diff --git a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
index 2b57e5cc2fb0d..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/js/transparent'
+            transparent: 'Magento_Payment/js/transparent',
+            'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
         }
     }
 };
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
index 8e30afdf51f7f..b4bc42b95d0aa 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
@@ -11,10 +11,10 @@ $permissions = $block->getData('permissions');
 ?>
 <?php if ($permissions && $permissions->hasAccessToAdditionalActions()): ?>
     <div class="additional-cache-management">
+        <h2>
+            <span><?= $block->escapeHtml(__('Additional Cache Management')); ?></span>
+        </h2>
         <?php if ($permissions->hasAccessToFlushCatalogImages()): ?>
-            <h2>
-                <span><?= $block->escapeHtml(__('Additional Cache Management')); ?></span>
-            </h2>
             <p>
                 <button onclick="setLocation('<?= $block->escapeJs($block->getCleanImagesUrl()); ?>')" type="button">
                     <?= $block->escapeHtml(__('Flush Catalog Images Cache')); ?>
diff --git a/app/code/Magento/Captcha/view/frontend/requirejs-config.js b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
index 0f3394e41e7c2..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/js/captcha'
+            captcha: 'Magento_Captcha/js/captcha',
+            'Magento_Captcha/captcha': 'Magento_Captcha/js/captcha'
         }
     }
 };
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
index f2039a5002dcc..8b638feafaafc 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\Exception\InputException;
 
+/**
+ * Option management model for product attribute.
+ */
 class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
 {
     /**
@@ -25,7 +28,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItems($attributeCode)
     {
@@ -36,7 +39,7 @@ public function getItems($attributeCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function add($attributeCode, $option)
     {
@@ -47,7 +50,7 @@ public function add($attributeCode, $option)
                 /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
                     $attributeOption = $attributeOption->getLabel();
             });
-            if (in_array($option->getLabel(), $currentOptions)) {
+            if (in_array($option->getLabel(), $currentOptions, true)) {
                 return false;
             }
         }
@@ -59,7 +62,7 @@ public function add($attributeCode, $option)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete($attributeCode, $optionId)
     {
diff --git a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
index fb4522a16f13d..4bb5dc196f985 100644
--- a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
+++ b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
@@ -298,7 +298,7 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
 
         if (!isset($jobConfig['instance'], $jobConfig['method'])) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
-            throw new \Exception('No callbacks found');
+            throw new \Exception(sprintf('No callbacks found for cron job %s', $jobCode));
         }
         $model = $this->_objectManager->create($jobConfig['instance']);
         $callback = [$model, $jobConfig['method']];
diff --git a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
index d14249e6b0e57..632a014a0ab77 100644
--- a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
@@ -354,7 +354,8 @@ public function testDispatchExceptionTooLate()
      */
     public function testDispatchExceptionNoCallback()
     {
-        $exceptionMessage = 'No callbacks found';
+        $jobName = 'test_job1';
+        $exceptionMessage = 'No callbacks found for cron job ' . $jobName;
         $exception = new \Exception(__($exceptionMessage));
 
         $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 86400);
@@ -383,7 +384,7 @@ public function testDispatchExceptionNoCallback()
 
         $this->loggerMock->expects($this->once())->method('critical')->with($exception);
 
-        $jobConfig = ['test_group' => ['test_job1' => ['instance' => 'Some_Class']]];
+        $jobConfig = ['test_group' => [$jobName => ['instance' => 'Some_Class']]];
 
         $this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
 
diff --git a/app/code/Magento/Customer/view/frontend/requirejs-config.js b/app/code/Magento/Customer/view/frontend/requirejs-config.js
index 967bbdcc0e663..f1bf5c1d1b67f 100644
--- a/app/code/Magento/Customer/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Customer/view/frontend/requirejs-config.js
@@ -11,7 +11,9 @@ var config = {
             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/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 086b7423befec..faa15f7240235 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -104,7 +104,7 @@
             <div class="control">
                 <select id="region_id" name="region_id"
                         title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
-                        class="validate-select" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
+                        class="validate-select region_id" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
                     <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
                 </select>
                 <input type="text"
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index bb86c9f453dfb..f11177ae19f7c 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -94,7 +94,7 @@
             <div class="field region required">
                 <label for="region_id" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span></label>
                 <div class="control">
-                    <select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select" style="display:none;">
+                    <select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select region_id" style="display:none;">
                         <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
                     </select>
                     <input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">
diff --git a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
index c3d33949eb012..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/js/downloadable'
+            downloadable: 'Magento_Downloadable/js/downloadable',
+            'Magento_Downloadable/downloadable': 'Magento_Downloadable/js/downloadable'
         }
     }
 };
