diff --git a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
index ec2e697ccc849..b736700a4481d 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
@@ -20,6 +20,8 @@
  *
  * Service which allows to sync product widget information, such as product id with db. In order to reuse this info
  * on different devices
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Synchronizer
 {
@@ -94,6 +96,7 @@ public function __construct(
      *
      * @param string $namespace
      * @return int
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getLifeTimeByNamespace($namespace)
     {
@@ -119,6 +122,7 @@ private function getLifeTimeByNamespace($namespace)
      * @param array $productsData (product action data, that came from frontend)
      * @param string $typeId namespace (type of action)
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function filterNewestActions(array $productsData, $typeId)
     {
@@ -166,6 +170,7 @@ private function getProductIdsByActions(array $actions)
      * @param array $productsData
      * @param string $typeId
      * @return void
+     * @throws \Exception
      */
     public function syncActions(array $productsData, $typeId)
     {
@@ -189,8 +194,7 @@ public function syncActions(array $productsData, $typeId)
             foreach ($collection as $item) {
                 $this->entityManager->delete($item);
             }
-
-            foreach ($productsData as $productId => $productData) {
+            foreach ($productsData as $productData) {
                 /** @var ProductFrontendActionInterface $action */
                 $action = $this->productFrontendActionFactory->create(
                     [
@@ -198,7 +202,7 @@ public function syncActions(array $productsData, $typeId)
                             'visitor_id' => $customerId ? null : $visitorId,
                             'customer_id' => $this->session->getCustomerId(),
                             'added_at' => $productData['added_at'],
-                            'product_id' => $productId,
+                            'product_id' => $productData['product_id'],
                             'type_id' => $typeId
                         ]
                     ]
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index afbe279045a38..14daac0147abf 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -1904,6 +1904,7 @@ protected function _productLimitationJoinPrice()
      * @see \Magento\Catalog\Model\ResourceModel\Product\Collection::_productLimitationJoinPrice()
      * @param bool $joinLeft
      * @return $this
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _productLimitationPrice($joinLeft = false)
     {
@@ -1922,14 +1923,14 @@ protected function _productLimitationPrice($joinLeft = false)
 
         $connection = $this->getConnection();
         $select = $this->getSelect();
-        $joinCond = join(
-            ' AND ',
-            [
-                'price_index.entity_id = e.entity_id',
-                $connection->quoteInto('price_index.website_id = ?', $filters['website_id']),
-                $connection->quoteInto('price_index.customer_group_id = ?', $filters['customer_group_id'])
-            ]
-        );
+        $joinCondArray = [];
+        $joinCondArray[] = 'price_index.entity_id = e.entity_id';
+        $joinCondArray[] = $connection->quoteInto('price_index.customer_group_id = ?', $filters['customer_group_id']);
+        // Add website condition only if it's different from admin scope
+        if (((int) $filters['website_id']) !== Store::DEFAULT_STORE_ID) {
+            $joinCondArray[] = $connection->quoteInto('price_index.website_id = ?', $filters['website_id']);
+        }
+        $joinCond = join(' AND ', $joinCondArray);
 
         $fromPart = $select->getPart(\Magento\Framework\DB\Select::FROM);
         if (!isset($fromPart['price_index'])) {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
index 38bed83cb9504..8b70899cd26d3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
@@ -82,15 +82,15 @@ public function testFilterProductActions()
     {
         $typeId = 'recently_compared_product';
         $productsData = [
-            1 => [
+            'website-1-1' => [
                 'added_at' => 12,
                 'product_id' => 1,
             ],
-            2 => [
+            'website-1-2' => [
                 'added_at' => 13,
                 'product_id' => '2',
             ],
-            3 => [
+            'website-2-3' => [
                 'added_at' => 14,
                 'product_id' => 3,
             ]
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index ae5f0f5d79e2a..d1bce7aaaf951 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -307,6 +307,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         // Can't add new translated strings in patch release
         'invalidLayoutUpdate' => 'Invalid format.',
         'insufficientPermissions' => 'Invalid format.',
+        ValidatorInterface::ERROR_SKU_MARGINAL_WHITESPACES => 'SKU contains marginal whitespaces'
     ];
     //@codingStandardsIgnoreEnd
 
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
index f41596ad185a6..f13b603003898 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
@@ -87,6 +87,8 @@ interface RowValidatorInterface extends \Magento\Framework\Validator\ValidatorIn
 
     const ERROR_DUPLICATE_MULTISELECT_VALUES = 'duplicatedMultiselectValues';
 
+    const ERROR_SKU_MARGINAL_WHITESPACES = 'skuMarginalWhitespaces';
+
     /**
      * Value that means all entities (e.g. websites, groups etc.)
      */
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index 4b7416f6ad9a6..b2eca68db4d1c 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -10,7 +10,7 @@
 use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 
 /**
- * Class Validator
+ * Product import model validator
  *
  * @api
  * @since 100.0.2
@@ -72,8 +72,12 @@ protected function textValidation($attrCode, $type)
         $val = $this->string->cleanString($this->_rowData[$attrCode]);
         if ($type == 'text') {
             $valid = $this->string->strlen($val) < Product::DB_MAX_TEXT_LENGTH;
-        } else if ($attrCode == Product::COL_SKU) {
+        } elseif ($attrCode == Product::COL_SKU) {
             $valid = $this->string->strlen($val) <= SKU::SKU_MAX_LENGTH;
+            if ($this->string->strlen($val) !== $this->string->strlen(trim($val))) {
+                $this->_addMessages([RowValidatorInterface::ERROR_SKU_MARGINAL_WHITESPACES]);
+                return false;
+            }
         } else {
             $valid = $this->string->strlen($val) < Product::DB_MAX_VARCHAR_LENGTH;
         }
@@ -359,5 +363,7 @@ public function init($context)
         foreach ($this->validators as $validator) {
             $validator->init($context);
         }
+
+        return $this;
     }
 }
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index eca994de0892f..f9340a495de65 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -11,6 +11,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ProductCategoryList;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Store\Model\Store;
 
 /**
@@ -122,46 +123,34 @@ protected function _addSpecialAttributes(array &$attributes)
     /**
      * Add condition to collection
      *
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+     * @param Collection $collection
      * @return $this
      */
     public function addToCollection($collection)
     {
         $attribute = $this->getAttributeObject();
+        $attributeCode = $attribute->getAttributeCode();
+        if ($attributeCode !== 'price' || !$collection->getLimitationFilters()->isUsingPriceIndex()) {
+            if ($collection->isEnabledFlat()) {
+                if ($attribute->isEnabledInFlat()) {
+                    $alias = array_keys($collection->getSelect()->getPart('from'))[0];
+                    $this->joinedAttributes[$attributeCode] = $alias . '.' . $attributeCode;
+                } else {
+                    $alias = 'at_' . $attributeCode;
+                    if (!in_array($alias, array_keys($collection->getSelect()->getPart('from')))) {
+                        $collection->joinAttribute($attributeCode, "catalog_product/$attributeCode", 'entity_id');
+                    }
 
-        if ($collection->isEnabledFlat()) {
-            if ($attribute->isEnabledInFlat()) {
-                $alias = array_keys($collection->getSelect()->getPart('from'))[0];
-                $this->joinedAttributes[$attribute->getAttributeCode()] = $alias . '.' . $attribute->getAttributeCode();
-            } else {
-                $alias = 'at_' . $attribute->getAttributeCode();
-                if (!in_array($alias, array_keys($collection->getSelect()->getPart('from')))) {
-                    $collection->joinAttribute(
-                        $attribute->getAttributeCode(),
-                        'catalog_product/'.$attribute->getAttributeCode(),
-                        'entity_id'
-                    );
+                    $this->joinedAttributes[$attributeCode] = $alias . '.value';
                 }
-
-                $this->joinedAttributes[$attribute->getAttributeCode()] = $alias . '.value';
+            } elseif ($attributeCode !== 'category_ids' && !$attribute->isStatic()) {
+                $this->addAttributeToCollection($attribute, $collection);
+                $attributes = $this->getRule()->getCollectedAttributes();
+                $attributes[$attributeCode] = true;
+                $this->getRule()->setCollectedAttributes($attributes);
             }
-            return $this;
         }
 
-        if ('category_ids' == $attribute->getAttributeCode() || $attribute->isStatic()) {
-            return $this;
-        }
-
-        if ($attribute->getBackend() && $attribute->isScopeGlobal()) {
-            $this->addGlobalAttribute($attribute, $collection);
-        } else {
-            $this->addNotGlobalAttribute($attribute, $collection);
-        }
-
-        $attributes = $this->getRule()->getCollectedAttributes();
-        $attributes[$attribute->getAttributeCode()] = true;
-        $this->getRule()->setCollectedAttributes($attributes);
-
         return $this;
     }
 
@@ -169,12 +158,12 @@ public function addToCollection($collection)
      * Adds Attributes that belong to Global Scope
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+     * @param Collection $collection
      * @return $this
      */
     protected function addGlobalAttribute(
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute,
-        \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+        Collection $collection
     ) {
         switch ($attribute->getBackendType()) {
             case 'decimal':
@@ -207,12 +196,12 @@ protected function addGlobalAttribute(
      * Adds Attributes that don't belong to Global Scope
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+     * @param Collection $collection
      * @return $this
      */
     protected function addNotGlobalAttribute(
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute,
-        \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+        Collection $collection
     ) {
         $storeId = $this->storeManager->getStore()->getId();
         $values = $collection->getAllAttributeValues($attribute);
@@ -255,6 +244,8 @@ public function getMappedSqlField()
             $result = parent::getMappedSqlField();
         } elseif (isset($this->joinedAttributes[$this->getAttribute()])) {
             $result = $this->joinedAttributes[$this->getAttribute()];
+        } elseif ($this->getAttribute() === 'price') {
+            $result = 'price_index.min_price';
         } elseif ($this->getAttributeObject()->isStatic()) {
             $result = $this->getAttributeObject()->getAttributeCode();
         } elseif ($this->getValueParsed()) {
@@ -267,11 +258,27 @@ public function getMappedSqlField()
     /**
      * @inheritdoc
      *
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
+     * @param Collection $productCollection
      * @return $this
      */
     public function collectValidatedAttributes($productCollection)
     {
         return $this->addToCollection($productCollection);
     }
+
+    /**
+     * Add attribute to collection based on scope
+     *
+     * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
+     * @param Collection $collection
+     * @return void
+     */
+    private function addAttributeToCollection($attribute, $collection): void
+    {
+        if ($attribute->getBackend() && $attribute->isScopeGlobal()) {
+            $this->addGlobalAttribute($attribute, $collection);
+        } else {
+            $this->addNotGlobalAttribute($attribute, $collection);
+        }
+    }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
index 97d0b35a2354f..a3370b2666264 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -21,6 +21,7 @@
 use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem\Driver\File;
 
 /**
  * Process template text for wysiwyg editor.
@@ -67,6 +68,11 @@ class Directive extends Action implements HttpGetActionInterface
      */
     private $filter;
 
+    /**
+     * @var File
+     */
+    private $file;
+
     /**
      * Constructor
      *
@@ -77,6 +83,7 @@ class Directive extends Action implements HttpGetActionInterface
      * @param LoggerInterface|null $logger
      * @param Config|null $config
      * @param Filter|null $filter
+     * @param File|null $file
      */
     public function __construct(
         Context $context,
@@ -85,7 +92,8 @@ public function __construct(
         AdapterFactory $adapterFactory = null,
         LoggerInterface $logger = null,
         Config $config = null,
-        Filter $filter = null
+        Filter $filter = null,
+        File $file = null
     ) {
         parent::__construct($context);
         $this->urlDecoder = $urlDecoder;
@@ -94,6 +102,7 @@ public function __construct(
         $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
         $this->config = $config ?: ObjectManager::getInstance()->get(Config::class);
         $this->filter = $filter ?: ObjectManager::getInstance()->get(Filter::class);
+        $this->file = $file ?: ObjectManager::getInstance()->get(File::class);
     }
 
     /**
@@ -127,6 +136,15 @@ public function execute()
                 $this->logger->warning($e);
             }
         }
+        $mimeType = $image->getMimeType();
+        unset($image);
+        // To avoid issues with PNG images with alpha blending we return raw file
+        // after validation as an image source instead of generating the new PNG image
+        // with image adapter
+        $content = $this->file->fileGetContents($imagePath);
+        $resultRaw->setHeader('Content-Type', $mimeType);
+        $resultRaw->setContents($content);
+
         return $resultRaw;
     }
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
index 5fea276225622..be9f6b8d8ccd5 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
@@ -5,100 +5,123 @@
  */
 namespace Magento\Cms\Test\Unit\Controller\Adminhtml\Wysiwyg;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive;
+use Magento\Cms\Model\Template\Filter;
+use Magento\Cms\Model\Wysiwyg\Config;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\Result\Raw;
+use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Image\Adapter\AdapterInterface;
+use Magento\Framework\Image\AdapterFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Url\DecoderInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+use Psr\Log\LoggerInterface;
+
 /**
  * @covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class DirectiveTest extends \PHPUnit\Framework\TestCase
+class DirectiveTest extends TestCase
 {
     const IMAGE_PATH = 'pub/media/wysiwyg/image.jpg';
 
     /**
-     * @var \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive
+     * @var Directive
      */
     protected $wysiwygDirective;
 
     /**
-     * @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|PHPUnit_Framework_MockObject_MockObject
      */
     protected $actionContextMock;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RequestInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $requestMock;
 
     /**
-     * @var \Magento\Framework\Url\DecoderInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DecoderInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $urlDecoderMock;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManagerInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $objectManagerMock;
 
     /**
-     * @var \Magento\Cms\Model\Template\Filter|\PHPUnit_Framework_MockObject_MockObject
+     * @var Filter|PHPUnit_Framework_MockObject_MockObject
      */
     protected $templateFilterMock;
 
     /**
-     * @var \Magento\Framework\Image\AdapterFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var AdapterFactory|PHPUnit_Framework_MockObject_MockObject
      */
     protected $imageAdapterFactoryMock;
 
     /**
-     * @var \Magento\Framework\Image\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AdapterInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $imageAdapterMock;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $responseMock;
 
     /**
-     * @var \Magento\Cms\Model\Wysiwyg\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var File|PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fileMock;
+
+    /**
+     * @var Config|PHPUnit_Framework_MockObject_MockObject
      */
     protected $wysiwygConfigMock;
 
     /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LoggerInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $loggerMock;
 
     /**
-     * @var \Magento\Framework\Controller\Result\RawFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var RawFactory|PHPUnit_Framework_MockObject_MockObject
      */
     protected $rawFactoryMock;
 
     /**
-     * @var \Magento\Framework\Controller\Result\Raw|\PHPUnit_Framework_MockObject_MockObject
+     * @var Raw|PHPUnit_Framework_MockObject_MockObject
      */
     protected $rawMock;
 
     protected function setUp()
     {
-        $this->actionContextMock = $this->getMockBuilder(\Magento\Backend\App\Action\Context::class)
+        $this->actionContextMock = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->urlDecoderMock = $this->getMockBuilder(\Magento\Framework\Url\DecoderInterface::class)
+        $this->urlDecoderMock = $this->getMockBuilder(DecoderInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->templateFilterMock = $this->getMockBuilder(\Magento\Cms\Model\Template\Filter::class)
+        $this->templateFilterMock = $this->getMockBuilder(Filter::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->imageAdapterFactoryMock = $this->getMockBuilder(\Magento\Framework\Image\AdapterFactory::class)
+        $this->imageAdapterFactoryMock = $this->getMockBuilder(AdapterFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->imageAdapterMock = $this->getMockBuilder(\Magento\Framework\Image\Adapter\AdapterInterface::class)
+        $this->imageAdapterMock = $this->getMockBuilder(AdapterInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(
                 [
@@ -117,21 +140,25 @@ protected function setUp()
                 ]
             )
             ->getMock();
-        $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
+        $this->responseMock = $this->getMockBuilder(ResponseInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['setHeader', 'setBody', 'sendResponse'])
             ->getMock();
-        $this->wysiwygConfigMock = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\Config::class)
+        $this->fileMock = $this->getMockBuilder(File::class)
             ->disableOriginalConstructor()
+            ->setMethods(['fileGetContents'])
             ->getMock();
-        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+        $this->wysiwygConfigMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->rawFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\RawFactory::class)
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->rawFactoryMock = $this->getMockBuilder(RawFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->rawMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Raw::class)
+        $this->rawMock = $this->getMockBuilder(Raw::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -145,9 +172,9 @@ protected function setUp()
             ->method('getObjectManager')
             ->willReturn($this->objectManagerMock);
 
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectManager = new ObjectManager($this);
         $this->wysiwygDirective = $objectManager->getObject(
-            \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::class,
+            Directive::class,
             [
                 'context' => $this->actionContextMock,
                 'urlDecoder' => $this->urlDecoderMock,
@@ -155,7 +182,8 @@ protected function setUp()
                 'adapterFactory' => $this->imageAdapterFactoryMock,
                 'logger' => $this->loggerMock,
                 'config' => $this->wysiwygConfigMock,
-                'filter' => $this->templateFilterMock
+                'filter' => $this->templateFilterMock,
+                'file' => $this->fileMock,
             ]
         );
     }
@@ -172,23 +200,29 @@ public function testExecute()
         $this->imageAdapterMock->expects($this->once())
             ->method('open')
             ->with(self::IMAGE_PATH);
-        $this->imageAdapterMock->expects($this->once())
+        $this->imageAdapterMock->expects($this->atLeastOnce())
             ->method('getMimeType')
             ->willReturn($mimeType);
-        $this->rawMock->expects($this->once())
+        $this->rawMock->expects($this->atLeastOnce())
             ->method('setHeader')
             ->with('Content-Type', $mimeType)
             ->willReturnSelf();
-        $this->rawMock->expects($this->once())
+        $this->rawMock->expects($this->atLeastOnce())
             ->method('setContents')
             ->with($imageBody)
             ->willReturnSelf();
         $this->imageAdapterMock->expects($this->once())
             ->method('getImage')
             ->willReturn($imageBody);
+        $this->fileMock->expects($this->once())
+            ->method('fileGetContents')
+            ->willReturn($imageBody);
         $this->rawFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->rawMock);
+        $this->imageAdapterFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->imageAdapterMock);
 
         $this->assertSame(
             $this->rawMock,
@@ -217,20 +251,23 @@ public function testExecuteException()
         $this->imageAdapterMock->expects($this->at(1))
             ->method('open')
             ->with($placeholderPath);
-        $this->imageAdapterMock->expects($this->once())
+        $this->imageAdapterMock->expects($this->atLeastOnce())
             ->method('getMimeType')
             ->willReturn($mimeType);
-        $this->rawMock->expects($this->once())
+        $this->rawMock->expects($this->atLeastOnce())
             ->method('setHeader')
             ->with('Content-Type', $mimeType)
             ->willReturnSelf();
-        $this->rawMock->expects($this->once())
+        $this->rawMock->expects($this->atLeastOnce())
             ->method('setContents')
             ->with($imageBody)
             ->willReturnSelf();
-        $this->imageAdapterMock->expects($this->once())
+        $this->imageAdapterMock->expects($this->any())
             ->method('getImage')
             ->willReturn($imageBody);
+        $this->fileMock->expects($this->once())
+            ->method('fileGetContents')
+            ->willReturn($imageBody);
         $this->loggerMock->expects($this->once())
             ->method('warning')
             ->with($exception);
@@ -238,6 +275,10 @@ public function testExecuteException()
             ->method('create')
             ->willReturn($this->rawMock);
 
+        $this->imageAdapterFactoryMock->expects($this->exactly(1))
+            ->method('create')
+            ->willReturn($this->imageAdapterMock);
+
         $this->assertSame(
             $this->rawMock,
             $this->wysiwygDirective->execute()
@@ -297,6 +338,20 @@ public function testExecuteWithDeletedImage()
             ->method('warning')
             ->with($exception);
 
+        $this->rawMock->expects($this->once())
+            ->method('setHeader')
+            ->with('Content-Type', null)
+            ->willReturnSelf();
+
+        $this->rawMock->expects($this->once())
+            ->method('setContents')
+            ->with(null)
+            ->willReturnSelf();
+
+        $this->rawFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->rawMock);
+
         $this->wysiwygDirective->execute();
     }
 }
diff --git a/app/code/Magento/Customer/Model/Indexer/Processor.php b/app/code/Magento/Customer/Model/Indexer/Processor.php
new file mode 100644
index 0000000000000..6b44b674b405a
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Indexer/Processor.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model\Indexer;
+
+use Magento\Customer\Model\Customer;
+
+/**
+ * Customer indexer
+ */
+class Processor extends \Magento\Framework\Indexer\AbstractProcessor
+{
+    const INDEXER_ID = Customer::CUSTOMER_GRID_INDEXER_ID;
+}
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
index 0f4c5f82bfe1d..4a22dc83a1f31 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
@@ -6,6 +6,7 @@
 namespace Magento\CustomerImportExport\Model\Import;
 
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\Customer\Model\Indexer\Processor;
 
 /**
  * Import entity customer combined model
@@ -148,6 +149,11 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      */
     protected $masterAttributeCode = 'email';
 
+    /**
+     * @var Processor
+     */
+    private $indexerProcessor;
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -158,6 +164,7 @@ class CustomerComposite extends \Magento\ImportExport\Model\Import\AbstractEntit
      * @param \Magento\CustomerImportExport\Model\ResourceModel\Import\CustomerComposite\DataFactory $dataFactory
      * @param \Magento\CustomerImportExport\Model\Import\CustomerFactory $customerFactory
      * @param \Magento\CustomerImportExport\Model\Import\AddressFactory $addressFactory
+     * @param Processor $indexerProcessor
      * @param array $data
      * @throws \Magento\Framework\Exception\LocalizedException
      *
@@ -173,6 +180,7 @@ public function __construct(
         \Magento\CustomerImportExport\Model\ResourceModel\Import\CustomerComposite\DataFactory $dataFactory,
         \Magento\CustomerImportExport\Model\Import\CustomerFactory $customerFactory,
         \Magento\CustomerImportExport\Model\Import\AddressFactory $addressFactory,
+        Processor $indexerProcessor,
         array $data = []
     ) {
         parent::__construct($string, $scopeConfig, $importFactory, $resourceHelper, $resource, $errorAggregator, $data);
@@ -230,6 +238,7 @@ public function __construct(
         } else {
             $this->_nextCustomerId = $resourceHelper->getNextAutoincrement($this->_customerEntity->getEntityTable());
         }
+        $this->indexerProcessor = $indexerProcessor;
     }
 
     /**
@@ -273,11 +282,12 @@ protected function _importData()
         $this->countItemsCreated += $this->_customerEntity->getCreatedItemsCount();
         $this->countItemsUpdated += $this->_customerEntity->getUpdatedItemsCount();
         $this->countItemsDeleted += $this->_customerEntity->getDeletedItemsCount();
-
         if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE) {
-            return $result && $this->_addressEntity->setCustomerAttributes($this->_customerAttributes)->importData();
+            $result = $result && $this->_addressEntity->setCustomerAttributes($this->_customerAttributes)->importData();
+        }
+        if ($result) {
+            $this->indexerProcessor->markIndexerAsInvalid();
         }
-
         return $result;
     }
 
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
index 1b900c2139588..7aff0f911c2b0 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
@@ -15,7 +15,7 @@
 use Magento\ImportExport\Model\Import\Source\Csv;
 
 /**
- * Customer composite test
+ * The test for Customer composite model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -88,6 +88,12 @@ class CustomerCompositeTest extends \PHPUnit\Framework\TestCase
      */
     protected $errorFactory;
 
+    /**
+     * @var \Magento\Customer\Model\Indexer\Processor
+     * |\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $indexerProcessor;
+
     /**
      * Expected prepared data after method CustomerComposite::_prepareRowForDb
      *
@@ -141,6 +147,7 @@ protected function setUp()
             ->getMock();
 
         $this->_scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->indexerProcessor = $this->createMock(\Magento\Customer\Model\Indexer\Processor::class);
     }
 
     /**
@@ -159,6 +166,7 @@ protected function _createModelMock($data)
             $this->_dataFactory,
             $this->_customerFactory,
             $this->_addressFactory,
+            $this->indexerProcessor,
             $data
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ProductFrontendAction/SynchronizerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ProductFrontendAction/SynchronizerTest.php
index 3ea30005e9f6c..5cf53349480f1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ProductFrontendAction/SynchronizerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ProductFrontendAction/SynchronizerTest.php
@@ -40,20 +40,24 @@ protected function setUp()
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSyncActions(): void
     {
         $actionsType = 'recently_viewed_product';
+        $productScope = 'website';
+        $scopeId = 1;
         $product1 = $this->productRepository->get('simple');
         $product2 = $this->productRepository->get('simple2');
         $product1Id = $product1->getId();
         $product2Id = $product2->getId();
         $productsData = [
-            $product1Id => [
+            $productScope . '-' . $scopeId . '-' . $product1Id => [
                 'added_at' => '1576582660',
                 'product_id' => $product1Id,
             ],
-            $product2Id => [
+            $productScope . '-' . $scopeId . '-' . $product2Id => [
                 'added_at' => '1576587153',
                 'product_id' => $product2Id,
             ],
@@ -71,8 +75,9 @@ public function testSyncActions(): void
         );
 
         foreach ($synchronizedCollection as $item) {
-            $this->assertArrayHasKey($item->getProductId(), $productsData);
-            $this->assertEquals($productsData[$item->getProductId()]['added_at'], $item->getAddedAt());
+            $productScopeId = $productScope . '-' . $scopeId . '-' . $item->getProductId();
+            $this->assertArrayHasKey($productScopeId, $productsData);
+            $this->assertEquals($productsData[$productScopeId]['added_at'], $item->getAddedAt());
         }
     }
 
@@ -81,6 +86,8 @@ public function testSyncActions(): void
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSyncActionsWithoutActionsType(): void
     {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 302534679d073..93684b1e7a070 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -2416,6 +2416,16 @@ public function validateRowDataProvider()
                 'behavior' => Import::BEHAVIOR_REPLACE,
                 'expectedResult' => true,
             ],
+            [
+                'row' => ['sku' => 'sku with whitespace ',
+                    'name' => 'Test',
+                    'product_type' => 'simple',
+                    '_attribute_set' => 'Default',
+                    'price' => 10.20,
+                ],
+                'behavior' => Import::BEHAVIOR_ADD_UPDATE,
+                'expectedResult' => false,
+            ],
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
index f11083dd2ba91..8bcd0001b8119 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
@@ -256,4 +256,80 @@ public function testCreateAnchorCollection()
             "Anchor root category does not contain products of it's children."
         );
     }
+
+    /**
+     * Test that price rule condition works correctly
+     *
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @param string $operator
+     * @param int $value
+     * @param array $matches
+     * @dataProvider priceFilterDataProvider
+     */
+    public function testPriceFilter(string $operator, int $value, array $matches)
+    {
+        $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,
+        `aggregator`:`all`,`value`:`1`,`new_child`:``^],
+        `1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,
+        `attribute`:`price`,
+        `operator`:`' . $operator . '`,`value`:`' . $value . '`^]^]';
+
+        $this->block->setData('conditions_encoded', $encodedConditions);
+
+        $productCollection = $this->block->createCollection();
+        $productCollection->load();
+        $skus = array_map(
+            function ($item) {
+                return $item['sku'];
+            },
+            $productCollection->getItems()
+        );
+        $this->assertEquals($matches, $skus, '', 0.0, 10, true);
+    }
+
+    public function priceFilterDataProvider(): array
+    {
+        return [
+            [
+                '>',
+                10,
+                [
+                    'simple1001',
+                ]
+            ],
+            [
+                '>=',
+                10,
+                [
+                    'simple1000',
+                    'simple1001',
+                    'configurable',
+                ]
+            ],
+            [
+                '<',
+                10,
+                []
+            ],
+            [
+                '<',
+                20,
+                [
+                    'simple1000',
+                    'configurable',
+                ]
+            ],
+            [
+                '<=',
+                20,
+                [
+                    'simple1000',
+                    'simple1001',
+                    'configurable',
+                ]
+            ],
+        ];
+    }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
index 242e4ebb22a54..48eb64ffea27e 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
@@ -10,4 +10,5 @@
     '/setup\/src\/Zend\/Mvc\/Controller\/LazyControllerAbstractFactory\.php/',
     '/app\/code\/(?!Magento)[^\/]*/',
     '#dev/tests/setup-integration/testsuite/Magento/Developer/_files/\S*\.xml$#',
+    '/lib\/internal\/Magento\/Framework\/File\/Test\/Unit\/_files\/blank.html$/'
 ];
diff --git a/lib/internal/Magento/Framework/File/Mime.php b/lib/internal/Magento/Framework/File/Mime.php
index ed370b1beae54..148f43d47cfd4 100644
--- a/lib/internal/Magento/Framework/File/Mime.php
+++ b/lib/internal/Magento/Framework/File/Mime.php
@@ -78,6 +78,18 @@ class Mime
         'svg' => 'image/svg+xml',
     ];
 
+    /**
+     * List of generic MIME types
+     *
+     * The file mime type should be detected by the file's extension if the native mime type is one of the listed below.
+     *
+     * @var array
+     */
+    private $genericMimeTypes = [
+        'application/x-empty',
+        'inode/x-empty',
+    ];
+
     /**
      * Get mime type of a file
      *
@@ -120,7 +132,11 @@ private function getNativeMimeType(string $file): string
         $extension = $this->getFileExtension($file);
         $result = mime_content_type($file);
         if (isset($this->mimeTypes[$extension], $this->defineByExtensionList[$extension])
-            && (strpos($result, 'text/') === 0 || strpos($result, 'image/svg') === 0)
+            && (
+                strpos($result, 'text/') === 0
+                || strpos($result, 'image/svg') === 0
+                || in_array($result, $this->genericMimeTypes, true)
+            )
         ) {
             $result = $this->mimeTypes[$extension];
         }
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/MimeTest.php b/lib/internal/Magento/Framework/File/Test/Unit/MimeTest.php
index 1a964c141dd34..0ae1542a2c0e1 100644
--- a/lib/internal/Magento/Framework/File/Test/Unit/MimeTest.php
+++ b/lib/internal/Magento/Framework/File/Test/Unit/MimeTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\File\Test\Unit;
 
+/**
+ * Test mime type utility for correct
+ */
 class MimeTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -12,6 +15,9 @@ class MimeTest extends \PHPUnit\Framework\TestCase
      */
     private $object;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->object = new \Magento\Framework\File\Mime();
@@ -42,12 +48,13 @@ public function testGetMimeType($file, $expectedType)
     /**
      * @return array
      */
-    public function getMimeTypeDataProvider()
+    public function getMimeTypeDataProvider(): array
     {
         return [
             'javascript' => [__DIR__ . '/_files/javascript.js', 'application/javascript'],
             'weird extension' => [__DIR__ . '/_files/file.weird', 'application/octet-stream'],
             'weird uppercase extension' => [__DIR__ . '/_files/UPPERCASE.WEIRD', 'application/octet-stream'],
+            'generic mime type' => [__DIR__ . '/_files/blank.html', 'text/html'],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/_files/blank.html b/lib/internal/Magento/Framework/File/Test/Unit/_files/blank.html
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
index caa080c02e255..df236faf8173b 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -75,16 +75,6 @@ public function open($filename)
             $this->_getCallback('create', null, sprintf('Unsupported image format. File: %s', $this->_fileName)),
             $this->_fileName
         );
-        $fileType = $this->getImageType();
-        if (in_array($fileType, [IMAGETYPE_PNG, IMAGETYPE_GIF])) {
-            $this->_keepTransparency = true;
-            if ($this->_imageHandler) {
-                $isAlpha = $this->checkAlpha($this->_fileName);
-                if ($isAlpha) {
-                    $this->_fillBackgroundColor($this->_imageHandler);
-                }
-            }
-        }
     }
 
     /**