diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
index c51b357091bda..9a3c941fdc9ed 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
@@ -4,45 +4,52 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
+/**
+ * @var SecureHtmlRenderer $secureRenderer
+ * @var Escaper $escaper
+ */
 ?>
-<!-- <?php if ($block->getTitle()): ?>
-    <h3><?= $block->escapeHtml($block->getTitle()) ?></h3>
-<?php endif ?> -->
 <?php if (!empty($tabs)): ?>
-<div id="<?=  $block->escapeHtmlAttr($block->getId()) ?>">
+    <?php $blockId = $block->getId() ?>
+<div id="<?= $escaper->escapeHtmlAttr($blockId) ?>" class="hidden">
 <ul  class="tabs-horiz">
     <?php foreach ($tabs as $_tab): ?>
+        <?php $tabId = $block->getTabId($_tab) ?>
         <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' .
             (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
         <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
         <?php $_tabHref = $block->getTabUrl($_tab) == '#' ?
-            '#' . $block->getTabId($_tab) . '_content' :
+            '#' . $tabId . '_content' :
             $block->getTabUrl($_tab) ?>
     <li>
-        <a href="<?= $block->escapeUrl($_tabHref) ?>"
-           id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
-           title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
-           class="<?= $block->escapeHtmlAttr($_tabClass) ?>"
-           data-tab-type="<?= $block->escapeHtmlAttr($_tabType) ?>">
+        <a href="<?= $escaper->escapeUrl($_tabHref) ?>"
+           id="<?= $escaper->escapeHtmlAttr($tabId) ?>"
+           title="<?= $escaper->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
+           class="<?= $escaper->escapeHtmlAttr($_tabClass) ?>"
+           data-tab-type="<?= $escaper->escapeHtmlAttr($_tabType) ?>">
             <span>
                 <span class="changed"
-                      title="<?= $block->escapeHtmlAttr(__('The information in this tab has been changed.')) ?>"></span>
+                      title="<?= $escaper->escapeHtmlAttr(__(
+                          'The information in this tab has been changed.'
+                      )) ?>"></span>
                 <span class="error"
-                      title="<?= $block->escapeHtmlAttr(__(
+                      title="<?= $escaper->escapeHtmlAttr(__(
                           'This tab contains invalid data. Please resolve this before saving.'
                       )) ?>"></span>
                 <span class="loader"
-                      title="<?= $block->escapeHtmlAttr(__('Loading...')) ?>"></span>
-                <?= $block->escapeHtml($block->getTabLabel($_tab)) ?>
+                      title="<?= $escaper->escapeHtmlAttr(__('Loading...')) ?>"></span>
+                <?= $escaper->escapeHtml($block->getTabLabel($_tab)) ?>
             </span>
         </a>
-        <div id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content">
+        <div id="<?= $escaper->escapeHtmlAttr($tabId) ?>_content">
             <?= /* @noEscape */ $block->getTabContent($_tab) ?>
         </div>
         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
             'display:none',
-            '#' . $block->escapeJs($block->getTabId($_tab)) . '_content'
+            '#' . $escaper->escapeJs($tabId) . '_content'
         ); ?>
     </li>
     <?php endforeach; ?>
