Merge remote-tracking branch 'l3/MC-41151' into 2.4-bugfixes-031921

Author: bubasuma

app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php

@@ -274,7 +274,7 @@ protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
                 '',
                 ['data' => $arguments]
             );
-            return $selectBlock->setOptions($options)->setValue($value)->getHtml();
+            return $selectBlock->setOptions($options)->setValue($value !== '' ? $value : null)->getHtml();
         } else {
             return __('We can\'t filter an attribute with no attribute options.');
         }