diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php
index da2b953d843b1..646ad4f195b9d 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php
@@ -81,6 +81,9 @@ public function testGetSolutionIdSandbox($environment, $expectedSolution)
         $this->assertEquals($expectedSolution, $this->model->getSolutionId(123));
     }
 
+    /**
+     * @return array
+     */
     public function configMapProvider()
     {
         return [
@@ -97,6 +100,10 @@ public function configMapProvider()
             ['getTransactionInfoSyncKeys', 'transactionSyncKeys', 'a,b,c', ['a', 'b', 'c']],
         ];
     }
+
+    /**
+     * @return array
+     */
     public function environmentUrlProvider()
     {
         return [
@@ -105,6 +112,9 @@ public function environmentUrlProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function environmentSolutionProvider()
     {
         return [
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
index 6ddb30a64af96..84c2f19040e16 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
@@ -108,6 +108,10 @@ public function testBuildWithBothAddresses()
         $this->assertEquals('abc', $result['transactionRequest']['customerIP']);
     }
 
+    /**
+     * @param $responseData
+     * @param $addressPrefix
+     */
     private function validateAddressData($responseData, $addressPrefix)
     {
         foreach ($this->mockAddressData as $fieldValue => $field) {
@@ -115,6 +119,11 @@ private function validateAddressData($responseData, $addressPrefix)
         }
     }
 
+    /**
+     * @param $prefix
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
     private function createAddressMock($prefix)
     {
         $addressAdapterMock = $this->createMock(AddressAdapterInterface::class);
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php
index a52a1b317fbb7..197dc209ece66 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php
@@ -112,6 +112,9 @@ public function testDoesNothingWhenPending(string $status)
         $this->handler->handle($subject, $response);
     }
 
+    /**
+     * @return array
+     */
     public function pendingTransactionStatusesProvider()
     {
         return [
@@ -120,6 +123,9 @@ public function pendingTransactionStatusesProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function declinedTransactionStatusesProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index aef79e651b584..320a322fc5f8e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -389,7 +389,7 @@
         <waitForPageLoad stepKey="waitForGridLoad"/>
     </actionGroup>
 
-    <!--Filter and select the the product  -->
+    <!--Filter and select the product  -->
     <actionGroup name="filterAndSelectProduct">
         <annotations>
             <description>Goes to the Admin Products grid. Filters the Product grid by the provided Product SKU.</description>
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
index 71f5ca33d1303..6977a9ad1c7cc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
@@ -191,6 +191,9 @@ public function testIsExist($fileName, $fileMediaPath)
         $this->assertTrue($this->model->isExist($fileName));
     }
 
+    /**
+     * @return array
+     */
     public function isExistProvider()
     {
         return [
@@ -213,6 +216,9 @@ public function testIsBeginsWithMediaDirectoryPath($fileName, $expected)
         $this->assertEquals($expected, $this->model->isBeginsWithMediaDirectoryPath($fileName));
     }
 
+    /**
+     * @return array
+     */
     public function isBeginsWithMediaDirectoryPathProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index 5eaf2422e95a9..0d1adfe3891e2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -486,6 +486,9 @@ public function testGetStoreSingleSiteModelIds(
         $this->assertEquals($websiteIDs, $this->model->getStoreIds());
     }
 
+    /**
+     * @return array
+     */
     public function getSingleStoreIds()
     {
         return [
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
index 66f8ed541ffd9..e0519a126aa48 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -222,7 +222,7 @@
     <!-- Check product in checkout cart items -->
     <actionGroup name="CheckProductInCheckoutCartItemsActionGroup">
         <annotations>
-            <description>Validates the the provided Product appears in the Storefront Checkout 'Order Summary' section.</description>
+            <description>Validates the provided Product appears in the Storefront Checkout 'Order Summary' section.</description>
         </annotations>
         <arguments>
             <argument name="productVar"/>
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
index daabb080b1c9a..82384fa83ab94 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
@@ -48,6 +48,9 @@ public function testProcess($cartData, $expected)
         $this->assertEquals($this->requestProcessor->process($cartData), $expected);
     }
 
+    /**
+     * @return array
+     */
     public function cartDataProvider()
     {
         return [
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
index 10d22b61ecae0..2a3a14293a059 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SetGroupForValidVATIdIntraUnionActionGroup">
         <annotations>
-            <description>Goes to the 'Configuration' page for 'Customer Configuration'. Sets the 'Group For Valid VAT ID Intra Union' option. Clicks on the Save button. Validates the the Save message is present.</description>
+            <description>Goes to the 'Configuration' page for 'Customer Configuration'. Sets the 'Group For Valid VAT ID Intra Union' option. Clicks on the Save button. Validates the Save message is present.</description>
         </annotations>
         <arguments>
             <argument name="value" type="string"/>
diff --git a/app/code/Magento/Deploy/Console/DeployStaticOptions.php b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
index 1c02d24f7e99c..06887fc0206fc 100644
--- a/app/code/Magento/Deploy/Console/DeployStaticOptions.php
+++ b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
@@ -78,6 +78,11 @@ class DeployStaticOptions
      */
     const NO_JAVASCRIPT = 'no-javascript';
 
+    /**
+     * Key for js-bundle option
+     */
+    const NO_JS_BUNDLE = 'no-js-bundle';
+
     /**
      * Key for css option
      */
@@ -122,9 +127,6 @@ class DeployStaticOptions
      */
     const NO_LESS = 'no-less';
 
-    /**
-     * Default jobs amount
-     */
     const DEFAULT_JOBS_AMOUNT = 0;
 
     /**
@@ -275,6 +277,12 @@ private function getSkipOptions()
                 InputOption::VALUE_NONE,
                 'Do not deploy JavaScript files.'
             ),
+            new InputOption(
+                self::NO_JS_BUNDLE,
+                null,
+                InputOption::VALUE_NONE,
+                'Do not deploy JavaScript bundle files.'
+            ),
             new InputOption(
                 self::NO_CSS,
                 null,
diff --git a/app/code/Magento/Deploy/Service/DeployStaticContent.php b/app/code/Magento/Deploy/Service/DeployStaticContent.php
index 8903997159914..b6333d6fec71e 100644
--- a/app/code/Magento/Deploy/Service/DeployStaticContent.php
+++ b/app/code/Magento/Deploy/Service/DeployStaticContent.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Deploy\Service;
 
-use Magento\Deploy\Strategy\DeployStrategyFactory;
-use Magento\Deploy\Process\QueueFactory;
 use Magento\Deploy\Console\DeployStaticOptions as Options;
+use Magento\Deploy\Process\QueueFactory;
+use Magento\Deploy\Strategy\DeployStrategyFactory;
 use Magento\Framework\App\View\Deployment\Version\StorageInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManagerInterface;
@@ -75,6 +75,9 @@ public function __construct(
      * @param array $options
      * @throws LocalizedException
      * @return void
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function deploy(array $options)
     {
@@ -106,27 +109,35 @@ public function deploy(array $options)
 
         $deployStrategy = $this->deployStrategyFactory->create(
             $options[Options::STRATEGY],
-            [
-                'queue' => $this->queueFactory->create($queueOptions)
-            ]
+            ['queue' => $this->queueFactory->create($queueOptions)]
         );
 
         $packages = $deployStrategy->deploy($options);
 
         if ($options[Options::NO_JAVASCRIPT] !== true) {
-            $deployRjsConfig = $this->objectManager->create(DeployRequireJsConfig::class, [
-                'logger' => $this->logger
-            ]);
-            $deployI18n = $this->objectManager->create(DeployTranslationsDictionary::class, [
-                'logger' => $this->logger
-            ]);
-            $deployBundle = $this->objectManager->create(Bundle::class, [
-                'logger' => $this->logger
-            ]);
+            $deployRjsConfig = $this->objectManager->create(
+                DeployRequireJsConfig::class,
+                ['logger' => $this->logger]
+            );
+            $deployI18n      = $this->objectManager->create(
+                DeployTranslationsDictionary::class,
+                ['logger' => $this->logger]
+            );
             foreach ($packages as $package) {
                 if (!$package->isVirtual()) {
                     $deployRjsConfig->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
                     $deployI18n->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
+                }
+            }
+        }
+
+        if ($options[Options::NO_JAVASCRIPT] !== true && $options[Options::NO_JS_BUNDLE] !== true) {
+            $deployBundle = $this->objectManager->create(
+                Bundle::class,
+                ['logger' => $this->logger]
+            );
+            foreach ($packages as $package) {
+                if (!$package->isVirtual()) {
                     $deployBundle->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
                 }
             }
diff --git a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
index 396381960e544..fcc02476bb858 100644
--- a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
@@ -103,7 +103,7 @@ public function testDeploy($options, $expectedContentVersion)
             $package->expects($this->never())->method('getTheme');
             $package->expects($this->never())->method('getLocale');
         } else {
-            $package->expects($this->exactly(1))->method('isVirtual')->willReturn(false);
+            $package->expects($this->exactly(2))->method('isVirtual')->willReturn(false);
             $package->expects($this->exactly(3))->method('getArea')->willReturn('area');
             $package->expects($this->exactly(3))->method('getTheme')->willReturn('theme');
             $package->expects($this->exactly(3))->method('getLocale')->willReturn('locale');
@@ -198,6 +198,7 @@ public function deployDataProvider()
                 [
                     'strategy' =>  'compact',
                     'no-javascript' => false,
+                    'no-js-bundle' => false,
                     'no-html-minify' => false,
                     'refresh-content-version-only' => false,
                 ],
@@ -207,6 +208,7 @@ public function deployDataProvider()
                 [
                     'strategy' =>  'compact',
                     'no-javascript' => false,
+                    'no-js-bundle' => false,
                     'no-html-minify' => false,
                     'refresh-content-version-only' => false,
                     'content-version' =>  '123456',
@@ -226,25 +228,28 @@ public function deployDataProvider()
     public function testMaxExecutionTimeOptionPassed()
     {
         $options = [
-            DeployStaticOptions::MAX_EXECUTION_TIME => 100,
+            DeployStaticOptions::MAX_EXECUTION_TIME           => 100,
             DeployStaticOptions::REFRESH_CONTENT_VERSION_ONLY => false,
-            DeployStaticOptions::JOBS_AMOUNT => 3,
-            DeployStaticOptions::STRATEGY => 'compact',
-            DeployStaticOptions::NO_JAVASCRIPT => true,
-            DeployStaticOptions::NO_HTML_MINIFY => true,
+            DeployStaticOptions::JOBS_AMOUNT                  => 3,
+            DeployStaticOptions::STRATEGY                     => 'compact',
+            DeployStaticOptions::NO_JAVASCRIPT                => true,
+            DeployStaticOptions::NO_JS_BUNDLE                 => true,
+            DeployStaticOptions::NO_HTML_MINIFY               => true,
         ];
 
         $queueMock = $this->createMock(Queue::class);
         $strategyMock = $this->createMock(CompactDeploy::class);
         $this->queueFactory->expects($this->once())
             ->method('create')
-            ->with([
-                'logger' => $this->logger,
-                'maxExecTime' => 100,
-                'maxProcesses' => 3,
-                'options' => $options,
-                'deployPackageService' => null
-            ])
+            ->with(
+                [
+                    'logger'               => $this->logger,
+                    'maxExecTime'          => 100,
+                    'maxProcesses'         => 3,
+                    'options'              => $options,
+                    'deployPackageService' => null
+                ]
+            )
             ->willReturn($queueMock);
         $this->deployStrategyFactory->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
index 82b09f1095585..73d80c0ae4d57 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -13,8 +13,8 @@ use Magento\Framework\App\TemplateTypesInterface;
     <?= $block->getBlockHtml('formkey') ?>
     <fieldset class="admin__fieldset form-inline">
         <legend class="admin__legend"><span><?= $block->escapeHtml(__('Load Default Template')) ?></span></legend><br>
-        <div class="admin__field">
-            <label class="admin__field-label" for="template_select"><?= $block->escapeHtml(__('Template')) ?></label>
+        <div class="admin__field required">
+            <label class="admin__field-label" for="template_select"><span><?= $block->escapeHtml(__('Template')) ?></span></label>
             <div class="admin__field-control">
                 <select id="template_select" name="code" class="admin__control-select required-entry">
                     <?php foreach ($block->getTemplateOptions() as $group => $options) : ?>
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
index 50e71512c3d28..04a15179477d8 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
@@ -640,6 +640,9 @@ public function testGetUnknownEntity($entity)
         $import->getEntity();
     }
 
+    /**
+     * @return array
+     */
     public function unknownEntitiesProvider()
     {
         return [
diff --git a/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php b/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php
index f0243784dd618..34627fbb286ed 100644
--- a/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php
+++ b/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php
@@ -100,7 +100,7 @@ public function testCanShowBlock()
             ->method('isEnabled')
             ->with($this->catalogLayerMock, $filters)
             ->will($this->returnValue($enabled));
-        
+
         $category = $this->createMock(Category::class);
         $this->catalogLayerMock->expects($this->atLeastOnce())->method('getCurrentCategory')->willReturn($category);
         $category->expects($this->once())->method('getDisplayMode')->willReturn(Category::DM_PRODUCT);
@@ -119,12 +119,12 @@ public function testCanShowBlock()
     public function testCanShowBlockWithDifferentDisplayModes(string $mode, bool $result)
     {
         $filters = ['To' => 'be', 'or' => 'not', 'to' => 'be'];
-        
+
         $this->filterListMock->expects($this->atLeastOnce())->method('getFilters')
             ->with($this->catalogLayerMock)
             ->will($this->returnValue($filters));
         $this->assertEquals($filters, $this->model->getFilters());
-        
+
         $this->visibilityFlagMock
             ->expects($this->any())
             ->method('isEnabled')
@@ -137,6 +137,9 @@ public function testCanShowBlockWithDifferentDisplayModes(string $mode, bool $re
         $this->assertEquals($result, $this->model->canShowBlock());
     }
 
+    /**
+     * @return array
+     */
     public function canShowBlockDataProvider()
     {
         return [
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
index 55ca286ad3d47..2d33ca3c6a872 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
@@ -40,6 +40,7 @@
                     <argument name="id" xsi:type="string">accounts</argument>
                     <argument name="column_css_class" xsi:type="string">col-qty</argument>
                     <argument name="header_css_class" xsi:type="string">col-qty</argument>
+                    <argument name="sortable" xsi:type="string">0</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index 12e59e63f6f7c..1efa149b390ef 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -136,4 +136,12 @@ public function getFormValues()
     {
         return $this->_getAddress()->getData();
     }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getAddressStoreId()
+    {
+        return $this->_getAddress()->getOrder()->getStoreId();
+    }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index e4b9dd4c63b93..3fe943c1b194c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -271,21 +271,24 @@ protected function _prepareForm()
 
         $this->_form->setValues($this->getFormValues());
 
-        if ($this->_form->getElement('country_id')->getValue()) {
-            $countryId = $this->_form->getElement('country_id')->getValue();
-            $this->_form->getElement('country_id')->setValue(null);
-            foreach ($this->_form->getElement('country_id')->getValues() as $country) {
+        $countryElement = $this->_form->getElement('country_id');
+
+        $this->processCountryOptions($countryElement);
+
+        if ($countryElement->getValue()) {
+            $countryId = $countryElement->getValue();
+            $countryElement->setValue(null);
+            foreach ($countryElement->getValues() as $country) {
                 if ($country['value'] == $countryId) {
-                    $this->_form->getElement('country_id')->setValue($countryId);
+                    $countryElement->setValue($countryId);
                 }
             }
         }
-        if ($this->_form->getElement('country_id')->getValue() === null) {
-            $this->_form->getElement('country_id')->setValue(
+        if ($countryElement->getValue() === null) {
+            $countryElement->setValue(
                 $this->directoryHelper->getDefaultCountry($this->getStore())
             );
         }
-        $this->processCountryOptions($this->_form->getElement('country_id'));
         // Set custom renderer for VAT field if needed
         $vatIdElement = $this->_form->getElement('vat_id');
         if ($vatIdElement && $this->getDisplayVatValidationButton() !== false) {
@@ -309,7 +312,7 @@ protected function _prepareForm()
      */
     private function processCountryOptions(\Magento\Framework\Data\Form\Element\AbstractElement $countryElement)
     {
-        $storeId = $this->getBackendQuoteSession()->getStoreId();
+        $storeId = $this->getAddressStoreId();
         $options = $this->getCountriesCollection()
             ->loadByStore($storeId)
             ->toOptionArray();
@@ -388,4 +391,14 @@ public function getAddressAsString(\Magento\Customer\Api\Data\AddressInterface $
 
         return $this->escapeHtml($result);
     }
+
+    /**
+     * Return address store id.
+     *
+     * @return int
+     */
+    protected function getAddressStoreId()
+    {
+        return $this->getBackendQuoteSession()->getStoreId();
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php
index 94148cc515382..2b08daf02134e 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php
@@ -95,6 +95,11 @@ protected function setUp()
                 '_orderCreate' => $this->orderCreate
             ]
         );
+
+        // Do not display VAT validation button on edit order address form
+        // Emulate fix done in controller
+        /** @see \Magento\Sales\Controller\Adminhtml\Order\Address::execute */
+        $this->addressBlock->setDisplayVatValidationButton(false);
     }
 
     public function testGetForm()
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
index 39c54be0d9c08..bd6487caff7dd 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
@@ -1253,6 +1253,9 @@ public function testGetCreatedAtFormattedUsesCorrectLocale()
         $this->order->getCreatedAtFormatted(\IntlDateFormatter::SHORT);
     }
 
+    /**
+     * @return array
+     */
     public function notInvoicingStatesProvider()
     {
         return [
@@ -1262,6 +1265,9 @@ public function notInvoicingStatesProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function canNotCreditMemoStatesProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
index 99a411c43c247..30513571fb71d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
@@ -103,6 +103,9 @@ public function testCheck(
         $this->assertEquals($expectedState, $this->orderMock->getState());
     }
 
+    /**
+     * @return array
+     */
     public function stateCheckDataProvider()
     {
         return [
diff --git a/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php b/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php
index 982d00bd9f648..748e441652f72 100644
--- a/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php
@@ -50,6 +50,9 @@ public function testGetPageSize($searchEngine, $size)
         $this->assertEquals($size, $this->model->getMaxPageSize());
     }
 
+    /**
+     * @return array
+     */
     public function getPageSizeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php b/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
index 77ccce5d23bde..f732871114061 100644
--- a/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
+++ b/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
@@ -44,6 +44,7 @@ public function __construct(
 
     /**
      * Return whole scopes config data from db.
+     *
      * Ignore $path argument due to config source must return all config data
      *
      * @param string $path
@@ -64,6 +65,8 @@ public function get($path = '')
     }
 
     /**
+     * Retrieve default connection
+     *
      * @return AdapterInterface
      */
     private function getConnection()
@@ -83,12 +86,17 @@ private function getConnection()
      */
     private function getEntities($table, $keyField)
     {
-        $entities = $this->getConnection()->fetchAll(
-            $this->getConnection()->select()->from($this->resourceConnection->getTableName($table))
-        );
         $data = [];
-        foreach ($entities as $entity) {
-            $data[$entity[$keyField]] = $entity;
+        $tableName = $this->resourceConnection->getTableName($table);
+        // Check if db table exists before fetch data
+        if ($this->resourceConnection->getConnection()->isTableExists($tableName)) {
+            $entities = $this->getConnection()->fetchAll(
+                $this->getConnection()->select()->from($tableName)
+            );
+
+            foreach ($entities as $entity) {
+                $data[$entity[$keyField]] = $entity;
+            }
         }
 
         return $data;
diff --git a/app/code/Magento/Store/Model/ResourceModel/Store.php b/app/code/Magento/Store/Model/ResourceModel/Store.php
index 88d7b5d8216fe..7a2821987f9bf 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Store.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Store.php
@@ -166,11 +166,16 @@ protected function _changeGroup(\Magento\Framework\Model\AbstractModel $model)
      */
     public function readAllStores()
     {
-        $select = $this->getConnection()
-            ->select()
-            ->from($this->getTable('store'));
+        $stores = [];
+        if ($this->getConnection()->isTableExists($this->getMainTable())) {
+            $select = $this->getConnection()
+                ->select()
+                ->from($this->getTable($this->getMainTable()));
 
-        return $this->getConnection()->fetchAll($select);
+            $stores = $this->getConnection()->fetchAll($select);
+        }
+
+        return $stores;
     }
 
     /**
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website.php b/app/code/Magento/Store/Model/ResourceModel/Website.php
index d6fefd60ae54a..431a9d62e7c39 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Website.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Website.php
@@ -47,12 +47,15 @@ protected function _initUniqueFields()
     public function readAllWebsites()
     {
         $websites = [];
-        $select = $this->getConnection()
-            ->select()
-            ->from($this->getTable('store_website'));
+        $tableName = $this->getMainTable();
+        if ($this->getConnection()->isTableExists($tableName)) {
+            $select = $this->getConnection()
+                ->select()
+                ->from($tableName);
 
-        foreach ($this->getConnection()->fetchAll($select) as $websiteData) {
-            $websites[$websiteData['code']] = $websiteData;
+            foreach ($this->getConnection()->fetchAll($select) as $websiteData) {
+                $websites[$websiteData['code']] = $websiteData;
+            }
         }
 
         return $websites;
@@ -115,6 +118,7 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
 
     /**
      * Retrieve default stores select object
+     *
      * Select fields website_id, store_id
      *
      * @param bool $includeDefault include/exclude default admin website
diff --git a/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php b/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
index ba06d191c9f71..a8f76d0a28fee 100644
--- a/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
+++ b/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
@@ -53,11 +53,11 @@ public function setUp()
 
     public function testGet()
     {
-        $this->deploymentConfig->expects($this->once())
+        $this->deploymentConfig->expects($this->any())
             ->method('get')
             ->with('db')
             ->willReturn(true);
-        $this->resourceConnection->expects($this->once())->method('getConnection')->willReturn($this->connection);
+        $this->resourceConnection->expects($this->any())->method('getConnection')->willReturn($this->connection);
 
         $selectMock = $this->getMockBuilder(Select::class)->disableOriginalConstructor()->getMock();
         $selectMock->expects($this->any())->method('from')->willReturnSelf();
diff --git a/app/code/Magento/Store/Test/Unit/Model/ResourceModel/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/ResourceModel/StoreTest.php
new file mode 100644
index 0000000000000..926764b989686
--- /dev/null
+++ b/app/code/Magento/Store/Test/Unit/Model/ResourceModel/StoreTest.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ResourceModel\Store;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+class StoreTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var Store */
+    protected $model;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resourceMock;
+
+    /** @var  Select | \PHPUnit_Framework_MockObject_MockObject */
+    protected $select;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionMock;
+
+    public function setUp()
+    {
+        $objectManagerHelper = new ObjectManager($this);
+        $this->select =  $this->createMock(Select::class);
+        $this->resourceMock = $this->createPartialMock(
+            ResourceConnection::class,
+            [
+                'getConnection',
+                'getTableName'
+            ]
+        );
+        $this->connectionMock = $this->createPartialMock(
+            \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
+            [
+                'isTableExists',
+                'select',
+                'fetchAll',
+                'fetchOne',
+                'from',
+                'getCheckSql',
+                'where',
+                'quoteIdentifier',
+                'quote'
+            ]
+        );
+
+        $contextMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\Context::class);
+        $contextMock->expects($this->once())->method('getResources')->willReturn($this->resourceMock);
+        $configCacheTypeMock = $this->createMock('\Magento\Framework\App\Cache\Type\Config');
+        $this->model = $objectManagerHelper->getObject(
+            Store::class,
+            [
+                'context' => $contextMock,
+                'configCacheType' => $configCacheTypeMock
+            ]
+        );
+    }
+
+    public function testCountAll($countAdmin = false)
+    {
+        $mainTable = 'store';
+        $tableIdentifier = 'code';
+        $tableIdentifierValue = 'admin';
+        $count = 1;
+
+        $this->resourceMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->resourceMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->select->expects($this->once())
+            ->method('from')
+            ->with($mainTable, 'COUNT(*)')
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->any())
+            ->method('quoteIdentifier')
+            ->with($tableIdentifier)
+            ->willReturn($tableIdentifier);
+
+        $this->connectionMock->expects($this->once())
+            ->method('quote')
+            ->with($tableIdentifierValue)
+            ->willReturn($tableIdentifierValue);
+
+        $this->select->expects($this->any())
+            ->method('where')
+            ->with(sprintf('%s <> %s', $tableIdentifier, $tableIdentifierValue))
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('fetchOne')
+            ->with($this->select)
+            ->willReturn($count);
+
+        $this->assertEquals($count, $this->model->countAll($countAdmin));
+    }
+
+    public function testReadAllStores()
+    {
+        $mainTable = 'store';
+        $data = [
+            ["store_id" => "0", "code" => "admin", "website_id" => 0, "name" => "Admin"],
+            ["store_id" => "1", "code" => "default", "website_id" => 1, "name" => "Default Store View"]
+        ];
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->connectionMock->expects($this->once())
+            ->method('isTableExists')
+            ->with($mainTable)
+            ->willReturn(true);
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->select->expects($this->once())
+            ->method('from')
+            ->with($mainTable)
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('fetchAll')
+            ->with($this->select)
+            ->willReturn($data);
+
+        $this->assertEquals($data, $this->model->readAllStores());
+    }
+
+    public function testReadAllStoresNoDbTable()
+    {
+        $mainTable = 'no_store_table';
+        $data = [];
+
+        $this->resourceMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->resourceMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->connectionMock->expects($this->once())
+            ->method('isTableExists')
+            ->with($mainTable)
+            ->willReturn(false);
+
+        $this->connectionMock->expects($this->never())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->select->expects($this->never())
+            ->method('from')
+            ->with($mainTable)
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->never())
+            ->method('fetchAll')
+            ->with($this->select)
+            ->willReturn($data);
+
+        $this->assertEquals($data, $this->model->readAllStores());
+    }
+}
diff --git a/app/code/Magento/Store/Test/Unit/Model/ResourceModel/WebsiteTest.php b/app/code/Magento/Store/Test/Unit/Model/ResourceModel/WebsiteTest.php
new file mode 100644
index 0000000000000..5fd5aa09a46be
--- /dev/null
+++ b/app/code/Magento/Store/Test/Unit/Model/ResourceModel/WebsiteTest.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ResourceModel\Website;
+
+class WebsiteTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var  Website */
+    protected $model;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resourceMock;
+
+    /** @var  Select | \PHPUnit_Framework_MockObject_MockObject */
+    protected $select;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionMock;
+
+    public function setUp()
+    {
+        $objectManagerHelper = new ObjectManager($this);
+        $this->select =  $this->createMock(\Magento\Framework\DB\Select::class);
+        $this->resourceMock = $this->createPartialMock(
+            ResourceConnection::class,
+            [
+                'getConnection',
+                'getTableName'
+            ]
+        );
+        $this->connectionMock = $this->createPartialMock(
+            \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
+            [
+                'isTableExists',
+                'select',
+                'fetchAll',
+                'fetchOne',
+                'from',
+                'getCheckSql',
+                'joinLeft',
+                'where'
+            ]
+        );
+        $contextMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\Context::class);
+        $contextMock->expects($this->once())->method('getResources')->willReturn($this->resourceMock);
+        $this->model = $objectManagerHelper->getObject(
+            Website::class,
+            [
+            'context' => $contextMock
+            ]
+        );
+    }
+
+    public function testReadAllWebsites()
+    {
+        $data = [
+            "admin" => ["website_id" => "0", "code" => "admin", "name" => "Admin"],
+            "base" => ["website_id" => "1", "code" => "base", "name" => "Main Website"]
+        ];
+        $mainTable = 'store_website';
+
+        $this->resourceMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('isTableExists')
+            ->with($mainTable)
+            ->willReturn(true);
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->select->expects($this->once())
+            ->method('from')
+            ->with($mainTable)
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('fetchAll')
+            ->with($this->select)
+            ->willReturn($data);
+
+        $this->assertEquals($data, $this->model->readAllWebsites());
+    }
+
+    public function testReadAllWebsitesNoDbTable()
+    {
+        $data = [];
+        $mainTable = 'no_store_website_table';
+
+        $this->resourceMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('isTableExists')
+            ->with($mainTable)
+            ->willReturn(false);
+
+        $this->connectionMock->expects($this->never())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->select->expects($this->never())
+            ->method('from')
+            ->with($mainTable)
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->never())
+            ->method('fetchAll')
+            ->with($this->select)
+            ->willReturn($data);
+
+        $this->assertEquals($data, $this->model->readAllWebsites());
+    }
+
+    public function testGetDefaultStoresSelect($includeDefault = false)
+    {
+        $storeId = 1;
+        $storeWebsiteTable = 'store_website';
+        $storeGroupTable = 'store_group';
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('getCheckSql')
+            ->with(
+                'store_group_table.default_store_id IS NULL',
+                '0',
+                'store_group_table.default_store_id'
+            )
+            ->willReturn($storeId);
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getTableName')
+            ->withConsecutive([$storeWebsiteTable], [$storeGroupTable])
+            ->willReturnOnConsecutiveCalls($storeWebsiteTable, $storeGroupTable);
+
+        $this->select->expects($this->once())
+            ->method('from')
+            ->with(
+                ['website_table' => $storeWebsiteTable],
+                ['website_id']
+            )
+            ->willReturnSelf();
+
+        $this->select->expects($this->once())
+            ->method('joinLeft')
+            ->with(
+                ['store_group_table' => $storeGroupTable],
+                'website_table.website_id=store_group_table.website_id' .
+                ' AND website_table.default_group_id = store_group_table.group_id',
+                ['store_id' => $storeId]
+            )
+            ->willReturnSelf();
+
+        $this->assertInstanceOf('\Magento\Framework\DB\Select', $this->model->getDefaultStoresSelect($includeDefault));
+    }
+
+    public function testCountAll($includeDefault = false)
+    {
+        $count = 2;
+        $mainTable = 'store_website';
+
+        $this->resourceMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->resourceMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->select->expects($this->once())
+            ->method('from')
+            ->with($mainTable, 'COUNT(*)')
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('fetchOne')
+            ->with($this->select)
+            ->willReturn($count);
+
+        $this->assertEquals($count, $this->model->countAll($includeDefault));
+    }
+}
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Node.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Node.js
index 41cc0d9813bfa..58074216458ee 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Node.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Node.js
@@ -197,7 +197,7 @@
 		},
 
 		/**
-		 * Wraps the node in in another node.
+		 * Wraps the node in another node.
 		 *
 		 * @example
 		 * node.wrap(wrapperNode);
diff --git a/app/functions.php b/app/functions.php
index 4b00d01819f70..6b3dae71c42c6 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -13,6 +13,9 @@
  * @return \Magento\Framework\Phrase
  */
 if (!function_exists('__')) {
+    /**
+     * @return \Magento\Framework\Phrase
+     */
     function __()
     {
         $argc = func_get_args();
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/DeployTest.php b/dev/tests/integration/testsuite/Magento/Deploy/DeployTest.php
index ea155894d7299..a9591f1968ef7 100644
--- a/dev/tests/integration/testsuite/Magento/Deploy/DeployTest.php
+++ b/dev/tests/integration/testsuite/Magento/Deploy/DeployTest.php
@@ -71,6 +71,7 @@ class DeployTest extends \PHPUnit\Framework\TestCase
     private $options = [
         Options::DRY_RUN => false,
         Options::NO_JAVASCRIPT => false,
+        Options::NO_JS_BUNDLE => false,
         Options::NO_CSS => false,
         Options::NO_LESS => false,
         Options::NO_IMAGES => false,
@@ -100,9 +101,10 @@ protected function setUp()
         $this->rootDir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
 
         $logger = $objectManager->get(\Psr\Log\LoggerInterface::class);
-        $this->deployService = $objectManager->create(DeployStaticContent::class, [
-            'logger' => $logger
-        ]);
+        $this->deployService = $objectManager->create(
+            DeployStaticContent::class,
+            ['logger' => $logger]
+        );
 
         $this->bundleConfig = $objectManager->create(BundleConfig::class);
         $this->config = $objectManager->create(View::class);
diff --git a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
index f15ce494e9bb4..e15a5151942f0 100644
--- a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
+++ b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
@@ -32,7 +32,7 @@ class InvalidRequestException extends RuntimeException
     /**
      * @param ResponseInterface|ResultInterface|NotFoundException $replaceResult
      * Use this result instead of calling an action instance,
-     * if NotFoundException is given the the default 404 mechanism will be triggered.
+     * if NotFoundException is given the default 404 mechanism will be triggered.
      * @param Phrase[]|null $messages Messages to show to client
      * as error messages.
      */
@@ -45,6 +45,8 @@ public function __construct($replaceResult, ?array $messages = null)
     }
 
     /**
+     * Return replaced result
+     *
      * @return ResponseInterface|ResultInterface|NotFoundException
      */
     public function getReplaceResult()
@@ -53,6 +55,8 @@ public function getReplaceResult()
     }
 
     /**
+     * Return messages
+     *
      * @return Phrase[]|null
      */
     public function getMessages(): ?array
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
index 452357003630c..4fc9ec992a3ef 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
@@ -28,6 +28,11 @@ protected function setUp()
         $this->key = substr(__CLASS__, -32, 32);
     }
 
+    /**
+     * @param int $length
+     *
+     * @return string
+     */
     protected function getRandomString(int $length): string
     {
         $result = '';
@@ -48,18 +53,33 @@ private function requireCipherInfo()
         }
     }
 
+    /**
+     * @param string $cipherName
+     * @param string $modeName
+     *
+     * @return int
+     */
     private function getKeySize(string $cipherName, string $modeName): int
     {
         $this->requireCipherInfo();
         return self::$cipherInfo[$cipherName][$modeName]['key_size'];
     }
 
+    /**
+     * @param string $cipherName
+     * @param string $modeName
+     *
+     * @return int
+     */
     private function getInitVectorSize(string $cipherName, string $modeName): int
     {
         $this->requireCipherInfo();
         return self::$cipherInfo[$cipherName][$modeName]['iv_size'];
     }
 
+    /**
+     * @return array
+     */
     public function getCipherModeCombinations(): array
     {
         $result = [];
@@ -87,6 +107,9 @@ public function testConstructor(string $cipher, string $mode)
         $this->assertEquals($initVector, $crypt->getInitVector());
     }
 
+    /**
+     * @return array
+     */
     public function getConstructorExceptionData(): array
     {
         $key = substr(__CLASS__, -32, 32);
@@ -130,6 +153,9 @@ public function testConstructorDefaults()
         $this->assertEquals($cryptExpected->getInitVector(), $cryptActual->getInitVector());
     }
 
+    /**
+     * @return array
+     */
     public function getCryptData(): array
     {
         $fixturesFilename = __DIR__ . '/../Crypt/_files/_crypt_fixtures.php';
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php
index 85faa0aa4676f..b7a9ae3bc1e38 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php
@@ -33,6 +33,9 @@ public function testIsValid($key, $expected = true)
         $this->assertEquals($expected, $this->keyValidator->isValid($key));
     }
 
+    /**
+     * @return array
+     */
     public function isValidDataProvider() : array
     {
         return [
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
index 2fdb3df5f6d71..2c498b0b7fd03 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
@@ -31,7 +31,7 @@ public function __construct(
     }
 
     /**
-     * Check the the environment config to determine if introspection should be disabled.
+     * Check the environment config to determine if introspection should be disabled.
      *
      * @return bool
      */
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php
index b55ace9bdec3d..60bbc092469c6 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php
@@ -210,6 +210,11 @@ public function testMultiDimensionProviderWithMixedDataProvider()
         }
     }
 
+    /**
+     * @param $dimensions
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
     private function getDimensionProviderMock($dimensions)
     {
         $dimensionProviderMock = $this->getMockBuilder(DimensionProviderInterface::class)
@@ -233,6 +238,12 @@ function () use ($dimensions) {
         return $dimensionProviderMock;
     }
 
+    /**
+     * @param string $name
+     * @param string $value
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
     private function getDimensionMock(string $name, string $value)
     {
         $dimensionMock = $this->getMockBuilder(Dimension::class)
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
index c867dced0fc6e..f6bf61708dd80 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
@@ -17,7 +17,7 @@ class JsonHexTagTest extends \PHPUnit\Framework\TestCase
      * @var \Magento\Framework\Serialize\Serializer\Json
      */
     private $json;
-    
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -37,6 +37,9 @@ public function testSerialize($value, $expected)
         );
     }
 
+    /**
+     * @return array
+     */
     public function serializeDataProvider()
     {
         $dataObject = new DataObject(['something']);
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php
index 9d431c30f001d..3b8d301fb3d0e 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php
@@ -99,6 +99,12 @@ public function generateCachePerScope(
         foreach (array_keys($areaConfig->getVirtualTypes()) as $virtualType) {
             $config['instanceTypes'][$virtualType] = $areaConfig->getInstanceType($virtualType);
         }
+
+        // sort configuration to have it in the same order on every build
+        ksort($config['arguments']);
+        ksort($config['preferences']);
+        ksort($config['instanceTypes']);
+
         return $config;
     }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php
index 16577ed2db738..23879bf005f85 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php
@@ -49,6 +49,9 @@ public function testExecute(array $currentConfig, array $correctConfig, string $
         $this->assertEquals($expectedOutput, $tester->getDisplay());
     }
 
+    /**
+     * @return array
+     */
     public function executeDataProvider()
     {
         $successMessage = 'The modules configuration is up to date.' . PHP_EOL;
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php
index aa16ea1f8cd60..6050122d78521 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php
@@ -294,6 +294,13 @@ public function testIndexAction()
         $this->assertInstanceOf(\Zend\View\Model\JsonModel::class, $model);
     }
 
+    /**
+     * @param \PHPUnit\Framework\MockObject\MockObject $request
+     * @param \PHPUnit\Framework\MockObject\MockObject $response
+     * @param \PHPUnit\Framework\MockObject\MockObject $routeMatch
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
     protected function getMvcEventMock(
         MockObject $request,
         MockObject $response,