diff --git a/.plugin-data b/.plugin-data
index 6b972083..315f6c26 100644
--- a/.plugin-data
+++ b/.plugin-data
@@ -1,4 +1,4 @@
 {
-    "version": "6.2.0",
+    "version": "6.3.0",
     "slug": "shopping-feed"
 }
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 20ea227c..670dcfac 100644
--- a/readme.md
+++ b/readme.md
@@ -2,8 +2,8 @@
 
 * Contributors: ShoppingFeed, BeAPI
 * Tags: shoppingfeed, marketplace, woocommerce, woocommerce shoppingfeed, create woocommerce products shoppingfeed, products feed, generate shoppingfeed, amazon, Jet, Walmart, many marketplace, import orders
-* Stable tag: 6.2.0
-* Version: 6.2.0
+* Stable tag: 6.3.0
+* Version: 6.3.0
 * Requires PHP: 7.1
 * Requires at least: 5.7
 * Tested up to: 6.2
@@ -15,6 +15,9 @@
 > Version 6.0.0 is a major version, there are several changes and improvements which affect the architecture of the plugin. You will have to re-configure the plugin, all the previous settings will be lost
 
 ## Changelog
+* 6.3.0
+  * Orders : Don't import orders fulfilled by the marketplaces by default, see details in the description.
+  * WPCLI command : don't rerun the generation process when an error occurs.
 * 6.2.0
   * Rework feed generation process to better handle shop with large amount of products.
 * 6.1.20
@@ -151,6 +154,17 @@ Sign up for free on ShoppingFeed : https://shopping-feed.com/
 - In Plugins > Installed Plugins > ShoppingFeed > settings, log in with your ShoppingFeed credentials
 - In Settings, check that ShoppingFeed is enabled and save changes
 
+## Orders fulfilled by the marketplaces
+
+The plugin won't import orders fulfilled by marketplaces by default.
+
+Options are available in the plugin settings to include those orders during the import.
+
+They can be found in the "Orders" tab :
+
+* Orders fulfilled by marketplace : import orders even if they are fulfilled by the marketplace.
+* Fulfilled by marketplace order's status : select the status used for orders fulfilled by marketplaces when they are imported.
+
 ## Shipment tracking support
 For now, the only shipment tracking plugins supported are :
 
diff --git a/readme.txt b/readme.txt
index 3e39c746..9fd1cc6c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,8 +1,8 @@
 ## ShoppingFeed
 Contributors: ShoppingFeed, BeAPI
 Tags: shoppingfeed, marketplace, woocommerce, woocommerce shoppingfeed, create woocommerce products shoppingfeed, products feed, generate shoppingfeed, amazon, Jet, Walmart, many marketplace, import orders
-Stable tag: 6.2.0
-Version: 6.2.0
+Stable tag: 6.3.0
+Version: 6.3.0
 Requires PHP: 7.1
 Requires at least: 5.7
 Tested up to: 6.2
@@ -13,6 +13,9 @@ WC tested up to: 7.7
 Version 6.0.0 is a major version, there are several changes and improvements which affect the architecture of the plugin. You will have to re-configure the plugin, all the previous settings will be lost
 
 == Changelog ==
+* 6.3.0
+  * Orders : Don't import orders fulfilled by the marketplaces by default, see details in the description.
+  * WPCLI command : don't rerun the generation process when an error occurs.
 * 6.2.0
   * Rework feed generation process to better handle shop with large amount of products.
 * 6.1.20
@@ -151,6 +154,17 @@ Sign up for free on ShoppingFeed : https://shopping-feed.com/
 - In Plugins > Installed Plugins > ShoppingFeed > settings, log in with your ShoppingFeed credentials
 - In Settings, check that ShoppingFeed is enabled and save changes
 
+## Orders fulfilled by the marketplaces
+
+The plugin won't import orders fulfilled by marketplaces by default.
+
+Options are available in the plugin settings to include those orders during the import.
+
+They can be found in the "Orders" tab :
+
+* Orders fulfilled by marketplace : import orders even if they are fulfilled by the marketplace.
+* Fulfilled by marketplace order's status : select the status used for orders fulfilled by marketplaces when they are imported.
+
 ## Shipment tracking support
 
 For now, the only shipment tracking plugins supported are :
diff --git a/shoppingfeed.php b/shoppingfeed.php
index 5961aef4..0bfa9144 100644
--- a/shoppingfeed.php
+++ b/shoppingfeed.php
@@ -7,7 +7,7 @@
  * Author URI:           https://www.shopping-feed.com/
  * Text Domain:          shopping-feed
  * Domain Path:          /languages
- * Version:              6.2.0
+ * Version:              6.3.0
  * Requires at least:    5.7
  * Requires PHP:         7.1
  * WC requires at least: 5.1.0
@@ -26,7 +26,7 @@
 	require_once plugin_dir_path( __FILE__ ) . '/vendor/autoload.php';
 }
 
-define( 'SF_VERSION', '6.2.0' );
+define( 'SF_VERSION', '6.3.0' );
 define( 'SF_DB_VERSION_SLUG', 'SF_DB_VERSION' );
 define( 'SF_DB_VERSION', '1.0.0' );
 define( 'SF_UPGRADE_RUNNING', 'SF_UPGRADE_RUNNING' );