@@ -51,11 +58,12 @@
     <?php $scriptString = <<<script
 require(["jquery","mage/backend/tabs"], function($){
     $(function() {
-        $('#{$block->getId()}').tabs({
-            active: '{$block->getActiveTabId()}',
-            destination: '#{$block->getDestElementId()}',
+        $('#{$escaper->escapeJs($blockId)}').tabs({
+            active: '{$escaper->escapeJs($block->getActiveTabId())}',
+            destination: '#{$escaper->escapeJs($block->getDestElementId())}',
             shadowTabs: {$block->getAllShadowTabs()}
         });
+        $('#{$escaper->escapeJs($blockId)}').removeClass('hidden');
     });
 });
 script;
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicPriceProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicPriceProductTest.xml
new file mode 100644
index 0000000000000..8b50fffec091f
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicPriceProductTest.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteBundleDynamicPriceProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Delete products"/>
+            <title value="Delete Bundle Dynamic Product"/>
+            <description value="Admin should be able to delete a bundle dynamic product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-26056"/>
+            <group value="mtf_migrated"/>
+            <group value="bundle"/>
+        </annotations>
+        <before>
+            <!-- Create category and simple product -->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+
+            <!-- Create bundle product -->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createDynamicBundleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createNewBundleLink">
+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="createSimpleProduct"/>
+            </createData>
+            <!-- TODO: Remove this action when MC-37719 will be fixed -->
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
+                <argument name="indices" value="cataloginventory_stock"/>
+            </actionGroup>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteBundleProductBySku">
+            <argument name="sku" value="$createDynamicBundleProduct.sku$"/>
+        </actionGroup>
+        <!-- Verify product on Product Page -->
+        <amOnPage url="{{StorefrontProductPage.url($createDynamicBundleProduct.custom_attributes[url_key]$)}}" stepKey="openBundleProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoopsMessage"/>
+        <!-- Search for the product by sku -->
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchBySku">
+            <argument name="query" value="$createDynamicBundleProduct.sku$"/>
+        </actionGroup>
+         <!-- Should not see bundle product -->
+        <dontSee userInput="$createDynamicBundleProduct.sku$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($createCategory.custom_attributes[url_key]$)}}" stepKey="openCategoryPage"/>
+        <!-- Should not see any products in category -->
+        <dontSee userInput="$createDynamicBundleProduct.name$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
index a2f26e235fc23..7973860e4d5c5 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
@@ -7,17 +7,17 @@
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminDeleteBundleDynamicProductTest">
+    <test name="AdminDeleteBundleDynamicProductTest" deprecated="Use AdminDeleteBundleDynamicPriceProductTest instead">
         <annotations>
             <features value="Bundle"/>
             <stories value="Delete products"/>
-            <title value="Delete Bundle Dynamic Product"/>
-            <description value="Admin should be able to delete a bundle dynamic product"/>
+            <title value="Deprecated. Delete Bundle Dynamic Product"/>
+            <description value="Deprecated. Admin should be able to delete a bundle dynamic product"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-11016"/>
             <group value="mtf_migrated"/>
             <skip>
-                <issueId value="MC-16393"/>
+                <issueId value="DEPRECATED">Use AdminDeleteBundleDynamicPriceProductTest instead</issueId>
             </skip>
         </annotations>
         <before>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.xml
index c6f0c3332b1d5..38193fe547e52 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.xml
@@ -8,6 +8,10 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOpenAttributeSetGridPageActionGroup">
+        <annotations>
+            <description>Open the Attribute Sets grid page.</description>
+        </annotations>
+
         <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetPage"/>
         <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
     </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/GoToAttributeGridPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/GoToAttributeGridPageActionGroup.xml
index 2b5fe9d76875c..6e44c33d81ba4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/GoToAttributeGridPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/GoToAttributeGridPageActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="GoToAttributeGridPageActionGroup">
+    <actionGroup name="GoToAttributeGridPageActionGroup" deprecated="Use AdminOpenAttributeSetGridPageActionGroup instead.">
         <annotations>
             <description>Goes to the Attribute Sets grid page.</description>
         </annotations>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml
index 66d695cbb2025..67e8bc6bf183c 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml
@@ -32,7 +32,7 @@
 
             <!-- Assign attribute to set -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="GoToAttributeGridPageActionGroup" stepKey="goToAttributeSetPage"/>
+            <actionGroup ref="AdminOpenAttributeSetGridPageActionGroup" stepKey="goToAttributeSetPage"/>
             <actionGroup ref="GoToAttributeSetByNameActionGroup" stepKey="openAttributeSetByName">
                 <argument name="name" value="$createAttributeSet.attribute_set_name$"/>
             </actionGroup>
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index ae88b24bd2682..0cc108e5bed8b 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -22,6 +22,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  *
  * @api
  * @since 100.0.2
@@ -152,6 +153,11 @@ class Storage extends \Magento\Framework\DataObject
      */
     private $ioFile;
 
+    /**
+     * @var \Magento\Framework\File\Mime|null
+     */
+    private $mime;
+
     /**
      * Construct
      *
@@ -174,6 +180,7 @@ class Storage extends \Magento\Framework\DataObject
      * @param \Magento\Framework\Filesystem\DriverInterface $file
      * @param \Magento\Framework\Filesystem\Io\File|null $ioFile
      * @param \Psr\Log\LoggerInterface|null $logger
+     * @param \Magento\Framework\File\Mime $mime
      *
      * @throws \Magento\Framework\Exception\FileSystemException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -197,7 +204,8 @@ public function __construct(
         array $data = [],
         \Magento\Framework\Filesystem\DriverInterface $file = null,
         \Magento\Framework\Filesystem\Io\File $ioFile = null,
-        \Psr\Log\LoggerInterface $logger = null
+        \Psr\Log\LoggerInterface $logger = null,
+        \Magento\Framework\File\Mime $mime = null
     ) {
         $this->_session = $session;
         $this->_backendUrl = $backendUrl;
@@ -217,6 +225,7 @@ public function __construct(
         $this->_dirs = $dirs;
         $this->file = $file ?: ObjectManager::getInstance()->get(\Magento\Framework\Filesystem\Driver\File::class);
         $this->ioFile = $ioFile ?: ObjectManager::getInstance()->get(\Magento\Framework\Filesystem\Io\File::class);
+        $this->mime = $mime ?: ObjectManager::getInstance()->get(\Magento\Framework\File\Mime::class);
         parent::__construct($data);
     }
 
@@ -362,7 +371,7 @@ public function getFilesCollection($path, $type = null)
             $item->setUrl($this->_cmsWysiwygImages->getCurrentUrl() . $item->getBasename());
             $itemStats = $this->file->stat($item->getFilename());
             $item->setSize($itemStats['size']);
-            $item->setMimeType(\mime_content_type($item->getFilename()));
+            $item->setMimeType($this->mime->getMimeType($item->getFilename()));
 
             if ($this->isImage($item->getBasename())) {
                 $thumbUrl = $this->getThumbnailUrl($item->getFilename(), true);
@@ -647,7 +656,7 @@ public function resizeFile($source, $keepRatio = true)
         $image->keepAspectRatio($keepRatio);
 
         list($imageWidth, $imageHeight) = $this->getResizedParams($source);
-        
+
         $image->resize($imageWidth, $imageHeight);
         $dest = $targetDir . '/' . $this->ioFile->getPathInfo($source)['basename'];
         $image->save($dest);
@@ -670,7 +679,7 @@ private function getResizedParams(string $source): array
 
         //phpcs:ignore Generic.PHP.NoSilencedErrors
         list($imageWidth, $imageHeight) = @getimagesize($source);
-     
+
         if ($imageWidth && $imageHeight) {
             $imageWidth = $configWidth > $imageWidth ? $imageWidth : $configWidth;
             $imageHeight = $configHeight > $imageHeight ? $imageHeight : $configHeight;
@@ -679,7 +688,7 @@ private function getResizedParams(string $source): array
         }
         return [$configWidth, $configHeight];
     }
-    
+
     /**
      * Resize images on the fly in controller action
      *
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
index d644b581088bc..8277cdd64928a 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
@@ -11,6 +11,7 @@
     <section name="AdminCustomerGridMainActionsSection">
         <element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
         <element name="multicheck" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>label"/>
+        <element name="multicheckTick" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>input"/>
         <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
         <element name="actions" type="text" selector=".action-select"/>
         <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{arg}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']//input" parameterized="true"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSearchSelectAllTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSearchSelectAllTest.xml
new file mode 100644
index 0000000000000..64e9f6d10bdb3
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSearchSelectAllTest.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminGridSearchSelectAllTest">
+        <annotations>
+            <stories value="Selection should be removed during search."/>
+            <title value="Selection should be removed during search."/>
+            <description value="Empty selected before and after search, like it works for filter"/>
+            <testCaseId value="MC-37659"/>
+            <severity value="CRITICAL"/>
+            <group value="uI"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <!--Create three customers-->
+            <createData entity="Simple_US_Customer" stepKey="firstCustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="secondCustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="thirdCustomer"/>
+        </before>
+        <after>
+            <!--Remove two created customers, third already deleted-->
+            <deleteData createDataKey="firstCustomer" stepKey="deleteFirstCustomer"/>
+            <deleteData createDataKey="secondCustomer" stepKey="deleteSecondCustomer"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomerPage"/>
+        <!-- search Admin Data Grid By Keyword -->
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="$$secondCustomer.email$$" stepKey="fillKeywordSearchFieldWithSecondCustomerEmail"/>
+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <!-- Select all from dropdown -->
+        <actionGroup ref="AdminGridSelectAllActionGroup" stepKey="selectAllCustomers"/>
+        <!-- Clear searching By Keyword-->
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFiltersAfterSearch"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterSearchRemoved"/>
+        <!-- Check if selection has bee removed -->
+        <dontSeeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.customerCheckbox($$secondCustomer.email$$)}}" stepKey="checkSecondCustomerCheckboxIsUnchecked"/>
+        <!-- Check delete action -->
+        <click selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(($$thirdCustomer.email$$)}}" stepKey="selectThirdCustomer"/>
+        <seeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.customerCheckbox($$thirdCustomer.email$$)}}" stepKey="checkThirdCustomerIsChecked"/>
+        <!-- Use delete action for selected -->
+        <click selector="{{AdminCustomerGridMainActionsSection.actions}}" stepKey="clickActions"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="clickDelete"/>
+        <waitForAjaxLoad stepKey="waitForLoadConfirmation"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+        <!-- Check if only one record record has been deleted -->
+        <see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) were deleted" stepKey="seeSuccess"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml
new file mode 100644
index 0000000000000..bfc49fd476dd0
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminGridSelectAllOnPageTest">
+        <annotations>
+            <stories value="Toggle select page."/>
+            <title value="Toggle select page."/>
+            <description value="Empty selected before and after search, like it works for filter"/>
+            <testCaseId value="MC-37660"/>
+            <severity value="CRITICAL"/>
+            <group value="uI"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <!--Create three customers-->
+            <createData entity="Simple_US_Customer" stepKey="firstCustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="secondCustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="thirdCustomer"/>
+        </before>
+        <after>
+            <!--Remove created customers -->
+            <deleteData createDataKey="firstCustomer" stepKey="deleteFirstCustomer"/>
+            <deleteData createDataKey="secondCustomer" stepKey="deleteSecondCustomer"/>
+            <deleteData createDataKey="thirdCustomer" stepKey="deleteThirdCustomer"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomerPage"/>
+        <!-- Select all from dropdown -->
+        <actionGroup ref="AdminGridSelectAllActionGroup" stepKey="selectAllCustomers"/>
+        <!-- Deselect third customer -->
+        <click selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(($$thirdCustomer.email$$)}}" stepKey="selectThirdCustomer"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.customerCheckbox($$thirdCustomer.email$$)}}" stepKey="checkThirdCustomerCheckboxIsUnchecked"/>
+        <!-- Click select all on page checkbox -->
+        <actionGroup ref="AdminSelectAllCustomers" stepKey="selectAllCustomersOnPage"/>
+        <seeElement selector="{{AdminCustomerGridMainActionsSection.multicheckTick}}" stepKey="waitForElement"/>
+        <seeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.multicheckTick}}" stepKey="checkAllSelectedCheckBoxIsChecked"/>
+        <!-- Check all created records selected -->
+        <seeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.customerCheckbox($$firstCustomer.email$$)}}" stepKey="checkFirstCustomerIsCheckedAfterSelectPage"/>
+        <seeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.customerCheckbox($$secondCustomer.email$$)}}" stepKey="checkSecondCustomerIsCheckedAfterSelectPage"/>
+        <seeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.customerCheckbox($$thirdCustomer.email$$)}}" stepKey="checkThirdCustomerIsCheckedAfterSelectPage"/>
+        <!-- Click deselect all on page checkbox -->
+        <actionGroup ref="AdminSelectAllCustomers" stepKey="deselectAllCustomersCheckbox"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.multicheckTick}}" stepKey="checkAllSelectedCheckBoxUnchecked"/>
+        <!-- Check all created records unselected -->
+        <dontSeeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.customerCheckbox($$firstCustomer.email$$)}}" stepKey="checkFirstCustomerIsUncheckedAfterSelectPage"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.customerCheckbox($$secondCustomer.email$$)}}" stepKey="checkSecondCustomerIsUncheckedAfterSelectPage"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCustomerGridMainActionsSection.customerCheckbox($$thirdCustomer.email$$)}}" stepKey="checkThirdCustomerIsUncheckedAfterSelectPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js
index aa8c199e4f261..1578677414b78 100644
--- a/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js
+++ b/app/code/Magento/Customer/view/adminhtml/web/js/form/components/insert-listing.js
@@ -72,7 +72,7 @@ define([
         },
 
         /**
-         * Delete customer address by ids
+         * Delete customer address and selections by provided ids.
          *
          * @param {Array} ids
          */
@@ -87,6 +87,10 @@ define([
             if (ids.indexOf(defaultBillingId) !== -1) {
                 this.source.set('data.default_billing_address', []);
             }
+
+            _.each(ids, function (id) {
+                this.selections().deselect(id.toString(), false);
+            }, this);
         }
     });
 });
