diff --git a/app/code/Magento/Quote/Setup/UpgradeSchema.php b/app/code/Magento/Quote/Setup/UpgradeSchema.php
index e9221895e18d..1689bc55954e 100644
--- a/app/code/Magento/Quote/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Quote/Setup/UpgradeSchema.php
@@ -26,7 +26,6 @@ class UpgradeSchema implements UpgradeSchemaInterface
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
-
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
             $setup->getConnection(self::$connectionName)->addIndex(
                 $setup->getTable('quote_id_mask', self::$connectionName),
@@ -34,7 +33,6 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['masked_id']
             );
         }
-
         if (version_compare($context->getVersion(), '2.0.2', '<')) {
             $setup->getConnection(self::$connectionName)->changeColumn(
                 $setup->getTable('quote_address', self::$connectionName),
@@ -101,25 +99,51 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
             );
         }
         if (version_compare($context->getVersion(), '2.0.7', '<')) {
-            $connection = $setup->getConnection(self::$connectionName);
-            $connection->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'telephone',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'fax',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'region',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'city',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            );
+            $this->expandQuoteAddressFields($setup);
+        }
+        if (version_compare($context->getVersion(), '2.0.8', '<')) {
+            $this->expandRemoteIpField($setup);
         }
         $setup->endSetup();
     }
+
+    /**
+     * @param SchemaSetupInterface $setup
+     * @return void
+     */
+    private function expandRemoteIpField(SchemaSetupInterface $setup)
+    {
+        $connection = $setup->getConnection(self::$connectionName);
+        $connection->modifyColumn(
+            $setup->getTable('quote', self::$connectionName),
+            'remote_ip',
+            ['type' => Table::TYPE_TEXT, 'length' => 45]
+        );
+    }
+
+    /**
+     * @param SchemaSetupInterface $setup
+     * @return void
+     */
+    private function expandQuoteAddressFields(SchemaSetupInterface $setup)
+    {
+        $connection = $setup->getConnection(self::$connectionName);
+        $connection->modifyColumn(
+            $setup->getTable('quote_address', self::$connectionName),
+            'telephone',
+            ['type' => Table::TYPE_TEXT, 'length' => 255]
+        )->modifyColumn(
+            $setup->getTable('quote_address', self::$connectionName),
+            'fax',
+            ['type' => Table::TYPE_TEXT, 'length' => 255]
+        )->modifyColumn(
+            $setup->getTable('quote_address', self::$connectionName),
+            'region',
+            ['type' => Table::TYPE_TEXT, 'length' => 255]
+        )->modifyColumn(
+            $setup->getTable('quote_address', self::$connectionName),
+            'city',
+            ['type' => Table::TYPE_TEXT, 'length' => 255]
+        );
+    }
 }
diff --git a/app/code/Magento/Quote/etc/module.xml b/app/code/Magento/Quote/etc/module.xml
index 6607dea5809b..6720a77a79e1 100644
--- a/app/code/Magento/Quote/etc/module.xml
+++ b/app/code/Magento/Quote/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Quote" setup_version="2.0.7">
+    <module name="Magento_Quote" setup_version="2.0.8">
     </module>
 </config>
diff --git a/app/code/Magento/Sales/Setup/UpgradeSchema.php b/app/code/Magento/Sales/Setup/UpgradeSchema.php
index 5dbf71e69e9b..fe2d422914c5 100644
--- a/app/code/Magento/Sales/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Sales/Setup/UpgradeSchema.php
@@ -106,6 +106,9 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ]
             );
         }
+        if (version_compare($context->getVersion(), '2.0.10', '<')) {
+            $this->expandRemoteIpField($installer);
+        }
     }
 
     /**
@@ -141,4 +144,21 @@ private function addIndexBaseGrandTotal(SchemaSetupInterface $installer)
             ['base_grand_total']
         );
     }
+
+    /**
+     * @param SchemaSetupInterface $installer
+     * @return void
+     */
+    private function expandRemoteIpField(SchemaSetupInterface $installer)
+    {
+        $connection = $installer->getConnection(self::$connectionName);
+        $connection->modifyColumn(
+            $installer->getTable('sales_order', self::$connectionName),
+            'remote_ip',
+            [
+                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                'length' => 45
+            ]
+        );
+    }
 }
diff --git a/app/code/Magento/Sales/etc/module.xml b/app/code/Magento/Sales/etc/module.xml
index b234cdad876c..3a82dd64a794 100644
--- a/app/code/Magento/Sales/etc/module.xml
+++ b/app/code/Magento/Sales/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Sales" setup_version="2.0.9">
+    <module name="Magento_Sales" setup_version="2.0.10">
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>