diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
index 79f69ab5da88d..6b5e0681139cf 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
@@ -28,11 +28,11 @@ public function execute()
                 )->markAsRead(
                     $notificationId
                 );
-                $this->messageManager->addSuccess(__('The message has been marked as Read.'));
+                $this->messageManager->addSuccessMessage(__('The message has been marked as Read.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __("We couldn't mark the notification as Read because of an error.")
                 );
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
index 9e61b8ff4b83c..9ae4a7cdac0b9 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
@@ -23,7 +23,7 @@ public function execute()
     {
         $ids = $this->getRequest()->getParam('notification');
         if (!is_array($ids)) {
-            $this->messageManager->addError(__('Please select messages.'));
+            $this->messageManager->addErrorMessage(__('Please select messages.'));
         } else {
             try {
                 foreach ($ids as $id) {
@@ -32,13 +32,13 @@ public function execute()
                         $model->setIsRead(1)->save();
                     }
                 }
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('A total of %1 record(s) have been marked as Read.', count($ids))
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __("We couldn't mark the notification as Read because of an error.")
                 );
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
index 94c7d955f592b..f4cafa09c7e45 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
@@ -23,7 +23,7 @@ public function execute()
     {
         $ids = $this->getRequest()->getParam('notification');
         if (!is_array($ids)) {
-            $this->messageManager->addError(__('Please select messages.'));
+            $this->messageManager->addErrorMessage(__('Please select messages.'));
         } else {
             try {
                 foreach ($ids as $id) {
@@ -32,11 +32,12 @@ public function execute()
                         $model->setIsRemove(1)->save();
                     }
                 }
-                $this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));
+                $this->messageManager->addSuccessMessage(__('Total of %1 record(s) have been removed.', count($ids)));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
+                $this->messageManager
+                    ->addExceptionMessage($e, __("We couldn't remove the messages because of an error."));
             }
         }
         $this->_redirect('adminhtml/*/');
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
index 17f911339cb61..bec101fc27d48 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
@@ -31,11 +31,12 @@ public function execute()
 
             try {
                 $model->setIsRemove(1)->save();
-                $this->messageManager->addSuccess(__('The message has been removed.'));
+                $this->messageManager->addSuccessMessage(__('The message has been removed.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
+                $this->messageManager
+                    ->addExceptionMessage($e, __("We couldn't remove the messages because of an error."));
             }
 
             $this->_redirect('adminhtml/*/');
diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
index 02413a1899cd7..818bcda1da65f 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
@@ -37,10 +37,10 @@ public function execute()
                 );
                 return $resultLayout;
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         } else {
-            $this->messageManager->addError(__('Please correct the data sent.'));
+            $this->messageManager->addErrorMessage(__('Please correct the data sent.'));
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request.php b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
index d9a403e5c991e..fc78d836b6080 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Request.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
@@ -112,50 +112,50 @@ public function setDataFromOrder(
             sprintf('%.2F', $order->getBaseShippingAmount())
         );
 
-        //need to use strval() because NULL values IE6-8 decodes as "null" in JSON in JavaScript,
+        //need to use (string) because NULL values IE6-8 decodes as "null" in JSON in JavaScript,
         //but we need "" for null values.
         $billing = $order->getBillingAddress();
         if (!empty($billing)) {
-            $this->setXFirstName(strval($billing->getFirstname()))
-                ->setXLastName(strval($billing->getLastname()))
-                ->setXCompany(strval($billing->getCompany()))
-                ->setXAddress(strval($billing->getStreetLine(1)))
-                ->setXCity(strval($billing->getCity()))
-                ->setXState(strval($billing->getRegion()))
-                ->setXZip(strval($billing->getPostcode()))
-                ->setXCountry(strval($billing->getCountryId()))
-                ->setXPhone(strval($billing->getTelephone()))
-                ->setXFax(strval($billing->getFax()))
-                ->setXCustId(strval($billing->getCustomerId()))
-                ->setXCustomerIp(strval($order->getRemoteIp()))
-                ->setXCustomerTaxId(strval($billing->getTaxId()))
-                ->setXEmail(strval($order->getCustomerEmail()))
-                ->setXEmailCustomer(strval($paymentMethod->getConfigData('email_customer')))
-                ->setXMerchantEmail(strval($paymentMethod->getConfigData('merchant_email')));
+            $this->setXFirstName((string)$billing->getFirstname())
+                ->setXLastName((string)$billing->getLastname())
+                ->setXCompany((string)$billing->getCompany())
+                ->setXAddress((string)$billing->getStreetLine(1))
+                ->setXCity((string)$billing->getCity())
+                ->setXState((string)$billing->getRegion())
+                ->setXZip((string)$billing->getPostcode())
+                ->setXCountry((string)$billing->getCountryId())
+                ->setXPhone((string)$billing->getTelephone())
+                ->setXFax((string)$billing->getFax())
+                ->setXCustId((string)$billing->getCustomerId())
+                ->setXCustomerIp((string)$order->getRemoteIp())
+                ->setXCustomerTaxId((string)$billing->getTaxId())
+                ->setXEmail((string)$order->getCustomerEmail())
+                ->setXEmailCustomer((string)$paymentMethod->getConfigData('email_customer'))
+                ->setXMerchantEmail((string)$paymentMethod->getConfigData('merchant_email'));
         }
 
         $shipping = $order->getShippingAddress();
         if (!empty($shipping)) {
             $this->setXShipToFirstName(
-                strval($shipping->getFirstname())
+                (string)$shipping->getFirstname()
             )->setXShipToLastName(
-                strval($shipping->getLastname())
+                (string)$shipping->getLastname()
             )->setXShipToCompany(
-                strval($shipping->getCompany())
+                (string)$shipping->getCompany()
             )->setXShipToAddress(
-                strval($shipping->getStreetLine(1))
+                (string)$shipping->getStreetLine(1)
             )->setXShipToCity(
-                strval($shipping->getCity())
+                (string)$shipping->getCity()
             )->setXShipToState(
-                strval($shipping->getRegion())
+                (string)$shipping->getRegion()
             )->setXShipToZip(
-                strval($shipping->getPostcode())
+                (string)$shipping->getPostcode()
             )->setXShipToCountry(
-                strval($shipping->getCountryId())
+                (string)$shipping->getCountryId()
             );
         }
 
-        $this->setXPoNum(strval($payment->getPoNumber()));
+        $this->setXPoNum((string)$payment->getPoNumber());
 
         return $this;
     }
diff --git a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
index 8edc38dce6f60..8c4c90bf111de 100644
--- a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            transparent: 'Magento_Payment/transparent'
+            transparent: 'Magento_Payment/js/transparent',
+            'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
         }
     }
 };
diff --git a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
index 68506a521c1cf..4b25e9921e404 100644
--- a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
+++ b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
@@ -160,7 +160,7 @@ protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterfa
             } else {
                 $this->_actionFlag->set('', \Magento\Framework\App\ActionInterface::FLAG_NO_DISPATCH, true);
                 $this->_response->setRedirect($this->_url->getCurrentUrl());
-                $this->messageManager->addError(__('Invalid Form Key. Please refresh the page.'));
+                $this->messageManager->addErrorMessage(__('Invalid Form Key. Please refresh the page.'));
                 $isRedirectNeeded = true;
             }
         }
@@ -205,7 +205,7 @@ protected function _performLogin(\Magento\Framework\App\RequestInterface $reques
             $this->_auth->login($username, $password);
         } catch (AuthenticationException $e) {
             if (!$request->getParam('messageSent')) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $request->setParam('messageSent', true);
                 $outputValue = false;
             }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
index b3f467ce37c88..03566bce3fc34 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -82,7 +82,7 @@ public function render(\Magento\Framework\DataObject $row)
     {
         if ($data = (string)$this->_getValue($row)) {
             $currency_code = $this->_getCurrencyCode($row);
-            $data = floatval($data) * $this->_getRate($row);
+            $data = (float)$data * $this->_getRate($row);
             $sign = (bool)(int)$this->getColumn()->getShowNumberSign() && $data > 0 ? '+' : '';
             $data = sprintf("%f", $data);
             $data = $this->_localeCurrency->getCurrency($currency_code)->toCurrency($data);
@@ -118,10 +118,10 @@ protected function _getCurrencyCode($row)
     protected function _getRate($row)
     {
         if ($rate = $this->getColumn()->getRate()) {
-            return floatval($rate);
+            return (float)$rate;
         }
         if ($rate = $row->getData($this->getColumn()->getRateField())) {
-            return floatval($rate);
+            return (float)$rate;
         }
         return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
     }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
index e4300c63485f5..9da23af83f036 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
@@ -60,7 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
                 return $data;
             }
 
-            $data = floatval($data) * $this->_getRate($row);
+            $data = (float)$data * $this->_getRate($row);
             $data = sprintf("%f", $data);
             $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
             return $data;
@@ -94,10 +94,10 @@ protected function _getCurrencyCode($row)
     protected function _getRate($row)
     {
         if ($rate = $this->getColumn()->getRate()) {
-            return floatval($rate);
+            return (float)$rate;
         }
         if ($rate = $row->getData($this->getColumn()->getRateField())) {
-            return floatval($rate);
+            return (float)$rate;
         }
         return 1;
     }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
index 41e32c929287a..e55c449a0e5bb 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
@@ -16,7 +16,7 @@ class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
     public function execute()
     {
         $this->_auth->logout();
-        $this->messageManager->addSuccess(__('You have logged out.'));
+        $this->messageManager->addSuccessMessage(__('You have logged out.'));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
index 7a926b1c09c3e..888ce11313b8a 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
@@ -28,11 +28,11 @@ public function execute()
         try {
             $this->_objectManager->create(\Magento\Catalog\Model\Product\Image::class)->clearCache();
             $this->_eventManager->dispatch('clean_catalog_images_cache_after');
-            $this->messageManager->addSuccess(__('The image cache was cleaned.'));
+            $this->messageManager->addSuccessMessage(__('The image cache was cleaned.'));
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('An error occurred while clearing the image cache.'));
+            $this->messageManager->addExceptionMessage($e, __('An error occurred while clearing the image cache.'));
         }
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
index 72f23ab65cf8a..5df0a7779c4c1 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
@@ -28,11 +28,12 @@ public function execute()
         try {
             $this->_objectManager->get(\Magento\Framework\View\Asset\MergeService::class)->cleanMergedJsCss();
             $this->_eventManager->dispatch('clean_media_cache_after');
-            $this->messageManager->addSuccess(__('The JavaScript/CSS cache has been cleaned.'));
+            $this->messageManager->addSuccessMessage(__('The JavaScript/CSS cache has been cleaned.'));
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
+            $this->messageManager
+                ->addExceptionMessage($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
         }
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
index 27ae2fc31e150..489eb5799a5e7 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
@@ -26,7 +26,7 @@ public function execute()
     {
         $this->_objectManager->get(\Magento\Framework\App\State\CleanupFiles::class)->clearMaterializedViewFiles();
         $this->_eventManager->dispatch('clean_static_files_cache_after');
-        $this->messageManager->addSuccess(__('The static files cache has been cleaned.'));
+        $this->messageManager->addSuccessMessage(__('The static files cache has been cleaned.'));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
index ca89ea58fa6f3..a2f18b4baf53d 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
@@ -27,7 +27,7 @@ public function execute()
         foreach ($this->_cacheFrontendPool as $cacheFrontend) {
             $cacheFrontend->getBackend()->clean();
         }
-        $this->messageManager->addSuccess(__("You flushed the cache storage."));
+        $this->messageManager->addSuccessMessage(__("You flushed the cache storage."));
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
         return $resultRedirect->setPath('adminhtml/*');
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
index f0fed159e0f22..90ed3432fa87b 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
@@ -27,7 +27,7 @@ public function execute()
             $cacheFrontend->clean();
         }
         $this->_eventManager->dispatch('adminhtml_cache_flush_system');
-        $this->messageManager->addSuccess(__("The Magento cache storage has been flushed."));
+        $this->messageManager->addSuccessMessage(__("The Magento cache storage has been flushed."));
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
         return $resultRedirect->setPath('adminhtml/*');
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
index 2bfa937b06b77..03b88ca1d3f47 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
@@ -67,12 +67,12 @@ private function disableCache()
             }
             if ($updatedTypes > 0) {
                 $this->_cacheState->persist();
-                $this->messageManager->addSuccess(__("%1 cache type(s) disabled.", $updatedTypes));
+                $this->messageManager->addSuccessMessage(__("%1 cache type(s) disabled.", $updatedTypes));
             }
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('An error occurred while disabling cache.'));
+            $this->messageManager->addExceptionMessage($e, __('An error occurred while disabling cache.'));
         }
     }
 
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
index 113e0f2d8961b..1b98a00d4bf35 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
@@ -66,12 +66,12 @@ private function enableCache()
             }
             if ($updatedTypes > 0) {
                 $this->_cacheState->persist();
-                $this->messageManager->addSuccess(__("%1 cache type(s) enabled.", $updatedTypes));
+                $this->messageManager->addSuccessMessage(__("%1 cache type(s) enabled.", $updatedTypes));
             }
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('An error occurred while enabling cache.'));
+            $this->messageManager->addExceptionMessage($e, __('An error occurred while enabling cache.'));
         }
     }
 
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
index 3843b030afb3d..bde211debcf72 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
@@ -37,12 +37,12 @@ public function execute()
                 $updatedTypes++;
             }
             if ($updatedTypes > 0) {
-                $this->messageManager->addSuccess(__("%1 cache type(s) refreshed.", $updatedTypes));
+                $this->messageManager->addSuccessMessage(__("%1 cache type(s) refreshed.", $updatedTypes));
             }
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('An error occurred while refreshing cache.'));
+            $this->messageManager->addExceptionMessage($e, __('An error occurred while refreshing cache.'));
         }
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
index f831fa67f4bb0..c10d1a77997b7 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -34,9 +34,9 @@ public function execute()
             foreach ($collectionsNames as $collectionName) {
                 $this->_objectManager->create($collectionName)->aggregate();
             }
-            $this->messageManager->addSuccess(__('We updated lifetime statistic.'));
+            $this->messageManager->addSuccessMessage(__('We updated lifetime statistic.'));
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
+            $this->messageManager->addErrorMessage(__('We can\'t refresh lifetime statistics.'));
             $this->logger->critical($e);
         }
 
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
index 1b10c151a9d21..d95b0541c2c76 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
@@ -76,12 +76,12 @@ public function execute()
             $errors = $user->validate();
             if ($errors !== true && !empty($errors)) {
                 foreach ($errors as $error) {
-                    $this->messageManager->addError($error);
+                    $this->messageManager->addErrorMessage($error);
                 }
             } else {
                 $user->save();
                 $user->sendNotificationEmailsIfRequired();
-                $this->messageManager->addSuccess(__('You saved the account.'));
+                $this->messageManager->addSuccessMessage(__('You saved the account.'));
             }
         } catch (UserLockedException $e) {
             $this->_auth->logout();
@@ -91,12 +91,12 @@ public function execute()
         } catch (ValidatorException $e) {
             $this->messageManager->addMessages($e->getMessages());
             if ($e->getMessage()) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('An error occurred while saving account.'));
+            $this->messageManager->addErrorMessage(__('An error occurred while saving account.'));
         }
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
index 76402169f269e..21f28188cf874 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
@@ -19,11 +19,11 @@ public function execute()
 
             try {
                 $design->delete();
-                $this->messageManager->addSuccess(__('You deleted the design change.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the design change.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __("You can't delete the design change."));
+                $this->messageManager->addExceptionMessage($e, __("You can't delete the design change."));
             }
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
index 1f478604ced7d..0228b48f7f11e 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
@@ -50,9 +50,9 @@ public function execute()
             try {
                 $design->save();
                 $this->_eventManager->dispatch('theme_save_after');
-                $this->messageManager->addSuccess(__('You saved the design change.'));
+                $this->messageManager->addSuccessMessage(__('You saved the design change.'));
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setDesignData($data);
                 return $resultRedirect->setPath('adminhtml/*/', ['id' => $design->getId()]);
             }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
index 4fbae6abb423a..0beeb5168b6d1 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
@@ -103,12 +103,12 @@ protected function _backupDatabase()
                 ->setType('db')
                 ->setPath($filesystem->getDirectoryRead(DirectoryList::VAR_DIR)->getAbsolutePath('backups'));
             $backupDb->createBackup($backup);
-            $this->messageManager->addSuccess(__('The database was backed up.'));
+            $this->messageManager->addSuccessMessage(__('The database was backed up.'));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             return false;
         } catch (\Exception $e) {
-            $this->messageManager->addException(
+            $this->messageManager->addExceptionMessage(
                 $e,
                 __('We can\'t create a backup right now. Please try again later.')
             );
@@ -125,7 +125,7 @@ protected function _backupDatabase()
      */
     protected function _addDeletionNotice($typeTitle)
     {
-        $this->messageManager->addNotice(
+        $this->messageManager->addNoticeMessage(
             __(
                 'Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.)'
                 . ', but the %1 will not be able to be restored. It is suggested that you create a database backup '
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
index 925ae4c69ee8e..4e323be709ae1 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
@@ -15,13 +15,13 @@ public function execute()
     {
         $itemId = $this->getRequest()->getParam('item_id', null);
         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Group::class)->load($itemId))) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This store cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This store cannot be deleted.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $itemId]);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
index b6fbd88c7669c..23364aac1f0ab 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
@@ -21,11 +21,11 @@ public function execute()
         $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
 
         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Group::class)->load($itemId))) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This store cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This store cannot be deleted.'));
             return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $model->getId()]);
         }
 
@@ -35,12 +35,12 @@ public function execute()
 
         try {
             $model->delete();
-            $this->messageManager->addSuccess(__('You deleted the store.'));
+            $this->messageManager->addSuccessMessage(__('You deleted the store.'));
             return $redirectResult->setPath('adminhtml/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to delete the store. Please try again later.'));
+            $this->messageManager->addExceptionMessage($e, __('Unable to delete the store. Please try again later.'));
         }
         return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $itemId]);
     }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
index b31de6cacc5ff..c340b1ec53aa5 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
@@ -15,13 +15,13 @@ public function execute()
     {
         $itemId = $this->getRequest()->getParam('item_id', null);
         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Store::class)->load($itemId))) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This store view cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This store view cannot be deleted.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $itemId]);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
index 13b104c5ec4c0..8146bfdd41e40 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
@@ -22,11 +22,11 @@ public function execute()
         /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
         $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Store::class)->load($itemId))) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This store view cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This store view cannot be deleted.'));
             return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $model->getId()]);
         }
 
@@ -37,12 +37,13 @@ public function execute()
         try {
             $model->delete();
 
-            $this->messageManager->addSuccess(__('You deleted the store view.'));
+            $this->messageManager->addSuccessMessage(__('You deleted the store view.'));
             return $redirectResult->setPath('adminhtml/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to delete the store view. Please try again later.'));
+            $this->messageManager
+                ->addExceptionMessage($e, __('Unable to delete the store view. Please try again later.'));
         }
         return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $itemId]);
     }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
index 1f2ec4b2ba4b1..d86f57daa396c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
@@ -15,13 +15,13 @@ public function execute()
     {
         $itemId = $this->getRequest()->getParam('item_id', null);
         if (!($model = $this->_objectManager->create(\Magento\Store\Model\Website::class)->load($itemId))) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This website cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This website cannot be deleted.'));
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/editWebsite', ['website_id' => $itemId]);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
index c2d24b8c41a8c..1fca5a896e050 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
@@ -23,11 +23,11 @@ public function execute()
         $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
 
         if (!$model) {
-            $this->messageManager->addError(__('Something went wrong. Please try again.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
             return $redirectResult->setPath('adminhtml/*/');
         }
         if (!$model->isCanDelete()) {
-            $this->messageManager->addError(__('This website cannot be deleted.'));
+            $this->messageManager->addErrorMessage(__('This website cannot be deleted.'));
             return $redirectResult->setPath('adminhtml/*/editWebsite', ['website_id' => $model->getId()]);
         }
 
@@ -37,12 +37,12 @@ public function execute()
 
         try {
             $model->delete();
-            $this->messageManager->addSuccess(__('You deleted the website.'));
+            $this->messageManager->addSuccessMessage(__('You deleted the website.'));
             return $redirectResult->setPath('adminhtml/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to delete the website. Please try again later.'));
+            $this->messageManager->addExceptionMessage($e, __('Unable to delete the website. Please try again later.'));
         }
         return $redirectResult->setPath('*/*/editWebsite', ['website_id' => $itemId]);
     }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
index cbc068a480865..a8651984cfa63 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
@@ -57,7 +57,7 @@ public function execute()
         if ($model->getId() || $this->_coreRegistry->registry('store_action') == 'add') {
             $this->_coreRegistry->register('store_data', $model);
             if ($this->_coreRegistry->registry('store_action') == 'edit' && $codeBase && !$model->isReadOnly()) {
-                $this->messageManager->addNotice($codeBase);
+                $this->messageManager->addNoticeMessage($codeBase);
             }
             $resultPage = $this->createPage();
             if ($this->_coreRegistry->registry('store_action') == 'add') {
@@ -71,7 +71,7 @@ public function execute()
             ));
             return $resultPage;
         } else {
-            $this->messageManager->addError($notExists);
+            $this->messageManager->addErrorMessage($notExists);
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
             return $resultRedirect->setPath('adminhtml/*/');
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
index 8ca783f887ec4..910511c2b275e 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
@@ -32,7 +32,7 @@ private function processWebsiteSave($postData)
         }
 
         $websiteModel->save();
-        $this->messageManager->addSuccess(__('You saved the website.'));
+        $this->messageManager->addSuccessMessage(__('You saved the website.'));
 
         return $postData;
     }
@@ -68,7 +68,7 @@ private function processStoreSave($postData)
             );
         }
         $storeModel->save();
-        $this->messageManager->addSuccess(__('You saved the store view.'));
+        $this->messageManager->addSuccessMessage(__('You saved the store view.'));
 
         return $postData;
     }
@@ -98,7 +98,7 @@ private function processGroupSave($postData)
             );
         }
         $groupModel->save();
-        $this->messageManager->addSuccess(__('You saved the store.'));
+        $this->messageManager->addSuccessMessage(__('You saved the store.'));
 
         return $postData;
     }
@@ -134,10 +134,10 @@ public function execute()
                 $redirectResult->setPath('adminhtml/*/');
                 return $redirectResult;
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_getSession()->setPostData($postData);
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __('Something went wrong while saving. Please review the error log.')
                 );
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php
index b1911da024227..ac0f4a2f467c8 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php
@@ -38,7 +38,7 @@ public function testExecute()
         $messageManagerParams = $helper->getConstructArguments(\Magento\Framework\Message\Manager::class);
         $messageManagerParams['exceptionMessageFactory'] = $exceptionMessageFactory;
         $messageManager = $this->getMockBuilder(\Magento\Framework\Message\Manager::class)
-            ->setMethods(['addSuccess'])
+            ->setMethods(['addSuccessMessage'])
             ->setConstructorArgs($messageManagerParams)
             ->getMock();
 
@@ -86,7 +86,7 @@ public function testExecute()
         $mergeService->expects($this->once())->method('cleanMergedJsCss');
 
         $messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('The JavaScript/CSS cache has been cleaned.');
 
         $valueMap = [
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
index 40d9ca1aa8996..fc457cd9681e6 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
@@ -76,7 +76,7 @@ public function testExecute()
             ->with('clean_static_files_cache_after');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('The static files cache has been cleaned.');
 
         $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
index 556db311748bd..9a42d0acdba89 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
@@ -155,7 +155,7 @@ public function testExecuteInvalidTypeCache()
             ->willReturn(['someCache']);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Specified cache type(s) don\'t exist: someCache')
             ->willReturnSelf();
 
@@ -175,7 +175,7 @@ public function testExecuteWithException()
             ->willThrowException($exception);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addException')
+            ->method('addExceptionMessage')
             ->with($exception, 'An error occurred while disabling cache.')
             ->willReturnSelf();
 
@@ -215,7 +215,7 @@ public function testExecuteSuccess()
             ->method('persist');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('1 cache type(s) disabled.')
             ->willReturnSelf();
 
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
index ad622ca69757a..23cf6a9a0a70a 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
@@ -155,7 +155,7 @@ public function testExecuteInvalidTypeCache()
             ->willReturn(['someCache']);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Specified cache type(s) don\'t exist: someCache')
             ->willReturnSelf();
 
@@ -175,7 +175,7 @@ public function testExecuteWithException()
             ->willThrowException($exception);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addException')
+            ->method('addExceptionMessage')
             ->with($exception, 'An error occurred while enabling cache.')
             ->willReturnSelf();
 
@@ -215,7 +215,7 @@ public function testExecuteSuccess()
             ->method('persist');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('1 cache type(s) enabled.')
             ->willReturnSelf();
 
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
index e8dcc00345fc6..a985681919f0b 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
@@ -107,7 +107,7 @@ public function testExecute()
         $this->resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirect);
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('We updated lifetime statistic.'));
 
         $this->objectManager->expects($this->any())
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
index 844a821df1c20..a8490d6ba2e58 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
@@ -71,7 +71,7 @@ protected function setUp()
             ->getMock();
         $this->_messagesMock = $this->getMockBuilder(\Magento\Framework\Message\Manager::class)
             ->disableOriginalConstructor()
-            ->setMethods(['addSuccess'])
+            ->setMethods(['addSuccessMessage'])
             ->getMockForAbstractClass();
 
         $this->_authSessionMock = $this->getMockBuilder(\Magento\Backend\Model\Auth\Session::class)
@@ -221,7 +221,7 @@ public function testSaveAction()
 
         $this->_requestMock->setParams($requestParams);
 
-        $this->_messagesMock->expects($this->once())->method('addSuccess')->with($this->equalTo($testedMessage));
+        $this->_messagesMock->expects($this->once())->method('addSuccessMessage')->with($this->equalTo($testedMessage));
 
         $this->_controller->execute();
     }
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
index 0bd7ef3d82ade..65ea398b74c42 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
@@ -82,7 +82,7 @@ public function execute()
 
             $backupManager->create();
 
-            $this->messageManager->addSuccess($successMessage);
+            $this->messageManager->addSuccessMessage($successMessage);
 
             $response->setRedirectUrl($this->getUrl('*/*/index'));
         } catch (\Magento\Framework\Backup\Exception\NotEnoughFreeSpace $e) {
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
index 04292d2759093..90657fc2490ba 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php
@@ -49,13 +49,13 @@ public function execute()
 
             $resultData->setIsSuccess(true);
             if ($allBackupsDeleted) {
-                $this->messageManager->addSuccess(__('You deleted the selected backup(s).'));
+                $this->messageManager->addSuccessMessage(__('You deleted the selected backup(s).'));
             } else {
                 throw new \Exception($deleteFailMessage);
             }
         } catch (\Exception $e) {
             $resultData->setIsSuccess(false);
-            $this->messageManager->addError($deleteFailMessage);
+            $this->messageManager->addErrorMessage($deleteFailMessage);
         }
 
         return $this->_redirect('backup/*/index');
diff --git a/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php
new file mode 100644
index 0000000000000..6dc40e76322df
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Request/MerchantAccountDataBuilder.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Gateway\Request;
+
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+
+/**
+ * Adds Merchant Account ID to the request if it was specified in the configuration.
+ */
+class MerchantAccountDataBuilder implements BuilderInterface
+{
+    /**
+     * The merchant account ID used to create a transaction.
+     * Currency is also determined by merchant account ID.
+     * If no merchant account ID is specified, Braintree will use your default merchant account.
+     */
+    private static $merchantAccountId = 'merchantAccountId';
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * Constructor
+     *
+     * @param Config $config
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(Config $config, SubjectReader $subjectReader)
+    {
+        $this->config = $config;
+        $this->subjectReader = $subjectReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function build(array $buildSubject): array
+    {
+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
+        $order = $paymentDO->getOrder();
+
+        $result = [];
+        $merchantAccountId = $this->config->getMerchantAccountId($order->getStoreId());
+        if (!empty($merchantAccountId)) {
+            $result[self::$merchantAccountId] = $merchantAccountId;
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
index 85a0c64451398..fe75ce86cca2f 100644
--- a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
@@ -6,8 +6,8 @@
 namespace Magento\Braintree\Gateway\Request;
 
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 
@@ -36,9 +36,8 @@ class PaymentDataBuilder implements BuilderInterface
     const PAYMENT_METHOD_NONCE = 'paymentMethodNonce';
 
     /**
-     * The merchant account ID used to create a transaction.
-     * Currency is also determined by merchant account ID.
-     * If no merchant account ID is specified, Braintree will use your default merchant account.
+     * @deprecated
+     * @see \Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder
      */
     const MERCHANT_ACCOUNT_ID = 'merchantAccountId';
 
@@ -47,25 +46,18 @@ class PaymentDataBuilder implements BuilderInterface
      */
     const ORDER_ID = 'orderId';
 
-    /**
-     * @var Config
-     */
-    private $config;
-
     /**
      * @var SubjectReader
      */
     private $subjectReader;
 
     /**
-     * Constructor
-     *
      * @param Config $config
      * @param SubjectReader $subjectReader
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(Config $config, SubjectReader $subjectReader)
     {
-        $this->config = $config;
         $this->subjectReader = $subjectReader;
     }
 
@@ -87,11 +79,6 @@ public function build(array $buildSubject)
             self::ORDER_ID => $order->getOrderIncrementId()
         ];
 
-        $merchantAccountId = $this->config->getMerchantAccountId($order->getStoreId());
-        if (!empty($merchantAccountId)) {
-            $result[self::MERCHANT_ACCOUNT_ID] = $merchantAccountId;
-        }
-
         return $result;
     }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php
new file mode 100644
index 0000000000000..038687d8821d7
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Gateway\Http\Client;
+
+use Braintree\Result\Successful;
+use Magento\Braintree\Gateway\Http\Client\TransactionRefund;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Payment\Gateway\Http\ClientException;
+use Magento\Payment\Gateway\Http\ConverterException;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
+use Magento\Payment\Model\Method\Logger;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class TransactionRefundTest
+ */
+class TransactionRefundTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var TransactionRefund
+     */
+    private $transactionRefundModel;
+
+    /**
+     * @var BraintreeAdapter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapterMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        /** @var LoggerInterface|MockObject $criticalLoggerMock */
+        $criticalLoggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        /** @var Logger|\PHPUnit_Framework_MockObject_MockObject $loggerMock */
+        $loggerMock = $this->getMockBuilder(Logger::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapterMock = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
+        $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactoryMock->method('create')
+            ->willReturn($this->adapterMock);
+
+        $this->transactionRefundModel = new TransactionRefund($criticalLoggerMock, $loggerMock, $adapterFactoryMock);
+    }
+
+    /**
+     * @throws ClientException
+     * @throws ConverterException
+     */
+    public function testRefundRequestWithStoreId()
+    {
+        $transactionId = '11223344';
+        $refundAmount = 10;
+        $data = [
+            'store_id' => 0,
+            'transaction_id' => $transactionId,
+            PaymentDataBuilder::AMOUNT => $refundAmount
+        ];
+        $successfulResponse = new Successful();
+
+        /** @var TransferInterface|\PHPUnit_Framework_MockObject_MockObject $transferObjectMock */
+        $transferObjectMock = $this->createMock(TransferInterface::class);
+        $transferObjectMock->method('getBody')
+            ->willReturn($data);
+        $this->adapterMock->expects($this->once())
+            ->method('refund')
+            ->with($transactionId, $refundAmount)
+            ->willReturn($successfulResponse);
+
+        $response = $this->transactionRefundModel->placeRequest($transferObjectMock);
+
+        self::assertEquals($successfulResponse, $response['object']);
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionVoidTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionVoidTest.php
new file mode 100644
index 0000000000000..8291806d2a6e0
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionVoidTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Gateway\Http\Client;
+
+use Braintree\Result\Successful;
+use Magento\Braintree\Gateway\Http\Client\TransactionVoid;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Payment\Gateway\Http\ClientException;
+use Magento\Payment\Gateway\Http\ConverterException;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Payment\Model\Method\Logger;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class TransactionVoidTest
+ */
+class TransactionVoidTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var TransactionVoid
+     */
+    private $transactionVoidModel;
+
+    /**
+     * @var BraintreeAdapter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapterMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        /** @var LoggerInterface|MockObject $criticalLoggerMock */
+        $criticalLoggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        /** @var Logger|\PHPUnit_Framework_MockObject_MockObject $loggerMock */
+        $loggerMock = $this->getMockBuilder(Logger::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapterMock = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
+        $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactoryMock->method('create')
+            ->willReturn($this->adapterMock);
+
+        $this->transactionVoidModel = new TransactionVoid($criticalLoggerMock, $loggerMock, $adapterFactoryMock);
+    }
+
+    /**
+     * @throws ClientException
+     * @throws ConverterException
+     */
+    public function testVoidRequestWithStoreId()
+    {
+        $transactionId = '11223344';
+        $data = [
+            'store_id' => 0,
+            'transaction_id' => $transactionId
+        ];
+        $successfulResponse = new Successful();
+
+        /** @var TransferInterface|\PHPUnit_Framework_MockObject_MockObject $transferObjectMock */
+        $transferObjectMock = $this->createMock(TransferInterface::class);
+        $transferObjectMock->method('getBody')
+            ->willReturn($data);
+        $this->adapterMock->expects($this->once())
+            ->method('void')
+            ->with($transactionId)
+            ->willReturn($successfulResponse);
+
+        $response = $this->transactionVoidModel->placeRequest($transferObjectMock);
+
+        self::assertEquals($successfulResponse, $response['object']);
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
index 16f11559f73cc..62ef402e9ca9f 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Model\Order\Payment;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Braintree\Gateway\Config\Config;
 
 /**
  * Class PaymentDataBuilderTest
@@ -29,11 +29,6 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
      */
     private $builder;
 
-    /**
-     * @var Config|MockObject
-     */
-    private $config;
-
     /**
      * @var Payment|MockObject
      */
@@ -52,15 +47,16 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->paymentDO = $this->createMock(PaymentDataObjectInterface::class);
-        $this->config = $this->getMockBuilder(Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->payment = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->order = $this->createMock(OrderAdapterInterface::class);
 
-        $this->builder = new PaymentDataBuilder($this->config, new SubjectReader());
+        $config = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->builder = new PaymentDataBuilder($config, new SubjectReader());
     }
 
     /**
@@ -98,8 +94,7 @@ public function testBuild()
         $expectedResult = [
             PaymentDataBuilder::AMOUNT  => 10.00,
             PaymentDataBuilder::PAYMENT_METHOD_NONCE  => self::PAYMENT_METHOD_NONCE,
-            PaymentDataBuilder::ORDER_ID => '000000101',
-            PaymentDataBuilder::MERCHANT_ACCOUNT_ID  => self::MERCHANT_ACCOUNT_ID,
+            PaymentDataBuilder::ORDER_ID => '000000101'
         ];
 
         $buildSubject = [
@@ -111,9 +106,6 @@ public function testBuild()
             ->method('getAdditionalInformation')
             ->willReturnMap($additionalData);
 
-        $this->config->method('getMerchantAccountId')
-            ->willReturn(self::MERCHANT_ACCOUNT_ID);
-
         $this->paymentDO->method('getPayment')
             ->willReturn($this->payment);
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PayPal/TokenFormatterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PayPal/TokenFormatterTest.php
new file mode 100644
index 0000000000000..e552f4f39f1c4
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PayPal/TokenFormatterTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Model\InstantPurchase\PayPal;
+
+use Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter as PaypalTokenFormatter;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+
+class TokenFormatterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PaymentTokenInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentTokenMock;
+
+    /**
+     * @var PaypalTokenFormatter
+     */
+    private $paypalTokenFormatter;
+
+    /**
+     * @var array
+     */
+    private $tokenDetails = [
+        'type' => 'visa',
+        'maskedCC' => '4444************9999',
+        'expirationDate' => '07-07-2025'
+    ];
+
+    protected function setUp()
+    {
+        $this->paymentTokenMock = $this->getMockBuilder(PaymentTokenInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->paypalTokenFormatter = new PaypalTokenFormatter();
+    }
+
+    public function testFormatPaymentTokenWithKnownCardType()
+    {
+        $this->tokenDetails['type'] = key(PaypalTokenFormatter::$baseCardTypes);
+        $this->paymentTokenMock->expects($this->once())
+            ->method('getTokenDetails')
+            ->willReturn(json_encode($this->tokenDetails));
+
+        $formattedString = sprintf(
+            '%s: %s, %s: %s (%s: %s)',
+            __('Credit Card'),
+            reset(PaypalTokenFormatter::$baseCardTypes),
+            __('ending'),
+            $this->tokenDetails['maskedCC'],
+            __('expires'),
+            $this->tokenDetails['expirationDate']
+        );
+
+        self::assertEquals($formattedString, $this->paypalTokenFormatter->formatPaymentToken($this->paymentTokenMock));
+    }
+
+    public function testFormatPaymentTokenWithUnknownCardType()
+    {
+        $this->paymentTokenMock->expects($this->once())
+            ->method('getTokenDetails')
+            ->willReturn(json_encode($this->tokenDetails));
+
+        $formattedString = sprintf(
+            '%s: %s, %s: %s (%s: %s)',
+            __('Credit Card'),
+            $this->tokenDetails['type'],
+            __('ending'),
+            $this->tokenDetails['maskedCC'],
+            __('expires'),
+            $this->tokenDetails['expirationDate']
+        );
+
+        self::assertEquals($formattedString, $this->paypalTokenFormatter->formatPaymentToken($this->paymentTokenMock));
+    }
+
+    public function testFormatPaymentTokenWithWrongData()
+    {
+        unset($this->tokenDetails['type']);
+
+        $this->paymentTokenMock->expects($this->once())
+            ->method('getTokenDetails')
+            ->willReturn(json_encode($this->tokenDetails));
+        self::expectException('\InvalidArgumentException');
+
+        $this->paypalTokenFormatter->formatPaymentToken($this->paymentTokenMock);
+    }
+}
diff --git a/app/code/Magento/Braintree/etc/adminhtml/di.xml b/app/code/Magento/Braintree/etc/adminhtml/di.xml
index bb5763469cad3..cd449c8bce76d 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/di.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/di.xml
@@ -29,6 +29,7 @@
                 <item name="vault" xsi:type="string">Magento\Braintree\Gateway\Request\VaultDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -41,6 +42,7 @@
                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml
index f4e6e17bfca76..c5440db1889f4 100644
--- a/app/code/Magento/Braintree/etc/di.xml
+++ b/app/code/Magento/Braintree/etc/di.xml
@@ -233,6 +233,7 @@
                 <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -291,6 +292,7 @@
                 <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -325,6 +327,7 @@
                 <item name="vault_capture" xsi:type="string">Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder</item>
                 <item name="settlement" xsi:type="string">Magento\Braintree\Gateway\Request\SettlementDataBuilder</item>
                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -347,6 +350,7 @@
                 <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\PayPal\DeviceDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -380,6 +384,7 @@
                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
+                <item name="merchant_account" xsi:type="string">Magento\Braintree\Gateway\Request\MerchantAccountDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
index 9c95b79196e9d..ab01565d7f1e5 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
@@ -24,6 +24,7 @@ define([
             scriptLoaded: false,
             braintree: null,
             selectedCardType: null,
+            checkout: null,
             imports: {
                 onActiveChange: 'active'
             }
@@ -147,6 +148,12 @@ define([
 
             this.disableEventListeners();
 
+            if (self.checkout) {
+                self.checkout.teardown(function () {
+                    self.checkout = null;
+                });
+            }
+
             self.braintree.setup(self.clientToken, 'custom', {
                 id: self.selector,
                 hostedFields: self.getHostedFields(),
@@ -154,7 +161,8 @@ define([
                 /**
                  * Triggered when sdk was loaded
                  */
-                onReady: function () {
+                onReady: function (checkout) {
+                    self.checkout = checkout;
                     $('body').trigger('processStop');
                     self.enableEventListeners();
                 },
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
index e050752dfd2c0..e1f6a1b4c25ce 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
@@ -12,7 +12,7 @@
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
         <label class="label" data-bind="attr: {'for': getCode()}">
             <!-- PayPal Logo -->
-            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}, title: $t('Acceptance Mark')}"
+            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark'), title: $t('Acceptance Mark')}"
                  class="payment-icon"/>
             <!-- PayPal Logo -->
             <span text="getTitle()"></span>
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index 3f19e20de8918..fd2b8efa8eebd 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -56,6 +56,11 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
      */
     private $catalogRuleProcessor;
 
+    /**
+     * @var array
+     */
+    private $optionsPosition = [];
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
@@ -172,6 +177,7 @@ public function getJsonConfig()
             }
             $optionId = $optionItem->getId();
             $options[$optionId] = $this->getOptionItemData($optionItem, $currentProduct, $position);
+            $this->optionsPosition[$position] = $optionId;
 
             // Add attribute default value (if set)
             if ($preConfiguredFlag) {
@@ -368,6 +374,7 @@ private function getConfigData(Product $product, array $options)
         $config = [
             'options' => $options,
             'selected' => $this->selectedOptions,
+            'positions' => $this->optionsPosition,
             'bundleId' => $product->getId(),
             'priceFormat' => $this->localeFormat->getPriceFormat(),
             'prices' => [
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
index 927b8fbff8d85..a28d721cc9a4e 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
@@ -54,7 +54,7 @@ public function create(
     ) {
         $arguments['bundleProduct'] = $bundleProduct;
         $arguments['saleableItem'] = $selection;
-        $arguments['quantity'] = $quantity ? floatval($quantity) : 1.;
+        $arguments['quantity'] = $quantity ? (float)$quantity : 1.;
 
         return $this->objectManager->create(self::SELECTION_CLASS_DEFAULT, $arguments);
     }
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductsOnAdminActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductsOnAdminActionGroup.xml
index e6480fa37870c..84e56e82410ff 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductsOnAdminActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductsOnAdminActionGroup.xml
@@ -25,14 +25,14 @@
         <!-- Select First Simple -->
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickOnFiltersButton"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clearFilters"/>
-        <fillField selector="{{AdminProductGridFilterSection.name}}" userInput="{{simpleProductFirst.name}}" stepKey="fillNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductFirst.name}}" stepKey="fillNameFilter"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="applyFilters"/>
         <click selector="{{AdminProductFormBundleSection.firstRowCheckbox}}" stepKey="selectFirstSimple"/>
 
         <!-- Select Second Simple -->
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickOnFiltersButton2"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clearFilters2"/>
-        <fillField selector="{{AdminProductGridFilterSection.name}}" userInput="{{simpleProductSecond.name}}" stepKey="fillNameFilter2"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductSecond.name}}" stepKey="fillNameFilter2"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="applyFilters2"/>
         <click selector="{{AdminProductFormBundleSection.firstRowCheckbox}}" stepKey="selectSecondSimple"/>
 
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
index 0f36049a86cac..bda1c32d4d66e 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
@@ -280,6 +280,7 @@ public function testGetJsonConfigFixedPriceBundle()
         $this->assertEquals(110, $jsonConfig['prices']['oldPrice']['amount']);
         $this->assertEquals(100, $jsonConfig['prices']['basePrice']['amount']);
         $this->assertEquals(100, $jsonConfig['prices']['finalPrice']['amount']);
+        $this->assertEquals([1], $jsonConfig['positions']);
     }
 
     /**
diff --git a/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js b/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
index d8d4cb1e99b7f..1e7fe6b6673d6 100644
--- a/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
+++ b/app/code/Magento/Bundle/view/frontend/web/js/product-summary.js
@@ -56,8 +56,9 @@ define([
 
             // Clear Summary box
             this.element.html('');
-
-            $.each(this.cache.currentElement.selected, $.proxy(this._renderOption, this));
+            this.cache.currentElement.positions.forEach(function (optionId) {
+                this._renderOption(optionId, this.cache.currentElement.selected[optionId]);
+            }, this);
             this.element
                 .parents(this.options.bundleSummaryContainer)
                 .toggleClass('empty', !this.cache.currentElementCount); // Zero elements equal '.empty' container
diff --git a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
index 40c215ec218a1..7ccaa76b6c7c8 100644
--- a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
@@ -66,15 +66,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $formId = 'guest_checkout';
         $captchaModel = $this->_helper->getCaptcha($formId);
         $checkoutMethod = $this->_typeOnepage->getQuote()->getCheckoutMethod();
-        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_GUEST) {
-            if ($captchaModel->isRequired()) {
-                $controller = $observer->getControllerAction();
-                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
-                ) {
-                    $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-                    $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
-                    $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
-                }
+        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_GUEST
+            && $captchaModel->isRequired()
+        ) {
+            $controller = $observer->getControllerAction();
+            if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
+                $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+                $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
+                $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
             }
         }
 
diff --git a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
index 3bf2ac38debee..8e110a9f4653d 100644
--- a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
@@ -66,15 +66,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $formId = 'register_during_checkout';
         $captchaModel = $this->_helper->getCaptcha($formId);
         $checkoutMethod = $this->_typeOnepage->getQuote()->getCheckoutMethod();
-        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER) {
-            if ($captchaModel->isRequired()) {
-                $controller = $observer->getControllerAction();
-                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
-                ) {
-                    $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-                    $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
-                    $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
-                }
+        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER
+            && $captchaModel->isRequired()
+        ) {
+            $controller = $observer->getControllerAction();
+            if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
+                $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+                $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
+                $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
             }
         }
 
diff --git a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
index 402fc028c5ad0..2de93dcf6b59b 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
@@ -69,18 +69,17 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $controller = $observer->getControllerAction();
         $email = (string)$observer->getControllerAction()->getRequest()->getParam('email');
         $params = $observer->getControllerAction()->getRequest()->getParams();
-        if (!empty($email) && !empty($params)) {
-            if ($captchaModel->isRequired()) {
-                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
-                ) {
-                    $this->_session->setEmail((string)$controller->getRequest()->getPost('email'));
-                    $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-                    $this->messageManager->addError(__('Incorrect CAPTCHA'));
-                    $controller->getResponse()->setRedirect(
-                        $controller->getUrl('*/*/forgotpassword', ['_nosecret' => true])
-                    );
-                }
-            }
+        if (!empty($email)
+            && !empty($params)
+            && $captchaModel->isRequired()
+            && !$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
+        ) {
+            $this->_session->setEmail((string)$controller->getRequest()->getPost('email'));
+            $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+            $this->messageManager->addError(__('Incorrect CAPTCHA'));
+            $controller->getResponse()->setRedirect(
+                $controller->getUrl('*/*/forgotpassword', ['_nosecret' => true])
+            );
         }
 
         return $this;
diff --git a/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php b/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
index 8cc907d7bd12b..924514cd48c5d 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
@@ -52,11 +52,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $formId = 'backend_login';
         $captchaModel = $this->_helper->getCaptcha($formId);
         $login = $observer->getEvent()->getUsername();
-        if ($captchaModel->isRequired($login)) {
-            if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($this->_request, $formId))) {
-                $captchaModel->logAttempt($login);
-                throw new PluginAuthenticationException(__('Incorrect CAPTCHA.'));
-            }
+        if ($captchaModel->isRequired($login)
+            && !$captchaModel->isCorrect($this->captchaStringResolver->resolve($this->_request, $formId))
+        ) {
+            $captchaModel->logAttempt($login);
+            throw new PluginAuthenticationException(__('Incorrect CAPTCHA.'));
         }
         $captchaModel->logAttempt($login);
 
diff --git a/app/code/Magento/Captcha/view/frontend/requirejs-config.js b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
index 3b322711f8b1f..42c80632d3e92 100644
--- a/app/code/Magento/Captcha/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            captcha: 'Magento_Captcha/captcha'
+            captcha: 'Magento_Captcha/js/captcha',
+            'Magento_Captcha/captcha': 'Magento_Captcha/js/captcha'
         }
     }
 };
diff --git a/app/code/Magento/Captcha/view/frontend/web/captcha.js b/app/code/Magento/Captcha/view/frontend/web/js/captcha.js
similarity index 100%
rename from app/code/Magento/Captcha/view/frontend/web/captcha.js
rename to app/code/Magento/Captcha/view/frontend/web/js/captcha.js
diff --git a/app/code/Magento/Captcha/view/frontend/web/onepage.js b/app/code/Magento/Captcha/view/frontend/web/js/onepage.js
similarity index 100%
rename from app/code/Magento/Captcha/view/frontend/web/onepage.js
rename to app/code/Magento/Captcha/view/frontend/web/js/onepage.js
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
index 0026e52e039ef..cd6c5021f0cc9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
@@ -32,10 +32,9 @@ protected function _getElementHtml(AbstractElement $element)
 
         $from = $element->setValue(isset($values[0]) ? $values[0] : null)->getElementHtml();
         $to = $element->setValue(isset($values[1]) ? $values[1] : null)->getElementHtml();
-        return __(
-            '<label class="label"><span>from</span></label>'
-        ) . $from . __(
-            '<label class="label"><span>to</span></label>'
-        ) . $to;
+        return '<label class="label"><span>' . __('from') . '</span></label>'
+        . $from .
+        '<label class="label"><span>' . __('to') . '</span></label>'
+        . $to;
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
index 375b7bff050fe..f1149f15c41d3 100644
--- a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
+++ b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
@@ -121,14 +121,6 @@ protected function getRatio(\Magento\Catalog\Helper\Image $helper)
      */
     public function create()
     {
-        /** @var \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface $simpleOption */
-        $simpleOption = $this->product->getOptionById('simple_product');
-
-        if ($simpleOption !== null) {
-            $optionProduct = $simpleOption->getProduct();
-            $this->setProduct($optionProduct);
-        }
-
         /** @var \Magento\Catalog\Helper\Image $helper */
         $helper = $this->helperFactory->create()
             ->init($this->product, $this->imageId);
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index 940062cd6cb4c..bf0d740fc98fb 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -102,12 +102,12 @@ public function execute()
                     $this->productBuilder->build($this->getRequest())
                 );
                 $this->productTypeManager->processProduct($product);
-
                 if (isset($data['product'][$product->getIdFieldName()])) {
                     throw new \Magento\Framework\Exception\LocalizedException(__('Unable to save product'));
                 }
 
                 $originalSku = $product->getSku();
+                $canSaveCustomOptions = $product->getCanSaveCustomOptions();
                 $product->save();
                 $this->handleImageRemoveError($data, $product->getId());
                 $this->getCategoryLinkManagement()->assignProductToCategories(
@@ -117,9 +117,9 @@ public function execute()
                 $productId = $product->getEntityId();
                 $productAttributeSetId = $product->getAttributeSetId();
                 $productTypeId = $product->getTypeId();
-
-                $this->copyToStores($data, $productId);
-
+                $extendedData = $data;
+                $extendedData['can_save_custom_options'] = $canSaveCustomOptions;
+                $this->copyToStores($extendedData, $productId);
                 $this->messageManager->addSuccessMessage(__('You saved the product.'));
                 $this->getDataPersistor()->clear('catalog_product');
                 if ($product->getSku() != $originalSku) {
@@ -141,19 +141,20 @@ public function execute()
                 );
 
                 if ($redirectBack === 'duplicate') {
+                    $product->unsetData('quantity_and_stock_status');
                     $newProduct = $this->productCopier->copy($product);
                     $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
                 }
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->messageManager->addExceptionMessage($e);
-                $data = $this->persistMediaData($product, $data);
+                $data = isset($product) ? $this->persistMediaData($product, $data) : $data;
                 $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             } catch (\Exception $e) {
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->messageManager->addErrorMessage($e->getMessage());
-                $data = $this->persistMediaData($product, $data);
+                $data = isset($product) ? $this->persistMediaData($product, $data) : $data;
                 $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             }
@@ -238,6 +239,7 @@ protected function copyToStores($data, $productId)
                                     ->setStoreId($copyFrom)
                                     ->load($productId)
                                     ->setStoreId($copyTo)
+                                    ->setCanSaveCustomOptions($data['can_save_custom_options'])
                                     ->setCopyFromView(true)
                                     ->save();
                             }
diff --git a/app/code/Magento/Catalog/CustomerData/CompareProducts.php b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
index 0e688042c615a..afbeab8c9070e 100644
--- a/app/code/Magento/Catalog/CustomerData/CompareProducts.php
+++ b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
@@ -19,6 +19,11 @@ class CompareProducts implements SectionSourceInterface
      */
     protected $productUrl;
 
+    /**
+     * @var \Magento\Catalog\Helper\Output
+     */
+    private $outputHelper;
+
     /**
      * @param \Magento\Catalog\Helper\Product\Compare $helper
      * @param \Magento\Catalog\Model\Product\Url $productUrl
@@ -54,6 +59,7 @@ public function getSectionData()
     protected function getItems()
     {
         $items = [];
+        /** @var \Magento\Catalog\Model\Product $item */
         foreach ($this->helper->getItemCollection() as $item) {
             $items[] = [
                 'id' => $item->getId(),
diff --git a/app/code/Magento/Catalog/Helper/Output.php b/app/code/Magento/Catalog/Helper/Output.php
index 83e9e81cc1071..ecd3fe6a32a83 100644
--- a/app/code/Magento/Catalog/Helper/Output.php
+++ b/app/code/Magento/Catalog/Helper/Output.php
@@ -151,7 +151,7 @@ public function productAttribute($product, $attributeHtml, $attributeName)
                 $attributeHtml = nl2br($attributeHtml);
             }
         }
-        if ($attribute->getIsHtmlAllowedOnFront() && $attribute->getIsWysiwygEnabled()) {
+        if ($attribute->getIsHtmlAllowedOnFront() || $attribute->getIsWysiwygEnabled()) {
             if ($this->_catalogData->isUrlDirectivesParsingAllowed()) {
                 $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
             }
diff --git a/app/code/Magento/Catalog/Model/ImageExtractor.php b/app/code/Magento/Catalog/Model/ImageExtractor.php
index 7888d8de1c2ff..1c20608670672 100644
--- a/app/code/Magento/Catalog/Model/ImageExtractor.php
+++ b/app/code/Magento/Catalog/Model/ImageExtractor.php
@@ -32,12 +32,16 @@ public function process(\DOMElement $mediaNode, $mediaParentTag)
                     continue;
                 }
                 $attributeTagName = $attribute->tagName;
-                if ($attributeTagName === 'background') {
-                    $nodeValue = $this->processImageBackground($attribute->nodeValue);
-                } elseif ($attributeTagName === 'width' || $attributeTagName === 'height') {
-                    $nodeValue = intval($attribute->nodeValue);
+                if ((bool)$attribute->getAttribute('xsi:nil') !== true) {
+                    if ($attributeTagName === 'background') {
+                        $nodeValue = $this->processImageBackground($attribute->nodeValue);
+                    } elseif ($attributeTagName === 'width' || $attributeTagName === 'height') {
+                            $nodeValue = intval($attribute->nodeValue);
+                    } else {
+                        $nodeValue = $attribute->nodeValue;
+                    }
                 } else {
-                    $nodeValue = $attribute->nodeValue;
+                    $nodeValue = null;
                 }
                 $result[$mediaParentTag][$moduleNameImage][Image::MEDIA_TYPE_CONFIG_NODE][$imageId][$attribute->tagName]
                     = $nodeValue;
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php
new file mode 100644
index 0000000000000..ec500ac2f2030
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * {@inheritdoc}
+ */
+class ItemResolverComposite implements ItemResolverInterface
+{
+    /**
+     * @var string[]
+     */
+    private $itemResolvers = [];
+
+    /**
+     * @var ItemResolverInterface[]
+     */
+    private $itemResolversInstances = [];
+
+    /**
+     * @param string[] $itemResolvers
+     */
+    public function __construct(array $itemResolvers)
+    {
+        $this->itemResolvers = $itemResolvers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFinalProduct(ItemInterface $item): ProductInterface
+    {
+        $finalProduct = $item->getProduct();
+
+        foreach ($this->itemResolvers as $resolver) {
+            $resolvedProduct = $this->getItemResolverInstance($resolver)->getFinalProduct($item);
+            if ($resolvedProduct !== $finalProduct) {
+                $finalProduct = $resolvedProduct;
+                break;
+            }
+        }
+
+        return $finalProduct;
+    }
+
+    /**
+     * Get the instance of the item resolver by class name.
+     *
+     * @param string $className
+     * @return ItemResolverInterface
+     */
+    private function getItemResolverInstance(string $className): ItemResolverInterface
+    {
+        if (!isset($this->itemResolversInstances[$className])) {
+            $this->itemResolversInstances[$className] = ObjectManager::getInstance()->get($className);
+        }
+
+        return $this->itemResolversInstances[$className];
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php
new file mode 100644
index 0000000000000..9e6de01bb5112
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Resolves the product from a configured item.
+ *
+ * @api
+ */
+interface ItemResolverInterface
+{
+    /**
+     * Get the final product from a configured item by product type and selection.
+     *
+     * @param ItemInterface $item
+     * @return ProductInterface
+     */
+    public function getFinalProduct(ItemInterface $item): ProductInterface;
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index 9ad0db444eed0..83057ad00c668 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -291,13 +291,7 @@ public function attributesCompare($attributeOne, $attributeTwo)
         $sortOne = $attributeOne->getGroupSortPath() * 1000 + $attributeOne->getSortPath() * 0.0001;
         $sortTwo = $attributeTwo->getGroupSortPath() * 1000 + $attributeTwo->getSortPath() * 0.0001;
 
-        if ($sortOne > $sortTwo) {
-            return 1;
-        } elseif ($sortOne < $sortTwo) {
-            return -1;
-        }
-
-        return 0;
+        return $sortOne <=> $sortTwo;
     }
 
     /**
@@ -938,7 +932,7 @@ public function getForceChildItemQtyChanges($product)
      */
     public function prepareQuoteItemQty($qty, $product)
     {
-        return floatval($qty);
+        return (float)$qty;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php b/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
index 4cc31d98fdfc2..56d1cfda8bce5 100644
--- a/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
+++ b/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
@@ -100,8 +100,13 @@ public function processMediaGallery(ProductInterface $product, array $mediaGalle
             $newEntries = $mediaGalleryEntries;
         }
 
-        $this->processor->clearMediaAttribute($product, array_keys($product->getMediaAttributes()));
         $images = $product->getMediaGallery('images');
+
+        if ($images) {
+            $images = $this->determineImageRoles($product, $images);
+        }
+
+        $this->processor->clearMediaAttribute($product, array_keys($product->getMediaAttributes()));
         if ($images) {
             foreach ($images as $image) {
                 if (!isset($image['removed']) && !empty($image['types'])) {
@@ -112,6 +117,32 @@ public function processMediaGallery(ProductInterface $product, array $mediaGalle
         $this->processEntries($product, $newEntries, $entriesById);
     }
 
+    /**
+     * Ascertain image roles, if they are not set against the gallery entries
+     *
+     * @param ProductInterface $product
+     * @param array $images
+     * @return array
+     */
+    private function determineImageRoles(ProductInterface $product, array $images)
+    {
+        $imagesWithRoles = [];
+        foreach ($images as $image) {
+            if (!isset($image['types'])) {
+                $image['types'] = [];
+                if (isset($image['file'])) {
+                    foreach (array_keys($product->getMediaAttributes()) as $attribute) {
+                        if ($image['file'] == $product->getData($attribute)) {
+                            $image['types'][] = $attribute;
+                        }
+                    }
+                }
+            }
+            $imagesWithRoles[] = $image;
+        }
+        return $imagesWithRoles;
+    }
+
     /**
      * Convert entries into product media gallery data and set to product.
      *
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
index 3699e29f8201a..585da2af529a4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
@@ -112,7 +112,7 @@ public function getCount($range)
         /**
          * Check and set correct variable values to prevent SQL-injections
          */
-        $range = floatval($range);
+        $range = (float)$range;
         if ($range == 0) {
             $range = 1;
         }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
index 849c12238db5a..7ea85cd3f6f10 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
@@ -456,7 +456,7 @@ protected function getSelect($entityIds = null, $type = null)
         $specialFromExpr = "{$specialFrom} IS NULL OR {$specialFromDate} <= {$currentDate}";
         $specialToExpr = "{$specialTo} IS NULL OR {$specialToDate} >= {$currentDate}";
         $specialPriceExpr = $connection->getCheckSql(
-            "{$specialPrice} IS NOT NULL AND {$specialFromExpr} AND {$specialToExpr}",
+            "{$specialPrice} IS NOT NULL AND ({$specialFromExpr}) AND ({$specialToExpr})",
             $specialPrice,
             $maxUnsignedBigint
         );
diff --git a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
index 609255d852da3..2c4e332e71237 100644
--- a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
@@ -22,14 +22,14 @@ class RegularPrice extends AbstractPrice implements BasePriceProviderInterface
     /**
      * Get price value
      *
-     * @return float|bool
+     * @return float
      */
     public function getValue()
     {
         if ($this->value === null) {
             $price = $this->product->getPrice();
             $priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
-            $this->value = $priceInCurrentCurrency ? floatval($priceInCurrentCurrency) : false;
+            $this->value = $priceInCurrentCurrency ? (float)$priceInCurrentCurrency : 0;
         }
         return $this->value;
     }
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index 893978a3b6b3b..a62f3ed09ee1d 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -82,7 +82,7 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         CustomerGroupRetrieverInterface $customerGroupRetriever = null
     ) {
-        $quantity = floatval($quantity) ? $quantity : 1;
+        $quantity = (float)$quantity ? $quantity : 1;
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->customerSession = $customerSession;
         $this->groupManagement = $groupManagement;
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
index e35769bb2019c..b21f29ac79e05 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
@@ -13,15 +13,15 @@
             <argument name="product" defaultValue="product"/>
         </arguments>
         <amOnPage stepKey="navigateProductPage" url="/{{product.name}}.html"/>
-        <click stepKey="addToCart" selector="{{StorefrontProductPageSection.AddToCartBtn}}"/>
-        <waitForElementVisible selector="{{StorefrontProductPageSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <click stepKey="addToCart" selector="{{StorefrontProductPageSection.addToCartBtn}}"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
     </actionGroup>.
     <!--Click Add to Cart button in storefront product page-->
     <actionGroup name="addToCartFromStorefrontProductPage">
         <arguments>
             <argument name="productName"/>
         </arguments>
-        <click selector="{{StorefrontProductPageSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAdding"/>
         <waitForElementNotVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAdded"/>
@@ -30,4 +30,4 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryProductAttributeActionGroup.xml
index 80ff45b7aa6fd..b1300f63d967c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryProductAttributeActionGroup.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <!--Actions to delete category-->
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!--Action to delete product attribute-->
     <actionGroup name="DeleteProductAttribute">
         <arguments>
             <argument name="productAttribute"/>
@@ -17,7 +17,7 @@
         <waitForPageLoad time="30" stepKey="waitForProductAttributesGridPageLoad"/>
         <click selector="{{AdminProductAttributeGridSection.resetFilter}}" stepKey="resetFilter"/>
         <fillField selector="{{AdminProductAttributeGridSection.gridFilterFrontEndLabel}}"
-            userInput="{{productAttribute.default_label}}" stepKey="fillAttributeDefaultLabelInput"/>
+                   userInput="{{productAttribute.default_label}}" stepKey="fillAttributeDefaultLabelInput"/>
         <click selector="{{AdminProductAttributeGridSection.search}}" stepKey="searchForAttribute"/>
         <click selector="{{AdminProductAttributeGridSection.firstRow}}" stepKey="clickFirstRow"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 9a56e1387522a..ee7e3c82564b7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -30,6 +30,20 @@
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
     </actionGroup>
 
+    <!--Fill main fields in create product form-->
+    <actionGroup name="fillMainProductForm">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="fillProductQty"/>
+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="selectStockStatus"/>
+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has weight" stepKey="selectWeight"/>
+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="fillProductWeight"/>
+    </actionGroup>
+
     <!--Fill main fields in create product form with no weight, useful for virtual and downloadable products -->
     <actionGroup name="fillMainProductFormNoWeight">
         <arguments>
@@ -50,6 +64,19 @@
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
     </actionGroup>
 
+    <!--Upload image for product-->
+    <actionGroup name="addProductImage">
+        <arguments>
+            <argument name="image" defaultValue="ProductImage"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
+        <waitForPageLoad time="30" stepKey="waitForPageRefresh"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.imageUploadButton}}" stepKey="seeImageSectionIsReady"/>
+        <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="{{image.file}}" stepKey="uploadFile"/>
+        <waitForElementNotVisible selector="{{AdminProductImagesSection.uploadProgressBar}}" stepKey="waitForUpload"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="waitForThumbnail"/>
+    </actionGroup>
+
     <!--Add special price to product in Admin product page-->
     <actionGroup name="AddSpecialPriceToProductActionGroup">
         <arguments>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
new file mode 100644
index 0000000000000..c095faa73d9b1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!--Add a custom option of type "file" to a product-->
+    <actionGroup name="AddProductCustomOptionFile">
+        <arguments>
+            <argument name="option" defaultValue="ProductOptionFile"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" stepKey="waitForOption"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{option.title}}" stepKey="fillTitle"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}" stepKey="openTypeSelect"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionType('File')}}" stepKey="selectTypeFile"/>
+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" stepKey="waitForElements"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" userInput="{{option.price}}" stepKey="fillPrice"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductsOnAdminActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductsOnAdminActionGroup.xml
index a1842645991f8..15c1a8079d4ac 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductsOnAdminActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductsOnAdminActionGroup.xml
@@ -35,7 +35,7 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickOnFiltersButton"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clearFilters"/>
-        <fillField selector="{{AdminProductGridFilterSection.name}}" userInput="{{product.name}}" stepKey="fillNameFieldInFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillNameFieldInFilter"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="applyFilters"/>
         <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="clickMulticheckDropDown"/>
         <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllFilteredProducts"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
index 921a44c7f45c3..4938b6a9592f1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
@@ -12,8 +12,8 @@
         <arguments>
             <argument name="productName"/>
         </arguments>
-        <click selector="{{StorefrontProductPageSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{StorefrontProductPageSection.SuccessMsg}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
+        <see selector="{{StorefrontProductPageSection.successMsg}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
index 1852f205c49ef..b585d160dde73 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -16,7 +16,7 @@
         </arguments>
         <seeInCurrentUrl url="/{{category.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
         <seeInTitle userInput="{{category.name}}" stepKey="assertCategoryNameInTitle"/>
-        <see userInput="{{category.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
+        <see userInput="{{category.name}}" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="assertCategoryName"/>
         <see userInput="{{productCount}}" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCount"/>
     </actionGroup>
 
@@ -25,9 +25,9 @@
         <arguments>
             <argument name="product"/>
         </arguments>
-        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName(product.name)}}" stepKey="assertProductName"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productTitleByName(product.name)}}" stepKey="assertProductName"/>
         <see userInput="${{product.price}}.00" selector="{{StorefrontCategoryProductSection.ProductPriceByName(product.name)}}" stepKey="AssertProductPrice"/>
         <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
-        <seeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
+        <seeElement selector="{{StorefrontCategoryProductSection.productAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryCheckActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryCheckActionGroup.xml
index e3179117b3462..e560e7facc7fd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryCheckActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryCheckActionGroup.xml
@@ -15,7 +15,7 @@
         </arguments>
         <amOnPage url="/{{categoryEntity.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{categoryEntity.name_lwr}}" stepKey="assertCategoryOnStorefront"/>
+        <see selector="{{StorefrontCategoryMainSection.categoryTitle}}" userInput="{{categoryEntity.name_lwr}}" stepKey="assertCategoryOnStorefront"/>
         <seeInTitle userInput="{{categoryEntity.name}}" stepKey="seeCategoryNameInTitle"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 13d9dcffb007f..14268fed8ff6b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -105,6 +105,24 @@
         <data key="file">magento-logo.png</data>
         <data key="fileName">magento-logo</data>
     </entity>
+    <entity name="MagentoLogo" type="image">
+        <data key="title" unique="suffix">MagentoLogo</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="file">magento-logo.png</data>
+        <data key="filename">magento-logo</data>
+        <data key="file_extension">png</data>
+    </entity>
+    <entity name="TestImageNew" type="image">
+        <data key="title" unique="suffix">magento-again</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="file">magento-again.jpg</data>
+        <data key="filename">magento-again</data>
+        <data key="file_extension">jpg</data>
+    </entity>
     <entity name="productWithDescription" type="product">
         <data key="sku" unique="suffix">testProductWithDescriptionSku</data>
         <data key="type_id">simple</data>
@@ -201,4 +219,8 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
+    <entity name="ProductWithOptions2" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
index 1028988146c86..ae8bcf0893ed0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
@@ -48,6 +48,15 @@
         <requiredEntity type="product_option_value">ProductOptionValueDropdown1</requiredEntity>
         <requiredEntity type="product_option_value">ProductOptionValueDropdown2</requiredEntity>
     </entity>
+    <entity name="ProductOptionDropDownWithLongValuesTitle" type="product_option">
+        <var key="product_sku" entityType="product" entityKey="sku" />
+        <data key="title">OptionDropDownWithLongTitles</data>
+        <data key="type">drop_down</data>
+        <data key="sort_order">4</data>
+        <data key="is_require">true</data>
+        <requiredEntity type="product_option_value">ProductOptionValueDropdownLongTitle1</requiredEntity>
+        <requiredEntity type="product_option_value">ProductOptionValueDropdownLongTitle2</requiredEntity>
+    </entity>
     <entity name="ProductOptionRadiobutton" type="product_option">
         <var key="product_sku" entityType="product" entityKey="sku" />
         <data key="title">OptionRadioButtons</data>
@@ -101,4 +110,4 @@
         <data key="price">0.00</data>
         <data key="price_type">percent</data>
     </entity>
-</entities>
\ No newline at end of file
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
index 7ad5428794fb5..82063a771d2a3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
@@ -49,4 +49,16 @@
         <data key="price">2</data>
         <data key="price_type">fixed</data>
     </entity>
-</entities>
\ No newline at end of file
+    <entity name="ProductOptionValueDropdownLongTitle1" type="product_option_value">
+        <data key="title">Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111</data>
+        <data key="sort_order">1</data>
+        <data key="price">10</data>
+        <data key="price_type">fixed</data>
+    </entity>
+    <entity name="ProductOptionValueDropdownLongTitle2" type="product_option_value">
+        <data key="title">Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj22222Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj22222</data>
+        <data key="sort_order">2</data>
+        <data key="price">20</data>
+        <data key="price_type">percent</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCatalogProductPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCatalogProductPage.xml
new file mode 100644
index 0000000000000..e5d3704bafcd1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCatalogProductPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  /**
+   * Copyright © Magento, Inc. All rights reserved.
+   * See COPYING.txt for license details.
+   */
+ -->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminCatalogProductPage" url="/catalog/product/" area="admin" module="Magento_Catalog">
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeEditPage.xml
new file mode 100644
index 0000000000000..3d7e79343155b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeEditPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminProductAttributeEditPage" url="catalog/product_attribute/edit/" area="admin" module="Magento_Catalog">
+        <section name="AdminProductAttributeEditSection"/>
+        <section name="AdminConfirmationModalSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeEditSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeEditSection.xml
index e8a7d0cd4f33b..798832f707bf0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeEditSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeEditSection.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductAttributeEditSection">
         <element name="deleteAttribute" type="button" selector="#delete" timeout="30"/>
     </section>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
index 96d03815df286..bb944270a10a9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
@@ -15,5 +15,6 @@
         <element name="search" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
         <element name="resetFilter" type="button" selector="button[data-action='grid-filter-reset']" timeout="30"/>
         <element name="firstRow" type="button" selector="//*[@id='attributeGrid_table']/tbody/tr[1]"/>
+        <element name="attributeCodeFilterInput" type="input" selector=".admin__data-grid-filters input[name='attribute_code']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
index 6c179f499b910..c59650cfee6c0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -10,16 +10,24 @@
           xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductCustomizableOptionsSection">
         <element name="checkIfCustomizableOptionsTabOpen" type="text" selector="//span[text()='Customizable Options']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
-        <element name="customezableOptions" type="text" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Customizable Options']" timeout="30"/>
+        <element name="customizableOptions" type="text" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Customizable Options']"/>
         <element name="useDefaultOptionTitle" type="text" selector="[data-index='options'] tr.data-row [data-index='title'] [name^='options_use_default']"/>
         <element name="useDefaultOptionValueTitleByIndex" type="text" selector="[data-index='options'] [data-index='values'] tr[data-repeat-index='{{var1}}'] [name^='options_use_default']" parameterized="true"/>
         <element name="addOptionBtn" type="button" selector="button[data-index='button_add']"/>
-        <element name="fillOptionTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Title']/parent::label/parent::div//input[@class='admin__control-text']" parameterized="true"/>
-        <element name="checkSelect" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Type']/parent::label/parent::div//div[@data-role='selected-option']" parameterized="true"/>
+        <element name="fillOptionTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//label[text()='Option Title']/parent::span/parent::div//input[@class='admin__control-text']" parameterized="true"/>
+        <element name="checkSelect" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//label[text()='Option Type']/parent::span/parent::div//div[@data-role='selected-option']" parameterized="true"/>
         <element name="checkDropDown" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//parent::label/parent::div//li[@class='admin__action-multiselect-menu-inner-item']//label[text()='Drop-down']" parameterized="true"/>
         <element name="clickAddValue" type="button" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tfoot//button" parameterized="true"/>
-        <element name="fillOptionValueTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='Title']/parent::label/parent::div//div[@class='admin__field-control']/input" parameterized="true"/>
+        <element name="fillOptionValueTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//label[text()='Title']/parent::span/parent::div//div[@class='admin__field-control']/input" parameterized="true"/>
         <element name="fillOptionValuePrice" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='Price']/parent::label/parent::div//div[@class='admin__control-addon']/input" parameterized="true"/>
-        <element name="clickSelectPriceType" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody//tr[@data-repeat-index='{{var2}}']//span[text()='Price Type']/parent::label/parent::div//select" parameterized="true"/>
+        <element name="clickSelectPriceType" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody//tr[@data-repeat-index='{{var2}}']//label[text()='Price Type']/parent::span/parent::div//select" parameterized="true"/>
+        <!-- Elements that make it easier to select the most recently added element -->
+        <element name="lastOptionTitle" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, '_required')]//input" />
+        <element name="lastOptionTypeParent" type="block" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__action-multiselect-text')]" />
+        <!-- var 1 represents the option type that you want to select, i.e "radio buttons" -->
+        <element name="optionType" type="block" selector="//*[@data-index='custom_options']//label[text()='{{var1}}'][ancestor::*[contains(@class, '_active')]]" parameterized="true" />
+        <element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][price]']"/>
+        <element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][price_type]']"/>
+        <element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][file_extension]']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 61a57914bc195..5f33eb6f52edf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -15,6 +15,8 @@
         <element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
         <element name="productNameUseDefault" type="checkbox" selector="input[name='use_default[name]']"/>
         <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
+        <element name="enableProductAttributeLabel" type="text" selector="[data-index='status'] .admin__field-label label"/>
+        <element name="enableProductAttributeLabelWrapper" type="text" selector="[data-index='status'] .admin__field-label"/>
         <element name="productStatus" type="checkbox" selector="input[name='product[status]']"/>
         <element name="productStatusUseDefault" type="checkbox" selector="input[name='use_default[status]']"/>
         <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
@@ -31,7 +33,7 @@
         <element name="visibilityUseDefault" type="checkbox" selector="//input[@name='use_default[visibility]']"/>
         <element name="divByDataIndex" type="input" selector="div[data-index='{{var}}']" parameterized="true"/>
         <element name="attributeSetSearchCount" type="text" selector="div[data-index='attribute_set_id'] .admin__action-multiselect-search-count"/>
-        <element name="attributeLabelByText" type="text" selector="//*[@class='admin__field']//span[text()='{{attributeLabel}}']" parameterized="true"/>
+        <element name="attributeLabelByText" type="text" selector="//*[@class='admin__field']//label[text()='{{attributeLabel}}']" parameterized="true"/>
         <element name="addAttributeBtn" type="button" selector="#addAttribute"/>
     </section>
     <section name="ProductInWebsitesSection">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index ce9e9879b67ed..a02da2df51702 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -17,7 +17,7 @@
         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
         <element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
         <element name="skuFilter" type="input" selector="input.admin__control-text[name='sku']"/>
-        <element name="name" type="input" selector="input.admin__control-text[name='name']"/>
+        <element name="nameFilter" type="input" selector="input.admin__control-text[name='name']"/>
         <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
         <element name="name" type="input" selector="input.admin__control-text[name='name']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
index 80a280c7e8726..c4ce9d9c96d78 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -26,5 +26,6 @@
         <element name="bulkActionOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/>
         <element name="productGridNameProduct" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
         <element name="adminImgGridThumbnail" type="text" selector="img.admin__control-thumbnail[src*='/{{var1}}']" parameterized="true"/>
+        <element name="selectRowBasedOnName" type="input" selector="//td/div[text()='{{var1}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
index d4fcd20a9d725..7269f8023d629 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryMainSection">
-        <element name="CategoryTitle" type="text" selector="#page-title-heading span"/>
+        <element name="categoryTitle" type="text" selector="#page-title-heading span"/>
         <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
         <element name="specifiedProductItemInfo" type="button" selector="//a[@class='product-item-link'][contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index 4aa8924548b75..1de234c512339 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -14,7 +14,7 @@
         <element name="ProductInfoByNumber" type="text" selector="//main//li[{{var1}}]//div[@class='product-item-info']" parameterized="true"/>
         <element name="ProductAddToCompareByNumber" type="text" selector="//main//li[{{var1}}]//a[contains(@class, 'tocompare')]" parameterized="true"/>
 
-        <element name="ProductTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="productTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="ProductPriceByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
         <element name="ProductImageByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
         <element name="ProductInfoByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//div[@class='product-item-info']" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
index d198961befb45..c960f8432e64d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
@@ -10,11 +10,13 @@
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductPageSection">
         <element name="QtyInput" type="button" selector="input.input-text.qty"/>
-        <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
-        <element name="SuccessMsg" type="button" selector="div.message-success"/>
-        <element name="AddToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/>
+        <element name="addToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <element name="successMsg" type="button" selector="div.message-success"/>
+        <element name="addToWishlist" type="button" selector="a.action.towishlist" timeout="30"/>
         <element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
         <element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/>
         <element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/>
+        <element name="alertMessage" type="text" selector=".page.messages [role=alert]"/>
+        <element name="messagesBlock" type="text" selector=".page.messages"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
index 2dac0d483a1ba..6f477a5325e64 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
@@ -35,6 +35,6 @@
         <!-- Literal URL below, need to refactor line + StorefrontCategoryPage when support for variable URL is implemented-->
         <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
         <seeInTitle userInput="{{SimpleSubCategory.name}}" stepKey="assertTitle"/>
-        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="assertInfo1"/>
+        <see selector="{{StorefrontCategoryMainSection.categoryTitle}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="assertInfo1"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
index 1deac4262ff7b..2a761f192f29f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
@@ -40,11 +40,10 @@
 
         <!--Create a Simple Product -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
-        <waitForPageLoad time="30" stepKey="waitForProductsGridPageLoad"/>
+        <waitForPageLoad stepKey="waitForProductsGridPageLoad"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
         <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
-        <!-- Need to wait because fields are loaded a little bit later then it starts to fill them -->
-        <waitForElementVisible selector="{{AdminProductFormSection.productName}}" stepKey="waitForNameFieldVisible"/>
+        <waitForPageLoad stepKey="waitForPageProductFormLoad"/>
         <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillProductName"/>
         <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillProductSKU"/>
         <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillProductPrice"/>
@@ -54,7 +53,7 @@
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsites"/>
         <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/>
+        <waitForPageLoad stepKey="waitForProductSave"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
 
         <!-- switch to the second store view -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
index ab8f272028f92..2e82f89b6fb87 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
@@ -54,7 +54,7 @@
         <amOnPage url="" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForFrontendLoad"/>
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="clickCategory"/>
-        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="assertCategoryOnStorefront"/>
+        <see selector="{{StorefrontCategoryMainSection.categoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="assertCategoryOnStorefront"/>
         <seeInTitle userInput="{{_defaultCategory.name}}" stepKey="seeCategoryNameInTitle"/>
         <seeInCurrentUrl stepKey="verifyUrlKey" url="{{_defaultCategory.name_lwr}}-hattest.html"/>
         <!-- Update SEO key to original, uncheck "Create Redirect", confirm in frontend -->
@@ -71,7 +71,7 @@
         <amOnPage url="" stepKey="goToStorefrontAfterOriginalSeoKey"/>
         <waitForPageLoad stepKey="waitForFrontendLoadAfterOriginalSeoKey"/>
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="clickCategoryAfterOriginalSeoKey"/>
-        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="assertCategoryOnStorefront2"/>
+        <see selector="{{StorefrontCategoryMainSection.categoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="assertCategoryOnStorefront2"/>
         <seeInTitle userInput="{{_defaultCategory.name}}" stepKey="seeCategoryNameInTitle2"/>
         <seeInCurrentUrl url="{{_defaultCategory.name_lwr}}.html" stepKey="verifyUrlKeyAfterOriginalSeoKey"/>
     </test>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
index 328f99df77ace..2599853f768bc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
@@ -53,7 +53,7 @@
         <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
 
         <!--Click Customizable Options-->
-        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
         <waitForPageLoad stepKey="waitAfterAddOption"/>
         <fillField selector="input[name='product[options][0][title]']" userInput="Radio Option" stepKey="fillOptionTitle"/>
@@ -85,7 +85,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForProductPagetoSaveAgain"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
 
-        <click selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}" stepKey="openCustomOptionsSection"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection"/>
         <seeNumberOfElements selector=".admin__dynamic-rows[data-index='values'] tr.data-row" userInput="3" stepKey="see4RowsOfOptions"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest.xml
index 25ad235da8045..325a6028e4464 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest.xml
@@ -31,10 +31,10 @@
         <!--Check product in category listing-->
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="goToCategoryPage"/>
         <seeElement selector="{{StorefrontCategoryProductSection.ProductImageByNameAndSrc($$createProduct.name$$, $$createProduct.product[media_gallery_entries][0][content][name]$$)}}" stepKey="seeCorrectImageCategoryPage"/>
-        <see selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createProduct.name$$)}}" userInput="$$createProduct.name$$" stepKey="seeCorrectNameCategoryPage"/>
+        <see selector="{{StorefrontCategoryProductSection.productTitleByName($$createProduct.name$$)}}" userInput="$$createProduct.name$$" stepKey="seeCorrectNameCategoryPage"/>
         <see selector="{{StorefrontCategoryProductSection.ProductPriceByName($$createProduct.name$$)}}" userInput="$$createProduct.price$$" stepKey="seeCorrectPriceCategoryPage"/>
         <!--Open product display page-->
-        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createProduct.name$$)}}" stepKey="clickProductToGoProductPage"/>
+        <click selector="{{StorefrontCategoryProductSection.productTitleByName($$createProduct.name$$)}}" stepKey="clickProductToGoProductPage"/>
         <waitForPageLoad stepKey="waitForProductDisplayPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createProduct.name$$" stepKey="seeCorrectName"/>
         <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createProduct.sku$$" stepKey="seeCorrectSku"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
index 07fa0548128fb..c2b502fd43f34 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
@@ -46,7 +46,7 @@
         <amOnPage url="{{StorefrontProductPage.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="goProductPageOnStorefront1"/>
         <!-- View Simple Product 1 -->
         <comment userInput="View simple product 1" stepKey="commentViewSimpleProduct1" after="goProductPageOnStorefront1"/>
-        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="commentViewSimpleProduct1"/>
+        <click selector="{{StorefrontCategoryProductSection.productTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="commentViewSimpleProduct1"/>
         <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct1Viewloaded" after="browseClickCategorySimpleProduct1View"/>
         <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="compareAddSimpleProduct1ToCompare">
             <argument name="productVar" value="$$createSimpleProduct1$$"/>
@@ -55,7 +55,7 @@
         <amOnPage url="{{StorefrontProductPage.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="goProductPageOnStorefront2"/>
         <!-- View Simple Product 2 -->
         <comment userInput="View simple product 2" stepKey="commentViewSimpleProduct2" after="goProductPageOnStorefront2"/>
-        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View" after="commentViewSimpleProduct2"/>
+        <click selector="{{StorefrontCategoryProductSection.productTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View" after="commentViewSimpleProduct2"/>
         <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct2Viewloaded" after="browseClickCategorySimpleProduct2View"/>
         <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="compareAddSimpleProduct2ToCompare">
             <argument name="productVar" value="$$createSimpleProduct2$$"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
index 648904d778843..bf4d38f79a920 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -78,7 +78,7 @@
 
         <!-- Update Product with Option Value DropDown 1-->
 
-        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="checkAddOption1"/>
         <waitForPageLoad time="10" stepKey="waitForPageLoad7"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('New Option')}}" userInput="Custom Options 1" stepKey="fillOptionTitle1"/>
@@ -105,7 +105,7 @@
         <!-- Open tab Customizable Options -->
 
         <waitForPageLoad time="10" stepKey="waitForPageLoad2"/>
-        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
 
         <!-- Update Option Customizable Options and Option Value 1-->
 
@@ -269,7 +269,7 @@
         <!-- Open tab Customizable Options -->
 
         <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
-        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses4" />
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses4" />
 
         <!-- Update Option Customizable Options and Option Value 1-->
 
@@ -291,4 +291,4 @@
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeProductOptionDropDownOptionTitle3"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option2')}}" stepKey="seeProductOptionDropDownOptionTitle4"/>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
new file mode 100644
index 0000000000000..d5dd0d8a23806
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle">
+        <annotations>
+            <group value="Catalog"/>
+            <title value="Admin should be able to see the full title of the selected custom option value in the order"/>
+            <description value="Admin should be able to see the full title of the selected custom option value in the order"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93340"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <!--Create Simple Product with Custom Options-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">17</field>
+            </createData>
+            <updateData createDataKey="createProduct" entity="ProductWithOptions2" stepKey="updateProductWithOptions"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+        <!-- Login Customer Storefront -->
+        <actionGroup ref="CustomerLoginOnStorefront" stepKey="customerLogin">
+            <argument name="customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <!-- Checking the correctness of displayed prices for user parameters -->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsDropDown(ProductOptionDropDownWithLongValuesTitle.title, ProductOptionValueDropdownLongTitle1.price)}}" stepKey="checkDropDownProductOption"/>
+        <!-- Adding items to the checkout -->
+        <selectOption userInput="{{ProductOptionValueDropdownLongTitle1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionDropDownWithLongValuesTitle.title)}}" stepKey="seeProductOptionDropDown"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="finalProductPrice"/>
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemName($$createProduct.name$$)}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" visible="false" stepKey="exposeProductOptions"/>
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <!-- Place Order -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPayment"/>
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+        <!-- Login to Admin and open Order -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <!-- Checking the correctness of displayed custom options for user parameters on Order -->
+        <dontSee selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="dontSeeAdminOrderProductOptionValueDropdown1"/>
+        <grabTextFrom selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="productOptionValueText"/>
+        <assertEquals stepKey="checkProductOptionValue">
+            <actualResult type="variable">productOptionValueText</actualResult>
+            <expectedResult type="string">Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 ...</expectedResult>
+        </assertEquals>
+        <moveMouseOver selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="hoverProduct"/>
+        <grabTextFrom selector="{{AdminOrderItemsOrderedSection.productNameOptions}} span:nth-child(2)" stepKey="productOptionValueTruncatedText"/>
+        <assertEquals stepKey="checkProductOptionTruncatedValue">
+            <actualResult type="variable">productOptionValueTruncatedText</actualResult>
+            <expectedResult type="string">11Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111</expectedResult>
+        </assertEquals>
+        <seeElement selector="{{AdminOrderItemsOrderedSection.productNameOptions}} span:nth-child(2)" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
index 39ddd8768fedc..8612858960c8c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
@@ -303,14 +303,8 @@ public function testCreateWithSimpleProduct($data, $expected)
         $imageId = 'test_image_id';
 
         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $simpleOptionMock = $this->createMock(\Magento\Wishlist\Model\Item\Option::class);
         $simpleProductMock = $this->createMock(\Magento\Catalog\Model\Product::class);
 
-        $productMock->expects($this->once())->method('getOptionById')
-            ->with('simple_product')->willReturn($simpleOptionMock);
-
-        $simpleOptionMock->expects($this->once())->method('getProduct')->willReturn($simpleProductMock);
-
         $helperMock = $this->createMock(\Magento\Catalog\Helper\Image::class);
         $helperMock->expects($this->once())
             ->method('init')
diff --git a/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php b/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
new file mode 100644
index 0000000000000..e30ddda0b70b9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\CustomerData;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\CustomerData\CompareProducts;
+use Magento\Catalog\Helper\Output;
+use Magento\Catalog\Helper\Product\Compare;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Url;
+use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class CompareProductsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CompareProducts
+     */
+    private $model;
+
+    /**
+     * @var Compare|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperMock;
+
+    /**
+     * @var Url|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productUrlMock;
+
+    /**
+     * @var Output|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $outputHelperMock;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var array
+     */
+    private $productValueMap = [
+        'id' => 'getId',
+        ProductInterface::NAME => 'getName'
+    ];
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->helperMock = $this->getMockBuilder(Compare::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productUrlMock = $this->getMockBuilder(Url::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->outputHelperMock = $this->getMockBuilder(Output::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->model = $this->objectManagerHelper->getObject(
+            CompareProducts::class,
+            [
+                'helper' => $this->helperMock,
+                'productUrl' => $this->productUrlMock,
+                'outputHelper' => $this->outputHelperMock
+            ]
+        );
+    }
+
+    /**
+     * Prepare compare items collection.
+     *
+     * @param array $items
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getItemCollectionMock(array $items) : \PHPUnit_Framework_MockObject_MockObject
+    {
+        $itemCollectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $itemCollectionMock->expects($this->any())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($items));
+
+        return $itemCollectionMock;
+    }
+
+    /**
+     * Prepare product mocks objects and add corresponding method mocks for helpers.
+     *
+     * @param array $dataSet
+     * @return array
+     */
+    private function prepareProductsWithCorrespondingMocks(array $dataSet) : array
+    {
+        $items = [];
+        $urlMap = [];
+        $outputMap = [];
+        $helperMap = [];
+
+        $count = count($dataSet);
+
+        foreach ($dataSet as $data) {
+            $item = $this->getProductMock($data);
+            $items[] = $item;
+
+            $outputMap[] = [$item, $data['name'], 'name', 'productName#' . $data['id']];
+            $helperMap[] = [$item, 'http://remove.url/' . $data['id']];
+            $urlMap[] = [$item, [], 'http://product.url/' . $data['id']];
+        }
+
+        $this->productUrlMock->expects($this->exactly($count))
+            ->method('getUrl')
+            ->will($this->returnValueMap($urlMap));
+
+        $this->outputHelperMock->expects($this->exactly($count))
+            ->method('productAttribute')
+            ->will($this->returnValueMap($outputMap));
+
+        $this->helperMock->expects($this->exactly($count))
+            ->method('getPostDataRemove')
+            ->will($this->returnValueMap($helperMap));
+
+        return $items;
+    }
+
+    /**
+     * Prepare mock of product object.
+     *
+     * @param array $data
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getProductMock(array $data) : \PHPUnit_Framework_MockObject_MockObject
+    {
+        $product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        foreach ($data as $index => $value) {
+            $product->expects($this->once())
+                ->method($this->productValueMap[$index])
+                ->willReturn($value);
+        }
+
+        return $product;
+    }
+
+    public function testGetSectionData()
+    {
+        $dataSet = [
+            ['id' => 1, 'name' => 'product#1'],
+            ['id' => 2, 'name' => 'product#2'],
+            ['id' => 3, 'name' => 'product#3']
+        ];
+
+        $count = count($dataSet);
+
+        $this->helperMock->expects($this->once())
+            ->method('getItemCount')
+            ->willReturn($count);
+
+        $items = $this->prepareProductsWithCorrespondingMocks($dataSet);
+
+        $itemCollectionMock = $this->getItemCollectionMock($items);
+
+        $this->helperMock->expects($this->once())
+            ->method('getItemCollection')
+            ->willReturn($itemCollectionMock);
+
+        $this->helperMock->expects($this->once())
+            ->method('getListUrl')
+            ->willReturn('http://list.url');
+
+        $this->assertEquals(
+            [
+                'count' => $count,
+                'countCaption' =>  __('%1 items', $count),
+                'listUrl' => 'http://list.url',
+                'items' => [
+                    [
+                        'id' => 1,
+                        'product_url' => 'http://product.url/1',
+                        'name' => 'productName#1',
+                        'remove_url' => 'http://remove.url/1'
+                    ],
+                    [
+                        'id' => 2,
+                        'product_url' => 'http://product.url/2',
+                        'name' => 'productName#2',
+                        'remove_url' => 'http://remove.url/2'
+                    ],
+                    [
+                        'id' => 3,
+                        'product_url' => 'http://product.url/3',
+                        'name' => 'productName#3',
+                        'remove_url' => 'http://remove.url/3'
+                    ]
+                ]
+            ],
+            $this->model->getSectionData()
+        );
+    }
+
+    public function testGetSectionDataNoItems()
+    {
+        $count = 0;
+
+        $this->helperMock->expects($this->once())
+            ->method('getItemCount')
+            ->willReturn($count);
+
+        $this->helperMock->expects($this->never())
+            ->method('getItemCollection');
+
+        $this->helperMock->expects($this->once())
+            ->method('getListUrl')
+            ->willReturn('http://list.url');
+
+        $this->assertEquals(
+            [
+                'count' => $count,
+                'countCaption' =>  __('%1 items', $count),
+                'listUrl' => 'http://list.url',
+                'items' => []
+            ],
+            $this->model->getSectionData()
+        );
+    }
+
+    public function testGetSectionDataSingleItem()
+    {
+        $count = 1;
+
+        $this->helperMock->expects($this->once())
+            ->method('getItemCount')
+            ->willReturn($count);
+
+        $items = $this->prepareProductsWithCorrespondingMocks(
+            [
+                [
+                    'id' => 12345,
+                    'name' => 'SingleProduct'
+                ]
+            ]
+        );
+
+        $itemCollectionMock = $this->getItemCollectionMock($items);
+
+        $this->helperMock->expects($this->once())
+            ->method('getItemCollection')
+            ->willReturn($itemCollectionMock);
+
+        $this->helperMock->expects($this->once())
+            ->method('getListUrl')
+            ->willReturn('http://list.url');
+
+        $this->assertEquals(
+            [
+                'count' => 1,
+                'countCaption' =>  __('1 item'),
+                'listUrl' => 'http://list.url',
+                'items' => [
+                    [
+                        'id' => 12345,
+                        'product_url' => 'http://product.url/12345',
+                        'name' => 'productName#12345',
+                        'remove_url' => 'http://remove.url/12345'
+                    ]
+                ]
+            ],
+            $this->model->getSectionData()
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
index f2c77627e38d0..8ca23df31cdee 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
@@ -152,7 +152,7 @@ public function testGetMaxPrice()
         $this->productCollection->expects($this->once())
             ->method('getMaxPrice')
             ->will($this->returnValue($maxPrice));
-        $this->assertSame(floatval($maxPrice), $this->target->getMaxPrice());
+        $this->assertSame((float)$maxPrice, $this->target->getMaxPrice());
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
index c3096770729a6..f38e2a0d426d1 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
@@ -90,14 +90,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->websiteRepositoryMock = $this->getMockBuilder(\Magento\Store\Api\WebsiteRepositoryInterface::class)
-            ->setMethods(['getList', 'getDefault'])
+            ->setMethods(['getDefault'])
             ->getMockForAbstractClass();
         $this->websiteRepositoryMock->expects($this->any())
             ->method('getDefault')
             ->willReturn($this->websiteMock);
-        $this->websiteRepositoryMock->expects($this->any())
-            ->method('getList')
-            ->willReturn([$this->websiteMock, $this->secondWebsiteMock]);
         $this->groupRepositoryMock = $this->getMockBuilder(\Magento\Store\Api\GroupRepositoryInterface::class)
             ->setMethods(['getList'])
             ->getMockForAbstractClass();
@@ -111,8 +108,10 @@ protected function setUp()
             ->method('getWebsiteIds')
             ->willReturn($this->assignedWebsites);
         $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->setMethods(['isSingleStoreMode'])
+            ->setMethods(['isSingleStoreMode', 'getWebsites'])
             ->getMockForAbstractClass();
+        $this->storeManagerMock->method('getWebsites')
+            ->willReturn([$this->websiteMock, $this->secondWebsiteMock]);
         $this->storeManagerMock->expects($this->any())
             ->method('isSingleStoreMode')
             ->willReturn(false);
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
index bab36ce5fc4d8..8166c42a5a8b1 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
@@ -175,9 +175,11 @@ protected function getFieldsForFieldset()
         $label = __('Websites');
 
         $defaultWebsiteId = $this->websiteRepository->getDefault()->getId();
+        $isOnlyOneWebsiteAvailable = count($websitesList) === 1;
         foreach ($websitesList as $website) {
             $isChecked = in_array($website['id'], $websiteIds)
-                || ($defaultWebsiteId == $website['id'] && $isNewProduct);
+                || ($defaultWebsiteId == $website['id'] && $isNewProduct)
+                || $isOnlyOneWebsiteAvailable;
             $children[$website['id']] = [
                 'arguments' => [
                     'data' => [
@@ -397,8 +399,9 @@ protected function getWebsitesList()
         $this->websitesList = [];
         $groupList = $this->groupRepository->getList();
         $storesList = $this->storeRepository->getList();
+        $websiteList = $this->storeManager->getWebsites(true);
 
-        foreach ($this->websiteRepository->getList() as $website) {
+        foreach ($websiteList as $website) {
             $websiteId = $website->getId();
             if (!$websiteId) {
                 continue;
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 98e0e29f4f3a6..eec0b8597f6e6 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -70,6 +70,7 @@
     <preference for="Magento\Catalog\Api\Data\ProductRender\FormattedPriceInfoInterface" type="Magento\Catalog\Model\ProductRender\FormattedPriceInfo" />
     <preference for="Magento\Framework\Indexer\BatchProviderInterface" type="Magento\Framework\Indexer\BatchProvider" />
     <preference for="Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface" type="Magento\Catalog\Model\Indexer\Product\Price\InvalidateIndex" />
+    <preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv
index b8b2d25d58b48..35a2c224c4ed2 100644
--- a/app/code/Magento/Catalog/i18n/en_US.csv
+++ b/app/code/Magento/Catalog/i18n/en_US.csv
@@ -13,8 +13,8 @@ Position,Position
 Day,Day
 Month,Month
 Year,Year
-"<label class=""label""><span>from</span></label>","<label class=""label""><span>from</span></label>"
-"<label class=""label""><span>to</span></label>","<label class=""label""><span>to</span></label>"
+from,from
+to,to
 [GLOBAL],[GLOBAL]
 [WEBSITE],[WEBSITE]
 "[STORE VIEW]","[STORE VIEW]"
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index ffecb2ba4f305..b2fa8e9aaf80f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Product media data template
  *
@@ -15,19 +13,19 @@
 <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
     <div data-role="loader" class="loading-mask">
         <div class="loader">
-            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
-                 alt="<?= /* @escapeNotVerified */ __('Loading...') ?>">
+            <img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')) ?>"
+                 alt="<?= $block->escapeHtml(__('Loading...')) ?>">
         </div>
     </div>
 </div>
 <!--Fix for jumping content. Loader must be the same size as gallery.-->
 <script>
     var config = {
-            "width": <?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>,
-            "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
-                        ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
-            "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
-            "height": <?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'height') ?>
+            "width": <?= $block->escapeHtml($block->getImageAttribute('product_page_image_medium', 'width')) ?>,
+            "thumbheight": <?= $block->escapeHtml($block->getImageAttribute('product_page_image_small', 'height')
+                        ?: $block->getImageAttribute('product_page_image_small', 'width')); ?>,
+            "navtype": "<?= $block->escapeHtml($block->getVar("gallery/navtype")) ?>",
+            "height": <?= $block->escapeHtml($block->getImageAttribute('product_page_image_medium', 'height')) ?>
         },
         thumbBarHeight = 0,
         loader = document.querySelectorAll('[data-gallery-role="gallery-placeholder"] [data-role="loader"]')[0];
@@ -43,70 +41,82 @@
         "[data-gallery-role=gallery-placeholder]": {
             "mage/gallery/gallery": {
                 "mixins":["magnifier/magnify"],
-                "magnifierOpts": <?= /* @escapeNotVerified */ $block->getMagnifier() ?>,
-                "data": <?= /* @escapeNotVerified */ $block->getGalleryImagesJson() ?>,
+                "magnifierOpts": <?= /* @noEscape */ $block->getMagnifier() ?>,
+                "data": <?= /* @noEscape */ $block->getGalleryImagesJson() ?>,
                 "options": {
-                    "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/nav") ?>",
-                    <?php if (($block->getVar("gallery/loop"))): ?>
-                        "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ?>,
+                    "nav": "<?= $block->escapeHtml($block->getVar("gallery/nav")) ?>",
+                    <?php if (($block->getVar("gallery/loop"))) : ?>
+                        "loop": <?= $block->escapeHtml($block->getVar("gallery/loop")) ?>,
                     <?php endif; ?>
-                    <?php if (($block->getVar("gallery/keyboard"))): ?>
-                        "keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ?>,
+                    <?php if (($block->getVar("gallery/keyboard"))) : ?>
+                        "keyboard": <?= $block->escapeHtml($block->getVar("gallery/keyboard")) ?>,
                     <?php endif; ?>
-                    <?php if (($block->getVar("gallery/arrows"))): ?>
-                        "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ?>,
+                    <?php if (($block->getVar("gallery/arrows"))) : ?>
+                        "arrows": <?= $block->escapeHtml($block->getVar("gallery/arrows")) ?>,
                     <?php endif; ?>
-                    <?php if (($block->getVar("gallery/allowfullscreen"))): ?>
-                        "allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ?>,
+                    <?php if (($block->getVar("gallery/allowfullscreen"))) : ?>
+                        "allowfullscreen": <?= $block->escapeHtml($block->getVar("gallery/allowfullscreen")) ?>,
                     <?php endif; ?>
-                    <?php if (($block->getVar("gallery/caption"))): ?>
-                        "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ?>,
+                    <?php if (is_bool($block->getVar("gallery/caption"))) : ?>
+                        "showCaption": <?= /* @noEscape */ $block->getVar("gallery/caption") ? 'true' : 'false'; ?>,
                     <?php endif; ?>
-                    "width": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>",
-                    "thumbwidth": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_small', 'width') ?>",
-                    <?php if ($block->getImageAttribute('product_page_image_small', 'height') || $block->getImageAttribute('product_page_image_small', 'width')): ?>
-                        "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
-                        ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
+                    <?php
+                        $imgWidth = $block->getImageAttribute('product_page_image_medium', 'width');
+                        $thumbWidth = $block->getImageAttribute('product_page_image_small', 'width');
+                    ?>
+                        "width": "<?= $block->escapeHtml($imgWidth) ?>",
+                        "thumbwidth": "<?= $block->escapeHtml($thumbWidth) ?>",
+                    <?php
+                        $thumbHeight = $block->getImageAttribute('product_page_image_small', 'height')
+                            ?: $block->getImageAttribute('product_page_image_small', 'width');
+                    ?>
+                    <?php if ($thumbHeight) : ?>
+                        "thumbheight": <?= $block->escapeHtml($thumbHeight); ?>,
                     <?php endif; ?>
-                    <?php if (($block->getVar("gallery/thumbmargin"))): ?>
-                        "thumbmargin": <?= /* @noEscape */ (int)$block->getVar("gallery/thumbmargin"); ?>,
+                    <?php if (($block->getVar("gallery/thumbmargin"))) : ?>
+                        "thumbmargin": <?= (int)$block->getVar("gallery/thumbmargin"); ?>,
                     <?php endif; ?>
-                    <?php if ($block->getImageAttribute('product_page_image_medium', 'height') || $block->getImageAttribute('product_page_image_medium', 'width')): ?>
-                        "height": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'height')
-                        ?: $block->getImageAttribute('product_page_image_medium', 'width'); ?>,
+                    <?php
+                        $imgHeight = $block->getImageAttribute('product_page_image_medium', 'height')
+                            ?: $block->getImageAttribute('product_page_image_medium', 'width')
+                    ?>
+                    <?php if ($imgHeight) : ?>
+                        "height": <?= $block->escapeHtml($imgHeight); ?>,
                     <?php endif; ?>
-                    <?php if ($block->getVar("gallery/transition/duration")): ?>
-                        "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/transition/duration") ?>,
+                    <?php if ($block->getVar("gallery/transition/duration")) : ?>
+                        "transitionduration": <?= $block->escapeHtml($block->getVar("gallery/transition/duration")) ?>,
                     <?php endif; ?>
-                    "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/transition/effect") ?>",
-                    <?php if (($block->getVar("gallery/navarrows"))): ?>
-                        "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ?>,
+                    "transition": "<?= $block->escapeHtml($block->getVar("gallery/transition/effect")) ?>",
+                    <?php if (($block->getVar("gallery/navarrows"))) : ?>
+                        "navarrows": <?= $block->escapeHtml($block->getVar("gallery/navarrows")) ?>,
                     <?php endif; ?>
-                    "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
-                    "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navdir") ?>"
+                    "navtype": "<?= $block->escapeHtml($block->getVar("gallery/navtype")) ?>",
+                    "navdir": "<?= $block->escapeHtml($block->getVar("gallery/navdir")) ?>"
                 },
                 "fullscreen": {
-                    "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/nav") ?>",
-                    <?php if ($block->getVar("gallery/fullscreen/loop")): ?>
-                        "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ?>,
+                    "nav": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/nav")) ?>",
+                    <?php if ($block->getVar("gallery/fullscreen/loop")) : ?>
+                        "loop": <?= $block->escapeHtml($block->getVar("gallery/fullscreen/loop")) ?>,
                     <?php endif; ?>
-                    "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navdir") ?>",
-                    <?php if ($block->getVar("gallery/transition/navarrows")): ?>
-                        "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ?>,
+                    "navdir": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navdir")) ?>",
+                    <?php if ($block->getVar("gallery/transition/navarrows")) : ?>
+                        "navarrows": <?= $block->escapeHtml($block->getVar("gallery/fullscreen/navarrows")) ?>,
                     <?php endif; ?>
-                    "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navtype") ?>",
-                    <?php if ($block->getVar("gallery/fullscreen/arrows")): ?>
-                        "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ?>,
+                    "navtype": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navtype")) ?>",
+                    <?php if ($block->getVar("gallery/fullscreen/arrows")) : ?>
+                        "arrows": <?= $block->escapeHtml($block->getVar("gallery/fullscreen/arrows")) ?>,
                     <?php endif; ?>
-                    <?php if ($block->getVar("gallery/fullscreen/caption")): ?>
-                        "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ?>,
+                    <?php if (is_bool($block->getVar("gallery/fullscreen/caption"))) : ?>
+                        <?php $showCaption = $block->getVar("gallery/fullscreen/caption") ? 'true' : 'false'; ?>
+                        "showCaption": <?= /* @noEscape */ $showCaption ?>,
                     <?php endif; ?>
-                    <?php if ($block->getVar("gallery/fullscreen/transition/duration")): ?>
-                        "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/duration") ?>,
+                    <?php if ($block->getVar("gallery/fullscreen/transition/duration")) : ?>
+                        "transitionduration": <?=
+                        $block->escapeHtml($block->getVar("gallery/fullscreen/transition/duration")) ?>,
                     <?php endif; ?>
-                    "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/effect") ?>"
+                    "transition": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/transition/effect")) ?>"
                 },
-                "breakpoints": <?= /* @escapeNotVerified */ $block->getBreakpoints() ?>
+                "breakpoints": <?= /* @noEscape */ $block->getBreakpoints() ?>
             }
         }
     }
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
index 8fcac2f9f1d65..9375d207e6ced 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
@@ -49,6 +49,22 @@ define([
             });
         },
 
+        /**
+         * @private
+         * @param {String} url
+         */
+        _redirect: function (url) {
+            var urlParts = url.split('#'),
+                locationParts = window.location.href.split('#'),
+                forceReload = urlParts[0] === locationParts[0];
+
+            window.location.assign(url);
+
+            if (forceReload) {
+                window.location.reload();
+            }
+        },
+
         /**
          * @return {Boolean}
          */
@@ -62,34 +78,27 @@ define([
          * @param {Object} form
          */
         submitForm: function (form) {
-            var addToCartButton, self = this;
-
-            if (form.has('input[type="file"]').length && form.find('input[type="file"]').val() !== '') {
-                self.element.off('submit');
-                // disable 'Add to Cart' button
-                addToCartButton = $(form).find(this.options.addToCartButtonSelector);
-                addToCartButton.prop('disabled', true);
-                addToCartButton.addClass(this.options.addToCartButtonDisabledClass);
-                form.submit();
-            } else {
-                self.ajaxSubmit(form);
-            }
+            this.ajaxSubmit(form);
         },
 
         /**
          * @param {String} form
          */
         ajaxSubmit: function (form) {
-            var self = this;
+            var self = this,
+                formData = new FormData(form[0]);
 
             $(self.options.minicartSelector).trigger('contentLoading');
             self.disableAddToCartButton(form);
 
             $.ajax({
                 url: form.attr('action'),
-                data: form.serialize(),
+                data: formData,
                 type: 'post',
                 dataType: 'json',
+                cache: false,
+                contentType: false,
+                processData: false,
 
                 /** @inheritdoc */
                 beforeSend: function () {
@@ -125,7 +134,8 @@ define([
                             parameters.push(eventData.redirectParameters.join('&'));
                             res.backUrl = parameters.join('#');
                         }
-                        window.location = res.backUrl;
+
+                        self._redirect(res.backUrl);
 
                         return;
                     }
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
index 83ba3ddbc6ace..2bc351edb2d62 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -206,7 +206,7 @@ public function getStockStatusChangedAuto()
      */
     public function getQty()
     {
-        return null === $this->_getData(static::QTY) ? null : floatval($this->_getData(static::QTY));
+        return null === $this->_getData(static::QTY) ? null : (float)$this->_getData(static::QTY);
     }
 
     /**
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
index 899056d8f0835..8a24d3c46abcb 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
@@ -106,9 +106,9 @@ public function getQty()
     /**
      * @return int
      */
-    public function getStockStatus()
+    public function getStockStatus(): int
     {
-        return $this->getData(self::KEY_STOCK_STATUS);
+        return (int)$this->getData(self::KEY_STOCK_STATUS);
     }
 
     //@codeCoverageIgnoreEnd
diff --git a/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
index cea19c098b928..abd704c1d0406 100644
--- a/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
@@ -74,7 +74,6 @@ private function processStockData(Product $product)
                 $this->setStockDataToProduct($product, $stockItem, $quantityAndStockStatus);
             }
         }
-        $product->unsetData('quantity_and_stock_status');
     }
 
     /**
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
index 85ad74f7bbfe2..4badfa1219e10 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
@@ -25,14 +25,14 @@ public function execute()
             $ruleJob->applyAll();
 
             if ($ruleJob->hasSuccess()) {
-                $this->messageManager->addSuccess($ruleJob->getSuccess());
+                $this->messageManager->addSuccessMessage($ruleJob->getSuccess());
                 $this->_objectManager->create(\Magento\CatalogRule\Model\Flag::class)->loadSelf()->setState(0)->save();
             } elseif ($ruleJob->hasError()) {
-                $this->messageManager->addError($errorMessage . ' ' . $ruleJob->getError());
+                $this->messageManager->addErrorMessage($errorMessage . ' ' . $ruleJob->getError());
             }
         } catch (\Exception $e) {
             $this->_objectManager->create(\Psr\Log\LoggerInterface::class)->critical($e);
-            $this->messageManager->addError($errorMessage);
+            $this->messageManager->addErrorMessage($errorMessage);
         }
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
index 8b007031f3305..3500506d8d6c5 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
@@ -25,13 +25,13 @@ public function execute()
                 $ruleRepository->deleteById($id);
 
                 $this->_objectManager->create(\Magento\CatalogRule\Model\Flag::class)->loadSelf()->setState(1)->save();
-                $this->messageManager->addSuccess(__('You deleted the rule.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the rule.'));
                 $this->_redirect('catalog_rule/*/');
                 return;
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('We can\'t delete this rule right now. Please review the log and try again.')
                 );
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
@@ -39,7 +39,7 @@ public function execute()
                 return;
             }
         }
-        $this->messageManager->addError(__('We can\'t find a rule to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a rule to delete.'));
         $this->_redirect('catalog_rule/*/');
     }
 }
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
index 97a5693b18117..945c28b2088f2 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
@@ -24,7 +24,7 @@ public function execute()
             try {
                 $model = $ruleRepository->get($id);
             } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-                $this->messageManager->addError(__('This rule no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This rule no longer exists.'));
                 $this->_redirect('catalog_rule/*');
                 return;
             }
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
index 0170fc76b6aab..f3046c58a389b 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
@@ -68,7 +68,7 @@ public function execute()
                 $validateResult = $model->validateData(new \Magento\Framework\DataObject($data));
                 if ($validateResult !== true) {
                     foreach ($validateResult as $errorMessage) {
-                        $this->messageManager->addError($errorMessage);
+                        $this->messageManager->addErrorMessage($errorMessage);
                     }
                     $this->_getSession()->setPageData($data);
                     $this->dataPersistor->set('catalog_rule', $data);
@@ -88,7 +88,7 @@ public function execute()
 
                 $ruleRepository->save($model);
 
-                $this->messageManager->addSuccess(__('You saved the rule.'));
+                $this->messageManager->addSuccessMessage(__('You saved the rule.'));
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setPageData(false);
                 $this->dataPersistor->clear('catalog_rule');
 
@@ -111,9 +111,9 @@ public function execute()
                 }
                 return;
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('Something went wrong while saving the rule data. Please review the error log.')
                 );
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
diff --git a/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php b/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php
index 08c3d97b216ed..749ac3cf51249 100644
--- a/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php
+++ b/app/code/Magento/CatalogRule/Observer/AddDirtyRulesNotice.php
@@ -37,7 +37,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $dirtyRules = $observer->getData('dirty_rules');
         if (!empty($dirtyRules)) {
             if ($dirtyRules->getState()) {
-                $this->messageManager->addNotice($observer->getData('message'));
+                $this->messageManager->addNoticeMessage($observer->getData('message'));
             }
         }
     }
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
index cc808a38db698..7fdffe933db8c 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php
@@ -103,7 +103,7 @@ protected function checkCatalogRulesAvailability($attributeCode)
 
         if ($disabledRulesCount) {
             $this->ruleProductProcessor->markIndexerAsInvalid();
-            $this->messageManager->addWarning(
+            $this->messageManager->addWarningMessage(
                 __(
                     'You disabled %1 Catalog Price Rules based on "%2" attribute.',
                     $disabledRulesCount,
diff --git a/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php b/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
index a45a548264a4c..c71b51317fd59 100644
--- a/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
+++ b/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
@@ -89,7 +89,7 @@ public function getValue()
     {
         if (null === $this->value) {
             if ($this->product->hasData(self::PRICE_CODE)) {
-                $this->value = floatval($this->product->getData(self::PRICE_CODE)) ?: false;
+                $this->value = (float)$this->product->getData(self::PRICE_CODE) ?: false;
             } else {
                 $this->value = $this->getRuleResource()
                     ->getRulePrice(
@@ -98,7 +98,7 @@ public function getValue()
                         $this->customerSession->getCustomerGroupId(),
                         $this->product->getId()
                     );
-                $this->value = $this->value ? floatval($this->value) : false;
+                $this->value = $this->value ? (float)$this->value : false;
             }
             if ($this->value) {
                 $this->value = $this->priceCurrency->convertAndRound($this->value);
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php b/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php
index b052ccddbf6b4..25bae43a930bb 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Observer/AddDirtyRulesNoticeTest.php
@@ -49,7 +49,7 @@ public function testExecute()
         $eventObserverMock->expects($this->at(0))->method('getData')->with('dirty_rules')->willReturn($flagMock);
         $flagMock->expects($this->once())->method('getState')->willReturn(1);
         $eventObserverMock->expects($this->at(1))->method('getData')->with('message')->willReturn($message);
-        $this->messageManagerMock->expects($this->once())->method('addNotice')->with($message);
+        $this->messageManagerMock->expects($this->once())->method('addNoticeMessage')->with($message);
         $this->observer->execute($eventObserverMock);
     }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index 9892465d1538a..18360dedf0693 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -3,27 +3,48 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogUrlRewrite\Observer;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
+use Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\ProductScopeRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\UrlRewrite\Model\MergeDataProvider;
+use Magento\UrlRewrite\Model\MergeDataProviderFactory;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class UrlRewriteHandler
 {
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider
+     * @var ChildrenCategoriesProvider
      */
     protected $childrenCategoriesProvider;
 
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
+     * @var CategoryUrlRewriteGenerator
      */
     protected $categoryUrlRewriteGenerator;
 
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator
+     * @var ProductUrlRewriteGenerator
      */
     protected $productUrlRewriteGenerator;
 
     /**
-     * @var \Magento\UrlRewrite\Model\UrlPersistInterface
+     * @var UrlPersistInterface
      */
     protected $urlPersist;
 
@@ -33,44 +54,51 @@ class UrlRewriteHandler
     protected $isSkippedProduct;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
+     * @var CollectionFactory
      */
     protected $productCollectionFactory;
 
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator
+     * @var CategoryProductUrlPathGenerator
      */
     private $categoryBasedProductRewriteGenerator;
 
     /**
-     * @var \Magento\UrlRewrite\Model\MergeDataProvider
+     * @var MergeDataProvider
      */
     private $mergeDataProviderPrototype;
 
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var Json
      */
     private $serializer;
 
     /**
-     * @param \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider
-     * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
-     * @param \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator $productUrlRewriteGenerator
-     * @param \Magento\UrlRewrite\Model\UrlPersistInterface $urlPersist
-     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
-     * @param \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator
-     * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @var ProductScopeRewriteGenerator
+     */
+    private $productScopeRewriteGenerator;
+
+    /**
+     * @param ChildrenCategoriesProvider $childrenCategoriesProvider
+     * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
+     * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
+     * @param UrlPersistInterface $urlPersist
+     * @param CollectionFactory $productCollectionFactory
+     * @param CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator
+     * @param MergeDataProviderFactory|null $mergeDataProviderFactory
+     * @param Json|null $serializer
+     * @param ProductScopeRewriteGenerator|null $productScopeRewriteGenerator
      */
     public function __construct(
-        \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider,
-        \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
-        \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator $productUrlRewriteGenerator,
-        \Magento\UrlRewrite\Model\UrlPersistInterface $urlPersist,
-        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
-        \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator,
-        \Magento\UrlRewrite\Model\MergeDataProviderFactory $mergeDataProviderFactory = null,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        ChildrenCategoriesProvider $childrenCategoriesProvider,
+        CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
+        ProductUrlRewriteGenerator $productUrlRewriteGenerator,
+        UrlPersistInterface $urlPersist,
+        CollectionFactory $productCollectionFactory,
+        CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator,
+        MergeDataProviderFactory $mergeDataProviderFactory = null,
+        Json $serializer = null,
+        ProductScopeRewriteGenerator $productScopeRewriteGenerator = null
     ) {
         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
         $this->categoryUrlRewriteGenerator = $categoryUrlRewriteGenerator;
@@ -79,58 +107,29 @@ public function __construct(
         $this->productCollectionFactory = $productCollectionFactory;
         $this->categoryBasedProductRewriteGenerator = $categoryBasedProductRewriteGenerator;
 
-        if (!isset($mergeDataProviderFactory)) {
-            $mergeDataProviderFactory =  \Magento\Framework\App\ObjectManager::getInstance()->get(
-                \Magento\UrlRewrite\Model\MergeDataProviderFactory::class
-            );
-        }
-
+        $objectManager = ObjectManager::getInstance();
+        $mergeDataProviderFactory = $mergeDataProviderFactory ?: $objectManager->get(MergeDataProviderFactory::class);
         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
-
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Serialize\Serializer\Json::class
-        );
+        $this->serializer = $serializer ?: $objectManager->get(Json::class);
+        $this->productScopeRewriteGenerator = $productScopeRewriteGenerator
+            ?: $objectManager->get(ProductScopeRewriteGenerator::class);
     }
 
     /**
-     * Generate url rewrites for products assigned to category
+     * Generates URL rewrites for products assigned to category.
      *
-     * @param \Magento\Catalog\Model\Category $category
+     * @param Category $category
      * @return array
      */
-    public function generateProductUrlRewrites(\Magento\Catalog\Model\Category $category)
+    public function generateProductUrlRewrites(Category $category): array
     {
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
         $this->isSkippedProduct[$category->getEntityId()] = [];
         $saveRewriteHistory = $category->getData('save_rewrites_history');
-        $storeId = $category->getStoreId();
+        $storeId = (int)$category->getStoreId();
 
         if ($category->getChangedProductIds()) {
-            $this->isSkippedProduct[$category->getEntityId()] = $category->getAffectedProductIds();
-            /* @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
-            $collection = $this->productCollectionFactory->create()
-                ->setStoreId($storeId)
-                ->addIdFilter($category->getAffectedProductIds())
-                ->addAttributeToSelect('visibility')
-                ->addAttributeToSelect('name')
-                ->addAttributeToSelect('url_key')
-                ->addAttributeToSelect('url_path');
-
-            $collection->setPageSize(1000);
-            $pageCount = $collection->getLastPageNumber();
-            $currentPage = 1;
-            while ($currentPage <= $pageCount) {
-                $collection->setCurPage($currentPage);
-                foreach ($collection as $product) {
-                    $product->setStoreId($storeId);
-                    $product->setData('save_rewrites_history', $saveRewriteHistory);
-                    $mergeDataProvider->merge(
-                        $this->productUrlRewriteGenerator->generate($product, $category->getEntityId())
-                    );
-                }
-                $collection->clear();
-                $currentPage++;
-            }
+            $this->generateChangedProductUrls($mergeDataProvider, $category, $storeId, $saveRewriteHistory);
         } else {
             $mergeDataProvider->merge(
                 $this->getCategoryProductsUrlRewrites(
@@ -157,21 +156,49 @@ public function generateProductUrlRewrites(\Magento\Catalog\Model\Category $cate
     }
 
     /**
-     * @param \Magento\Catalog\Model\Category $category
+     * @param Category $category
+     * @return void
+     */
+    public function deleteCategoryRewritesForChildren(Category $category)
+    {
+        $categoryIds = $this->childrenCategoriesProvider->getChildrenIds($category, true);
+        $categoryIds[] = $category->getId();
+        foreach ($categoryIds as $categoryId) {
+            $this->urlPersist->deleteByData(
+                [
+                    UrlRewrite::ENTITY_ID =>
+                        $categoryId,
+                    UrlRewrite::ENTITY_TYPE =>
+                        CategoryUrlRewriteGenerator::ENTITY_TYPE,
+                ]
+            );
+            $this->urlPersist->deleteByData(
+                [
+                    UrlRewrite::METADATA =>
+                        $this->serializer->serialize(['category_id' => $categoryId]),
+                    UrlRewrite::ENTITY_TYPE =>
+                        ProductUrlRewriteGenerator::ENTITY_TYPE,
+                ]
+            );
+        }
+    }
+
+    /**
+     * @param Category $category
      * @param int $storeId
      * @param bool $saveRewriteHistory
      * @param int|null $rootCategoryId
      * @return array
      */
     private function getCategoryProductsUrlRewrites(
-        \Magento\Catalog\Model\Category $category,
+        Category $category,
         $storeId,
         $saveRewriteHistory,
         $rootCategoryId = null
     ) {
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
 
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
+        /** @var Collection $productCollection */
         $productCollection = $this->productCollectionFactory->create();
 
         $productCollection->addCategoriesFilter(['eq' => [$category->getEntityId()]])
@@ -199,30 +226,65 @@ private function getCategoryProductsUrlRewrites(
     }
 
     /**
-     * @param \Magento\Catalog\Model\Category $category
-     * @return void
+     * Generates product URL rewrites.
+     *
+     * @param MergeDataProvider $mergeDataProvider
+     * @param Category $category
+     * @param Product $product
+     * @param int $storeId
+     * @param $saveRewriteHistory
      */
-    public function deleteCategoryRewritesForChildren(\Magento\Catalog\Model\Category $category)
-    {
-        $categoryIds = $this->childrenCategoriesProvider->getChildrenIds($category, true);
-        $categoryIds[] = $category->getId();
-        foreach ($categoryIds as $categoryId) {
-            $this->urlPersist->deleteByData(
-                [
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::ENTITY_ID =>
-                        $categoryId,
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::ENTITY_TYPE =>
-                        \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator::ENTITY_TYPE,
-                ]
-            );
-            $this->urlPersist->deleteByData(
-                [
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::METADATA =>
-                        $this->serializer->serialize(['category_id' => $categoryId]),
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::ENTITY_TYPE =>
-                        \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator::ENTITY_TYPE,
-                ]
-            );
+    private function generateChangedProductUrls(
+        MergeDataProvider $mergeDataProvider,
+        Category $category,
+        int $storeId,
+        $saveRewriteHistory
+    ) {
+        $this->isSkippedProduct[$category->getEntityId()] = $category->getAffectedProductIds();
+
+        $categoryStoreIds = [$storeId];
+        // If category is changed in the Global scope when need to regenerate product URL rewrites for all other scopes.
+        if ($this->productScopeRewriteGenerator->isGlobalScope($storeId)) {
+            $categoryStoreIds = $this->getCategoryStoreIds($category);
+        }
+
+        foreach ($categoryStoreIds as $categoryStoreId) {
+            /* @var Collection $collection */
+            $collection = $this->productCollectionFactory->create()
+                ->setStoreId($categoryStoreId)
+                ->addIdFilter($category->getAffectedProductIds())
+                ->addAttributeToSelect('visibility')
+                ->addAttributeToSelect('name')
+                ->addAttributeToSelect('url_key')
+                ->addAttributeToSelect('url_path');
+
+            $collection->setPageSize(1000);
+            $pageCount = $collection->getLastPageNumber();
+            $currentPage = 1;
+            while ($currentPage <= $pageCount) {
+                $collection->setCurPage($currentPage);
+                foreach ($collection as $product) {
+                    $product->setData('save_rewrites_history', $saveRewriteHistory);
+                    $product->setStoreId($categoryStoreId);
+                    $mergeDataProvider->merge(
+                        $this->productUrlRewriteGenerator->generate($product, $category->getEntityId())
+                    );
+                }
+                $collection->clear();
+                $currentPage++;
+            }
         }
     }
+
+    /**
+     * Gets category store IDs without Global Store.
+     *
+     * @param Category $category
+     * @return array
+     */
+    private function getCategoryStoreIds(Category $category): array
+    {
+        $ids = $category->getStoreIds();
+        return array_filter($ids);
+    }
 }
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
index 57ca4b7b2e606..95d63bb0eda95 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -11,6 +11,8 @@
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 
 /**
  * Shopping cart item render block
@@ -91,6 +93,11 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      */
     private $messageInterpretationStrategy;
 
+    /**
+     * @var ItemResolverInterface
+     */
+    private $itemResolver;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfig
@@ -102,6 +109,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param InterpretationStrategyInterface $messageInterpretationStrategy
      * @param array $data
+     * @param ItemResolverInterface|null $itemResolver
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
      */
@@ -115,7 +123,8 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Module\Manager $moduleManager,
         InterpretationStrategyInterface $messageInterpretationStrategy,
-        array $data = []
+        array $data = [],
+        ItemResolverInterface $itemResolver = null
     ) {
         $this->priceCurrency = $priceCurrency;
         $this->imageBuilder = $imageBuilder;
@@ -127,6 +136,7 @@ public function __construct(
         $this->_isScopePrivate = true;
         $this->moduleManager = $moduleManager;
         $this->messageInterpretationStrategy = $messageInterpretationStrategy;
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
     }
 
     /**
@@ -172,7 +182,7 @@ public function getProduct()
      */
     public function getProductForThumbnail()
     {
-        return $this->getProduct();
+        return $this->itemResolver->getFinalProduct($this->getItem());
     }
 
     /**
diff --git a/app/code/Magento/Checkout/CustomerData/DefaultItem.php b/app/code/Magento/Checkout/CustomerData/DefaultItem.php
index 9351685405a60..21580d1275d0c 100644
--- a/app/code/Magento/Checkout/CustomerData/DefaultItem.php
+++ b/app/code/Magento/Checkout/CustomerData/DefaultItem.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\CustomerData;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 
 /**
  * Default item
@@ -39,12 +40,15 @@ class DefaultItem extends AbstractItem
     protected $checkoutHelper;
 
     /**
-     * Escaper
-     *
      * @var \Magento\Framework\Escaper
      */
     private $escaper;
 
+    /**
+     * @var ItemResolverInterface
+     */
+    private $itemResolver;
+
     /**
      * @param \Magento\Catalog\Helper\Image $imageHelper
      * @param \Magento\Msrp\Helper\Data $msrpHelper
@@ -52,6 +56,7 @@ class DefaultItem extends AbstractItem
      * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param \Magento\Framework\Escaper|null $escaper
+     * @param ItemResolverInterface|null $itemResolver
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -60,7 +65,8 @@ public function __construct(
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool,
         \Magento\Checkout\Helper\Data $checkoutHelper,
-        \Magento\Framework\Escaper $escaper = null
+        \Magento\Framework\Escaper $escaper = null,
+        ItemResolverInterface $itemResolver = null
     ) {
         $this->configurationPool = $configurationPool;
         $this->imageHelper = $imageHelper;
@@ -68,6 +74,7 @@ public function __construct(
         $this->urlBuilder = $urlBuilder;
         $this->checkoutHelper = $checkoutHelper;
         $this->escaper = $escaper ?: ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
     }
 
     /**
@@ -119,7 +126,7 @@ protected function getOptionList()
      */
     protected function getProductForThumbnail()
     {
-        return $this->getProduct();
+        return $this->itemResolver->getFinalProduct($this->item);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
index 23ffc3dca14ab..497137b3f7d0e 100644
--- a/app/code/Magento/Checkout/Helper/Data.php
+++ b/app/code/Magento/Checkout/Helper/Data.php
@@ -167,7 +167,7 @@ public function getPriceInclTax($item)
         }
         $qty = $item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1);
         $taxAmount = $item->getTaxAmount() + $item->getDiscountTaxCompensation();
-        $price = floatval($qty) ? ($item->getRowTotal() + $taxAmount) / $qty : 0;
+        $price = (float)$qty ? ($item->getRowTotal() + $taxAmount) / $qty : 0;
         return $this->priceCurrency->round($price);
     }
 
@@ -194,7 +194,7 @@ public function getBasePriceInclTax($item)
     {
         $qty = $item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1);
         $taxAmount = $item->getBaseTaxAmount() + $item->getBaseDiscountTaxCompensation();
-        $price = floatval($qty) ? ($item->getBaseRowTotal() + $taxAmount) / $qty : 0;
+        $price = (float)$qty ? ($item->getBaseRowTotal() + $taxAmount) / $qty : 0;
         return $this->priceCurrency->round($price);
     }
 
diff --git a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
index d8d0003d8ca7e..673e8a3b5937b 100644
--- a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
+++ b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
@@ -5,8 +5,10 @@
  */
 namespace Magento\Checkout\Model\Cart;
 
+use Magento\Checkout\CustomerData\DefaultItem;
+use Magento\Framework\App\ObjectManager;
+
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  */
 class ImageProvider
@@ -18,20 +20,29 @@ class ImageProvider
 
     /**
      * @var \Magento\Checkout\CustomerData\ItemPoolInterface
+     * @deprecated No need for the pool as images are resolved in the default item implementation
+     * @see \Magento\Checkout\CustomerData\DefaultItem::getProductForThumbnail
      */
     protected $itemPool;
 
+    /**
+     * @var \Magento\Checkout\CustomerData\DefaultItem
+     */
+    private $customerDataItem;
+
     /**
      * @param \Magento\Quote\Api\CartItemRepositoryInterface $itemRepository
      * @param \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool
-     * @codeCoverageIgnore
+     * @param DefaultItem|null $customerDataItem
      */
     public function __construct(
         \Magento\Quote\Api\CartItemRepositoryInterface $itemRepository,
-        \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool
+        \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool,
+        \Magento\Checkout\CustomerData\DefaultItem $customerDataItem = null
     ) {
         $this->itemRepository = $itemRepository;
         $this->itemPool = $itemPool;
+        $this->customerDataItem = $customerDataItem ?: ObjectManager::getInstance()->get(DefaultItem::class);
     }
 
     /**
@@ -45,9 +56,10 @@ public function getImages($cartId)
         $items = $this->itemRepository->getList($cartId);
         /** @var \Magento\Quote\Model\Quote\Item $cartItem */
         foreach ($items as $cartItem) {
-            $allData = $this->itemPool->getItemData($cartItem);
+            $allData = $this->customerDataItem->getItemData($cartItem);
             $itemData[$cartItem->getItemId()] = $allData['product_image'];
         }
+
         return $itemData;
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index ec6548d27e447..2e0b91d50c3ff 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -9,10 +9,28 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutCartProductSection">
-        <element name="itemOptionsBlock" type="block" selector=".item:nth-of-type({{numElement}}) .item-options" parameterized="true"/>
-        <element name="editItemParametersButton" type="block" selector=".item:nth-of-type({{numElement}}) .action-edit" parameterized="true"/>
-        <element name="productQuantityByName" type="input" selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'qty')]//input[contains(@class, 'qty')]" parameterized="true"/>
-        <element name="productSubtotalByName" type="input" selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'subtotal')]//span[@class='price']" parameterized="true"/>
-        <element name="updateShoppingCartButton" type="button" selector="#form-validate button[type='submit'].update" timeout="30"/>
+        <element name="itemOptionsBlock" type="block"
+                 selector=".item:nth-of-type({{numElement}}) .item-options"
+                 parameterized="true"/>
+        <element name="editItemParametersButton" type="block"
+                 selector=".item:nth-of-type({{numElement}}) .action-edit"
+                 parameterized="true"/>
+        <element name="productQuantityByName" type="input"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'qty')]//input[contains(@class, 'qty')]"
+                 parameterized="true"/>
+        <element name="productSubtotalByName" type="input"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'subtotal')]//span[@class='price']"
+                 parameterized="true"/>
+        <element name="updateShoppingCartButton" type="button"
+                 selector="#form-validate button[type='submit'].update"
+                 timeout="30"/>
+        <element name="productLinkByName" type="button"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr//strong[contains(@class, 'product-item-name')]//a[contains(text(), '{{var1}}')]"
+                 parameterized="true"/>
+        <element name="productOptionByNameAndAttribute" type="input"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr[.//strong[contains(@class, 'product-item-name')]//a[contains(text(), '{{var1}}')]]//dl[@class='item-options']//dt[.='{{var2}}']/following-sibling::dd[1]"
+                 parameterized="true"/>
+        <element name="removeItem" type="button"
+                 selector="//table[@id='shopping-cart-table']//tbody//tr[contains(@class,'item-actions')]//a[contains(@class,'action-delete')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
index 7a2b8f28f77d8..f9e27ef36c715 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -12,7 +12,7 @@
         <element name="isPaymentSection" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Review &amp; Payments')]]"/>
         <element name="availablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div:nth-child(2)>div.payment-method-title.field.choice"/>
         <element name="notAvailablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div.payment-method._active>div.payment-method-title.field.choice"/>
-        <element name="billingNewAddressForm" type="text" selector=".billing-new-address-form"/>
+        <element name="billingNewAddressForm" type="text" selector="[data-form='billing-new-address']"/>
         <element name="placeOrderDisabled" type="button" selector="#checkout-payment-method-load button.disabled"/>
         <element name="update" type="button" selector=".payment-method-billing-address .action.action-update"/>
         <element name="guestFirstName" type="input" selector=".billing-address-form input[name*='firstname']"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index 0edbb21bc6f5d..c7599deab9644 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -10,6 +10,6 @@
           xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryProductSection">
         <element name="ProductAddToCartByNumber" type="button" selector="//main//li[{{var1}}]//button[contains(@class, 'tocart')]" parameterized="true"/>
-        <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'tocart')]" parameterized="true"/>
+        <element name="productAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'tocart')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
index d963fa2d76e6b..38c1288069d38 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
@@ -5,8 +5,11 @@
  */
 namespace Magento\Checkout\Test\Unit\Block\Cart\Item;
 
+use Magento\Catalog\Block\Product\Image;
+use Magento\Catalog\Model\Product;
 use Magento\Checkout\Block\Cart\Item\Renderer;
 use Magento\Quote\Model\Quote\Item;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -16,17 +19,22 @@ class RendererTest extends \PHPUnit\Framework\TestCase
     /**
      * @var Renderer
      */
-    protected $_renderer;
+    private $renderer;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $layout;
+    private $layout;
 
     /**
      * @var \Magento\Catalog\Block\Product\ImageBuilder|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $imageBuilder;
+    private $imageBuilder;
+
+    /**
+     * @var ItemResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $itemResolver;
 
     protected function setUp()
     {
@@ -39,17 +47,20 @@ protected function setUp()
             ->getMock();
         $context->expects($this->once())
             ->method('getLayout')
-            ->will($this->returnValue($this->layout));
+            ->willReturn($this->layout);
 
         $this->imageBuilder = $this->getMockBuilder(\Magento\Catalog\Block\Product\ImageBuilder::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->_renderer = $objectManagerHelper->getObject(
+        $this->itemResolver = $this->createMock(ItemResolverInterface::class);
+
+        $this->renderer = $objectManagerHelper->getObject(
             \Magento\Checkout\Block\Cart\Item\Renderer::class,
             [
                 'context' => $context,
                 'imageBuilder' => $this->imageBuilder,
+                'itemResolver' => $this->itemResolver,
             ]
         );
     }
@@ -57,29 +68,34 @@ protected function setUp()
     public function testGetProductForThumbnail()
     {
         $product = $this->_initProduct();
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
+        $productForThumbnail = $this->renderer->getProductForThumbnail();
         $this->assertEquals($product->getName(), $productForThumbnail->getName(), 'Invalid product was returned.');
     }
 
     /**
      * Initialize product.
      *
-     * @return \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject
+     * @return Product|\PHPUnit_Framework_MockObject_MockObject
      */
     protected function _initProduct()
     {
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $product */
+        /** @var Product|\PHPUnit_Framework_MockObject_MockObject $product */
         $product = $this->createPartialMock(
-            \Magento\Catalog\Model\Product::class,
+            Product::class,
             ['getName', '__wakeup', 'getIdentities']
         );
-        $product->expects($this->any())->method('getName')->will($this->returnValue('Parent Product'));
+        $product->expects($this->any())->method('getName')->willReturn('Parent Product');
 
         /** @var Item|\PHPUnit_Framework_MockObject_MockObject $item */
         $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($product));
+        $item->expects($this->any())->method('getProduct')->willReturn($product);
+
+        $this->itemResolver->expects($this->any())
+            ->method('getFinalProduct')
+            ->with($item)
+            ->willReturn($product);
 
-        $this->_renderer->setItem($item);
+        $this->renderer->setItem($item);
         return $product;
     }
 
@@ -89,14 +105,14 @@ public function testGetIdentities()
         $identities = [1 => 1, 2 => 2, 3 => 3];
         $product->expects($this->exactly(2))
             ->method('getIdentities')
-            ->will($this->returnValue($identities));
+            ->willReturn($identities);
 
-        $this->assertEquals($product->getIdentities(), $this->_renderer->getIdentities());
+        $this->assertEquals($product->getIdentities(), $this->renderer->getIdentities());
     }
 
     public function testGetIdentitiesFromEmptyItem()
     {
-        $this->assertEmpty($this->_renderer->getIdentities());
+        $this->assertEmpty($this->renderer->getIdentities());
     }
 
     /**
@@ -106,7 +122,7 @@ public function testGetIdentitiesFromEmptyItem()
     public function testGetProductPriceHtml()
     {
         $priceHtml = 'some price html';
-        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+        $product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -117,7 +133,7 @@ public function testGetProductPriceHtml()
         $this->layout->expects($this->atLeastOnce())
             ->method('getBlock')
             ->with('product.price.render.default')
-            ->will($this->returnValue($priceRender));
+            ->willReturn($priceRender);
 
         $priceRender->expects($this->once())
             ->method('render')
@@ -129,9 +145,9 @@ public function testGetProductPriceHtml()
                     'display_minimal_price' => true,
                     'zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST
                 ]
-            )->will($this->returnValue($priceHtml));
+            )->willReturn($priceHtml);
 
-        $this->assertEquals($priceHtml, $this->_renderer->getProductPriceHtml($product));
+        $this->assertEquals($priceHtml, $this->renderer->getProductPriceHtml($product));
     }
 
     public function testGetActions()
@@ -148,7 +164,7 @@ public function testGetActions()
 
         $this->layout->expects($this->once())
             ->method('getChildName')
-            ->with($this->_renderer->getNameInLayout(), 'actions')
+            ->with($this->renderer->getNameInLayout(), 'actions')
             ->willReturn($blockNameInLayout);
         $this->layout->expects($this->once())
             ->method('getBlock')
@@ -169,14 +185,14 @@ public function testGetActions()
             ->method('toHtml')
             ->willReturn($blockHtml);
 
-        $this->assertEquals($blockHtml, $this->_renderer->getActions($itemMock));
+        $this->assertEquals($blockHtml, $this->renderer->getActions($itemMock));
     }
 
     public function testGetActionsWithNoBlock()
     {
         $this->layout->expects($this->once())
             ->method('getChildName')
-            ->with($this->_renderer->getNameInLayout(), 'actions')
+            ->with($this->renderer->getNameInLayout(), 'actions')
             ->willReturn(false);
 
         /**
@@ -186,25 +202,19 @@ public function testGetActionsWithNoBlock()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->assertEquals('', $this->_renderer->getActions($itemMock));
+        $this->assertEquals('', $this->renderer->getActions($itemMock));
     }
 
     public function testGetImage()
     {
         $imageId = 'test_image_id';
         $attributes = [];
-
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $imageMock = $this->getMockBuilder(\Magento\Catalog\Block\Product\Image::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $product = $this->createMock(Product::class);
+        $imageMock = $this->createMock(Image::class);
 
         $this->imageBuilder->expects($this->once())
             ->method('setProduct')
-            ->with($productMock)
+            ->with($product)
             ->willReturnSelf();
         $this->imageBuilder->expects($this->once())
             ->method('setImageId')
@@ -219,8 +229,8 @@ public function testGetImage()
             ->willReturn($imageMock);
 
         $this->assertInstanceOf(
-            \Magento\Catalog\Block\Product\Image::class,
-            $this->_renderer->getImage($productMock, $imageId, $attributes)
+            Image::class,
+            $this->renderer->getImage($product, $imageId, $attributes)
         );
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php b/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
index 8a7c2e951dd72..86825f6ca1da0 100644
--- a/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
@@ -5,12 +5,14 @@
  */
 namespace Magento\Checkout\Test\Unit\CustomerData;
 
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+
 class DefaultItemTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Checkout\CustomerData\DefaultItem
      */
-    protected $model;
+    private $model;
 
     /**
      * @var \Magento\Catalog\Helper\Image
@@ -22,6 +24,14 @@ class DefaultItemTest extends \PHPUnit\Framework\TestCase
      */
     private $configurationPool;
 
+    /**
+     * @var ItemResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $itemResolver;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -35,12 +45,14 @@ protected function setUp()
         $checkoutHelper = $this->getMockBuilder(\Magento\Checkout\Helper\Data::class)
             ->setMethods(['formatPrice'])->disableOriginalConstructor()->getMock();
         $checkoutHelper->expects($this->any())->method('formatPrice')->willReturn(5);
+        $this->itemResolver = $this->createMock(ItemResolverInterface::class);
         $this->model = $objectManager->getObject(
             \Magento\Checkout\CustomerData\DefaultItem::class,
             [
                 'imageHelper' => $this->imageHelper,
                 'configurationPool' => $this->configurationPool,
-                'checkoutHelper' => $checkoutHelper
+                'checkoutHelper' => $checkoutHelper,
+                'itemResolver' => $this->itemResolver,
             ]
         );
     }
@@ -72,6 +84,10 @@ public function testGetItemData()
         $this->imageHelper->expects($this->any())->method('getWidth')->willReturn(100);
         $this->imageHelper->expects($this->any())->method('getHeight')->willReturn(100);
         $this->configurationPool->expects($this->any())->method('getByProductType')->willReturn($product);
+        $this->itemResolver->expects($this->any())
+            ->method('getFinalProduct')
+            ->with($item)
+            ->willReturn($product);
 
         $itemData = $this->model->getItemData($item);
         $this->assertArrayHasKey('options', $itemData);
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
index 5330d93b46f6a..993a01d922c1c 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
@@ -11,25 +11,34 @@ class ImageProviderTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Checkout\Model\Cart\ImageProvider
      */
-    public $model;
+    private $model;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Quote\Api\CartItemRepositoryInterface
      */
-    protected $itemRepositoryMock;
+    private $itemRepositoryMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Checkout\CustomerData\ItemPoolInterface
      */
-    protected $itemPoolMock;
+    private $itemPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Checkout\CustomerData\DefaultItem
+     */
+    private $customerItem;
 
     protected function setUp()
     {
         $this->itemRepositoryMock = $this->createMock(\Magento\Quote\Api\CartItemRepositoryInterface::class);
         $this->itemPoolMock = $this->createMock(\Magento\Checkout\CustomerData\ItemPoolInterface::class);
+        $this->customerItem = $this->getMockBuilder(\Magento\Checkout\CustomerData\DefaultItem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->model = new \Magento\Checkout\Model\Cart\ImageProvider(
             $this->itemRepositoryMock,
-            $this->itemPoolMock
+            $this->itemPoolMock,
+            $this->customerItem
         );
     }
 
@@ -44,7 +53,7 @@ public function testGetImages()
         $expectedResult = [$itemId => $itemData['product_image']];
 
         $this->itemRepositoryMock->expects($this->once())->method('getList')->with($cartId)->willReturn([$itemMock]);
-        $this->itemPoolMock->expects($this->once())->method('getItemData')->with($itemMock)->willReturn($itemData);
+        $this->customerItem->expects($this->once())->method('getItemData')->with($itemMock)->willReturn($itemData);
 
         $this->assertEquals($expectedResult, $this->model->getImages($cartId));
     }
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index 940b60e796c9d..d80f88786c87b 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -39,7 +39,7 @@
     </type>
     <preference for="Magento\Checkout\CustomerData\ItemPoolInterface"
                 type="Magento\Checkout\CustomerData\ItemPool"/>
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
+    <type name="Magento\Checkout\CustomerData\ItemPool">
         <arguments>
             <argument name="defaultItemId" xsi:type="string">Magento\Checkout\CustomerData\DefaultItem</argument>
         </arguments>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
index 5530f7661bb1b..d329e2e8c1770 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
@@ -14,7 +14,8 @@
 <?php $methods = $block->getMethods('methods') ?: $block->getMethods('top_methods') ?>
 <ul class="checkout methods items checkout-methods-items">
 <?php foreach ($methods as $method): ?>
-    <?php if ($methodHtml = $block->getMethodHtml($method)): ?>
+    <?php $methodHtml = $block->getMethodHtml($method); ?>
+    <?php if (trim($methodHtml) !== ''): ?>
     <li class="item"><?= /* @escapeNotVerified */ $methodHtml ?></li>
     <?php endif; ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js
index e269462047748..0e94232786c65 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js
@@ -38,7 +38,7 @@ define([
             payload.addressInformation['shipping_carrier_code'] = quote.shippingMethod()['carrier_code'];
         }
 
-        storage.post(
+        return storage.post(
             serviceUrl, JSON.stringify(payload), false
         ).done(function (result) {
             var data = {
@@ -96,7 +96,7 @@ define([
             ) {
                 quote.setTotals(cartCache.get('totals'));
             } else {
-                loadFromServer(address);
+                return loadFromServer(address);
             }
         }
     };
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
index dacebd75c3c68..cf2a59cdba427 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -188,6 +188,8 @@ define([
 
                     if (!this.options.optionalRegionAllowed) { //eslint-disable-line max-depth
                         regionList.attr('disabled', 'disabled');
+                    } else {
+                        regionList.removeAttr('disabled');
                     }
                 }
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
index debb1acf90d4f..3b5168453e11a 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -61,13 +61,15 @@ define([
             };
             events['click ' + this.options.button.checkout] = $.proxy(function () {
                 var cart = customerData.get('cart'),
-                    customer = customerData.get('customer');
+                    customer = customerData.get('customer'),
+                    element = $(this.options.button.checkout);
 
                 if (!customer().firstname && cart().isGuestCheckoutAllowed === false) {
                     // set URL for redirect on successful login/registration. It's postprocessed on backend.
                     $.cookie('login_redirect', this.options.url.checkout);
 
                     if (this.options.url.isRedirectRequired) {
+                        element.prop('disabled', true);
                         location.href = this.options.url.loginUrl;
                     } else {
                         authenticationPopup.showModal();
@@ -75,6 +77,7 @@ define([
 
                     return false;
                 }
+                element.prop('disabled', true);
                 location.href = this.options.url.checkout;
             }, this);
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
index 093b2295a12b3..54fe9a1f59394 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
@@ -9,9 +9,7 @@
     <!-- ko template: getTemplate() --><!-- /ko -->
     <!--/ko-->
     <form data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
-        <fieldset
-                data-bind="attr: { id:'billing-new-address-form-'+index, value:index}"
-                class="billing-new-address-form fieldset address">
+        <fieldset class="fieldset address" data-form="billing-new-address">
             <!-- ko foreach: getRegion('additional-fieldsets') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
index daa37cbe2dc89..dd59bd78416c6 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
@@ -12,7 +12,7 @@
 
     <div class="product-item-inner">
         <div class="product-item-name-block">
-            <strong class="product-item-name" data-bind="text: $parent.name"></strong>
+            <strong class="product-item-name" data-bind="html: $parent.name"></strong>
             <div class="details-qty">
                 <span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
                 <span class="value" data-bind="text: $parent.qty"></span>
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php
index 13130a4491eb2..aa6f461fc5ee2 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php
@@ -5,7 +5,11 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml;
 
-abstract class Agreement extends \Magento\Backend\App\Action
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+
+abstract class Agreement extends Action
 {
     /**
      * Authorization level of a basic admin session
@@ -22,12 +26,14 @@ abstract class Agreement extends \Magento\Backend\App\Action
     protected $_coreRegistry = null;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
+     * @param Context $context
+     * @param Registry $coreRegistry
      * @codeCoverageIgnore
      */
-    public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
-    {
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry
+    ) {
         $this->_coreRegistry = $coreRegistry;
         parent::__construct($context);
     }
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
index 65aca6205caa4..f7b178df99624 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
@@ -6,27 +6,53 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+
+class Delete extends Agreement
 {
+    /**
+     * @var CheckoutAgreementsRepositoryInterface
+     */
+    private $agreementRepository;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param CheckoutAgreementsRepositoryInterface $agreementRepository
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        CheckoutAgreementsRepositoryInterface $agreementRepository = null
+    ) {
+        $this->agreementRepository = $agreementRepository ?:
+                ObjectManager::getInstance()->get(CheckoutAgreementsRepositoryInterface::class);
+        parent::__construct($context, $coreRegistry);
+    }
     /**
      * @return void
      */
     public function execute()
     {
         $id = (int)$this->getRequest()->getParam('id');
-        $model = $this->_objectManager->get(\Magento\CheckoutAgreements\Model\Agreement::class)->load($id);
-        if (!$model->getId()) {
+        $agreement = $this->agreementRepository->get($id);
+        if (!$agreement->getAgreementId()) {
             $this->messageManager->addError(__('This condition no longer exists.'));
             $this->_redirect('checkout/*/');
             return;
         }
 
         try {
-            $model->delete();
+            $this->agreementRepository->delete($agreement);
             $this->messageManager->addSuccess(__('You deleted the condition.'));
             $this->_redirect('checkout/*/');
             return;
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             $this->messageManager->addError($e->getMessage());
         } catch (\Exception $e) {
             $this->messageManager->addError(__('Something went wrong  while deleting this condition.'));
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
index 73ac129bc993c..8bec3b581cd54 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
@@ -6,8 +6,34 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\CheckoutAgreements\Model\AgreementFactory;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\App\ObjectManager;
+use Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit as BlockEdit;
+
+class Edit extends Agreement
 {
+    /**
+     * @var AgreementFactory
+     */
+    private $agreementFactory;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param AgreementFactory $agreementFactory
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        AgreementFactory $agreementFactory = null
+    ) {
+        $this->agreementFactory = $agreementFactory ?:
+                ObjectManager::getInstance()->get(AgreementFactory::class);
+        parent::__construct($context, $coreRegistry);
+    }
     /**
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -15,7 +41,7 @@ class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
     public function execute()
     {
         $id = $this->getRequest()->getParam('id');
-        $agreementModel = $this->_objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
+        $agreementModel = $this->agreementFactory->create();
 
         if ($id) {
             $agreementModel->load($id);
@@ -26,7 +52,7 @@ public function execute()
             }
         }
 
-        $data = $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getAgreementData(true);
+        $data = $this->_session->getAgreementData(true);
         if (!empty($data)) {
             $agreementModel->setData($data);
         }
@@ -38,7 +64,7 @@ public function execute()
             $id ? __('Edit Condition') : __('New Condition')
         )->_addContent(
             $this->_view->getLayout()->createBlock(
-                \Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit::class
+                BlockEdit::class
             )->setData(
                 'action',
                 $this->getUrl('checkout/*/save')
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
index 25c034203620b..05a16d3dd4264 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
@@ -6,8 +6,35 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class Save extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\CheckoutAgreements\Model\AgreementFactory;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
+
+class Save extends Agreement
 {
+    /**
+     * @var AgreementFactory
+     */
+    private $agreementFactory;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param AgreementFactory $agreementFactory
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        AgreementFactory $agreementFactory = null
+    ) {
+        $this->agreementFactory = $agreementFactory ?:
+                ObjectManager::getInstance()->get(AgreementFactory::class);
+        parent::__construct($context, $coreRegistry);
+    }
     /**
      * @return void
      */
@@ -15,11 +42,11 @@ public function execute()
     {
         $postData = $this->getRequest()->getPostValue();
         if ($postData) {
-            $model = $this->_objectManager->get(\Magento\CheckoutAgreements\Model\Agreement::class);
+            $model = $this->agreementFactory->create();
             $model->setData($postData);
 
             try {
-                $validationResult = $model->validateData(new \Magento\Framework\DataObject($postData));
+                $validationResult = $model->validateData(new DataObject($postData));
                 if ($validationResult !== true) {
                     foreach ($validationResult as $message) {
                         $this->messageManager->addError($message);
@@ -30,13 +57,13 @@ public function execute()
                     $this->_redirect('checkout/*/');
                     return;
                 }
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            } catch (LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addError(__('Something went wrong while saving this condition.'));
             }
 
-            $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setAgreementData($postData);
+            $this->_session->setAgreementData($postData);
             $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
         }
     }
diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
index 8e20feb0f058f..c027bd1a2b717 100644
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -1,27 +1,55 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Index;
 
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Controller\Result\Forward;
+use Magento\Framework\Controller\Result\ForwardFactory;
+use Magento\Framework\View\Result\Page as ResultPage;
+use Magento\Cms\Helper\Page;
+use Magento\Store\Model\ScopeInterface;
+
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var \Magento\Framework\Controller\Result\ForwardFactory
+     * @var ForwardFactory
      */
     protected $resultForwardFactory;
 
     /**
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var Page
+     */
+    private $page;
+
+    /**
+     * Index constructor.
+     *
+     * @param Context $context
+     * @param ForwardFactory $resultForwardFactory
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @param Page|null $page
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+        Context $context,
+        ForwardFactory $resultForwardFactory,
+        ScopeConfigInterface $scopeConfig = null,
+        Page $page = null
     ) {
         $this->resultForwardFactory = $resultForwardFactory;
+        $this->scopeConfig = $scopeConfig ? : ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->page = $page ? : ObjectManager::getInstance()->get(Page::class);
         parent::__construct($context);
     }
 
@@ -29,20 +57,17 @@ public function __construct(
      * Renders CMS Home page
      *
      * @param string|null $coreRoute
-     * @return \Magento\Framework\Controller\Result\Forward
+     *
+     * @return bool|ResponseInterface|Forward|ResultInterface|ResultPage
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($coreRoute = null)
     {
-        $pageId = $this->_objectManager->get(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class
-        )->getValue(
-            \Magento\Cms\Helper\Page::XML_PATH_HOME_PAGE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-        $resultPage = $this->_objectManager->get(\Magento\Cms\Helper\Page::class)->prepareResultPage($this, $pageId);
+        $pageId = $this->scopeConfig->getValue(Page::XML_PATH_HOME_PAGE, ScopeInterface::SCOPE_STORE);
+        $resultPage = $this->page->prepareResultPage($this, $pageId);
         if (!$resultPage) {
-            /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+            /** @var Forward $resultForward */
             $resultForward = $this->resultForwardFactory->create();
             $resultForward->forward('defaultIndex');
             return $resultForward;
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithAllValuesActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithAllValuesActionGroup.xml
new file mode 100644
index 0000000000000..48b10d0ee48be
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithAllValuesActionGroup.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateNewPageWithAllValues">
+        <arguments>
+            <argument name="pageTitle" type="string"/>
+            <argument name="contentHeading" type="string"/>
+            <argument name="urlKey" type="string"/>
+            <argument name="selectStoreViewOpt" type="string"/>
+        </arguments>
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnCMSNewPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <waitForElementVisible selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" stepKey="waitUntilTitleAppears"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{pageTitle}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
+        <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{contentHeading}}" stepKey="fillFieldContentHeading"/>
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimization"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{urlKey}}" stepKey="fillFieldUrlKey"/>
+        <click selector="{{AdminCmsNewPagePiwSection.header}}" stepKey="clickPageInWebsites"/>
+        <waitForElementVisible selector="{{AdminCmsNewPagePiwSection.selectStoreView(selectStoreViewOpt)}}" stepKey="waitForStoreGridReload"/>
+        <clickWithLeftButton selector="{{AdminCmsNewPagePiwSection.selectStoreView(selectStoreViewOpt)}}" stepKey="clickStoreView2"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml
new file mode 100644
index 0000000000000..05e61ac86e166
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeletePageByUrlKeyActionGroup">
+        <arguments>
+            <argument name="urlKey" type="string"/>
+        </arguments>
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnCMSPagesIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{CmsPagesPageActionsSection.select(urlKey)}}" stepKey="clickSelect"/>
+        <click selector="{{CmsPagesPageActionsSection.delete(urlKey)}}" stepKey="clickDelete"/>
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="waitForOkButtonToBeVisible"/>
+        <click selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="clickOkButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <see userInput="The page has been deleted." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
index b165d6c044c2b..bb8dc9cf9159c 100644
--- a/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
@@ -13,5 +13,6 @@
         <section name="CmsNewPagePageBasicFieldsSection"/>
         <section name="CmsNewPagePageContentSection"/>
         <section name="CmsNewPagePageSeoSection"/>
+        <section name="AdminCmsNewPagePiwSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsNewPagePiwSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsNewPagePiwSection.xml
new file mode 100644
index 0000000000000..ce22bae4e2b93
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsNewPagePiwSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminCmsNewPagePiwSection">
+        <element name="header" type="button" selector="div[data-index=websites]" timeout="30"/>
+        <element name="selectStoreView" type="select" selector="//option[contains(text(),'{{var1}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
index 3b9d2ddd9fcf2..f60fced7d05d4 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewPagePageActionsSection">
         <element name="savePage" type="button" selector="#save" timeout="30"/>
+        <element name="saveAndContinueEdit" type="button" selector="#save_and_continue" timeout="10"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
index b3946b74439a1..63069c2ccf264 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
@@ -13,5 +13,7 @@
         <element name="select" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" parameterized="true"/>
         <element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']" parameterized="true"/>
         <element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Preview']" parameterized="true"/>
+        <element name="delete" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Delete']" parameterized="true"/>
+        <element name="deleteConfirm" type="button" selector=".action-primary.action-accept" timeout="60"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php
index 8ff206e8a80fc..d8453bc6ecbce 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php
@@ -84,7 +84,9 @@ protected function setUp()
                 'response' => $responseMock,
                 'objectManager' => $objectManagerMock,
                 'request' => $this->requestMock,
-                'resultForwardFactory' => $this->forwardFactoryMock
+                'resultForwardFactory' => $this->forwardFactoryMock,
+                'scopeConfig' => $scopeConfigMock,
+                'page' => $this->cmsHelperMock
             ]
         );
     }
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
index b86b86ad3bb8c..4ae66bfd9692b 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
@@ -71,7 +71,7 @@ protected function _getCurrencyBase()
                 $this->getScopeId()
             );
         }
-        return strval($value);
+        return (string)$value;
     }
 
     /**
@@ -88,7 +88,7 @@ protected function _getCurrencyDefault()
                 $this->getScopeId()
             );
         }
-        return strval($value);
+        return (string)$value;
     }
 
     /**
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
index f6f3a0be187a3..2733847bab1d0 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php
@@ -55,11 +55,11 @@ protected function _cmp($elementA, $elementB)
     {
         $sortIndexA = 0;
         if ($this->_hasValue('sortOrder', $elementA)) {
-            $sortIndexA = floatval($elementA['sortOrder']);
+            $sortIndexA = (float)$elementA['sortOrder'];
         }
         $sortIndexB = 0;
         if ($this->_hasValue('sortOrder', $elementB)) {
-            $sortIndexB = floatval($elementB['sortOrder']);
+            $sortIndexB = (float)$elementB['sortOrder'];
         }
 
         if ($sortIndexA == $sortIndexB) {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
index 63eec3bb698bb..4c7c5df736112 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
@@ -19,6 +19,8 @@ class Configurable extends Renderer implements IdentityInterface
 {
     /**
      * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     * @deprecated moved to model because of class refactoring
+     * @see \Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver::CONFIG_THUMBNAIL_SOURCE
      */
     const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/configurable_product_image';
 
@@ -55,32 +57,6 @@ public function getOptionList()
         return $this->_productConfig->getOptions($this->getItem());
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProductForThumbnail()
-    {
-        /**
-         * Show parent product thumbnail if it must be always shown according to the related setting in system config
-         * or if child thumbnail is not available
-         */
-        if ($this->_scopeConfig->getValue(
-            self::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
-            !(
-                $this->getChildProduct() &&
-                $this->getChildProduct()->getThumbnail() &&
-                $this->getChildProduct()->getThumbnail() != 'no_selection'
-            )
-        ) {
-            $product = $this->getProduct();
-        } else {
-            $product = $this->getChildProduct();
-        }
-        return $product;
-    }
-
     /**
      * Return identifiers for produced content
      *
diff --git a/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php b/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
index 67e51b3797540..e8169fd926ae5 100644
--- a/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
+++ b/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
@@ -11,6 +11,9 @@
 
 /**
  * Configurable item
+ *
+ * @deprecated moved to model because of class refactoring
+ * @see \Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver
  */
 class ConfigurableItem extends DefaultItem
 {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php b/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php
new file mode 100644
index 0000000000000..d63ff06b7a483
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Catalog\Model\Product;
+
+/**
+ * {@inheritdoc}
+ */
+class ItemProductResolver implements ItemResolverInterface
+{
+    /**
+     * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     */
+    const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/configurable_product_image';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFinalProduct(ItemInterface $item): ProductInterface
+    {
+        /**
+         * Show parent product thumbnail if it must be always shown according to the related setting in system config
+         * or if child thumbnail is not available.
+         */
+        $parentProduct = $item->getProduct();
+        $finalProduct = $parentProduct;
+        $childProduct = $this->getChildProduct($item);
+
+        if ($childProduct !== $parentProduct) {
+            $configValue = $this->scopeConfig->getValue(
+                self::CONFIG_THUMBNAIL_SOURCE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            );
+            $childThumb = $childProduct->getData('thumbnail');
+            $finalProduct =
+                ($configValue == Thumbnail::OPTION_USE_PARENT_IMAGE) || (!$childThumb || $childThumb == 'no_selection')
+                    ? $parentProduct
+                    : $childProduct;
+        }
+
+        return $finalProduct;
+    }
+
+    /**
+     * Get item configurable child product.
+     *
+     * @param ItemInterface $item
+     * @return Product
+     */
+    private function getChildProduct(ItemInterface $item): Product
+    {
+        $option = $item->getOptionByCode('simple_product');
+        $product = $item->getProduct();
+
+        if ($option) {
+            $product = $option->getProduct();
+        }
+
+        return $product;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 2bfee9fc6e794..f98075f2294cc 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -930,6 +930,8 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                         return $result;
                     }
                 }
+            } elseif (is_string($result)) {
+                return __($result)->render();
             }
         }
 
diff --git a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
index 4450bbd75e574..85493b81bc6d4 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
@@ -69,7 +69,7 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
             if (is_array($options)) {
                 $requestData = [];
                 foreach ($options as $option) {
-                    $requestData['super_attribute'][$option->getOptionId()] = $option->getOptionValue();
+                    $requestData['super_attribute'][$option->getOptionId()] = (string) $option->getOptionValue();
                 }
                 return $this->objectFactory->create($requestData);
             }
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
index 5d9eed0a188fc..ef5005d7bf5e0 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
@@ -91,7 +91,7 @@ public function getSelect(AbstractAttribute $superAttribute, int $productId, Sco
                 ]
             ),
             []
-        )->joinInner(
+        )->joinLeft(
             ['attribute_option' => $this->attributeResource->getTable('eav_attribute_option')],
             'attribute_option.option_id = entity_value.value',
             []
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
new file mode 100644
index 0000000000000..462fd64031849
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!--
+
+    Create a configurable product with three options for color: red, white, and blue
+
+    Expected start state = logged in as an admin
+    End state = on the product edit page in the admin
+
+    -->
+    <actionGroup name="createConfigurableProduct">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+            <argument name="category" defaultValue="_defaultCategory"/>
+        </arguments>
+
+        <!-- fill in basic configurable product values -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad time="30" stepKey="wait1"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
+        <click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" stepKey="clickOnAddConfigurableProduct"/>
+        <fillField userInput="{{product.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{product.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{product.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="fillCategory"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{product.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+
+        <!-- create configurations for colors the product is available in -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
+        <waitForPageLoad stepKey="waitForIFrame"/>
+        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{colorProductAttribute.default_label}}" stepKey="fillDefaultLabel"/>
+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+        <waitForPageLoad stepKey="waitForFilters"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.filters}}" stepKey="clickOnFilters"/>
+        <fillField userInput="{{colorProductAttribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanelSection.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
+        <fillField userInput="{{colorProductAttribute1.name}}" selector="{{AdminCreateProductConfigurationsPanelSection.attributeName}}" stepKey="fillFieldForNewAttribute1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.createNewValue}}" stepKey="clickOnCreateNewValue2"/>
+        <fillField userInput="{{colorProductAttribute2.name}}" selector="{{AdminCreateProductConfigurationsPanelSection.attributeName}}" stepKey="fillFieldForNewAttribute2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.saveAttribute}}" stepKey="clickOnSaveNewAttribute2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.createNewValue}}" stepKey="clickOnCreateNewValue3"/>
+        <fillField userInput="{{colorProductAttribute3.name}}" selector="{{AdminCreateProductConfigurationsPanelSection.attributeName}}" stepKey="fillFieldForNewAttribute3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.saveAttribute}}" stepKey="clickOnSaveNewAttribute3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.selectAll}}" stepKey="clickOnSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.applyUniquePricesByAttributeToEachSku}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
+        <selectOption selector="{{AdminCreateProductConfigurationsPanelSection.selectAttribute}}" userInput="{{colorProductAttribute.default_label}}" stepKey="selectAttributes"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.attribute('0')}}" userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice1"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.attribute('1')}}" userInput="{{colorProductAttribute2.price}}" stepKey="fillAttributePrice2"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.attribute('2')}}" userInput="{{colorProductAttribute3.price}}" stepKey="fillAttributePrice3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="clickOnNextButton4"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <click selector="{{AdminChooseAffectedAttributeSetSection.confirm}}" stepKey="clickOnConfirmInPopup"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="seeProductNameInTitle"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
index f7f1eb8bc5ef7..83e0aa1deaedf 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
@@ -15,6 +15,7 @@
         <data key="visibility">4</data>
         <data key="name" unique="suffix">configurable</data>
         <data key="price">123.00</data>
+        <data key="weight">2</data>
         <data key="urlKey" unique="suffix">configurableurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
index a9973c5fabbb9..15392480108a5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -10,5 +10,8 @@
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <section name="AdminNewAttributePanel"/>
+        <section name="AdminProductFormConfigurationsSection"/>
+        <section name="AdminCreateProductConfigurationsPanelSection"/>
+        <section name="AdminChooseAffectedAttributeSetSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml
new file mode 100644
index 0000000000000..7b7b5e8b39aa6
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerWishlistPage" url="/wishlist/" area="storefront" module="Magento_Wishlist">
+        <section name="StorefrontCustomerWishlistSection" />
+        <section name="StorefrontCustomerWishlistProductSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
new file mode 100644
index 0000000000000..ca3e2e9cee1b1
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminChooseAffectedAttributeSetSection">
+        <element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
new file mode 100644
index 0000000000000..b1caaa5782c8f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminCreateProductConfigurationsPanelSection">
+        <element name="next" type="button" selector=".steps-wizard-navigation .action-next-step" timeout="30"/>
+        <element name="createNewAttribute" type="button" selector=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
+        <element name="attributeCode" type="input" selector=".admin__control-text[name='attribute_code']"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
+        <element name="selectAll" type="button" selector=".action-select-all"/>
+        <element name="selectAllByAttribute" type="button" selector="//div[@data-attribute-title='{{attr}}']//button[contains(@class, 'action-select-all')]" parameterized="true"/>
+        <element name="createNewValue" type="input" selector=".action-create-new" timeout="30"/>
+        <element name="attributeName" type="input" selector="li[data-attribute-option-title=''] .admin__field-create-new .admin__control-text"/>
+        <element name="saveAttribute" type="button" selector="li[data-attribute-option-title=''] .action-save" timeout="30"/>
+        <element name="applyUniquePricesByAttributeToEachSku" type="radio" selector=".admin__field-label[for='apply-unique-prices-radio']"/>
+        <element name="selectAttribute" type="select" selector="#select-each-price" timeout="30"/>
+        <element name="attribute" type="input" selector="#apply-single-price-input-{{var1}}" parameterized="true"/>
+        <element name="applySingleQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
+        <element name="quantity" type="input" selector="#apply-single-inventory-input"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
new file mode 100644
index 0000000000000..5ae70488d164d
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormConfigurationsSection">
+        <element name="sectionHeader" type="text" selector=".admin__collapsible-block-wrapper[data-index='configurable']"/>
+        <element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="30"/>
+        <element name="currentVariationsRows" type="button" selector=".data-row"/>
+        <element name="currentVariationsNameCells" type="textarea" selector=".admin__control-fields[data-index='name_container']"/>
+        <element name="currentVariationsSkuCells" type="textarea" selector=".admin__control-fields[data-index='sku_container']"/>
+        <element name="currentVariationsPriceCells" type="textarea" selector=".admin__control-fields[data-index='price_container']"/>
+        <element name="currentVariationsQuantityCells" type="textarea" selector=".admin__control-fields[data-index='quantity_container']"/>
+        <element name="currentVariationsAttributesCells" type="textarea" selector=".admin__control-fields[data-index='attributes']"/>
+        <element name="currentVariationsStatusCells" type="textarea" selector="._no-header[data-index='status']"/>
+        <element name="actionsBtn" type="button" selector="(//button[@class='action-select']/span[contains(text(), 'Select')])[{{var1}}]" parameterized="true"/>
+        <element name="removeProductBtn" type="button" selector="//a[text()='Remove Product']"/>
+        <element name="disableProductBtn" type="button" selector="//a[text()='Disable Product']"/>
+        <element name="enableProductBtn" type="button" selector="//a[text()='Enable Product']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
new file mode 100644
index 0000000000000..da738d95d038e
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerWishlistProductSection">
+        <element name="productImageByImageName" type="text" selector="//main//li//a//img[contains(@src, '{{var1}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
new file mode 100644
index 0000000000000..c7d270ab306df
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerWishlistSection">
+        <element name="successMsg" type="text" selector="div.message-success.success.message"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
new file mode 100644
index 0000000000000..1fb2dc07393a7
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerWishlistSidebarSection">
+        <element name="productImageByImageName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a//img[contains(@src, '{{var1}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index b131f326c8a99..996a392230eea 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -12,5 +12,6 @@
         <element name="productAttributeTitle" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
         <element name="productAttributeOptions" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
         <element name="stockIndication" type="block" selector=".stock" />
+        <element name="productAttributeOptionsSelectButton" type="select" selector="#product-options-wrapper .super-attribute-select"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
index 43642b2f24385..cac379e11e79a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
@@ -169,21 +169,21 @@
         <waitForPageLoad stepKey="waitForStorefront"/>
         <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createConfigProductAttributeSelectOption1.option[store_labels][0][label]$$" stepKey="searchStorefront1"/>
         <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearch1"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}" stepKey="seeProduct1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productTitleByName('$$createConfigProduct.name$$')}}" stepKey="seeProduct1"/>
 
         <!-- Quick search the storefront for the second attribute option -->
         <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createConfigProductAttributeOption2Multiselect.option[store_labels][0][label]$$" stepKey="searchStorefront2"/>
         <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearch2"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}" stepKey="seeProduct2"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productTitleByName('$$createConfigProduct.name$$')}}" stepKey="seeProduct2"/>
 
         <!-- Quick search the storefront for the first product description -->
         <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="'$$createConfigChildProduct1.custom_attributes[short_description]$$'" stepKey="searchStorefront3"/>
         <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearch3"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}" stepKey="seeProduct3"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productTitleByName('$$createConfigProduct.name$$')}}" stepKey="seeProduct3"/>
 
         <!-- Quick search the storefront for the first product name -->
         <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="'$$createConfigChildProduct1.name$$'" stepKey="searchStorefront4"/>
         <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearch4"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}" stepKey="seeProduct4"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productTitleByName('$$createConfigProduct.name$$')}}" stepKey="seeProduct4"/>
     </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
new file mode 100644
index 0000000000000..5dcbfbaf44037
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontConfigurableProductWithFileCustomOptionTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Add configurable product to cart"/>
+            <title value="Correct error message and redirect with invalid file option"/>
+            <description value="Configurable product has file custom option. When adding to cart with an invalid filetype, the correct error message is shown, and options remain selected."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-93318"/>
+            <group value="configurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="DeleteAllProductsOnProductsGridPageFilteredByName" stepKey="deleteAllCreatedProducts">
+                <argument name="product" value="BaseConfigurableProduct"/>
+            </actionGroup>
+            <actionGroup ref="DeleteProductAttribute" stepKey="deleteCreatedProductAttribute">
+                <argument name="productAttribute" value="colorProductAttribute"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logoutAdminUserAfterTest"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        <!-- Create a configurable product via the UI -->
+        <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+        <!--Add custom option to configurable product-->
+        <actionGroup ref="AddProductCustomOptionFile" stepKey="addCustomOptionToProduct"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+
+        <!--Go to storefront-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <waitForPageLoad stepKey="waitForHomePageLoad"/>
+        <click selector="{{StorefrontNavigationSection.topCategory($$createCategory.name$$)}}" stepKey="goToCategoryStorefront"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.categoryTitle}}" userInput="$$createCategory.name$$" stepKey="seeOnCategoryPage"/>
+        <!--Add configurable product to cart-->
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.productTitleByName(BaseConfigurableProduct.name)}}" stepKey="hoverProductInGrid"/>
+        <click selector="{{StorefrontCategoryProductSection.productAddToCartByName(BaseConfigurableProduct.name)}}" stepKey="tryAddToCartFromCategoryPage"/>
+        <waitForPageLoad stepKey="waitForRedirectToProductPage"/>
+        <seeInCurrentUrl url="{{StorefrontProductPage.url(BaseConfigurableProduct.urlKey)}}" stepKey="seeOnProductPage"/>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="{{colorProductAttribute2.name}}" stepKey="selectColor"/>
+        <!--Try invalid file-->
+        <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" userInput="lorem_ipsum.docx" stepKey="attachInvalidFile"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartInvalidFile"/>
+        <waitForPageLoad time="30" stepKey="waitForAddToCartWithError"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.alertMessage}}" stepKey="waitForErrorMessageInvalidFile"/>
+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="The file 'lorem_ipsum.docx' for '{{ProductOptionFile.title}}' has an invalid extension." stepKey="seeMessageInvalidFile"/>
+        <!--Option remains selected-->
+        <seeOptionIsSelected selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeOptionRemainSelected"/>
+        <!--Try valid file-->
+        <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" userInput="{{MagentoLogo.file}}" stepKey="attachValidFile"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$11.99" stepKey="seePriceUpdated"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="BaseConfigurableProduct.name"/>
+        </actionGroup>
+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="You added {{BaseConfigurableProduct.name}} to your shopping cart." stepKey="seeSuccessMessage"/>
+
+        <!--Check item in cart-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
+        <seeElement selector="{{CheckoutCartProductSection.productLinkByName(BaseConfigurableProduct.name)}}" stepKey="seeProductInCart"/>
+        <see selector="{{CheckoutCartProductSection.productOptionByNameAndAttribute(BaseConfigurableProduct.name, colorProductAttribute.default_label)}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeSelectedOption"/>
+        <see selector="{{CheckoutCartProductSection.productOptionByNameAndAttribute(BaseConfigurableProduct.name, ProductOptionFile.title)}}" userInput="{{MagentoLogo.file}}" stepKey="seeCorrectOptionFile"/>
+        <!--Delete cart item-->
+        <click selector="{{CheckoutCartProductSection.removeItem}}" stepKey="deleteCartItem"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
index e199841cbcdc4..f324494f5918a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
@@ -10,155 +10,59 @@
 
 class ConfigurableTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Framework\View\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_configManager;
+    /**
+     * @var \Magento\Framework\View\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configManager;
 
-    /** @var \Magento\Catalog\Helper\Image|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_imageHelper;
+    /**
+     * @var \Magento\Catalog\Helper\Image|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $imageHelper;
 
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_scopeConfig;
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $productConfigMock;
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productConfigMock;
 
-    /** @var Renderer */
-    protected $_renderer;
+    /**
+     * @var Renderer
+     */
+    private $renderer;
 
     protected function setUp()
     {
         parent::setUp();
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_configManager = $this->createMock(\Magento\Framework\View\ConfigInterface::class);
-        $this->_imageHelper = $this->createPartialMock(
+        $this->configManager = $this->createMock(\Magento\Framework\View\ConfigInterface::class);
+        $this->imageHelper = $this->createPartialMock(
             \Magento\Catalog\Helper\Image::class,
             ['init', 'resize', '__toString']
         );
-        $this->_scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->productConfigMock = $this->createMock(\Magento\Catalog\Helper\Product\Configuration::class);
-        $this->_renderer = $objectManagerHelper->getObject(
+        $this->renderer = $objectManagerHelper->getObject(
             \Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable::class,
             [
-                'viewConfig' => $this->_configManager,
-                'imageHelper' => $this->_imageHelper,
-                'scopeConfig' => $this->_scopeConfig,
-                'productConfig' => $this->productConfigMock
+                'viewConfig' => $this->configManager,
+                'imageHelper' => $this->imageHelper,
+                'scopeConfig' => $this->scopeConfig,
+                'productConfig' => $this->productConfigMock,
             ]
         );
     }
 
-    /**
-     * Child thumbnail is available and config option is not set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnail()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['childProduct'],
-            $productForThumbnail,
-            'Child product was expected to be returned.'
-        );
-    }
-
-    /**
-     * Child thumbnail is not available and config option is not set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnailChildThumbnailNotAvailable()
-    {
-        $childHasThumbnail = false;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned.'
-        );
-    }
-
-    /**
-     * Child thumbnail is available and config option is set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnailConfigUseParent()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = true;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned ' .
-            'if "checkout/cart/configurable_product_image option" is set to "parent" in system config.'
-        );
-    }
-
-    /**
-     * Initialize parent configurable product and child product.
-     *
-     * @param bool $childHasThumbnail
-     * @param bool $useParentThumbnail
-     * @return \Magento\Catalog\Model\Product[]|\PHPUnit_Framework_MockObject_MockObject[]
-     */
-    protected function _initProducts($childHasThumbnail = true, $useParentThumbnail = false)
-    {
-        /** Set option which can force usage of parent product thumbnail when configurable product is displayed */
-        $thumbnailToBeUsed = $useParentThumbnail
-            ? ThumbnailSource::OPTION_USE_PARENT_IMAGE
-            : ThumbnailSource::OPTION_USE_OWN_IMAGE;
-        $this->_scopeConfig->expects(
-            $this->any()
-        )->method(
-            'getValue'
-        )->with(
-            Renderer::CONFIG_THUMBNAIL_SOURCE
-        )->will(
-            $this->returnValue($thumbnailToBeUsed)
-        );
-
-        /** Initialized parent product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $parentProduct */
-        $parentProduct = $this->createMock(\Magento\Catalog\Model\Product::class);
-
-        /** Initialize child product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $childProduct */
-        $childProduct = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getThumbnail', '__wakeup']);
-        $childThumbnail = $childHasThumbnail ? 'thumbnail.jpg' : 'no_selection';
-        $childProduct->expects($this->any())->method('getThumbnail')->will($this->returnValue($childThumbnail));
-
-        /** Mock methods which return parent and child products */
-        /** @var \Magento\Quote\Model\Quote\Item\Option|\PHPUnit_Framework_MockObject_MockObject $itemOption */
-        $itemOption = $this->createMock(\Magento\Quote\Model\Quote\Item\Option::class);
-        $itemOption->expects($this->any())->method('getProduct')->will($this->returnValue($childProduct));
-        /** @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject $item */
-        $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($parentProduct));
-        $item->expects(
-            $this->any()
-        )->method(
-            'getOptionByCode'
-        )->with(
-            'simple_product'
-        )->will(
-            $this->returnValue($itemOption)
-        );
-        $this->_renderer->setItem($item);
-
-        return ['parentProduct' => $parentProduct, 'childProduct' => $childProduct];
-    }
-
     public function testGetOptionList()
     {
         $itemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $this->_renderer->setItem($itemMock);
+        $this->renderer->setItem($itemMock);
         $this->productConfigMock->expects($this->once())->method('getOptions')->with($itemMock);
-        $this->_renderer->getOptionList();
+        $this->renderer->getOptionList();
     }
 
     public function testGetIdentities()
@@ -168,7 +72,7 @@ public function testGetIdentities()
         $product->expects($this->exactly(2))->method('getIdentities')->will($this->returnValue($productTags));
         $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
         $item->expects($this->exactly(2))->method('getProduct')->will($this->returnValue($product));
-        $this->_renderer->setItem($item);
-        $this->assertEquals(array_merge($productTags, $productTags), $this->_renderer->getIdentities());
+        $this->renderer->setItem($item);
+        $this->assertEquals(array_merge($productTags, $productTags), $this->renderer->getIdentities());
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php
new file mode 100644
index 0000000000000..28e3e5e4cb5c6
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
+use Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Tests \Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver
+ */
+class ItemProductResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ItemProductResolver
+     */
+    private $resolver;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new ObjectManager($this);
+        $this->scopeConfig = $this->createPartialMock(ScopeConfigInterface::class, ['getValue', 'isSetFlag']);
+        $this->resolver = $objectManagerHelper->getObject(
+            ItemProductResolver::class,
+            ['scopeConfig' => $this->scopeConfig]
+        );
+    }
+
+    /**
+     * @param bool $existOption
+     * @param string $configImageSource
+     * @return void
+     * @dataProvider getFinalProductDataProvider
+     */
+    public function testGetFinalProduct(bool $existOption, string $configImageSource)
+    {
+        $option = null;
+        $parentProduct = $this->createMock(Product::class);
+        $finalProduct = $parentProduct;
+
+        if ($existOption) {
+            $childProduct = $this->createPartialMock(Product::class, ['getData']);
+            $childProduct->expects($this->once())->method('getData')->with('thumbnail')->willReturn('someImage');
+
+            $option = $this->createPartialMock(
+                OptionInterface::class,
+                ['getProduct', 'getValue']
+            );
+            $option->expects($this->once())->method('getProduct')->willReturn($childProduct);
+
+            $this->scopeConfig->expects($this->once())
+                ->method('getValue')
+                ->with(ItemProductResolver::CONFIG_THUMBNAIL_SOURCE, ScopeInterface::SCOPE_STORE)
+                ->willReturn($configImageSource);
+
+            $finalProduct = ($configImageSource == Thumbnail::OPTION_USE_PARENT_IMAGE) ? $parentProduct : $childProduct;
+        }
+
+        $item = $this->createPartialMock(
+            ItemInterface::class,
+            ['getProduct', 'getOptionByCode', 'getFileDownloadParams']
+        );
+        $item->expects($this->exactly(2))->method('getProduct')->willReturn($parentProduct);
+        $item->expects($this->once())->method('getOptionByCode')->with('simple_product')->willReturn($option);
+
+        $this->assertEquals($finalProduct, $this->resolver->getFinalProduct($item));
+    }
+
+    /**
+     * @return array
+     */
+    public function getFinalProductDataProvider(): array
+    {
+        return [
+            [false, Thumbnail::OPTION_USE_PARENT_IMAGE],
+            [true, Thumbnail::OPTION_USE_PARENT_IMAGE],
+            [true, Thumbnail::OPTION_USE_OWN_IMAGE],
+        ];
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
index 9802c97372bbb..537288618b648 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
@@ -112,8 +112,8 @@ public function testGetSelect()
     {
         $this->select->expects($this->exactly(1))->method('from')->willReturnSelf();
         $this->select->expects($this->exactly(1))->method('columns')->willReturnSelf();
-        $this->select->expects($this->exactly(6))->method('joinInner')->willReturnSelf();
-        $this->select->expects($this->exactly(3))->method('joinLeft')->willReturnSelf();
+        $this->select->expects($this->exactly(5))->method('joinInner')->willReturnSelf();
+        $this->select->expects($this->exactly(4))->method('joinLeft')->willReturnSelf();
         $this->select->expects($this->exactly(1))->method('order')->willReturnSelf();
         $this->select->expects($this->exactly(2))->method('where')->willReturnSelf();
 
@@ -156,8 +156,8 @@ public function testGetSelectWithBackendModel()
     {
         $this->select->expects($this->exactly(1))->method('from')->willReturnSelf();
         $this->select->expects($this->exactly(0))->method('columns')->willReturnSelf();
-        $this->select->expects($this->exactly(6))->method('joinInner')->willReturnSelf();
-        $this->select->expects($this->exactly(1))->method('joinLeft')->willReturnSelf();
+        $this->select->expects($this->exactly(5))->method('joinInner')->willReturnSelf();
+        $this->select->expects($this->exactly(2))->method('joinLeft')->willReturnSelf();
         $this->select->expects($this->exactly(1))->method('order')->willReturnSelf();
         $this->select->expects($this->exactly(2))->method('where')->willReturnSelf();
 
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index 43e70f3766dca..dfbad0dd5a764 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -221,4 +221,11 @@
     <type name="Magento\Catalog\Model\Product">
         <plugin name="product_identities_extender" type="Magento\ConfigurableProduct\Model\Plugin\ProductIdentitiesExtender" />
     </type>
+    <type name="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite">
+        <arguments>
+            <argument name="itemResolvers" xsi:type="array">
+                <item name="configurable" xsi:type="string">Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
index 592b0292c98ab..bb830c36b929d 100644
--- a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
@@ -7,13 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
-        <arguments>
-            <argument name="itemMap" xsi:type="array">
-                <item name="configurable" xsi:type="string">Magento\ConfigurableProduct\CustomerData\ConfigurableItem</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
         <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
     </type>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
index be290e49a43c3..e2e0faec3b805 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
@@ -407,15 +407,17 @@ define([
          *   - associated_product_ids_serialized.
          */
         serializeData: function () {
-            this.source.data['configurable-matrix-serialized'] =
-                JSON.stringify(this.source.data['configurable-matrix']);
-
-            delete this.source.data['configurable-matrix'];
-
-            this.source.data['associated_product_ids_serialized'] =
-                JSON.stringify(this.source.data['associated_product_ids']);
+            if (this.source.data['configurable-matrix']) {
+                this.source.data['configurable-matrix-serialized'] =
+                    JSON.stringify(this.source.data['configurable-matrix']);
+                delete this.source.data['configurable-matrix'];
+            }
 
-            delete this.source.data['associated_product_ids'];
+            if (this.source.data['associated_product_ids']) {
+                this.source.data['associated_product_ids_serialized'] =
+                    JSON.stringify(this.source.data['associated_product_ids']);
+                delete this.source.data['associated_product_ids'];
+            }
         },
 
         /**
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
index 9b8e2c0c8c0bd..f5ed067967547 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
@@ -38,6 +38,9 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
                     "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
                         'Magento_ConfigurableProduct') ?: 'replace'; ?>"
                 }
+            },
+            "*" : {
+                "Magento_ConfigurableProduct/js/catalog-add-to-cart": {}
             }
         }
     </script>
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/catalog-add-to-cart.js
new file mode 100644
index 0000000000000..3e6a611c268af
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/catalog-add-to-cart.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+require([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    /**
+     * Add selected configurable attributes to redirect url
+     *
+     * @see Magento_Catalog/js/catalog-add-to-cart
+     */
+    $('body').on('catalogCategoryAddToCartRedirect', function (event, data) {
+        $(data.form).find('select[name*="super"]').each(function (index, item) {
+            data.redirectParameters.push(item.config.id + '=' + $(item).val());
+        });
+    });
+});
diff --git a/app/code/Magento/Customer/view/frontend/requirejs-config.js b/app/code/Magento/Customer/view/frontend/requirejs-config.js
index 20dd53ded11c9..f1bf5c1d1b67f 100644
--- a/app/code/Magento/Customer/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Customer/view/frontend/requirejs-config.js
@@ -7,11 +7,13 @@ var config = {
     map: {
         '*': {
             checkoutBalance:    'Magento_Customer/js/checkout-balance',
-            address:            'Magento_Customer/address',
-            changeEmailPassword: 'Magento_Customer/change-email-password',
+            address:            'Magento_Customer/js/address',
+            changeEmailPassword: 'Magento_Customer/js/change-email-password',
             passwordStrengthIndicator: 'Magento_Customer/js/password-strength-indicator',
             zxcvbn: 'Magento_Customer/js/zxcvbn',
-            addressValidation: 'Magento_Customer/js/addressValidation'
+            addressValidation: 'Magento_Customer/js/addressValidation',
+            'Magento_Customer/address': 'Magento_Customer/js/address',
+            'Magento_Customer/change-email-password': 'Magento_Customer/js/change-email-password'
         }
     }
 };
diff --git a/app/code/Magento/Customer/view/frontend/web/address.js b/app/code/Magento/Customer/view/frontend/web/js/address.js
similarity index 100%
rename from app/code/Magento/Customer/view/frontend/web/address.js
rename to app/code/Magento/Customer/view/frontend/web/js/address.js
diff --git a/app/code/Magento/Customer/view/frontend/web/change-email-password.js b/app/code/Magento/Customer/view/frontend/web/js/change-email-password.js
similarity index 100%
rename from app/code/Magento/Customer/view/frontend/web/change-email-password.js
rename to app/code/Magento/Customer/view/frontend/web/js/change-email-password.js
diff --git a/app/code/Magento/Deploy/etc/di.xml b/app/code/Magento/Deploy/etc/di.xml
index ce7c84c95538a..fd604aa1b397b 100644
--- a/app/code/Magento/Deploy/etc/di.xml
+++ b/app/code/Magento/Deploy/etc/di.xml
@@ -78,6 +78,9 @@
                     <item name="production" xsi:type="array">
                         <item name="dev/debug/debug_logging" xsi:type="string">0</item>
                     </item>
+                    <item name="developer" xsi:type="array">
+                        <item name="dev/debug/debug_logging" xsi:type="null" />
+                    </item>
                 </item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
index f39c33408f90b..6a2ebb4531502 100644
--- a/app/code/Magento/Directory/Model/Currency.php
+++ b/app/code/Magento/Directory/Model/Currency.php
@@ -225,7 +225,7 @@ public function convert($price, $toCurrency = null)
         if ($toCurrency === null) {
             return $price;
         } elseif ($rate = $this->getRate($toCurrency)) {
-            return floatval($price) * floatval($rate);
+            return (float)$price * (float)$rate;
         }
 
         throw new \Exception(__(
diff --git a/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php b/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
index 3e0bd5368509e..f1c63ede74151 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
@@ -5,15 +5,18 @@
  */
 namespace Magento\Directory\Model\Currency\Import;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * Currency rate import model (From http://fixer.io/)
  */
-class FixerIo extends \Magento\Directory\Model\Currency\Import\AbstractImport
+class FixerIo extends AbstractImport
 {
     /**
      * @var string
      */
-    const CURRENCY_CONVERTER_URL = 'http://api.fixer.io/latest?base={{CURRENCY_FROM}}&symbols={{CURRENCY_TO}}';
+    const CURRENCY_CONVERTER_URL = 'http://data.fixer.io/api/latest?access_key={{ACCESS_KEY}}'
+        . '&base={{CURRENCY_FROM}}&symbols={{CURRENCY_TO}}';
 
     /**
      * Http Client Factory
@@ -65,6 +68,13 @@ public function fetchRates()
         return $data;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function _convert($currencyFrom, $currencyTo)
+    {
+    }
+
     /**
      * Return currencies convert rates in batch mode
      *
@@ -75,9 +85,19 @@ public function fetchRates()
      */
     private function convertBatch($data, $currencyFrom, $currenciesTo)
     {
+        $accessKey = $this->scopeConfig->getValue('currency/fixerio/api_key', ScopeInterface::SCOPE_STORE);
+        if (empty($accessKey)) {
+            $this->_messages[] = __('No API Key was specified or an invalid API Key was specified.');
+            $data[$currencyFrom] = $this->makeEmptyResponse($currenciesTo);
+            return $data;
+        }
+
         $currenciesStr = implode(',', $currenciesTo);
-        $url = str_replace('{{CURRENCY_FROM}}', $currencyFrom, self::CURRENCY_CONVERTER_URL);
-        $url = str_replace('{{CURRENCY_TO}}', $currenciesStr, $url);
+        $url = str_replace(
+            ['{{ACCESS_KEY}}', '{{CURRENCY_FROM}}', '{{CURRENCY_TO}}'],
+            [$accessKey, $currencyFrom, $currenciesStr],
+            self::CURRENCY_CONVERTER_URL
+        );
 
         set_time_limit(0);
         try {
@@ -86,6 +106,11 @@ private function convertBatch($data, $currencyFrom, $currenciesTo)
             ini_restore('max_execution_time');
         }
 
+        if (!$this->validateResponse($response, $currencyFrom)) {
+            $data[$currencyFrom] = $this->makeEmptyResponse($currenciesTo);
+            return $data;
+        }
+
         foreach ($currenciesTo as $currencyTo) {
             if ($currencyFrom == $currencyTo) {
                 $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1);
@@ -117,18 +142,17 @@ private function getServiceResponse($url, $retry = 0)
         $response = [];
 
         try {
-            $jsonResponse = $httpClient->setUri(
-                $url
-            )->setConfig(
-                [
-                    'timeout' => $this->scopeConfig->getValue(
-                        'currency/fixerio/timeout',
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    ),
-                ]
-            )->request(
-                'GET'
-            )->getBody();
+            $jsonResponse = $httpClient->setUri($url)
+                ->setConfig(
+                    [
+                        'timeout' => $this->scopeConfig->getValue(
+                            'currency/fixerio/timeout',
+                            ScopeInterface::SCOPE_STORE
+                        ),
+                    ]
+                )
+                ->request('GET')
+                ->getBody();
 
             $response = json_decode($jsonResponse, true);
         } catch (\Exception $e) {
@@ -140,9 +164,38 @@ private function getServiceResponse($url, $retry = 0)
     }
 
     /**
-     * {@inheritdoc}
+     * Validates rates response.
+     *
+     * @param array $response
+     * @param string $baseCurrency
+     * @return bool
      */
-    protected function _convert($currencyFrom, $currencyTo)
+    private function validateResponse(array $response, string $baseCurrency): bool
+    {
+        if ($response['success']) {
+            return true;
+        }
+
+        $errorCodes = [
+            101 => __('No API Key was specified or an invalid API Key was specified.'),
+            102 => __('The account this API request is coming from is inactive.'),
+            105 => __('The "%1" is not allowed as base currency for your subscription plan.', $baseCurrency),
+            201 => __('An invalid base currency has been entered.'),
+        ];
+
+        $this->_messages[] = $errorCodes[$response['error']['code']] ?? __('Currency rates can\'t be retrieved.');
+
+        return false;
+    }
+
+    /**
+     * Creates array for provided currencies with empty rates.
+     *
+     * @param array $currenciesTo
+     * @return array
+     */
+    private function makeEmptyResponse(array $currenciesTo): array
     {
+        return array_fill_keys($currenciesTo, null);
     }
 }
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
deleted file mode 100644
index fa3c3a9018dbc..0000000000000
--- a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Directory\Model\Currency\Import;
-
-/**
- * Currency rate import model (From www.webservicex.net)
- */
-class Webservicex extends \Magento\Directory\Model\Currency\Import\AbstractImport
-{
-    /**
-     * Currency converter url
-     */
-    const CURRENCY_CONVERTER_URL = 'http://www.webservicex.net/CurrencyConvertor.asmx/ConversionRate'
-        . '?FromCurrency={{CURRENCY_FROM}}&ToCurrency={{CURRENCY_TO}}';
-
-    /**
-     * Http Client Factory
-     *
-     * @var \Magento\Framework\HTTP\ZendClientFactory
-     */
-    protected $httpClientFactory;
-
-    /**
-     * Core scope config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * Constructor
-     *
-     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\HTTP\ZendClientFactory|null $zendClientFactory
-     */
-    public function __construct(
-        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\HTTP\ZendClientFactory $zendClientFactory = null
-    ) {
-        parent::__construct($currencyFactory);
-        $this->scopeConfig = $scopeConfig;
-        $this->httpClientFactory = $zendClientFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\HTTP\ZendClientFactory::class);
-    }
-
-    /**
-     * @param string $currencyFrom
-     * @param string $currencyTo
-     * @param int $retry
-     * @return float|null
-     */
-    protected function _convert($currencyFrom, $currencyTo, $retry = 0)
-    {
-        $url = str_replace('{{CURRENCY_FROM}}', $currencyFrom, self::CURRENCY_CONVERTER_URL);
-        $url = str_replace('{{CURRENCY_TO}}', $currencyTo, $url);
-        /** @var \Magento\Framework\HTTP\ZendClient $httpClient */
-        $httpClient = $this->httpClientFactory->create();
-
-        try {
-            $response = $httpClient->setUri(
-                $url
-            )->setConfig(
-                [
-                    'timeout' => $this->scopeConfig->getValue(
-                        'currency/webservicex/timeout',
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    ),
-                ]
-            )->request(
-                'GET'
-            )->getBody();
-
-            $xml = simplexml_load_string($response, null, LIBXML_NOERROR);
-            if (!$xml || (isset($xml[0]) && $xml[0] == -1)) {
-                $this->_messages[] = __('We can\'t retrieve a rate from %1.', $url);
-                return null;
-            }
-            return (double)$xml;
-        } catch (\Exception $e) {
-            if ($retry == 0) {
-                $this->_convert($currencyFrom, $currencyTo, 1);
-            } else {
-                $this->_messages[] = __('We can\'t retrieve a rate from %1.', $url);
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Directory/Model/Currency/Import/YahooFinance.php b/app/code/Magento/Directory/Model/Currency/Import/YahooFinance.php
deleted file mode 100644
index 5f96b8627af65..0000000000000
--- a/app/code/Magento/Directory/Model/Currency/Import/YahooFinance.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Directory\Model\Currency\Import;
-
-/**
- * Currency rate import model (From http://query.yahooapis.com/)
- */
-class YahooFinance extends \Magento\Directory\Model\Currency\Import\AbstractImport
-{
-    // @codingStandardsIgnoreStart
-
-    // @codingStandardsIgnoreStart
-    private $currencyConverterUrl = 'http://query.yahooapis.com/v1/public/yql?format=json&q={{YQL_STRING}}&env=store://datatables.org/alltableswithkeys';
-    // @codingStandardsIgnoreEnd
-
-    // @codingStandardsIgnoreEnd
-    private $timeoutConfigPath = 'currency/yahoofinance/timeout';
-
-    /**
-     * Http Client Factory
-     *
-     * @var \Magento\Framework\HTTP\ZendClientFactory
-     */
-    protected $httpClientFactory;
-
-    /**
-     * Core scope config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * Initialize dependencies
-     *
-     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
-     */
-    public function __construct(
-        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
-    ) {
-        parent::__construct($currencyFactory);
-        $this->scopeConfig = $scopeConfig;
-        $this->httpClientFactory = $httpClientFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetchRates()
-    {
-        $data = [];
-        $currencies = $this->_getCurrencyCodes();
-        $defaultCurrencies = $this->_getDefaultCurrencyCodes();
-
-        foreach ($defaultCurrencies as $currencyFrom) {
-            if (!isset($data[$currencyFrom])) {
-                $data[$currencyFrom] = [];
-            }
-            $data = $this->convertBatch($data, $currencyFrom, $currencies);
-            ksort($data[$currencyFrom]);
-        }
-        return $data;
-    }
-
-    /**
-     * Return currencies convert rates in batch mode
-     *
-     * @param array $data
-     * @param string $currencyFrom
-     * @param array $currenciesTo
-     * @return array
-     */
-    private function convertBatch($data, $currencyFrom, $currenciesTo)
-    {
-        $url = $this->buildUrl($currencyFrom, $currenciesTo);
-        set_time_limit(0);
-        try {
-            $response = $this->getServiceResponse($url);
-        } finally {
-            ini_restore('max_execution_time');
-        }
-
-        foreach ($currenciesTo as $currencyTo) {
-            if ($currencyFrom == $currencyTo) {
-                $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1);
-            } else {
-                if (empty($response[$currencyFrom . $currencyTo])) {
-                    $this->_messages[] = __('We can\'t retrieve a rate from %1 for %2.', $url, $currencyTo);
-                    $data[$currencyFrom][$currencyTo] = null;
-                } else {
-                    $data[$currencyFrom][$currencyTo] = $this->_numberFormat(
-                        (double)$response[$currencyFrom . $currencyTo]
-                    );
-                }
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Get Fixer.io service response
-     *
-     * @param string $url
-     * @param int $retry
-     * @return array
-     */
-    private function getServiceResponse($url, $retry = 0)
-    {
-        /** @var \Magento\Framework\HTTP\ZendClient $httpClient */
-        $httpClient = $this->httpClientFactory->create();
-        $response = [];
-        try {
-            $jsonResponse = $httpClient->setUri(
-                $url
-            )->setConfig(
-                [
-                    'timeout' => $this->scopeConfig->getValue(
-                        $this->timeoutConfigPath,
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    ),
-                ]
-            )->request(
-                'GET'
-            )->getBody();
-
-            $jsonResponse = json_decode($jsonResponse, true);
-            if (!empty($jsonResponse['query']['results']['rate'])) {
-                $response = array_column($jsonResponse['query']['results']['rate'], 'Rate', 'id');
-            }
-        } catch (\Exception $e) {
-            if ($retry == 0) {
-                $response = $this->getServiceResponse($url, 1);
-            }
-        }
-        return $response;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function _convert($currencyFrom, $currencyTo)
-    {
-    }
-
-    /**
-     * Build url for Currency Service
-     *
-     * @param string $currencyFrom
-     * @param string[] $currenciesTo
-     * @return string
-     */
-    private function buildUrl($currencyFrom, $currenciesTo)
-    {
-        $query = urlencode('select ') . '*' . urlencode(' from yahoo.finance.xchange where pair in (');
-        $query .=
-            urlencode(
-                implode(
-                    ',',
-                    array_map(
-                        function ($currencyTo) use ($currencyFrom) {
-                            return '"' . $currencyFrom . $currencyTo . '"';
-                        },
-                        $currenciesTo
-                    )
-                )
-            );
-        $query .= ')';
-        return str_replace('{{YQL_STRING}}', $query, $this->currencyConverterUrl);
-    }
-}
diff --git a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php
index c1c3f2fbacb03..7cbab6c46743c 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/FixerIoTest.php
@@ -3,89 +3,112 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Directory\Test\Unit\Model\Currency\Import;
 
+use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\Currency\Import\FixerIo;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
 class FixerIoTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Directory\Model\Currency\Import\FixerIo
+     * @var FixerIo
      */
     private $model;
 
     /**
-     * @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CurrencyFactory|MockObject
+     */
+    private $currencyFactory;
+
+    /**
+     * @var ZendClientFactory|MockObject
      */
-    private $currencyFactoryMock;
+    private $httpClientFactory;
 
     /**
-     * @var \Magento\Framework\HTTP\ZendClientFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|MockObject
      */
-    private $httpClientFactoryMock;
+    private $scopeConfig;
 
     protected function setUp()
     {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->currencyFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
+        $this->currencyFactory = $this->getMockBuilder(CurrencyFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->httpClientFactoryMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClientFactory::class)
+        $this->httpClientFactory = $this->getMockBuilder(ZendClientFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $scopeMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
 
-        $this->model = $objectManagerHelper->getObject(
-            \Magento\Directory\Model\Currency\Import\FixerIo::class,
-            [
-                'currencyFactory' => $this->currencyFactoryMock,
-                'scopeConfig' => $scopeMock,
-                'httpClientFactory' => $this->httpClientFactoryMock
-            ]
-        );
+        $this->model = new FixerIo($this->currencyFactory, $this->scopeConfig, $this->httpClientFactory);
     }
 
     public function testFetchRates()
     {
         $currencyFromList = ['USD'];
         $currencyToList = ['EUR', 'UAH'];
-        $responseBody = '{"base":"USD","date":"2015-10-07","rates":{"EUR":0.9022}}';
+        $responseBody = '{"success":"true","base":"USD","date":"2015-10-07","rates":{"EUR":0.9022}}';
         $expectedCurrencyRateList = ['USD' => ['EUR' => 0.9022, 'UAH' => null]];
-        $message = "We can't retrieve a rate from http://api.fixer.io/latest?base=USD&symbols=EUR,UAH for UAH.";
+        $message = "We can't retrieve a rate from "
+            . "http://data.fixer.io/api/latest?access_key=api_key&base=USD&symbols=EUR,UAH for UAH.";
+
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['currency/fixerio/api_key', 'store'],
+                ['currency/fixerio/timeout', 'store']
+            )
+            ->willReturnOnConsecutiveCalls('api_key', 100);
 
-        /** @var \Magento\Directory\Model\Currency|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
+        /** @var Currency|MockObject $currency */
+        $currency = $this->getMockBuilder(Currency::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
             ->getMock();
-        /** @var \Magento\Framework\HTTP\ZendClient|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $httpClientMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClient::class)
+        /** @var ZendClient|MockObject $httpClient */
+        $httpClient = $this->getMockBuilder(ZendClient::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
             ->getMock();
-        /** @var \Zend_Http_Response|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $httpResponseMock = $this->getMockBuilder(\Zend_Http_Response::class)
+        /** @var DataObject|MockObject $currencyMock */
+        $httpResponse = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
+            ->setMethods(['getBody'])
             ->getMock();
-        $this->currencyFactoryMock->expects($this->any())->method('create')->willReturn($currencyMock);
-        $currencyMock->expects($this->once())->method('getConfigBaseCurrencies')->willReturn($currencyFromList);
-        $currencyMock->expects($this->once())->method('getConfigAllowCurrencies')->willReturn($currencyToList);
-        $this->httpClientFactoryMock->expects($this->any())->method('create')->willReturn($httpClientMock);
-        $httpClientMock->expects($this->atLeastOnce())->method('setUri')->willReturnSelf();
-        $httpClientMock->expects($this->atLeastOnce())->method('setConfig')->willReturnSelf();
-        $httpClientMock->expects($this->atLeastOnce())->method('request')->willReturn($httpResponseMock);
-        $httpResponseMock->expects($this->any())->method('getBody')->willReturn($responseBody);
 
-        $this->assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
+        $this->currencyFactory->method('create')
+            ->willReturn($currency);
+        $currency->method('getConfigBaseCurrencies')
+            ->willReturn($currencyFromList);
+        $currency->method('getConfigAllowCurrencies')
+            ->willReturn($currencyToList);
+
+        $this->httpClientFactory->method('create')
+            ->willReturn($httpClient);
+        $httpClient->method('setUri')
+            ->willReturnSelf();
+        $httpClient->method('setConfig')
+            ->willReturnSelf();
+        $httpClient->method('request')
+            ->willReturn($httpResponse);
+        $httpResponse->method('getBody')
+            ->willReturn($responseBody);
+
+        self::assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
+
         $messages = $this->model->getMessages();
-        $this->assertNotEmpty($messages);
-        $this->assertTrue(is_array($messages));
-        $this->assertEquals($message, (string)$messages[0]);
+        self::assertNotEmpty($messages);
+        self::assertTrue(is_array($messages));
+        self::assertEquals($message, (string)$messages[0]);
     }
 }
diff --git a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/YahooFinanceTest.php b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/YahooFinanceTest.php
deleted file mode 100644
index b7b9015ffdfe6..0000000000000
--- a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/YahooFinanceTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Directory\Test\Unit\Model\Currency\Import;
-
-class YahooFinanceTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Directory\Model\Currency\Import\YahooFinance
-     */
-    private $model;
-
-    /**
-     * @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $currencyFactoryMock;
-
-    /**
-     * @var \Magento\Framework\HTTP\ZendClientFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $httpClientFactoryMock;
-
-    protected function setUp()
-    {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->currencyFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->httpClientFactoryMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClientFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $scopeMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-
-        $this->model = $objectManagerHelper->getObject(
-            \Magento\Directory\Model\Currency\Import\YahooFinance::class,
-            [
-                'currencyFactory' => $this->currencyFactoryMock,
-                'scopeConfig' => $scopeMock,
-                'httpClientFactory' => $this->httpClientFactoryMock
-            ]
-        );
-    }
-
-    public function testFetchRates()
-    {
-        $currencyFromList = ['USD'];
-        $currencyToList = ['EUR', 'UAH'];
-        $responseBody = '{"query":{"count":7,"created":"2016-04-05T16:46:55Z","lang":"en-US","results":{"rate":'
-            . '[{"id":"USDEUR","Name":"USD/EUR","Rate":"0.9022","Date":"4/5/2016"}]}}}';
-        $expectedCurrencyRateList = ['USD' => ['EUR' => 0.9022, 'UAH' => null]];
-        $message = "We can't retrieve a rate from http://query.yahooapis.com/v1/public/yql?format=json"
-            . "&q=select+*+from+yahoo.finance.xchange+where+pair+in+%28%22USDEUR%22%2C%22USDUAH%22)"
-            . "&env=store://datatables.org/alltableswithkeys for UAH.";
-
-        /** @var \Magento\Directory\Model\Currency|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        /** @var \Magento\Framework\HTTP\ZendClient|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $httpClientMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClient::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        /** @var \Zend_Http_Response|\PHPUnit_Framework_MockObject_MockObject $currencyMock */
-        $httpResponseMock = $this->getMockBuilder('Zend_Http_Response')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $this->currencyFactoryMock->expects($this->any())->method('create')->willReturn($currencyMock);
-        $currencyMock->expects($this->once())->method('getConfigBaseCurrencies')->willReturn($currencyFromList);
-        $currencyMock->expects($this->once())->method('getConfigAllowCurrencies')->willReturn($currencyToList);
-        $this->httpClientFactoryMock->expects($this->any())->method('create')->willReturn($httpClientMock);
-        $httpClientMock->expects($this->atLeastOnce())->method('setUri')->willReturnSelf();
-        $httpClientMock->expects($this->atLeastOnce())->method('setConfig')->willReturnSelf();
-        $httpClientMock->expects($this->atLeastOnce())->method('request')->willReturn($httpResponseMock);
-        $httpResponseMock->expects($this->any())->method('getBody')->willReturn($responseBody);
-
-        $this->assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
-        $messages = $this->model->getMessages();
-        $this->assertNotEmpty($messages);
-        $this->assertTrue(is_array($messages));
-        $this->assertEquals($message, (string)$messages[0]);
-    }
-}
diff --git a/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php
deleted file mode 100644
index 5fb7271a411ed..0000000000000
--- a/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Directory\Test\Unit\Model;
-
-use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Directory\Model\Observer;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class ObserverTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var  \Magento\Framework\TestFramework\Unit\Helper\ObjectManager  */
-    protected $objectManager;
-
-    /** @var Observer */
-    protected $observer;
-
-    /** @var  \Magento\Directory\Model\Currency\Import\Factory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $importFactory;
-
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $scopeConfig;
-
-    /** @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject */
-    protected $transportBuilder;
-
-    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $storeManager;
-
-    /** @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $currencyFactory;
-
-    /** @var \Magento\Framework\Translate\Inline\StateInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $inlineTranslation;
-
-    protected function setUp()
-    {
-        $this->objectManager = new ObjectManager($this);
-
-        $this->importFactory = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Factory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\MutableScopeConfig::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getValue'])
-            ->getMock();
-        $this->transportBuilder = $this->getMockBuilder(\Magento\Framework\Mail\Template\TransportBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManager::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->currencyFactory = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->inlineTranslation = $this->getMockBuilder(\Magento\Framework\Translate\Inline\StateInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->observer = $this->objectManager->getObject(
-            \Magento\Directory\Model\Observer::class,
-            [
-                'importFactory' => $this->importFactory,
-                'scopeConfig' => $this->scopeConfig,
-                'transportBuilder' => $this->transportBuilder,
-                'storeManager' => $this->storeManager,
-                'currencyFactory' => $this->currencyFactory,
-                'inlineTranslation' => $this->inlineTranslation
-            ]
-        );
-    }
-
-    public function testScheduledUpdateCurrencyRates()
-    {
-        $this->scopeConfig
-            ->expects($this->at(0))
-            ->method('getValue')
-            ->with(Observer::IMPORT_ENABLE, ScopeInterface::SCOPE_STORE)
-            ->will($this->returnValue(1));
-        $this->scopeConfig
-            ->expects($this->at(1))
-            ->method('getValue')
-            ->with(Observer::CRON_STRING_PATH, ScopeInterface::SCOPE_STORE)
-            ->will($this->returnValue('cron-path'));
-        $this->scopeConfig
-            ->expects($this->at(2))
-            ->method('getValue')
-            ->with(Observer::IMPORT_SERVICE, ScopeInterface::SCOPE_STORE)
-            ->will($this->returnValue('import-service'));
-        $importInterfaceMock = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Webservicex::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['fetchRates', 'getMessages'])
-            ->getMock();
-        $importInterfaceMock->expects($this->once())
-            ->method('fetchRates')
-            ->will($this->returnValue([]));
-        $importInterfaceMock->expects($this->once())
-            ->method('getMessages')
-            ->will($this->returnValue([]));
-
-        $this->importFactory
-            ->expects($this->once())
-            ->method('create')
-            ->with('import-service')
-            ->will($this->returnValue($importInterfaceMock));
-
-        $currencyMock = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['saveRates', '__wakeup', '__sleep'])
-            ->getMock();
-        $currencyMock->expects($this->once())
-            ->method('saveRates')
-            ->will($this->returnValue(null));
-        $this->currencyFactory
-            ->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($currencyMock));
-
-        $this->observer->scheduledUpdateCurrencyRates(null);
-    }
-
-    /**
-     * @expectedException \Exception
-     */
-    public function testScheduledUpdateCurrencyRatesThrowsException()
-    {
-        $this->scopeConfig->expects($this->exactly(3))
-            ->method('getValue')
-            ->willReturnMap(
-                [
-                    [Observer::IMPORT_ENABLE, ScopeInterface::SCOPE_STORE, null, 1],
-                    [Observer::CRON_STRING_PATH, ScopeInterface::SCOPE_STORE, null, 'cron-path'],
-                    [Observer::IMPORT_SERVICE, ScopeInterface::SCOPE_STORE, null, 'import-service']
-                ]
-            );
-
-        $this->importFactory
-            ->expects($this->once())
-            ->method('create')
-            ->with('import-service')
-            ->willThrowException(new \Exception());
-
-        $this->observer->scheduledUpdateCurrencyRates(null);
-    }
-}
diff --git a/app/code/Magento/Directory/etc/adminhtml/system.xml b/app/code/Magento/Directory/etc/adminhtml/system.xml
index 15a82e006bffe..1a11accb0a518 100644
--- a/app/code/Magento/Directory/etc/adminhtml/system.xml
+++ b/app/code/Magento/Directory/etc/adminhtml/system.xml
@@ -34,21 +34,14 @@
                     <can_be_empty>1</can_be_empty>
                 </field>
             </group>
-            <group id="yahoofinance" translate="label" sortOrder="33" showInDefault="1" showInWebsite="0" showInStore="0">
-                <label>Yahoo Finance Exchange</label>
-                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Connection Timeout in Seconds</label>
-                </field>
-            </group>
             <group id="fixerio" translate="label" sortOrder="35" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Fixer.io</label>
-                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Connection Timeout in Seconds</label>
+                <field id="api_key" translate="label" type="obscure" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>API Key</label>
+                    <config_path>currency/fixerio/api_key</config_path>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
-            </group>
-            <group id="webservicex" translate="label" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
-                <label>Webservicex</label>
-                <field id="timeout" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="timeout" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Connection Timeout in Seconds</label>
                 </field>
             </group>
diff --git a/app/code/Magento/Directory/etc/config.xml b/app/code/Magento/Directory/etc/config.xml
index fa4e9d64d10d8..585d53bac7c19 100644
--- a/app/code/Magento/Directory/etc/config.xml
+++ b/app/code/Magento/Directory/etc/config.xml
@@ -18,15 +18,10 @@
                 <base>USD</base>
                 <default>USD</default>
             </options>
-            <yahoofinance>
-                <timeout>100</timeout>
-            </yahoofinance>
             <fixerio>
                 <timeout>100</timeout>
+                <api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
             </fixerio>
-            <webservicex>
-                <timeout>100</timeout>
-            </webservicex>
             <import>
                 <enabled>0</enabled>
                 <error_email />
diff --git a/app/code/Magento/Directory/etc/di.xml b/app/code/Magento/Directory/etc/di.xml
index 3bc50e3bc0316..2c345ef92fee1 100644
--- a/app/code/Magento/Directory/etc/di.xml
+++ b/app/code/Magento/Directory/etc/di.xml
@@ -10,14 +10,6 @@
     <type name="Magento\Directory\Model\Currency\Import\Config">
         <arguments>
             <argument name="servicesConfig" xsi:type="array">
-                <item name="yahoofinance" xsi:type="array">
-                    <item name="label" xsi:type="string" translatable="true">Yahoo Finance Exchange</item>
-                    <item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\YahooFinance</item>
-                </item>
-                <item name="webservicex" xsi:type="array">
-                    <item name="label" xsi:type="string" translatable="true">Webservicex</item>
-                    <item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\Webservicex</item>
-                </item>
                 <item name="fixerio" xsi:type="array">
                     <item name="label" xsi:type="string" translatable="true">Fixer.io</item>
                     <item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\FixerIo</item>
diff --git a/app/code/Magento/Directory/i18n/en_US.csv b/app/code/Magento/Directory/i18n/en_US.csv
index 00e32ab8c8501..53ce272ea88bc 100644
--- a/app/code/Magento/Directory/i18n/en_US.csv
+++ b/app/code/Magento/Directory/i18n/en_US.csv
@@ -30,10 +30,8 @@ Continue,Continue
                     "
 "Default Display Currency","Default Display Currency"
 "Allowed Currencies","Allowed Currencies"
-"Yahoo Finance Exchange","Yahoo Finance Exchange"
 "Connection Timeout in Seconds","Connection Timeout in Seconds"
 Fixer.io,Fixer.io
-Webservicex,Webservicex
 "Scheduled Import Settings","Scheduled Import Settings"
 Enabled,Enabled
 "Error Email Recipient","Error Email Recipient"
@@ -49,3 +47,8 @@ Service,Service
 "State is Required for","State is Required for"
 "Allow to Choose State if It is Optional for Country","Allow to Choose State if It is Optional for Country"
 "Weight Unit","Weight Unit"
+"No API Key was specified or an invalid API Key was specified.","No API Key was specified or an invalid API Key was specified."
+"The account this API request is coming from is inactive.","The account this API request is coming from is inactive."
+"The """%1"" is not allowed as base currency for your subscription plan.","The """%1"" is not allowed as base currency for your subscription plan."
+"An invalid base currency has been entered.","An invalid base currency has been entered."
+"Currency rates can't be retrieved.","Currency rates can't be retrieved."
\ No newline at end of file
diff --git a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
index 59d0558decd16..f615966d801f7 100644
--- a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            downloadable: 'Magento_Downloadable/downloadable'
+            downloadable: 'Magento_Downloadable/js/downloadable',
+            'Magento_Downloadable/downloadable': 'Magento_Downloadable/js/downloadable'
         }
     }
 };
diff --git a/app/code/Magento/Downloadable/view/frontend/web/downloadable.js b/app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
similarity index 100%
rename from app/code/Magento/Downloadable/view/frontend/web/downloadable.js
rename to app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
index 9664cabc79ba0..49da8f24a6201 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
@@ -1,17 +1,19 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Eav\Api\Data;
 
+use Magento\Framework\Api\CustomAttributesDataInterface;
+use Magento\Framework\Api\MetadataObjectInterface;
+
 /**
  * Interface AttributeInterface
  * @api
  * @since 100.0.2
  */
-interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
+interface AttributeInterface extends CustomAttributesDataInterface, MetadataObjectInterface
 {
     const ATTRIBUTE_ID = 'attribute_id';
 
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index feb2c4d7d3f9f..40b884aec529f 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -602,13 +602,7 @@ public function attributesCompare($firstAttribute, $secondAttribute)
         $firstSort = $firstAttribute->getSortWeight((int) $this->_sortingSetId);
         $secondSort = $secondAttribute->getSortWeight((int) $this->_sortingSetId);
 
-        if ($firstSort > $secondSort) {
-            return 1;
-        } elseif ($firstSort < $secondSort) {
-            return -1;
-        }
-
-        return 0;
+        return $firstSort <=> $secondSort;
     }
 
     /**
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
index bd77b952a07b8..0f3b8be32b988 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
@@ -167,7 +167,9 @@ public function getOptionText($value)
         $optionsText = [];
         foreach ($options as $item) {
             if (in_array($item['value'], $value)) {
-                $optionsText[] = $this->escaper->escapeHtml($item['label']);
+                $optionsText[] = ($this->_attribute->getIsHtmlAllowedOnFront())
+                    ? $item['label']
+                    : $this->escaper->escapeHtml($item['label']);
             }
         }
 
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php b/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php
new file mode 100644
index 0000000000000..929cd58f260b6
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GiftMessage\Model\Plugin;
+
+use Magento\Quote\Model\Quote\Item;
+use Magento\Quote\Model\Quote\Item\Processor;
+
+class MergeQuoteItems
+{
+    /**
+     * Resolves gift message to be
+     * applied to merged quote items.
+     *
+     * @param Processor $subject
+     * @param Item $result
+     * @param Item $source
+     * @return Item
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterMerge(Processor $subject, Item $result, Item $source)
+    {
+        $giftMessageId = $source->getGiftMessageId();
+
+        if ($giftMessageId) {
+            $result->setGiftMessageId($giftMessageId);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php b/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php
index 0d2280d29fed4..044a0bf91c982 100644
--- a/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php
+++ b/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php
@@ -28,7 +28,10 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         /** @var  Quote $sourceQuote */
         $sourceQuote = $observer->getData('source');
 
-        $targetQuote->setGiftMessageId($sourceQuote->getGiftMessageId());
+        $giftMessageId = $sourceQuote->getGiftMessageId();
+        if ($giftMessageId) {
+            $targetQuote->setGiftMessageId($giftMessageId);
+        }
 
         return $this;
     }
diff --git a/app/code/Magento/GiftMessage/etc/frontend/di.xml b/app/code/Magento/GiftMessage/etc/frontend/di.xml
index 1566c51ee9df3..a4837e0180c0b 100644
--- a/app/code/Magento/GiftMessage/etc/frontend/di.xml
+++ b/app/code/Magento/GiftMessage/etc/frontend/di.xml
@@ -43,4 +43,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote\Item\Processor">
+        <plugin name="mergeQuoteItems" type="Magento\GiftMessage\Model\Plugin\MergeQuoteItems"/>
+    </type>
 </config>
diff --git a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
index db33efeba1a94..f8a463bec37f9 100644
--- a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
+++ b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
@@ -6,8 +6,10 @@
 var config = {
     map: {
         '*': {
-            giftOptions:    'Magento_GiftMessage/gift-options',
-            extraOptions:   'Magento_GiftMessage/extra-options'
+            giftOptions:    'Magento_GiftMessage/js/gift-options',
+            extraOptions:   'Magento_GiftMessage/js/extra-options',
+            'Magento_GiftMessage/gift-options':    'Magento_GiftMessage/js/gift-options',
+            'Magento_GiftMessage/extra-options':   'Magento_GiftMessage/js/extra-options'
         }
     }
 };
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/extra-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/extra-options.js
similarity index 100%
rename from app/code/Magento/GiftMessage/view/frontend/web/extra-options.js
rename to app/code/Magento/GiftMessage/view/frontend/web/js/extra-options.js
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/gift-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js
similarity index 100%
rename from app/code/Magento/GiftMessage/view/frontend/web/gift-options.js
rename to app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js
diff --git a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
index a97b1c246741e..e85d4eeca730a 100644
--- a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
@@ -19,6 +19,8 @@ class Grouped extends Renderer implements IdentityInterface
 {
     /**
      * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     * @deprecated moved to model because of class refactoring
+     * @see \Magento\GroupedProduct\Model\Product\Configuration\Item\ItemProductResolver::CONFIG_THUMBNAIL_SOURCE
      */
     const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/grouped_product_image';
 
@@ -36,28 +38,6 @@ public function getGroupedProduct()
         return $this->getProduct();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProductForThumbnail()
-    {
-        /**
-         * Show grouped product thumbnail if it must be always shown according to the related setting in system config
-         * or if child product thumbnail is not available
-         */
-        if ($this->_scopeConfig->getValue(
-            self::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
-            !($this->getProduct()->getThumbnail() && $this->getProduct()->getThumbnail() != 'no_selection')
-        ) {
-            $product = $this->getGroupedProduct();
-        } else {
-            $product = $this->getProduct();
-        }
-        return $product;
-    }
-
     /**
      * Return identifiers for produced content
      *
diff --git a/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php b/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
index a38ce3ac65296..a33c33ce85ee9 100644
--- a/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
+++ b/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
@@ -8,6 +8,10 @@
 use Magento\Catalog\Model\Config\Source\Product\Thumbnail as ThumbnailSource;
 use Magento\Checkout\CustomerData\DefaultItem;
 
+/**
+ * @deprecated moved to model because of class refactoring
+ * @see \Magento\GroupedProduct\Model\Product\Configuration\Item\ItemProductResolver
+ */
 class GroupedItem extends DefaultItem
 {
     /**
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Configuration/Item/ItemProductResolver.php b/app/code/Magento/GroupedProduct/Model/Product/Configuration/Item/ItemProductResolver.php
new file mode 100644
index 0000000000000..832823cd3b54c
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Model/Product/Configuration/Item/ItemProductResolver.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GroupedProduct\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class ItemProductResolver implements ItemResolverInterface
+{
+    /**
+     * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     */
+    const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/grouped_product_image';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFinalProduct(ItemInterface $item): ProductInterface
+    {
+        /**
+         * Show grouped product thumbnail if it must be always shown according to the related setting in system config
+         * or if child product thumbnail is not available.
+         */
+        $childProduct = $item->getProduct();
+        $finalProduct = $childProduct;
+        $parentProduct = $this->getParentProduct($item);
+
+        if ($childProduct !== $parentProduct) {
+            $configValue = $this->scopeConfig->getValue(
+                self::CONFIG_THUMBNAIL_SOURCE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            );
+            $childThumb = $childProduct->getData('thumbnail');
+
+            $finalProduct =
+                ($configValue == Thumbnail::OPTION_USE_PARENT_IMAGE) || (!$childThumb || $childThumb == 'no_selection')
+                    ? $parentProduct
+                    : $childProduct;
+        }
+
+        return $finalProduct;
+    }
+
+    /**
+     * Get grouped product.
+     *
+     * @param ItemInterface $item
+     * @return Product
+     */
+    private function getParentProduct(ItemInterface $item) : Product
+    {
+        $option = $item->getOptionByCode('product_type');
+        $product = $item->getProduct();
+
+        if ($option) {
+            $product = $option->getProduct();
+        }
+
+        return $product;
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php
index a3d269e481552..08d2c1d193779 100644
--- a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php
+++ b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredRegularPrice.php
@@ -80,7 +80,7 @@ public function getValue()
             if ($this->value === null) {
                 $price = $this->product->getPrice();
                 $priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
-                $this->value = $priceInCurrentCurrency ? floatval($priceInCurrentCurrency) : false;
+                $this->value = $priceInCurrentCurrency ? (float)$priceInCurrentCurrency : false;
             }
             return $this->value;
         }
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php
index 5dc12fe39c46a..7328f710f9231 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php
@@ -10,127 +10,28 @@
 
 class GroupedTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_scopeConfig;
-
-    /** @var Renderer */
-    protected $_renderer;
-
-    protected function setUp()
-    {
-        parent::setUp();
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $this->_renderer = $objectManagerHelper->getObject(
-            \Magento\GroupedProduct\Block\Cart\Item\Renderer\Grouped::class,
-            ['scopeConfig' => $this->_scopeConfig]
-        );
-    }
-
     /**
-     * Child thumbnail is available and config option is not set to use parent thumbnail.
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    public function testGetProductForThumbnail()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['childProduct'],
-            $productForThumbnail,
-            'Child product was expected to be returned.'
-        );
-    }
+    private $scopeConfig;
 
     /**
-     * Child thumbnail is not available and config option is not set to use parent thumbnail.
+     * @var Renderer
      */
-    public function testGetProductForThumbnailChildThumbnailNotAvailable()
-    {
-        $childHasThumbnail = false;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned.'
-        );
-    }
+    private $renderer;
 
     /**
-     * Child thumbnail is available and config option is set to use parent thumbnail.
+     * @inheritdoc
      */
-    public function testGetProductForThumbnailConfigUseParent()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = true;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned ' .
-            'if "checkout/cart/grouped_product_image" is set to "parent" in system config.'
-        );
-    }
-
-    /**
-     * Initialize parent grouped product and child product.
-     *
-     * @param bool $childHasThumbnail
-     * @param bool $useParentThumbnail
-     * @return \Magento\Catalog\Model\Product[]|\PHPUnit_Framework_MockObject_MockObject[]
-     */
-    protected function _initProducts($childHasThumbnail = true, $useParentThumbnail = false)
+    protected function setUp()
     {
-        /** Set option which can force usage of parent product thumbnail when grouped product is displayed */
-        $thumbnailToBeUsed = $useParentThumbnail
-            ? ThumbnailSource::OPTION_USE_PARENT_IMAGE
-            : ThumbnailSource::OPTION_USE_OWN_IMAGE;
-        $this->_scopeConfig->expects(
-            $this->any()
-        )->method(
-            'getValue'
-        )->with(
-            Renderer::CONFIG_THUMBNAIL_SOURCE
-        )->will(
-            $this->returnValue($thumbnailToBeUsed)
-        );
-
-        /** Initialized parent product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $parentProduct */
-        $parentProduct = $this->createMock(\Magento\Catalog\Model\Product::class);
-
-        /** Initialize child product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $childProduct */
-        $childProduct = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getThumbnail', '__wakeup']);
-        $childThumbnail = $childHasThumbnail ? 'thumbnail.jpg' : 'no_selection';
-        $childProduct->expects($this->any())->method('getThumbnail')->will($this->returnValue($childThumbnail));
-
-        /** Mock methods which return parent and child products */
-        /** @var \Magento\Quote\Model\Quote\Item\Option|\PHPUnit_Framework_MockObject_MockObject $itemOption */
-        $itemOption = $this->createMock(\Magento\Quote\Model\Quote\Item\Option::class);
-        $itemOption->expects($this->any())->method('getProduct')->will($this->returnValue($parentProduct));
-        /** @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject $item */
-        $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($childProduct));
-        $item->expects(
-            $this->any()
-        )->method(
-            'getOptionByCode'
-        )->with(
-            'product_type'
-        )->will(
-            $this->returnValue($itemOption)
+        parent::setUp();
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->renderer = $objectManagerHelper->getObject(
+            \Magento\GroupedProduct\Block\Cart\Item\Renderer\Grouped::class,
+            ['scopeConfig' => $this->scopeConfig]
         );
-        $this->_renderer->setItem($item);
-
-        return ['parentProduct' => $parentProduct, 'childProduct' => $childProduct];
     }
 
     public function testGetIdentities()
@@ -140,7 +41,7 @@ public function testGetIdentities()
         $product->expects($this->exactly(2))->method('getIdentities')->will($this->returnValue($productTags));
         $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
         $item->expects($this->exactly(2))->method('getProduct')->will($this->returnValue($product));
-        $this->_renderer->setItem($item);
-        $this->assertEquals(array_merge($productTags, $productTags), $this->_renderer->getIdentities());
+        $this->renderer->setItem($item);
+        $this->assertEquals(array_merge($productTags, $productTags), $this->renderer->getIdentities());
     }
 }
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php
new file mode 100644
index 0000000000000..bd4fb9231c0b2
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\GroupedProduct\Test\Unit\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
+use Magento\GroupedProduct\Model\Product\Configuration\Item\ItemProductResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Tests \Magento\GroupedProduct\Model\Product\Configuration\Item\ItemProductResolver
+ */
+class ItemProductResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ItemProductResolver
+     */
+    private $resolver;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new ObjectManager($this);
+        $this->scopeConfig = $this->createPartialMock(ScopeConfigInterface::class, ['getValue', 'isSetFlag']);
+        $this->resolver = $objectManagerHelper->getObject(
+            ItemProductResolver::class,
+            ['scopeConfig' => $this->scopeConfig]
+        );
+    }
+
+    /**
+     * @param bool $existOption
+     * @param string $configImageSource
+     * @return void
+     * @dataProvider getFinalProductDataProvider
+     */
+    public function testGetFinalProduct(bool $existOption, string $configImageSource)
+    {
+        $option = null;
+        $childProduct = $this->createPartialMock(Product::class, ['getData']);
+        $finalProduct = $childProduct;
+
+        if ($existOption) {
+            $parentProduct = $this->createMock(Product::class);
+            $childProduct->expects($this->once())->method('getData')->with('thumbnail')->willReturn('someImage');
+
+            $option = $this->createPartialMock(
+                OptionInterface::class,
+                ['getProduct', 'getValue']
+            );
+            $option->expects($this->once())->method('getProduct')->willReturn($parentProduct);
+
+            $this->scopeConfig->expects($this->once())
+                ->method('getValue')
+                ->with(ItemProductResolver::CONFIG_THUMBNAIL_SOURCE, ScopeInterface::SCOPE_STORE)
+                ->willReturn($configImageSource);
+
+            $finalProduct = ($configImageSource == Thumbnail::OPTION_USE_PARENT_IMAGE) ? $parentProduct : $childProduct;
+        }
+
+        $item = $this->createPartialMock(
+            ItemInterface::class,
+            ['getProduct', 'getOptionByCode', 'getFileDownloadParams']
+        );
+        $item->expects($this->exactly(2))->method('getProduct')->willReturn($childProduct);
+        $item->expects($this->once())->method('getOptionByCode')->with('product_type')->willReturn($option);
+
+        $this->assertEquals($finalProduct, $this->resolver->getFinalProduct($item));
+    }
+
+    /**
+     * @return array
+     */
+    public function getFinalProductDataProvider(): array
+    {
+        return [
+            [false, Thumbnail::OPTION_USE_PARENT_IMAGE],
+            [true, Thumbnail::OPTION_USE_PARENT_IMAGE],
+            [true, Thumbnail::OPTION_USE_OWN_IMAGE],
+        ];
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/etc/di.xml b/app/code/Magento/GroupedProduct/etc/di.xml
index 44d793e74d728..43678d0ad7a82 100644
--- a/app/code/Magento/GroupedProduct/etc/di.xml
+++ b/app/code/Magento/GroupedProduct/etc/di.xml
@@ -98,4 +98,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite">
+        <arguments>
+            <argument name="itemResolvers" xsi:type="array">
+                <item name="grouped" xsi:type="string">Magento\GroupedProduct\Model\Product\Configuration\Item\ItemProductResolver</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/GroupedProduct/etc/frontend/di.xml b/app/code/Magento/GroupedProduct/etc/frontend/di.xml
deleted file mode 100644
index 755d53f46bfdd..0000000000000
--- a/app/code/Magento/GroupedProduct/etc/frontend/di.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
-        <arguments>
-            <argument name="itemMap" xsi:type="array">
-                <item name="grouped" xsi:type="string">Magento\GroupedProduct\CustomerData\GroupedItem</item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index f5dca6a19651d..e2398e792b817 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -391,6 +391,7 @@ protected function _saveValidatedBunches()
         $nextRowBackup = [];
         $maxDataSize = $this->_resourceHelper->getMaxDataSize();
         $bunchSize = $this->_importExportData->getBunchSize();
+        $skuSet = [];
 
         $source->rewind();
         $this->_dataSourceModel->cleanBunches();
@@ -407,6 +408,7 @@ protected function _saveValidatedBunches()
             if ($source->valid()) {
                 try {
                     $rowData = $source->current();
+                    $skuSet[$rowData['sku']] = true;
                 } catch (\InvalidArgumentException $e) {
                     $this->addRowError($e->getMessage(), $this->_processedRowsCount);
                     $this->_processedRowsCount++;
@@ -434,6 +436,8 @@ protected function _saveValidatedBunches()
                 $source->next();
             }
         }
+        $this->_processedEntitiesCount = count($skuSet);
+
         return $this;
     }
 
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml
index ab9aa485aeea2..3bb21ed09a01c 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml
@@ -7,6 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
+        <attribute name="class" value="page-with-filter"/>
         <referenceContainer name="sidebar.main">
             <block class="Magento\LayeredNavigation\Block\Navigation\Search" name="catalogsearch.leftnav" before="-" template="Magento_LayeredNavigation::layer/view.phtml">
                 <block class="Magento\LayeredNavigation\Block\Navigation\State" name="catalogsearch.navigation.state" as="state" />
diff --git a/app/code/Magento/Payment/view/frontend/requirejs-config.js b/app/code/Magento/Payment/view/frontend/requirejs-config.js
index 70f93854ead4b..949b1554a6f7d 100644
--- a/app/code/Magento/Payment/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Payment/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            creditCardType: 'Magento_Payment/cc-type'
+            creditCardType: 'Magento_Payment/js/cc-type',
+            'Magento_Payment/cc-type': 'Magento_Payment/js/cc-type'
         }
     }
 };
diff --git a/app/code/Magento/Payment/view/frontend/web/cc-type.js b/app/code/Magento/Payment/view/frontend/web/js/cc-type.js
similarity index 100%
rename from app/code/Magento/Payment/view/frontend/web/cc-type.js
rename to app/code/Magento/Payment/view/frontend/web/js/cc-type.js
diff --git a/app/code/Magento/Payment/view/frontend/web/transparent.js b/app/code/Magento/Payment/view/frontend/web/js/transparent.js
similarity index 100%
rename from app/code/Magento/Payment/view/frontend/web/transparent.js
rename to app/code/Magento/Payment/view/frontend/web/js/transparent.js
diff --git a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
index a370eeb40eafd..73b4c9f6ee6ea 100644
--- a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
+++ b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
@@ -50,7 +50,7 @@ public function execute()
                     $redirectBlock->setData('goto_success_page', true);
                 } else {
                     if ($this->checkPaymentMethod($order)) {
-                        $gotoSection = $this->_cancelPayment(strval($this->getRequest()->getParam('RESPMSG')));
+                        $gotoSection = $this->_cancelPayment((string)$this->getRequest()->getParam('RESPMSG'));
                         $redirectBlock->setData('goto_section', $gotoSection);
                         $redirectBlock->setData('error_msg', __('Your payment has been declined. Please try again.'));
                     } else {
diff --git a/app/code/Magento/Paypal/Model/Api/AbstractApi.php b/app/code/Magento/Paypal/Model/Api/AbstractApi.php
index 0d1cd44639e93..89f83790263b8 100644
--- a/app/code/Magento/Paypal/Model/Api/AbstractApi.php
+++ b/app/code/Magento/Paypal/Model/Api/AbstractApi.php
@@ -427,6 +427,7 @@ protected function _exportLineItems(array &$request, $i = 0)
                 if (isset($this->_lineItemTotalExportMap[$key])) {
                     // !empty($total)
                     $privateKey = $this->_lineItemTotalExportMap[$key];
+                    $total = round($total, 2);
                     $request[$privateKey] = $this->formatPrice($total);
                 }
             }
diff --git a/app/code/Magento/Paypal/Model/Cart.php b/app/code/Magento/Paypal/Model/Cart.php
index c8e4a6acf4649..b65fcd340d535 100644
--- a/app/code/Magento/Paypal/Model/Cart.php
+++ b/app/code/Magento/Paypal/Model/Cart.php
@@ -177,7 +177,7 @@ protected function _applyDiscountTaxCompensationWorkaround(
     ) {
         $dataContainer = $salesEntity->getTaxContainer();
         $this->addTax((double)$dataContainer->getBaseDiscountTaxCompensationAmount());
-        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmnt());
+        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmount());
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index 9c9b4dc3e87a7..3d1f5159933f8 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -498,7 +498,8 @@ public function start($returnUrl, $cancelUrl, $button = null)
         $solutionType = $this->_config->getMerchantCountry() == 'DE'
             ? \Magento\Paypal\Model\Config::EC_SOLUTION_TYPE_MARK
             : $this->_config->getValue('solutionType');
-        $this->_getApi()->setAmount($this->_quote->getBaseGrandTotal())
+        $totalAmount = round($this->_quote->getBaseGrandTotal(), 2);
+        $this->_getApi()->setAmount($totalAmount)
             ->setCurrencyCode($this->_quote->getBaseCurrencyCode())
             ->setInvNum($this->_quote->getReservedOrderId())
             ->setReturnUrl($returnUrl)
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
index 0f787f0f513a1..28837727533d2 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
@@ -70,7 +70,7 @@ protected function setUp()
     public function testInvalidGetAllItems($items)
     {
         $taxContainer = new \Magento\Framework\DataObject(
-            ['base_discount_tax_compensation_amount' => 0.2, 'base_shipping_discount_tax_compensation_amnt' => 0.1]
+            ['base_discount_tax_compensation_amount' => 0.2, 'base_shipping_discount_tax_compensation_amount' => 0.1]
         );
         $this->_salesModel->expects($this->once())->method('getTaxContainer')->will($this->returnValue($taxContainer));
         $this->_salesModel->expects($this->once())->method('getAllItems')->will($this->returnValue($items));
@@ -146,7 +146,7 @@ public function testInvalidTotalsGetAllItems($values, $transferDiscount)
         $this->assertEquals(
             $values['base_tax_amount'] +
             $values['base_discount_tax_compensation_amount'] +
-            $values['base_shipping_discount_tax_compensation_amnt'],
+            $values['base_shipping_discount_tax_compensation_amount'],
             $this->_model->getTax()
         );
         $this->assertEquals($values['base_shipping_amount'], $this->_model->getShipping());
@@ -162,7 +162,7 @@ public function invalidTotalsGetAllItemsDataProvider()
             [
                 [
                     'base_discount_tax_compensation_amount' => 0,
-                    'base_shipping_discount_tax_compensation_amnt' => 0,
+                    'base_shipping_discount_tax_compensation_amount' => 0,
                     'base_subtotal' => 0,
                     'base_tax_amount' => 0,
                     'base_shipping_amount' => 0,
@@ -174,7 +174,7 @@ public function invalidTotalsGetAllItemsDataProvider()
             [
                 [
                     'base_discount_tax_compensation_amount' => 1,
-                    'base_shipping_discount_tax_compensation_amnt' => 2,
+                    'base_shipping_discount_tax_compensation_amount' => 2,
                     'base_subtotal' => 3,
                     'base_tax_amount' => 4,
                     'base_shipping_amount' => 5,
@@ -255,8 +255,8 @@ protected function _prepareInvalidModelData($values, $transferDiscount)
             [
                 'base_discount_tax_compensation_amount' =>
                     $values['base_discount_tax_compensation_amount'],
-                'base_shipping_discount_tax_compensation_amnt' =>
-                    $values['base_shipping_discount_tax_compensation_amnt'],
+                'base_shipping_discount_tax_compensation_amount' =>
+                    $values['base_shipping_discount_tax_compensation_amount'],
             ]
         );
         $expectedSubtotal = $values['base_subtotal'];
diff --git a/app/code/Magento/Paypal/view/base/requirejs-config.js b/app/code/Magento/Paypal/view/base/requirejs-config.js
index 8edc38dce6f60..8c4c90bf111de 100644
--- a/app/code/Magento/Paypal/view/base/requirejs-config.js
+++ b/app/code/Magento/Paypal/view/base/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            transparent: 'Magento_Payment/transparent'
+            transparent: 'Magento_Payment/js/transparent',
+            'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
         }
     }
 };
diff --git a/app/code/Magento/Paypal/view/frontend/requirejs-config.js b/app/code/Magento/Paypal/view/frontend/requirejs-config.js
index d2cf3f9a0ce7d..223ade43d86e5 100644
--- a/app/code/Magento/Paypal/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Paypal/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            orderReview: 'Magento_Paypal/order-review',
+            orderReview: 'Magento_Paypal/js/order-review',
+            'Magento_Paypal/order-review': 'Magento_Paypal/js/order-review',
             paypalCheckout: 'Magento_Paypal/js/paypal-checkout'
         }
     },
diff --git a/app/code/Magento/Paypal/view/frontend/web/order-review.js b/app/code/Magento/Paypal/view/frontend/web/js/order-review.js
similarity index 100%
rename from app/code/Magento/Paypal/view/frontend/web/order-review.js
rename to app/code/Magento/Paypal/view/frontend/web/js/order-review.js
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index dcadcde292500..b7ce25d56fd1f 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -1609,7 +1609,7 @@ public function addProduct(
          * Error message
          */
         if (is_string($cartCandidates) || $cartCandidates instanceof \Magento\Framework\Phrase) {
-            return strval($cartCandidates);
+            return (string)$cartCandidates;
         }
 
         /**
@@ -2342,6 +2342,7 @@ public function merge(Quote $quote)
             foreach ($this->getAllItems() as $quoteItem) {
                 if ($quoteItem->compare($item)) {
                     $quoteItem->setQty($quoteItem->getQty() + $item->getQty());
+                    $this->itemProcessor->merge($item, $quoteItem);
                     $found = true;
                     break;
                 }
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 67393e3598568..a738f844c8d8d 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -872,13 +872,7 @@ public function getGroupedAllShippingRates()
      */
     protected function _sortRates($firstItem, $secondItem)
     {
-        if ((int)$firstItem[0]->carrier_sort_order < (int)$secondItem[0]->carrier_sort_order) {
-            return -1;
-        } elseif ((int)$firstItem[0]->carrier_sort_order > (int)$secondItem[0]->carrier_sort_order) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return (int) $firstItem[0]->carrier_sort_order <=> (int) $secondItem[0]->carrier_sort_order;
     }
 
     /**
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Processor.php b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
index f34591cfad143..f9dac1779ad27 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Processor.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
@@ -103,6 +103,20 @@ public function prepare(Item $item, DataObject $request, Product $candidate)
         }
     }
 
+    /**
+     * Merge two quote items.
+     *
+     * @param Item $source
+     * @param Item $target
+     * @return Item
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function merge(Item $source, Item $target): Item
+    {
+        return $target;
+    }
+
     /**
      * Set store_id value to quote item
      *
diff --git a/app/code/Magento/Quote/Model/QuoteValidator.php b/app/code/Magento/Quote/Model/QuoteValidator.php
index d3992589ef0b9..ac3820c842967 100644
--- a/app/code/Magento/Quote/Model/QuoteValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteValidator.php
@@ -6,12 +6,13 @@
 
 namespace Magento\Quote\Model;
 
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Quote\Model\Quote as QuoteEntity;
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\Error;
+use Magento\Quote\Model\Quote as QuoteEntity;
 use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage as OrderAmountValidationMessage;
-use \Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @api
@@ -63,50 +64,32 @@ public function validateQuoteAmount(QuoteEntity $quote, $amount)
             $quote->setHasError(true);
             $quote->addMessage(__('This item price or quantity is not valid for checkout.'));
         }
+
         return $this;
     }
 
     /**
-     * Validate quote before submit
+     * Validates quote before submit.
      *
      * @param Quote $quote
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function validateBeforeSubmit(QuoteEntity $quote)
     {
+        if ($quote->getHasError()) {
+            $errors = $this->getQuoteErrors($quote);
+            throw new LocalizedException(__($errors ?: 'Something went wrong. Please try to place the order again.'));
+        }
+
         if (!$quote->isVirtual()) {
-            $address = $quote->getShippingAddress();
-            $address->setStoreId($quote->getStoreId());
-            if ($address->validate() !== true) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __(
-                        'Please check the shipping address information. %1',
-                        implode(' ', $address->validate())
-                    )
-                );
-            }
-
-            // Checks if country id present in the allowed countries list.
-            if (!in_array(
-                $address->getCountryId(),
-                $this->allowedCountryReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $quote->getStoreId())
-            )) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Some addresses cannot be used due to country-specific configurations.')
-                );
-            }
-
-            $method = $address->getShippingMethod();
-            $rate = $address->getShippingRateByCode($method);
-            if (!$method || !$rate) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a shipping method.'));
-            }
+            $this->validateShippingAddress($quote);
         }
+
         $billingAddress = $quote->getBillingAddress();
         $billingAddress->setStoreId($quote->getStoreId());
         if ($billingAddress->validate() !== true) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __(
                     'Please check the billing address information. %1',
                     implode(' ', $quote->getBillingAddress()->validate())
@@ -114,7 +97,7 @@ public function validateBeforeSubmit(QuoteEntity $quote)
             );
         }
         if (!$quote->getPayment()->getMethod()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please select a valid payment method.'));
+            throw new LocalizedException(__('Please select a valid payment method.'));
         }
         if (!$quote->validateMinimumAmount($quote->getIsMultiShipping())) {
             throw new LocalizedException($this->minimumAmountMessage->getMessage());
@@ -122,4 +105,58 @@ public function validateBeforeSubmit(QuoteEntity $quote)
 
         return $this;
     }
+
+    /**
+     * Validates shipping address.
+     *
+     * @param Quote $quote
+     * @throws LocalizedException
+     */
+    private function validateShippingAddress(QuoteEntity $quote)
+    {
+        $address = $quote->getShippingAddress();
+        $address->setStoreId($quote->getStoreId());
+        if ($address->validate() !== true) {
+            throw new LocalizedException(
+                __(
+                    'Please check the shipping address information. %1',
+                    implode(' ', $address->validate())
+                )
+            );
+        }
+
+        // Checks if country id present in the allowed countries list.
+        if (!in_array(
+            $address->getCountryId(),
+            $this->allowedCountryReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $quote->getStoreId())
+        )) {
+            throw new LocalizedException(
+                __('Some addresses cannot be used due to country-specific configurations.')
+            );
+        }
+
+        $method = $address->getShippingMethod();
+        $rate = $address->getShippingRateByCode($method);
+        if (!$method || !$rate) {
+            throw new LocalizedException(__('Please specify a shipping method.'));
+        }
+    }
+
+    /**
+     * Parses quote error messages and concatenates them into single string.
+     *
+     * @param Quote $quote
+     * @return string
+     */
+    private function getQuoteErrors(QuoteEntity $quote): string
+    {
+        $errors = array_map(
+            function (Error $error) {
+                return $error->getText();
+            },
+            $quote->getErrors()
+        );
+
+        return implode(PHP_EOL, $errors);
+    }
 }
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
index 158455db26455..76c110c41b98e 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Reports\Block\Adminhtml\Grid;
 
 class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
@@ -170,12 +171,7 @@ public function addColumn($columnId, $column)
      */
     protected function _getStoreIds()
     {
-        $filterData = $this->getFilterData();
-        if ($filterData) {
-            $storeIds = explode(',', $filterData->getData('store_ids'));
-        } else {
-            $storeIds = [];
-        }
+        $storeIds = $this->getFilteredStores();
         // By default storeIds array contains only allowed stores
         $allowedStoreIds = array_keys($this->_storeManager->getStores());
         // And then array_intersect with post data for prevent unauthorized stores reports
@@ -302,6 +298,7 @@ public function getCountTotals()
             );
 
             $this->_addOrderStatusFilter($totalsCollection, $filterData);
+            $this->_addCustomFilter($totalsCollection, $filterData);
 
             if ($totalsCollection->load()->getSize() < 1 || !$filterData->getData('from')) {
                 $this->setTotals(new \Magento\Framework\DataObject());
@@ -313,6 +310,7 @@ public function getCountTotals()
                 }
             }
         }
+
         return parent::getCountTotals();
     }
 
@@ -409,4 +407,33 @@ protected function _addCustomFilter($collection, $filterData)
     {
         return $this;
     }
+
+    /**
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getFilteredStores(): array
+    {
+        $storeIds = [];
+
+        $filterData = $this->getFilterData();
+        if ($filterData) {
+            if ($filterData->getWebsite()) {
+                $storeIds = array_keys(
+                    $this->_storeManager->getWebsite($filterData->getWebsite())->getStores()
+                );
+            }
+
+            if ($filterData->getGroup()) {
+                $storeIds = array_keys(
+                    $this->_storeManager->getGroup($filterData->getGroup())->getStores()
+                );
+            }
+
+            if ($filterData->getData('store_ids')) {
+                $storeIds = explode(',', $filterData->getData('store_ids'));
+            }
+        }
+        return is_array($storeIds) ? $storeIds : [];
+    }
 }
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
index 260d7bb50679d..f22b3e7bb963b 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
@@ -30,7 +30,7 @@ public function render(\Magento\Framework\DataObject $row)
             return $data;
         }
 
-        $data = floatval($data) * $this->_getRate($row);
+        $data = (float)$data * $this->_getRate($row);
         $data = sprintf("%f", $data);
         $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
         return $data;
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
index 21836f1a8c276..1f90309721c23 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
 
+use Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency;
+
 /**
  * Adminhtml sales report grid block
  *
@@ -36,7 +38,7 @@ protected function _construct()
      */
     public function getResourceCollectionName()
     {
-        return $this->getFilterData()->getData('report_type') == 'updated_at_order'
+        return $this->getFilterData()->getData('report_type') === 'updated_at_order'
             ? \Magento\Sales\Model\ResourceModel\Report\Order\Updatedat\Collection::class
             : \Magento\Sales\Model\ResourceModel\Report\Order\Collection::class;
     }
@@ -103,9 +105,7 @@ protected function _prepareColumns()
             ]
         );
 
-        if ($this->getFilterData()->getStoreIds()) {
-            $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
-        }
+        $this->setStoreIds($this->_getStoreIds());
         $currencyCode = $this->getCurrentCurrencyCode();
         $rate = $this->getRate($currencyCode);
 
@@ -118,6 +118,7 @@ protected function _prepareColumns()
                 'index' => 'total_income_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-sales-total',
                 'column_css_class' => 'col-sales-total'
@@ -133,6 +134,7 @@ protected function _prepareColumns()
                 'index' => 'total_revenue_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-revenue',
@@ -149,6 +151,7 @@ protected function _prepareColumns()
                 'index' => 'total_profit_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-profit',
@@ -165,6 +168,7 @@ protected function _prepareColumns()
                 'index' => 'total_invoiced_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-invoiced',
                 'column_css_class' => 'col-invoiced'
@@ -180,6 +184,7 @@ protected function _prepareColumns()
                 'index' => 'total_paid_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-paid',
@@ -196,6 +201,7 @@ protected function _prepareColumns()
                 'index' => 'total_refunded_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-refunded',
                 'column_css_class' => 'col-refunded'
@@ -211,6 +217,7 @@ protected function _prepareColumns()
                 'index' => 'total_tax_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-sales-tax',
                 'column_css_class' => 'col-sales-tax'
@@ -226,6 +233,7 @@ protected function _prepareColumns()
                 'index' => 'total_tax_amount_actual',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-tax',
@@ -242,6 +250,7 @@ protected function _prepareColumns()
                 'index' => 'total_shipping_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-sales-shipping',
                 'column_css_class' => 'col-sales-shipping'
@@ -257,6 +266,7 @@ protected function _prepareColumns()
                 'index' => 'total_shipping_amount_actual',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-shipping',
@@ -273,6 +283,7 @@ protected function _prepareColumns()
                 'index' => 'total_discount_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-sales-discount',
                 'column_css_class' => 'col-sales-discount'
@@ -288,6 +299,7 @@ protected function _prepareColumns()
                 'index' => 'total_discount_amount_actual',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'visibility_filter' => ['show_actual_columns'],
                 'rate' => $rate,
                 'header_css_class' => 'col-discount',
@@ -304,6 +316,7 @@ protected function _prepareColumns()
                 'index' => 'total_canceled_amount',
                 'total' => 'sum',
                 'sortable' => false,
+                'renderer' => Currency::class,
                 'rate' => $rate,
                 'header_css_class' => 'col-canceled',
                 'column_css_class' => 'col-canceled'
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
index f81176b7a1124..ff76702592196 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
@@ -67,6 +67,9 @@ protected function _prepareCollection()
 
         $this->setCollection($collection);
         parent::_prepareCollection();
+        if ($this->_isExport) {
+            $collection->setPageSize(null);
+        }
         $this->getCollection()->resolveCustomerNames();
         return $this;
     }
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
index 3dbced45e0a69..68f2722ca6dfb 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
@@ -9,8 +9,10 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
+
 namespace Magento\Reports\Controller\Adminhtml\Report;
 
+use Magento\Backend\Helper\Data as BackendHelper;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
@@ -41,22 +43,30 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
      */
     protected $timezone;
 
+    /**
+     * @var BackendHelper
+     */
+    private $backendHelper;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param TimezoneInterface $timezone
+     * @param BackendHelper|null $backendHelperData
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
-        TimezoneInterface $timezone
+        TimezoneInterface $timezone,
+        BackendHelper $backendHelperData = null
     ) {
         parent::__construct($context);
         $this->_fileFactory = $fileFactory;
         $this->_dateFilter = $dateFilter;
         $this->timezone = $timezone;
+        $this->backendHelper = $backendHelperData ?: $this->_objectManager->get(BackendHelper::class);
     }
 
     /**
@@ -103,25 +113,7 @@ public function _initReportAction($blocks)
             $blocks = [$blocks];
         }
 
-        $requestData = $this->_objectManager->get(
-            \Magento\Backend\Helper\Data::class
-        )->prepareFilterString(
-            $this->getRequest()->getParam('filter')
-        );
-        $inputFilter = new \Zend_Filter_Input(
-            ['from' => $this->_dateFilter, 'to' => $this->_dateFilter],
-            [],
-            $requestData
-        );
-        $requestData = $inputFilter->getUnescaped();
-        $requestData['store_ids'] = $this->getRequest()->getParam('store_ids');
-        $params = new \Magento\Framework\DataObject();
-
-        foreach ($requestData as $key => $value) {
-            if (!empty($value)) {
-                $params->setData($key, $value);
-            }
-        }
+        $params = $this->initFilterData();
 
         foreach ($blocks as $block) {
             if ($block) {
@@ -147,7 +139,7 @@ protected function _showLastExecutionTime($flagCode, $refreshCode)
             ->loadSelf();
         $updatedAt = 'undefined';
         if ($flag->hasData()) {
-            $updatedAt =  $this->timezone->formatDate(
+            $updatedAt = $this->timezone->formatDate(
                 $flag->getLastUpdate(),
                 \IntlDateFormatter::MEDIUM,
                 true
@@ -168,4 +160,34 @@ protected function _showLastExecutionTime($flagCode, $refreshCode)
         );
         return $this;
     }
+
+    /**
+     * Init filter data
+     *
+     * @return \Magento\Framework\DataObject
+     */
+    private function initFilterData(): \Magento\Framework\DataObject
+    {
+        $requestData = $this->backendHelper
+            ->prepareFilterString(
+                $this->getRequest()->getParam('filter')
+            );
+
+        $filterRules = ['from' => $this->_dateFilter, 'to' => $this->_dateFilter];
+        $inputFilter = new \Zend_Filter_Input($filterRules, [], $requestData);
+
+        $requestData = $inputFilter->getUnescaped();
+        $requestData['store_ids'] = $this->getRequest()->getParam('store_ids');
+        $requestData['group'] = $this->getRequest()->getParam('group');
+        $requestData['website'] = $this->getRequest()->getParam('website');
+
+        $params = new \Magento\Framework\DataObject();
+
+        foreach ($requestData as $key => $value) {
+            if (!empty($value)) {
+                $params->setData($key, $value);
+            }
+        }
+        return $params;
+    }
 }
diff --git a/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Sales/Coupons/GridTest.php b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Sales/Coupons/GridTest.php
new file mode 100644
index 0000000000000..9e97af428de90
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Sales/Coupons/GridTest.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Test\Unit\Block\Adminhtml\Sales\Coupons;
+
+/**
+ * Test for class \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid
+ */
+class GridTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var \Magento\Reports\Model\ResourceModel\Report\Collection\Factory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceFactoryMock;
+
+    protected function setUp()
+    {
+        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->getMock();
+        $this->resourceFactoryMock = $this
+            ->getMockBuilder(\Magento\Reports\Model\ResourceModel\Report\Collection\Factory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $aggregatedColumns = [1 => 'SUM(value)'];
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->model = $objectManager->getObject(
+            \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid::class,
+            [
+                '_storeManager' => $this->storeManagerMock,
+                '_aggregatedColumns' => $aggregatedColumns,
+                'resourceFactory' => $this->resourceFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getCountTotalsDataProvider
+     *
+     * @param string $reportType
+     * @param int $priceRuleType
+     * @param int $collectionSize
+     * @param bool $expectedCountTotals
+     */
+    public function testGetCountTotals(
+        string $reportType,
+        int $priceRuleType,
+        int $collectionSize,
+        bool $expectedCountTotals
+    ) {
+        $filterData = new \Magento\Framework\DataObject();
+        $filterData->setData('report_type', $reportType);
+        $filterData->setData('period_type', 'day');
+        $filterData->setData('from', '2000-01-01');
+        $filterData->setData('to', '2000-01-30');
+        $filterData->setData('store_ids', '1');
+        $filterData->setData('price_rule_type', $priceRuleType);
+        if ($priceRuleType) {
+            $filterData->setData('rules_list', ['0,1']);
+        }
+        $filterData->setData('order_statuses', 'statuses');
+        $this->model->setFilterData($filterData);
+
+        $resourceCollectionName = $this->model->getResourceCollectionName();
+        $collectionMock = $this->buildBaseCollectionMock($filterData, $resourceCollectionName, $collectionSize);
+
+        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->getMock();
+        $this->storeManagerMock->method('getStores')
+            ->willReturn([1 => $store]);
+        $this->resourceFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($collectionMock);
+
+        $this->assertEquals($expectedCountTotals, $this->model->getCountTotals());
+    }
+
+    /**
+     * @return array
+     */
+    public function getCountTotalsDataProvider(): array
+    {
+        return [
+            ['created_at_shipment', 0, 0, false],
+            ['created_at_shipment', 0, 1, true],
+            ['updated_at_order', 0, 1, true],
+            ['updated_at_order', 1, 1, true],
+        ];
+    }
+
+    /**
+     * @param \Magento\Framework\DataObject $filterData
+     * @param string $resourceCollectionName
+     * @param int $collectionSize
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function buildBaseCollectionMock(
+        \Magento\Framework\DataObject $filterData,
+        string $resourceCollectionName,
+        int $collectionSize
+    ): \PHPUnit_Framework_MockObject_MockObject {
+        $collectionMock = $this->getMockBuilder($resourceCollectionName)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $collectionMock->expects($this->once())
+            ->method('setPeriod')
+            ->with($filterData->getData('period_type'))
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('setDateRange')
+            ->with($filterData->getData('from'), $filterData->getData('to'))
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('addStoreFilter')
+            ->with(\explode(',', $filterData->getData('store_ids')))
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('setAggregatedColumns')
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('isTotals')
+            ->with(true)
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('addOrderStatusFilter')
+            ->with($filterData->getData('order_statuses'))
+            ->willReturnSelf();
+
+        if ($filterData->getData('price_rule_type')) {
+            $collectionMock->expects($this->once())
+                ->method('addRuleFilter')
+                ->with(\explode(',', $filterData->getData('rules_list')[0]))
+                ->willReturnSelf();
+        }
+
+        $collectionMock->expects($this->once())
+            ->method('load')
+            ->willReturnSelf();
+        $collectionMock->expects($this->once())
+            ->method('getSize')
+            ->willReturn($collectionSize);
+        if ($collectionSize) {
+            $itemMock = $this->getMockBuilder(\Magento\Reports\Model\Item::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+            $collectionMock->expects($this->once())
+                ->method('getItems')
+                ->willReturn([$itemMock]);
+        }
+
+        return $collectionMock;
+    }
+}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
index 1ed9d59d29a72..2175d83c67d07 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Block\Adminhtml\Items\Column;
 
+use Magento\Framework\Filter\TruncateFilter\Result;
+
 /**
  * Sales Order items name column renderer
  *
@@ -13,6 +17,11 @@
  */
 class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
 {
+    /**
+     * @var Result
+     */
+    private $truncateResult = null;
+
     /**
      * Truncate string
      *
@@ -22,13 +31,20 @@ class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
      * @param string &$remainder
      * @param bool $breakWords
      * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function truncateString($value, $length = 80, $etc = '...', &$remainder = '', $breakWords = true)
-    {
-        return $this->filterManager->truncate(
+    public function truncateString(
+        string $value,
+        int $length = 80,
+        string $etc = '...',
+        string &$remainder = '',
+        bool $breakWords = true
+    ): string {
+        $this->truncateResult = $this->filterManager->truncateFilter(
             $value,
-            ['length' => $length, 'etc' => $etc, 'remainder' => $remainder, 'breakWords' => $breakWords]
+            ['length' => $length, 'etc' => $etc, 'breakWords' => $breakWords]
         );
+        return $this->truncateResult->getValue();
     }
 
     /**
@@ -37,11 +53,14 @@ public function truncateString($value, $length = 80, $etc = '...', &$remainder =
      * @param string $value
      * @return array
      */
-    public function getFormattedOption($value)
+    public function getFormattedOption(string $value): array
     {
         $remainder = '';
-        $value = $this->truncateString($value, 55, '', $remainder);
-        $result = ['value' => nl2br($value), 'remainder' => nl2br($remainder)];
+        $this->truncateString($value, 55, '', $remainder);
+        $result = [
+            'value' => nl2br($this->truncateResult->getValue()),
+            'remainder' => nl2br($this->truncateResult->getRemainder())
+        ];
 
         return $result;
     }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
index 648a281228908..c4ce48d162c2c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
@@ -8,6 +8,7 @@
 /**
  * Adminhtml creditmemo bar
  *
+ * @deprecated
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
index 83486704984f7..94ca6a0375e7c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
@@ -74,9 +74,12 @@ public function __construct(
      */
     public function massAction(AbstractCollection $collection)
     {
+        $pdf = $this->pdfCreditmemo->getPdf($collection);
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('creditmemo%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfCreditmemo->getPdf($collection)->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
index d6c94feb57606..c5902aac33355 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
@@ -53,6 +53,7 @@ public function __construct(
 
     /**
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward
+     * @throws \Exception
      */
     public function execute()
     {
@@ -69,9 +70,11 @@ public function execute()
                 $date = $this->_objectManager->get(
                     \Magento\Framework\Stdlib\DateTime\DateTime::class
                 )->date('Y-m-d_H-i-s');
+                $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
                 return $this->_fileFactory->create(
                     \creditmemo::class . $date . '.pdf',
-                    $pdf->render(),
+                    $fileContent,
                     DirectoryList::VAR_DIR,
                     'application/pdf'
                 );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
index a949ceca53961..18cf397c0e3b9 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
@@ -75,9 +75,12 @@ public function __construct(
      */
     public function massAction(AbstractCollection $collection)
     {
+        $pdf = $this->pdfInvoice->getPdf($collection);
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('invoice%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfInvoice->getPdf($collection)->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
index 2421267aa753d..2caa8ec2dcb83 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
@@ -45,6 +45,7 @@ public function __construct(
 
     /**
      * @return ResponseInterface|void
+     * @throws \Exception
      */
     public function execute()
     {
@@ -58,9 +59,11 @@ public function execute()
                 $date = $this->_objectManager->get(
                     \Magento\Framework\Stdlib\DateTime\DateTime::class
                 )->date('Y-m-d_H-i-s');
+                $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
                 return $this->_fileFactory->create(
                     'invoice' . $date . '.pdf',
-                    $pdf->render(),
+                    $fileContent,
                     DirectoryList::VAR_DIR,
                     'application/pdf'
                 );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
index f96e2fd09c2b0..b6e3c4998eade 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
@@ -76,6 +76,7 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|ResultInterface
+     * @throws \Exception
      */
     protected function massAction(AbstractCollection $collection)
     {
@@ -85,9 +86,12 @@ protected function massAction(AbstractCollection $collection)
             $this->messageManager->addError(__('There are no printable documents related to selected orders.'));
             return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl());
         }
+        $pdf = $this->pdfCreditmemo->getPdf($creditmemoCollection->getItems());
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('creditmemo%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfCreditmemo->getPdf($creditmemoCollection->getItems())->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
index d68cfe696b0ef..90ffa2b75de22 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
@@ -113,6 +113,7 @@ public function __construct(
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Redirect
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws \Exception
      */
     protected function massAction(AbstractCollection $collection)
     {
@@ -142,10 +143,11 @@ protected function massAction(AbstractCollection $collection)
         foreach ($documents as $document) {
             $pdf->pages = array_merge($pdf->pages, $document->pages);
         }
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
 
         return $this->fileFactory->create(
             sprintf('docs%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $pdf->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
index fee124a91410d..93cb5882ed5de 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
@@ -75,6 +75,7 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|ResultInterface
+     * @throws \Exception
      */
     protected function massAction(AbstractCollection $collection)
     {
@@ -83,9 +84,12 @@ protected function massAction(AbstractCollection $collection)
             $this->messageManager->addError(__('There are no printable documents related to selected orders.'));
             return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl());
         }
+        $pdf = $this->pdfInvoice->getPdf($invoicesCollection->getItems());
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('invoice%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfInvoice->getPdf($invoicesCollection->getItems())->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
index 1aa5bfdb83878..d414ec99c2e6a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
@@ -77,6 +77,7 @@ public function __construct(
      *
      * @param AbstractCollection $collection
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Redirect
+     * @throws \Exception
      */
     protected function massAction(AbstractCollection $collection)
     {
@@ -87,9 +88,13 @@ protected function massAction(AbstractCollection $collection)
             $this->messageManager->addError(__('There are no printable documents related to selected orders.'));
             return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl());
         }
+
+        $pdf = $this->pdfShipment->getPdf($shipmentsCollection->getItems());
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('packingslip%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfShipment->getPdf($shipmentsCollection->getItems())->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
index b10dca908fe6a..4a7c6e0533e33 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
@@ -70,9 +70,12 @@ public function __construct(
      */
     public function massAction(AbstractCollection $collection)
     {
+        $pdf = $this->pdfShipment->getPdf($collection);
+        $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
         return $this->fileFactory->create(
             sprintf('packingslip%s.pdf', $this->dateTime->date('Y-m-d_H-i-s')),
-            $this->pdfShipment->getPdf($collection)->render(),
+            $fileContent,
             DirectoryList::VAR_DIR,
             'application/pdf'
         );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
index da8646a0c30b2..1e49fe7eff60a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
@@ -48,6 +48,7 @@ public function __construct(
 
     /**
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward
+     * @throws \Exception
      */
     public function execute()
     {
@@ -63,9 +64,11 @@ public function execute()
                 $date = $this->_objectManager->get(
                     \Magento\Framework\Stdlib\DateTime\DateTime::class
                 )->date('Y-m-d_H-i-s');
+                $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
+
                 return $this->_fileFactory->create(
                     'packingslip' . $date . '.pdf',
-                    $pdf->render(),
+                    $fileContent,
                     DirectoryList::VAR_DIR,
                     'application/pdf'
                 );
diff --git a/app/code/Magento/Sales/Model/Config/Ordered.php b/app/code/Magento/Sales/Model/Config/Ordered.php
index 8c5ddb8e07df7..bae6223ee7d5e 100644
--- a/app/code/Magento/Sales/Model/Config/Ordered.php
+++ b/app/code/Magento/Sales/Model/Config/Ordered.php
@@ -167,13 +167,8 @@ function ($a, $b) {
                     if (!isset($a['sort_order']) || !isset($b['sort_order'])) {
                         return 0;
                     }
-                    if ($a['sort_order'] > $b['sort_order']) {
-                        return 1;
-                    } elseif ($a['sort_order'] < $b['sort_order']) {
-                        return -1;
-                    } else {
-                        return 0;
-                    }
+
+                    return $a['sort_order'] <=> $b['sort_order'];
                 }
             );
         }
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
index a2f1d6bcdfbcc..2bcc1fd50dbfa 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
@@ -13,14 +13,11 @@
 use Magento\Framework\Data\Collection;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\TransactionInterface;
-use Magento\Sales\Api\OrderPaymentRepositoryInterface;
-use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\Data\TransactionSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Sales\Api\TransactionRepositoryInterface;
 use Magento\Sales\Model\EntityStorage;
 use Magento\Sales\Model\EntityStorageFactory;
-use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\ResourceModel\Metadata;
-use Magento\Sales\Api\Data\TransactionSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Sales\Model\ResourceModel\Order\Payment\Transaction as TransactionResource;
 
 /**
diff --git a/app/code/Magento/Sales/Model/Order/StateResolver.php b/app/code/Magento/Sales/Model/Order/StateResolver.php
index 6f84c9b48b6d5..f5575e0388af3 100644
--- a/app/code/Magento/Sales/Model/Order/StateResolver.php
+++ b/app/code/Magento/Sales/Model/Order/StateResolver.php
@@ -39,7 +39,7 @@ private function isOrderClosed(OrderInterface $order, $arguments)
     {
         /** @var $order Order|OrderInterface */
         $forceCreditmemo = in_array(self::FORCED_CREDITMEMO, $arguments);
-        if (floatval($order->getTotalRefunded()) || !$order->getTotalRefunded() && $forceCreditmemo) {
+        if ((float)$order->getTotalRefunded() || !$order->getTotalRefunded() && $forceCreditmemo) {
             return true;
         }
         return false;
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
index c7bac874fa330..3b127abbda732 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
@@ -29,7 +29,7 @@ public function check(Order $order)
                     $order->setState(Order::STATE_COMPLETE)
                         ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
                 }
-            } elseif (floatval($order->getTotalRefunded())
+            } elseif ((float)$order->getTotalRefunded()
                 || !$order->getTotalRefunded() && $order->hasForcedCanCreditmemo()
             ) {
                 if ($order->getState() !== Order::STATE_CLOSED) {
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
new file mode 100644
index 0000000000000..082eba016f898
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminOrdersGridSection">
+        <element name="search" type="input" selector="#fulltext"/>
+        <element name="submitSearch" type="button" selector=".//*[@id='container']/div/div[2]/div[1]/div[2]/button"/>
+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php
index 881af16f5fe69..e12a4195db4c6 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php
@@ -155,7 +155,8 @@ public function testExecute()
         $creditmemoId = 2;
         $date = '2015-01-19_13-03-45';
         $fileName = 'creditmemo2015-01-19_13-03-45.pdf';
-        $fileContents = 'pdf0123456789';
+        $pdfContent = 'pdf0123456789';
+        $fileData = ['type' => 'string', 'value' => $pdfContent, 'rm' => true];
         $this->prepareTestExecute($creditmemoId);
 
         $this->objectManagerMock->expects($this->any())
@@ -184,12 +185,12 @@ public function testExecute()
             ->willReturn($date);
         $this->pdfMock->expects($this->once())
             ->method('render')
-            ->willReturn($fileContents);
+            ->willReturn($pdfContent);
         $this->fileFactoryMock->expects($this->once())
             ->method('create')
             ->with(
                 $fileName,
-                $fileContents,
+                $fileData,
                 \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR,
                 'application/pdf'
             )
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
index 0c1b395b5116d..71490553aff17 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
@@ -22,7 +22,6 @@
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
                         <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="Magento_Sales::order/totalbar.phtml"/>
                         <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="Magento_Sales::order/totals.phtml">
                             <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments" name="adjustments" template="Magento_Sales::order/creditmemo/create/totals/adjustments.phtml"/>
                             <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="Magento_Sales::order/totals/tax.phtml"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
index 29a61308391c6..8375bec965794 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
@@ -13,7 +13,6 @@
             <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
             <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
             <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
-            <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="Magento_Sales::order/totalbar.phtml"/>
             <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="Magento_Sales::order/totals.phtml">
                 <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments" name="adjustments" template="Magento_Sales::order/creditmemo/create/totals/adjustments.phtml"/>
                 <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="Magento_Sales::order/totals/tax.phtml"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
index def5ebaf546cd..b589ac0ac793d 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
@@ -25,7 +25,6 @@
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
                         <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="Magento_Sales::order/totalbar.phtml"/>
                         <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Totals" name="invoice_totals" template="Magento_Sales::order/totals.phtml">
                             <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="Magento_Sales::order/totals/tax.phtml"/>
                         </block>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
index 4df3f057f6a58..38e4cb50f4343 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
@@ -13,7 +13,6 @@
             <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
             <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
             <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
-            <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="Magento_Sales::order/totalbar.phtml"/>
             <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Totals" name="invoice_totals" template="Magento_Sales::order/totals.phtml">
                 <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="Magento_Sales::order/totals/tax.phtml"/>
             </block>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
index b038c72199c7f..8ff360b9635c3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// @deprecated
 // @codingStandardsIgnoreFile
 
 ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
index fbf5f5c1023e3..53ab6c204fa5b 100644
--- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -39,6 +39,7 @@ define([
             this.isOnlyVirtualProduct = false;
             this.excludedPaymentMethods = [];
             this.summarizePrice = true;
+            this.timerId = null;
             jQuery.async('#order-items', (function(){
                 this.dataArea = new OrderFormArea('data', $(this.getAreaId('data')), this);
                 this.itemsArea = Object.extend(new OrderFormArea('items', $(this.getAreaId('items')), this), {
@@ -189,14 +190,27 @@ define([
         bindAddressFields : function(container) {
             var fields = $(container).select('input', 'select', 'textarea');
             for(var i=0;i<fields.length;i++){
-                Event.observe(fields[i], 'change', this.changeAddressField.bind(this));
+                Event.observe(fields[i], 'change', this.triggerChangeEvent.bind(this));
             }
         },
 
+        /**
+         * Calls changing address field handler after timeout to prevent multiple simultaneous calls.
+         *
+         * @param {Event} event
+         */
+        triggerChangeEvent: function (event) {
+            if (this.timerId) {
+                window.clearTimeout(this.timerId);
+            }
+
+            this.timerId = window.setTimeout(this.changeAddressField.bind(this), 500, event);
+        },
+
         /**
          * Triggers on each form's element changes.
          *
-         * @param {Object} event
+         * @param {Event} event
          */
         changeAddressField: function (event) {
             var field = Event.element(event),
@@ -619,7 +633,7 @@ define([
                     }
                     else if (((elms[i].type == 'checkbox' || elms[i].type == 'radio') && elms[i].checked)
                         || ((elms[i].type == 'file' || elms[i].type == 'text' || elms[i].type == 'textarea' || elms[i].type == 'hidden')
-                        && Form.Element.getValue(elms[i]))
+                            && Form.Element.getValue(elms[i]))
                     ) {
                         if (this._isSummarizePrice(elms[i])) {
                             productPrice += getPrice(elms[i]);
@@ -1131,7 +1145,7 @@ define([
          */
         isPaymentValidationAvailable : function(){
             return ((typeof this.paymentMethod) == 'undefined'
-            || this.excludedPaymentMethods.indexOf(this.paymentMethod) == -1);
+                || this.excludedPaymentMethods.indexOf(this.paymentMethod) == -1);
         },
 
         serializeData : function(container){
diff --git a/app/code/Magento/Sales/view/frontend/requirejs-config.js b/app/code/Magento/Sales/view/frontend/requirejs-config.js
index 04778765f3c97..4d323684afff6 100644
--- a/app/code/Magento/Sales/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Sales/view/frontend/requirejs-config.js
@@ -6,8 +6,10 @@
 var config = {
     map: {
         '*': {
-            giftMessage:    'Magento_Sales/gift-message',
-            ordersReturns:  'Magento_Sales/orders-returns'
+            giftMessage:    'Magento_Sales/js/gift-message',
+            ordersReturns:  'Magento_Sales/js/orders-returns',
+            'Magento_Sales/gift-message':    'Magento_Sales/js/gift-message',
+            'Magento_Sales/orders-returns':  'Magento_Sales/js/orders-returns'
         }
     }
 };
diff --git a/app/code/Magento/Sales/view/frontend/web/gift-message.js b/app/code/Magento/Sales/view/frontend/web/js/gift-message.js
similarity index 100%
rename from app/code/Magento/Sales/view/frontend/web/gift-message.js
rename to app/code/Magento/Sales/view/frontend/web/js/gift-message.js
diff --git a/app/code/Magento/Sales/view/frontend/web/orders-returns.js b/app/code/Magento/Sales/view/frontend/web/js/orders-returns.js
similarity index 100%
rename from app/code/Magento/Sales/view/frontend/web/orders-returns.js
rename to app/code/Magento/Sales/view/frontend/web/js/orders-returns.js
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
index 54b50dbdf38db..59f24fa8b6e03 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -6,6 +6,7 @@
 
 namespace Magento\SalesRule\Model\ResourceModel\Rule;
 
+use Magento\Framework\DB\Select;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Quote\Model\Quote\Address;
 
@@ -209,7 +210,9 @@ public function setValidationFilter(
                 $andWhereCondition = implode(' AND ', $andWhereConditions);
 
                 $select->where(
-                    $noCouponWhereCondition . ' OR ((' . $orWhereCondition . ') AND ' . $andWhereCondition . ')'
+                    $noCouponWhereCondition . ' OR ((' . $orWhereCondition . ') AND ' . $andWhereCondition . ')',
+                    null,
+                    Select::TYPE_CONDITION
                 );
             } else {
                 $this->addFieldToFilter(
@@ -320,7 +323,7 @@ public function addAttributeInConditionFilter($attributeCode)
         $this->getSelect()->where(
             sprintf('(%s OR %s)', $cCond, $aCond),
             null,
-            \Magento\Framework\DB\Select::TYPE_CONDITION
+            Select::TYPE_CONDITION
         );
 
         return $this;
diff --git a/app/code/Magento/Search/view/frontend/requirejs-config.js b/app/code/Magento/Search/view/frontend/requirejs-config.js
index c38cba4315eac..d945944daa1b0 100644
--- a/app/code/Magento/Search/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Search/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            quickSearch: 'Magento_Search/form-mini'
+            quickSearch: 'Magento_Search/js/form-mini',
+            'Magento_Search/form-mini': 'Magento_Search/js/form-mini'
         }
     }
 };
diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
similarity index 100%
rename from app/code/Magento/Search/view/frontend/web/form-mini.js
rename to app/code/Magento/Search/view/frontend/web/js/form-mini.js
diff --git a/app/code/Magento/SendFriend/view/frontend/requirejs-config.js b/app/code/Magento/SendFriend/view/frontend/requirejs-config.js
new file mode 100644
index 0000000000000..f356cebe57946
--- /dev/null
+++ b/app/code/Magento/SendFriend/view/frontend/requirejs-config.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    map: {
+        '*': {
+            'Magento_SendFriend/back-event': 'Magento_SendFriend/js/back-event'
+        }
+    }
+};
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index 3342530f01eb5..2b25e0efab84a 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -123,7 +123,7 @@
 <script type="text/x-magento-init">
     {
         "a[role='back']": {
-            "Magento_SendFriend/back-event": {}
+            "Magento_SendFriend/js/back-event": {}
         }
     }
 </script>
diff --git a/app/code/Magento/SendFriend/view/frontend/web/back-event.js b/app/code/Magento/SendFriend/view/frontend/web/js/back-event.js
similarity index 100%
rename from app/code/Magento/SendFriend/view/frontend/web/back-event.js
rename to app/code/Magento/SendFriend/view/frontend/web/js/back-event.js
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index d92e115742857..3e38d9aa53c9f 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -48,4 +48,13 @@
         <data key="store_type">store</data>
         <requiredEntity type="storeGroup">secondStoreGroup</requiredEntity>
     </entity>
+    <entity name="staticStore" type="store">
+        <data key="name">Second Store View</data>
+        <data key="code">store123</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">group</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
index eebe2c570b1fe..30dfbd9dbedf2 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
@@ -29,4 +29,10 @@
         <data key="store_action">add</data>
         <data key="store_type">group</data>
     </entity>
+    <entity name="staticStoreGroup" type="group">
+        <data key="name">NewStore</data>
+        <data key="code">Base12</data>
+        <data key="root_category_id">2</data>
+        <data key="website_id">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
index 5f8e27f3ec101..a3b5d1e616319 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
@@ -10,6 +10,6 @@
         <element name="backButton" type="button" selector="#back" timeout="30"/>
         <element name="delete" type="button" selector="#delete" timeout="30"/>
         <element name="resetButton" type="button" selector="#reset" timeout="30"/>
-        <element name="saveButton" type="button" selector="#save" timeout="30"/>
+        <element name="saveButton" type="button" selector="#save" timeout="60"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
index 70a33d3a2a060..1f02de731f9a0 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
@@ -7,6 +7,6 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminNewWebsiteActionsSection">
-        <element name="saveWebsite" type="button" selector="#save" timeout="30"/>
+        <element name="saveWebsite" type="button" selector="#save" timeout="60"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
index ae0283865b774..6dc766c0c02da 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
@@ -7,6 +7,6 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminStoreGroupActionsSection">
-        <element name="saveButton" type="button" selector="#save" timeout="30" />
+        <element name="saveButton" type="button" selector="#save" timeout="60" />
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php b/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
index ed9ac7ebe438a..f31acd40a2e69 100644
--- a/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
+++ b/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
@@ -22,6 +22,11 @@ class RouteParamsResolverTest extends \PHPUnit\Framework\TestCase
      */
     protected $queryParamsResolverMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\Store
+     */
+    protected $storeMock;
+
     /**
      * @var \Magento\Store\Url\Plugin\RouteParamsResolver
      */
@@ -30,7 +35,19 @@ class RouteParamsResolverTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+
+        $this->storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->setMethods(['getCode'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeMock->expects($this->any())->method('getCode')->willReturn('custom_store');
+
         $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->storeManagerMock
+            ->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+
         $this->queryParamsResolverMock = $this->createMock(\Magento\Framework\Url\QueryParamsResolverInterface::class);
         $this->model = new \Magento\Store\Url\Plugin\RouteParamsResolver(
             $this->scopeConfigMock,
@@ -42,6 +59,8 @@ protected function setUp()
     public function testBeforeSetRouteParamsScopeInParams()
     {
         $storeCode = 'custom_store';
+        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         $this->scopeConfigMock
             ->expects($this->once())
             ->method('getValue')
@@ -52,7 +71,7 @@ public function testBeforeSetRouteParamsScopeInParams()
             )
             ->will($this->returnValue(false));
         $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
-        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
         $routeParamsResolverMock = $this->getMockBuilder(\Magento\Framework\Url\RouteParamsResolver::class)
             ->setMethods(['setScope', 'getScope'])
@@ -61,7 +80,7 @@ public function testBeforeSetRouteParamsScopeInParams()
         $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
 
-        $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
+        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam');
 
         $this->model->beforeSetRouteParams(
             $routeParamsResolverMock,
@@ -72,6 +91,8 @@ public function testBeforeSetRouteParamsScopeInParams()
     public function testBeforeSetRouteParamsScopeUseStoreInUrl()
     {
         $storeCode = 'custom_store';
+        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         $this->scopeConfigMock
             ->expects($this->once())
             ->method('getValue')
@@ -81,8 +102,9 @@ public function testBeforeSetRouteParamsScopeUseStoreInUrl()
                 $storeCode
             )
             ->will($this->returnValue(true));
+
         $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
-        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
         $routeParamsResolverMock = $this->getMockBuilder(\Magento\Framework\Url\RouteParamsResolver::class)
             ->setMethods(['setScope', 'getScope'])
@@ -91,7 +113,7 @@ public function testBeforeSetRouteParamsScopeUseStoreInUrl()
         $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
 
-        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam');
+        $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
 
         $this->model->beforeSetRouteParams(
             $routeParamsResolverMock,
@@ -102,6 +124,8 @@ public function testBeforeSetRouteParamsScopeUseStoreInUrl()
     public function testBeforeSetRouteParamsSingleStore()
     {
         $storeCode = 'custom_store';
+        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         $this->scopeConfigMock
             ->expects($this->once())
             ->method('getValue')
@@ -112,7 +136,7 @@ public function testBeforeSetRouteParamsSingleStore()
             )
             ->will($this->returnValue(false));
         $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(true);
-        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+
         /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
         $routeParamsResolverMock = $this->getMockBuilder(\Magento\Framework\Url\RouteParamsResolver::class)
             ->setMethods(['setScope', 'getScope'])
@@ -132,6 +156,8 @@ public function testBeforeSetRouteParamsSingleStore()
     public function testBeforeSetRouteParamsNoScopeInParams()
     {
         $storeCode = 'custom_store';
+        $data = ['_scope_to_url' => true];
+
         $this->scopeConfigMock
             ->expects($this->once())
             ->method('getValue')
@@ -140,17 +166,10 @@ public function testBeforeSetRouteParamsNoScopeInParams()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeCode
             )
-            ->will($this->returnValue(false));
+            ->will($this->returnValue(true));
+
         $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
-        /** @var \PHPUnit_Framework_MockObject_MockObject| $routeParamsResolverMock */
-        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->setMethods(['getCode'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $storeMock->expects($this->any())->method('getCode')->willReturn($storeCode);
-        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
 
-        $data = ['_scope_to_url' => true];
         /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
         $routeParamsResolverMock = $this->getMockBuilder(\Magento\Framework\Url\RouteParamsResolver::class)
             ->setMethods(['setScope', 'getScope'])
diff --git a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
index c4f8a31430963..468352af78cbc 100644
--- a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
+++ b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
@@ -6,6 +6,7 @@
 namespace Magento\Store\Url\Plugin;
 
 use \Magento\Store\Model\Store;
+use \Magento\Store\Api\Data\StoreInterface;
 use \Magento\Store\Model\ScopeInterface as StoreScopeInterface;
 
 /**
@@ -51,6 +52,8 @@ public function __construct(
      * @param \Magento\Framework\Url\RouteParamsResolver $subject
      * @param array $data
      * @param bool $unsetOldParams
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     *
      * @return array
      */
     public function beforeSetRouteParams(
@@ -63,13 +66,19 @@ public function beforeSetRouteParams(
             unset($data['_scope']);
         }
         if (isset($data['_scope_to_url']) && (bool)$data['_scope_to_url'] === true) {
-            $storeCode = $subject->getScope() ?: $this->storeManager->getStore()->getCode();
+            /** @var StoreInterface $currentScope */
+            $currentScope = $subject->getScope();
+            $storeCode = $currentScope && $currentScope instanceof StoreInterface ?
+                $currentScope->getCode() :
+                $this->storeManager->getStore()->getCode();
+
             $useStoreInUrl = $this->scopeConfig->getValue(
                 Store::XML_PATH_STORE_IN_URL,
                 StoreScopeInterface::SCOPE_STORE,
                 $storeCode
             );
-            if (!$useStoreInUrl && !$this->storeManager->hasSingleStore()) {
+
+            if ($useStoreInUrl && !$this->storeManager->hasSingleStore()) {
                 $this->queryParamsResolver->setQueryParam('___store', $storeCode);
             }
         }
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/CreateConfigurationsWithVisualSwatchActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/CreateConfigurationsWithVisualSwatchActionGroup.xml
new file mode 100644
index 0000000000000..4eb4ca0b1327b
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/CreateConfigurationsWithVisualSwatchActionGroup.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateConfigurationsWithVisualSwatch">
+        <arguments>
+            <argument name="attribute" defaultValue="VisualSwatchAttribute"/>
+            <argument name="option1" defaultValue="VisualSwatchOption1"/>
+            <argument name="option2" defaultValue="VisualSwatchOption2"/>
+        </arguments>
+        <seeInCurrentUrl url="{{AdminCatalogProductPage.url}}" stepKey="seeOnProductEditPage"/>
+        <conditionalClick selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="openConfigurationSection"/>
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="openConfigurationPanel"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanelSection.createNewAttribute}}" stepKey="waitForSlideOut"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
+        <waitForPageLoad stepKey="waitForIFrame"/>
+
+        <switchToIFrame selector="{{AdminNewAttributePanelSection.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
+        <fillField selector="{{AdminNewAttributePanelSection.defaultLabel}}" userInput="{{attribute.default_label}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AdminNewAttributePanelSection.inputType}}" userInput="{{attribute.input_type}}" stepKey="selectInputType"/>
+        <!--Add swatch options-->
+        <click selector="{{AdminNewAttributePanelSection.addVisualSwatchOption}}" stepKey="clickAddSwatch1"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanelSection.visualSwatchOptionAdminValue('0')}}" stepKey="waitForOption1Row"/>
+        <fillField selector="{{AdminNewAttributePanelSection.visualSwatchOptionAdminValue('0')}}" userInput="{{option1.admin_label}}" stepKey="fillAdminLabel1"/>
+        <fillField selector="{{AdminNewAttributePanelSection.visualSwatchOptionDefaultStoreValue('0')}}" userInput="{{option1.default_label}}" stepKey="fillDefaultStoreLabel1"/>
+        <click selector="{{AdminNewAttributePanelSection.addVisualSwatchOption}}" stepKey="clickAddSwatch2"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanelSection.visualSwatchOptionAdminValue('1')}}" stepKey="waitForOption2Row"/>
+        <fillField selector="{{AdminNewAttributePanelSection.visualSwatchOptionAdminValue('1')}}" userInput="{{option2.admin_label}}" stepKey="fillAdminLabel2"/>
+        <fillField selector="{{AdminNewAttributePanelSection.visualSwatchOptionDefaultStoreValue('1')}}" userInput="{{option2.default_label}}" stepKey="fillDefaultStoreLabel2"/>
+
+        <!--Save attribute-->
+        <click selector="{{AdminNewAttributePanelSection.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+
+        <!--Find attribute in grid and select-->
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="clickOnFilters"/>
+        <fillField selector="{{AdminProductAttributeGridSection.attributeCodeFilterInput}}" userInput="{{attribute.default_label}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminDataGridTableSection.rowCheckbox('1')}}" stepKey="clickOnFirstCheckbox"/>
+
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="clickNextStep1"/>
+
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.selectAllByAttribute(attribute.default_label)}}" stepKey="clickSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="clickNextStep2"/>
+
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.quantity}}" userInput="100" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="clickOnNextStep3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="generateProducts"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <click selector="{{AdminChooseAffectedAttributeSetSection.confirm}}" stepKey="clickOnConfirmInPopup"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml
new file mode 100644
index 0000000000000..7822120337e1d
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="VisualSwatchAttribute" type="SwatchAttribute">
+        <data key="default_label" unique="suffix">VisualSwatchAttr</data>
+        <data key="input_type">Visual Swatch</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Data/SwatchOptionData.xml b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchOptionData.xml
new file mode 100644
index 0000000000000..d6228512c807c
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchOptionData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="VisualSwatchOption1" type="SwatchOption">
+        <data key="admin_label" unique="suffix">VisualOpt1</data>
+        <data key="default_label" unique="suffix">VisualOpt1</data>
+    </entity>
+
+    <entity name="VisualSwatchOption2" type="SwatchOption">
+        <data key="admin_label" unique="suffix">VisualOpt2</data>
+        <data key="default_label" unique="suffix">VisualOpt2</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Swatches/Test/Mftf/Page/AdminProductCreatePage.xml
new file mode 100644
index 0000000000000..bce9c170899a3
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
+        <section name="AdminNewAttributePanelSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/AdminNewAttributePanelSection.xml
new file mode 100644
index 0000000000000..664d318c6e831
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/AdminNewAttributePanelSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminNewAttributePanelSection">
+        <element name="addVisualSwatchOption" type="button" selector="#add_new_swatch_visual_option_button"/>
+        <element name="visualSwatchOptionAdminValue" type="input" selector="[data-role='swatch-visual-options-container'] input[name='optionvisual[value][option_{{row}}][0]']" parameterized="true"/>
+        <element name="visualSwatchOptionDefaultStoreValue" type="input" selector="[data-role='swatch-visual-options-container'] input[name='optionvisual[value][option_{{row}}][1]']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..d547d8c95d4b0
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="swatchOptionByLabel" type="button" selector="div.swatch-option[option-label={{opt}}]" parameterized="true"/>
+        <element name="selectedSwatchValue" type="text" selector="//div[contains(@class, 'swatch-attribute') and contains(., '{{attr}}')]//span[contains(@class, 'swatch-attribute-selected-option')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
new file mode 100644
index 0000000000000..1786b9bad236d
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontSwatchProductWithFileCustomOptionTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Add configurable product to cart"/>
+            <title value="Correct error message and redirect with invalid file option"/>
+            <description value="Configurable product with swatch option and file custom option. When adding to cart with an invalid filetype, the correct error message is shown, and options remain selected."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-93331"/>
+            <group value="ConfigurableProduct"/>
+            <group value="swatches"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="DeleteAllProductsOnProductsGridPageFilteredByName" stepKey="deleteAllCreatedProducts">
+                <argument name="product" value="BaseConfigurableProduct"/>
+            </actionGroup>
+            <actionGroup ref="DeleteProductAttribute" stepKey="deleteCreatedProductAttribute">
+                <argument name="productAttribute" value="VisualSwatchAttribute"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logoutAdminUserAfterTest"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        <!-- Create a configurable swatch product via the UI -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="searchAndSelectCategory"/>
+        <!--Add swatch attribute to configurable product-->
+        <actionGroup ref="CreateConfigurationsWithVisualSwatch" stepKey="createConfigurationsWithVisualSwatch"/>
+        <!--Add custom option to configurable product-->
+        <actionGroup ref="AddProductCustomOptionFile" stepKey="addCustomOptionToProduct"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+
+        <!--Go to storefront-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <waitForPageLoad stepKey="waitForHomePageLoad"/>
+        <click selector="{{StorefrontNavigationSection.topCategory($$createCategory.name$$)}}" stepKey="goToCategoryStorefront"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.categoryTitle}}" userInput="$$createCategory.name$$" stepKey="seeOnCategoryPage"/>
+        <!--Add configurable product to cart-->
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.productTitleByName(BaseConfigurableProduct.name)}}" stepKey="hoverProductInGrid"/>
+        <click selector="{{StorefrontCategoryProductSection.productAddToCartByName(BaseConfigurableProduct.name)}}" stepKey="tryAddToCartFromCategoryPage"/>
+        <waitForPageLoad stepKey="waitForRedirectToProductPage"/>
+        <seeInCurrentUrl url="{{StorefrontProductPage.url(BaseConfigurableProduct.name)}}" stepKey="seeOnProductPage"/>
+        <click selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(VisualSwatchOption2.default_label)}}" stepKey="clickSwatchOption"/>
+        <see selector="{{StorefrontProductInfoMainSection.selectedSwatchValue(VisualSwatchAttribute.default_label)}}" userInput="{{VisualSwatchOption2.default_label}}" stepKey="seeSwatchIsSelected"/>
+
+        <!--Try invalid file-->
+        <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" userInput="lorem_ipsum.docx" stepKey="attachInvalidFile"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartInvalidFile"/>
+        <waitForPageLoad time="30" stepKey="waitForAddToCartWithError"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.alertMessage}}" stepKey="waitForErrorMessageInvalidFile"/>
+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="The file 'lorem_ipsum.docx' for '{{ProductOptionFile.title}}' has an invalid extension." stepKey="seeMessageInvalidFile"/>
+        <!--Swatch remains selected-->
+        <see selector="{{StorefrontProductInfoMainSection.selectedSwatchValue(VisualSwatchAttribute.default_label)}}" userInput="{{VisualSwatchOption2.default_label}}" stepKey="seeSwatchRemainsSelected"/>
+        <!--Try valid file-->
+        <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" userInput="{{MagentoLogo.file}}" stepKey="attachValidFile"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$132.99" stepKey="seePriceUpdated"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartValidFile"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="You added {{BaseConfigurableProduct.name}} to your shopping cart." stepKey="seeSuccessMessage"/>
+
+        <!--Check item in cart-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
+        <seeElement selector="{{CheckoutCartProductSection.productLinkByName(BaseConfigurableProduct.name)}}" stepKey="seeProductInCart"/>
+        <see selector="{{CheckoutCartProductSection.productOptionByNameAndAttribute(BaseConfigurableProduct.name, VisualSwatchAttribute.default_label)}}" userInput="{{VisualSwatchOption2.default_label}}" stepKey="seeSelectedSwatch"/>
+        <see selector="{{CheckoutCartProductSection.productOptionByNameAndAttribute(BaseConfigurableProduct.name, ProductOptionFile.title)}}" userInput="{{MagentoLogo.file}}" stepKey="seeCorrectOptionFile"/>
+        <!--Delete cart item-->
+        <click selector="{{CheckoutCartProductSection.removeItem}}" stepKey="deleteCartItem"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
index ea166b9080f5c..fbd6ff15c006e 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
@@ -22,6 +22,9 @@
             "Magento_Swatches/js/configurable-customer-data": {
                     "swatchOptions": <?php /* @noEscape */ echo $swatchOptions ?>
             }
+        },
+        "*" : {
+            "Magento_Swatches/js/catalog-add-to-cart": {}
         }
     }
 </script>
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js
index d699faae3a85f..ce4a364e97144 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js
@@ -7,11 +7,22 @@ require([
 ], function ($) {
     'use strict';
 
+    /**
+     * Add selected swatch attributes to redirect url
+     *
+     * @see Magento_Catalog/js/catalog-add-to-cart
+     */
     $('body').on('catalogCategoryAddToCartRedirect', function (event, data) {
         $(data.form).find('[name*="super"]').each(function (index, item) {
-            var $item = $(item);
+            var $item = $(item),
+                attr;
 
-            data.redirectParameters.push($item.attr('data-attr-name') + '=' + $item.val());
+            if ($item.attr('data-attr-name')) {
+                attr = $item.attr('data-attr-name');
+            } else {
+                attr = $item.parent().attr('attribute-code');
+            }
+            data.redirectParameters.push(attr + '=' + $item.val());
         });
     });
 });
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index 50a3af34aa684..3060dfd316929 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -1240,8 +1240,20 @@ define([
          */
         _EmulateSelected: function (selectedAttributes) {
             $.each(selectedAttributes, $.proxy(function (attributeCode, optionId) {
-                this.element.find('.' + this.options.classes.attributeClass +
-                    '[attribute-code="' + attributeCode + '"] [option-id="' + optionId + '"]').trigger('click');
+                var elem = this.element.find('.' + this.options.classes.attributeClass +
+                    '[attribute-code="' + attributeCode + '"] [option-id="' + optionId + '"]'),
+                    parentInput = elem.parent();
+
+                if (elem.hasClass('selected')) {
+                    return;
+                }
+
+                if (parentInput.hasClass(this.options.classes.selectClass)) {
+                    parentInput.val(optionId);
+                    parentInput.trigger('change');
+                } else {
+                    elem.trigger('click');
+                }
             }, this));
         },
 
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 5bfbf9e061a37..1426878d3f313 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -733,7 +733,7 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
             $orderItemId = $orderItem->getId();
             $orderItemTax = $orderItem->getTaxAmount();
             $itemTax = $item->getTaxAmount();
-            if (!$itemTax || !floatval($orderItemTax)) {
+            if (!$itemTax || !(float)$orderItemTax) {
                 continue;
             }
             //An invoiced item or credit memo item can have a different qty than its order item qty
@@ -761,7 +761,7 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
         $shippingTaxAmount = $salesItem->getShippingTaxAmount();
         $originalShippingTaxAmount = $order->getShippingTaxAmount();
         if ($shippingTaxAmount && $originalShippingTaxAmount &&
-            $shippingTaxAmount != 0 && floatval($originalShippingTaxAmount)
+            $shippingTaxAmount != 0 && (float)$originalShippingTaxAmount
         ) {
             //An invoice or credit memo can have a different qty than its order
             $shippingRatio = $shippingTaxAmount / $originalShippingTaxAmount;
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
index 16a55dbfac3e2..6e38e29decae5 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
@@ -39,16 +39,23 @@ public function collect(
         $quoteDetails = $this->prepareQuoteDetails($shippingAssignment, [$shippingDataObject]);
         $taxDetails = $this->taxCalculationService
             ->calculateTax($quoteDetails, $storeId);
+        $taxDetailsItems = $taxDetails->getItems()[self::ITEM_CODE_SHIPPING];
 
         $baseQuoteDetails = $this->prepareQuoteDetails($shippingAssignment, [$baseShippingDataObject]);
         $baseTaxDetails = $this->taxCalculationService
             ->calculateTax($baseQuoteDetails, $storeId);
+        $baseTaxDetailsItems = $baseTaxDetails->getItems()[self::ITEM_CODE_SHIPPING];
+
+        $quote->getShippingAddress()
+            ->setShippingAmount($taxDetailsItems->getRowTotal());
+        $quote->getShippingAddress()
+            ->setBaseShippingAmount($baseTaxDetailsItems->getRowTotal());
 
         $this->processShippingTaxInfo(
             $shippingAssignment,
             $total,
-            $taxDetails->getItems()[self::ITEM_CODE_SHIPPING],
-            $baseTaxDetails->getItems()[self::ITEM_CODE_SHIPPING]
+            $taxDetailsItems,
+            $baseTaxDetailsItems
         );
 
         return $this;
@@ -58,6 +65,8 @@ public function collect(
      * @param \Magento\Quote\Model\Quote $quote
      * @param Address\Total $total
      * @return array|null
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/Theme/Controller/Result/MessagePlugin.php b/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
index 145493b8e44d8..83172df748a47 100644
--- a/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
@@ -5,9 +5,12 @@
  */
 namespace Magento\Theme\Controller\Result;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Translate\Inline\ParserInterface;
+use Magento\Framework\Translate\InlineInterface;
 
 /**
  * Plugin for putting messages to cookies
@@ -44,26 +47,34 @@ class MessagePlugin
      */
     private $serializer;
 
+    /**
+     * @var InlineInterface
+     */
+    private $inlineTranslate;
+
     /**
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Framework\View\Element\Message\InterpretationStrategyInterface $interpretationStrategy
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param InlineInterface|null $inlineTranslate
      */
     public function __construct(
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\Framework\View\Element\Message\InterpretationStrategyInterface $interpretationStrategy,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        InlineInterface $inlineTranslate = null
     ) {
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->messageManager = $messageManager;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->serializer = $serializer ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         $this->interpretationStrategy = $interpretationStrategy;
+        $this->inlineTranslate = $inlineTranslate ?: ObjectManager::getInstance()->get(InlineInterface::class);
     }
 
     /**
@@ -112,6 +123,12 @@ public function afterRenderResult(
     private function setCookie(array $messages)
     {
         if (!empty($messages)) {
+            if ($this->inlineTranslate->isAllowed()) {
+                foreach ($messages as &$message) {
+                    $message['text'] = $this->convertMessageText($message['text']);
+                }
+            }
+
             $publicCookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata();
             $publicCookieMetadata->setDurationOneYear();
             $publicCookieMetadata->setPath('/');
@@ -125,6 +142,21 @@ private function setCookie(array $messages)
         }
     }
 
+    /**
+     * Replace wrapping translation with html body.
+     *
+     * @param string $text
+     * @return string
+     */
+    private function convertMessageText(string $text): string
+    {
+        if (preg_match('#' . ParserInterface::REGEXP_TOKEN . '#', $text, $matches)) {
+            $text = $matches[1];
+        }
+
+        return $text;
+    }
+
     /**
      * Return messages array and clean message manager messages
      *
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php
index 60457fc1436c0..389e404ed129f 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\Cookie\PublicCookieMetadata;
 use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Framework\Translate\InlineInterface;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use Magento\Theme\Controller\Result\MessagePlugin;
 
@@ -40,6 +41,9 @@ class MessagePluginTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */
     private $serializerMock;
 
+    /** @var InlineInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $inlineTranslateMock;
+
     protected function setUp()
     {
         $this->cookieManagerMock = $this->getMockBuilder(CookieManagerInterface::class)
@@ -53,13 +57,15 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
             ->getMock();
+        $this->inlineTranslateMock = $this->getMockBuilder(InlineInterface::class)->getMockForAbstractClass();
 
         $this->model = new MessagePlugin(
             $this->cookieManagerMock,
             $this->cookieMetadataFactoryMock,
             $this->managerMock,
             $this->interpretationStrategyMock,
-            $this->serializerMock
+            $this->serializerMock,
+            $this->inlineTranslateMock
         );
     }
 
@@ -450,4 +456,93 @@ function ($data) {
 
         $this->assertEquals($resultMock, $this->model->afterRenderResult($resultMock, $resultMock));
     }
+
+    /**
+     * @return void
+     */
+    public function testAfterRenderResultWithAllowedInlineTranslate()
+    {
+        $messageType = 'message1type';
+        $messageText = '{{{message1text}}{{message1text}}{{message1text}}{{theme/luma}}}';
+        $expectedMessages = [
+            [
+                'type' => $messageType,
+                'text' => 'message1text',
+            ],
+        ];
+
+        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $resultMock */
+        $resultMock = $this->getMockBuilder(Redirect::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var PublicCookieMetadata|\PHPUnit_Framework_MockObject_MockObject $cookieMetadataMock */
+        $cookieMetadataMock = $this->getMockBuilder(PublicCookieMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->cookieMetadataFactoryMock->expects($this->once())
+            ->method('createPublicCookieMetadata')
+            ->willReturn($cookieMetadataMock);
+
+        $this->cookieManagerMock->expects($this->once())
+            ->method('setPublicCookie')
+            ->with(
+                MessagePlugin::MESSAGES_COOKIES_NAME,
+                json_encode($expectedMessages),
+                $cookieMetadataMock
+            );
+        $this->cookieManagerMock->expects($this->once())
+            ->method('getCookie')
+            ->with(
+                MessagePlugin::MESSAGES_COOKIES_NAME
+            )
+            ->willReturn(json_encode([]));
+
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willReturnCallback(
+                function ($data) {
+                    return json_decode($data, true);
+                }
+            );
+        $this->serializerMock->expects($this->once())
+            ->method('serialize')
+            ->willReturnCallback(
+                function ($data) {
+                    return json_encode($data);
+                }
+            );
+
+        /** @var MessageInterface|\PHPUnit_Framework_MockObject_MockObject $messageMock */
+        $messageMock = $this->getMockBuilder(MessageInterface::class)
+            ->getMock();
+        $messageMock->expects($this->once())
+            ->method('getType')
+            ->willReturn($messageType);
+
+        $this->interpretationStrategyMock->expects($this->once())
+            ->method('interpret')
+            ->with($messageMock)
+            ->willReturn($messageText);
+
+        $this->inlineTranslateMock->expects($this->once())
+            ->method('isAllowed')
+            ->willReturn(true);
+
+        /** @var Collection|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
+        $collectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $collectionMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$messageMock]);
+
+        $this->managerMock->expects($this->once())
+            ->method('getMessages')
+            ->with(true, null)
+            ->willReturn($collectionMock);
+
+        $this->assertEquals($resultMock, $this->model->afterRenderResult($resultMock, $resultMock));
+    }
 }
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index c20184fec6bc4..21e1736d01bf1 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -69,7 +69,7 @@
     </type>
     <type name="Magento\Framework\App\Area">
         <arguments>
-            <argument name="translator" xsi:type="object">Magento\Framework\Translate</argument>
+            <argument name="translator" xsi:type="object">Magento\Framework\TranslateInterface</argument>
             <argument name="design" xsi:type="object">Magento\Theme\Model\Design\Proxy</argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
index 9037574e28a5b..a1cfab00b6c8d 100644
--- a/app/code/Magento/Translation/Model/Js/DataProvider.php
+++ b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -114,7 +114,8 @@ public function getData($themePath)
                     }
                 } catch (\Exception $e) {
                     throw new LocalizedException(
-                        __('Error while translating phrase "%s" in file %s.', $phrase, $filePath[0])
+                        __('Error while translating phrase "%s" in file %s.', $phrase, $filePath[0]),
+                        $e
                     );
                 }
             }
diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js
index 47ccaf5a33e57..b4b3ce0f8c554 100644
--- a/app/code/Magento/Translation/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Translation/view/frontend/requirejs-config.js
@@ -7,7 +7,8 @@ var config = {
     map: {
         '*': {
             editTrigger: 'mage/edit-trigger',
-            addClass: 'Magento_Translation/add-class'
+            addClass: 'Magento_Translation/js/add-class',
+            'Magento_Translation/add-class': 'Magento_Translation/js/add-class'
         }
     },
     deps: [
diff --git a/app/code/Magento/Translation/view/frontend/web/add-class.js b/app/code/Magento/Translation/view/frontend/web/js/add-class.js
similarity index 100%
rename from app/code/Magento/Translation/view/frontend/web/add-class.js
rename to app/code/Magento/Translation/view/frontend/web/js/add-class.js
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Input.php b/app/code/Magento/Ui/Component/Filters/Type/Input.php
index 9cc060ae58172..230f3dbce3497 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Input.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Input.php
@@ -67,7 +67,7 @@ protected function applyFilter()
         if (isset($this->filterData[$this->getName()])) {
             $value = str_replace(['%', '_'], ['\%', '\_'], $this->filterData[$this->getName()]);
 
-            if (!empty($value)) {
+            if (!$this->isEmptyValue($value)) {
                 $filter = $this->filterBuilder->setConditionType('like')
                     ->setField($this->getName())
                     ->setValue(sprintf('%%%s%%', $value))
@@ -77,4 +77,15 @@ protected function applyFilter()
             }
         }
     }
+
+    /**
+     * Empty values are null, empty string and empty array.
+     *
+     * @param mixed $value
+     * @return bool
+     */
+    private function isEmptyValue($value)
+    {
+        return $value === null || $value === '' || (is_array($value) && empty($value));
+    }
 }
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
index 2164af26e5ac4..ea0f7e64a8448 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
@@ -12,6 +12,7 @@
         <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{col}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
+        <element name="rowCheckbox" type="checkbox" selector="table.data-grid tbody > tr:nth-of-type({{row}}) td.data-grid-checkbox-cell input" parameterized="true"/>
         <element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
         <element name="rows" type="text" selector="table.data-grid tbody > tr.data-row"/>
         <!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
index d814fdcd153da..be5a37a709a6e 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
@@ -177,6 +177,16 @@ public function getPrepareDataProvider()
                 ['test_date' => ''],
                 null,
             ],
+            [
+                'test_date',
+                ['test_date' => null],
+                null,
+            ],
+            [
+                'test_date',
+                ['test_date' => '0'],
+                ['like' => '%0%'],
+            ],
             [
                 'test_date',
                 ['test_date' => 'some_value'],
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
index b729dd3127d90..6d33386fa1f1c 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
@@ -22,7 +22,7 @@ define([
             opened: false,
             level: 0,
             visible: true,
-            initializeFieldsetDataByDefault: false,    /* Data in some fieldsets should be initialized before open */
+            initializeFieldsetDataByDefault: false, /* Data in some fieldsets should be initialized before open */
             disabled: false,
             listens: {
                 'opened': 'onVisibilityChange'
@@ -77,9 +77,9 @@ define([
             elem.initContainer(this);
 
             elem.on({
-                'update':   this.onChildrenUpdate,
-                'loading':  this.onContentLoading,
-                'error':  this.onChildrenError
+                'update': this.onChildrenUpdate,
+                'loading': this.onContentLoading,
+                'error': this.onChildrenError
             });
 
             if (this.disabled) {
@@ -155,11 +155,42 @@ define([
          * @param {String} message - error message.
          */
         onChildrenError: function (message) {
-            var hasErrors = this.elems.some('error');
+            var hasErrors = false;
+
+            if (!message) {
+                hasErrors = this._isChildrenHasErrors(hasErrors, this);
+            }
 
             this.error(hasErrors || message);
         },
 
+        /**
+         * Returns errors of children if exist
+         *
+         * @param {Boolean} hasErrors
+         * @param {*} container
+         * @return {Boolean}
+         * @private
+         */
+        _isChildrenHasErrors: function (hasErrors, container) {
+            var self = this;
+
+            if (hasErrors === false && container.hasOwnProperty('elems')) {
+                hasErrors = container.elems.some('error');
+
+                if (hasErrors === false && container.hasOwnProperty('_elems')) {
+                    container._elems.forEach(function (child) {
+
+                        if (hasErrors === false) {
+                            hasErrors = self._isChildrenHasErrors(hasErrors, child);
+                        }
+                    });
+                }
+            }
+
+            return hasErrors;
+        },
+
         /**
          * Callback that sets loading property to true.
          */
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
index b14b70e80525e..041b6eb3b48c1 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
@@ -72,13 +72,13 @@ define([
         ],
         'max-words': [
             function (value, params) {
-                return utils.stripHtml(value).match(/\b\w+\b/g).length < params;
+                return utils.isEmpty(value) || utils.stripHtml(value).match(/\b\w+\b/g).length < params;
             },
             $.mage.__('Please enter {0} words or less.')
         ],
         'min-words': [
             function (value, params) {
-                return utils.stripHtml(value).match(/\b\w+\b/g).length >= params;
+                return utils.isEmpty(value) || utils.stripHtml(value).match(/\b\w+\b/g).length >= params;
             },
             $.mage.__('Please enter at least {0} words.')
         ],
@@ -86,49 +86,53 @@ define([
             function (value, params) {
                 var match = utils.stripHtml(value).match(/\b\w+\b/g) || [];
 
-                return match.length >= params[0] &&
+                return utils.isEmpty(value) || match.length >= params[0] &&
                     match.length <= params[1];
             },
             $.mage.__('Please enter between {0} and {1} words.')
         ],
         'letters-with-basic-punc': [
             function (value) {
-                return /^[a-z\-.,()\u0027\u0022\s]+$/i.test(value);
+                return utils.isEmpty(value) || /^[a-z\-.,()\u0027\u0022\s]+$/i.test(value);
             },
             $.mage.__('Letters or punctuation only please')
         ],
         'alphanumeric': [
             function (value) {
-                return /^\w+$/i.test(value);
+                return utils.isEmpty(value) || /^\w+$/i.test(value);
             },
             $.mage.__('Letters, numbers, spaces or underscores only please')
         ],
         'letters-only': [
             function (value) {
-                return /^[a-z]+$/i.test(value);
+                return utils.isEmpty(value) || /^[a-z]+$/i.test(value);
             },
             $.mage.__('Letters only please')
         ],
         'no-whitespace': [
             function (value) {
-                return /^\S+$/i.test(value);
+                return utils.isEmpty(value) || /^\S+$/i.test(value);
             },
             $.mage.__('No white space please')
         ],
         'zip-range': [
             function (value) {
-                return /^90[2-5]-\d{2}-\d{4}$/.test(value);
+                return utils.isEmpty(value) || /^90[2-5]-\d{2}-\d{4}$/.test(value);
             },
             $.mage.__('Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx')
         ],
         'integer': [
             function (value) {
-                return /^-?\d+$/.test(value);
+                return utils.isEmpty(value) || /^-?\d+$/.test(value);
             },
             $.mage.__('A positive or negative non-decimal number please')
         ],
         'vinUS': [
             function (value) {
+                if (utils.isEmpty(value)) {
+                    return true;
+                }
+
                 if (value.length !== 17) {
                     return false;
                 }
@@ -214,13 +218,13 @@ define([
         ],
         'time': [
             function (value) {
-                return /^([01]\d|2[0-3])(:[0-5]\d){0,2}$/.test(value);
+                return utils.isEmpty(value) || /^([01]\d|2[0-3])(:[0-5]\d){0,2}$/.test(value);
             },
             $.mage.__('Please enter a valid time, between 00:00 and 23:59')
         ],
         'time12h': [
             function (value) {
-                return /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\ [AP]M))$/i.test(value);
+                return utils.isEmpty(value) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\ [AP]M))$/i.test(value);
             },
             $.mage.__('Please enter a valid time, between 00:00 am and 12:00 pm')
         ],
@@ -228,19 +232,21 @@ define([
             function (value) {
                 value = value.replace(/\s+/g, '');
 
-                return value.length > 9 && value.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
+                return utils.isEmpty(value) || value.length > 9 &&
+                    value.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
             },
             $.mage.__('Please specify a valid phone number')
         ],
         'phoneUK': [
             function (value) {
-                return value.length > 9 && value.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
+                return utils.isEmpty(value) || value.length > 9 &&
+                    value.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
             },
             $.mage.__('Please specify a valid phone number')
         ],
         'mobileUK': [
             function (value) {
-                return value.length > 9 && value.match(/^((0|\+44)7\d{3}\s?\d{6})$/);
+                return utils.isEmpty(value) || value.length > 9 && value.match(/^((0|\+44)7\d{3}\s?\d{6})$/);
             },
             $.mage.__('Please specify a valid mobile number')
         ],
@@ -252,13 +258,13 @@ define([
         ],
         'email2': [
             function (value) {
-                return /^((([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\u0022)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\u0022)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);//eslint-disable-line max-len
+                return utils.isEmpty(value) || /^((([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&\u0027\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\u0022)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\u0022)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);//eslint-disable-line max-len
             },
             $.validator.messages.email
         ],
         'url2': [
             function (value) {
-                return /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);//eslint-disable-line max-len
+                return utils.isEmpty(value) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\u0027\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);//eslint-disable-line max-len
             },
             $.validator.messages.url
         ],
@@ -266,6 +272,10 @@ define([
             function (value, param) {
                 var validTypes;
 
+                if (utils.isEmpty(value)) {
+                    return true;
+                }
+
                 if (/[^0-9-]+/.test(value)) {
                     return false;
                 }
@@ -350,19 +360,19 @@ define([
         ],
         'ipv4': [
             function (value) {
-                return /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(value);//eslint-disable-line max-len
+                return utils.isEmpty(value) || /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(value);//eslint-disable-line max-len
             },
             $.mage.__('Please enter a valid IP v4 address.')
         ],
         'ipv6': [
             function (value) {
-                return /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);//eslint-disable-line max-len
+                return utils.isEmpty(value) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);//eslint-disable-line max-len
             },
             $.mage.__('Please enter a valid IP v6 address.')
         ],
         'pattern': [
             function (value, param) {
-                return new RegExp(param).test(value);
+                return utils.isEmpty(value) || new RegExp(param).test(value);
             },
             $.mage.__('Invalid format.')
         ],
@@ -844,7 +854,7 @@ define([
                     return validateCreditCard(value);
                 }
 
-                return false;
+                return true;
             },
             $.mage.__('Please enter a valid credit card number.')
         ],
@@ -885,10 +895,14 @@ define([
         ],
         'validate-per-page-value-list': [
             function (value) {
-                var isValid = !utils.isEmpty(value),
+                var isValid = utils.isEmpty(value),
                     values = value.split(','),
                     i;
 
+                if (isValid) {
+                    return true;
+                }
+
                 for (i = 0; i < values.length; i++) {
                     if (!/^[0-9]+$/.test(values[i])) {
                         isValid = false;
diff --git a/app/code/Magento/Ui/view/base/web/js/modal/confirm.js b/app/code/Magento/Ui/view/base/web/js/modal/confirm.js
index 9cb14f7b2ef11..eceab940d1141 100644
--- a/app/code/Magento/Ui/view/base/web/js/modal/confirm.js
+++ b/app/code/Magento/Ui/view/base/web/js/modal/confirm.js
@@ -9,10 +9,10 @@
 define([
     'jquery',
     'underscore',
+    'mage/translate',
     'jquery/ui',
-    'Magento_Ui/js/modal/modal',
-    'mage/translate'
-], function ($, _) {
+    'Magento_Ui/js/modal/modal'
+], function ($, _, $t) {
     'use strict';
 
     $.widget('mage.confirm', $.mage.modal, {
@@ -38,7 +38,7 @@ define([
                 cancel: function () {}
             },
             buttons: [{
-                text: $.mage.__('Cancel'),
+                text: $t('Cancel'),
                 class: 'action-secondary action-dismiss',
 
                 /**
@@ -48,7 +48,7 @@ define([
                     this.closeModal(event);
                 }
             }, {
-                text: $.mage.__('OK'),
+                text: $t('OK'),
                 class: 'action-primary action-accept',
 
                 /**
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/field.html b/app/code/Magento/Ui/view/base/web/templates/form/field.html
index 888bc911d747f..144825967401e 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/field.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/field.html
@@ -8,9 +8,9 @@
      visible="visible"
      css="$data.additionalClasses"
      attr="'data-index': index">
-    <label class="admin__field-label" if="$data.label" visible="$data.labelVisible" attr="for: uid">
-        <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
-    </label>
+    <span class="admin__field-label" if="$data.label" visible="$data.labelVisible">
+        <label translate="label" attr="'data-config-scope': $data.scopeLabel, for: uid"/>
+    </span>
     <div class="admin__field-control"
          css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
         <render args="elementTmpl" ifnot="hasAddons()"/>
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 3fed1210e0c8e..018302bd51fc2 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -884,7 +884,7 @@ protected function _parseXmlResponse($xmlResponse)
 
                         if ($successConversion) {
                             $costArr[$code] = $cost;
-                            $priceArr[$code] = $this->getMethodPrice(floatval($cost), $code);
+                            $priceArr[$code] = $this->getMethodPrice((float)$cost, $code);
                         }
                     }
                 }
diff --git a/app/code/Magento/Weee/view/frontend/requirejs-config.js b/app/code/Magento/Weee/view/frontend/requirejs-config.js
index 49dfb6b9d469b..94c59da65216d 100644
--- a/app/code/Magento/Weee/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Weee/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            'taxToggle': 'Magento_Weee/tax-toggle'
+            'taxToggle': 'Magento_Weee/js/tax-toggle',
+            'Magento_Weee/tax-toggle': 'Magento_Weee/js/tax-toggle'
         }
     }
 };
diff --git a/app/code/Magento/Weee/view/frontend/web/tax-toggle.js b/app/code/Magento/Weee/view/frontend/web/js/tax-toggle.js
similarity index 100%
rename from app/code/Magento/Weee/view/frontend/web/tax-toggle.js
rename to app/code/Magento/Weee/view/frontend/web/js/tax-toggle.js
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
index 02a897d44b3c6..26fb8cd283ec1 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
@@ -3,18 +3,54 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * Wishlist block customer item cart column
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+
 /**
+ * Wishlist block customer item cart column
+ *
  * @api
  * @since 100.0.2
  */
 class Image extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
+    /**
+     * @var ItemResolverInterface
+     */
+    private $itemResolver;
+
+    /**
+     * @param \Magento\Catalog\Block\Product\Context $context
+     * @param \Magento\Framework\App\Http\Context $httpContext
+     * @param array|null $data
+     * @param ItemResolverInterface|null $itemResolver
+     */
+    public function __construct(
+        \Magento\Catalog\Block\Product\Context $context,
+        \Magento\Framework\App\Http\Context $httpContext,
+        array $data = [],
+        ItemResolverInterface $itemResolver = null
+    ) {
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
+        parent::__construct(
+            $context,
+            $httpContext,
+            $data
+        );
+    }
+
+    /**
+     * Identify the product from which thumbnail should be taken.
+     *
+     * @param \Magento\Wishlist\Model\Item $item
+     * @return \Magento\Catalog\Model\Product
+     */
+    public function getProductForThumbnail(\Magento\Wishlist\Model\Item $item): \Magento\Catalog\Model\Product
+    {
+        return $this->itemResolver->getFinalProduct($item);
+    }
 }
diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
index d7dd27874d365..84e4857ffeb29 100644
--- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php
+++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -5,8 +5,10 @@
  */
 namespace Magento\Wishlist\CustomerData;
 
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
 use Magento\Customer\CustomerData\SectionSourceInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Wishlist section
@@ -38,22 +40,30 @@ class Wishlist implements SectionSourceInterface
      */
     protected $block;
 
+    /**
+     * @var ItemResolverInterface
+     */
+    private $itemResolver;
+
     /**
      * @param \Magento\Wishlist\Helper\Data $wishlistHelper
      * @param \Magento\Wishlist\Block\Customer\Sidebar $block
      * @param \Magento\Catalog\Helper\ImageFactory $imageHelperFactory
      * @param \Magento\Framework\App\ViewInterface $view
+     * @param ItemResolverInterface|null $itemResolver
      */
     public function __construct(
         \Magento\Wishlist\Helper\Data $wishlistHelper,
         \Magento\Wishlist\Block\Customer\Sidebar $block,
         \Magento\Catalog\Helper\ImageFactory $imageHelperFactory,
-        \Magento\Framework\App\ViewInterface $view
+        \Magento\Framework\App\ViewInterface $view,
+        ItemResolverInterface $itemResolver = null
     ) {
         $this->wishlistHelper = $wishlistHelper;
         $this->imageHelperFactory = $imageHelperFactory;
         $this->block = $block;
         $this->view = $view;
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
     }
 
     /**
@@ -122,7 +132,7 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
     {
         $product = $wishlistItem->getProduct();
         return [
-            'image' => $this->getImageData($product),
+            'image' => $this->getImageData($this->itemResolver->getFinalProduct($wishlistItem)),
             'product_url' => $this->wishlistHelper->getProductUrl($wishlistItem),
             'product_name' => $product->getName(),
             'product_price' => $this->block->getProductPriceHtml(
@@ -147,14 +157,6 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
      */
     protected function getImageData($product)
     {
-        /*Set variant product if it is configurable product.
-        It will show variant product image in sidebar instead of configurable product image.*/
-        $simpleOption = $product->getCustomOption('simple_product');
-        if ($simpleOption !== null) {
-            $optionProduct = $simpleOption->getProduct();
-            $product = $optionProduct;
-        }
-
         /** @var \Magento\Catalog\Helper\Image $helper */
         $helper = $this->imageHelperFactory->create()
             ->init($product, 'wishlist_sidebar_block');
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index 968a7f1db8c39..7eef535382b7f 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -570,7 +570,7 @@ public function calculate()
             ) {
                 $count = $collection->getItemsQty();
             } else {
-                $count = $collection->getSize();
+                $count = $collection->count();
             }
             $this->_customerSession->setWishlistDisplayType(
                 $this->scopeConfig->getValue(
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
index 225026f31a994..d3b710f229527 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
@@ -307,6 +307,7 @@ protected function _assignProducts()
 
         $checkInStock = $this->_productInStock && !$this->stockConfiguration->isShowOutOfStock();
 
+        /** @var \Magento\Wishlist\Model\Item $item */
         foreach ($this as $item) {
             $product = $productCollection->getItemById($item->getProductId());
             if ($product) {
@@ -320,7 +321,7 @@ protected function _assignProducts()
                     $item->setPrice($product->getPrice());
                 }
             } else {
-                $item->isDeleted(true);
+                $this->removeItemByKey($item->getId());
             }
         }
 
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 12da947ee3e25..6a5a7c45383f5 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -582,7 +582,7 @@ public function setStore($store)
      */
     public function getItemsCount()
     {
-        return $this->getItemCollection()->getSize();
+        return $this->getItemCollection()->count();
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
index 3f4c8eb764c1d..b9ea513288c81 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
@@ -76,20 +76,17 @@
         <!-- Add product visible on default store to wishlist -->
         <amOnPage url="$$product.name$$.html" stepKey="navigateToProductPageOnDefaultStore"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$product.name$$" stepKey="assertFirstProductNameTitle"/>
-        <click stepKey="addFirstProductToWishlist" selector="{{StorefrontProductPageSection.AddToWishlist}}"/>
+        <click stepKey="addFirstProductToWishlist" selector="{{StorefrontProductPageSection.addToWishlist}}"/>
         <!-- Switch to second store and add second product (visible on second store) to wishlist -->
         <click stepKey="ClickSwitchStoreButtonOnDefaultStore" selector="{{StorefrontFooterSection.SwitchStoreButton}}"/>
         <click stepKey="SelectSecondStoreToSwitchOn" selector="{{StorefrontFooterSection.StoreLink($$storeGroup.group[name]$$)}}"/>
         <!-- Verify that both products are visible in wishlist on both stores -->
-        <see stepKey="seeProduct1InWishlist" userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
         <amOnPage url="$$secondProduct.name$$.html" stepKey="navigateToProductPageOnSecondStore"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$secondProduct.name$$" stepKey="assertSecondProductNameTitle"/>
-        <click stepKey="addSecondProductToWishlist" selector="{{StorefrontProductPageSection.AddToWishlist}}"/>
-        <see stepKey="seeProduct1InWishlistOnSecondStore" userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
+        <click stepKey="addSecondProductToWishlist" selector="{{StorefrontProductPageSection.addToWishlist}}"/>
         <see stepKey="seeProduct2InWishlistOnSecondStore" userInput="$$secondProduct.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
         <click stepKey="ClickSwitchStoreButtonOnSecondStore" selector="{{StorefrontFooterSection.SwitchStoreButton}}"/>
         <click stepKey="SelectDefaultStoreToSwitchOn" selector="{{StorefrontFooterSection.StoreLink('Main Website Store')}}"/>
         <see stepKey="seeProduct1InWishlistOnDefaultStore" userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
-        <see stepKey="seeProduct2InWishlistOnDefaultStore" userInput="$$secondProduct.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontConfigurableProductChildImageShouldBeShownOnWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontConfigurableProductChildImageShouldBeShownOnWishlistTest.xml
new file mode 100644
index 0000000000000..a9804e56a56d7
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontConfigurableProductChildImageShouldBeShownOnWishlistTest.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontConfigurableProductChildImageShouldBeShownOnWishlistTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <group value="wishlist"/>
+            <title value="When user add Configurable child product to WIshlist then child product image should be shown in Wishlist"/>
+            <description value="When user add Configurable child product to WIshlist then child product image should be shown in Wishlist"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93730"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set checkout/cart/configurable_product_image itself" stepKey="setProductImageSettingUnderCofigurationSalesCheckout"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteAllProductsOnProductsGridPageFilteredByName" stepKey="deleteAllCreatedProducts">
+                <argument name="product" value="_defaultProduct"/>
+            </actionGroup>
+            <actionGroup ref="DeleteProductAttribute" stepKey="deleteCreatedProductAttribute">
+                <argument name="productAttribute" value="colorProductAttribute"/>
+            </actionGroup>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(_defaultProduct.name)}}" stepKey="selectProductToAddImage"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
+        <actionGroup ref="addProductImage" stepKey="addImageForParentProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex1"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad1"/>
+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(colorProductAttribute1.name)}}" stepKey="selectProductToAddImage1"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad1"/>
+        <actionGroup ref="addProductImage" stepKey="addImageForChildProduct">
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+
+        <!--Sign in as customer -->
+        <actionGroup ref="CustomerLoginOnStorefront" stepKey="customerLogin">
+            <argument name="customer" value="$$customer$$" />
+        </actionGroup>
+        <see userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeFirstName"/>
+        <see userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeLastName"/>
+        <see userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeEmail"/>
+        <waitForPageLoad stepKey="waitForLogin"/>
+
+        <amOnPage url="{{StorefrontProductPage.url(_defaultProduct.urlKey)}}" stepKey="amOnConfigurableProductPage"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="seeProductName"/>
+        <selectOption userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="waitForAddToCartVisible"/>
+        <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addFirstProductToWishlist"/>
+        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addProductToWishlistWaitForSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.productImageByImageName(TestImageNew.filename)}}" stepKey="AssertWishlistProductImage" />
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.productImageByImageName(TestImageNew.filename)}}" stepKey="AssertWishlistSidebarProductImage" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
index 9ecd58b44f0e5..7a7c982ce0497 100644
--- a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
@@ -8,7 +8,7 @@
 use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Type\AbstractType;
-use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 use Magento\Framework\App\ViewInterface;
 use Magento\Framework\Pricing\Render;
 use Magento\Wishlist\Block\Customer\Sidebar;
@@ -23,21 +23,39 @@
  */
 class WishlistTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var Wishlist */
-    protected $model;
+    /**
+     * @var Wishlist
+     */
+    private $model;
+
+    /**
+     * @var Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $wishlistHelperMock;
 
-    /** @var Data|\PHPUnit_Framework_MockObject_MockObject */
-    protected $wishlistHelperMock;
+    /**
+     * @var Sidebar|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sidebarMock;
 
-    /** @var Sidebar|\PHPUnit_Framework_MockObject_MockObject */
-    protected $sidebarMock;
+    /**
+     * @var Image|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $catalogImageHelperMock;
 
-    /** @var Image|\PHPUnit_Framework_MockObject_MockObject */
-    protected $catalogImageHelperMock;
+    /**
+     * @var ViewInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $viewMock;
 
-    /** @var ViewInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $viewMock;
+    /**
+     * @var \Magento\Catalog\Block\Product\ImageBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $itemResolver;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->wishlistHelperMock = $this->getMockBuilder(\Magento\Wishlist\Helper\Data::class)
@@ -60,11 +78,14 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->catalogImageHelperMock);
 
+        $this->itemResolver = $this->createMock(ItemResolverInterface::class);
+
         $this->model = new Wishlist(
             $this->wishlistHelperMock,
             $this->sidebarMock,
             $imageHelperFactory,
-            $this->viewMock
+            $this->viewMock,
+            $this->itemResolver
         );
     }
 
@@ -158,6 +179,10 @@ public function testGetSectionData()
             ->method('getProduct')
             ->willReturn($productMock);
 
+        $this->itemResolver->expects($this->once())
+            ->method('getFinalProduct')
+            ->willReturn($productMock);
+
         $this->catalogImageHelperMock->expects($this->once())
             ->method('init')
             ->with($productMock, 'wishlist_sidebar_block', [])
@@ -343,6 +368,10 @@ public function testGetSectionDataWithTwoItems()
             ->method('getProduct')
             ->willReturn($productMock);
 
+        $this->itemResolver->expects($this->exactly(2))
+            ->method('getFinalProduct')
+            ->willReturn($productMock);
+
         $this->catalogImageHelperMock->expects($this->exactly(2))
             ->method('init')
             ->with($productMock, 'wishlist_sidebar_block', [])
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
index 1008f5f377df5..2eb4664991e99 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
@@ -13,5 +13,5 @@ $item = $block->getItem();
 $product = $item->getProduct();
 ?>
 <a class="product-item-photo" tabindex="-1" href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?= $block->escapeHtmlAttr($product->getName()) ?>">
-    <?= $block->getImage($product, 'wishlist_thumbnail')->toHtml() ?>
+    <?= $block->getImage($block->getProductForThumbnail($item), 'wishlist_thumbnail')->toHtml() ?>
 </a>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index 00fb87b411fe0..84b607adb6362 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -31,7 +31,7 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
                             <div class="product-item-details">
                                 <strong class="product-item-name">
                                     <a data-bind="attr: { href: product_url }" class="product-item-link">
-                                        <span data-bind="text: product_name"></span>
+                                        <span data-bind="html: product_name"></span>
                                     </a>
                                 </strong>
                                 <div data-bind="html: product_price"></div>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
index da16bde107673..337d63369b160 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
@@ -7,6 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
+        <meta name="robots" content="NOINDEX,NOFOLLOW"/>
         <css src="jquery/jstree/themes/default/style.css"/>
         <css src="css/styles-old.css"/>
         <css src="css/styles.css"/>
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
index 59675de698787..6dbef05ea2389 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -183,10 +183,13 @@
 
 .admin__field-label {
     color: @field-label__color;
-    cursor: pointer;
     margin: 0;
     text-align: right;
 
+    label {
+        cursor: pointer;
+    }
+
     + br {
         display: none;
     }
@@ -207,7 +210,7 @@
             overflow: hidden;
         }
 
-        span {
+        label {
             display: inline-block;
             line-height: @field-label__line-height;
             vertical-align: middle;
@@ -225,7 +228,7 @@
 
     .required > &, // ToDo UI: change classes 'required' to '_required'.
     ._required > & {
-        > span {
+        > label {
             &:after {
                 color: @validation__color;
                 content: '*';
@@ -512,7 +515,7 @@
                 position: absolute;
                 top: 0;
 
-                span {
+                label {
                     &:before {
                         display: block;
                     }
@@ -527,7 +530,7 @@
         }
 
         & > .admin__field-label {
-            span {
+            label {
                 &:before {
                     display: none;
                 }
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less
index bb14a3c2521b0..d3d15019f0e87 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less
@@ -305,7 +305,7 @@
                     white-space: nowrap;
                     width: 33%;
 
-                    &:before {
+                    &[data-th]:before {
                         content: attr(data-th) ':';
                         display: block;
                         font-weight: @font-weight__bold;
diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
index 84adec39c8892..215d7d8b322b4 100644
--- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
+++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_email.less
@@ -203,7 +203,8 @@
         text-align: center;
     }
 
-    .item-price {
+    .item-price,
+    .item-subtotal {
         text-align: right;
     }
 
diff --git a/app/design/frontend/Magento/blank/web/css/source/_email-base.less b/app/design/frontend/Magento/blank/web/css/source/_email-base.less
index 29f6fd0dcbcfc..f9b779d761576 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_email-base.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_email-base.less
@@ -160,8 +160,8 @@ body {
 
 .main {
     margin: 0 auto;
+    max-width: @email-body__width;
     text-align: left; // Necessary to prevent all text from centering in Outlook 2003
-    width: @email-body__width;
 }
 
 .header {
diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
index c177f91e9e7e8..6df78859a1a80 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less
@@ -846,7 +846,7 @@
                     white-space: nowrap;
                     width: 33%;
 
-                    &:before {
+                    &[data-th]:before {
                         content: attr(data-th) ':';
                         display: block;
                         font-weight: @font-weight__bold;
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 4b8db9202b195..10b917635bd40 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -464,7 +464,7 @@
                     white-space: nowrap;
                     width: 33%;
 
-                    &:before {
+                    &[data-th]:before {
                         content: attr(data-th);
                         display: block;
                         font-weight: @font-weight__semibold;
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
index 9a3f433618c36..3f19d1020bab9 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_email.less
@@ -207,7 +207,8 @@
         text-align: center;
     }
 
-    .item-price {
+    .item-price,
+    .item-subtotal {
         text-align: right;
     }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
index 692f91ef463b1..a0f734b05cbd1 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
@@ -482,7 +482,7 @@
 
         .options-label + .item-options-container,
         .item-options-container + .item-options-container {
-            &:before {
+            &[data-th]:before {
                 content: attr(data-th) ':';
                 display: block;
                 font-weight: @font-weight__bold;
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index edb096360b5e0..dee6f8e09fc76 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -435,6 +435,17 @@
     }
 }
 
+//
+//  Mobile
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .cms-page-view .page-main {
+        padding-top: 41px;
+        position: relative;
+    }
+}
+
 //
 //  Desktop
 //  _____________________________________________
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
index 760ec9ed861a9..8d1ce2b2f896e 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -3,6 +3,8 @@
 //  * See COPYING.txt for license details.
 //  */
 
+@_column-number: 1;
+
 //
 //  List default styles reset
 //  ---------------------------------------------
@@ -705,7 +707,7 @@
 //  ---------------------------------------------
 
 @abs-form-field-revert-column-1: {
-    .lib-form-field-column-number(@_column-number: 1);
+    .lib-form-field-column-number(@_column-number);
 };
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
@@ -760,7 +762,7 @@
                     white-space: nowrap;
                     width: 33%;
 
-                    &:before {
+                    &[data-th]:before {
                         content: attr(data-th) ':';
                         display: block;
                         font-weight: @font-weight__bold;
diff --git a/dev/tests/acceptance/tests/_data/lorem_ipsum.docx b/dev/tests/acceptance/tests/_data/lorem_ipsum.docx
new file mode 100644
index 0000000000000..488f64e86b6ff
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/lorem_ipsum.docx differ
diff --git a/dev/tests/acceptance/tests/_data/lorem_ipsum.txt b/dev/tests/acceptance/tests/_data/lorem_ipsum.txt
new file mode 100644
index 0000000000000..64cb8d023361a
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/lorem_ipsum.txt
@@ -0,0 +1,9 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc venenatis cursus eros, eu congue risus eleifend ut. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean aliquet mi diam, at consequat ex imperdiet eu. Nullam vulputate sollicitudin libero, tristique ullamcorper ante pretium eget. Nunc vehicula, risus ut hendrerit ornare, tortor est mattis urna, vitae egestas arcu tellus quis est. Sed mollis est sem. Aenean rhoncus ultricies sapien, id tempus elit lobortis ac. Pellentesque condimentum gravida purus a pretium. Nulla sed sapien mattis, auctor lacus quis, volutpat metus. Nunc mattis diam elit, viverra tincidunt nisl faucibus eu. Duis ac nisl tellus. Aenean eros lectus, malesuada in ex non, pharetra aliquam odio. Aenean ultricies pharetra mauris, ac rutrum quam posuere at. Phasellus et tempor turpis, ut sodales turpis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
+
+Sed fringilla orci at elit gravida, posuere varius elit eleifend. Nam libero dui, rutrum ac massa et, dictum egestas massa. Fusce rutrum, neque vitae vestibulum mattis, magna orci dictum turpis, ut laoreet eros urna lacinia ipsum. Donec eget ultrices eros. Duis sollicitudin ante est. Maecenas semper pellentesque scelerisque. Vestibulum eu venenatis tellus. Etiam nec massa sem. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam blandit molestie justo, non euismod dolor aliquet ac. Duis consectetur enim in arcu suscipit, in tempus nisi commodo.
+
+Donec sed venenatis nunc. Proin velit leo, porta eget erat elementum, dapibus posuere odio. Nam varius lectus eu cursus tristique. Ut tempus libero vehicula, iaculis augue sit amet, vestibulum justo. Vivamus porta diam vitae malesuada vestibulum. Donec mi dolor, semper at rutrum eget, vehicula non orci. Nunc dolor urna, laoreet et egestas vitae, sodales quis ipsum. Vivamus aliquet viverra enim cursus tincidunt. Pellentesque vel laoreet mi. Aenean ut rhoncus orci. Donec a purus venenatis, tempor dolor in, facilisis ex. Sed nec metus convallis, viverra nisl nec, luctus arcu. Integer blandit arcu a est posuere pharetra.
+
+Aliquam ultricies lectus ac mauris luctus, a viverra neque rhoncus. Vestibulum id velit eu nisl efficitur lobortis. Sed id metus at ipsum imperdiet porta. Quisque in quam in turpis fermentum condimentum. Phasellus sagittis risus eu tempus scelerisque. Vivamus dapibus sem odio, vitae fermentum sem viverra et. Quisque sit amet cursus neque, vel hendrerit risus. Integer ut diam porta, volutpat risus in, iaculis diam. Suspendisse vulputate non quam et finibus.
+
+Donec blandit, sem ut posuere dignissim, dolor lorem egestas magna, vel faucibus dui metus eget orci. Nullam ipsum lacus, imperdiet at nisl sed, condimentum dignissim lectus. Nunc orci libero, tincidunt a molestie vel, dapibus at mi. Quisque scelerisque sem quis massa suscipit, sit amet suscipit arcu volutpat. In tincidunt lacus in porttitor mattis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Morbi rutrum gravida orci quis porta.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/_data/magento-again.jpg b/dev/tests/acceptance/tests/_data/magento-again.jpg
new file mode 100644
index 0000000000000..c377daf8fb0b3
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magento-again.jpg differ
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertDeviceDataIsPresentInBraintreeRequest.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertDeviceDataIsPresentInBraintreeRequest.php
index 7eb53d728b079..40ae920a6bbde 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertDeviceDataIsPresentInBraintreeRequest.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/AssertDeviceDataIsPresentInBraintreeRequest.php
@@ -17,7 +17,7 @@ class AssertDeviceDataIsPresentInBraintreeRequest extends AbstractConstraint
     /**
      * Log file name.
      */
-    const FILE_NAME = 'debug.log';
+    const FILE_NAME = 'payment.log';
 
     /**
      * Device data pattern for regular expression.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
index 9331c2c987549..61142adc8f9b3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
@@ -28,7 +28,7 @@ class ProductForm extends FormSections
      *
      * @var string
      */
-    protected $attribute = './/*[contains(@class,"label")]/span[text()="%s"]';
+    protected $attribute = './/*[contains(@class,"label")]/label[text()="%s"]';
 
     /**
      * Product new from date field on the product form
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
index 72a3b2b5f68d1..610387d9a39eb 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
@@ -34,7 +34,7 @@ class AbandonedCartsReportEntityTest extends Injectable
 {
     /* tags */
     const MVP = 'no';
-    const STABLE = 'no';
+    const STABLE = 'yes';
     /* end tags */
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
index 02fcf3b19fbde..66ae1d8179af5 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Store\Test\TestCase\DeleteStoreGroupEntityTest" summary="Delete Store Group" ticketId="MAGETWO-27596">
         <variation name="DeleteStoreGroupEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S3, stable:no</data>
+            <data name="tag" xsi:type="string">severity:S3</data>
             <data name="storeGroup/dataset" xsi:type="string">custom</data>
             <data name="createBackup" xsi:type="string">Yes</data>
             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupSuccessDeleteAndBackupMessages" />
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AbstractAssertWishlistProductDetails.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AbstractAssertWishlistProductDetails.php
index ba9fe67b5eb4c..2df4cc3078370 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AbstractAssertWishlistProductDetails.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AbstractAssertWishlistProductDetails.php
@@ -16,6 +16,11 @@
  */
 abstract class AbstractAssertWishlistProductDetails extends AbstractAssertForm
 {
+    /**
+     * @inheritdoc
+     */
+    protected $skippedFields = ['sku'];
+
     /**
      * Assert product details.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
index fd80d385e4853..95e6a854ed266 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/MoveProductFromShoppingCartToWishlistTest.xml
@@ -37,7 +37,6 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="MoveProductFromShoppingCartToWishlistTestVariation5">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="product/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
@@ -45,7 +44,6 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="MoveProductFromShoppingCartToWishlistTestVariation6">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="product/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
index 0525c68b04d14..1b97fb2ad510c 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
@@ -72,7 +72,7 @@ public function testMassActionsInvalidTypes($action)
         $this->getRequest()->setParams(['types' => ['invalid_type_1', 'invalid_type_2', 'config']]);
         $this->dispatch('backend/admin/cache/' . $action);
         $this->assertSessionMessages(
-            $this->contains("Specified cache type(s) don't exist: invalid_type_1, invalid_type_2"),
+            $this->contains("Specified cache type(s) don&#039;t exist: invalid_type_1, invalid_type_2"),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Invoice/CreateTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Invoice/CreateTest.php
new file mode 100644
index 0000000000000..8476542c8f054
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Invoice/CreateTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Controller\Adminhtml\Invoice;
+
+use Braintree\Result\Successful;
+use Braintree\Transaction;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class CreateTest extends AbstractBackendController
+{
+    /**
+     * @var BraintreeAdapter|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactory->method('create')
+            ->willReturn($this->adapter);
+
+        $this->_objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->_objectManager->removeSharedInstance(BraintreeAdapterFactory::class);
+        parent::tearDown();
+    }
+
+    /**
+     * Checks a case when non default Merchant Account ID should be send to Braintree
+     * during creation second partial invoice.
+     *
+     * @magentoConfigFixture default_store payment/braintree/merchant_account_id Magneto
+     * @magentoConfigFixture current_store payment/braintree/merchant_account_id USA_Merchant
+     * @magentoDataFixture Magento/Braintree/Fixtures/partial_invoice.php
+     */
+    public function testCreatePartialInvoiceWithNonDefaultMerchantAccount()
+    {
+        $order = $this->getOrder('100000002');
+
+        $this->adapter->method('sale')
+            ->with(self::callback(function ($request) {
+                self::assertEquals('USA_Merchant', $request['merchantAccountId']);
+                return true;
+            }))
+            ->willReturn($this->getTransactionStub());
+
+        $uri = 'backend/sales/order_invoice/save/order_id/' . $order->getEntityId();
+        $this->prepareRequest($uri);
+        $this->dispatch($uri);
+
+        self::assertSessionMessages(
+            self::equalTo(['The invoice has been created.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * Creates stub for Braintree capture Transaction.
+     *
+     * @return Successful
+     */
+    private function getTransactionStub(): Successful
+    {
+        $transaction = $this->getMockBuilder(Transaction::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $transaction->status = 'submitted_for_settlement';
+        $response = new Successful();
+        $response->success = true;
+        $response->transaction = $transaction;
+
+        return $response;
+    }
+
+    /**
+     * Gets order by increment ID.
+     *
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    private function getOrder(string $incrementId): OrderInterface
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', $incrementId)
+            ->create();
+
+        /** @var OrderRepositoryInterface $repository */
+        $repository = $this->_objectManager->get(OrderRepositoryInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Prepares POST request for invoice creation.
+     *
+     * @param string $uri
+     */
+    private function prepareRequest(string $uri)
+    {
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $request = $this->getRequest();
+        $request->setMethod('POST');
+        $request->setParam('form_key', $formKey->getFormKey());
+        $request->setRequestUri($uri);
+        $request->setPostValue(
+            [
+                'invoice' => [
+                    'capture_case' => 'online'
+                ]
+            ]
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order.php
new file mode 100644
index 0000000000000..ceb90710ed5e7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+$addressData = include __DIR__ . '/../../Sales/_files/address_data.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+
+$billingAddress = $objectManager->create(Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)
+    ->setAddressType('shipping');
+
+/** @var OrderItem $orderItem */
+$orderItem = $objectManager->create(OrderItem::class);
+$orderItem->setProductId($product->getId())
+    ->setQtyOrdered(2)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType('simple');
+
+require __DIR__ . '/payment.php';
+
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000002')
+    ->setSubtotal($product->getPrice() * 2)
+    ->setBaseSubtotal($product->getPrice() * 2)
+    ->setCustomerEmail('admin@example.com')
+    ->setCustomerIsGuest(true)
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setStoreId(
+        $objectManager->get(StoreManagerInterface::class)->getStore()
+            ->getId()
+    )
+    ->addItem($orderItem)
+    ->setPayment($payment);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order_rollback.php
new file mode 100644
index 0000000000000..a2da0b639e98d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/order_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+
+$objectManager = ObjectManager::getInstance();
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', '100000002')
+    ->create();
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$items = $orderRepository->getList($searchCriteria)
+    ->getItems();
+
+foreach ($items as $item) {
+    $orderRepository->delete($item);
+}
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice.php
new file mode 100644
index 0000000000000..22b954515f3b5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Api\TransactionRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Service\InvoiceService;
+use Magento\TestFramework\ObjectManager;
+
+/** @var Order $order */
+
+require __DIR__ . '/order.php';
+
+$objectManager = ObjectManager::getInstance();
+
+/** @var InvoiceService $invoiceService */
+$invoiceService = $objectManager->get(InvoiceService::class);
+$invoice = $invoiceService->prepareInvoice($order);
+$invoice->setIncrementId('100000002');
+$invoice->register();
+
+$items = $invoice->getAllItems();
+$item = array_pop($items);
+$item->setQty(1);
+$invoice->setTotalQty(1);
+
+$items = $order->getAllItems();
+/** @var \Magento\Sales\Api\Data\OrderItemInterface $item */
+$item = array_pop($items);
+$item->setQtyInvoiced(1);
+$invoice->collectTotals();
+
+/** @var InvoiceRepositoryInterface $invoiceRepository */
+$invoiceRepository = $objectManager->get(InvoiceRepositoryInterface::class);
+$invoice = $invoiceRepository->save($invoice);
+
+/** @var TransactionRepositoryInterface $transactionRepository */
+$transactionRepository = $objectManager->get(TransactionRepositoryInterface::class);
+$transaction = $transactionRepository->create();
+$transaction->setTxnType('capture');
+$transaction->setPaymentId($order->getPayment()->getEntityId());
+$transaction->setOrderId($order->getEntityId());
+$transactionRepository->save($transaction);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice_rollback.php
new file mode 100644
index 0000000000000..1ed4438f87db2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/partial_invoice_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+
+$objectManager = ObjectManager::getInstance();
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('increment_id', '%10000000%', 'like')
+    ->create();
+
+/** @var InvoiceRepositoryInterface $invoiceRepository */
+$invoiceRepository = $objectManager->get(InvoiceRepositoryInterface::class);
+$items = $invoiceRepository->getList($searchCriteria)
+    ->getItems();
+
+foreach ($items as $item) {
+    $invoiceRepository->delete($item);
+}
+
+require __DIR__ . '/order_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment.php
new file mode 100644
index 0000000000000..a4285b963bffa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
+use Magento\Sales\Model\Order\Payment;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+require __DIR__ . '/../../Vault/_files/token.php';
+
+$token->setPaymentMethodCode(ConfigProvider::CODE);
+/** @var OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory */
+$paymentExtensionFactory = $objectManager->get(OrderPaymentExtensionInterfaceFactory::class);
+$extensionAttributes = $paymentExtensionFactory->create();
+$extensionAttributes->setVaultPaymentToken($token);
+
+/** @var Payment $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod(ConfigProvider::CODE);
+$payment->setExtensionAttributes($extensionAttributes);
+$payment->setAuthorizationTransaction(true);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/GalleryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/GalleryTest.php
new file mode 100644
index 0000000000000..c97dc821913f9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/GalleryTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Block\Product\View;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class GalleryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+    /**
+     * Tests rendered gallery block.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     * @magentoAppArea frontend
+     */
+    public function testHtml()
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        /** @var ProductInterface $product */
+        $product = $productRepository->get('simple');
+        /** @var LayoutInterface $layout */
+        $layout = $this->objectManager->get(LayoutInterface::class);
+        /** @var Gallery $block */
+        $block = $layout->createBlock(Gallery::class);
+        $block->setData('product', $product);
+        $block->setTemplate("Magento_Catalog::product/view/gallery.phtml");
+
+        $showCaption = $block->getVar('gallery/caption');
+
+        self::assertContains('"showCaption": ' . $showCaption, $block->toHtml());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
index 6ea7c19dce91e..1ed0057ca2486 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
@@ -217,7 +217,7 @@ public function testGetAttributeTextArray()
         $expected = [
             'Option 2',
             'Option 3',
-            'Option 4 &quot;!@#$%^&amp;*'
+            'Option 4 "!@#$%^&*'
         ];
         self::assertEquals(
             $expected,
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index 562dd35a2338a..62a918b7e3c5a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -550,6 +550,9 @@ public function testGetOptions()
             '4-2-radio' => 40000.00
         ];
         foreach ($options as $option) {
+            if (!$option->getValues()) {
+                continue;
+            }
             foreach ($option->getValues() as $value) {
                 $this->assertEquals($expectedValue[$value->getSku()], floatval($value->getPrice()));
             }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_apostrophe.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_apostrophe.php
index 4da1519c0366a..dda5c80137f61 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_apostrophe.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_apostrophe.php
@@ -8,8 +8,11 @@
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
 $categoryFirst = $objectManager->create(\Magento\Catalog\Model\Category::class);
-$categoryFirst->setName('Category 1')
-    ->setPath('1/2')
+$categoryFirst->isObjectNew(true);
+$categoryFirst->setId(523)
+    ->setName('Parent Apostrophe Category')
+    ->setParentId(2)
+    ->setPath('1/2/523')
     ->setLevel(2)
     ->setAvailableSortBy('name')
     ->setDefaultSortBy('name')
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php
index ccf91282ab1f6..8f4add8144859 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes.php
@@ -8,8 +8,11 @@
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
 $categoryFirst = $objectManager->create(\Magento\Catalog\Model\Category::class);
-$categoryFirst->setName('Category 1')
-    ->setPath('1/2')
+$categoryFirst->isObjectNew(true);
+$categoryFirst->setId(523)
+    ->setName('Parent Doublequotes Category')
+    ->setParentId(2)
+    ->setPath('1/2/523')
     ->setLevel(2)
     ->setAvailableSortBy('name')
     ->setDefaultSortBy('name')
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes_rollback.php
new file mode 100644
index 0000000000000..134f3d844e00b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_doublequotes_rollback.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$collection
+    ->addAttributeToFilter('level', 2)
+    ->load()
+    ->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php
index 059b784978a22..61b549f7729d1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php
@@ -86,7 +86,18 @@
                 'sku' => '4-2-radio',
             ],
         ]
-    ]
+    ],
+    [
+        'previous_group' => 'text',
+        'title'     => 'Test Field',
+        'type'      => 'field',
+        'is_require' => 1,
+        'sort_order' => 0,
+        'price'     => 1,
+        'price_type' => 'fixed',
+        'sku'       => '1-text',
+        'max_characters' => 100,
+    ],
 ];
 
 $options = [];
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key.php
new file mode 100644
index 0000000000000..cae23dcc9c674
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+require __DIR__ . '/../_files/product_with_category.php';
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product->setStoreId(1);
+$product->setUrlKey('store-1-key');
+$product = $productRepository->save($product);
+$linkManagement->assignProductToCategories($product->getSku(), [Category::TREE_ROOT_ID, $category->getEntityId()]);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key_rollback.php
new file mode 100644
index 0000000000000..517e9121a6d1e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+require __DIR__ . '/../_files/product_with_category_rollback.php';
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
new file mode 100644
index 0000000000000..402db06a0bbc9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Observer;
+
+use Magento\Catalog\Api\CategoryListInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class UrlRewriteHandlerTest extends TestCase
+{
+    /**
+     * @var UrlRewriteHandler
+     */
+    private $handler;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->handler = $this->objectManager->get(UrlRewriteHandler::class);
+    }
+
+    /**
+     * Checks category URLs rewrites generation with enabled `Use Categories Path for Product URLs` option and
+     * store's specific product URL key.
+     *
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key.php
+     * @magentoConfigFixture admin_store catalog/seo/product_use_categories 1
+     */
+    public function testGenerateProductUrlRewrites()
+    {
+        $product = $this->getProduct('p002');
+        $category = $this->getCategory('category 1');
+        // change the category scope to the global
+        $category->setStoreId(0)
+            ->setChangedProductIds([$product->getId()])
+            ->setAffectedProductIds([$product->getId()])
+            ->setAnchorsAbove(false);
+
+        $generatedUrls = $this->handler->generateProductUrlRewrites($category);
+        $actual = array_values(array_map(function (UrlRewrite $urlRewrite) {
+            return $urlRewrite->getRequestPath();
+        }, $generatedUrls));
+
+        $expected = [
+            'store-1-key.html', // the Default store
+            'cat-1/store-1-key.html', // the Default store with Category URL key
+            '/store-1-key.html', // an anchor URL the Default store
+            'p002.html', // the Secondary store
+            'cat-1-2/p002.html', // the Secondary store with Category URL key
+            '/p002.html', // an anchor URL the Secondary store
+        ];
+        self::assertEquals($expected, $actual, 'Generated URLs rewrites do not match.');
+    }
+
+    /**
+     * Gets category by name.
+     *
+     * @param string $name
+     * @return CategoryInterface
+     */
+    private function getCategory(string $name): CategoryInterface
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('name', $name)
+            ->create();
+        /** @var CategoryListInterface $repository */
+        $repository = $this->objectManager->get(CategoryListInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Gets product by SKU.
+     *
+     * @param string $sku
+     * @return ProductInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getProduct(string $sku): ProductInterface
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        return $productRepository->get($sku);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php
index 236a80a3e66f9..4c55bf47484b6 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category.php
@@ -65,7 +65,7 @@
 
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
-$productRepository->save($product);
+$product = $productRepository->save($product);
 
 /** @var CategoryLinkManagementInterface $linkManagement */
 $linkManagement = $objectManager->get(CategoryLinkManagementInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
index 67874d9f3974a..068a9c3529c15 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
@@ -11,8 +11,12 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Checkout\Model\Session;
+use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Customer\Model\ResourceModel\CustomerRepository;
 use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Request;
 use Magento\Customer\Model\Session as CustomerSession;
@@ -25,6 +29,28 @@
  */
 class CartTest extends \Magento\TestFramework\TestCase\AbstractController
 {
+    /** @var CheckoutSession */
+    private $checkoutSession;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->checkoutSession = $this->_objectManager->get(CheckoutSession::class);
+        $this->_objectManager->addSharedInstance($this->checkoutSession, CheckoutSession::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->_objectManager->removeSharedInstance(CheckoutSession::class);
+        parent::tearDown();
+    }
+
     /**
      * Test for \Magento\Checkout\Controller\Cart::configureAction() with simple product
      *
@@ -32,8 +58,8 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
      */
     public function testConfigureActionWithSimpleProduct()
     {
-        /** @var $session \Magento\Checkout\Model\Session  */
-        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        /** @var $session CheckoutSession */
+        $session = $this->_objectManager->create(CheckoutSession::class);
 
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
@@ -63,19 +89,20 @@ public function testConfigureActionWithSimpleProduct()
     /**
      * Test for \Magento\Checkout\Controller\Cart::configureAction() with simple product and custom option
      *
-     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_and_custom_option.php
+     * @magentoDataFixture Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php
      */
     public function testConfigureActionWithSimpleProductAndCustomOption()
     {
-        /** @var $session \Magento\Checkout\Model\Session  */
-        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        /** @var Quote $quote */
+        $quote = $this->getQuote('test_order_item_with_custom_options');
+        $this->checkoutSession->setQuoteId($quote->getId());
 
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
         /** @var $product \Magento\Catalog\Model\Product */
-        $product = $productRepository->get('simple');
+        $product = $productRepository->get('simple_with_custom_options');
 
-        $quoteItem = $this->_getQuoteItemIdByProductId($session->getQuote(), $product->getId());
+        $quoteItem = $this->_getQuoteItemIdByProductId($quote, $product->getId());
         $this->assertNotNull($quoteItem, 'Cannot get quote item for simple product with custom option');
 
         $this->dispatch(
@@ -112,8 +139,8 @@ public function testConfigureActionWithSimpleProductAndCustomOption()
      */
     public function testConfigureActionWithBundleProduct()
     {
-        /** @var $session \Magento\Checkout\Model\Session  */
-        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        /** @var $session CheckoutSession */
+        $session = $this->_objectManager->create(CheckoutSession::class);
 
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
@@ -147,8 +174,8 @@ public function testConfigureActionWithBundleProduct()
      */
     public function testConfigureActionWithDownloadableProduct()
     {
-        /** @var $session \Magento\Checkout\Model\Session  */
-        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        /** @var $session CheckoutSession */
+        $session = $this->_objectManager->create(CheckoutSession::class);
 
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
@@ -201,8 +228,8 @@ public function testUpdatePostAction()
         $productId = $product->getId();
         $originalQuantity = 1;
         $updatedQuantity = 2;
-        /** @var $checkoutSession \Magento\Checkout\Model\Session  */
-        $checkoutSession = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        /** @var $checkoutSession CheckoutSession */
+        $checkoutSession = $this->_objectManager->create(CheckoutSession::class);
         $quoteItem = $this->_getQuoteItemIdByProductId($checkoutSession->getQuote(), $productId);
 
         /** @var FormKey $formKey */
@@ -235,6 +262,26 @@ public function testUpdatePostAction()
         $this->assertEquals($updatedQuantity, $quoteItem->getQty(), "Invalid quote item quantity");
     }
 
+    /**
+     * Gets quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote($reservedOrderId)
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+
+        return array_pop($items);
+    }
+
     /**
      * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id
      *
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php
new file mode 100644
index 0000000000000..ad4234f266baa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/cart_with_simple_product_and_custom_options.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Option;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\DataObject;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_custom_options.php';
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->create(ProductRepositoryInterface::class);
+$product = $productRepository->get('simple_with_custom_options');
+
+$options = [];
+/** @var $option Option */
+foreach ($product->getOptions() as $option) {
+    switch ($option->getGroupByType()) {
+        case ProductCustomOptionInterface::OPTION_GROUP_SELECT:
+            $value = key($option->getValues());
+            break;
+        default:
+            $value = 'test';
+            break;
+    }
+    $options[$option->getId()] = $value;
+}
+
+$requestInfo = new DataObject(['qty' => 1, 'options' => $options]);
+
+/** @var $cart \Magento\Checkout\Model\Cart */
+$quote = Bootstrap::getObjectManager()->create(Quote::class);
+$quote->setReservedOrderId('test_order_item_with_custom_options');
+$quote->addProduct($product, $requestInfo);
+$quote->save();
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = Bootstrap::getObjectManager();
+$objectManager->removeSharedInstance(Session::class);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
index d8f905f7d4284..78fa4733a2562 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
@@ -157,6 +157,19 @@ public function testGetConfigurableAttributes()
         }
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable_custom.php
+     */
+    public function testGetConfigurableAttributesWithSourceModel()
+    {
+        $collection = $this->model->getConfigurableAttributes($this->product);
+        /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $configurableAttribute */
+        $configurableAttribute = $collection->getFirstItem();
+        $attribute = $this->_getAttributeByCode('test_configurable_with_sm');
+        $this->assertSameSize($attribute->getSource()->getAllOptions(), $configurableAttribute->getOptions());
+    }
+
     /**
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model.php
new file mode 100644
index 0000000000000..2c4713ac6b16e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$eavSetup = $objectManager->create(\Magento\Eav\Setup\EavSetup::class);
+$eavSetup->addAttribute(
+    \Magento\Catalog\Model\Product::ENTITY,
+    'test_configurable_with_sm',
+    [
+        'group' => 'General',
+        'type' => 'varchar',
+        'backend' => '',
+        'frontend' => '',
+        'label' => 'Test configurable with source model',
+        'input' => 'select',
+        'source' => \Magento\Catalog\Model\Category\Attribute\Source\Mode::class,
+        'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
+        'visible' => true,
+        'required' => false,
+        'user_defined' => true,
+        'default' => '',
+        'searchable' => false,
+        'filterable' => false,
+        'comparable' => false,
+        'visible_on_front' => false,
+        'used_in_product_listing' => true,
+        'unique' => false,
+        'apply_to' => ''
+    ]
+);
+
+$eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
+$eavConfig->clear();
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model_rollback.php
new file mode 100644
index 0000000000000..8930f4da7f686
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'test_configurable_with_sm');
+if ($attribute instanceof \Magento\Eav\Model\Entity\Attribute\AbstractAttribute && $attribute->getId()) {
+    $attribute->delete();
+}
+$eavConfig->clear();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom.php
new file mode 100644
index 0000000000000..56306c9f94c26
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/configurable_attribute_with_source_model.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$installer = $objectManager->create(\Magento\Catalog\Setup\CategorySetup::class);
+
+$eavConfig = $objectManager->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'test_configurable_with_sm');
+$options = $attribute->getOptions();
+
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$attributeValues = [];
+$associatedProductIds = [];
+$attributeSetId = $installer->getAttributeSetId(\Magento\Catalog\Model\Product::ENTITY, 'Default');
+
+foreach ($options as $key => $option) {
+    $productId = $key + 10;
+
+    $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+    $product->setTypeId(Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+        ->setId($productId)
+        ->setAttributeSetId($attributeSetId)
+        ->setWebsiteIds([1])
+        ->setName('Configurable Option ' . $option->getLabel())
+        ->setSku('simple_' . $productId)
+        ->setPrice($productId)
+        ->setTestConfigurableWithSm($option->getValue())
+        ->setVisibility(Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
+        ->setStatus(Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+        ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+    $product = $productRepository->save($product);
+
+    $stockItem = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Item::class);
+    $stockItem->load($productId, 'product_id');
+    if (!$stockItem->getProductId()) {
+        $stockItem->setProductId($productId);
+    }
+    $stockItem->setUseConfigManageStock(1);
+    $stockItem->setQty(1000);
+    $stockItem->setIsQtyDecimal(0);
+    $stockItem->setIsInStock(1);
+    $stockItem->save();
+
+    $attributeValues[] = [
+        'label' => 'test',
+        'attribute_id' => $attribute->getId(),
+        'value_index' => $option->getValue(),
+    ];
+    $associatedProductIds[] = $product->getId();
+}
+
+$optionsFactory = $objectManager->create(\Magento\ConfigurableProduct\Helper\Product\Options\Factory::class);
+$configurableAttributesData = [
+    [
+        'attribute_id' => $attribute->getId(),
+        'code' => $attribute->getAttributeCode(),
+        'label' => $attribute->getStoreLabel(),
+        'position' => '0',
+        'values' => $attributeValues,
+    ],
+];
+$configurableOptions = $optionsFactory->create($configurableAttributesData);
+
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+
+$product->setTypeId(\Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE)
+    ->setId(1)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([1])
+    ->setName('Configurable Product')
+    ->setSku('configurable')
+    ->setVisibility(Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+$productRepository->save($product);
+
+$categoryLinkManagement = $objectManager->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2]
+);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom_rollback.php
new file mode 100644
index 0000000000000..1b7c2b76d0479
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_custom_rollback.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+foreach (['simple_10', 'simple_11', 'simple_12', 'configurable'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, true);
+
+        $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
+        $stockStatus->load($product->getEntityId(), 'product_id');
+        $stockStatus->delete();
+
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/configurable_attribute_with_source_model_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php b/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php
index cdeb67afca471..99be1bcbae379 100644
--- a/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php
@@ -27,7 +27,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr 8 * * * *
+     * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr * * * * *
      */
     public function testDispatchScheduled()
     {
@@ -35,6 +35,7 @@ public function testDispatchScheduled()
             \Magento\Cron\Model\ResourceModel\Schedule\Collection::class
         );
         $collection->addFieldToFilter('status', \Magento\Cron\Model\Schedule::STATUS_PENDING);
+        $collection->addFieldToFilter('job_code', 'catalog_product_alert');
         $this->assertGreaterThan(0, $collection->count(), 'Cron has failed to schedule tasks for itself for future.');
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php
index 28f744aa4142f..e1a1df2b50a51 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php
@@ -42,85 +42,4 @@ public function testFetchRatesActionWithNonexistentService()
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
-
-    /**
-     * Test save action with nonexistent service
-     */
-    public function testFetchRatesActionWithServiceErrors()
-    {
-        $this->runActionWithMockedImportService(['We can\'t retrieve a rate from url']);
-
-        $this->assertSessionMessages(
-            $this->contains('Click "Save" to apply the rates we found.'),
-            \Magento\Framework\Message\MessageInterface::TYPE_WARNING
-        );
-    }
-
-    /**
-     * Test save action with nonexistent service
-     */
-    public function testFetchRatesActionWithoutServiceErrors()
-    {
-        $this->runActionWithMockedImportService();
-
-        $this->assertSessionMessages(
-            $this->contains('Click "Save" to apply the rates we found.'),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-        );
-    }
-
-    /**
-     * Run fetchRates with mocked external import service
-     *
-     * @param array $messages messages from external import service
-     */
-    protected function runActionWithMockedImportService(array $messages = [])
-    {
-        $importServiceMock = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Webservicex::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $importServiceMock->method('fetchRates')
-            ->willReturn(['USD' => ['USD' => 1]]);
-
-        $importServiceMock->method('getMessages')
-            ->willReturn($messages);
-
-        $backendSessionMock = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $importServiceFactoryMock = $this->getMockBuilder(\Magento\Directory\Model\Currency\Import\Factory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $importServiceFactoryMock->method('create')
-            ->willReturn($importServiceMock);
-
-        $objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $objectManagerMap = [
-            [\Magento\Directory\Model\Currency\Import\Factory::class, $importServiceFactoryMock],
-            [\Magento\Backend\Model\Session::class, $backendSessionMock]
-        ];
-
-        $objectManagerMock->method('get')
-            ->will($this->returnValueMap($objectManagerMap));
-
-        $context =  $this->_objectManager->create(
-            \Magento\Backend\App\Action\Context::class,
-            ["objectManager" => $objectManagerMock]
-        );
-        $registry =  $this->_objectManager->get(\Magento\Framework\Registry::class);
-
-        $this->getRequest()->setParam('rate_services', 'webservicex');
-
-        $action = new \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency\FetchRates(
-            $context,
-            $registry
-        );
-        $action->execute();
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
index 4f9fa437dcd52..5425af856bd9f 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -11,6 +11,9 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\TestFramework\Helper\CacheCleaner;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class CustomerMetadataTest extends \PHPUnit\Framework\TestCase
 {
     /** @var CustomerRepositoryInterface */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
index 3d469dc653128..167f654162ad8 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
@@ -13,6 +13,7 @@
 
 /**
  * Test for \Magento\Customer\Model\CustomerRegistry
+ * @magentoAppIsolation enabled
  */
 class CustomerRegistryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupRegistryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupRegistryTest.php
index cf5939d0a331d..a9842a2b7226a 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupRegistryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupRegistryTest.php
@@ -8,6 +8,7 @@
 
 /**
  * Test for \Magento\Customer\Model\GroupRegistry
+ * @magentoAppIsolation enabled
  */
 class GroupRegistryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
index 9b66d3e3f452b..2b74a58288600 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
@@ -20,6 +20,7 @@
  * @SuppressWarnings(PHPMD.TooManyMethods)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @magentoAppIsolation enabled
  */
 class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
index fe9037e4ffd2b..e777313f13fe8 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
@@ -15,6 +15,7 @@
  * Checks Customer insert, update, search with repository
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @magentoAppIsolation enabled
  */
 class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php
index 016efd60ce786..b1e394db11674 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php
@@ -12,6 +12,7 @@
 
 /**
  * Customer grid collection tests.
+ * @magentoAppIsolation enabled
  */
 class CollectionTest extends \Magento\TestFramework\Indexer\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/GroupRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/GroupRepositoryTest.php
index 9d86b72ec28be..ae2cc2c9d078c 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/GroupRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/GroupRepositoryTest.php
@@ -11,6 +11,7 @@
 
 /**
  * Integration test for \Magento\Customer\Model\ResourceModel\GroupRepository
+ * @magentoAppIsolation enabled
  */
 class GroupRepositoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/VisitorTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/VisitorTest.php
index 0d5a5f262d1a6..55ed0c6321b1b 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/VisitorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/VisitorTest.php
@@ -7,6 +7,9 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class VisitorTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
deleted file mode 100644
index ee323ace6d78e..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-namespace Magento\Directory\Model;
-
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\TestFramework\Helper\Bootstrap;
-
-/**
- * Integration test for \Magento\Directory\Model\Observer
- */
-class ObserverTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var  ObjectManagerInterface */
-    protected $objectManager;
-
-    /** @var Observer */
-    protected $observer;
-
-    /** @var \Magento\Framework\App\MutableScopeConfig */
-    protected $scopeConfig;
-
-    /** @var string */
-    protected $baseCurrency = 'USD';
-
-    /** @var string */
-    protected $baseCurrencyPath = 'currency/options/base';
-
-    /** @var string */
-    protected $allowedCurrenciesPath = 'currency/options/allow';
-
-    /** @var \Magento\Config\Model\ResourceModel\Config */
-    protected $configResource;
-
-    public function setUp()
-    {
-        $this->objectManager = Bootstrap::getObjectManager();
-
-        $this->scopeConfig = $this->objectManager->create(\Magento\Framework\App\MutableScopeConfig::class);
-        $this->scopeConfig->setValue(Observer::IMPORT_ENABLE, 1, ScopeInterface::SCOPE_STORE);
-        $this->scopeConfig->setValue(Observer::CRON_STRING_PATH, 'cron-string-path', ScopeInterface::SCOPE_STORE);
-        $this->scopeConfig->setValue(Observer::IMPORT_SERVICE, 'webservicex', ScopeInterface::SCOPE_STORE);
-
-        $this->configResource = $this->objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
-        $this->configResource->saveConfig(
-            $this->baseCurrencyPath,
-            $this->baseCurrency,
-            ScopeInterface::SCOPE_STORE,
-            0
-        );
-
-        $this->observer = $this->objectManager->create(\Magento\Directory\Model\Observer::class);
-    }
-
-    public function testScheduledUpdateCurrencyRates()
-    {
-        //skipping test if service is unavailable
-        $url = str_replace('{{CURRENCY_FROM}}', 'USD',
-            \Magento\Directory\Model\Currency\Import\Webservicex::CURRENCY_CONVERTER_URL
-        );
-        $url = str_replace('{{CURRENCY_TO}}', 'GBP', $url);
-        try {
-            file_get_contents($url);
-        } catch (\PHPUnit\Framework\Exception $e) {
-            $this->markTestSkipped('http://www.webservicex.net is unavailable ');
-        }
-
-        $allowedCurrencies = 'USD,GBP,EUR';
-        $this->configResource->saveConfig(
-            $this->allowedCurrenciesPath,
-            $allowedCurrencies,
-            ScopeInterface::SCOPE_STORE,
-            0
-        );
-        $this->observer->scheduledUpdateCurrencyRates(null);
-        /** @var Currency $currencyResource */
-        $currencyResource = $this->objectManager
-            ->create(\Magento\Directory\Model\CurrencyFactory::class)
-            ->create()
-            ->getResource();
-        $rates = $currencyResource->getCurrencyRates($this->baseCurrency, explode(',', $allowedCurrencies));
-        $this->assertNotEmpty($rates);
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/Validator/Attribute/BackendTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/Validator/Attribute/BackendTest.php
index b3c4323ed67dd..3784c8aae7e98 100644
--- a/dev/tests/integration/testsuite/Magento/Eav/Model/Validator/Attribute/BackendTest.php
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/Validator/Attribute/BackendTest.php
@@ -9,6 +9,9 @@
  */
 namespace Magento\Eav\Model\Validator\Attribute;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class BackendTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttribute/JoinProcessorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttribute/JoinProcessorTest.php
index 4b2c59b433afa..6806c2cfd060f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttribute/JoinProcessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttribute/JoinProcessorTest.php
@@ -17,6 +17,7 @@
  * Class to test the JoinProcessor functionality
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @magentoAppIsolation enabled
  */
 class JoinProcessorTest extends \PHPUnit\Framework\TestCase
 {
@@ -144,55 +145,55 @@ public function testProcess()
     private function getConfig()
     {
         return [\Magento\Catalog\Api\Data\ProductInterface::class => [
-                'review_id' => [
-                    Converter::DATA_TYPE => 'string',
-                    Converter::RESOURCE_PERMISSIONS => [],
-                    Converter::JOIN_DIRECTIVE => [
-                        Converter::JOIN_REFERENCE_TABLE => "reviews",
-                        Converter::JOIN_REFERENCE_FIELD => "product_id",
-                        Converter::JOIN_FIELDS => [
-                            [
-                                Converter::JOIN_FIELD => "review_id",
-                                Converter::JOIN_FIELD_COLUMN => "db_review_id",
-                            ],
+            'review_id' => [
+                Converter::DATA_TYPE => 'string',
+                Converter::RESOURCE_PERMISSIONS => [],
+                Converter::JOIN_DIRECTIVE => [
+                    Converter::JOIN_REFERENCE_TABLE => "reviews",
+                    Converter::JOIN_REFERENCE_FIELD => "product_id",
+                    Converter::JOIN_FIELDS => [
+                        [
+                            Converter::JOIN_FIELD => "review_id",
+                            Converter::JOIN_FIELD_COLUMN => "db_review_id",
                         ],
-                        Converter::JOIN_ON_FIELD => "id",
                     ],
+                    Converter::JOIN_ON_FIELD => "id",
                 ],
-            ], \Magento\Customer\Api\Data\CustomerInterface::class => [
-                'library_card_id' => [
-                    Converter::DATA_TYPE => 'string',
-                    Converter::RESOURCE_PERMISSIONS => [],
-                    Converter::JOIN_DIRECTIVE => [
-                        Converter::JOIN_REFERENCE_TABLE => "library_account",
-                        Converter::JOIN_FIELDS => [
-                            [
-                                Converter::JOIN_FIELD => "library_card_id",
-                                Converter::JOIN_FIELD_COLUMN => "",
-                            ],
+            ],
+        ], \Magento\Customer\Api\Data\CustomerInterface::class => [
+            'library_card_id' => [
+                Converter::DATA_TYPE => 'string',
+                Converter::RESOURCE_PERMISSIONS => [],
+                Converter::JOIN_DIRECTIVE => [
+                    Converter::JOIN_REFERENCE_TABLE => "library_account",
+                    Converter::JOIN_FIELDS => [
+                        [
+                            Converter::JOIN_FIELD => "library_card_id",
+                            Converter::JOIN_FIELD_COLUMN => "",
                         ],
-                        Converter::JOIN_ON_FIELD => "customer_id",
                     ],
+                    Converter::JOIN_ON_FIELD => "customer_id",
                 ],
-                'reviews' => [
-                    Converter::DATA_TYPE => 'Magento\Reviews\Api\Data\Reviews[]',
-                    Converter::RESOURCE_PERMISSIONS => [],
-                    Converter::JOIN_DIRECTIVE => [
-                        Converter::JOIN_REFERENCE_TABLE => "reviews",
-                        Converter::JOIN_FIELDS => [
-                            [
-                                Converter::JOIN_FIELD => "comment",
-                                Converter::JOIN_FIELD_COLUMN => "",
-                            ],
-                            [
-                                Converter::JOIN_FIELD => "rating",
-                                Converter::JOIN_FIELD_COLUMN => "",
-                            ],
+            ],
+            'reviews' => [
+                Converter::DATA_TYPE => 'Magento\Reviews\Api\Data\Reviews[]',
+                Converter::RESOURCE_PERMISSIONS => [],
+                Converter::JOIN_DIRECTIVE => [
+                    Converter::JOIN_REFERENCE_TABLE => "reviews",
+                    Converter::JOIN_FIELDS => [
+                        [
+                            Converter::JOIN_FIELD => "comment",
+                            Converter::JOIN_FIELD_COLUMN => "",
+                        ],
+                        [
+                            Converter::JOIN_FIELD => "rating",
+                            Converter::JOIN_FIELD_COLUMN => "",
                         ],
-                        Converter::JOIN_ON_FIELD => "customer_id",
                     ],
+                    Converter::JOIN_ON_FIELD => "customer_id",
                 ],
             ],
+        ],
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/CreatePdfFileTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/CreatePdfFileTest.php
new file mode 100644
index 0000000000000..d97a57589bc59
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/CreatePdfFileTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ *
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Filesystem;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\Filesystem;
+use Magento\TestFramework\Helper\Bootstrap;
+use Zend\Http\Header\ContentType;
+
+/**
+ * Class CreatePdfFileTest
+ *
+ * Integration test for testing a file creation from string
+ */
+class CreatePdfFileTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGenerateFileFromString()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var FileFactory $fileFactory */
+        $fileFactory =  $objectManager->get(FileFactory::class);
+        /** @var Filesystem $filesystem */
+        $filesystem = $objectManager->get(Filesystem::class);
+        $filename = 'test.pdf';
+        $contentType = 'application/pdf';
+        $fileContent = ['type' => 'string', 'value' => ''];
+        $response = $fileFactory->create($filename, $fileContent, DirectoryList::VAR_DIR, $contentType);
+        /** @var ContentType $contentTypeHeader */
+        $contentTypeHeader = $response->getHeader('Content-type');
+
+        /* Check the system returns the correct type */
+        self::assertEquals("Content-Type: $contentType", $contentTypeHeader->toString());
+
+        $varDirectory = $filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
+        $varDirectory->isFile($filename);
+
+        /* Check the file is generated */
+        self::assertTrue($varDirectory->isFile($filename));
+
+        /* Check the file is removed after generation if the corresponding option is set */
+        $fileContent = ['type' => 'string', 'value' => '', 'rm' => true];
+        $fileFactory->create($filename, $fileContent, DirectoryList::VAR_DIR, $contentType);
+
+        self::assertFalse($varDirectory->isFile($filename));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/TruncateFilterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/TruncateFilterTest.php
new file mode 100644
index 0000000000000..01fd999d4ab30
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/TruncateFilterTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter;
+
+class TruncateFilterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @dataProvider truncateDataProvider
+     * @param string $expectedValue
+     * @param string $expectedRemainder
+     * @param string $string
+     * @param int $length
+     * @param string $etc
+     * @param bool $breakWords
+     * @return void
+     */
+    public function testFilter(
+        string $expectedValue,
+        string $expectedRemainder,
+        string $string,
+        int $length = 5,
+        string $etc = '...',
+        bool $breakWords = true
+    ) {
+        /** @var TruncateFilter $truncateFilter */
+        $truncateFilter = \Magento\TestFramework\ObjectManager::getInstance()->create(
+            TruncateFilter::class,
+            [
+                'length' => $length,
+                'etc' => $etc,
+                'breakWords' => $breakWords,
+            ]
+        );
+        $result = $truncateFilter->filter($string);
+        $this->assertEquals($expectedValue, $result->getValue());
+        $this->assertEquals($expectedRemainder, $result->getRemainder());
+    }
+
+    /**
+     * @return array
+     */
+    public function truncateDataProvider() : array
+    {
+        return [
+            '1' => [
+                '12...',
+                '34567890',
+                '1234567890',
+            ],
+            '2' => [
+                '123..',
+                ' 456 789',
+                '123 456 789',
+                8,
+                '..',
+                false,
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
index 0b0071beb5133..356117f2b3dc8 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Model;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Type;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 
 /**
  * Class for testing QuoteManagement model
@@ -14,79 +22,120 @@
 class QuoteManagementTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * Create order with product that has child items
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var CartManagementInterface
+     */
+    private $cartManagement;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->cartManagement = $this->objectManager->create(CartManagementInterface::class);
+    }
+
+    /**
+     * Creates order with product that has child items.
      *
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
      */
     public function testSubmit()
     {
-        /**
-         * Preconditions:
-         * Load quote with Bundle product that has at least two child products
-         */
-        $objectManager = Bootstrap::getObjectManager();
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
-        $quote->load('test01', 'reserved_order_id');
-
-        /** Execute SUT */
-        /** @var \Magento\Quote\Api\CartManagementInterface $model */
-        $cartManagement = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
-        /** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
-        $orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
-        $orderId = $cartManagement->placeOrder($quote->getId());
+        $quote = $this->getQuote('test01');
+        $orderId = $this->cartManagement->placeOrder($quote->getId());
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->create(OrderRepositoryInterface::class);
         $order = $orderRepository->get($orderId);
 
-        /** Check if SUT caused expected effects */
         $orderItems = $order->getItems();
-        $this->assertCount(3, $orderItems);
+        self::assertCount(3, $orderItems);
         foreach ($orderItems as $orderItem) {
             if ($orderItem->getProductType() == Type::TYPE_SIMPLE) {
-                $this->assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
-                $this->assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
+                self::assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
+                self::assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
             }
         }
     }
 
     /**
-     * Create order with product that has child items and one of them was deleted
+     * Tries to create order with product that has child items and one of them was deleted.
      *
      * @magentoAppArea adminhtml
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Some of the products below do not have all the required options.
      */
     public function testSubmitWithDeletedItem()
     {
-        /**
-         * Preconditions:
-         * Load quote with Bundle product that have at least to child products
-         */
-        $objectManager = Bootstrap::getObjectManager();
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $product = $productRepository->get('simple-2');
         $productRepository->delete($product);
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
-        $quote->load('test01', 'reserved_order_id');
-
-        /** Execute SUT */
-        /** @var \Magento\Quote\Api\CartManagementInterface $model */
-        $cartManagement = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
-        /** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
-        $orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
-        $orderId = $cartManagement->placeOrder($quote->getId());
-        $order = $orderRepository->get($orderId);
+        $quote = $this->getQuote('test01');
 
-        /** Check if SUT caused expected effects */
-        $orderItems = $order->getItems();
-        $this->assertCount(2, $orderItems);
-        foreach ($orderItems as $orderItem) {
-            if ($orderItem->getProductType() == Type::TYPE_SIMPLE) {
-                $this->assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
-                $this->assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
-            }
-        }
+        $this->cartManagement->placeOrder($quote->getId());
+    }
+
+    /**
+     * Tries to create order with item of stock during checkout.
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Some of the products are out of stock.
+     * @magentoDbIsolation enabled
+     */
+    public function testSubmitWithItemOutOfStock()
+    {
+        $this->makeProductOutOfStock('simple');
+        $quote = $this->getQuote('test01');
+        $this->cartManagement->placeOrder($quote->getId());
+    }
+
+    /**
+     * Gets quote by reserved order ID.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Makes provided product as out of stock.
+     *
+     * @param string $sku
+     * @return void
+     */
+    private function makeProductOutOfStock(string $sku)
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku);
+        $extensionAttributes = $product->getExtensionAttributes();
+        $stockItem = $extensionAttributes->getStockItem();
+        $stockItem->setIsInStock(false);
+        $productRepository->save($product);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
index bcd7fef9c3c93..802358c2c83c7 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -3,12 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Model;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\ProductRepository;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Quote\Api\Data\CartInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -49,7 +51,7 @@ public function testCollectTotalsWithVirtual()
         $quote->load('test01', 'reserved_order_id');
 
         $productRepository = $this->objectManager->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
+            ProductRepositoryInterface::class
         );
         $product = $productRepository->get('virtual-product', false, null, true);
         $quote->addProduct($product);
@@ -318,7 +320,7 @@ public function testAddProductUpdateItem()
         $productStockQty = 100;
 
         $productRepository = $this->objectManager->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
+            ProductRepositoryInterface::class
         );
         $product = $productRepository->get('simple-1', false, null, true);
 
@@ -474,7 +476,7 @@ public function testGetItemById()
 
         $quoteItem = $this->objectManager->create(\Magento\Quote\Model\Quote\Item::class);
 
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $product = $productRepository->get('simple');
 
         $quoteItem->setProduct($product);
@@ -488,21 +490,77 @@ public function testGetItemById()
     /**
      * Tests of quotes merging.
      *
+     * @param int|null $guestItemGiftMessageId
+     * @param int|null $customerItemGiftMessageId
+     * @param int|null $guestOrderGiftMessageId
+     * @param int|null $customerOrderGiftMessageId
+     * @param int|null $expectedItemGiftMessageId
+     * @param int|null $expectedOrderGiftMessageId
+     *
      * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @dataProvider giftMessageDataProvider
+     * @throws LocalizedException
      */
-    public function testMerge()
-    {
-        $giftMessageId = 1;
+    public function testMerge(
+        $guestItemGiftMessageId,
+        $customerItemGiftMessageId,
+        $guestOrderGiftMessageId,
+        $customerOrderGiftMessageId,
+        $expectedItemGiftMessageId,
+        $expectedOrderGiftMessageId
+    ) {
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple', false, null, true);
 
         /** @var Quote  $quote */
         $guestQuote = $this->getQuote('test01');
-        $guestQuote->setGiftMessageId($giftMessageId);
+        $guestQuote->setGiftMessageId($guestOrderGiftMessageId);
 
         /** @var Quote  $customerQuote */
         $customerQuote = $this->objectManager->create(Quote::class);
+        $customerQuote->setReservedOrderId('test02')
+            ->setStoreId($guestQuote->getStoreId())
+            ->addProduct($product);
+        $customerQuote->setGiftMessageId($customerOrderGiftMessageId);
+
+        $guestItem = $guestQuote->getItemByProduct($product);
+        $guestItem->setGiftMessageId($guestItemGiftMessageId);
+
+        $customerItem = $customerQuote->getItemByProduct($product);
+        $customerItem->setGiftMessageId($customerItemGiftMessageId);
+
         $customerQuote->merge($guestQuote);
+        $mergedItemItem = $customerQuote->getItemByProduct($product);
+
+        self::assertEquals($expectedOrderGiftMessageId, $customerQuote->getGiftMessageId());
+        self::assertEquals($expectedItemGiftMessageId, $mergedItemItem->getGiftMessageId());
+    }
 
-        self::assertEquals($giftMessageId, $customerQuote->getGiftMessageId());
+    /**
+     * Provides order- and item-level gift message Id.
+     *
+     * @return array
+     */
+    public function giftMessageDataProvider(): array
+    {
+        return [
+            [
+                'guestItemId' => null,
+                'customerItemId' => 1,
+                'guestOrderId' => null,
+                'customerOrderId' => 11,
+                'expectedItemId' => 1,
+                'expectedOrderId' => 11
+            ],
+            [
+                'guestItemId' => 1,
+                'customerItemId' => 2,
+                'guestOrderId' => 11,
+                'customerOrderId' => 22,
+                'expectedItemId' => 1,
+                'expectedOrderId' => 11
+            ]
+        ];
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php
index b8446839c8c99..895f7b846f4d2 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Quote\Model\Quote;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\View\LayoutInterface;
 
 /**
  * Test class for \Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid
@@ -22,10 +23,10 @@ class GridTest extends \Magento\Reports\Block\Adminhtml\Shopcart\GridTestAbstrac
      */
     public function testGridContent()
     {
-        /** @var \Magento\Framework\View\LayoutInterface $layout */
-        $layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
+        /** @var LayoutInterface $layout */
+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
         /** @var Grid $grid */
-        $grid = $layout->createBlock(\Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid::class);
+        $grid = $layout->createBlock(Grid::class);
         $grid->getRequest()->setParams(['filter' => base64_encode(urlencode('email=customer@example.com'))]);
         $result = $grid->getPreparedCollection();
 
@@ -35,4 +36,17 @@ public function testGridContent()
         $this->assertEquals('customer@example.com', $quote->getCustomerEmail());
         $this->assertEquals(10.00, $quote->getSubtotal());
     }
+
+    /**
+     * @return void
+     */
+    public function testPageSizeIsSetToNullWhenExportCsvFile()
+    {
+        /** @var LayoutInterface $layout */
+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        /** @var Grid $grid */
+        $grid = $layout->createBlock(Grid::class);
+        $grid->getCsvFile();
+        $this->assertNull($grid->getCollection()->getPageSize());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Items/Column/NameTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Items/Column/NameTest.php
new file mode 100644
index 0000000000000..5be1e7bbce0d7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Items/Column/NameTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml\Items\Column;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class NameTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Name
+     */
+    private $block;
+
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var $layout \Magento\Framework\View\Layout */
+        $layout = $objectManager->create(\Magento\Framework\View\LayoutInterface::class);
+        /** @var $block \Magento\Sales\Block\Adminhtml\Items\AbstractItems */
+        $this->block = $layout->createBlock(Name::class, 'block');
+    }
+
+    /**
+     * @return void
+     */
+    public function testTruncateString()
+    {
+        $remainder = '';
+        $this->assertEquals(
+            '12345',
+            $this->block->truncateString('1234567890', 5, '', $remainder)
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetFormattedOption()
+    {
+        $this->assertEquals(
+            [
+                'value' => '1234567890123456789012345678901234567890123456789012345',
+                'remainder' => '67890',
+            ],
+            $this->block->getFormattedOption(
+                '123456789012345678901234567890123456789012345678901234567890'
+            )
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddCommentTest.php
deleted file mode 100644
index 020c9f51bb10f..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddCommentTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class AddCommentTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::comment';
-        $this->uri = 'backend/sales/order/addcomment';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php
deleted file mode 100644
index 9cdd84a5971f3..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class AddressSaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::actions_edit';
-        $this->uri = 'backend/sales/order/addresssave';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php
deleted file mode 100644
index 73e46b513287f..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class AddressTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::actions_edit';
-        $this->uri = 'backend/sales/order/address';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php
deleted file mode 100644
index c24191fe5e45e..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CancelTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class CancelTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::cancel';
-        $this->uri = 'backend/sales/order/cancel';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
deleted file mode 100644
index 70fbb2ee9a5bd..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class EmailTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::email';
-        $this->uri = 'backend/sales/order/email';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/HoldTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/HoldTest.php
deleted file mode 100644
index 4c90939d75b2d..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/HoldTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class HoldTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::hold';
-        $this->uri = 'backend/sales/order/hold';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ReviewPaymentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ReviewPaymentTest.php
deleted file mode 100644
index 96d197628584a..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ReviewPaymentTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class ReviewPaymentTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::review_payment';
-        $this->uri = 'backend/sales/order/reviewpayment';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/UnholdTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/UnholdTest.php
deleted file mode 100644
index 351801d8a0558..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/UnholdTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class UnholdTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::unhold';
-        $this->uri = 'backend/sales/order/unhold';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ViewTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ViewTest.php
deleted file mode 100644
index 0374edfaad9d9..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ViewTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Order;
-
-class ViewTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::actions_view';
-        $this->uri = 'backend/sales/order/view';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Transactions/FetchTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Transactions/FetchTest.php
deleted file mode 100644
index 7b9481db7997a..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Transactions/FetchTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sales\Controller\Adminhtml\Transactions;
-
-use Magento\TestFramework\TestCase\AbstractBackendController;
-
-class FetchTest extends \Magento\TestFramework\TestCase\AbstractBackendController
-{
-    public function setUp()
-    {
-        $this->resource = 'Magento_Sales::transactions_fetch';
-        $this->uri = 'backend/sales/transactions/fetch';
-        parent::setUp();
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php
index 872661a24b7c4..7a38c14685073 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php
@@ -49,8 +49,6 @@ protected function setUp()
      */
     public function testGetListWithMultipleFiltersAndSorting()
     {
-        $this->markTestSkipped('To be fixed in MAGETWO-91166');
-
         $filter1 = $this->filterBuilder
             ->setField('postcode')
             ->setConditionType('neq')
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php
index 6c27c334d6ef4..6d75cd8b07e06 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php
@@ -90,6 +90,36 @@ public function applyFixedDiscountDataProvider()
         ];
     }
 
+    /**
+     * Tests that coupon with wildcard symbols in code can be successfully applied.
+     *
+     * @magentoDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testCouponCodeWithWildcard()
+    {
+        $expectedDiscount = '-5.00';
+        $couponCode =  '2?ds5!2d';
+        $cartId = $this->cartManagement->createEmptyCart();
+        $productPrice = 10;
+
+        $product = $this->createProduct($productPrice);
+
+        /** @var CartItemInterface $quoteItem */
+        $quoteItem = Bootstrap::getObjectManager()->create(CartItemInterface::class);
+        $quoteItem->setQuoteId($cartId);
+        $quoteItem->setProduct($product);
+        $quoteItem->setQty(1);
+        $this->cartItemRepository->save($quoteItem);
+
+        $this->couponManagement->set($cartId, $couponCode);
+
+        /** @var GuestCartTotalRepositoryInterface $cartTotalRepository */
+        $cartTotalRepository = Bootstrap::getObjectManager()->get(GuestCartTotalRepositoryInterface::class);
+        $total = $cartTotalRepository->get($cartId);
+
+        $this->assertEquals($expectedDiscount, $total->getBaseDiscountAmount());
+    }
+
     /**
      * Returns simple product with given price.
      *
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard.php
new file mode 100644
index 0000000000000..9005284f984cf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\GroupManagement;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Rule $salesRule */
+$salesRule = $objectManager->create(Rule::class);
+$salesRule->setData(
+    [
+        'name' => '5$ fixed discount on whole cart',
+        'is_active' => 1,
+        'customer_group_ids' => [GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => Rule::COUPON_TYPE_SPECIFIC,
+        'conditions' => [],
+        'simple_action' => Rule::CART_FIXED_ACTION,
+        'discount_amount' => 5,
+        'discount_step' => 0,
+        'stop_rules_processing' => 1,
+        'website_ids' => [
+            $objectManager->get(StoreManagerInterface::class)->getWebsite()->getId(),
+        ],
+    ]
+);
+$objectManager->get(\Magento\SalesRule\Model\ResourceModel\Rule::class)->save($salesRule);
+
+// Create coupon and assign "15$ fixed discount" rule to this coupon.
+$coupon = $objectManager->create(Coupon::class);
+$coupon->setRuleId($salesRule->getId())
+    ->setCode('2?ds5!2d')
+    ->setType(0);
+
+/** @var CouponRepositoryInterface $couponRepository */
+$couponRepository = $objectManager->get(CouponRepositoryInterface::class);
+$couponRepository->save($coupon);
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php
new file mode 100644
index 0000000000000..776c302210351
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_code_with_wildcard_rollback.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Rule $salesRule */
+$salesRule = getSalesRule('5$ fixed discount on whole cart');
+if ($salesRule !== null) {
+    /** @var RuleRepositoryInterface $ruleRepository */
+    $ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
+    $ruleRepository->deleteById($salesRule->getRuleId());
+}
+
+$coupon = $objectManager->create(Coupon::class);
+$coupon->loadByCode('2?ds5!2d');
+if ($coupon->getCouponId()) {
+    /** @var CouponRepositoryInterface $couponRepository */
+    $couponRepository = $objectManager->get(CouponRepositoryInterface::class);
+    $couponRepository->deleteById($coupon->getCouponId());
+}
+
+function getSalesRule(string $name)
+{
+    /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+    $searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
+    $searchCriteria = $searchCriteriaBuilder->addFilter('name', $name)
+        ->create();
+
+    /** @var RuleRepositoryInterface $ruleRepository */
+    $ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
+    $items = $ruleRepository->getList($searchCriteria)
+        ->getItems();
+
+    return array_pop($items);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
index 54734e5a01c1b..bd6c900cf203c 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
@@ -143,6 +143,7 @@ class SetupUtil
         'discount_amount' => 40,
         'discount_step' => 0,
         'stop_rules_processing' => 1,
+        'apply_to_shipping' => 0,
         'website_ids' => [1],
     ];
 
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_apply_tax_after_discount.php b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_apply_tax_after_discount.php
new file mode 100644
index 0000000000000..a341344ddbb95
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_apply_tax_after_discount.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Tax\Model\Calculation;
+use Magento\Tax\Model\Config;
+use Magento\Tax\Model\Sales\Total\Quote\SetupUtil;
+
+$taxCalculationData['including_tax_apply_tax_after_discount'] = [
+    'config_data' => [
+        SetupUtil::CONFIG_OVERRIDES => [
+            Config::CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT => 1,
+            Config::CONFIG_XML_PATH_PRICE_INCLUDES_TAX => 1,
+            Config::CONFIG_XML_PATH_SHIPPING_INCLUDES_TAX => 1,
+            Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS => SetupUtil::SHIPPING_TAX_CLASS,
+            Config::XML_PATH_ALGORITHM => Calculation::CALC_ROW_BASE,
+        ],
+        SetupUtil::TAX_RATE_OVERRIDES => [
+            SetupUtil::TAX_RATE_TX => 10,
+            SetupUtil::TAX_STORE_RATE => 10,
+            SetupUtil::TAX_RATE_SHIPPING => 10
+        ],
+        SetupUtil::TAX_RULE_OVERRIDES => [
+            [
+                //tax rule for product
+                'code' => 'Product Tax Rule',
+                'product_tax_class_ids' => [SetupUtil::PRODUCT_TAX_CLASS_1],
+            ],
+            [
+                //tax rule for shipping
+                'code' => 'Shipping Tax Rule',
+                'product_tax_class_ids' => [SetupUtil::SHIPPING_TAX_CLASS],
+                'tax_rate_ids' => [SetupUtil::TAX_RATE_SHIPPING],
+            ],
+        ],
+    ],
+    'quote_data' => [
+        'billing_address' => [
+            'region_id' => SetupUtil::REGION_TX,
+        ],
+        'shipping_address' => [
+            'region_id' => SetupUtil::REGION_TX,
+        ],
+        'items' => [
+            [
+                'sku' => 'simple1',
+                'price' => 29,
+                'qty' => 1,
+            ],
+        ],
+        'shipping_method' => 'flatrate_flatrate',
+        'shopping_cart_rules' => [
+            [
+                'discount_amount' => 50,
+                'apply_to_shipping' => 1,
+            ],
+        ],
+    ],
+    'expected_results' => [
+        'address_data' => [
+            'subtotal' => 26.36,
+            'base_subtotal' => 26.36,
+            'subtotal_incl_tax' => 29,
+            'base_subtotal_incl_tax' => 29,
+            'tax_amount' => 1.69,
+            'base_tax_amount' => 1.69,
+            'shipping_amount' => 4.55,
+            'base_shipping_amount' => 4.55,
+            'shipping_incl_tax' => 5,
+            'base_shipping_incl_tax' => 5,
+            'shipping_tax_amount' => 0.25,
+            'base_shipping_tax_amount' => 0.25,
+            'discount_amount' => -15.455,
+            'base_discount_amount' => -15.455,
+            'discount_tax_compensation_amount' => 1.2,
+            'base_discount_tax_compensation_amount' => 1.2,
+            'shipping_discount_tax_compensation_amount' => 0.2,
+            'base_shipping_discount_tax_compensation_amount' => 0.2,
+            'grand_total' => 18.545,
+            'base_grand_total' => 18.545,
+            'applied_taxes' => [
+                SetupUtil::TAX_RATE_TX => [
+                    'percent' => 10,
+                    'amount' => 1.44,
+                    'base_amount' => 1.44,
+                    'rates' => [
+                        [
+                            'code' => SetupUtil::TAX_RATE_TX,
+                            'title' => SetupUtil::TAX_RATE_TX,
+                            'percent' => 10,
+                        ],
+                    ],
+                ],
+                SetupUtil::TAX_RATE_SHIPPING => [
+                    'percent' => 10,
+                    'amount' => 0.25,
+                    'base_amount' => 0.25,
+                    'rates' => [
+                        [
+                            'code' => SetupUtil::TAX_RATE_SHIPPING,
+                            'title' => SetupUtil::TAX_RATE_SHIPPING,
+                            'percent' => 10,
+                        ],
+                    ],
+                ],
+            ],
+        ],
+        'items_data' => [
+            'simple1' => [
+                'row_total' => 26.36,
+                'base_row_total' => 26.36,
+                'tax_percent' => 10,
+                'price' => 26.36,
+                'base_price' => 26.36,
+                'price_incl_tax' => 29,
+                'base_price_incl_tax' => 29,
+                'row_total_incl_tax' => 29,
+                'base_row_total_incl_tax' => 29,
+                'tax_amount' => 1.44,
+                'base_tax_amount' => 1.44,
+                'discount_amount' => 13.18,
+                'base_discount_amount' => 13.18,
+                'discount_percent' => 50,
+                'discount_tax_compensation_amount' => 1.2,
+                'base_discount_tax_compensation_amount' => 1.2,
+            ],
+        ],
+    ],
+];
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
index c47d348cedda5..f22b48a259685 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
@@ -30,3 +30,4 @@
 require_once __DIR__ . '/scenarios/multi_tax_rule_total_calculate_subtotal_yes.php';
 require_once __DIR__ . '/scenarios/multi_tax_rule_two_row_calculate_subtotal_yes_row.php';
 require_once __DIR__ . '/scenarios/multi_tax_rule_two_row_calculate_subtotal_yes_total.php';
+require_once __DIR__ . '/scenarios/including_tax_apply_tax_after_discount.php';
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php
index ba7ed7b8c1c14..a9631272cdf39 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php
@@ -16,7 +16,7 @@ class TreeTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\UrlRewrite\Block\Catalog\Category\Tree
      */
-    private $_treeBlock;
+    private $treeBlock;
 
     /**
      * Set up
@@ -24,7 +24,7 @@ class TreeTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->_treeBlock = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $this->treeBlock = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Framework\View\LayoutInterface::class
         )->createBlock(
             \Magento\UrlRewrite\Block\Catalog\Category\Tree::class
@@ -39,7 +39,7 @@ protected function setUp()
      */
     public function testGetTreeArray()
     {
-        $tree = $this->_treeBlock->getTreeArray();
+        $tree = $this->treeBlock->getTreeArray();
         $this->assertEquals(false, $tree['is_active']);
         $this->assertEquals('Root', (string)$tree['name']);
         $this->assertEquals(true, $tree['expanded']);
@@ -54,13 +54,12 @@ public function testGetTreeArray()
      */
     public function testGetTreeArrayApostropheReplaced()
     {
-        $this->markTestSkipped('To be fixed in MAGETWO-91166');
-        $tree = $this->_treeBlock->getTreeArray();
+        $tree = $this->treeBlock->getTreeArray(523);
 
-        $this->assertNotContains('\'', $tree['children'][0]['children'][0]['children'][0]['name']);
+        $this->assertNotContains('\'', $tree[0]['name']);
         $this->assertEquals(
             '&#039;Category 6&#039;',
-            $tree['children'][0]['children'][0]['children'][0]['name']
+            $tree[0]['name']
         );
     }
 
@@ -72,13 +71,12 @@ public function testGetTreeArrayApostropheReplaced()
      */
     public function testGetTreeArrayDoubleQuotesReplaced()
     {
-        $this->markTestSkipped('To be fixed in MAGETWO-91166');
-        $tree = $this->_treeBlock->getTreeArray();
+        $tree = $this->treeBlock->getTreeArray(523);
 
-        $this->assertNotContains('\"', $tree['children'][0]['children'][0]['children'][0]['name']);
+        $this->assertNotContains('\"', $tree[0]['name']);
         $this->assertEquals(
             '&quot;Category 6&quot;',
-            $tree['children'][0]['children'][0]['children'][0]['name']
+            $tree[0]['name']
         );
     }
 
@@ -90,7 +88,7 @@ public function testGetLoadTreeUrl()
         $row = new \Magento\Framework\DataObject(['id' => 1]);
         $this->assertStringStartsWith(
             'http://localhost/index.php',
-            $this->_treeBlock->getLoadTreeUrl($row),
+            $this->treeBlock->getLoadTreeUrl($row),
             'Tree load URL is invalid'
         );
     }
@@ -100,7 +98,7 @@ public function testGetLoadTreeUrl()
      */
     public function testGetCategoryCollection()
     {
-        $collection = $this->_treeBlock->getCategoryCollection();
+        $collection = $this->treeBlock->getCategoryCollection();
         $this->assertInstanceOf(\Magento\Catalog\Model\ResourceModel\Category\Collection::class, $collection);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Vault/_files/token.php b/dev/tests/integration/testsuite/Magento/Vault/_files/token.php
index 396b2a5c20536..e1e0a31da4f5f 100644
--- a/dev/tests/integration/testsuite/Magento/Vault/_files/token.php
+++ b/dev/tests/integration/testsuite/Magento/Vault/_files/token.php
@@ -23,4 +23,4 @@
 
 /** @var PaymentTokenRepository $tokenRepository */
 $tokenRepository = $objectManager->create(PaymentTokenRepository::class);
-$tokenRepository->save($token);
+$token = $tokenRepository->save($token);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
index 48cc6cea49156..4999e379e1d0a 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
@@ -122,6 +122,7 @@ public function testAddActionProductNameXss()
     }
 
     /**
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Wishlist/_files/wishlist_with_product_qty_increments.php
      */
     public function testAllcartAction()
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
index 99f9aa4991b5e..b684da05dd254 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Wishlist\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 
@@ -85,4 +86,39 @@ public function testAddNewItemInvalidWishlistItemConfiguration()
         );
         $this->wishlist->addNewItem($product);
     }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testGetItemCollection()
+    {
+        $productSku = 'simple';
+        $customerId = 1;
+
+        $this->wishlist->loadByCustomerId($customerId, true);
+        $itemCollection = $this->wishlist->getItemCollection();
+        /** @var \Magento\Wishlist\Model\Item $item */
+        $item = $itemCollection->getFirstItem();
+        $this->assertEquals($productSku, $item->getProduct()->getSku());
+    }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testGetItemCollectionWithDisabledProduct()
+    {
+        $productSku = 'simple';
+        $customerId = 1;
+
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku);
+        $product->setStatus(ProductStatus::STATUS_DISABLED);
+        $productRepository->save($product);
+
+        $this->wishlist->loadByCustomerId($customerId, true);
+        $itemCollection = $this->wishlist->getItemCollection();
+        $this->assertEmpty($itemCollection->getItems());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php
new file mode 100644
index 0000000000000..6b1afb6ffa509
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Wishlist\Model\Wishlist $wishlist */
+$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
+$wishlist->loadByCustomerId(1);
+$wishlist->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
+require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php
new file mode 100644
index 0000000000000..15e23f0e31b56
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_product_qty_increments_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Wishlist\Model\Wishlist $wishlist */
+$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
+$wishlist->loadByCustomerId(1);
+$wishlist->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_special_price_rollback.php';
+require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js
index 44f06279dcbef..91cb4480039d1 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js
@@ -106,6 +106,8 @@ define([
         });
 
         it('estimateTotals if data wasn\'t cached and request was successfully sent', function () {
+            var deferral = new $.Deferred();
+
             spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'isChanged').and.returnValue(true);
             spyOn(mocks['Magento_Customer/js/customer-data'], 'get').and.returnValue(
                 ko.observable({
@@ -117,9 +119,9 @@ define([
                 data.shippingMethodCode = mocks['Magento_Checkout/js/model/quote'].shippingMethod()['method_code'];
                 data.shippingCarrierCode = mocks['Magento_Checkout/js/model/quote'].shippingMethod()['carrier_code'];
 
-                return new $.Deferred().resolve(result);
+                return deferral.resolve(result);
             });
-            expect(defaultProcessor.estimateTotals(address)).toBeUndefined();
+            expect(defaultProcessor.estimateTotals(address)).toBe(deferral);
             expect(mocks['Magento_Checkout/js/model/quote'].setTotals).toHaveBeenCalledWith(totals);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(0)[0]).toBe(true);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(1)[0]).toBe(false);
@@ -129,6 +131,8 @@ define([
         });
 
         it('estimateTotals if data wasn\'t cached and request returns error', function () {
+            var deferral = new $.Deferred();
+
             spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'isChanged').and.returnValue(true);
             spyOn(mocks['Magento_Customer/js/customer-data'], 'get').and.returnValue(
                 ko.observable({
@@ -137,9 +141,9 @@ define([
             );
             spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'get');
             spyOn(mocks['mage/storage'], 'post').and.callFake(function () {
-                return new $.Deferred().reject('Error Message');
+                return deferral.reject('Error Message');
             });
-            expect(defaultProcessor.estimateTotals(address)).toBeUndefined();
+            expect(defaultProcessor.estimateTotals(address)).toBe(deferral);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(0)[0]).toBe(true);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(1)[0]).toBe(false);
             expect(mocks['mage/storage'].post).toHaveBeenCalled();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js
index 5d90d6088ba90..19b4baaff05ae 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js
@@ -15,7 +15,7 @@ define([
                 var value = '',
                     params = [1,3];
 
-                expect(rules['range-words'].handler(value, params)).toBe(false);
+                expect(rules['range-words'].handler(value, params)).toBe(true);
             });
 
             it('Check on redundant words', function () {
diff --git a/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt b/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
index db5c1cab06655..70764344de69b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
@@ -23,3 +23,4 @@ app/design/adminhtml/Magento/backend/web/mui/clearless/_sprites.less
 app/design/adminhtml/Magento/backend/web/mui/styles/_abstract.less
 app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
 app/design/adminhtml/Magento/backend/web/mui/styles/_vars.less
+app/design/frontend/Magento/blank/web/css/source/_email-base.less
diff --git a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
index 3ea43cbccd24f..99dd972dc26ea 100644
--- a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
+++ b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
@@ -74,7 +74,7 @@ public function getCustomAttribute($attributeCode)
      */
     public function getCustomAttributes()
     {
-        return isset($this->_data[self::CUSTOM_ATTRIBUTES]) ? $this->_data[self::CUSTOM_ATTRIBUTES] : [];
+        return $this->_data[self::CUSTOM_ATTRIBUTES] ?? [];
     }
 
     /**
@@ -129,7 +129,7 @@ public function setCustomAttribute($attributeCode, $attributeValue)
      */
     protected function getCustomAttributesCodes()
     {
-        return isset($this->customAttributesCodes) ? $this->customAttributesCodes : [];
+        return $this->customAttributesCodes ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php b/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php
index b907246139d42..9cc0ddab3bfcb 100644
--- a/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php
+++ b/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php
@@ -34,7 +34,7 @@ public function __construct(array $data = [])
      */
     protected function _get($key)
     {
-        return isset($this->_data[$key]) ? $this->_data[$key] : null;
+        return $this->_data[$key] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/ImageProcessor.php b/lib/internal/Magento/Framework/Api/ImageProcessor.php
index e2c5f8c4083b9..4642a742576df 100644
--- a/lib/internal/Magento/Framework/Api/ImageProcessor.php
+++ b/lib/internal/Magento/Framework/Api/ImageProcessor.php
@@ -172,7 +172,7 @@ public function processImageContent($entityType, $imageContent)
      */
     protected function getMimeTypeExtension($mimeType)
     {
-        return isset($this->mimeTypeExtensionMap[$mimeType]) ? $this->mimeTypeExtensionMap[$mimeType] : '';
+        return $this->mimeTypeExtensionMap[$mimeType] ?? '';
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/Search/Document.php b/lib/internal/Magento/Framework/Api/Search/Document.php
index d60458a6e5585..7454fa7974ece 100644
--- a/lib/internal/Magento/Framework/Api/Search/Document.php
+++ b/lib/internal/Magento/Framework/Api/Search/Document.php
@@ -33,9 +33,7 @@ public function setId($id)
      */
     public function getCustomAttribute($attributeCode)
     {
-        return isset($this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode])
-            ? $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]
-            : null;
+        return $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php
index b663a3a2f733c..e127dfd4b1624 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php
@@ -114,6 +114,6 @@ private function getCustomFilterForField($field)
      */
     private function getFieldMapping($field)
     {
-        return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;
+        return $this->fieldMapping[$field] ?? $field;
     }
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
index b8e52334bee1f..207325042c737 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
@@ -121,6 +121,6 @@ private function getCustomJoin($field)
      */
     private function getFieldMapping($field)
     {
-        return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;
+        return $this->fieldMapping[$field] ?? $field;
     }
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/SortingProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/SortingProcessor.php
index 7598c4eb4abdc..9c18b8c1a9ae5 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/SortingProcessor.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/SortingProcessor.php
@@ -59,7 +59,7 @@ public function process(SearchCriteriaInterface $searchCriteria, AbstractDb $col
      */
     private function getFieldMapping($field)
     {
-        return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;
+        return $this->fieldMapping[$field] ?? $field;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/ActionFlag.php b/lib/internal/Magento/Framework/App/ActionFlag.php
index 657c2ede9262d..55201504c968f 100644
--- a/lib/internal/Magento/Framework/App/ActionFlag.php
+++ b/lib/internal/Magento/Framework/App/ActionFlag.php
@@ -65,9 +65,7 @@ public function get($action, $flag = '')
             $action = $this->_request->getActionName();
         }
         if ('' === $flag) {
-            return isset(
-                $this->_flags[$this->_getControllerKey()]
-            ) ? $this->_flags[$this->_getControllerKey()] : [];
+            return $this->_flags[$this->_getControllerKey()] ?? [];
         } elseif (isset($this->_flags[$this->_getControllerKey()][$action][$flag])) {
             return $this->_flags[$this->_getControllerKey()][$action][$flag];
         } else {
diff --git a/lib/internal/Magento/Framework/App/AreaList.php b/lib/internal/Magento/Framework/App/AreaList.php
index 7c123f7ff9d60..fb28d09d5fe09 100644
--- a/lib/internal/Magento/Framework/App/AreaList.php
+++ b/lib/internal/Magento/Framework/App/AreaList.php
@@ -88,7 +88,7 @@ public function getCodeByFrontName($frontName)
      */
     public function getFrontName($areaCode)
     {
-        return isset($this->_areas[$areaCode]['frontName']) ? $this->_areas[$areaCode]['frontName'] : null;
+        return $this->_areas[$areaCode]['frontName'] ?? null;
     }
 
     /**
@@ -111,7 +111,7 @@ public function getCodes()
      */
     public function getDefaultRouter($areaCode)
     {
-        return isset($this->_areas[$areaCode]['router']) ? $this->_areas[$areaCode]['router'] : null;
+        return $this->_areas[$areaCode]['router'] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Config/Initial.php b/lib/internal/Magento/Framework/App/Config/Initial.php
index 1933682346ad3..b65c9a2f53489 100644
--- a/lib/internal/Magento/Framework/App/Config/Initial.php
+++ b/lib/internal/Magento/Framework/App/Config/Initial.php
@@ -72,9 +72,9 @@ public function getData($scope)
         list($scopeType, $scopeCode) = array_pad(explode('|', $scope), 2, null);
 
         if (ScopeConfigInterface::SCOPE_TYPE_DEFAULT == $scopeType) {
-            return isset($this->_data[$scopeType]) ? $this->_data[$scopeType] : [];
+            return $this->_data[$scopeType] ?? [];
         } elseif ($scopeCode) {
-            return isset($this->_data[$scopeType][$scopeCode]) ? $this->_data[$scopeType][$scopeCode] : [];
+            return $this->_data[$scopeType][$scopeCode] ?? [];
         }
         return [];
     }
diff --git a/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php b/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php
index 61d0aa138f9a4..8a4188aed9605 100644
--- a/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php
+++ b/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php
@@ -32,6 +32,6 @@ public function __construct(array $parts)
      */
     public function getPart($code)
     {
-        return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
+        return $this->_parts[$code] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index 92bb3fdbbc54f..615c295675adc 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -70,7 +70,7 @@ public function get($key = null, $defaultValue = null)
         if ($key === null) {
             return $this->flatData;
         }
-        return isset($this->flatData[$key]) ? $this->flatData[$key] : $defaultValue;
+        return $this->flatData[$key] ?? $defaultValue;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Http/Context.php b/lib/internal/Magento/Framework/App/Http/Context.php
index a5eba2753b510..79a15110234cd 100644
--- a/lib/internal/Magento/Framework/App/Http/Context.php
+++ b/lib/internal/Magento/Framework/App/Http/Context.php
@@ -84,9 +84,7 @@ public function unsValue($name)
      */
     public function getValue($name)
     {
-        return isset($this->data[$name])
-            ? $this->data[$name]
-            : (isset($this->default[$name]) ? $this->default[$name] : null);
+        return $this->data[$name] ?? ($this->default[$name] ?? null);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
index 979ea1c429590..19a89681a2d5f 100644
--- a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
+++ b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -59,6 +59,7 @@ public function create(
         $dir = $this->_filesystem->getDirectoryWrite($baseDir);
         $isFile = false;
         $file = null;
+        $fileContent = $this->getFileContent($content);
         if (is_array($content)) {
             if (!isset($content['type']) || !isset($content['value'])) {
                 throw new \InvalidArgumentException("Invalid arguments. Keys 'type' and 'value' are required.");
@@ -76,7 +77,7 @@ public function create(
             ->setHeader('Pragma', 'public', true)
             ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true)
             ->setHeader('Content-type', $contentType, true)
-            ->setHeader('Content-Length', $contentLength === null ? strlen($content) : $contentLength, true)
+            ->setHeader('Content-Length', $contentLength === null ? strlen($fileContent) : $contentLength, true)
             ->setHeader('Content-Disposition', 'attachment; filename="' . $fileName . '"', true)
             ->setHeader('Last-Modified', date('r'), true);
 
@@ -88,7 +89,8 @@ public function create(
                     echo $stream->read(1024);
                 }
             } else {
-                $dir->writeFile($fileName, $content);
+                $dir->writeFile($fileName, $fileContent);
+                $file = $fileName;
                 $stream = $dir->openFile($fileName, 'r');
                 while (!$stream->eof()) {
                     echo $stream->read(1024);
@@ -102,4 +104,19 @@ public function create(
         }
         return $this->_response;
     }
+
+    /**
+     * Returns file content for writing.
+     *
+     * @param string|array $content
+     * @return string|array
+     */
+    private function getFileContent($content)
+    {
+        if (isset($content['type']) && $content['type'] === 'string') {
+            return $content['value'];
+        }
+
+        return $content;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
index 9c746177d6f7d..88b2995179d4d 100644
--- a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
+++ b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
@@ -68,7 +68,7 @@ public function getPaths($type)
     public function getPath($type, $componentName)
     {
         self::validateType($type);
-        return isset(self::$paths[$type][$componentName]) ? self::$paths[$type][$componentName] : null;
+        return self::$paths[$type][$componentName] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index ef9c39e221e86..05863caeec2b6 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -71,7 +71,7 @@ public function __construct(
     public function getVars($module)
     {
         $this->initData();
-        return isset($this->data['vars'][$module]) ? $this->data['vars'][$module] : [];
+        return $this->data['vars'][$module] ?? [];
     }
 
     /**
@@ -110,7 +110,7 @@ public function getVarValue($module, $var)
     public function getMediaEntities($module, $mediaType)
     {
         $this->initData();
-        return isset($this->data['media'][$module][$mediaType]) ? $this->data['media'][$module][$mediaType] : [];
+        return $this->data['media'][$module][$mediaType] ?? [];
     }
 
     /**
@@ -124,9 +124,7 @@ public function getMediaEntities($module, $mediaType)
     public function getMediaAttributes($module, $mediaType, $mediaId)
     {
         $this->initData();
-        return isset($this->data['media'][$module][$mediaType][$mediaId])
-            ? $this->data['media'][$module][$mediaType][$mediaId]
-            : [];
+        return $this->data['media'][$module][$mediaType][$mediaId] ?? [];
     }
 
     /**
@@ -163,7 +161,7 @@ protected function getIdAttributes()
     public function getExcludedFiles()
     {
         $items = $this->getItems();
-        return isset($items['file']) ? $items['file'] : [];
+        return $items['file'] ?? [];
     }
 
     /**
@@ -174,7 +172,7 @@ public function getExcludedFiles()
     public function getExcludedDir()
     {
         $items = $this->getItems();
-        return isset($items['directory']) ? $items['directory'] : [];
+        return $items['directory'] ?? [];
     }
 
     /**
@@ -185,7 +183,7 @@ public function getExcludedDir()
     protected function getItems()
     {
         $this->initData();
-        return isset($this->data['exclude']) ? $this->data['exclude'] : [];
+        return $this->data['exclude'] ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Config/etc/view.xsd b/lib/internal/Magento/Framework/Config/etc/view.xsd
index 20b6a7d4fbfd2..b908862b02147 100644
--- a/lib/internal/Magento/Framework/Config/etc/view.xsd
+++ b/lib/internal/Magento/Framework/Config/etc/view.xsd
@@ -49,13 +49,13 @@
             <xs:element name="image" minOccurs="1" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0"/>
-                        <xs:element name="constrain" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="frame" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="transparency" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="background" minOccurs="0">
+                        <xs:element name="width" type="xs:positiveInteger" minOccurs="0" nillable="true"/>
+                        <xs:element name="height" type="xs:positiveInteger" minOccurs="0" nillable="true"/>
+                        <xs:element name="constrain" type="xs:boolean" minOccurs="0" nillable="true"/>
+                        <xs:element name="aspect_ratio" type="xs:boolean" minOccurs="0" nillable="true"/>
+                        <xs:element name="frame" type="xs:boolean" minOccurs="0" nillable="true"/>
+                        <xs:element name="transparency" type="xs:boolean" minOccurs="0" nillable="true"/>
+                        <xs:element name="background" minOccurs="0" nillable="true">
                             <xs:simpleType>
                                 <xs:restriction base="xs:string">
                                     <xs:pattern value="\[(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\]"/>
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 2274fde82b818..1449d6d2a6456 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -483,7 +483,7 @@ public function rawFetchRow($sql, $field = null)
         if (empty($field)) {
             return $row;
         } else {
-            return isset($row[$field]) ? $row[$field] : false;
+            return $row[$field] ?? false;
         }
     }
 
diff --git a/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php b/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
index 36a075b9af8c9..dfe9c8949c353 100644
--- a/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
+++ b/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
@@ -40,12 +40,12 @@ public function render(Select $select, $sql = '')
             $order = [];
             foreach ($select->getPart(Select::ORDER) as $term) {
                 if (is_array($term)) {
-                    if (is_numeric($term[0]) && strval(intval($term[0])) == $term[0]) {
+                    if (is_numeric($term[0]) && (string)(int)$term[0] == $term[0]) {
                         $order[] = (int)trim($term[0]) . ' ' . $term[1];
                     } else {
                         $order[] = $this->quote->quoteIdentifier($term[0]) . ' ' . $term[1];
                     }
-                } elseif (is_numeric($term) && strval(intval($term)) == $term) {
+                } elseif (is_numeric($term) && (string)(int)$term == $term) {
                     $order[] = (int)trim($term);
                 } else {
                     $order[] = $this->quote->quoteIdentifier($term);
diff --git a/lib/internal/Magento/Framework/Data/AbstractCriteria.php b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
index c90ed2b03bf3d..d4811b79980a9 100644
--- a/lib/internal/Magento/Framework/Data/AbstractCriteria.php
+++ b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
@@ -274,7 +274,7 @@ public function getLimit()
      */
     public function getPart($name, $default = null)
     {
-        return isset($this->data[$name]) ? $this->data[$name] : $default;
+        return $this->data[$name] ?? $default;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/AbstractDataObject.php b/lib/internal/Magento/Framework/Data/AbstractDataObject.php
index 5916100ffbbfa..da04fecc447cc 100644
--- a/lib/internal/Magento/Framework/Data/AbstractDataObject.php
+++ b/lib/internal/Magento/Framework/Data/AbstractDataObject.php
@@ -50,6 +50,6 @@ public function toArray()
      */
     protected function get($key)
     {
-        return isset($this->data[$key]) ? $this->data[$key] : null;
+        return $this->data[$key] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index f8b82d3122234..71ec8c1aa8379 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -851,7 +851,7 @@ public function count()
      */
     public function getFlag($flag)
     {
-        return isset($this->_flags[$flag]) ? $this->_flags[$flag] : null;
+        return $this->_flags[$flag] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
index 3048be4d5dc1b..2a68432207b23 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
@@ -121,13 +121,13 @@ public function getChecked($value)
             return;
         }
         if (!is_array($checked)) {
-            $checked = [strval($checked)];
+            $checked = [(string)$checked];
         } else {
             foreach ($checked as $k => $v) {
-                $checked[$k] = strval($v);
+                $checked[$k] = (string)$v;
             }
         }
-        if (in_array(strval($value), $checked)) {
+        if (in_array((string)$value, $checked)) {
             return 'checked';
         }
         return;
@@ -141,13 +141,13 @@ public function getDisabled($value)
     {
         if ($disabled = $this->getData('disabled')) {
             if (!is_array($disabled)) {
-                $disabled = [strval($disabled)];
+                $disabled = [(string)$disabled];
             } else {
                 foreach ($disabled as $k => $v) {
-                    $disabled[$k] = strval($v);
+                    $disabled[$k] = (string)$v;
                 }
             }
-            if (in_array(strval($value), $disabled)) {
+            if (in_array((string)$value, $disabled)) {
                 return 'disabled';
             }
         }
diff --git a/lib/internal/Magento/Framework/Data/Structure.php b/lib/internal/Magento/Framework/Data/Structure.php
index 9d540e8a49f08..a977d3448ec26 100644
--- a/lib/internal/Magento/Framework/Data/Structure.php
+++ b/lib/internal/Magento/Framework/Data/Structure.php
@@ -166,7 +166,7 @@ public function createElement($elementId, array $data)
      */
     public function getElement($elementId)
     {
-        return isset($this->_elements[$elementId]) ? $this->_elements[$elementId] : false;
+        return $this->_elements[$elementId] ?? false;
     }
 
     /**
@@ -456,9 +456,7 @@ public function getChildId($parentId, $alias)
      */
     public function getChildren($parentId)
     {
-        return isset(
-            $this->_elements[$parentId][self::CHILDREN]
-        ) ? $this->_elements[$parentId][self::CHILDREN] : [];
+        return $this->_elements[$parentId][self::CHILDREN] ?? [];
     }
 
     /**
@@ -469,7 +467,7 @@ public function getChildren($parentId)
      */
     public function getParentId($childId)
     {
-        return isset($this->_elements[$childId][self::PARENT]) ? $this->_elements[$childId][self::PARENT] : false;
+        return $this->_elements[$childId][self::PARENT] ?? false;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Event.php b/lib/internal/Magento/Framework/Event.php
index 4c116d0a33629..c7b15a8eb0722 100644
--- a/lib/internal/Magento/Framework/Event.php
+++ b/lib/internal/Magento/Framework/Event.php
@@ -88,7 +88,7 @@ public function dispatch()
      */
     public function getName()
     {
-        return isset($this->_data['name']) ? $this->_data['name'] : null;
+        return $this->_data['name'] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/File.php b/lib/internal/Magento/Framework/Filesystem/Io/File.php
index 60a94d5b430e9..2e724260ff543 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/File.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/File.php
@@ -228,7 +228,7 @@ public function streamStat($part = null, $default = null)
         }
         $stat = @fstat($this->_streamHandler);
         if ($part !== null) {
-            return isset($stat[$part]) ? $stat[$part] : $default;
+            return $stat[$part] ?? $default;
         }
         return $stat;
     }
diff --git a/lib/internal/Magento/Framework/Filter/AbstractFactory.php b/lib/internal/Magento/Framework/Filter/AbstractFactory.php
index 2a0ae0ba15e42..c30b07aa09061 100644
--- a/lib/internal/Magento/Framework/Filter/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/Filter/AbstractFactory.php
@@ -68,7 +68,7 @@ public function canCreateFilter($alias)
      */
     public function isShared($class)
     {
-        return isset($this->shared[$class]) ? $this->shared[$class] : $this->shareByDefault;
+        return $this->shared[$class] ?? $this->shareByDefault;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Filter/Factory.php b/lib/internal/Magento/Framework/Filter/Factory.php
index a5e5978a83f06..dbe037ecbbbd1 100644
--- a/lib/internal/Magento/Framework/Filter/Factory.php
+++ b/lib/internal/Magento/Framework/Filter/Factory.php
@@ -32,6 +32,7 @@ class Factory extends AbstractFactory
         'decrypt' => \Magento\Framework\Filter\Decrypt::class,
         'translit' => \Magento\Framework\Filter\Translit::class,
         'translitUrl' => \Magento\Framework\Filter\TranslitUrl::class,
+        'truncateFilter' => \Magento\Framework\Filter\TruncateFilter::class,
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/Filter/FilterManager.php b/lib/internal/Magento/Framework/Filter/FilterManager.php
index 52c9d017ad11c..ca5d998af833f 100644
--- a/lib/internal/Magento/Framework/Filter/FilterManager.php
+++ b/lib/internal/Magento/Framework/Filter/FilterManager.php
@@ -21,6 +21,7 @@
  * @method string removeTags(string $value, $params = array())
  * @method string stripTags(string $value, $params = array())
  * @method string truncate(string $value, $params = array())
+ * @method string truncateFilter(string $value, $params = array())
  * @method string encrypt(string $value, $params = array())
  * @method string decrypt(string $value, $params = array())
  * @method string translit(string $value)
diff --git a/lib/internal/Magento/Framework/Filter/Input.php b/lib/internal/Magento/Framework/Filter/Input.php
index 39c7a54786edb..6da748fcbeb9f 100644
--- a/lib/internal/Magento/Framework/Filter/Input.php
+++ b/lib/internal/Magento/Framework/Filter/Input.php
@@ -183,7 +183,7 @@ public function getFilters($name = null)
         if (null === $name) {
             return $this->_filters;
         } else {
-            return isset($this->_filters[$name]) ? $this->_filters[$name] : null;
+            return $this->_filters[$name] ?? null;
         }
     }
 
diff --git a/lib/internal/Magento/Framework/Filter/Translit.php b/lib/internal/Magento/Framework/Filter/Translit.php
index 7a84a6e33af18..a6162aa7a7fff 100644
--- a/lib/internal/Magento/Framework/Filter/Translit.php
+++ b/lib/internal/Magento/Framework/Filter/Translit.php
@@ -409,7 +409,7 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
         $convertConfig = $config->getValue('url/convert', 'default');
         if ($convertConfig) {
             foreach ($convertConfig as $configValue) {
-                $this->convertTable[strval($configValue['from'])] = strval($configValue['to']);
+                $this->convertTable[(string)$configValue['from']] = (string)$configValue['to'];
             }
         }
     }
diff --git a/lib/internal/Magento/Framework/Filter/Truncate.php b/lib/internal/Magento/Framework/Filter/Truncate.php
index fd4fbe9910427..a4dd35b302705 100644
--- a/lib/internal/Magento/Framework/Filter/Truncate.php
+++ b/lib/internal/Magento/Framework/Filter/Truncate.php
@@ -10,6 +10,9 @@
  *
  * Truncate a string to a certain length if necessary, appending the $etc string.
  * $remainder will contain the string that has been replaced with $etc.
+ *
+ * @deprecated
+ * @see \Magento\Framework\Filter\TruncateFilter
  */
 class Truncate implements \Zend_Filter_Interface
 {
diff --git a/lib/internal/Magento/Framework/Filter/TruncateFilter.php b/lib/internal/Magento/Framework/Filter/TruncateFilter.php
new file mode 100644
index 0000000000000..c8667a7d49f26
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/TruncateFilter.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter;
+
+use Magento\Framework\Filter\TruncateFilter\Result;
+use Magento\Framework\Filter\TruncateFilter\ResultFactory;
+use Magento\Framework\Stdlib\StringUtils;
+
+/**
+ * Truncate filter
+ *
+ * Truncate a string to a certain length if necessary, appending the $etc string.
+ * $remainder will contain the string that has been replaced with $etc.
+ */
+class TruncateFilter implements \Zend_Filter_Interface
+{
+    /**
+     * @var int
+     */
+    private $length;
+
+    /**
+     * @var string
+     */
+    private $etc;
+
+    /**
+     * @var bool
+     */
+    private $breakWords;
+
+    /**
+     * @var StringUtils
+     */
+    private $stringUtils;
+
+    /**
+     * @var ResultFactory
+     */
+    private $resultFactory;
+
+    /**
+     * @param StringUtils $stringUtils
+     * @param ResultFactory $resultFactory
+     * @param int $length
+     * @param string $etc
+     * @param bool $breakWords
+     */
+    public function __construct(
+        StringUtils $stringUtils,
+        ResultFactory $resultFactory,
+        int $length = 80,
+        string $etc = '...',
+        bool $breakWords = true
+    ) {
+        $this->stringUtils = $stringUtils;
+        $this->resultFactory = $resultFactory;
+        $this->length = $length;
+        $this->etc = $etc;
+        $this->breakWords = $breakWords;
+    }
+
+    /**
+     * Filter value
+     *
+     * @param mixed $string
+     * @return Result
+     */
+    public function filter($string) : Result
+    {
+        /** @var Result $result */
+        $result = $this->resultFactory->create(['value' => $string, 'remainder' => '']);
+        $length = $this->length;
+        if (0 == $length) {
+            $result->setValue('');
+
+            return $result;
+        }
+
+        $originalLength = $this->stringUtils->strlen($string);
+        if ($originalLength > $length) {
+            $length -= $this->stringUtils->strlen($this->etc);
+            if ($length <= 0) {
+                $result->setValue('');
+
+                return $result;
+            }
+            $preparedString = $string;
+            $preparedLength = $length;
+            if (!$this->breakWords) {
+                $preparedString = preg_replace(
+                    '/\s+?(\S+)?$/u',
+                    '',
+                    $this->stringUtils->substr($string, 0, $length + 1)
+                );
+                $preparedLength = $this->stringUtils->strlen($preparedString);
+            }
+            $result->setRemainder($this->stringUtils->substr($string, $preparedLength, $originalLength));
+            $result->setValue($this->stringUtils->substr($preparedString, 0, $length) . $this->etc);
+
+            return $result;
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/TruncateFilter/Result.php b/lib/internal/Magento/Framework/Filter/TruncateFilter/Result.php
new file mode 100644
index 0000000000000..801ce355f5eb9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/TruncateFilter/Result.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\TruncateFilter;
+
+/**
+ * Resulting class for truncate filter
+ */
+class Result
+{
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @var string
+     */
+    private $remainder;
+
+    /**
+     * @param string $value
+     * @param string $remainder
+     */
+    public function __construct(string $value, string $remainder)
+    {
+        $this->value = $value;
+        $this->remainder = $remainder;
+    }
+
+    /**
+     * Set result value
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setValue(string $value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * Get value
+     *
+     * @return string
+     */
+    public function getValue() : string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set remainder
+     *
+     * @param string $remainder
+     * @return void
+     */
+    public function setRemainder(string $remainder)
+    {
+        $this->remainder = $remainder;
+    }
+
+    /**
+     * Get remainder
+     *
+     * @return string
+     */
+    public function getRemainder() : string
+    {
+        return $this->remainder;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 489755a2846fc..718b08190d8be 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -268,7 +268,7 @@ public function getNext($type, $method, $code = '__self')
             $this->_inheritPlugins($type);
         }
         $key = $type . '_' . lcfirst($method) . '_' . $code;
-        return isset($this->_processed[$key]) ? $this->_processed[$key] : null;
+        return $this->_processed[$key] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Message/Collection.php b/lib/internal/Magento/Framework/Message/Collection.php
index fb8351c5a04ba..b1e3088a703f7 100644
--- a/lib/internal/Magento/Framework/Message/Collection.php
+++ b/lib/internal/Magento/Framework/Message/Collection.php
@@ -142,7 +142,7 @@ public function getItems()
      */
     public function getItemsByType($type)
     {
-        return isset($this->messages[$type]) ? $this->messages[$type] : [];
+        return $this->messages[$type] ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
index db919c80e251c..5963f5f942374 100644
--- a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
@@ -151,9 +151,7 @@ public function getCustomAttributes()
     public function getCustomAttribute($attributeCode)
     {
         $this->initializeCustomAttributes();
-        return isset($this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode])
-            ? $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]
-            : null;
+        return $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/FullModuleList.php b/lib/internal/Magento/Framework/Module/FullModuleList.php
index 5ad5b05a413ef..c6e403dee0898 100644
--- a/lib/internal/Magento/Framework/Module/FullModuleList.php
+++ b/lib/internal/Magento/Framework/Module/FullModuleList.php
@@ -55,7 +55,7 @@ public function getAll()
     public function getOne($name)
     {
         $data = $this->getAll();
-        return isset($data[$name]) ? $data[$name] : null;
+        return $data[$name] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/ModuleList.php b/lib/internal/Magento/Framework/Module/ModuleList.php
index 406aa9efd31a0..6ee061cffb3d0 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList.php
@@ -90,7 +90,7 @@ public function getAll()
     public function getOne($name)
     {
         $enabled = $this->getAll();
-        return isset($enabled[$name]) ? $enabled[$name] : null;
+        return $enabled[$name] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/ModuleResource.php b/lib/internal/Magento/Framework/Module/ModuleResource.php
index ed740d459060e..9f7ac2a1b393c 100644
--- a/lib/internal/Magento/Framework/Module/ModuleResource.php
+++ b/lib/internal/Magento/Framework/Module/ModuleResource.php
@@ -84,7 +84,7 @@ public function getDbVersion($moduleName)
             return false;
         }
         $this->_loadVersion('db');
-        return isset(self::$schemaVersions[$moduleName]) ? self::$schemaVersions[$moduleName] : false;
+        return self::$schemaVersions[$moduleName] ?? false;
     }
 
     /**
@@ -116,7 +116,7 @@ public function getDataVersion($moduleName)
             return false;
         }
         $this->_loadVersion('data');
-        return isset(self::$dataVersions[$moduleName]) ? self::$dataVersions[$moduleName] : false;
+        return self::$dataVersions[$moduleName] ?? false;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/PackageInfo.php b/lib/internal/Magento/Framework/Module/PackageInfo.php
index 7edb0c04ebf98..0dce507ba26f4 100644
--- a/lib/internal/Magento/Framework/Module/PackageInfo.php
+++ b/lib/internal/Magento/Framework/Module/PackageInfo.php
@@ -283,6 +283,6 @@ public function getConflict($moduleName)
     public function getVersion($moduleName)
     {
         $this->load();
-        return isset($this->modulePackageVersionMap[$moduleName]) ? $this->modulePackageVersionMap[$moduleName] : '';
+        return $this->modulePackageVersionMap[$moduleName] ?? '';
     }
 }
diff --git a/lib/internal/Magento/Framework/Mview/View/Subscription.php b/lib/internal/Magento/Framework/Mview/View/Subscription.php
index 4f5c65c799be8..653d68502e384 100644
--- a/lib/internal/Magento/Framework/Mview/View/Subscription.php
+++ b/lib/internal/Magento/Framework/Mview/View/Subscription.php
@@ -202,10 +202,10 @@ protected function buildStatement($event, $changelog)
                 break;
 
             case Trigger::EVENT_UPDATE:
+                $tableName = $this->resource->getTableName($this->getTableName());
                 $trigger = "INSERT IGNORE INTO %s (%s) VALUES (NEW.%s);";
-
-                if ($this->connection->isTableExists($this->getTableName())
-                    && $describe = $this->connection->describeTable($this->getTableName())
+                if ($this->connection->isTableExists($tableName) &&
+                    $describe = $this->connection->describeTable($tableName)
                 ) {
                     $columnNames = array_column($describe, 'COLUMN_NAME');
                     $columnNames = array_diff($columnNames, $this->ignoredUpdateColumns);
@@ -213,7 +213,7 @@ protected function buildStatement($event, $changelog)
                         $columns = [];
                         foreach ($columnNames as $columnName) {
                             $columns[] = sprintf(
-                                'NEW.%1$s != OLD.%1$s',
+                                'NEW.%1$s <=> OLD.%1$s',
                                 $this->connection->quoteIdentifier($columnName)
                             );
                         }
diff --git a/lib/internal/Magento/Framework/Notification/MessageList.php b/lib/internal/Magento/Framework/Notification/MessageList.php
index 8fb91890b2ff0..ac753b48c8944 100644
--- a/lib/internal/Magento/Framework/Notification/MessageList.php
+++ b/lib/internal/Magento/Framework/Notification/MessageList.php
@@ -72,7 +72,7 @@ protected function _loadMessages()
     public function getMessageByIdentity($identity)
     {
         $this->_loadMessages();
-        return isset($this->_messages[$identity]) ? $this->_messages[$identity] : null;
+        return $this->_messages[$identity] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Polymorphous.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Polymorphous.php
index ebb7d76dcb63c..0c1a2128560f8 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Polymorphous.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Polymorphous.php
@@ -26,6 +26,6 @@ public function __construct()
      */
     public function getArg($key)
     {
-        return isset($this->args[$key]) ? $this->args[$key] : null;
+        return $this->args[$key] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php b/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
index 4ba8c747fa12c..fd1b0c18ead17 100644
--- a/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
+++ b/lib/internal/Magento/Framework/Phrase/Renderer/Placeholder.php
@@ -40,6 +40,6 @@ public function render(array $source, array $arguments)
      */
     private function keyToPlaceholder($key)
     {
-        return '%' . (is_int($key) ? strval($key + 1) : $key);
+        return '%' . (is_int($key) ? (string)($key + 1) : $key);
     }
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Amount/Base.php b/lib/internal/Magento/Framework/Pricing/Amount/Base.php
index 2664ccc54944c..d055819a4a126 100644
--- a/lib/internal/Magento/Framework/Pricing/Amount/Base.php
+++ b/lib/internal/Magento/Framework/Pricing/Amount/Base.php
@@ -105,9 +105,7 @@ public function getBaseAmount()
      */
     public function getAdjustmentAmount($adjustmentCode)
     {
-        return isset($this->adjustmentAmounts[$adjustmentCode])
-            ? $this->adjustmentAmounts[$adjustmentCode]
-            : false;
+        return $this->adjustmentAmounts[$adjustmentCode] ?? false;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Pricing/Price/Pool.php b/lib/internal/Magento/Framework/Pricing/Price/Pool.php
index b460113fc32c8..dfdd0c52681e1 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/Pool.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/Pool.php
@@ -141,6 +141,6 @@ public function offsetUnset($offset)
      */
     public function offsetGet($offset)
     {
-        return isset($this->prices[$offset]) ? $this->prices[$offset] : null;
+        return $this->prices[$offset] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/Search/Response/Aggregation.php b/lib/internal/Magento/Framework/Search/Response/Aggregation.php
index 9cb7a364ff21c..ea72597c53034 100644
--- a/lib/internal/Magento/Framework/Search/Response/Aggregation.php
+++ b/lib/internal/Magento/Framework/Search/Response/Aggregation.php
@@ -47,7 +47,7 @@ public function getIterator()
      */
     public function getBucket($bucketName)
     {
-        return isset($this->buckets[$bucketName]) ? $this->buckets[$bucketName] : null;
+        return $this->buckets[$bucketName] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index ecf169cb0bc88..b855b05a38354 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -476,7 +476,7 @@ protected function _addHost()
      */
     protected function _getHosts()
     {
-        return isset($_SESSION[self::HOST_KEY]) ? $_SESSION[self::HOST_KEY] : [];
+        return $_SESSION[self::HOST_KEY] ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php
index 4b6432a863ebe..8bf898965cbc3 100644
--- a/lib/internal/Magento/Framework/System/Ftp.php
+++ b/lib/internal/Magento/Framework/System/Ftp.php
@@ -105,6 +105,12 @@ public function validateConnectionString($string)
         if ($data['scheme'] != 'ftp') {
             throw new \Exception("Support for scheme unsupported: '{$data['scheme']}'");
         }
+        
+        // Decode user & password strings from URL
+        foreach (array_intersect(array_keys($data), ['user','pass']) as $key) {
+            $data[$key] = urldecode($data[$key]);
+        }
+        
         return $data;
     }
 
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
index 2982edaa4766f..5a02beb798ed0 100644
--- a/lib/internal/Magento/Framework/Url.php
+++ b/lib/internal/Magento/Framework/Url.php
@@ -1074,7 +1074,7 @@ function ($match) {
                     if ($match[1] == '?') {
                         return isset($match[3]) ? '?' : '';
                     } elseif ($match[1] == '&amp;' || $match[1] == '&') {
-                        return isset($match[3]) ? $match[3] : '';
+                        return $match[3] ?? '';
                     }
                 }
             },
diff --git a/lib/internal/Magento/Framework/Validator/Exception.php b/lib/internal/Magento/Framework/Validator/Exception.php
index c70ecfabb52af..370f66c424b01 100644
--- a/lib/internal/Magento/Framework/Validator/Exception.php
+++ b/lib/internal/Magento/Framework/Validator/Exception.php
@@ -84,6 +84,6 @@ public function getMessages($type = '')
             }
             return $allMessages;
         }
-        return isset($this->messages[$type]) ? $this->messages[$type] : [];
+        return $this->messages[$type] ?? [];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php b/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php
index ad86dfca47a25..4fe8f48d6b723 100644
--- a/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php
+++ b/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php
@@ -45,6 +45,6 @@ public function getProperties()
      */
     public function getProperty($name)
     {
-        return isset($this->properties[$name]) ? $this->properties[$name] : null;
+        return $this->properties[$name] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/View/BlockPool.php b/lib/internal/Magento/Framework/View/BlockPool.php
index c50af9d5bbc5f..dff280057fdaf 100644
--- a/lib/internal/Magento/Framework/View/BlockPool.php
+++ b/lib/internal/Magento/Framework/View/BlockPool.php
@@ -72,6 +72,6 @@ public function get($name = null)
             return $this->blocks;
         }
 
-        return isset($this->blocks[$name]) ? $this->blocks[$name] : null;
+        return $this->blocks[$name] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/View/DataSourcePool.php b/lib/internal/Magento/Framework/View/DataSourcePool.php
index 24bdb6639981b..94f4f1dceae97 100644
--- a/lib/internal/Magento/Framework/View/DataSourcePool.php
+++ b/lib/internal/Magento/Framework/View/DataSourcePool.php
@@ -80,7 +80,7 @@ public function get($name = null)
             return $this->dataSources;
         }
 
-        return isset($this->dataSources[$name]) ? $this->dataSources[$name] : null;
+        return $this->dataSources[$name] ?? null;
     }
 
     /**
@@ -107,6 +107,6 @@ public function assign($dataName, $namespace, $alias)
      */
     public function getNamespaceData($namespace)
     {
-        return isset($this->assignments[$namespace]) ? $this->assignments[$namespace] : [];
+        return $this->assignments[$namespace] ?? [];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
index 06c78e7125040..04e775d730b56 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
@@ -118,7 +118,7 @@ public function addDataValidators($dataKey, $validators)
     public function getErrorMessages($dataKey = null)
     {
         if ($dataKey) {
-            return isset($this->_errorMessages[$dataKey]) ? $this->_errorMessages[$dataKey] : [];
+            return $this->_errorMessages[$dataKey] ?? [];
         }
         return $this->_errorMessages;
     }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
index 4430d18db1e70..7312f7546df9b 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
@@ -208,7 +208,7 @@ public function getFiltersParams()
     public function getFilterParam($key, $defaultValue = null)
     {
         $filter = $this->getFiltersParams();
-        return isset($filter[$key]) ? $filter[$key] : $defaultValue;
+        return $filter[$key] ?? $defaultValue;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php
index b2288a47f8f83..baa4e94eed978 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php
@@ -181,7 +181,7 @@ public function getMeta()
      */
     public function getFieldSetMetaInfo($fieldSetName)
     {
-        return isset($this->meta[$fieldSetName]) ? $this->meta[$fieldSetName] : [];
+        return $this->meta[$fieldSetName] ?? [];
     }
 
     /**
@@ -190,7 +190,7 @@ public function getFieldSetMetaInfo($fieldSetName)
      */
     public function getFieldsMetaInfo($fieldSetName)
     {
-        return isset($this->meta[$fieldSetName]['children']) ? $this->meta[$fieldSetName]['children'] : [];
+        return $this->meta[$fieldSetName]['children'] ?? [];
     }
 
     /**
@@ -200,9 +200,7 @@ public function getFieldsMetaInfo($fieldSetName)
      */
     public function getFieldMetaInfo($fieldSetName, $fieldName)
     {
-        return isset($this->meta[$fieldSetName]['children'][$fieldName])
-            ? $this->meta[$fieldSetName]['children'][$fieldName]
-            : [];
+        return $this->meta[$fieldSetName]['children'][$fieldName] ?? [];
     }
 
     /**
@@ -291,7 +289,7 @@ public function getData()
      */
     public function getConfigData()
     {
-        return isset($this->data['config']) ? $this->data['config'] : [];
+        return $this->data['config'] ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Layout/Generic.php b/lib/internal/Magento/Framework/View/Layout/Generic.php
index b83545ff3c439..b527d1a817a96 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generic.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generic.php
@@ -200,6 +200,6 @@ protected function createChildFormComponent(UiComponentInterface $childComponent
      */
     protected function getConfig($name)
     {
-        return isset($this->data['config'][$name]) ? $this->data['config'][$name] : null;
+        return $this->data['config'][$name] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
index 25a04845a0728..3193e10282fd4 100644
--- a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
+++ b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
@@ -146,7 +146,7 @@ public function unsetElementToSort($elementName)
      */
     public function getElementToSort($elementName, array $default = [])
     {
-        return isset($this->elementsToSort[$elementName]) ? $this->elementsToSort[$elementName] : $default;
+        return $this->elementsToSort[$elementName] ?? $default;
     }
 
     /**
@@ -257,7 +257,7 @@ public function unsetElement($elementName)
      */
     public function getElementToMove($elementName, $default = null)
     {
-        return isset($this->scheduledMoves[$elementName]) ? $this->scheduledMoves[$elementName] : $default;
+        return $this->scheduledMoves[$elementName] ?? $default;
     }
 
     /**
@@ -370,7 +370,7 @@ public function unsetStructureElement($elementName)
      */
     public function getStructureElementData($elementName, $default = null)
     {
-        return isset($this->scheduledData[$elementName]) ? $this->scheduledData[$elementName] : $default;
+        return $this->scheduledData[$elementName] ?? $default;
     }
 
     /**
@@ -524,6 +524,6 @@ public function populateWithArray(array $data)
      */
     private function getArrayValueByKey($key, array $array)
     {
-        return isset($array[$key]) ? $array[$key] : [];
+        return $array[$key] ?? [];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index 058cad00320cd..226abc538112b 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -542,7 +542,7 @@ public function setElementAttribute($elementType, $attribute, $value)
     public function getElementAttribute($elementType, $attribute)
     {
         $this->build();
-        return isset($this->elements[$elementType][$attribute]) ? $this->elements[$elementType][$attribute] : null;
+        return $this->elements[$elementType][$attribute] ?? null;
     }
 
     /**
@@ -552,7 +552,7 @@ public function getElementAttribute($elementType, $attribute)
     public function getElementAttributes($elementType)
     {
         $this->build();
-        return isset($this->elements[$elementType]) ? $this->elements[$elementType] : [];
+        return $this->elements[$elementType] ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Url/_files/sourceImport.css b/lib/internal/Magento/Framework/View/Test/Unit/Url/_files/sourceImport.css
index d7ce9e81258db..420083613705f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Url/_files/sourceImport.css
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Url/_files/sourceImport.css
@@ -2,8 +2,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-body {background: url(body.gif);}
 @import url(../recursive.css);
-p {background: url(1.gif?param);}
 @import url("deep/recursive.css");
+body {background: url(body.gif);}
+p {background: url(1.gif?param);}
 h1 {background: url('../h1.gif#param');} h2 {background: url(../images/h2.gif?test);}
diff --git a/lib/internal/Magento/Framework/Xml/Generator.php b/lib/internal/Magento/Framework/Xml/Generator.php
index 975073e443d0e..f165793c2e2a4 100644
--- a/lib/internal/Magento/Framework/Xml/Generator.php
+++ b/lib/internal/Magento/Framework/Xml/Generator.php
@@ -146,8 +146,6 @@ public function setIndexedArrayItemName($name)
      */
     protected function _getIndexedArrayItemName()
     {
-        return isset($this->_defaultIndexedArrayItemName)
-            ? $this->_defaultIndexedArrayItemName
-            : self::DEFAULT_ENTITY_ITEM_NAME;
+        return $this->_defaultIndexedArrayItemName ?? self::DEFAULT_ENTITY_ITEM_NAME;
     }
 }
diff --git a/lib/web/css/docs/docs.css b/lib/web/css/docs/docs.css
index beb18b8b2194a..a3a372ad4eeb9 100644
--- a/lib/web/css/docs/docs.css
+++ b/lib/web/css/docs/docs.css
@@ -4187,7 +4187,7 @@ select {
   color: #000066;
 }
 .example-message-4:before {
-  background: #green;
+  background: green;
   width: 30px;
   content: '';
   display: block;
@@ -4230,7 +4230,7 @@ select {
   border: 5px solid transparent;
   height: 0;
   width: 0;
-  border-left-color: #green;
+  border-left-color: green;
   left: 30px;
 }
 .example-message-4 > *:first-child:after {
diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
index 8f658f8fad738..32586d2115b30 100644
--- a/lib/web/mage/adminhtml/form.js
+++ b/lib/web/mage/adminhtml/form.js
@@ -494,7 +494,8 @@ define([
                     inputs.each(function (item) {
                         // don't touch hidden inputs (and Use Default inputs too), bc they may have custom logic
                         if ((!item.type || item.type != 'hidden') && !($(item.id + '_inherit') && $(item.id + '_inherit').checked) && //eslint-disable-line
-                            !(currentConfig['can_edit_price'] != undefined && !currentConfig['can_edit_price']) //eslint-disable-line
+                            !(currentConfig['can_edit_price'] != undefined && !currentConfig['can_edit_price']) &&  //eslint-disable-line
+                            !item.id.endsWith('_inherit')
                         ) {
                             item.disabled = false;
                             jQuery(item).removeClass('ignore-validate');
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
index 1ec9d486a5a22..04ec83a3d0ca2 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
@@ -26,11 +26,13 @@ class Cache implements ConfigOptionsListInterface
     const INPUT_KEY_CACHE_BACKEND_REDIS_SERVER = 'cache-backend-redis-server';
     const INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE = 'cache-backend-redis-db';
     const INPUT_KEY_CACHE_BACKEND_REDIS_PORT = 'cache-backend-redis-port';
+    const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
 
     const CONFIG_PATH_CACHE_BACKEND = 'cache/frontend/default/backend';
     const CONFIG_PATH_CACHE_BACKEND_SERVER = 'cache/frontend/default/backend_options/server';
     const CONFIG_PATH_CACHE_BACKEND_DATABASE = 'cache/frontend/default/backend_options/database';
     const CONFIG_PATH_CACHE_BACKEND_PORT = 'cache/frontend/default/backend_options/port';
+    const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
 
     /**
      * @var array
@@ -38,7 +40,8 @@ class Cache implements ConfigOptionsListInterface
     private $defaultConfigValues = [
         self::INPUT_KEY_CACHE_BACKEND_REDIS_SERVER => '127.0.0.1',
         self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE => '0',
-        self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => '6379'
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => '6379',
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => ''
     ];
 
     /**
@@ -55,6 +58,7 @@ class Cache implements ConfigOptionsListInterface
         self::INPUT_KEY_CACHE_BACKEND_REDIS_SERVER => self::CONFIG_PATH_CACHE_BACKEND_SERVER,
         self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE => self::CONFIG_PATH_CACHE_BACKEND_DATABASE,
         self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_CACHE_BACKEND_PORT,
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_CACHE_BACKEND_PASSWORD
     ];
 
     /**
@@ -102,6 +106,12 @@ public function getOptions()
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_CACHE_BACKEND_PORT,
                 'Redis server listen port'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
+                'Redis server password'
             )
         ];
     }
@@ -190,6 +200,13 @@ private function validateRedisConfig(array $options, DeploymentConfig $deploymen
                 self::CONFIG_PATH_CACHE_BACKEND_DATABASE,
                 $this->getDefaultConfigValue(self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE)
             );
+        
+        $config['password'] = isset($options[self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD])
+            ? $options[self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD]
+            : $deploymentConfig->get(
+                self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
+                $this->getDefaultConfigValue(self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD)
+            );
 
         return $this->redisValidator->isValidConnection($config);
     }
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
index be1cc5b010185..944c543495751 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
@@ -27,12 +27,14 @@ class PageCache implements ConfigOptionsListInterface
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE = 'page-cache-redis-db';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT = 'page-cache-redis-port';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'page-cache-redis-compress-data';
+    const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD = 'page-cache-redis-password';
 
     const CONFIG_PATH_PAGE_CACHE_BACKEND = 'cache/frontend/page_cache/backend';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER = 'cache/frontend/page_cache/backend_options/server';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE = 'cache/frontend/page_cache/backend_options/database';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_PORT = 'cache/frontend/page_cache/backend_options/port';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/page_cache/backend_options/compress_data';
+    const CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD = 'cache/frontend/page_cache/backend_options/password';
 
     /**
      * @var array
@@ -41,7 +43,8 @@ class PageCache implements ConfigOptionsListInterface
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER => '127.0.0.1',
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE => '1',
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => '6379',
-        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => '0'
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => '0',
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => ''
     ];
 
     /**
@@ -58,7 +61,8 @@ class PageCache implements ConfigOptionsListInterface
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER => self::CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE => self::CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PORT,
-        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA,
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD
     ];
 
     /**
@@ -112,6 +116,12 @@ public function getOptions()
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA,
                 'Set to 1 to compress the full page cache (use 0 to disable)'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
+                'Redis server password'
             )
         ];
     }
@@ -201,6 +211,13 @@ private function validateRedisConfig(array $options, DeploymentConfig $deploymen
                 self::CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE,
                 $this->getDefaultConfigValue(self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE)
             );
+        
+        $config['password'] = isset($options[self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD])
+            ? $options[self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD]
+            : $deploymentConfig->get(
+                self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
+                $this->getDefaultConfigValue(self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD)
+            );
 
         return $this->redisValidator->isValidConnection($config);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
index ef0ea3e988364..39b95953c6347 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
@@ -39,7 +39,7 @@ protected function setUp()
     public function testGetOptions()
     {
         $options = $this->configOptionsList->getOptions();
-        $this->assertCount(4, $options);
+        $this->assertCount(5, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -56,6 +56,10 @@ public function testGetOptions()
         $this->assertArrayHasKey(3, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[3]);
         $this->assertEquals('cache-backend-redis-port', $options[3]->getName());
+
+        $this->assertArrayHasKey(4, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[4]);
+        $this->assertEquals('cache-backend-redis-password', $options[4]->getName());
     }
 
     public function testCreateConfigCacheRedis()
@@ -70,7 +74,8 @@ public function testCreateConfigCacheRedis()
                         'backend_options' => [
                             'server' => '',
                             'port' => '',
-                            'database' => ''
+                            'database' => '',
+                            'password' => ''
                         ]
                     ]
                 ]
@@ -92,7 +97,8 @@ public function testCreateConfigWithRedisConfig()
                         'backend_options' => [
                             'server' => 'localhost',
                             'port' => '1234',
-                            'database' => '5'
+                            'database' => '5',
+                            'password' => ''
                         ]
                     ]
                 ]
@@ -118,7 +124,7 @@ public function testValidateWithValidInput()
         ];
         $this->validatorMock->expects($this->once())
             ->method('isValidConnection')
-            ->with(['host'=>'localhost', 'db'=>'', 'port'=>''])
+            ->with(['host'=>'localhost', 'db'=>'', 'port'=>'', 'password'=> ''])
             ->willReturn(true);
 
         $errors = $this->configOptionsList->validate($options, $this->deploymentConfigMock);
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
index e654bea9ac1c5..ed0e567820ad1 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
@@ -39,7 +39,7 @@ protected function setUp()
     public function testGetOptions()
     {
         $options = $this->configList->getOptions();
-        $this->assertCount(5, $options);
+        $this->assertCount(6, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -60,6 +60,10 @@ public function testGetOptions()
         $this->assertArrayHasKey(4, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[4]);
         $this->assertEquals('page-cache-redis-compress-data', $options[4]->getName());
+
+        $this->assertArrayHasKey(5, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[5]);
+        $this->assertEquals('page-cache-redis-password', $options[5]->getName());
     }
 
     public function testCreateConfigWithRedis()
@@ -75,7 +79,8 @@ public function testCreateConfigWithRedis()
                             'server'=> '',
                             'port' => '',
                             'database' => '',
-                            'compress_data' => ''
+                            'compress_data' => '',
+                            'password' => ''
                         ]
                     ]
                 ]
@@ -98,7 +103,8 @@ public function testCreateConfigWithRedisConfiguration()
                             'server' => 'foo.bar',
                             'port' => '9000',
                             'database' => '6',
-                            'compress_data' => '1'
+                            'compress_data' => '1',
+                            'password' => ''
                         ]
                     ]
                 ]