diff --git a/app/code/Magento/Integration/Test/Mftf/Page/AdminConfigServicesOauthPage.xml b/app/code/Magento/Integration/Test/Mftf/Page/AdminConfigServicesOauthPage.xml
new file mode 100644
index 0000000000000..85f20c3617e1d
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Page/AdminConfigServicesOauthPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminConfigServicesOauthPage" url="admin/system_config/edit/section/oauth/" area="admin" module="Magento_Integration">
+        <section name="AdminConfigAccessTokenExpirationSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Integration/Test/Mftf/Section/AdminConfigAccessTokenExpirationSection.xml b/app/code/Magento/Integration/Test/Mftf/Section/AdminConfigAccessTokenExpirationSection.xml
new file mode 100644
index 0000000000000..0f18c1e75979e
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Section/AdminConfigAccessTokenExpirationSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminConfigAccessTokenExpirationSection">
+        <element name="tabAccessTokenLifetime" type="select" selector="#oauth_access_token_lifetime-head"/>
+        <element name="CheckIfTabExpand" type="button" selector="#oauth_access_token_lifetime-head:not(.open)"/>
+        <element name="valueForTokenLifetime" type="input" selector="#oauth_access_token_lifetime_customer"/>
+        <element name="systemValueForTokenLifetime" type="checkbox" selector="#oauth_access_token_lifetime_customer_inherit"/>
+        <element name="valueForTokenLifetimeAdmin" type="input" selector="#oauth_access_token_lifetime_admin"/>
+        <element name="systemValueForTokenLifetimeAdmin" type="checkbox" selector="#oauth_access_token_lifetime_admin_inherit"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminConfigSaveEmptySettingsTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminConfigSaveEmptySettingsTest.xml
new file mode 100644
index 0000000000000..89a0fb4c1f026
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminConfigSaveEmptySettingsTest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigSaveEmptySettingsTest">
+        <annotations>
+            <features value="Configuration"/>
+            <stories value="Save settings 'Access Token Expiration'."/>
+            <title value="Save settings 'Access Token Expiration' with empty values."/>
+            <description value="Save settings 'Customer Token Lifetime' and 'Admin Token Lifetime' with empty values without validations."/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-37382"/>
+            <group value="configuration"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{AdminConfigServicesOauthPage.url}}" stepKey="navigateToConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick selector="{{AdminConfigAccessTokenExpirationSection.tabAccessTokenLifetime}}" dependentSelector="{{AdminConfigAccessTokenExpirationSection.CheckIfTabExpand}}" visible="true" stepKey="expandTab"/>
+        <waitForAjaxLoad stepKey="waitForAjax"/>
+        <uncheckOption selector="{{AdminConfigAccessTokenExpirationSection.systemValueForTokenLifetime}}" stepKey="uncheckUseSystemValue"/>
+        <fillField selector="{{AdminConfigAccessTokenExpirationSection.valueForTokenLifetime}}" userInput="" stepKey="valueForTokenLifetime"/>
+        <uncheckOption selector="{{AdminConfigAccessTokenExpirationSection.systemValueForTokenLifetimeAdmin}}" stepKey="uncheckUseSystemValueAdmin"/>
+        <fillField selector="{{AdminConfigAccessTokenExpirationSection.valueForTokenLifetimeAdmin}}" userInput="" stepKey="valueForTokenLifetimeAdmin"/>
+        <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Integration/etc/adminhtml/system.xml b/app/code/Magento/Integration/etc/adminhtml/system.xml
index 6ef569a1d8a2f..3d465a9642805 100644
--- a/app/code/Magento/Integration/etc/adminhtml/system.xml
+++ b/app/code/Magento/Integration/etc/adminhtml/system.xml
@@ -16,12 +16,12 @@
                 <field id="customer" translate="label comment" type="text" sortOrder="30" showInDefault="1" canRestore="1">
                     <label>Customer Token Lifetime (hours)</label>
                     <comment>We will disable this feature if the value is empty.</comment>
