Merge remote-tracking branch 'origin/MC-40502' into 2.4-develop-pr53

Author: Serhii Balko

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml

@@ -19,5 +19,6 @@
         <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
         <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="countryOptions" type="button" selector=".admin__data-grid-filters select[name=billing_country_id] option"/>
+        <element name="websiteOptions" type="button" selector=".admin__data-grid-filters select[name=website_id] option"/>
     </section>
 </sections>

app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml

@@ -189,6 +189,7 @@
         </column>
         <column name="website_id" class="Magento\Customer\Ui\Component\Listing\Column\Websites" component="Magento_Ui/js/grid/columns/select" sortOrder="110">
             <settings>
+                <options class="Magento\Store\Model\ResourceModel\Website\Collection"/>
                 <filter>select</filter>
                 <editor>
                     <editorType>select</editorType>