diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
index d5ad9a8ea1138..080ed0cc54088 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
@@ -193,6 +193,7 @@ public function addImage(
         $mediaGalleryData['images'][] = [
             'file' => $fileName,
             'position' => $position,
+            'media_type' => 'image',
             'label' => '',
             'disabled' => (int)$exclude,
         ];
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index d5d4f5a0db8f6..1db22ebf2d93a 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -400,12 +400,12 @@ Password:,Password:
 "If you did not make this request, you can ignore this email and your password will remain the same.","If you did not make this request, you can ignore this email and your password will remain the same."
 "Your %store_name password has been changed","Your %store_name password has been changed"
 "We have received a request to change the following information associated with your account at %store_name: password.","We have received a request to change the following information associated with your account at %store_name: password."
-"Checkout out as a new customer","Checkout out as a new customer"
+"Checkout as a new customer","Checkout as a new customer"
 "Creating an account has many benefits:","Creating an account has many benefits:"
 "See order and shipping status","See order and shipping status"
 "Track order history","Track order history"
 "Check out faster","Check out faster"
-"Checkout out using your account","Checkout out using your account"
+"Checkout using your account","Checkout using your account"
 "Email Address","Email Address"
 "Are you sure you want to do this?","Are you sure you want to do this?"
 "Are you sure you want to delete this address?","Are you sure you want to delete this address?"
diff --git a/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html b/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
index b7b32203c0d7a..ad3d62f6c1c27 100644
--- a/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
+++ b/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
@@ -14,7 +14,7 @@
             <strong id="block-new-customer-heading"
                     role="heading"
                     aria-level="2"
-                    data-bind="i18n: 'Checkout out as a new customer'"></strong>
+                    data-bind="i18n: 'Checkout as a new customer'"></strong>
         </div>
         <div class="block-content" aria-labelledby="block-new-customer-heading">
             <p data-bind="i18n: 'Creating an account has many benefits:'"></p>
@@ -39,7 +39,7 @@
             <strong id="block-customer-login-heading"
                     role="heading"
                     aria-level="2"
-                    data-bind="i18n: 'Checkout out using your account'"></strong>
+                    data-bind="i18n: 'Checkout using your account'"></strong>
         </div>
         <!-- ko foreach: getRegion('messages') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Date.php b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
index 94f6ca65e83bf..78b02a63d172e 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/Date.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
@@ -53,7 +53,9 @@ public function prepareDataSource(array $dataSource)
     {
         if (isset($dataSource['data']['items'])) {
             foreach ($dataSource['data']['items'] as & $item) {
-                if (isset($item[$this->getData('name')])) {
+                if (isset($item[$this->getData('name')])
+                   && $item[$this->getData('name')] !== "0000-00-00 00:00:00"
+                ) {
                     $date = $this->timezone->date(new \DateTime($item[$this->getData('name')]));
                     $timezone = isset($this->getConfiguration()['timezone'])
                         ? $this->booleanUtils->convert($this->getConfiguration()['timezone'])
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php
index 0bfb2a7dc0f34..045f11fe688f4 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php
@@ -89,4 +89,14 @@ public function testPrepareDataSource()
         $result = $this->model->prepareDataSource(['data' => ['items' => [$item]]]);
         $this->assertEquals(self::TEST_TIME, $result['data']['items'][0]['field_name']);
     }
+
+    public function testPrepareDataSourceWithZeroDate()
+    {
+        $zeroDate = '0000-00-00 00:00:00';
+        $item = ['test_data' => 'some_data', 'field_name' => $zeroDate];
+        $this->timezoneMock->expects($this->never())->method('date');
+
+        $result = $this->model->prepareDataSource(['data' => ['items' => [$item]]]);
+        $this->assertEquals($zeroDate, $result['data']['items'][0]['field_name']);
+    }
 }
diff --git a/app/code/Magento/Webapi/Controller/Rest.php b/app/code/Magento/Webapi/Controller/Rest.php
index 1f8260c93c574..dc061aeea99e7 100644
--- a/app/code/Magento/Webapi/Controller/Rest.php
+++ b/app/code/Magento/Webapi/Controller/Rest.php
@@ -303,7 +303,7 @@ protected function processSchemaRequest()
         $responseBody = $this->swaggerGenerator->generate(
             $requestedServices,
             $this->_request->getScheme(),
-            $this->_request->getHttpHost(),
+            $this->_request->getHttpHost(false),
             $this->_request->getRequestUri()
         );
         $this->_response->setBody($responseBody)->setHeader('Content-Type', 'application/json');