-                    <validate>required-entry validate-zero-or-greater validate-number</validate>
+                    <validate>validate-zero-or-greater validate-number</validate>
                 </field>
                 <field id="admin" translate="label comment" type="text" sortOrder="60" showInDefault="1" canRestore="1">
                     <label>Admin Token Lifetime (hours)</label>
                     <comment>We will disable this feature if the value is empty.</comment>
-                    <validate>required-entry validate-zero-or-greater validate-number</validate>
+                    <validate>validate-zero-or-greater validate-number</validate>
                 </field>
             </group>
             <group id="cleanup" translate="label" type="text" sortOrder="300" showInDefault="1">
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
index b729eadf122c5..b75b59eeacce2 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
@@ -268,7 +268,8 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode():
             </fieldset>
         </div>
     </script>
-    <div id="new_video_<?= /* @noEscape */ $block->getNewVideoBlockName() ?>">
+    <?php $videoBlockId = "new_video_" . $block->getHtmlId() . rand(); ?>
+    <div id="<?= /* @noEscape */ $videoBlockId ?>">
         <?= $block->getFormHtml() ?>
         <div id="video-player-preview-location" class="video-player-sidebar">
             <div class="video-player-container"></div>
@@ -288,7 +289,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode():
     </div>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         'display:none',
