Merge branch 'ACQE-8922-dev' into ACQE-functional-deployment-version20

Author: chandrakalahanchinal

app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutFillEstimateShippingAndTaxActionGroup.xml

@@ -18,6 +18,7 @@
         <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{address.state}}" stepKey="selectState"/>
         <waitForElementVisible selector="{{CheckoutCartSummarySection.postcode}}" stepKey="waitForPostCodeVisible"/>
         <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{address.postcode}}" stepKey="selectPostCode"/>
-        <waitForPageLoad stepKey="waitForLoadingMaskToDiappear"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoaded"/>
+        <waitForAjaxLoad stepKey="waitForAjax"/>
     </actionGroup>
 </actionGroups>