diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 0fb00c89cc122..01fe2188854c2 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -14,7 +14,7 @@
         <element name="minPrice" type="text" selector="span[data-price-type='minPrice']"/>
         <element name="maxPrice" type="text" selector="span[data-price-type='minPrice']"/>
         <element name="asLowAsFinalPrice" type="text" selector="div.price-box.price-final_price p.minimal-price > span.price-final_price span.price"/>
-        <element name="fixedFinalPrice" type="text" selector="div.price-box.price-final_price > span.price-final_price span.price"/>
+        <element name="fixedFinalPrice" type="text" selector="div.price-box.price-final_price p.price-from span.price-final_price span.price-wrapper span.price"/>
         <element name="productBundleOptionsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/../input" parameterized="true" timeout="30"/>
         <element name="productBundleOneOptionInput" type="input" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/..//input[contains(@class, 'option')]" parameterized="true" timeout="30"/>
         <element name="productBundleOptionQty" type="input" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/..//input[contains(@class, 'qty')]" parameterized="true" timeout="30"/>
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index ca9b550ca31de..8d328d9a62292 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -118,7 +118,8 @@ private function preparePageMetadata(ResultPage $resultPage, $product)
         $pageConfig = $resultPage->getConfig();
 
         $metaTitle = $product->getMetaTitle();
-        $pageConfig->setMetaTitle($metaTitle);
+        $productMetaTitle = $metaTitle ? $this->addConfigValues($metaTitle) : null;
+        $pageConfig->setMetaTitle($productMetaTitle);
         $pageConfig->getTitle()->set($metaTitle ?: $product->getName());
 
         $keyword = $product->getMetaKeyword();
@@ -294,4 +295,22 @@ public function prepareAndRender(ResultPage $resultPage, $productId, $controller
         $this->preparePageMetadata($resultPage, $product);
         return $this;
     }
+
+    /**
+     * Add Prefix and Suffix as per the configuration.
+     *
+     * @param string $title
+     * @return string
+     */
+    private function addConfigValues(string $title): string
+    {
+        $preparedTitle = $this->scopeConfig->getValue(
+            'design/head/title_prefix',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        ) . ' ' . $title . ' ' . $this->scopeConfig->getValue(
+            'design/head/title_suffix',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        return trim($preparedTitle);
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
index c586563759b54..29f940021ee6d 100644
--- a/app/code/Magento/Catalog/Model/ProductRepository.php
+++ b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -66,11 +66,6 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      */
     protected $instancesById = [];
 
-    /**
-     * @var \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper
-     */
-    protected $initializationHelper;
-
     /**
      * @var \Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory
      */
@@ -195,7 +190,6 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
     /**
      * ProductRepository constructor.
      * @param ProductFactory $productFactory
-     * @param \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper $initializationHelper
      * @param \Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory $searchResultsFactory
      * @param ResourceModel\Product\CollectionFactory $collectionFactory
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
@@ -225,7 +219,6 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      */
     public function __construct(
         ProductFactory $productFactory,
-        \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper $initializationHelper,
         \Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory $searchResultsFactory,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory,
         \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
@@ -253,7 +246,6 @@ public function __construct(
     ) {
         $this->productFactory = $productFactory;
         $this->collectionFactory = $collectionFactory;
-        $this->initializationHelper = $initializationHelper;
         $this->searchResultsFactory = $searchResultsFactory;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->resourceModel = $resourceModel;
@@ -940,7 +932,7 @@ private function joinPositionField(
             foreach ($filterGroup->getFilters() as $filter) {
                 if ($filter->getField() === 'category_id') {
                     $filterValue = $filter->getValue();
-                    $categoryIds[] = is_array($filterValue) ? $filterValue : explode(',', $filterValue ?? '');
+                    $categoryIds[] = is_array($filterValue) ? $filterValue : explode(',', $filterValue);
                 }
             }
         }
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductImageStorefrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductImageStorefrontProductPageActionGroup.xml
index f4e38009d6772..e5b7d57a50200 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductImageStorefrontProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductImageStorefrontProductPageActionGroup.xml
@@ -19,7 +19,7 @@
 
         <seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="waitForImage"/>
-        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+        <waitForElement selector="{{StorefrontProductMediaSection.imageFileInGallery(image.filename)}}" stepKey="waitForImage"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imageFileInGallery(image.filename)}}" stepKey="seeImage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 47bfa67168e91..01480d6ca68ce 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -24,8 +24,8 @@
         <element name="oldPriceTag" type="text" selector=".old-price .price-label"/>
         <element name="oldPriceAmount" type="text" selector=".old-price span.price"/>
         <element name="productStockStatus" type="text" selector=".stock[title=Availability]>span"/>
-        <element name="productImage" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[@class='fotorama__img']"/>
-        <element name="productImageSrc" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[contains(@src, '{{src}}')]" parameterized="true"/>
+        <element name="productImage" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[contains(@class, 'fotorama__img')]"/>
+        <element name="productImageSrc" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[contains(@class, 'fotorama__img')][contains(@src, '{{src}}')]" parameterized="true"/>
         <element name="productDescription" type="text" selector="#description .value"/>
         <element name="productOptionFieldInput" type="input" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//input[@type='text']" parameterized="true"/>
         <element name="productOptionAreaInput" type="textarea" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//textarea" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
index 2dd4b021bc597..0f97d9454c878 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
@@ -15,7 +15,8 @@
         <element name="productImage" type="text" selector="//*[@data-gallery-role='gallery' and not(contains(@class, 'fullscreen'))]//img[contains(@src, '{{filename}}') and not(contains(@class, 'full'))]" parameterized="true" />
         <element name="productImageFullscreen" type="text" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//img[contains(@src, '{{filename}}') and contains(@class, 'full')]" parameterized="true" />
         <element name="closeFullscreenImage" type="button" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//*[@data-gallery-role='fotorama__fullscreen-icon']" />
-        <element name="imageFile" type="text" selector="//*[@class='product media']//img[contains(@src, '{{filename}}')]" parameterized="true"/>
+        <element name="imageFile" type="text" selector="//div[contains(@class, 'fotorama__active')]//img[contains(@src, '{{filename}}')]" parameterized="true"/>
+        <element name="imageFileInGallery" type="text" selector="//div[contains(@class, 'fotorama__loaded--img')]//img[contains(@src, '{{filename}}')]" parameterized="true"/>
         <element name="productImageActive" type="text" selector=".product.media div[data-active=true] > img[src*='{{filename}}']" parameterized="true"/>
         <element name="productImageInFotorama" type="file" selector=".fotorama__nav__shaft img[src*='{{imageName}}']" parameterized="true" timeout="30"/>
         <element name="fotoramaPrevButton" type="button" selector="//*[@data-gallery-role='gallery']//*[@data-gallery-role='nav-wrap']//*[@data-gallery-role='arrow' and contains(@class, 'fotorama__thumb__arr--left')]" timeout="30"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
index f342231f98f3a..fea3ab8c2efa6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
@@ -110,12 +110,12 @@
         <waitForPageLoad stepKey="waitForStorefront"/>
 
         <!-- See all of the images that we uploaded -->
-        <waitForElement selector="{{StorefrontProductMediaSection.imageFile('small')}}" stepKey="seeSmall"/>
-        <waitForElement selector="{{StorefrontProductMediaSection.imageFile('medium')}}" stepKey="seeMedium"/>
-        <waitForElement selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="seeLarge"/>
-        <waitForElement selector="{{StorefrontProductMediaSection.imageFile('gif')}}" stepKey="seeGif"/>
-        <waitForElement selector="{{StorefrontProductMediaSection.imageFile('jpg')}}" stepKey="seeJpg"/>
-        <waitForElement selector="{{StorefrontProductMediaSection.imageFile('png')}}" stepKey="seePng"/>
+        <waitForElement selector="{{StorefrontProductMediaSection.imageFileInGallery('small')}}" stepKey="seeSmall"/>
+        <waitForElement selector="{{StorefrontProductMediaSection.imageFileInGallery('medium')}}" stepKey="seeMedium"/>
+        <waitForElement selector="{{StorefrontProductMediaSection.imageFileInGallery('large')}}" stepKey="seeLarge"/>
+        <waitForElement selector="{{StorefrontProductMediaSection.imageFileInGallery('gif')}}" stepKey="seeGif"/>
+        <waitForElement selector="{{StorefrontProductMediaSection.imageFileInGallery('jpg')}}" stepKey="seeJpg"/>
+        <waitForElement selector="{{StorefrontProductMediaSection.imageFileInGallery('png')}}" stepKey="seePng"/>
 
         <!-- Go to the category page and see a placeholder image for the second product -->
         <amOnPage url="$$category.custom_attributes[url_key]$$.html" stepKey="goToCategoryPage"/>
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
index 166b38e3d0910..328fa181684d3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
@@ -18,7 +18,7 @@
 
 class SortbyTest extends TestCase
 {
-    const DEFAULT_ATTRIBUTE_CODE = 'attribute_name';
+    private const DEFAULT_ATTRIBUTE_CODE = 'attribute_name';
 
     /**
      * @var Sortby
@@ -45,7 +45,6 @@ class SortbyTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->markTestSkipped('Due to MAGETWO-48956');
         $this->objectHelper = new ObjectManager($this);
         $this->scopeConfig = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->model = $this->objectHelper->getObject(
@@ -217,7 +216,7 @@ public function testValidateUnique(): void
     {
         $this->attribute->expects($this->any())->method('getName')->willReturn('attribute_name');
         $this->attribute->method('getIsRequired');
-        $this->attribute§('getIsUnique')
+        $this->attribute->method('getIsUnique')
             ->willReturn(true);
 
         $entityMock = $this->getMockForAbstractClass(
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
index 306905a24fcb0..53cfdbd6f64df 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
@@ -77,11 +77,6 @@ class ProductRepositoryTest extends TestCase
      */
     private $model;
 
-    /**
-     * @var Helper|MockObject
-     */
-    private $initializationHelper;
-
     /**
      * @var Product|MockObject
      */
@@ -255,7 +250,6 @@ protected function setUp(): void
             ->method('hasGalleryAttribute')
             ->willReturn(true);
         $this->filterBuilder = $this->createMock(FilterBuilder::class);
-        $this->initializationHelper = $this->createMock(Helper::class);
         $this->collectionFactory = $this->createPartialMock(CollectionFactory::class, ['create']);
         $this->searchCriteriaBuilder = $this->createMock(SearchCriteriaBuilder::class);
         $this->metadataService = $this->getMockForAbstractClass(ProductAttributeRepositoryInterface::class);
@@ -342,7 +336,6 @@ function ($value) {
             ProductRepository::class,
             [
                 'productFactory' => $this->productFactory,
-                'initializationHelper' => $this->initializationHelper,
                 'resourceModel' => $this->resourceModel,
                 'filterBuilder' => $this->filterBuilder,
                 'collectionFactory' => $this->collectionFactory,
@@ -723,7 +716,6 @@ public function testSaveExisting(): void
         $this->productFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->product);
-        $this->initializationHelper->expects($this->never())->method('initialize');
         $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(true);
         $this->resourceModel->expects($this->once())->method('save')->with($this->product)->willReturn(true);
@@ -748,7 +740,6 @@ public function testSaveNew(): void
         $this->productFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->product);
-        $this->initializationHelper->expects($this->never())->method('initialize');
         $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(true);
         $this->resourceModel->expects($this->once())->method('save')->with($this->product)->willReturn(true);
@@ -774,7 +765,6 @@ public function testSaveUnableToSaveException(): void
         $this->productFactory->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->product);
-        $this->initializationHelper->expects($this->never())->method('initialize');
         $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(true);
         $this->resourceModel->expects($this->once())->method('save')->with($this->product)
@@ -800,7 +790,6 @@ public function testSaveException(): void
         $this->productFactory->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->product);
-        $this->initializationHelper->expects($this->never())->method('initialize');
         $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(true);
 
@@ -830,7 +819,6 @@ public function testSaveInvalidProductException(): void
         $this->productFactory->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->product);