-        'div#new_video_' . /* @noEscape */ $block->getNewVideoBlockName()
+        'div#' . $videoBlockId
     ) ?>
 
     <?= $block->getChildHtml('new-video') ?>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridSelectAllActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridSelectAllActionGroup.xml
new file mode 100644
index 0000000000000..bbfb7e46d89ec
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridSelectAllActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminGridSelectAllActionGroup">
+        <annotations>
+            <description>Click on select all option on the grid</description>
+        </annotations>
+
+        <waitForElementVisible selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="waitForElement"/>
+        <click selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminGridSelectRows.multicheckOption('Select All')}}" stepKey="clickSelectAllCustomers"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js
index ba0f4d25c25a4..828bbccee0478 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js
@@ -52,6 +52,7 @@ define([
 
             listens: {
                 '${ $.provider }:params.filters': 'onFilter',
+                '${ $.provider }:params.search': 'onSearch',
                 selected: 'onSelectedChange',
                 rows: 'onRowsChange'
             },
@@ -235,7 +236,7 @@ define([
         * @returns {Multiselect} Chainable.
         */
         togglePage: function () {
-            return this.isPageSelected() ? this.deselectPage() : this.selectPage();
+            return this.isPageSelected() && !this.excluded().length ? this.deselectPage() : this.selectPage();
         },
 
         /**
@@ -496,6 +497,13 @@ define([
             if (!this.preserveSelectionsOnFilter) {
                 this.deselectAll();
             }
+        },
+
+        /**
+         * Is invoked when search is applied or removed
+         */
+        onSearch: function () {
+            this.onFilter();
         }
     });
 });
