Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop-pr

Author: tomreece

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/EnableDisableProductActionGroup.xml

@@ -25,8 +25,7 @@
     <actionGroup name="FindProductToEdit">
         <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
         <waitForPageLoad stepKey="WaitForCatalogProductPageToLoad"/>
-        <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
-        <waitForPageLoad stepKey="RemovingFilters"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <fillField userInput="{{BundleProduct.name}}" selector="#fulltext" stepKey="EnterProductNameInSearch"/>
         <click stepKey="ClickSearch" selector="{{AdminProductFormBundleSection.searchButton}}"/>
         <click stepKey="ClickOnProduct" selector="{{AdminProductFormBundleSection.firstCatalogProduct}}"/>