-        $this->initializationHelper->expects($this->never())->method('initialize');
         $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(['error1', 'error2']);
         $this->product->expects($this->once())->method('getId')->willReturn(null);
@@ -854,8 +842,6 @@ public function testSaveThrowsTemporaryStateExceptionIfDatabaseConnectionErrorOc
         $this->productFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->product);
-        $this->initializationHelper->expects($this->never())
-            ->method('initialize');
         $this->resourceModel->expects($this->once())
             ->method('validate')
             ->with($this->product)
@@ -1018,7 +1004,6 @@ public function testSaveExistingWithOptions(array $newOptions): void
         $this->productFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->initializedProduct);
-        $this->initializationHelper->expects($this->never())->method('initialize');
         $this->resourceModel->expects($this->once())->method('validate')->with($this->initializedProduct)
             ->willReturn(true);
         $this->resourceModel->expects($this->once())->method('save')
@@ -1184,7 +1169,6 @@ public function testSaveWithLinks(array $newLinks, array $existingLinks, array $
         $this->productFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->initializedProduct);
-        $this->initializationHelper->expects($this->never())->method('initialize');
         $this->resourceModel->expects($this->once())->method('validate')->with($this->initializedProduct)
             ->willReturn(true);
         $this->resourceModel->expects($this->once())->method('save')
@@ -1354,7 +1338,6 @@ protected function setupProductMocksForSave(): void
         $this->productFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->initializedProduct);
-        $this->initializationHelper->expects($this->never())->method('initialize');
         $this->resourceModel->expects($this->once())->method('validate')->with($this->initializedProduct)
             ->willReturn(true);
         $this->resourceModel->expects($this->once())->method('save')
@@ -1475,7 +1458,6 @@ public function testSaveWithDifferentWebsites(): void
         $this->productFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->product);
-        $this->initializationHelper->expects($this->never())->method('initialize');
         $this->resourceModel->expects($this->once())->method('validate')->with($this->product)
             ->willReturn(true);
         $this->resourceModel->expects($this->once())->method('save')->with($this->product)->willReturn(true);
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
index 0ef5adf7a1888..dad564e95ca79 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
@@ -9,16 +9,16 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
- * Class Thumbnail
+ * Class prepares Thumbnail
  *
  * @api
  * @since 100.0.2
  */
 class Thumbnail extends \Magento\Ui\Component\Listing\Columns\Column
 {
-    const NAME = 'thumbnail';
+    public const NAME = 'thumbnail';
 
-    const ALT_FIELD = 'name';
+    public const ALT_FIELD = 'name';
 
     /**
      * @var \Magento\Catalog\Helper\Image
@@ -77,7 +77,6 @@ public function prepareDataSource(array $dataSource)
 
         return $dataSource;
     }
-
     /**
      * Get Alt
      *
@@ -88,6 +87,7 @@ public function prepareDataSource(array $dataSource)
     protected function getAlt($row)
     {
         $altField = $this->getData('config/altField') ?: self::ALT_FIELD;
-        return $row[$altField] ?? null;
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
+        return html_entity_decode($row[$altField], ENT_QUOTES, "UTF-8") ?? null;
     }
 }
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index 6e24f84f00482..33fbf78981783 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
@@ -36,7 +36,7 @@
         </referenceBlock>
 
         <referenceContainer name="content">
-            <container name="product.info.main" htmlTag="div" htmlClass="product-info-main" before="-">
+            <container name="product.info.main" htmlTag="div" htmlClass="product-info-main" before="product.info.details">
                 <container name="product.info.price" label="Product info auxiliary container" htmlTag="div" htmlClass="product-info-price">
                     <container name="product.info.stock.sku" label="Product auxiliary info" htmlTag="div" htmlClass="product-info-stock-sku">
                         <container name="product.info.type" before="-"/>
@@ -111,14 +111,14 @@
                     </arguments>
                 </block>
             </container>
-            <container name="product.info.media" htmlTag="div" htmlClass="product media" after="product.info.main">
+            <container name="product.info.media" htmlTag="div" htmlClass="product media" before="product.info.main">
                 <block class="Magento\Framework\View\Element\Template" name="skip_gallery_after.target" before="skip_gallery_before.wrapper" template="Magento_Theme::html/skiptarget.phtml">
                     <arguments>
                         <argument name="target_id" xsi:type="string">gallery-prev-area</argument>
                     </arguments>
                 </block>
                 <container name="skip_gallery_before.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
-                    <block class="Magento\Framework\View\Element\Template" before="product.info.media.image" name="skip_gallery_before" template="Magento_Theme::html/skip.phtml">
+                    <block class="Magento\Framework\View\Element\Template" name="skip_gallery_before" template="Magento_Theme::html/skip.phtml">
                         <arguments>
                             <argument name="target" xsi:type="string">gallery-next-area</argument>
                             <argument name="label" translate="true" xsi:type="string">Skip to the end of the images gallery</argument>
@@ -132,7 +132,7 @@
                     </arguments>
                 </block>
                 <container name="skip_gallery_after.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
-                    <block class="Magento\Framework\View\Element\Template" after="product.info.media.image" name="skip_gallery_after" template="Magento_Theme::html/skip.phtml">
+                    <block class="Magento\Framework\View\Element\Template" name="skip_gallery_after" template="Magento_Theme::html/skip.phtml">
                         <arguments>
                             <argument name="target" xsi:type="string">gallery-prev-area</argument>
                             <argument name="label" translate="true" xsi:type="string">Skip to the beginning of the images gallery</argument>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 4b33864aef47a..ce0fa3827afe0 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -8,6 +8,7 @@
  * Product media data template
  *
  * @var $block \Magento\Catalog\Block\Product\View\Gallery
+ * @var $escaper \Magento\Framework\Escaper
  */
 ?>
 
@@ -25,6 +26,8 @@ $helper = $block->getData('imageHelper');
 $mainImageData = $mainImage ?
     $mainImage->getData('medium_image_url') :
     $helper->getDefaultPlaceholderUrl('image');
+    $imageWidth = $block->getImageAttribute('product_page_image_medium', 'width');
+    $imageHeight = $block->getImageAttribute('product_page_image_medium', 'height');
 
 ?>
 
@@ -33,9 +36,11 @@ $mainImageData = $mainImage ?
         alt="main product photo"
         class="gallery-placeholder__image"
         src="<?= /* @noEscape */ $mainImageData ?>"
+        <?= $imageWidth ? 'width="'. $escaper->escapeHtmlAttr($imageWidth) .'"' : '' ?>
+        <?= $imageHeight ? 'height="'. $escaper->escapeHtmlAttr($imageHeight) .'"' : '' ?>
     />
 </div>
-
+<?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
 <script type="text/x-magento-init">
     {
         "[data-gallery-role=gallery-placeholder]": {
diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
index c7217dc9df80a..e8c4fbcf6cb89 100644
--- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -6,6 +6,8 @@
 
 namespace Magento\ConfigurableProduct\Model;
 
+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory;
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
@@ -47,6 +49,16 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
      */
     private $attributeFactory;
 
+    /**
+     * @var ProductRepository|mixed
+     */
+    private \Magento\Catalog\Model\ProductRepository $mediaGallery;
+
+    /**
+     * @var ProductAttributeMediaGalleryEntryInterfaceFactory|mixed
+     */
+    private \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $myModelFactory;
+
     /**
      * Constructor
      *
@@ -55,13 +67,19 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
      * @param \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $configurableType
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory
+     * @param \Magento\Catalog\Model\ProductRepository $mediaGalleryProcessor
+     * @param \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $myModelFactory
+     * @param \Magento\ConfigurableProduct\Helper\Product\Options\Factory $optionsFactory
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\Data\ProductInterfaceFactory $productFactory,
         \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $configurableType,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-        \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory = null
+        \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory = null,
+        \Magento\Catalog\Model\ProductRepository $mediaGalleryProcessor = null,
+        \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $myModelFactory = null,
+        \Magento\ConfigurableProduct\Helper\Product\Options\Factory $optionsFactory = null
     ) {
         $this->productRepository = $productRepository;
         $this->productFactory = $productFactory;
@@ -69,6 +87,12 @@ public function __construct(
         $this->dataObjectHelper = $dataObjectHelper;
         $this->attributeFactory = $attributeFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory::class);
+        $this->mediaGallery = $mediaGalleryProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Model\ProductRepository::class);
+        $this->myModelFactory = $myModelFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory::class);
+        $this->optionsFactory = $optionsFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\ConfigurableProduct\Helper\Product\Options\Factory::class);
     }
 
     /**
@@ -81,11 +105,9 @@ public function getChildren($sku)
         if ($product->getTypeId() != \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
             return [];
         }
-
         /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable $productTypeInstance */
         $productTypeInstance = $product->getTypeInstance();
         $productTypeInstance->setStoreFilter($product->getStoreId(), $product);
-
         $childrenList = [];
         /** @var \Magento\Catalog\Model\Product $child */
         foreach ($productTypeInstance->getUsedProducts($product) as $child) {
@@ -97,7 +119,9 @@ public function getChildren($sku)
                     $attributes[$attrCode] = $value;
                 }
             }
+            $images= (array)$child->getMediaGallery('images');
             $attributes['store_id'] = $child->getStoreId();
+            $attributes['media_gallery_entries'] = $this->getMediaEntries($images);
             /** @var \Magento\Catalog\Api\Data\ProductInterface $productDataObject */
             $productDataObject = $this->productFactory->create();
             $this->dataObjectHelper->populateWithArray(
@@ -110,6 +134,28 @@ public function getChildren($sku)
         return $childrenList;
     }
 
+    /**
+     * Get media entries
+     *
+     * @param array $images
+     * @return array
+     */
+    public function getMediaEntries(array $images): array
+    {
+        $media = $this->myModelFactory->create();
+        $mediaGalleryEntries=[];
+        foreach ($images as $image) {
+            $media->setId($image["value_id"]);
+            $media->setMediaType($image["media_type"]);
+            $media->setLabel($image["label"]);
+            $media->setPosition($image["position"]);
+            $media->setDisabled($image["disabled"]);
+            $media->setFile($image["file"]);
+            $mediaGalleryEntries[]=$media->getData();
+        }
+        return $mediaGalleryEntries;
+    }
+
     /**
      * @inheritdoc
      * @throws InputException
@@ -150,7 +196,7 @@ public function addChild($sku, $childSku)
         $configurableOptionData = $this->getConfigurableAttributesData($attributeData);
 
         /** @var \Magento\ConfigurableProduct\Helper\Product\Options\Factory $optionFactory */
-        $optionFactory = $this->getOptionsFactory();
+        $optionFactory = $this->optionsFactory;
         $options = $optionFactory->create($configurableOptionData);
         $childrenIds[] = $child->getId();
         $product->getExtensionAttributes()->setConfigurableProductOptions($options);
@@ -194,22 +240,6 @@ public function removeChild($sku, $childSku)
         return true;
     }
 
-    /**
-     * Get Options Factory
-     *
-     * @return \Magento\ConfigurableProduct\Helper\Product\Options\Factory
-     *
-     * @deprecated 100.2.0
-     */
-    private function getOptionsFactory()
-    {
-        if (!$this->optionsFactory) {
-            $this->optionsFactory = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\ConfigurableProduct\Helper\Product\Options\Factory::class);
-        }
-        return $this->optionsFactory;
-    }
-
     /**
      * Get Configurable Attribute Data
      *
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
index 8247353bb3437..33f7e7742a1b8 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
@@ -135,8 +135,11 @@ public function testGetChildren(): void
 
         $this->dataObjectHelperMock->expects($this->once())
             ->method('populateWithArray')
-            ->with($productMock, ['store_id' => 1, 'code' => 10], ProductInterface::class)
-            ->willReturnSelf();
+            ->with(
+                $productMock,
+                ['store_id' => 1, 'code' => 10, 'media_gallery_entries' => []],
+                ProductInterface::class
+            )->willReturnSelf();
 
         $this->productFactory->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/Directory/etc/zip_codes.xml b/app/code/Magento/Directory/etc/zip_codes.xml
index d915d2945e9e7..075e9ee15f9a3 100644
--- a/app/code/Magento/Directory/etc/zip_codes.xml
+++ b/app/code/Magento/Directory/etc/zip_codes.xml
@@ -283,7 +283,7 @@
     </zip>
     <zip countryCode="GR">
         <codes>
-            <code id="pattern_1" active="true" example="123 45">^[0-9]{3}\s[0-9]{2}$</code>
+            <code id="pattern_1" active="true" example="12345">^[0-9]{5}$</code>
         </codes>
     </zip>
     <zip countryCode="GS">
diff --git a/app/code/Magento/Sales/Test/Unit/ViewModel/Header/LogoPathResolverTest.php b/app/code/Magento/Sales/Test/Unit/ViewModel/Header/LogoPathResolverTest.php
new file mode 100644
index 0000000000000..1d95a6d39fedc
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/ViewModel/Header/LogoPathResolverTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\ViewModel\Header;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Registry;
+use Magento\Sales\Model\Order;
+use Magento\Sales\ViewModel\Header\LogoPathResolver;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test logo path resolver view model
+ */
+class LogoPathResolverTest extends TestCase
+{
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @var LogoPathResolver
+     */
+    private $model;
+
+    /**
+     * @var Registry|MockObject
+     */
+    private $registry;
+
+    /**
+     * Test for case when app in single store mode
+     * and logo path is defined in config
+     * @return void
+     */
+    public function testGetPathWhenInSingleStoreModeAndSalesLogoPathNotNull(): void
+    {
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+                ['sales/identity/logo_html', ScopeInterface::SCOPE_WEBSITE, 1]
+            )
+            ->willReturn(
+                "1",
+                'sales_identity_logo_html_value'
+            );
+        $valueForAssert = $this->model->getPath();
+        $this->assertEquals('sales/store/logo_html/sales_identity_logo_html_value', $valueForAssert);
+        $this->assertNotNull($valueForAssert);
+    }
+
+    /**
+     * Test for case when app in single store mode
+     * and logo path is not defined in config
+     * and header logo path is defined in config
+     * @return void
+     */
+    public function testGetPathWhenInSingleStoreModeAndSalesLogoPathIsNullAndHeaderLogoPathIsNotNull(): void
+    {
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+                ['sales/identity/logo_html', ScopeInterface::SCOPE_WEBSITE, 1],
+                ['design/header/logo_src', ScopeInterface::SCOPE_WEBSITE, 1]
+            )
+            ->willReturn('1', null, 'SingleStore.png');
+        $valueForAssert = $this->model->getPath();
+        $this->assertEquals('logo/SingleStore.png', $valueForAssert);
+        $this->assertNotNull($valueForAssert);
+    }
+
+    /**
+     * Test for case when app in single store mode
+     * and logo path is not defined in config
+     * and header logo path is not defined in config
+     * @return void
+     */
+    public function testGetPathWhenInSingleStoreModeAndSalesLogoPathIsNullAndHeaderLogoPathIsNull(): void
+    {
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+                ['sales/identity/logo_html', ScopeInterface::SCOPE_WEBSITE, 1],
+                ['design/header/logo_src', ScopeInterface::SCOPE_WEBSITE, 1]
+            )
+            ->willReturn('1', null, null);
+        $valueForAssert = $this->model->getPath();
+        $this->assertNull($valueForAssert);
+    }
+
+    /**
+     * Test for case when app in multi store mode
+     * and logo path is defined in config
+     * @return void
+     */
+    public function testGetPathWhenInMultiStoreModeAndPathNotNull(): void
+    {
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+                ['sales/identity/logo_html', ScopeInterface::SCOPE_STORE, 1]
+            )
+            ->willReturn('0', 'sales_identity_logo_html_value');
+        $valueForAssert = $this->model->getPath();
+        $this->assertEquals('sales/store/logo_html/sales_identity_logo_html_value', $valueForAssert);
+        $this->assertNotNull($valueForAssert);
+    }
+
+    /**
+     * Test for case when app in single store mode
+     * and logo path is not defined in config
+     * and header logo path is not defined in config
+     * @return void
+     */
+    public function testGetPathWhenInMultiStoreModeAndSalesLogoPathIsNullAndHeaderLogoPathIsNull(): void
+    {
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+                ['sales/identity/logo_html', ScopeInterface::SCOPE_STORE, 1],
+                ['design/header/logo_src', ScopeInterface::SCOPE_STORE, 1]
+            )
+            ->willReturn('0', null, null);
+        $valueForAssert = $this->model->getPath();
+        $this->assertNull($valueForAssert);
+    }
+
+    /**
+     * Test for case when app in single store mode
+     * and logo path is not defined in config
+     * and header logo path is defined in config
+     * @return void
+     */
+    public function testGetPathWhenInMultiStoreModeAndSalesLogoPathIsNullAndHeaderLogoPathIsNotNull(): void
+    {
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+                ['sales/identity/logo_html', ScopeInterface::SCOPE_WEBSITE, 1],
+                ['design/header/logo_src', ScopeInterface::SCOPE_WEBSITE, 1]
+            )
+            ->willReturn('1', null, 'MultiStore.png');
+        $valueForAssert = $this->model->getPath();
+        $this->assertEquals('logo/MultiStore.png', $valueForAssert);
+        $this->assertNotNull($valueForAssert);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
+        $this->registry = $this->createMock(Registry::class);
+        $orderMock = $this->createMock(Order::class);
+        $orderMock->method('getStoreId')
+            ->willReturn(1);
+        $this->registry->method('registry')
+            ->with('current_order')
+            ->willReturn($orderMock);
+        $this->model = new LogoPathResolver($this->scopeConfig, $this->registry);
+    }
+}
diff --git a/app/code/Magento/Sales/ViewModel/Header/LogoPathResolver.php b/app/code/Magento/Sales/ViewModel/Header/LogoPathResolver.php
index a640526517d47..d133388e4a4c1 100644
--- a/app/code/Magento/Sales/ViewModel/Header/LogoPathResolver.php
+++ b/app/code/Magento/Sales/ViewModel/Header/LogoPathResolver.php
@@ -54,9 +54,13 @@ public function getPath(): ?string
         if ($order instanceof Order) {
             $storeId = $order->getStoreId();
         }
