diff --git a/vendor/magento/module-catalog-widget/Model/Rule/Condition/Product.php b/vendor/magento/module-catalog-widget/Model/Rule/Condition/Product.php
index 41f23d9c6df..a8cafb034c0 100644
--- a/vendor/magento/module-catalog-widget/Model/Rule/Condition/Product.php
+++ b/vendor/magento/module-catalog-widget/Model/Rule/Condition/Product.php
@@ -9,9 +9,9 @@
  */
 namespace Magento\CatalogWidget\Model\Rule\Condition;
 
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ProductCategoryList;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\DB\Select;
 use Magento\Store\Model\Store;
 
 /**
@@ -87,9 +87,7 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
         $productAttributes = array_filter(
             $productAttributes,
             function ($attribute) {
-                return $attribute->getFrontendLabel() &&
-                    $attribute->getFrontendInput() !== 'text' &&
-                    $attribute->getAttributeCode() !== ProductInterface::STATUS;
+                return $attribute->getFrontendLabel();
             }
         );
 
@@ -203,32 +201,63 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
         \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute,
         Collection $collection
     ) {
-        $storeId = $this->storeManager->getStore()->getId();
-        $values = $collection->getAllAttributeValues($attribute);
-        $validEntities = [];
-        if ($values) {
-            foreach ($values as $entityId => $storeValues) {
-                if (isset($storeValues[$storeId])) {
-                    if ($this->validateAttribute($storeValues[$storeId])) {
-                        $validEntities[] = $entityId;
-                    }
-                } else {
-                    if (isset($storeValues[Store::DEFAULT_STORE_ID]) &&
-                        $this->validateAttribute($storeValues[Store::DEFAULT_STORE_ID])
-                    ) {
-                        $validEntities[] = $entityId;
-                    }
-                }
-            }
+        $connection = $this->_productResource->getConnection();
+        switch ($attribute->getBackendType()) {
+            case 'decimal':
+            case 'datetime':
+            case 'int':
+            case 'varchar':
+            case 'text':
+                $aliasDefault = 'at_' . $attribute->getAttributeCode() . '_default';
+                $aliasStore = 'at_' . $attribute->getAttributeCode();
+                $collection->addAttributeToSelect($attribute->getAttributeCode(), 'left');
+                break;
+            default:
+                $aliasDefault = 'at_' . sha1($this->getId()) . $attribute->getAttributeCode() . '_default';
+                $aliasStore = 'at_' . sha1($this->getId()) . $attribute->getAttributeCode();
+
+                $storeDefaultId = $connection->getIfNullSql(
+                    $aliasDefault . '.store_id',
+                    Store::DEFAULT_STORE_ID
+                );
+                $storeId = $connection->getIfNullSql(
+                    $aliasStore . '.store_id',
+                    $this->storeManager->getStore()->getId()
+                );
+                $linkField = $attribute->getEntity()->getLinkField();
+
+                $collection->getSelect()->joinLeft(
+                    [$aliasDefault => $collection->getTable($attribute->getBackendTable())],
+                    "($aliasDefault.$linkField = e.$linkField) AND ($aliasDefault.store_id = $storeDefaultId)" .
+                    " AND ($aliasDefault.attribute_id = {$attribute->getId()})",
+                    []
+                );
+                $collection->getSelect()->joinLeft(
+                    [$aliasStore => $collection->getTable($attribute->getBackendTable())],
+                    "($aliasStore.$linkField = e.$linkField) AND ($aliasStore.store_id = $storeId)" .
+                    " AND ($aliasStore.attribute_id = {$attribute->getId()})",
+                    []
+                );
         }
-        $this->setOperator('()');
-        $this->unsetData('value_parsed');
-        if ($validEntities) {
-            $this->setData('value', implode(',', $validEntities));
+
+        $fromPart = $collection->getSelect()->getPart(Select::FROM);
+        if (isset($fromPart[$aliasStore]['joinType'])
+            && isset($fromPart[$aliasDefault]['joinType'])
+        ) {
+            $conditionCheck = $connection->quoteIdentifier($aliasStore . '.value_id') . " > 0";
+            $conditionTrue = $connection->quoteIdentifier($aliasStore . '.value');
+            $conditionFalse = $connection->quoteIdentifier($aliasDefault . '.value');
+            $joinedAttribute = $collection->getSelect()->getConnection()->getCheckSql(
+                $conditionCheck,
+                $conditionTrue,
+                $conditionFalse
+            );
         } else {
-            $this->unsetData('value');
+            $joinedAttribute = $aliasStore . '.' . 'value';
         }
 
+        $this->joinedAttributes[$attribute->getAttributeCode()] = $joinedAttribute;
+
         return $this;
     }
 
diff --git a/vendor/magento/module-rule/Model/Condition/Sql/Builder.php b/vendor/magento/module-rule/Model/Condition/Sql/Builder.php
index cb4cb9a12bd..ff676739695 100644
--- a/vendor/magento/module-rule/Model/Condition/Sql/Builder.php
+++ b/vendor/magento/module-rule/Model/Condition/Sql/Builder.php
@@ -144,6 +144,7 @@ class Builder
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _getMappedSqlCondition(
         AbstractCondition $condition,
@@ -155,7 +156,7 @@ class Builder
         // If rule hasn't valid argument - prevent incorrect rule behavior.
         if (empty($argument)) {
             return $this->_expressionFactory->create(['expression' => '1 = -1']);
-        } elseif (preg_match('/[^a-z0-9\-_\.\`]/i', $argument) > 0) {
+        } elseif (preg_match('/[^a-z0-9\-_\.\`]/i', $argument) > 0 && !$argument instanceof \Zend_Db_Expr) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Invalid field'));
         }