diff --git a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
index c3f8ecc45da38..f8a463bec37f9 100644
--- a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
+++ b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
@@ -7,7 +7,9 @@ var config = {
     map: {
         '*': {
             giftOptions:    'Magento_GiftMessage/js/gift-options',
-            extraOptions:   'Magento_GiftMessage/js/extra-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/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index c776ca65407bf..4f46c84894f12 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -80,8 +80,9 @@ public function __construct(
     protected function validateEmailAvailable($email)
     {
         $websiteId = $this->_storeManager->getStore()->getWebsiteId();
-        if ($this->_customerSession->getCustomerDataObject()->getEmail() !== $email
-            && !$this->customerAccountManagement->isEmailAvailable($email, $websiteId)
+        if ($this->_customerSession->isLoggedIn()
+            && ($this->_customerSession->getCustomerDataObject()->getEmail() !== $email
+            && !$this->customerAccountManagement->isEmailAvailable($email, $websiteId))
         ) {
             throw new LocalizedException(
                 __('This email address is already assigned to another user.')
diff --git a/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php b/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
index ed8185e6dedeb..62c1cc15bad85 100644
--- a/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
+++ b/app/code/Magento/Payment/Observer/SalesOrderBeforeSaveObserver.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Verify order payment observer
+ */
 class SalesOrderBeforeSaveObserver implements ObserverInterface
 {
     /**
@@ -15,12 +18,19 @@ class SalesOrderBeforeSaveObserver implements ObserverInterface
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException in case order has no payment specified.
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         /** @var \Magento\Sales\Model\Order $order */
         $order = $observer->getEvent()->getOrder();
 
+        if (!$order->getPayment()) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Please provide payment for the order.')
+            );
+        }
+
         if ($order->getPayment()->getMethodInstance()->getCode() != 'free') {
             return $this;
         }
diff --git a/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php b/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
index b86fbc6b18263..63ca1b47dc08c 100644
--- a/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
@@ -61,7 +61,7 @@ public function testSalesOrderBeforeSaveCantUnhold()
         $paymentMock = $this->getMockBuilder(
             \Magento\Sales\Model\Order\Payment::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
-        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
+        $order->method('getPayment')->will($this->returnValue($paymentMock));
         $methodInstance = $this->getMockBuilder(
             \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
@@ -86,7 +86,7 @@ public function testSalesOrderBeforeSaveIsCanceled()
         $paymentMock = $this->getMockBuilder(
             \Magento\Sales\Model\Order\Payment::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
-        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
+        $order->method('getPayment')->will($this->returnValue($paymentMock));
         $methodInstance = $this->getMockBuilder(
             \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
@@ -114,7 +114,7 @@ public function testSalesOrderBeforeSaveIsClosed()
         $paymentMock = $this->getMockBuilder(
             \Magento\Sales\Model\Order\Payment::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
-        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
+        $order->method('getPayment')->will($this->returnValue($paymentMock));
         $methodInstance = $this->getMockBuilder(
             \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
@@ -156,6 +156,29 @@ public function testSalesOrderBeforeSaveSetForced()
         $this->salesOrderBeforeSaveObserver->execute($this->observerMock);
     }
 
+    /**
+     * The method should check that the payment is available, as this is not always the case.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @exceptedExceptionMessage Please provide payment for the order.
+     */
+    public function testDoesNothingWhenNoPaymentIsAvailable()
+    {
+        $this->_prepareEventMockWithMethods(['getOrder']);
+
+        $order = $this->getMockBuilder(\Magento\Sales\Model\Order::class)->disableOriginalConstructor()->setMethods(
+            array_merge(['__wakeup', 'getPayment'])
+        )->getMock();
+
+        $this->eventMock->expects($this->once())->method('getOrder')->will(
+            $this->returnValue($order)
+        );
+
+        $order->expects($this->exactly(1))->method('getPayment')->willReturn(null);
+
+        $this->salesOrderBeforeSaveObserver->execute($this->observerMock);
+    }
+
     /**
      * Prepares EventMock with set of methods
      *
@@ -184,7 +207,7 @@ private function _getPreparedOrderMethod($methodCode, $orderMethods = [])
         $paymentMock = $this->getMockBuilder(
             \Magento\Sales\Model\Order\Payment::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
-        $order->expects($this->once())->method('getPayment')->will($this->returnValue($paymentMock));
+        $order->method('getPayment')->will($this->returnValue($paymentMock));
         $methodInstance = $this->getMockBuilder(
             \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
diff --git a/app/code/Magento/Payment/view/frontend/requirejs-config.js b/app/code/Magento/Payment/view/frontend/requirejs-config.js
index efa24d129e8ec..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/js/cc-type'
+            creditCardType: 'Magento_Payment/js/cc-type',
+            'Magento_Payment/cc-type': 'Magento_Payment/js/cc-type'
         }
     }
 };
diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php
index b5fdaf4ae9fd4..aeea4c75933b5 100644
--- a/app/code/Magento/Paypal/Model/Payflowpro.php
+++ b/app/code/Magento/Paypal/Model/Payflowpro.php
@@ -420,6 +420,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
             $request->setTrxtype(self::TRXTYPE_SALE);
             $request->setOrigid($payment->getAdditionalInformation(self::PNREF));
             $payment->unsAdditionalInformation(self::PNREF);
+            $request->setData('currency', $payment->getOrder()->getBaseCurrencyCode());
         } elseif ($payment->getParentTransactionId()) {
             $request = $this->buildBasicRequest();
             $request->setOrigid($payment->getParentTransactionId());
@@ -472,6 +473,7 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
 
     /**
      * Check void availability
+     *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -584,7 +586,7 @@ public function getConfig()
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      */
     public function postRequest(DataObject $request, ConfigInterface $config)
     {
@@ -719,6 +721,8 @@ public function reviewPayment(InfoInterface $payment, $action)
     }
 
     /**
+     * Set billing address
+     *
      * @param DataObject $request
      * @param DataObject $billing
      *
@@ -745,6 +749,8 @@ public function setBilling(DataObject $request, $billing)
     }
 
     /**
+     * Set shipping address
+     *
      * @param DataObject $request
      * @param DataObject $shipping
      *
@@ -815,6 +821,8 @@ public function mapGatewayResponse(array $postData, DataObject $response)
     }
 
     /**
+     * Set transaction status
+     *
      * @param DataObject $payment
      * @param DataObject $response
      *
@@ -848,6 +856,8 @@ public function setTransStatus($payment, $response)
     }
 
     /**
+     * Fill customer contacts
+     *
      * @param DataObject $order
      * @param DataObject $request
      * @return DataObject
@@ -869,6 +879,7 @@ public function fillCustomerContacts(DataObject $order, DataObject $request)
 
     /**
      * Add order details to payment request
+     *
      * @param DataObject $request
      * @param Order $order
      * @return void
@@ -917,6 +928,8 @@ public function assignData(DataObject $data)
     }
 
     /**
+     * Make a transaction Inquiry Request
+     *
      * @param InfoInterface $payment
      * @param string $transactionId
      * @return DataObject
diff --git a/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php b/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php
index 87abdf8264503..edb50acc5ee76 100644
--- a/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php
+++ b/app/code/Magento/Paypal/Plugin/OrderCanInvoice.php
@@ -40,6 +40,10 @@ public function __construct(Express $express)
      */
     public function afterCanInvoice(Order $order, bool $result): bool
     {
+        if (!$order->getPayment()) {
+            return false;
+        }
+
         if ($this->express->isOrderAuthorizationAllowed($order->getPayment())) {
             return false;
         }
diff --git a/app/code/Magento/Paypal/view/base/requirejs-config.js b/app/code/Magento/Paypal/view/base/requirejs-config.js
index 2b57e5cc2fb0d..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/js/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 f2ac876f560c9..223ade43d86e5 100644
--- a/app/code/Magento/Paypal/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Paypal/view/frontend/requirejs-config.js
@@ -7,6 +7,7 @@ var config = {
     map: {
         '*': {
             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/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index 451ad08d425f5..6ed8393f80658 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -159,7 +159,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Customer\Model\CustomerFactory $customerModelFactory
-     * @param \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory,
+     * @param \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param StoreManagerInterface $storeManager
      * @param \Magento\Checkout\Model\Session $checkoutSession
@@ -221,7 +221,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createEmptyCart()
     {
@@ -241,7 +241,7 @@ public function createEmptyCart()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createEmptyCartForCustomer($customerId)
     {
@@ -257,7 +257,7 @@ public function createEmptyCartForCustomer($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function assignCustomer($cartId, $customerId, $storeId)
     {
@@ -332,7 +332,7 @@ protected function createCustomerCart($customerId, $storeId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
     {
@@ -349,6 +349,8 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
 
             $data = $paymentMethod->getData();
             $quote->getPayment()->importData($data);
+        } else {
+            $quote->collectTotals();
         }
 
         if ($quote->getCheckoutMethod() === self::METHOD_GUEST) {
@@ -379,7 +381,7 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCartForCustomer($customerId)
     {
@@ -406,6 +408,8 @@ public function submit(QuoteEntity $quote, $orderData = [])
     }
 
     /**
+     * Convert quote items to order items for quote
+     *
      * @param Quote $quote
      * @return array
      */
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
index 107445bb18d2a..72e516e35cd6e 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
@@ -188,6 +188,7 @@ protected function setUp()
                 'setCustomerGroupId',
                 'assignCustomer',
                 'getPayment',
+                'collectTotals'
             ]);
 
         $this->quoteAddressFactory = $this->createPartialMock(
@@ -687,6 +688,7 @@ public function testPlaceOrderIfCustomerIsGuest()
         $service->expects($this->once())->method('submit')->willReturn($orderMock);
 
         $this->quoteMock->expects($this->atLeastOnce())->method('getId')->willReturn($cartId);
+        $this->quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf();
 
         $orderMock->expects($this->atLeastOnce())->method('getId')->willReturn($orderId);
         $orderMock->expects($this->atLeastOnce())->method('getIncrementId')->willReturn($orderIncrementId);
diff --git a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
index 8a7bd0260df0f..999bb1786cf83 100644
--- a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
+++ b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
@@ -3,11 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\CronJob;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\Store\Model\StoresConfig;
 use Magento\Sales\Model\Order;
 
+/**
+ * Class that provides functionality of cleaning expired quotes by cron
+ */
 class CleanExpiredOrders
 {
     /**
@@ -16,20 +24,28 @@ class CleanExpiredOrders
     protected $storesConfig;
 
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
+     * @var CollectionFactory
      */
     protected $orderCollectionFactory;
 
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagement;
+
     /**
      * @param StoresConfig $storesConfig
-     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory
+     * @param CollectionFactory $collectionFactory
+     * @param OrderManagementInterface|null $orderManagement
      */
     public function __construct(
         StoresConfig $storesConfig,
-        \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        OrderManagementInterface $orderManagement = null
     ) {
         $this->storesConfig = $storesConfig;
         $this->orderCollectionFactory = $collectionFactory;
+        $this->orderManagement = $orderManagement ?: ObjectManager::getInstance()->get(OrderManagementInterface::class);
     }
 
     /**
@@ -48,8 +64,10 @@ public function execute()
             $orders->getSelect()->where(
                 new \Zend_Db_Expr('TIME_TO_SEC(TIMEDIFF(CURRENT_TIMESTAMP, `updated_at`)) >= ' . $lifetime * 60)
             );
-            $orders->walk('cancel');
-            $orders->walk('save');
+
+            foreach ($orders->getAllIds() as $entityId) {
+                $this->orderManagement->cancel((int) $entityId);
+            }
         }
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 09f0e5f60c914..58128d4f3a404 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -660,8 +660,8 @@ private function canCreditmemoForZeroTotalRefunded($totalRefunded)
         $isRefundZero = abs($totalRefunded) < .0001;
         // Case when Adjustment Fee (adjustment_negative) has been used for first creditmemo
         $hasAdjustmentFee = abs($totalRefunded - $this->getAdjustmentNegative()) < .0001;
-        $hasActinFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
-        if ($isRefundZero || $hasAdjustmentFee || $hasActinFlag) {
+        $hasActionFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
+        if ($isRefundZero || $hasAdjustmentFee || $hasActionFlag) {
             return false;
         }
 
@@ -680,13 +680,12 @@ public function canCreditmemoForZeroTotal($totalRefunded)
         //check if total paid is less than grandtotal
         $checkAmtTotalPaid = $totalPaid <= $this->getGrandTotal();
         //case when amount is due for invoice
-        $dueAmountCondition = $this->canInvoice() && ($checkAmtTotalPaid);
+        $hasDueAmount = $this->canInvoice() && ($checkAmtTotalPaid);
         //case when paid amount is refunded and order has creditmemo created
-
         $creditmemos = ($this->getCreditmemosCollection() === false) ?
              true : (count($this->getCreditmemosCollection()) > 0);
         $paidAmtIsRefunded = $this->getTotalRefunded() == $totalPaid && $creditmemos;
-        if (($dueAmountCondition || $paidAmtIsRefunded) ||
+        if (($hasDueAmount || $paidAmtIsRefunded) ||
             (!$checkAmtTotalPaid &&
             abs($totalRefunded - $this->getAdjustmentNegative()) < .0001)) {
             return false;
diff --git a/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php b/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
index 269ce829e64d3..6844b908ea98d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
@@ -26,6 +26,11 @@ class CleanExpiredOrdersTest extends \PHPUnit\Framework\TestCase
      */
     protected $orderCollectionMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderManagementMock;
+
     /**
      * @var ObjectManager
      */
@@ -44,10 +49,12 @@ protected function setUp()
             ['create']
         );
         $this->orderCollectionMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
+        $this->orderManagementMock = $this->createMock(\Magento\Sales\Api\OrderManagementInterface::class);
 
         $this->model = new CleanExpiredOrders(
             $this->storesConfigMock,
-            $this->collectionFactoryMock
+            $this->collectionFactoryMock,
+            $this->orderManagementMock
         );
     }
 
@@ -64,8 +71,11 @@ public function testExecute()
         $this->collectionFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->orderCollectionMock);
+        $this->orderCollectionMock->expects($this->exactly(2))
+            ->method('getAllIds')
+            ->willReturn([1, 2]);
         $this->orderCollectionMock->expects($this->exactly(4))->method('addFieldToFilter');
-        $this->orderCollectionMock->expects($this->exactly(4))->method('walk');
+        $this->orderManagementMock->expects($this->exactly(4))->method('cancel');
 
         $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
         $selectMock->expects($this->exactly(2))->method('where')->willReturnSelf();
@@ -92,14 +102,18 @@ public function testExecuteWithException()
         $this->collectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->orderCollectionMock);
+        $this->orderCollectionMock->expects($this->once())
+            ->method('getAllIds')
+            ->willReturn([1]);
         $this->orderCollectionMock->expects($this->exactly(2))->method('addFieldToFilter');
+        $this->orderManagementMock->expects($this->once())->method('cancel');
 
         $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
         $selectMock->expects($this->once())->method('where')->willReturnSelf();
         $this->orderCollectionMock->expects($this->once())->method('getSelect')->willReturn($selectMock);
 
-        $this->orderCollectionMock->expects($this->once())
-            ->method('walk')
+        $this->orderManagementMock->expects($this->once())
+            ->method('cancel')
             ->willThrowException(new \Exception($exceptionMessage));
 
         $this->model->execute();
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
index 2bf0eddc022b6..c5657f3a309f7 100644
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -795,3 +795,5 @@ Created,Created
 "PDF Shipments","PDF Shipments"
 "PDF Creditmemos","PDF Creditmemos"
 Refunds,Refunds
+"Allow Zero GrandTotal for Creditmemo","Allow Zero GrandTotal for Creditmemo"
+"Allow Zero GrandTotal","Allow Zero GrandTotal"
diff --git a/app/code/Magento/Sales/view/frontend/requirejs-config.js b/app/code/Magento/Sales/view/frontend/requirejs-config.js
index 658960c749f8c..4d323684afff6 100644
--- a/app/code/Magento/Sales/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Sales/view/frontend/requirejs-config.js
@@ -7,7 +7,9 @@ var config = {
     map: {
         '*': {
             giftMessage:    'Magento_Sales/js/gift-message',
-            ordersReturns:  'Magento_Sales/js/orders-returns'
+            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/Search/view/frontend/requirejs-config.js b/app/code/Magento/Search/view/frontend/requirejs-config.js
index cca294dd3689d..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/js/form-mini'
+            quickSearch: 'Magento_Search/js/form-mini',
+            'Magento_Search/form-mini': 'Magento_Search/js/form-mini'
         }
     }
 };
diff --git a/app/code/Magento/SendFriend/view/frontend/web/requirejs-config.js b/app/code/Magento/SendFriend/view/frontend/web/requirejs-config.js
new file mode 100644
index 0000000000000..8e85666c2362a
--- /dev/null
+++ b/app/code/Magento/SendFriend/view/frontend/web/requirejs-config.js
@@ -0,0 +1,11 @@
+/**
+ * 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/ThemeGraphQl/README.md b/app/code/Magento/ThemeGraphQl/README.md
index fed6b54fa5cf1..2b3d54d9b5735 100644
--- a/app/code/Magento/ThemeGraphQl/README.md
+++ b/app/code/Magento/ThemeGraphQl/README.md
@@ -1,4 +1,4 @@
-# ThemeGraphQlhQl
+# ThemeGraphQl
 
-**ThemeGraphQlhQl** provides type information for the GraphQl module
+**ThemeGraphQl** provides type information for the GraphQl module
 to generate theme fields information endpoints.
diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js
index 4414f0d153ee8..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/js/add-class'
+            addClass: 'Magento_Translation/js/add-class',
+            'Magento_Translation/add-class': 'Magento_Translation/js/add-class'
         }
     },
     deps: [
diff --git a/app/code/Magento/Weee/view/frontend/requirejs-config.js b/app/code/Magento/Weee/view/frontend/requirejs-config.js
index 5b1b3a0f7ec73..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/js/tax-toggle'
+            'taxToggle': 'Magento_Weee/js/tax-toggle',
+            'Magento_Weee/tax-toggle': 'Magento_Weee/js/tax-toggle'
         }
     }
 };
diff --git a/app/code/Magento/Wishlist/etc/adminhtml/system.xml b/app/code/Magento/Wishlist/etc/adminhtml/system.xml
index 50ea4b01fe12b..1e26a1195a7fe 100644
--- a/app/code/Magento/Wishlist/etc/adminhtml/system.xml
+++ b/app/code/Magento/Wishlist/etc/adminhtml/system.xml
@@ -39,6 +39,10 @@
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="show_in_sidebar" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Show in Sidebar</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="wishlist_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>My Wish List Link</label>
diff --git a/app/code/Magento/Wishlist/etc/config.xml b/app/code/Magento/Wishlist/etc/config.xml
index 1fec2d1baf9d4..6588c41a0a7dd 100644
--- a/app/code/Magento/Wishlist/etc/config.xml
+++ b/app/code/Magento/Wishlist/etc/config.xml
@@ -10,6 +10,7 @@
         <wishlist>
             <general>
                 <active>1</active>
+                <show_in_sidebar>1</show_in_sidebar>
             </general>
             <email>
                 <email_identity>general</email_identity>
diff --git a/app/code/Magento/Wishlist/i18n/en_US.csv b/app/code/Magento/Wishlist/i18n/en_US.csv
index a1d33cbd574f0..a9acce448c80c 100644
--- a/app/code/Magento/Wishlist/i18n/en_US.csv
+++ b/app/code/Magento/Wishlist/i18n/en_US.csv
@@ -118,4 +118,5 @@ Action,Action
 Configure,Configure
 Delete,Delete
 "Product Details and Comment","Product Details and Comment"
-"You must login or register to add items to your wishlist.","You must login or register to add items to your wishlist."
\ No newline at end of file
+"You must login or register to add items to your wishlist.","You must login or register to add items to your wishlist."
+"Show in Sidebar","Show in Sidebar"
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/default.xml b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
index f655c7034fe6a..c4f0d01707b20 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/default.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
@@ -18,7 +18,7 @@
             </block>
         </referenceBlock>
         <referenceContainer name="sidebar.additional">
-            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml"/>
+            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml" ifconfig="wishlist/general/show_in_sidebar"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index a3124affffc10..e8e2746717e6a 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -162,6 +162,11 @@
     &.collapsible-block-wrapper-last {
         border-bottom: 0;
     }
+    .admin__dynamic-rows.admin__control-collapsible {   
+        .admin__collapsible-block-wrapper {
+            border-bottom: none;
+        }
+    }
 }
 
 .admin__collapsible-content {
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 3503abcc30468..fe9cbe9b9771d 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
@@ -147,6 +147,14 @@
                 }
             }
         }
+
+        &.field-currently_used_for {
+            > .admin__field-control {
+                .admin__field {
+                    margin-top: 8px;
+                }
+            } 
+        }
     }
 }
 
@@ -288,6 +296,12 @@
     .admin__fieldset > & {
         margin-bottom: 3rem;
         position: relative;
+        
+        &.field-import_file {
+            .input-file {
+                margin-top: 6px;
+            }
+        }
     }
 
     //  Hide group legend and show first field label instead
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index 74098f127eb73..cb718a646ae5c 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -783,7 +783,7 @@
         box-sizing: border-box;
         border: 1px solid #adadad;
         border-radius: 1px;
-        padding: 4px;
+        padding: .6rem 1rem .6rem;
         color: #303030;
         background-color: @color-white;
         font-weight: 500;
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
index 3ffaeb82cdc2a..e2fd226a54fe3 100644
--- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -65,7 +65,7 @@
     }
 
     .form-address-edit {
-        #region_id {
+        .region_id {
             display: none;
         }
 
@@ -368,7 +368,7 @@
 
     .account {
         .page.messages {
-            margin-bottom: @indent__xl;
+            margin-bottom: @indent__base;
         }
 
         .toolbar {
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index d7ae6c3b28f4a..5418d836fc262 100755
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -70,7 +70,7 @@
     }
 
     .form-address-edit {
-        #region_id {
+        .region_id {
             display: none;
         }
 
@@ -551,7 +551,7 @@
 
     .account {
         .page.messages {
-            margin-bottom: @indent__xl;
+            margin-bottom: @indent__base;
         }
 
         .column.main {
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
index 92e4f31064e43..9dbf5c4d2a2a9 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
@@ -57,7 +57,7 @@ public function testNewActionUsedEmail()
         $this->dispatch('newsletter/subscriber/new');
 
         $this->assertSessionMessages($this->equalTo([
-                'This email address is already assigned to another user.',
+                'Thank you for your subscription.',
             ]));
         $this->assertRedirect($this->anything());
     }
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index 8608f20285db3..328a748cfd5df 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -548,7 +548,7 @@ private function _setUploadFileId($fileId)
 
             preg_match("/^(.*?)\[(.*?)\]$/", $fileId, $file);
 
-            if (is_array($file) && count($file) > 0 && count($file[0]) > 0 && count($file[1]) > 0) {
+            if (is_array($file) && count($file) > 0 && !empty($file[0]) && !empty($file[1])) {
                 array_shift($file);
                 $this->_uploadType = self::MULTIPLE_STYLE;
 
diff --git a/lib/internal/Magento/Framework/Option/ArrayInterface.php b/lib/internal/Magento/Framework/Option/ArrayInterface.php
index ecfa71227f9f2..054d9059b02f8 100644
--- a/lib/internal/Magento/Framework/Option/ArrayInterface.php
+++ b/lib/internal/Magento/Framework/Option/ArrayInterface.php
@@ -6,7 +6,10 @@
 namespace Magento\Framework\Option;
 
 /**
- * @todo Remove in favor of the ancestor interface
+ * Array marker interface
+ *
+ * @deprecated please use \Magento\Framework\Data\OptionSourceInterface instead.
+ * @see \Magento\Framework\Data\OptionSourceInterface
  */
 interface ArrayInterface extends \Magento\Framework\Data\OptionSourceInterface
 {