+        $scopeType = ScopeInterface::SCOPE_STORE;
+        if ($this->scopeConfig->getValue('general/single_store_mode/enabled') === "1") {
+            $scopeType = ScopeInterface::SCOPE_WEBSITE;
+        }
         $salesLogoPath = $this->scopeConfig->getValue(
             'sales/identity/logo_html',
-            ScopeInterface::SCOPE_STORE,
+            $scopeType,
             $storeId
         );
 
@@ -66,7 +70,7 @@ public function getPath(): ?string
 
         $headerLogoPath = $this->scopeConfig->getValue(
             'design/header/logo_src',
-            ScopeInterface::SCOPE_STORE,
+            $scopeType,
             $storeId
         );
 
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
index 1c6d534bf0700..cc84d27691214 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -70,7 +70,13 @@ public function asXml($containerKey = 'conditions', $itemKey = 'condition')
      */
     public function loadAttributeOptions()
     {
-        $this->setAttributeOption(['qty' => __('total quantity'), 'base_row_total' => __('total amount')]);
+        $this->setAttributeOption(
+            [
+                'qty' => __('total quantity'),
+                'base_row_total' => __('total amount (excl. tax)'),
+                'base_row_total_incl_tax' => __('total amount (incl. tax)')
+            ]
+        );
         return $this;
     }
 
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/Product/SubselectTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/Product/SubselectTest.php
index 8620531b12c18..d545f1e13b413 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/Product/SubselectTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/Product/SubselectTest.php
@@ -308,4 +308,97 @@ public function dataProviderForFixedBundleProduct(): array
                 ]
         ];
     }