diff --git a/app/code/Magento/User/i18n/en_US.csv b/app/code/Magento/User/i18n/en_US.csv
index 064b6428387fe..cd550015401d0 100644
--- a/app/code/Magento/User/i18n/en_US.csv
+++ b/app/code/Magento/User/i18n/en_US.csv
@@ -106,8 +106,8 @@ username,username
 Custom,Custom
 All,All
 Resources,Resources
-"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
-"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
+"Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?","Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?"
+"Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?","Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?"
 "Password Reset Confirmation for %name","Password Reset Confirmation for %name"
 "%name,","%name,"
 "There was recently a request to change the password for your account.","There was recently a request to change the password for your account."
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
index 2042479832898..b0107a53593d3 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
@@ -51,8 +51,8 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()):
 
                 if (checked) {
                     confirm({
-                        content: "{$myBlock->escapeJs(__('Warning!\r\nThis action will remove this user from already ' .
-                                                         'assigned role\r\nAre you sure?'))}",
+                        content: "{$myBlock->escapeJs(__('Warning!<br>This action will remove this user from already ' .
+                                                         'assigned role.<br>Are you sure?'))}",
                         actions: {
                             confirm: function () {
                                 checkbox[0].checked = false;
@@ -102,7 +102,7 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()):
             allCheckbox.checked = true;
             confirm({
                 content: "{$myBlock->escapeJs(
-                    __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?')
+                    __('Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?')
                     )}",
                 actions: {
                     confirm: function () {
diff --git a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
index 71a866f945693..7455c26334c02 100644
--- a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
@@ -45,7 +45,7 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()):
                 var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
                 if (checked && warning && radioBoxes.size() > 0) {
                     if ( !confirm("{$myBlock->escapeJs(
-                        __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')
+                        __('Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?')
                         )}") ) {
                         checkbox[0].checked = false;
                         for(i in radioBoxes) {
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
index a68a546c20bc6..cb96ca2a14cac 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
@@ -6,7 +6,13 @@
  */
 namespace Magento\Cms\Model\Wysiwyg\Images;
 
+use Magento\Cms\Model\Wysiwyg\Images\Storage\Collection;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\DataObject;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Test methods of class Storage
@@ -29,22 +35,27 @@ class StorageTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Framework\Filesystem
+     * @var Filesystem
      */
     private $filesystem;
 
     /**
-     * @var \Magento\Cms\Model\Wysiwyg\Images\Storage
+     * @var Storage
      */
     private $storage;
 
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
     /**
      * @inheritdoc
      */
     // phpcs:disable
     public static function setUpBeforeClass(): void
     {
-        self::$_baseDir = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        self::$_baseDir = Bootstrap::getObjectManager()->get(
             \Magento\Cms\Helper\Wysiwyg\Images::class
         )->getCurrentPath() . 'MagentoCmsModelWysiwygImagesStorageTest';
         if (!file_exists(self::$_baseDir)) {
@@ -60,8 +71,8 @@ public static function setUpBeforeClass(): void
     // phpcs:ignore
     public static function tearDownAfterClass(): void
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Filesystem\Driver\File::class
+        Bootstrap::getObjectManager()->create(
+            File::class
         )->deleteDirectory(
             self::$_baseDir
         );
@@ -72,9 +83,10 @@ public static function tearDownAfterClass(): void
      */
     protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->filesystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
-        $this->storage = $this->objectManager->create(\Magento\Cms\Model\Wysiwyg\Images\Storage::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+        $this->storage = $this->objectManager->create(Storage::class);
+        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
     }
 
     /**
@@ -83,16 +95,31 @@ protected function setUp(): void
      */
     public function testGetFilesCollection(): void
     {
-        \Magento\TestFramework\Helper\Bootstrap::getInstance()
+        Bootstrap::getInstance()
             ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
-        $collection = $this->storage->getFilesCollection(self::$_baseDir, 'media');
-        $this->assertInstanceOf(\Magento\Cms\Model\Wysiwyg\Images\Storage\Collection::class, $collection);
+        $fileName = 'magento_image.jpg';
+        $imagePath = realpath(__DIR__ . '/../../../../Catalog/_files/' . $fileName);
+        $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $modifiableFilePath = $mediaDirectory->getAbsolutePath('MagentoCmsModelWysiwygImagesStorageTest/' . $fileName);
+        $this->driver->copy(
+            $imagePath,
+            $modifiableFilePath
+        );
+        $this->storage->resizeFile($modifiableFilePath);
+        $collection = $this->storage->getFilesCollection(self::$_baseDir, 'image');
+        $this->assertInstanceOf(Collection::class, $collection);
         foreach ($collection as $item) {
-            $this->assertInstanceOf(\Magento\Framework\DataObject::class, $item);
-            $this->assertStringEndsWith('/1.swf', $item->getUrl());
-            $this->assertStringMatchesFormat(
-                'http://%s/static/%s/adminhtml/%s/%s/Magento_Cms/images/placeholder_thumbnail.jpg',
-                $item->getThumbUrl()
+            $this->assertInstanceOf(DataObject::class, $item);
+            $this->assertStringEndsWith('/' . $fileName, $item->getUrl());
+            $this->assertEquals(
+                '/pub/media/.thumbsMagentoCmsModelWysiwygImagesStorageTest/magento_image.jpg',
+                parse_url($item->getThumbUrl(), PHP_URL_PATH),
+                "Check if Thumbnail URL is equal to the generated URL"
+            );
+            $this->assertEquals(
+                'image/jpeg',
+                $item->getMimeType(),
+                "Check if Mime Type is equal to the image in the file system"
             );
             return;
         }
@@ -121,7 +148,7 @@ public function testDeleteDirectory(): void
         $this->storage->createDirectory($dir, $path);
         $this->assertFileExists($fullPath);
         $this->storage->deleteDirectory($fullPath);
-        $this->assertFileNotExists($fullPath);
+        $this->assertFileDoesNotExist($fullPath);
     }
 
     /**
@@ -142,7 +169,7 @@ public function testDeleteDirectoryWithExcludedDirPath(): void
     public function testUploadFile(): void
     {
         $fileName = 'magento_small_image.jpg';
-        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
         $filePath = $tmpDirectory->getAbsolutePath($fileName);
         // phpcs:disable
         $fixtureDir = realpath(__DIR__ . '/../../../../Catalog/_files');
@@ -172,7 +199,7 @@ public function testUploadFileWithExcludedDirPath(): void
         );
 
         $fileName = 'magento_small_image.jpg';
-        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
         $filePath = $tmpDirectory->getAbsolutePath($fileName);
         // phpcs:disable
         $fixtureDir = realpath(__DIR__ . '/../../../../Catalog/_files');
@@ -204,7 +231,7 @@ public function testUploadFileWithWrongExtension(string $fileName, string $fileT
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
         $this->expectExceptionMessage('File validation failed.');
 
-        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
         $filePath = $tmpDirectory->getAbsolutePath($fileName);
         // phpcs:disable
         $fixtureDir = realpath(__DIR__ . '/../../../_files');
@@ -251,7 +278,7 @@ public function testUploadFileWithWrongFile(): void
         $this->expectExceptionMessage('File validation failed.');
 
         $fileName = 'file.gif';
-        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
         $filePath = $tmpDirectory->getAbsolutePath($fileName);
         // phpcs:disable
         $file = fopen($filePath, "wb");
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/insert-listing.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/insert-listing.test.js
index 63ce265ac9001..e07b1fbc69453 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/insert-listing.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/adminhtml/js/view/form/components/insert-listing.test.js
@@ -18,7 +18,8 @@ define(['Magento_Customer/js/form/components/insert-listing'], function (Constr)
                 }
             },
             selectionsProvider = {
-                selected: jasmine.createSpy().and.returnValue(ids)
+                selected: jasmine.createSpy().and.returnValue(ids),
+                deselect: jasmine.createSpy()
             };
 
         beforeEach(function () {
@@ -54,7 +55,7 @@ define(['Magento_Customer/js/form/components/insert-listing'], function (Constr)
                 expect(obj._delete).toHaveBeenCalledWith([1, 2]);
             });
 
-            it('Check removal of default addresses', function () {
+            it('Check removal of default addresses and selections by provided ids', function () {
                 obj.source = {
                     get: jasmine.createSpy().and.returnValues(2, 3),
                     set: jasmine.createSpy()
@@ -64,6 +65,7 @@ define(['Magento_Customer/js/form/components/insert-listing'], function (Constr)
                 expect(selectionsProvider.selected).not.toHaveBeenCalled();
                 expect(obj.source.get.calls.count()).toEqual(2);
                 expect(obj.source.set.calls.count()).toEqual(1);
+                expect(selectionsProvider.deselect.calls.count()).toEqual(2);
             });
         });
     });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
index de3387e31af88..5975f21e08070 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
@@ -135,6 +135,19 @@ define([
             expect(multiSelect.selected().toString()).toEqual('3,4,1,2');
         });
 
+        it('Select all rows all over the Grid and deselects all records', function () {
+            multiSelect.rows([{
+                id: 1
+            }, {
+                id: 2
+            }]);
+
+            multiSelect.selectAll();
+            multiSelect.deselectAll();
+            multiSelect.indetermine(2);
+            expect(multiSelect.togglePage().selected()).toEqual([1, 2]);
+        });
+
         it('Select all rows all over the Grid without all rows on current page but with specific rows on another page',
             function () {
                 multiSelect.rows([{
diff --git a/lib/internal/Magento/Framework/File/Mime.php b/lib/internal/Magento/Framework/File/Mime.php
index 148f43d47cfd4..e0b22e4c944d9 100644
--- a/lib/internal/Magento/Framework/File/Mime.php
+++ b/lib/internal/Magento/Framework/File/Mime.php
@@ -108,6 +108,9 @@ public function getMimeType($file)
 
         if (function_exists('mime_content_type')) {
             $result = $this->getNativeMimeType($file);
+        } else {
+            $imageInfo = getimagesize($file);
+            $result = $imageInfo['mime'];
         }
 
         if (null === $result && isset($this->mimeTypes[$extension])) {
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/MimeTest.php b/lib/internal/Magento/Framework/File/Test/Unit/MimeTest.php
index 3c571452d7a3e..7a54a7966b500 100644
--- a/lib/internal/Magento/Framework/File/Test/Unit/MimeTest.php
+++ b/lib/internal/Magento/Framework/File/Test/Unit/MimeTest.php
@@ -58,6 +58,7 @@ public function getMimeTypeDataProvider(): array
             'weird extension' => [__DIR__ . '/_files/file.weird', 'application/octet-stream'],
             'weird uppercase extension' => [__DIR__ . '/_files/UPPERCASE.WEIRD', 'application/octet-stream'],
             'generic mime type' => [__DIR__ . '/_files/blank.html', 'text/html'],
+            'tmp file mime type' => [__DIR__ . '/_files/magento', 'image/jpeg'],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/_files/magento b/lib/internal/Magento/Framework/File/Test/Unit/_files/magento
new file mode 100644
index 0000000000000..c377daf8fb0b3
Binary files /dev/null and b/lib/internal/Magento/Framework/File/Test/Unit/_files/magento differ