+
+    /**
+     * Tests validate for base row total incl tax
+     *
+     * @param array|null $attributeDetails
+     * @param array $productDetails
+     * @param bool $expectedResult
+     * @return void
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @dataProvider dataProviderForBaseTotalInclTax
+     */
+    public function testValidateForBaseTotalInclTax(
+        ?array $attributeDetails,
+        array $productDetails,
+        bool $expectedResult
+    ):void {
+        $attributeResource = new DataObject();
+        if ($attributeDetails) {
+            $attributeResource->setAttribute($attributeDetails['id']);
+            $this->ruleConditionMock->expects($this->any())
+                ->method('setName')
+                ->willReturn($attributeDetails['name']);
+            $this->ruleConditionMock->expects($this->any())
+                ->method('setAttributeScope')
+                ->willReturn($attributeDetails['attributeScope']);
+            $this->ruleConditionMock->expects($this->any())
+                ->method('getAttribute')
+                ->willReturn($attributeDetails['id']);
+            $this->model->setData('conditions', [$this->ruleConditionMock]);
+            $this->model->setData('attribute', $attributeDetails['id']);
+            $this->model->setData('value', $productDetails['valueParsed']);
+            $this->model->setData('operator', $attributeDetails['attributeOperator']);
+            $this->productMock->expects($this->any())
+                ->method('hasData')
+                ->with($attributeDetails['id'])
+                ->willReturn(!empty($productDetails));
+            $this->productMock->expects($this->any())
+                ->method('getData')
+                ->with($attributeDetails['id'])
+                ->willReturn($productDetails['price']);
+            $this->ruleConditionMock->expects($this->any())
+                ->method('getValueParsed')
+                ->willReturn($productDetails['valueParsed']);
+            $this->ruleConditionMock->expects($this->any())->method('getOperatorForValidate')
+                ->willReturn($attributeDetails['attributeOperator']);
+        }
+
+        /* @var AbstractItem|MockObject $quoteItemMock */
+        $this->productMock->expects($this->any())
+            ->method('getResource')
+            ->willReturn($attributeResource);
+        $this->quoteItemMock->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
+        $this->quoteItemMock->expects($this->any())
+            ->method('getProductId')
+            ->willReturn($productDetails['id']);
+        $this->quoteItemMock->expects($this->any())
+            ->method('getData')
+            ->willReturn($productDetails['baseRowTotalInclTax']);
+        $this->assertEquals($expectedResult, $this->model->validate($this->abstractModel));
+    }
+
+    /**
+     * Get data provider array for validate base total incl tax
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function dataProviderForBaseTotalInclTax(): array
+    {
+        return [
+            'validate true for product data with conditions for attribute base_row_total_incl_tax' =>
+                [
+                    [
+                        'id' => 'attribute_set_id',
+                        'name' => 'base_row_total_incl_tax',
+                        'attributeScope' => 'frontend',
+                        'attributeOperator' => '=='
+                    ],
+                    [
+                        'id'=> 1,
+                        'type' => ProductType::TYPE_SIMPLE,
+                        'qty' => 2,
+                        'price' => 100,
+                        'hasChildren' => true,
+                        'baseRowTotalInclTax' => 200,
+                        'valueParsed' => 200
+                    ],
+                    false
+                ]
+        ];
+    }
 }
diff --git a/app/code/Magento/SalesRule/i18n/en_US.csv b/app/code/Magento/SalesRule/i18n/en_US.csv
index b00b3a74a6482..81a8c8936413f 100644
--- a/app/code/Magento/SalesRule/i18n/en_US.csv
+++ b/app/code/Magento/SalesRule/i18n/en_US.csv
@@ -99,7 +99,8 @@ FOUND,FOUND
 "NOT FOUND","NOT FOUND"
 "If an item is %1 in the cart with %2 of these conditions true:","If an item is %1 in the cart with %2 of these conditions true:"
 "total quantity","total quantity"
-"total amount","total amount"
+"total amount (excl. tax)","total amount (excl. tax)"
+"total amount (incl. tax)","total amount (incl. tax)"
 is,is
 "is not","is not"
 "equals or greater than","equals or greater than"
diff --git a/app/code/Magento/Theme/Test/Unit/ViewModel/Block/Html/Header/LogoPathResolverTest.php b/app/code/Magento/Theme/Test/Unit/ViewModel/Block/Html/Header/LogoPathResolverTest.php
new file mode 100644
index 0000000000000..3dd36a39a2abb
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Unit/ViewModel/Block/Html/Header/LogoPathResolverTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Theme\Test\Unit\ViewModel\Block\Html\Header;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Theme\ViewModel\Block\Html\Header\LogoPathResolver;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test logo path resolver view model
+ */
+class LogoPathResolverTest extends TestCase
+{
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @var LogoPathResolver
+     */
+    private $model;
+
+    /**
+     * Test for case when app in single store mode
+     * and logo path is defined in config
+     * @return void
+     */
+    public function testGetPathWhenInSingleStoreModeAndPathNotNull(): void
+    {
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+                ['design/header/logo_src', ScopeInterface::SCOPE_WEBSITE, null]
+            )
+            ->willReturn('1', 'SingleStore.png');
+        $valueForAssert = $this->model->getPath();
+        $this->assertEquals('logo/SingleStore.png', $valueForAssert);
+        $this->assertNotNull($valueForAssert);
+    }
+
+    /**
+     * Test for case when app in single store mode
+     * and logo path is not defined in config
+     * @return void
+     */
+    public function testGetPathWhenInSingleStoreModeAndPathIsNull(): void
+    {
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+                ['design/header/logo_src', ScopeInterface::SCOPE_WEBSITE, null]
+            )
+            ->willReturn('1', null);
+        $this->assertNull($this->model->getPath());
+    }
+
+    /**
+     * Test for case when app in multi store mode
+     * and logo path is defined in config
+     * @return void
+     */
+    public function testGetPathWhenInMultiStoreModeAndPathNotNull(): void
+    {
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+                ['design/header/logo_src', ScopeInterface::SCOPE_STORE, null]
+            )
+            ->willReturn('0', 'MultiStore.png');
+        $valueForAssert = $this->model->getPath();
+        $this->assertEquals('logo/MultiStore.png', $valueForAssert);
+        $this->assertNotNull($valueForAssert);
+    }
+
+    /**
+     * Test for case when app in multi store mode
+     * and logo path is not defined in config
+     * @return void
+     */
+    public function testGetPathWhenInMultiStoreModeAndPathIsNull(): void
+    {
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+                ['design/header/logo_src', ScopeInterface::SCOPE_STORE, null]
+            )
+            ->willReturn('0', null);
+        $this->assertNull($this->model->getPath());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
+        $this->model = new LogoPathResolver($this->scopeConfig);
+    }
+}
diff --git a/app/code/Magento/Theme/ViewModel/Block/Html/Header/LogoPathResolver.php b/app/code/Magento/Theme/ViewModel/Block/Html/Header/LogoPathResolver.php
index 1a10fe9177320..5be2cf9360ed4 100644
--- a/app/code/Magento/Theme/ViewModel/Block/Html/Header/LogoPathResolver.php
+++ b/app/code/Magento/Theme/ViewModel/Block/Html/Header/LogoPathResolver.php
@@ -39,9 +39,13 @@ public function __construct(
     public function getPath(): ?string
     {
         $path = null;
+        $scopeType = ScopeInterface::SCOPE_STORE;
+        if ($this->scopeConfig->getValue('general/single_store_mode/enabled') === "1") {
+            $scopeType = ScopeInterface::SCOPE_WEBSITE;
+        }
         $storeLogoPath = $this->scopeConfig->getValue(
             'design/header/logo_src',
-            ScopeInterface::SCOPE_STORE
+            $scopeType
         );
         if ($storeLogoPath !== null) {
             $path = Logo::UPLOAD_DIR . '/' . $storeLogoPath;
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
index cb9f5b13de494..27b9c1127fc12 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
@@ -147,7 +147,7 @@ define([
      */
     function processAdded(node) {
         _.each(watchers.selectors, function (listeners, selector) {
-            listeners.forEach(function (data) {
+            for (let data of listeners) {
                 if (!data.ctx.contains(node) || !$(node, data.ctx).is(selector)) {
                     return;
                 }
@@ -157,7 +157,7 @@ define([
                 } else if (data.type === 'remove') {
                     addRemovalListener(node, data);
                 }
-            });
+            }
         });
     }
 
@@ -170,14 +170,14 @@ define([
         var nodeData    = getNodeData(node),
             listeners   = nodeData && nodeData.remove;
 
+
         if (!listeners) {
             return;
         }
 
-        listeners.forEach(function (data) {
+        for (let data of listeners) {
             trigger(node, data);
-        });
-
+        }
         removeNodeData(node);
     }
 
@@ -194,12 +194,12 @@ define([
 
         nodes = _.toArray(nodes).filter(isElementNode);
 
-        nodes.forEach(function (node) {
+        for (let node of nodes) {
             result.push(node);
 
             children = extractChildren(node);
-            result   = result.concat(children);
-        });
+            result.push(...children);
+        }
 
         return result;
     }
@@ -216,10 +216,10 @@ define([
         var removed = [],
             added = [];
 
-        mutations.forEach(function (record) {
-            removed = removed.concat(_.toArray(record.removedNodes));
-            added   = added.concat(_.toArray(record.addedNodes));
-        });
+        for (let record of mutations) {
+            removed.push(...record.removedNodes);
+            added.push(...record.addedNodes);
+        }
 
         removed = removed.filter(function (node) {
             var addIndex = added.indexOf(node),
@@ -285,10 +285,16 @@ define([
         var changes;
 
         if (shouldObserveMutations(mutations)) {
+            let node;
+
             changes = formChangesLists(mutations);
 
-            changes.removed.forEach(processRemoved);
-            changes.added.forEach(processAdded);
+            for (node of changes.removed) {
+                processRemoved(node);
+            }
+            for (node of changes.added) {
+                processAdded(node);
+            }
         }
     });
 
@@ -331,10 +337,9 @@ define([
 
             nodes = $(selector, data.ctx).toArray();
 
-            nodes.forEach(function (node) {
+            for (let node of nodes) {
                 trigger(node, data);
-            });
-
+            }
             addSelectorListener(selector, data);
         },
 
@@ -366,9 +371,9 @@ define([
                 addSelectorListener(selector, data);
             }
 
-            nodes.forEach(function (node) {
+            for (let node of nodes) {
                 addRemovalListener(node, data);
-            });
+            }
         },
 
         /**
diff --git a/app/code/Magento/User/ViewModel/JsonSerializer.php b/app/code/Magento/User/ViewModel/JsonSerializer.php
index 3cd234d9c41e2..26093a250656b 100644
--- a/app/code/Magento/User/ViewModel/JsonSerializer.php
+++ b/app/code/Magento/User/ViewModel/JsonSerializer.php
@@ -8,21 +8,19 @@
 
 namespace Magento\User\ViewModel;
 
-/**
- * JsonSerializer
- */
+use Magento\Framework\Serialize\Serializer\JsonHexTag;
+
 class JsonSerializer implements \Magento\Framework\View\Element\Block\ArgumentInterface
 {
-
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var JsonHexTag
      */
     private $serializer;
 
     /**
-     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @param JsonHexTag $serializer
      */
-    public function __construct(\Magento\Framework\Serialize\Serializer\Json $serializer)
+    public function __construct(JsonHexTag $serializer)
     {
         $this->serializer = $serializer;
     }
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index 43694a8197963..ea7d8b412768f 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -152,15 +152,8 @@
 
         .additional-attributes {
             width: auto;
-            .lib-table-bordered(
-                @_table_type: clear
-            );
-            .lib-table-resize(
-                @_th-padding-left: 0,
-                @_th-padding-right: @indent__l,
-                @_th-padding-bottom: @indent__s,
-                @_td-padding-bottom: @indent__s
-            );
+            .lib-table-bordered(@_table_type: clear);
+            .lib-table-resize(@_th-padding-left: 0, @_th-padding-right: @indent__l, @_th-padding-bottom: @indent__s, @_td-padding-bottom: @indent__s);
         }
     }
 
@@ -323,14 +316,7 @@
                 .legend {
                     &:after {
                         content: '*';
-                        .lib-typography(
-                        @_font-size: @form-field-label-asterisk__font-size,
-                        @_color: @form-field-label-asterisk__color,
-                        @_font-family: @form-field-label-asterisk__font-family,
-                        @_font-weight: @form-field-label-asterisk__font-weight,
-                        @_line-height: @form-field-label-asterisk__line-height,
-                        @_font-style: @form-field-label-asterisk__font-style
-                        );
+                        .lib-typography(@_font-size: @form-field-label-asterisk__font-size, @_color: @form-field-label-asterisk__color, @_font-family: @form-field-label-asterisk__font-family, @_font-weight: @form-field-label-asterisk__font-weight, @_line-height: @form-field-label-asterisk__line-height, @_font-style: @form-field-label-asterisk__font-style);
                     }
                 }
             }
@@ -434,10 +420,7 @@
 
         .action.tocompare {
             &:extend(.abs-actions-addto all);
-            .lib-icon-font-symbol(
-                @_icon-font-content: @icon-compare-full,
-                @_icon-font-position: before
-            );
+            .lib-icon-font-symbol(@_icon-font-content: @icon-compare-full, @_icon-font-position: before);
         }
     }
 
@@ -617,12 +600,14 @@
     }
 }
 
+/**
+ * @codingStandardsIgnoreStart
+ */
 //
 //  Mobile @screen__s
 //  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
-
     .product-info-price {
         margin: 0 -@indent__s 0;
         width: ~'calc(100% + 2*@{indent__s})' !important;
@@ -642,7 +627,7 @@
         }
     }
 }
-
+//@codingStandardsIgnoreEnd
 //
 //  Desktop
 //  _____________________________________________
@@ -1014,6 +999,10 @@
         display: none;
     }
 
+
+    /**
+     * @codingStandardsIgnoreStart
+     */
     .catalog-product_compare-index {
         .columns {
             .column {
@@ -1023,6 +1012,7 @@
             }
         }
     }
+    //@codingStandardsIgnoreEnd
 }
 
 //
@@ -1036,16 +1026,7 @@
 
         .action.compare {
             line-height: @form-element-input__height;
-            .lib-link(
-                @_link-color: @primary__color,
-                @_link-text-decoration: none,
-                @_link-color-visited: @primary__color,
-                @_link-text-decoration-visited: none,
-                @_link-color-hover: @primary__color,
-                @_link-text-decoration-hover: underline,
-                @_link-color-active: @primary__color,
-                @_link-text-decoration-active: underline
-            );
+            .lib-link(@_link-color: @primary__color, @_link-text-decoration: none, @_link-color-visited: @primary__color, @_link-text-decoration-visited: none, @_link-color-hover: @primary__color, @_link-text-decoration-hover: underline, @_link-color-active: @primary__color, @_link-text-decoration-active: underline);
         }
 
         .counter.qty {
@@ -1095,6 +1076,9 @@
     }
 }
 
+/**
+ * @codingStandardsIgnoreStart
+ */
 //
 //  Desktop large
 //  _____________________________________________
@@ -1106,3 +1090,4 @@
         }
     }
 }
+//@codingStandardsIgnoreEnd
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
index fbd9701d44be9..34109eb7cea90 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
@@ -1,3 +1,6 @@
+// @codingStandardsIgnoreFile
+
+
 // /**
 //  * Copyright © Magento, Inc. All rights reserved.
 //  * See COPYING.txt for license details.
@@ -61,389 +64,390 @@
 //
 //  Single file uploader
 //  ---------------------------------------------
+& when (@media-common = true) {
+    .file-uploader-area {
+        position: relative;
 
-.file-uploader-area {
-    position: relative;
-
-    input[type='file'] {
-        cursor: pointer;
-        opacity: 0;
-        overflow: hidden;
-        position: absolute;
-        visibility: hidden;
-        width: 0;
+        input[type='file'] {
+            cursor: pointer;
+            opacity: 0;
+            overflow: hidden;
+            position: absolute;
+            visibility: hidden;
+            width: 0;
 
-        &:focus {
-            + .file-uploader-button {
-                box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
+            &:focus {
+                + .file-uploader-button {
+                    box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
+                }
             }
-        }
 
-        &:disabled {
-            + .file-uploader-button {
-                cursor: default;
-                opacity: .5;
-                pointer-events: none;
+            &:disabled {
+                + .file-uploader-button {
+                    cursor: default;
+                    opacity: .5;
+                    pointer-events: none;
+                }
             }
         }
     }
-}
-
-.file-uploader-summary {
-    display: inline-block;
-    vertical-align: top;
-}
 
-.file-uploader-button {
-    background: @color-gray-darken0;
-    border: 1px solid @color-gray_light;
-    box-sizing: border-box;
-    color: @color-black_dark;
-    cursor: pointer;
-    display: inline-block;
-    font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    font-size: 1.4rem;
-    font-weight: 600;
-    line-height: 1.6rem;
-    margin: 0;
-    padding: 7px 15px;
-    vertical-align: middle;
-
-    &._is-dragover {
-        background: @file-uploader-dragover__background;
-        border: 1px solid @file-uploader-preview-focus__color;
+    .file-uploader-summary {
+        display: inline-block;
+        vertical-align: top;
     }
-}
-
-.file-uploader-spinner {
-    background-image: url('@{baseDir}images/loader-1.gif');
-    background-position: 50%;
-    background-repeat: no-repeat;
-    background-size: @file-uploader-spinner-dimensions;
-    display: none;
-    height: 30px;
-    margin-left: @indent__s;
-    vertical-align: top;
-    width: @file-uploader-spinner-dimensions;
-}
 
-.file-uploader-preview {
-    .action-remove {
-        .lib-icon-font (
-                @icon-delete__content,
-            @_icon-font: @icons__font-name,
-            @_icon-font-size: @file-uploader-delete-icon__font-size,
-            @_icon-font-color: @file-uploader-delete-icon__color,
-            @_icon-font-color-hover: @file-uploader-delete-icon__hover__color,
-            @_icon-font-text-hide: true,
-            @_icon-font-display: block
-        );
-        bottom: 4px;
+    .file-uploader-button {
+        background: @color-gray-darken0;
+        border: 1px solid @color-gray_light;
+        box-sizing: border-box;
+        color: @color-black_dark;
         cursor: pointer;
-        display: block;
-        height: 27px;
-        left: 6px;
-        padding: 2px;
-        position: absolute;
-        text-decoration: none;
-        width: 25px;
-        z-index: 2;
-    }
+        display: inline-block;
+        font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+        font-size: 1.4rem;
+        font-weight: 600;
+        line-height: 1.6rem;
+        margin: 0;
+        padding: 7px 15px;
+        vertical-align: middle;
 
-    &:hover {
-        .preview-image img,
-        .preview-link:before {
-            opacity: @file-uploader-preview__opacity;
+        &._is-dragover {
+            background: @file-uploader-dragover__background;
+            border: 1px solid @file-uploader-preview-focus__color;
         }
     }
 
-    .preview-link {
-        display: block;
-        height: 100%;
+    .file-uploader-spinner {
+        background-image: url('@{baseDir}images/loader-1.gif');
+        background-position: 50%;
+        background-repeat: no-repeat;
+        background-size: @file-uploader-spinner-dimensions;
+        display: none;
+        height: 30px;
+        margin-left: @indent__s;
+        vertical-align: top;
+        width: @file-uploader-spinner-dimensions;
     }
 
-    .preview-image img {
-        bottom: 0;
-        left: 0;
-        margin: auto;
-        max-height: 100%;
-        max-width: 100%;
-        position: absolute;
-        right: 0;
-        top: 0;
-        z-index: 1;
-    }
+    .file-uploader-preview {
+        .action-remove {
+            .lib-icon-font (
+                @icon-delete__content,
+                @_icon-font: @icons__font-name,
+                @_icon-font-size: @file-uploader-delete-icon__font-size,
+                @_icon-font-color: @file-uploader-delete-icon__color,
+                @_icon-font-color-hover: @file-uploader-delete-icon__hover__color,
+                @_icon-font-text-hide: true,
+                @_icon-font-display: block
+            );
+            bottom: 4px;
+            cursor: pointer;
+            display: block;
+            height: 27px;
+            left: 6px;
+            padding: 2px;
+            position: absolute;
+            text-decoration: none;
+            width: 25px;
+            z-index: 2;
+        }
 
-    .preview-video {
-        .lib-icon-font(
-                @icon-file__content,
-            @_icon-font: @icons__font-name,
-            @_icon-font-size: @file-uploader-video-icon__size,
-            @_icon-font-color: @file-uploader-video-icon__color,
-            @_icon-font-color-hover: @file-uploader-video-icon__color
-        );
+        &:hover {
+            .preview-image img,
+            .preview-link:before {
+                opacity: @file-uploader-preview__opacity;
+            }
+        }
+
+        .preview-link {
+            display: block;
+            height: 100%;
+        }
 
-        &:before {
+        .preview-image img {
+            bottom: 0;
             left: 0;
-            margin-top: -@file-uploader-video-icon__size / 2;
+            margin: auto;
+            max-height: 100%;
+            max-width: 100%;
             position: absolute;
             right: 0;
-            top: 50%;
-            z-index: @file-uploader-video-icon__z-index;
+            top: 0;
+            z-index: 1;
         }
-    }
 
-    .preview-document {
-        .lib-icon-font(
+        .preview-video {
+            .lib-icon-font(
                 @icon-file__content,
-            @_icon-font: @icons__font-name,
-            @_icon-font-size: @file-uploader-document-icon__size,
-            @_icon-font-color: @file-uploader-document-icon__color,
-            @_icon-font-color-hover: @file-uploader-document-icon__color
-        );
+                @_icon-font: @icons__font-name,
+                @_icon-font-size: @file-uploader-video-icon__size,
+                @_icon-font-color: @file-uploader-video-icon__color,
+                @_icon-font-color-hover: @file-uploader-video-icon__color
+            );
 
-        &:before {
-            left: 0;
-            margin-top: -@file-uploader-document-icon__size / 2;
-            position: absolute;
-            right: 0;
-            top: 50%;
-            z-index: @file-uploader-document-icon__z-index;
+            &:before {
+                left: 0;
+                margin-top: -@file-uploader-video-icon__size / 2;
+                position: absolute;
+                right: 0;
+                top: 50%;
+                z-index: @file-uploader-video-icon__z-index;
+            }
         }
-    }
-}
 
-.file-uploader-preview,
-.file-uploader-placeholder {
-    background: @file-uploader-preview__background-color;
-    border: 1px solid @file-uploader-preview__border-color;
-    box-sizing: border-box;
-    cursor: pointer;
-    display: block;
-    height: @file-uploader-preview__height;
-    line-height: 1;
-    margin: @indent__s @indent__m @indent__s 0;
-    overflow: hidden;
-    position: relative;
-    width: @file-uploader-preview__width;
-}
+        .preview-document {
+            .lib-icon-font(
+                @icon-file__content,
+                @_icon-font: @icons__font-name,
+                @_icon-font-size: @file-uploader-document-icon__size,
+                @_icon-font-color: @file-uploader-document-icon__color,
+                @_icon-font-color-hover: @file-uploader-document-icon__color
+            );
 
-.file-uploader {
-    &._loading {
-        .file-uploader-spinner {
-            display: inline-block;
+            &:before {
+                left: 0;
+                margin-top: -@file-uploader-document-icon__size / 2;
+                position: absolute;
+                right: 0;
+                top: 50%;
+                z-index: @file-uploader-document-icon__z-index;
+            }
         }
     }
 
-    .admin__field-note,
-    .admin__field-error {
-        margin-bottom: @indent__s;
+    .file-uploader-preview,
+    .file-uploader-placeholder {
+        background: @file-uploader-preview__background-color;
+        border: 1px solid @file-uploader-preview__border-color;
+        box-sizing: border-box;
+        cursor: pointer;
+        display: block;
+        height: @file-uploader-preview__height;
+        line-height: 1;
+        margin: @indent__s @indent__m @indent__s 0;
+        overflow: hidden;
+        position: relative;
+        width: @file-uploader-preview__width;
     }
 
-    .file-uploader-filename {
-        .lib-text-overflow();
-        max-width: @file-uploader-preview__width;
-        word-break: break-all;
+    .file-uploader {
+        &._loading {
+            .file-uploader-spinner {
+                display: inline-block;
+            }
+        }
 
-        &:first-child {
+        .admin__field-note,
+        .admin__field-error {
             margin-bottom: @indent__s;
         }
-    }
 
-    .file-uploader-meta {
-        color: @file-uploader-muted-text__color;
-    }
+        .file-uploader-filename {
+            .lib-text-overflow();
+            max-width: @file-uploader-preview__width;
+            word-break: break-all;
 
-    .admin__field-fallback-reset {
-        margin-left: @indent__s;
-    }
+            &:first-child {
+                margin-bottom: @indent__s;
+            }
+        }
 
-    ._keyfocus & .action-remove {
-        &:focus {
-            box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
+        .file-uploader-meta {
+            color: @file-uploader-muted-text__color;
         }
-    }
-}
 
-//  Placeholder for multiple uploader
-.file-uploader-placeholder {
-    &.placeholder-document {
-        .lib-icon-font(
-                @icon-file__content,
-            @_icon-font: @icons__font-name,
-            @_icon-font-size: 5rem,
-            @_icon-font-color: @file-uploader-placeholder-icon__color,
-            @_icon-font-color-hover: @file-uploader-placeholder-icon__color
-        );
+        .admin__field-fallback-reset {
+            margin-left: @indent__s;
+        }
 
-        &:before {
-            left: 0;
-            position: absolute;
-            right: 0;
-            top: 20px;
-            z-index: @file-uploader-placeholder-icon__z-index;
+        ._keyfocus & .action-remove {
+            &:focus {
+                box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
+            }
         }
     }
 
-    &.placeholder-image {
-        .lib-icon-font(
+    //  Placeholder for multiple uploader
+    .file-uploader-placeholder {
+        &.placeholder-document {
+            .lib-icon-font(
                 @icon-file__content,
-            @_icon-font: @icons__font-name,
-            @_icon-font-size: 5rem,
-            @_icon-font-color: @file-uploader-placeholder-icon__color,
-            @_icon-font-color-hover: @file-uploader-placeholder-icon__color
-        );
+                @_icon-font: @icons__font-name,
+                @_icon-font-size: 5rem,
+                @_icon-font-color: @file-uploader-placeholder-icon__color,
+                @_icon-font-color-hover: @file-uploader-placeholder-icon__color
+            );
 
-        &:before {
-            left: 0;
-            position: absolute;
-            right: 0;
-            top: 20px;
-            z-index: @file-uploader-placeholder-icon__z-index;
+            &:before {
+                left: 0;
+                position: absolute;
+                right: 0;
+                top: 20px;
+                z-index: @file-uploader-placeholder-icon__z-index;
+            }
         }
-    }
 
-    &.placeholder-video {
-        .lib-icon-font(
+        &.placeholder-image {
+            .lib-icon-font(
                 @icon-file__content,
-            @_icon-font: @icons__font-name,
-            @_icon-font-size: 3rem,
-            @_icon-font-color: @file-uploader-placeholder-icon__color,
-            @_icon-font-color-hover: @file-uploader-placeholder-icon__color
-        );
+                @_icon-font: @icons__font-name,
+                @_icon-font-size: 5rem,
+                @_icon-font-color: @file-uploader-placeholder-icon__color,
+                @_icon-font-color-hover: @file-uploader-placeholder-icon__color
+            );
 
-        &:before {
-            left: 0;
-            position: absolute;
-            right: 0;
-            top: 30px;
-            z-index: @file-uploader-placeholder-icon__z-index;
+            &:before {
+                left: 0;
+                position: absolute;
+                right: 0;
+                top: 20px;
+                z-index: @file-uploader-placeholder-icon__z-index;
+            }
         }
-    }
-}
-
-.file-uploader-placeholder-text {
-    bottom: 0;
-    color: @color-blue-dodger;
-    font-size: 1.1rem;
-    left: 0;
-    line-height: @line-height__base;
-    margin-bottom: 15%;
-    padding: 0 @indent__base;
-    position: absolute;
-    right: 0;
-    text-align: center;
-}
-
-//
-//  Grid image uploader
-//  ---------------------------------------------
-
-.data-grid-file-uploader {
-    min-width: @data-grid-file-uploader-wrapper__size;
 
-    &._loading {
-        .file-uploader-spinner {
-            display: block;
-        }
+        &.placeholder-video {
+            .lib-icon-font(
+                @icon-file__content,
+                @_icon-font: @icons__font-name,
+                @_icon-font-size: 3rem,
+                @_icon-font-color: @file-uploader-placeholder-icon__color,
+                @_icon-font-color-hover: @file-uploader-placeholder-icon__color
+            );
 
-        .file-uploader-button {
             &:before {
-                display: none;
+                left: 0;
+                position: absolute;
+                right: 0;
+                top: 30px;
+                z-index: @file-uploader-placeholder-icon__z-index;
             }
         }
     }
 
-    .file-uploader-image {
-        background: transparent;
+    .file-uploader-placeholder-text {
         bottom: 0;
+        color: @color-blue-dodger;
+        font-size: 1.1rem;
         left: 0;
-        margin: auto;
-        max-height: 100%;
-        max-width: 100%;
+        line-height: @line-height__base;
+        margin-bottom: 15%;
+        padding: 0 @indent__base;
         position: absolute;
         right: 0;
-        top: 0;
-        z-index: @data-grid-file-uploader-image__z-index;
+        text-align: center;
+    }
+
+    //
+    //  Grid image uploader
+    //  ---------------------------------------------
+
+    .data-grid-file-uploader {
+        min-width: @data-grid-file-uploader-wrapper__size;
+
+        &._loading {
+            .file-uploader-spinner {
+                display: block;
+            }
 
-        + .file-uploader-area {
             .file-uploader-button {
                 &:before {
                     display: none;
                 }
             }
         }
-    }
 
-    .file-uploader-area {
-        z-index: @data-grid-file-uploader-image__z-index + 1;
-    }
+        .file-uploader-image {
+            background: transparent;
+            bottom: 0;
+            left: 0;
+            margin: auto;
+            max-height: 100%;
+            max-width: 100%;
+            position: absolute;
+            right: 0;
+            top: 0;
+            z-index: @data-grid-file-uploader-image__z-index;
+
+            + .file-uploader-area {
+                .file-uploader-button {
+                    &:before {
+                        display: none;
+                    }
+                }
+            }
+        }
 
-    .file-uploader-spinner {
-        height: 100%;
-        margin: 0;
-        position: absolute;
-        top: 0;
-        width: 100%;
-    }
+        .file-uploader-area {
+            z-index: @data-grid-file-uploader-image__z-index + 1;
+        }
 
-    .file-uploader-button {
-        display: block;
-        height: @data-grid-file-uploader-upload-icon__line-height;
-        text-align: center;
+        .file-uploader-spinner {
+            height: 100%;
+            margin: 0;
+            position: absolute;
+            top: 0;
+            width: 100%;
+        }
+
+        .file-uploader-button {
+            display: block;
+            height: @data-grid-file-uploader-upload-icon__line-height;
+            text-align: center;
 
-        .lib-icon-font (
+            .lib-icon-font (
                 @icon-file__content,
-            @_icon-font: @icons__font-name,
-            @_icon-font-size: 1.3rem,
-            @_icon-font-line-height: @data-grid-file-uploader-upload-icon__line-height,
-            @_icon-font-color: @data-grid-file-uploader-upload-icon__color,
-            @_icon-font-color-hover: @data-grid-file-uploader-upload-icon__hover__color,
-            @_icon-font-text-hide: true,
-            @_icon-font-display: block
-        );
-    }
+                @_icon-font: @icons__font-name,
+                @_icon-font-size: 1.3rem,
+                @_icon-font-line-height: @data-grid-file-uploader-upload-icon__line-height,
+                @_icon-font-color: @data-grid-file-uploader-upload-icon__color,
+                @_icon-font-color-hover: @data-grid-file-uploader-upload-icon__hover__color,
+                @_icon-font-text-hide: true,
+                @_icon-font-display: block
+            );
+        }
 
-    .action-select-wrap {
-        float: left;
+        .action-select-wrap {
+            float: left;
 
-        .action-select {
-            border: 1px solid @file-uploader-preview__border-color;
-            display: block;
-            height: @data-grid-file-uploader-image__size;
-            margin-left: -1px;
-            padding: 0;
-            width: @data-grid-file-uploader-menu-button__width;
-
-            &:after {
-                border-color: @data-grid-file-uploader-upload-icon__color transparent transparent transparent;
-                left: 50%;
-                margin: 0 0 0 -5px;
-            }
+            .action-select {
+                border: 1px solid @file-uploader-preview__border-color;
+                display: block;
+                height: @data-grid-file-uploader-image__size;
+                margin-left: -1px;
+                padding: 0;
+                width: @data-grid-file-uploader-menu-button__width;
 
-            &:hover {
                 &:after {
-                    border-color: @data-grid-file-uploader-upload-icon__hover__color transparent transparent transparent;
+                    border-color: @data-grid-file-uploader-upload-icon__color transparent transparent transparent;
+                    left: 50%;
+                    margin: 0 0 0 -5px;
+                }
+
+                &:hover {
+                    &:after {
+                        border-color: @data-grid-file-uploader-upload-icon__hover__color transparent transparent transparent;
+                    }
                 }
-            }
 
-            > span {
-                display: none;
+                > span {
+                    display: none;
+                }
             }
-        }
 
-        .action-menu {
-            left: 4rem;
-            right: auto;
-            z-index: @data-grid-file-uploader-image__z-index + 1;
+            .action-menu {
+                left: 4rem;
+                right: auto;
+                z-index: @data-grid-file-uploader-image__z-index + 1;
+            }
         }
     }
-}
 
-.data-grid-file-uploader-inner {
-    border: 1px solid @file-uploader-preview__border-color;
-    float: left;
-    height: @data-grid-file-uploader-image__size;
-    position: relative;
-    width: @data-grid-file-uploader-image__size;
+    .data-grid-file-uploader-inner {
+        border: 1px solid @file-uploader-preview__border-color;
+        float: left;
+        height: @data-grid-file-uploader-image__size;
+        position: relative;
+        width: @data-grid-file-uploader-image__size;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php
index 6d9b428eeb0c5..bad30298f4224 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php
@@ -101,6 +101,8 @@ public function testInitProductLayout()
     /**
      * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
      * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store design/head/title_prefix prefix
+     * @magentoConfigFixture default_store design/head/title_suffix suffix
      * @magentoAppArea frontend
      */
     public function testPrepareAndRender()
@@ -112,6 +114,7 @@ public function testPrepareAndRender()
         /** @var \Magento\TestFramework\Response $response */
         $response = $this->objectManager->get(\Magento\TestFramework\Response::class);
         $this->page->renderResult($response);
+        $this->assertStringContainsString('prefix meta title suffix', $response->getBody());
         $this->assertNotEmpty($response->getBody());
         $this->assertEquals(
             10,
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
index 3806cdba939cd..62ef01d51d09d 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
@@ -157,7 +157,7 @@ public function getPostcodesDataProvider()
             ['countryId' => 'GH', 'postcode' => 'GA18400'],
             ['countryId' => 'GN', 'postcode' => '123'],
             ['countryId' => 'GP', 'postcode' => '12345'],
-            ['countryId' => 'GR', 'postcode' => '123 45'],
+            ['countryId' => 'GR', 'postcode' => '12345'],
             ['countryId' => 'GS', 'postcode' => 'SIQQ 1ZZ'],
             ['countryId' => 'GT', 'postcode' => '12345'],
             ['countryId' => 'GU', 'postcode' => '12345'],
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
index 642dbdb9e1290..bfea8d3c182d7 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
@@ -32,6 +32,7 @@ public function testExclusion()
             ]
         );
 
+        $result = [];
         foreach ($iterator as $i) {
             $result[] = $i;
         }
@@ -52,8 +53,8 @@ private function getFilesIterator()
 
         foreach ($files as $file) {
             $item = $this->getMockBuilder(
-                \SplFileInfoClass::class
-            )->setMethods(['__toString', 'getFilename'])->getMock();
+                \SplFileInfo::class
+            )->disableOriginalConstructor()->setMethods(['__toString', 'getFilename'])->getMock();
             $item->expects($this->any())->method('__toString')->willReturn($file);
             $item->expects($this->any())->method('getFilename')->willReturn('notDots');
             yield $item;
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php
index 73d13aa14b66b..e8f4e455e5ad8 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php
@@ -299,14 +299,12 @@ private function getSimpleNestedConfig()
                 '_vac_' => [
                     'array_value' => 'value',
                     'array_configured_instance' => [
-                        '_i_' => \Magento\Framework\ObjectManager\Test\Unit::class
-                            . '\Factory\Fixture\Compiled\DependencySharedTesting',
+                        '_i_' => DependencySharedTesting::class,
                     ],
                     'array_configured_array' => [
                         'array_array_value' => 'value',
                         'array_array_configured_instance' => [
-                            '_ins_' => \Magento\Framework\ObjectManager::class
-                                . '\Test\Unit\Factory\Fixture\Compiled\DependencyTesting',
+                            '_ins_' => DependencyTesting::class,
                         ],
                     ],
                     'array_global_argument' => [
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/SortItemsTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/SortItemsTest.php
index 44646946bafb7..3bcb84b06d559 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/SortItemsTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/SortItemsTest.php
@@ -12,11 +12,6 @@
 
 class SortItemsTest extends TestCase
 {
-    /**
-     * @var MockObject|InterpreterInterface
-     */
-    protected InterpreterInterface $_itemInterpreter;
-
     /**
      * @var SortItemsHelper
      */
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
index 339f4dbe15dcf..a373726645ce4 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
@@ -74,11 +74,8 @@ protected function setUp(): void
         $scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $cacheState = $this->getMockBuilder(StateInterface::class)
             ->getMockForAbstractClass();
-        $storeConfig = $this->getMockBuilder(\Magento\Store\Model\Store\Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->context = $this->getMockBuilder(Context::class)
-            ->setMethods(['getLayout', 'getEventManager', 'getStoreConfig', 'getScopeConfig', 'getCacheState'])
+            ->setMethods(['getLayout', 'getEventManager', 'getScopeConfig', 'getCacheState'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->context->expects($this->any())
@@ -87,9 +84,6 @@ protected function setUp(): void
         $this->context->expects($this->any())
             ->method('getEventManager')
             ->willReturn($eventManager);
-        $this->context->expects($this->any())
-            ->method('getStoreConfig')
-            ->willReturn($storeConfig);
         $this->context->expects($this->any())
             ->method('getScopeConfig')
             ->willReturn($scopeConfigMock);
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
index 511c538c7fe50..3b1a6d42ac44d 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
@@ -12,6 +12,7 @@
  * Helper class for basic object retrieving, such as blocks, models etc...
  *
  * @deprecated Class under test should be instantiated with `new` keyword with explicit dependencies declaration
+ * @see https://github.com/magento/magento2/pull/29272
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ObjectManager
@@ -29,8 +30,6 @@ class ObjectManager
     ];
 
     /**
-     * Test object
-     *
      * @var \PHPUnit\Framework\TestCase
      */
     protected $_testObject;
@@ -158,10 +157,7 @@ protected function _getMockWithoutConstructorCall($className)
      */
     public function getObject($className, array $arguments = [])
     {
-        // phpstan:ignore
-        if (is_subclass_of($className, \Magento\Framework\Api\AbstractSimpleObjectBuilder::class)
-            || is_subclass_of($className, \Magento\Framework\Api\Builder::class)
-        ) {
+        if (is_subclass_of($className, \Magento\Framework\Api\AbstractSimpleObjectBuilder::class)) {
             return $this->getBuilder($className, $arguments);
         }
         $constructArguments = $this->getConstructArguments($className, $arguments);
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php
index d74ce015ba659..e63efad9a0547 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Test Webapi Json Deserializer Request Rest Controller.
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -62,7 +60,7 @@ public function testGetLogicExceptionInvalidRequestDeserializer()
     {
         $expectedMetadata = ['text_xml' => ['type' => 'text/xml', 'model' => 'Xml']];
         $invalidInterpreter = $this->getMockBuilder(
-            \Magento\Framework\Webapi\Response\Rest\Renderer\Json::class
+            \Magento\Framework\Webapi\Rest\Response\Renderer\Json::class
         )->disableOriginalConstructor()
         ->getMock();
 
diff --git a/lib/web/css/source/lib/_breadcrumbs.less b/lib/web/css/source/lib/_breadcrumbs.less
index 0afc45acc6f16..0544863f8163e 100644
--- a/lib/web/css/source/lib/_breadcrumbs.less
+++ b/lib/web/css/source/lib/_breadcrumbs.less
@@ -12,6 +12,7 @@
     @_breadcrumbs-display: @breadcrumbs__display,
     @_breadcrumbs-container-margin: @breadcrumbs__container-margin,
     @_breadcrumbs-padding: @breadcrumbs__padding,
+    @_breadcrumbs-min-height: @breadcrumbs__min-height,
 
     //  Breadcrumbs separating symbol
     @_breadcrumbs-separator-symbol: @breadcrumbs-separator__symbol,
@@ -74,6 +75,7 @@
     @_breadcrumbs-link-gradient-color-end-active: @breadcrumbs-link__active__gradient-color-end
 ) {
     .lib-css(margin, @_breadcrumbs-container-margin);
+    .lib-css(min-height, @_breadcrumbs-min-height);
     .items {
         .lib-font-size(@_breadcrumbs-font-size);
         .lib-css(color, @_breadcrumbs-current-color);
diff --git a/lib/web/css/source/lib/variables/_breadcrumbs.less b/lib/web/css/source/lib/variables/_breadcrumbs.less
index 001ee41aa8522..65d06d946ea2a 100644
--- a/lib/web/css/source/lib/variables/_breadcrumbs.less
+++ b/lib/web/css/source/lib/variables/_breadcrumbs.less
@@ -11,6 +11,7 @@
 @breadcrumbs__display: false;
 @breadcrumbs__container-margin: 0 0 @indent__base;
 @breadcrumbs__padding: false;
+@breadcrumbs__min-height: 24px;
 
 @breadcrumbs-separator__symbol: false;
 @breadcrumbs-separator__color: @breadcrumbs-current__color;
diff --git a/lib/web/mage/gallery/gallery.js b/lib/web/mage/gallery/gallery.js
index 64a02f9f4b639..5872be6e4689e 100644
--- a/lib/web/mage/gallery/gallery.js
+++ b/lib/web/mage/gallery/gallery.js
@@ -23,8 +23,8 @@ define([
             var mainIndex;
 
             if (_.every(data, function (item) {
-                    return _.isObject(item);
-                })
+                return _.isObject(item);
+            })
             ) {
                 mainIndex = _.findIndex(data, function (item) {
                     return item.isMain;
@@ -122,7 +122,7 @@ define([
 
             this.settings = {
                 $element: $(element),
-                $pageWrapper: $('body>.page-wrapper'),
+                $pageWrapper: $('.page-wrapper'),
                 currentConfig: config,
                 defaultConfig: _.clone(config),
                 fullscreenConfig: _.clone(config.fullscreen),
@@ -277,8 +277,7 @@ define([
                 }),
                 mainImageIndex,
                 $element = settings.$element,
-                $fotoramaElement,
-                $fotoramaStage;
+                $fotoramaElement;
 
             if (settings.breakpoints) {
                 _.each(_.values(settings.breakpoints), function (breakpoint) {
@@ -286,7 +285,7 @@ define([
 
                     _.each(_.pairs(breakpoint.conditions), function (pair) {
                         conditions = conditions ? conditions + ' and (' + pair[0] + ': ' + pair[1] + ')' :
-                        '(' + pair[0] + ': ' + pair[1] + ')';
+                            '(' + pair[0] + ': ' + pair[1] + ')';
                     });
                     breakpoints[conditions] = breakpoint.options;
                 });
@@ -308,20 +307,13 @@ define([
 
             $fotoramaElement = $element.find('[data-gallery-role="gallery"]');
 
-            $fotoramaStage = $fotoramaElement.find('.fotorama__stage');
-            $fotoramaStage.css('position', 'absolute');
-
             $fotoramaElement.fotorama(config);
             $fotoramaElement.find('.fotorama__stage__frame.fotorama__active')
-                    .one('f:load', function () {
-                        // Remove placeholder when main gallery image loads.
-                        $element.find('.gallery-placeholder__image').remove();
-                        $element
-                            .removeClass('_block-content-loading')
-                            .css('min-height', '');
-
-                        $fotoramaStage.css('position', '');
-                    });
+                .one('f:load', function () {
+                    $element
+                        .removeClass('_block-content-loading')
+                        .css('min-height', '');
+                });
             settings.$elementF = $fotoramaElement;
             settings.fotoramaApi = $fotoramaElement.data('fotorama');
 
diff --git a/lib/web/mage/gallery/gallery.less b/lib/web/mage/gallery/gallery.less
index 00b1488ad21ca..958843664b648 100644
--- a/lib/web/mage/gallery/gallery.less
+++ b/lib/web/mage/gallery/gallery.less
@@ -867,6 +867,10 @@
 }
 
 .fotorama__nav-wrap--horizontal {
+    &.fotorama__nav-wrap {
+        min-height: 30px;
+    }
+
     .fotorama__thumb__arr--left,
     .fotorama__thumb__arr--right {
         bottom: 0;
@@ -1024,3 +1028,17 @@
         display: none !important;
     }
 }
+
+._block-content-loading .fotorama-item {
+    position: absolute !important;
+    z-index: -1;
+    top: 0;
+    width: 100%;
+}
+
+.gallery-placeholder:not(._block-content-loading) {
+    // Hide placeholder when gallery is loaded
+    .gallery-placeholder__image {
+        display: none;
+    }
+}
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
index a606c266d3827..5baefb19d6fbf 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -42,42 +44,55 @@ public function collectEntities(array $files)
             $virtualTypeQuery = "//virtualType/@name";
 
             foreach ($xpath->query($virtualTypeQuery) as $virtualNode) {
-                $virtualTypes[] = $virtualNode->nodeValue;
-            }
-
-            $regex = '/^(.*)\\\(.*)Proxy$/';
-            $query = "/config/preference[ php:functionString('preg_match', '{$regex}', @type) > 0]/@type | " .
-                "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
-                "//item[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
-                "/config/virtualType[ php:functionString('preg_match', '{$regex}', @type) > 0]/@type";
-            /** @var \DOMNode $node */
-            foreach ($xpath->query($query) as $node) {
-                $output[] = $node->nodeValue;
+                $virtualTypes[] = ltrim($virtualNode->nodeValue, '\\');
             }
 
-            $factoriesOutput = array_merge($factoriesOutput, $this->scanFactories($xpath));
+            $output[] = $this->scanProxies($xpath);
+            $factoriesOutput[] = $this->scanFactories($xpath);
         }
 
-        $output = array_unique($output);
-        $factoriesOutput = array_unique($factoriesOutput);
+        $output = array_unique(array_merge([], ...$output));
+        $factoriesOutput = array_unique(array_merge([], ...$factoriesOutput));
         $factoriesOutput = array_diff($factoriesOutput, $virtualTypes);
         return array_merge($this->_filterEntities($output), $factoriesOutput);
     }
 
     /**
-     * Scan factories from all di.xml and retrieve non virtual one
+     * Scan proxies from all di.xml
+     *
+     * @param \DOMXPath $xpath
+     * @return array
+     */
+    private function scanProxies(\DOMXPath $xpath): array
+    {
+        $result = [];
+        $regex = '/^(\s+)?(.*)\\\(.*)Proxy(\s+)?$/';
+        $query = "/config/preference[ php:functionString('preg_match', '{$regex}', @type) > 0]/@type | " .
+            "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
+            "//item[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
+            "/config/virtualType[ php:functionString('preg_match', '{$regex}', @type) > 0]/@type";
+        /** @var \DOMNode $node */
+        foreach ($xpath->query($query) as $node) {
+            $result[] = ltrim(trim($node->nodeValue), '\\');
+        }
+        return $result;
+    }
+
+    /**
+     * Scan factories from all di.xml and retrieve non-virtual one
      *
      * @param \DOMXPath $domXpath
      * @return array
      */
-    private function scanFactories(\DOMXPath $domXpath)
+    private function scanFactories(\DOMXPath $domXpath): array
     {
         $output = [];
-        $regex = '/^(.*)Factory$/';
+        $regex = '/^(\s+)?(.*)Factory(\s+)?$/';
         $query = "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
             "//item[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0]";
+
         foreach ($domXpath->query($query) as $node) {
-            $output[] = $node->nodeValue;
+            $output[] = ltrim(trim($node->nodeValue), '\\');
         }
 
         return $output;
@@ -94,13 +109,13 @@ protected function _filterEntities(array $output)
         $entitySuffix = '\\' . ucfirst(ProxyGenerator::ENTITY_TYPE);
         $filteredEntities = [];
         foreach ($output as $className) {
-            $entityName = substr($className, -strlen($entitySuffix)) === $entitySuffix
+            $entityName = str_ends_with($className, $entitySuffix)
                 ? substr($className, 0, -strlen($entitySuffix))
                 : $className;
             $isClassExists = false;
             try {
                 $isClassExists = class_exists($className);
-            } catch (\RuntimeException $e) {
+            } catch (\RuntimeException $e) { //@codingStandardsIgnoreLine
             }
             if (false === $isClassExists) {
                 if (class_exists($entityName) || interface_exists($entityName)) {
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassesScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassesScannerTest.php
index e2c1708089bab..4e72f82409c7d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassesScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassesScannerTest.php
@@ -43,6 +43,6 @@ public function testGetList()
         $pathToScan = str_replace('\\', '/', realpath(__DIR__ . '/../../') . '/_files/app/code/Magento/SomeModule');
         $actual = $this->model->getList($pathToScan);
         $this->assertIsArray($actual);
-        $this->assertCount(6, $actual);
+        $this->assertCount(7, $actual);
     }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlScannerTest.php
index 11208d18ffcbc..9d0f66a6a471d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlScannerTest.php
@@ -17,32 +17,33 @@ class XmlScannerTest extends TestCase
     /**
      * @var XmlScanner
      */
-    protected $_model;
+    private XmlScanner $model;
 
     /**
      * @var MockObject
      */
-    protected $_logMock;
+    private Log $logMock;
 
     /**
      * @var array
      */
-    protected $_testFiles = [];
+    private array $testFiles = [];
 
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $this->_model = new XmlScanner(
-            $this->_logMock = $this->createMock(Log::class)
-        );
+        $this->logMock = $this->createMock(Log::class);
+        $this->model = new XmlScanner($this->logMock);
         $testDir = __DIR__ . '/../../' . '/_files';
-        $this->_testFiles = [
+        $this->testFiles = [
             $testDir . '/app/code/Magento/SomeModule/etc/adminhtml/system.xml',
             $testDir . '/app/code/Magento/SomeModule/etc/di.xml',
             $testDir . '/app/code/Magento/SomeModule/view/frontend/default.xml',
         ];
+        require_once  __DIR__ . '/../../_files/app/code/Magento/SomeModule/Element.php';
+        require_once  __DIR__ . '/../../_files/app/code/Magento/SomeModule/NestedElement.php';
     }
 
     /**
@@ -51,7 +52,7 @@ protected function setUp(): void
     public function testCollectEntities(): void
     {
         $className = 'Magento\Store\Model\Config\Invalidator\Proxy';
-        $this->_logMock
+        $this->logMock
             ->method('add')
             ->withConsecutive(
                 [
@@ -61,16 +62,26 @@ public function testCollectEntities(): void
                 ],
                 [
                     4,
-                    '\Magento\SomeModule\Model\Element\Proxy',
-                    'Invalid proxy class for ' . substr('\Magento\SomeModule\Model\Element\Proxy', 0, -5)
+                    'Magento\SomeModule\Model\Element\Proxy',
+                    'Invalid proxy class for ' . substr('Magento\SomeModule\Model\Element\Proxy', 0, -5)
                 ],
                 [
                     4,
-                    '\Magento\SomeModule\Model\Nested\Element\Proxy',
-                    'Invalid proxy class for ' . substr('\Magento\SomeModule\Model\Nested\Element\Proxy', 0, -5)
-                ]
+                    'Magento\SomeModule\Model\Element2\Proxy',
+                    'Invalid proxy class for ' . substr('Magento\SomeModule\Model\Element2\Proxy', 0, -5)
+                ],
+                [
+                    4,
+                    'Magento\SomeModule\Model\Nested\Element\Proxy',
+                    'Invalid proxy class for ' . substr('Magento\SomeModule\Model\Nested\Element\Proxy', 0, -5)
+                ],
+                [
+                    4,
+                    'Magento\SomeModule\Model\Nested\Element2\Proxy',
+                    'Invalid proxy class for ' . substr('Magento\SomeModule\Model\Nested\Element2\Proxy', 0, -5)
+                ],
             );
-        $actual = $this->_model->collectEntities($this->_testFiles);
+        $actual = $this->model->collectEntities($this->testFiles);
         $expected = [];
         $this->assertEquals($expected, $actual);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/NestedElement.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/NestedElement.php
new file mode 100644
index 0000000000000..1ad64f8b52a17
--- /dev/null
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/NestedElement.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SomeModule;
+
+class NestedElement
+{
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/etc/di.xml b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/etc/di.xml
index 8332fd77b0e3d..96d02af5c4db0 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/etc/di.xml
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/etc/di.xml
@@ -13,9 +13,48 @@
     </virtualType>
     <type name="Magento\SomeModule\Model\Test">
         <arguments>
+            <!-- non-existing class proxy - inline -->
             <argument name="proxy" xsi:type="object">\Magento\SomeModule\Model\Element\Proxy</argument>
+            <argument name="proxy2" xsi:type="object">Magento\SomeModule\Model\Element\Proxy</argument>
+            <!-- non-existing class proxy - multi-line -->
+            <argument name="proxy3" xsi:type="object">
+                \Magento\SomeModule\Model\Element2\Proxy
+            </argument>
+            <argument name="proxy4" xsi:type="object">
+                Magento\SomeModule\Model\Element2\Proxy
+            </argument>
+            <!-- existing class proxy - multi-line -->
+            <argument name="proxy5" xsi:type="object">
+                \Magento\SomeModule\Element\Proxy
+            </argument>
+            <argument name="proxy6" xsi:type="object">
+                Magento\SomeModule\Element\Proxy
+            </argument>
+            <!-- existing class proxy - inline -->
+            <argument name="proxy7" xsi:type="object">\Magento\SomeModule\Element\Proxy</argument>
+            <argument name="proxy8" xsi:type="object">Magento\SomeModule\Element\Proxy</argument>
+
             <argument name="array" xsi:type="array">
+                <!-- non-existing class proxy - inline -->
                 <item name="proxy" xsi:type="object">\Magento\SomeModule\Model\Nested\Element\Proxy</item>
+                <item name="proxy2" xsi:type="object">Magento\SomeModule\Model\Nested\Element\Proxy</item>
+                <!-- non-existing class proxy - multi-line -->
+                <item name="proxy3" xsi:type="object">
+                    \Magento\SomeModule\Model\Nested\Element2\Proxy
+                </item>
+                <item name="proxy4" xsi:type="object">
+                    \Magento\SomeModule\Model\Nested\Element2\Proxy
+                </item>
+                <!-- existing class proxy - multi-line -->
+                <item name="proxy5" xsi:type="object">
+                    \Magento\SomeModule\NestedElement\Proxy
+                </item>
+                <item name="proxy6" xsi:type="object">
+                    Magento\SomeModule\NestedElement\Proxy
+                </item>
+                <!-- existing class proxy - inline -->
+                <item name="proxy7" xsi:type="object">\Magento\SomeModule\NestedElement\Proxy</item>
+                <item name="proxy8" xsi:type="object">Magento\SomeModule\NestedElement\Proxy</item>
             </argument>
         </arguments>
     </type>