diff --git a/Block/Config.php b/Block/Config.php
index 534393e68..f031ae50d 100755
--- a/Block/Config.php
+++ b/Block/Config.php
@@ -69,6 +69,14 @@ public function getConfig()
         return $config;
     }
 
+    /**
+     * @return string
+     */
+    public function getJsonConfig()
+    {
+        return json_encode($this->getConfig());
+    }
+
     /**
      * @return bool
      */
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69905d24..a649567b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 5.14.2
+* Removed usage of Zend libraries and updated requirements for PHP 8.2/Magento 2.4.6 compatibility
+* Fixed issue where coupon usage is not properly decremented when placing order fails
+
 ## 5.14.1
 * Changed how buttons are rendered for compatibility with estimated order amount feature
 * Removed estimated order amount from PDP button
diff --git a/Helper/Customer.php b/Helper/Customer.php
index f567dc928..a42ebe31d 100644
--- a/Helper/Customer.php
+++ b/Helper/Customer.php
@@ -18,7 +18,7 @@
 namespace Amazon\Pay\Helper;
 
 use Amazon\Pay\Api\Data\AmazonCustomerInterface;
-use Zend_Validate;
+use Magento\Framework\Validator\ValidatorChain;
 
 class Customer
 {
@@ -79,7 +79,7 @@ public function getAmazonCustomer($buyerInfo)
 
     public function createCustomer(AmazonCustomerInterface $amazonCustomer)
     {
-        if (! Zend_Validate::is($amazonCustomer->getEmail(), 'EmailAddress')) {
+        if (! ValidatorChain::is($amazonCustomer->getEmail(), '\Magento\Framework\Validator\EmailAddress')) {
             throw new ValidatorException(__('the email address for your Amazon account is invalid'));
         }
 
diff --git a/Model/CheckoutSessionManagement.php b/Model/CheckoutSessionManagement.php
index 4ca891e0d..a059ed1af 100755
--- a/Model/CheckoutSessionManagement.php
+++ b/Model/CheckoutSessionManagement.php
@@ -42,6 +42,7 @@
 use Magento\Integration\Model\Oauth\TokenFactory as TokenModelFactory;
 use Magento\Authorization\Model\UserContextInterface as UserContext;
 use Magento\Framework\Phrase\Renderer\Translate as Translate;
+use Magento\SalesRule\Model\Coupon\UpdateCouponUsages;
 
 class CheckoutSessionManagement implements \Amazon\Pay\Api\CheckoutSessionManagementInterface
 {
@@ -208,6 +209,11 @@ class CheckoutSessionManagement implements \Amazon\Pay\Api\CheckoutSessionManage
      */
     private $translationRenderer;
 
+    /**
+     * @var UpdateCouponUsages
+     */
+    private $updateCouponUsages;
+
     /**
      * CheckoutSessionManagement constructor.
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -240,6 +246,7 @@ class CheckoutSessionManagement implements \Amazon\Pay\Api\CheckoutSessionManage
      * @param \Amazon\Pay\Logger\Logger $logger
      * @param Session $session
      * @param Translate $translationRenderer
+     * @param UpdateCouponUsages $updateCouponUsages
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -271,7 +278,8 @@ public function __construct(
         UserContext $userContext,
         \Amazon\Pay\Logger\Logger $logger,
         Session $session,
-        Translate $translationRenderer
+        Translate $translationRenderer,
+        UpdateCouponUsages $updateCouponUsages,
     ) {
         $this->storeManager = $storeManager;
         $this->quoteIdMaskFactory = $quoteIdMaskFactory;
@@ -303,6 +311,7 @@ public function __construct(
         $this->logger = $logger;
         $this->session = $session;
         $this->translationRenderer = $translationRenderer;
+        $this->updateCouponUsages = $updateCouponUsages;
     }
 
     /**
@@ -634,6 +643,9 @@ private function cancelOrder($order)
             $invoice->setState(Invoice::STATE_CANCELED);
         }
 
+        // decrement coupon usages if applicable
+        $this->updateCouponUsages->execute($order, false);
+
         // delete order comments and add new one
         foreach ($order->getStatusHistories() as $history) {
             $history->delete();
diff --git a/README.md b/README.md
index 672a2590f..5988f75f6 100755
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ The following table provides an overview on which Git branch is compatible to wh
 Magento Version | Github Branch | Latest release
 ---|---|---
 2.2.6 - 2.2.11 (EOL) | [V2checkout-1.2.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/V2checkout-1.2.x)  | 1.20.0 (EOL)
-2.3.0 - 2.4.x | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) | 5.14.1
+2.3.0 - 2.4.x | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) | 5.14.2
 
 ## Release Notes
 See [CHANGELOG.md](/CHANGELOG.md) 
diff --git a/Test/Mftf-23/ActionGroup/AmazonBeginLoginOnlyActionGroup.xml b/Test/Mftf-23/ActionGroup/AmazonBeginLoginOnlyActionGroup.xml
index 5e6129b5a..df51bf8e7 100644
--- a/Test/Mftf-23/ActionGroup/AmazonBeginLoginOnlyActionGroup.xml
+++ b/Test/Mftf-23/ActionGroup/AmazonBeginLoginOnlyActionGroup.xml
@@ -5,9 +5,43 @@
         <wait time="1" stepKey="allowButtonToActivate1"/>
         <fillField selector="{{AmazonPageSection.emailField}}" userInput="{{AmazonAccount.email}}" stepKey="fillAmazonPageEmailField"/>
         <fillField selector="{{AmazonPageSection.passwordField}}" userInput="{{AmazonAccount.password}}" stepKey="fillAmazonPagePasswordField"/>
-        <click selector="{{AmazonPageSection.signInButton}}" stepKey="clickAmazonPageSignInButton"/>
-        <!--Verify successful login by the presence of the continue button-->
-        <wait time="1" stepKey="allowButtonToActivate2"/>
-        <waitForElement selector="{{AmazonLoginSection.consentButton}}" stepKey="seeAmazonConsentButton"/>
+        
+        <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
+            try {
+                $remoteWebDriver->findElement(
+                    \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.signInButton}}')
+                )->click();
+                $remoteWebDriver->switchTo()->window($openerName);
+                $I->wait(5);
+            } catch (\Exception $ex) {
+                $I->comment('exception caught');
+            } catch (\Error $err) {
+                $I->comment('error caught');
+            }
+        }" stepKey="handlePopupSecondScreen"/>
+
+        <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
+            try {
+                if (count($remoteWebDriver->getWindowHandles()) > 1) {
+                    $I->comment('Popup remained open, switching back to it');
+                    $I->switchToNextTab();
+    
+                    $loginCancel = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.loginCancelButton}}'));
+    
+                    if (!empty($loginCancel)) {
+                        $I->comment('Cancel login with Amazon and land back on sign-in Magento page');
+                        $loginCancel[0]->click();
+                        $remoteWebDriver->switchTo()->window($openerName);
+                    }
+                } else {
+                    $I->comment('Popup closed, signing out manually and returning to login page');
+                    $I->amOnPage('customer/account/logout/');
+                    $I->wait(5);
+                    $I->amOnPage('/customer/account/login/');
+                }
+            } catch (\Exception $ex) {
+
+            }
+        }" stepKey="handleCancelSignIn"/>
     </actionGroup>
 </actionGroups>
diff --git a/Test/Mftf-23/ActionGroup/AmazonLoginActionGroup.xml b/Test/Mftf-23/ActionGroup/AmazonLoginActionGroup.xml
index 8bb17e0be..530da756d 100644
--- a/Test/Mftf-23/ActionGroup/AmazonLoginActionGroup.xml
+++ b/Test/Mftf-23/ActionGroup/AmazonLoginActionGroup.xml
@@ -5,29 +5,69 @@
         <wait time="1" stepKey="allowButtonToActivate1"/>
         <fillField selector="{{AmazonPageSection.emailField}}" userInput="{{AmazonAccount.email}}" stepKey="fillAmazonPageEmailField"/>
         <fillField selector="{{AmazonPageSection.passwordField}}" userInput="{{AmazonAccount.password}}" stepKey="fillAmazonPagePasswordField"/>
-        <click selector="{{AmazonPageSection.signInButton}}" stepKey="clickAmazonPageSignInButton"/>
-        <!--Verify successful login by the presence of the checkout button-->
-        <wait time="1" stepKey="allowButtonToActivate"/>
+        
+        <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
+            try {
+                $remoteWebDriver->findElement(
+                    \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.signInButton}}')
+                )->click();
+                $remoteWebDriver->switchTo()->window($openerName);
+                $I->wait(5);
+            } catch (\Exception $ex) {
+                $I->comment('exception caught');
+            } catch (\Error $err) {
+                $I->comment('error caught');
+            }
+        }" stepKey="handlePopupSecondScreen"/>
 
         <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
-            $continueAs = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.continueButton}}'));
+            try {
+                if (count($remoteWebDriver->getWindowHandles()) > 1) {
+                    if ($I->executeJS('return window.name;') === $openerName) {
+                        $I->comment('Popup remained open, switching back to it');
+                        $I->switchToNextTab();
+                    }
+    
+                    $continueAs = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.continueButton}}'));
 
-            if (!empty($continueAs)) {
-                $I->comment('Click Continue as... button and return to checkout');
-                $continueAs[0]->click();
-                $remoteWebDriver->switchTo()->window($openerName);
-                $I->waitForPageLoad(30);
+                    if (!empty($continueAs)) {
+                        $I->comment('Click Continue as... button and return to checkout');
+                        $continueAs[0]->click();
+                        $remoteWebDriver->switchTo()->window($openerName);
+                        $I->waitForPageLoad(30);
+
+                        $I->comment('Wait for Edit button in address details');
+                        $editAddressSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonCheckoutSection.editShippingButton}}');
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                        $I->comment('Click Edit button to return to normal flow');
+                        $remoteWebDriver->findElement($editAddressSelector)->click();
+                        
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                        $I->switchToNextTab();
+                        $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                    } else {
+                        $I->comment('No continue button, standard maxo/pay now');
+                        $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                    }
+                } else {
+                    $I->comment('Popup closed, allowing checkout page to load');
+                    $I->comment('Wait for Edit button in address details');
+                    $editAddressSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonCheckoutSection.editShippingButton}}');
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                    $I->comment('Click Edit button to return to normal flow');
+                    $remoteWebDriver->findElement($editAddressSelector)->click();
+                    
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                    $I->switchToNextTab();
+                    $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                }
+            } catch (\Exception $ex) {
 
-                $I->comment('Wait for Edit button in address details');
-                $editAddressSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonCheckoutSection.editShippingButton}}');
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
-                $I->comment('Click Edit button to return to normal flow');
-                $remoteWebDriver->findElement($editAddressSelector)->click();
-                
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
-                $I->switchToNextTab();
             }
-        }" stepKey="secureSignInWorkaround" />
+        }" stepKey="navigateToAddressAndPaymentOptions" />
 
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="seeAmazonCheckoutButton"/>
     </actionGroup>
diff --git a/Test/Mftf-23/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml b/Test/Mftf-23/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
index 95349f785..48c0919f8 100644
--- a/Test/Mftf-23/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
+++ b/Test/Mftf-23/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
@@ -22,33 +22,73 @@
         <waitForElement selector="{{AmazonPageSection.emailField}}" time="30" stepKey="apWaitForLogin"/>
         <fillField selector="{{AmazonPageSection.emailField}}" userInput="{{AmazonAccount.email}}" stepKey="apEnterEmail"/>
         <fillField selector="{{AmazonPageSection.passwordField}}" userInput="{{AmazonAccount.password}}" stepKey="apEnterPassword"/>
-        <click selector="{{AmazonPageSection.signInButton}}" stepKey="clickSigninButton"/>
 
-        <!--Verify successful login by the presence of the checkout button-->
-        <wait time="1" stepKey="allowButtonToActivate2"/>
-        
         <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
-            $continueAs = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.continueButton}}'));
-
-            if (!empty($continueAs)) {
-                $I->comment('Click Continue as... button and return to checkout');
-                $continueAs[0]->click();
+            try {
+                $remoteWebDriver->findElement(
+                    \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.signInButton}}')
+                )->click();
                 $remoteWebDriver->switchTo()->window($openerName);
-                $I->waitForPageLoad(30);
+                $I->wait(5);
+            } catch (\Exception $ex) {
+                $I->comment('exception caught');
+            } catch (\Error $err) {
+                $I->comment('error caught');
+            }
+        }" stepKey="handlePopupSecondScreen"/>
+
+        <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
+            try {
+                if (count($remoteWebDriver->getWindowHandles()) > 1) {
+                    if ($I->executeJS('return window.name;') === $openerName) {
+                        $I->comment('Popup remained open, switching back to it');
+                        $I->switchToNextTab();
+                    }
+    
+                    $continueAs = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.continueButton}}'));
+
+                    if (!empty($continueAs)) {
+                        $I->comment('Click Continue as... button and return to checkout');
+                        $continueAs[0]->click();
+                        $remoteWebDriver->switchTo()->window($openerName);
+                        $I->waitForPageLoad(30);
+
+                        $I->comment('Wait for Edit button in address details');
+                        $editAddressSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonCheckoutSection.editShippingButton}}');
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                        $I->comment('Click Edit button to return to normal flow');
+                        $remoteWebDriver->findElement($editAddressSelector)->click();
+                        
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                        $I->switchToNextTab();
+                        $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                    } else {
+                        $I->comment('No continue button, standard maxo/pay now');
+                        $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                    }
+                } else {
+                    $I->comment('Popup closed, allowing checkout page to load');
+                    $I->comment('Wait for Edit button in address details');
+                    $editAddressSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonCheckoutSection.editShippingButton}}');
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                    $I->comment('Click Edit button to return to normal flow');
+                    $remoteWebDriver->findElement($editAddressSelector)->click();
+                    
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                    $I->switchToNextTab();
+                    $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                }
+            } catch (\Exception $ex) {
 
-                $I->comment('Wait for Edit button in address details');
-                $editAddressSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonCheckoutSection.editShippingButton}}');
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
-                $I->comment('Click Edit button to return to normal flow');
-                $remoteWebDriver->findElement($editAddressSelector)->click();
-                
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
-                $I->switchToNextTab();
             }
-        }" stepKey="secureSignInWorkaround" />
+        }" stepKey="navigateToAddressAndPaymentOptions" />
 
         <!-- Load address list in DOM -->
         <waitForElementVisible selector="{{AmazonPageSection.changeAddressButton}}" stepKey="waitForChangeAddressButton"/>
+        <wait time="2" stepKey="waitForChangeAddressClickable"/>
         <click selector="{{AmazonPageSection.changeAddressButton}}" stepKey="clickChangeAddress"/>
         <waitForElementVisible selector="{{AmazonPageSection.addressBackButton}}" stepKey="waitForAddressBackButton"/>
         <click selector="{{AmazonPageSection.addressBackButton}}" stepKey="clickAddressBackButton"/>
diff --git a/Test/Mftf-23/ActionGroup/AmazonLoginOnlyActionGroup.xml b/Test/Mftf-23/ActionGroup/AmazonLoginOnlyActionGroup.xml
index 006dca33b..b9aa176cf 100644
--- a/Test/Mftf-23/ActionGroup/AmazonLoginOnlyActionGroup.xml
+++ b/Test/Mftf-23/ActionGroup/AmazonLoginOnlyActionGroup.xml
@@ -14,13 +14,44 @@
 
         <waitForElement selector="{{AmazonPageSection.emailField}}" stepKey="waitForEmailField"/>
         <wait time="1" stepKey="allowButtonToActivate1"/>
+        
         <fillField selector="{{AmazonPageSection.emailField}}" userInput="{{AmazonAccount.email}}" stepKey="fillAmazonPageEmailField"/>
         <fillField selector="{{AmazonPageSection.passwordField}}" userInput="{{AmazonAccount.password}}" stepKey="fillAmazonPagePasswordField"/>
-        <click selector="{{AmazonPageSection.signInButton}}" stepKey="clickAmazonPageSignInButton"/>
-        <!--Verify successful login by the presence of the continue button-->
-        <wait time="1" stepKey="allowButtonToActivate2"/>
-        <waitForElement selector="{{AmazonLoginSection.consentButton}}" stepKey="seeAmazonConsentButton"/>
-        <click selector="{{AmazonLoginSection.consentButton}}" stepKey="clickAmazonConsentButton"/>
+
+        <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
+            try {
+                $remoteWebDriver->findElement(
+                    \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.signInButton}}')
+                )->click();
+                $remoteWebDriver->switchTo()->window($openerName);
+                $I->wait(5);
+            } catch (\Exception $ex) {
+                $I->comment('exception caught');
+            } catch (\Error $err) {
+                $I->comment('error caught');
+            }
+        }" stepKey="handlePopupSecondScreen"/>
+
+        <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
+            try {
+                if (count($remoteWebDriver->getWindowHandles()) > 1) {
+                    $I->comment('Popup remained open, switching back to it');
+                    $I->switchToNextTab();
+    
+                    $loginConsent = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonLoginSection.consentButton}}'));
+    
+                    if (!empty($loginConsent)) {
+                        $I->comment('Click Continue button');
+                        $loginConsent[0]->click();
+                        $remoteWebDriver->switchTo()->window($openerName);
+                    }
+                } else {
+                    $I->comment('Popup closed, following redirect to account screen');
+                }
+            } catch (\Exception $ex) {
+
+            }
+        }" stepKey="handleSignInConsent"/>
 
         <!-- Switch back to main window -->
         <switchToWindow userInput="{$openerName}" stepKey="switchToWindowOpener" />
diff --git a/Test/Mftf-23/ActionGroup/AmazonLoginOnlyRedirectActionGroup.xml b/Test/Mftf-23/ActionGroup/AmazonLoginOnlyRedirectActionGroup.xml
index 172c6829a..cef9aeef8 100644
--- a/Test/Mftf-23/ActionGroup/AmazonLoginOnlyRedirectActionGroup.xml
+++ b/Test/Mftf-23/ActionGroup/AmazonLoginOnlyRedirectActionGroup.xml
@@ -5,9 +5,41 @@
         <wait time="1" stepKey="allowButtonToActivate1"/>
         <fillField selector="{{AmazonPageSection.emailField}}" userInput="{{AmazonAccount.email}}" stepKey="fillAmazonPageEmailField"/>
         <fillField selector="{{AmazonPageSection.passwordField}}" userInput="{{AmazonAccount.password}}" stepKey="fillAmazonPagePasswordField"/>
-        <click selector="{{AmazonPageSection.signInButton}}" stepKey="clickAmazonPageSignInButton"/>
-        <!--Verify successful login by the presence of the continue button-->
-        <wait time="1" stepKey="allowButtonToActivate2"/>
-        <waitForElement selector="{{AmazonLoginSection.consentButton}}" stepKey="seeAmazonConsentButton"/>
+        
+        <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
+            try {
+                $remoteWebDriver->findElement(
+                    \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.signInButton}}')
+                )->click();
+                $remoteWebDriver->switchTo()->window($openerName);
+                $I->wait(5);
+            } catch (\Exception $ex) {
+                $I->comment('exception caught');
+            } catch (\Error $err) {
+                $I->comment('error caught');
+            }
+        }" stepKey="handlePopupSecondScreen"/>
+
+        <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
+            try {
+                if (count($remoteWebDriver->getWindowHandles()) > 1) {
+                    $I->comment('Popup remained open, switching back to it');
+                    $I->switchToNextTab();
+    
+                    $loginConsent = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonLoginSection.consentButton}}'));
+    
+                    if (!empty($loginConsent)) {
+                        $I->comment('Click Continue button');
+                        $loginConsent[0]->click();
+                        $remoteWebDriver->switchTo()->window($openerName);
+                    }
+                } else {
+                    $I->comment('Popup closed, following redirect to account screen');
+                }
+            } catch (\Exception $ex) {
+
+            }
+        }" stepKey="handleSignInConsent"/>
+        
     </actionGroup>
 </actionGroups>
diff --git a/Test/Mftf-23/Section/AmazonPageSection.xml b/Test/Mftf-23/Section/AmazonPageSection.xml
index bef5a519a..6a6f4e111 100644
--- a/Test/Mftf-23/Section/AmazonPageSection.xml
+++ b/Test/Mftf-23/Section/AmazonPageSection.xml
@@ -5,9 +5,9 @@
         <element name="passwordField" type="input" selector="#ap_password"/>
         <element name="signInButton" type="button" selector="#signInSubmit"/>
         <element name="checkoutButton" type="button" selector="#default-button-content input[type=submit]"/>
-        <element name="continueButton" type="button" selector="#maxo_buy_now input[type=submit]" />
+        <element name="continueButton" type="button" selector="#maxo_consent input[type=submit]" />
         <element name="cancelButton" type="button" selector="#return_back_to_merchant_link"/>
-        <element name="loginCancelButton" type="button" selector="#consent-wrapper-content [data-action='cancel-consent'] a"/>
+        <element name="loginCancelButton" type="button" selector='#consent-wrapper-content [data-action="cancel-consent"] div a'/>
         <element name="addressId" type="text" selector="#default .default_address .address_id"/>
         <element name="addressDetails" type="text" selector="#change-buyer-details li[data-address_id='{{address_id}}']" parameterized="true"/>
         <element name="changeAddressButton" type="button" selector="#change-address-button"/>
diff --git a/Test/Mftf-23/Test/AmazonCancelReturnUrl.xml b/Test/Mftf-23/Test/AmazonCancelReturnUrl.xml
index 0a2b8a1ac..f3bc78234 100644
--- a/Test/Mftf-23/Test/AmazonCancelReturnUrl.xml
+++ b/Test/Mftf-23/Test/AmazonCancelReturnUrl.xml
@@ -38,12 +38,6 @@
 
         <!-- Login to Amazon -->
         <actionGroup ref="AmazonBeginLoginOnlyActionGroup" stepKey="amazonBeginLoginOnlyActionGroup"/>
-        <waitForElement selector="{{AmazonPageSection.loginCancelButton}}" stepKey="waitForCancelLogin"/>
-
-        <!-- Cancel login with Amazon and land back on sign-in Magento page -->
-        <click selector="{{AmazonPageSection.loginCancelButton}}" stepKey="clickLoginCancelButton"/>
-        <!-- Switch back to main window -->
-        <switchToWindow userInput="{$openerName}" stepKey="switchToWindowOpener" />
         <waitForPageLoad stepKey="waitForSigninPageLoad"/>
         <seeInCurrentUrl url="{{StorefrontCustomerSignInPage.url}}" stepKey="assertLoginUrl"/>
 
@@ -56,31 +50,104 @@
 
         <!-- Click Amazon Pay button on product page and login -->
         <click selector="{{AmazonButtonSection.product}}" stepKey="clickAmazonButton"/>
-
         <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="allowPopupToOpen2" />
         <wait time="3" stepKey="allowButtonToActivate"/>
-        
+
+        <!-- Sign in or 'Continue As' Amazon buyer -->
+        <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
+            $emailField = $remoteWebDriver->findElements(
+                \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.emailField}}')
+            );
+
+            if (!empty($emailField)) {
+                $I->fillField('{{AmazonPageSection.emailField}}', new \Codeception\Step\Argument\PasswordArgument('pay-demo-eu@amazon.com'));
+                $I->fillField('{{AmazonPageSection.passwordField}}', new \Codeception\Step\Argument\PasswordArgument('demo123'));
+
+                try {
+                    $remoteWebDriver->findElement(
+                        \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.signInButton}}')
+                    )->click();
+                    $remoteWebDriver->switchTo()->window($openerName);
+                    $I->wait(5);
+                } catch (\Exception $ex) {
+                    $I->comment('exception caught');
+                } catch (\Error $err) {
+                    $I->comment('error caught');
+                }
+            } else {
+                $I->comment('Popup appeared as normal');
+                $continueAs = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.continueButton}}'));
+
+                if (!empty($continueAs)) {
+                    $I->comment('Click Continue as... button and return to checkout');
+                    $continueAs[0]->click();
+                    $remoteWebDriver->switchTo()->window($openerName);
+                    $I->waitForPageLoad(30);
+
+                    $I->comment('Wait for Edit button in address details');
+                    $editAddressSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonCheckoutSection.editShippingButton}}');
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                    $I->comment('Click Edit button to return to normal flow');
+                    $remoteWebDriver->findElement($editAddressSelector)->click();
+                    
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                    $I->switchToNextTab();
+                    $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                } else {
+                    $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                }
+            }
+        }" stepKey="signInIfNecessary" />
+
         <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
-            $continueAs = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.continueButton}}'));
-
-            if (!empty($continueAs)) {
-                $I->comment('Click Continue as... button and return to checkout');
-                $continueAs[0]->click();
-                $remoteWebDriver->switchTo()->window($openerName);
-                $I->waitForPageLoad(30);
-
-                $I->comment('Wait for Edit button in address details');
-                $editAddressSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonCheckoutSection.editShippingButton}}');
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
-                $I->comment('Click Edit button to return to normal flow');
-                $remoteWebDriver->findElement($editAddressSelector)->click();
-                
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
-                $I->switchToNextTab();
-                $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+            try {
+                if (count($remoteWebDriver->getWindowHandles()) > 1) {
+                    if ($I->executeJS('return window.name;') === $openerName) {
+                        $I->comment('Popup remained open, switching back to it');
+                        $I->switchToNextTab();
+                    }
+    
+                    $continueAs = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.continueButton}}'));
+
+                    if (!empty($continueAs)) {
+                        $I->comment('Click Continue as... button and return to checkout');
+                        $continueAs[0]->click();
+                        $remoteWebDriver->switchTo()->window($openerName);
+                        $I->waitForPageLoad(30);
+
+                        $I->comment('Wait for Edit button in address details');
+                        $editAddressSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonCheckoutSection.editShippingButton}}');
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                        $I->comment('Click Edit button to return to normal flow');
+                        $remoteWebDriver->findElement($editAddressSelector)->click();
+                        
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                        $I->switchToNextTab();
+                        $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                    } else {
+                        $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                        $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                    }
+                } else {
+                    $I->comment('Popup closed, allowing checkout page to load');
+                    $I->comment('Wait for Edit button in address details');
+                    $editAddressSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonCheckoutSection.editShippingButton}}');
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                    $I->comment('Click Edit button to return to normal flow');
+                    $remoteWebDriver->findElement($editAddressSelector)->click();
+                    
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                    $I->switchToNextTab();
+                    $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
+                    $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                }
+            } catch (\Exception $ex) {
+
             }
-        }" stepKey="secureSignInWorkaround" />
+        }" stepKey="handlePopupSecondScreen2" />
 
         <!--Come back to checkout with default address-->
         <actionGroup ref="AmazonCheckoutActionGroup" stepKey="DefaultAmazonCheckoutActionGroup">
diff --git a/Test/Mftf-23/Test/AmazonSignInToExistingTest.xml b/Test/Mftf-23/Test/AmazonSignInToExistingTest.xml
index 2fac5737c..e76e1a89e 100644
--- a/Test/Mftf-23/Test/AmazonSignInToExistingTest.xml
+++ b/Test/Mftf-23/Test/AmazonSignInToExistingTest.xml
@@ -43,9 +43,6 @@
         <reloadPage stepKey="reloadAmazonLoginPage"/>
 
         <actionGroup ref="AmazonLoginOnlyRedirectActionGroup" stepKey="AmazonLoginOnlyRedirectActionGroup2"/>
-        <click selector="{{AmazonLoginSection.consentButton}}" stepKey="clickAmazonConsentButton"/>
-        <!-- Switch back to main window -->
-        <switchToWindow userInput="{$openerName}" stepKey="switchToWindowOpener" />
 
         <waitForPageLoad stepKey="waitForMyAccountPageLoad2"/>
         <see userInput="My Account" stepKey="seeMyAccount2"/>
diff --git a/Test/Mftf-24/ActionGroup/AmazonBeginLoginOnlyActionGroup.xml b/Test/Mftf-24/ActionGroup/AmazonBeginLoginOnlyActionGroup.xml
index 5e6129b5a..36a5dcfb1 100644
--- a/Test/Mftf-24/ActionGroup/AmazonBeginLoginOnlyActionGroup.xml
+++ b/Test/Mftf-24/ActionGroup/AmazonBeginLoginOnlyActionGroup.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AmazonBeginLoginOnlyActionGroup">
+
         <waitForElement selector="{{AmazonPageSection.emailField}}" stepKey="waitForEmailField"/>
         <wait time="1" stepKey="allowButtonToActivate1"/>
         <fillField selector="{{AmazonPageSection.emailField}}" userInput="{{AmazonAccount.email}}" stepKey="fillAmazonPageEmailField"/>
         <fillField selector="{{AmazonPageSection.passwordField}}" userInput="{{AmazonAccount.password}}" stepKey="fillAmazonPagePasswordField"/>
-        <click selector="{{AmazonPageSection.signInButton}}" stepKey="clickAmazonPageSignInButton"/>
-        <!--Verify successful login by the presence of the continue button-->
-        <wait time="1" stepKey="allowButtonToActivate2"/>
-        <waitForElement selector="{{AmazonLoginSection.consentButton}}" stepKey="seeAmazonConsentButton"/>
+        
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\HandlePopupSecondScreen" method="handleClickOnly" stepKey="handleSignInClick">
+            <argument name="signInButton">{{AmazonPageSection.signInButton}}</argument>
+            <argument name="openerName">{$openerName}</argument>
+        </helper>
+
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\HandlePopupSecondScreen" method="handleCancelSignIn" stepKey="handleCancelSignIn">
+            <argument name="loginCancelButton">{{AmazonPageSection.loginCancelButton}}</argument>
+            <argument name="openerName">{$openerName}</argument>
+        </helper>
     </actionGroup>
 </actionGroups>
diff --git a/Test/Mftf-24/ActionGroup/AmazonCheckoutActionGroup.xml b/Test/Mftf-24/ActionGroup/AmazonCheckoutActionGroup.xml
index c2dbc3498..67438a1b6 100644
--- a/Test/Mftf-24/ActionGroup/AmazonCheckoutActionGroup.xml
+++ b/Test/Mftf-24/ActionGroup/AmazonCheckoutActionGroup.xml
@@ -6,11 +6,14 @@
             <argument name="openerName" type="string"/>
         </arguments>
 
+        <wait time="2" stepKey="waitForCheckoutIfNecessary"/>
         <!-- Load address list in DOM -->
         <helper class="\Amazon\Pay\Test\Mftf\Helper\LoadAddresses" method="loadAddresses" stepKey="loadAddresses">
             <argument name="changeAddressSelector">{{AmazonPageSection.changeAddressButton}}</argument>
             <argument name="addressBackButtonSelector">{{AmazonPageSection.addressBackButton}}</argument>
             <argument name="defaultAddressSelector">{{AmazonPageSection.addressId}}</argument>
+            <argument name="openerName">{{openerName}}</argument>
+            <argument name="editShippingButton">{{AmazonCheckoutSection.editShippingButton}}</argument>
         </helper>
 
         <!--Get shipping address information-->
diff --git a/Test/Mftf-24/ActionGroup/AmazonGoToPaymentMethodActionGroup.xml b/Test/Mftf-24/ActionGroup/AmazonGoToPaymentMethodActionGroup.xml
new file mode 100644
index 000000000..c3e4f7580
--- /dev/null
+++ b/Test/Mftf-24/ActionGroup/AmazonGoToPaymentMethodActionGroup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AmazonGoToPaymentMethodActionGroup">
+        <!--Go to payment method-->
+        <waitForElement selector="{{CheckoutShippingSection.next}}" stepKey="waitForCheckoutShippingNext"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
+        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/Test/Mftf-24/ActionGroup/AmazonLoginActionGroup.xml b/Test/Mftf-24/ActionGroup/AmazonLoginActionGroup.xml
index 60961a623..0b5dc59b8 100644
--- a/Test/Mftf-24/ActionGroup/AmazonLoginActionGroup.xml
+++ b/Test/Mftf-24/ActionGroup/AmazonLoginActionGroup.xml
@@ -2,21 +2,26 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Open login popup and complete form-->
     <actionGroup name="AmazonLoginActionGroup">
+        <arguments>
+            <argument name="buttonSelector" defaultValue="{{AmazonButtonSection.payment}}" type="string"/>
+        </arguments>
+
         <!-- Fill in login form -->
         <waitForElement selector="{{AmazonPageSection.emailField}}" time="30" stepKey="apWaitForLogin"/>
         <fillField selector="{{AmazonPageSection.emailField}}" userInput="{{AmazonAccount.email}}" stepKey="apEnterEmail"/>
         <fillField selector="{{AmazonPageSection.passwordField}}" userInput="{{AmazonAccount.password}}" stepKey="apEnterPassword"/>
-        <click selector="{{AmazonPageSection.signInButton}}" stepKey="clickSigninButton"/>
-
-        <!--Verify successful login by the presence of the checkout button-->
-        <wait time="1" stepKey="allowButtonToActivate"/>
+        
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\HandlePopupSecondScreen" method="handleClickOnly" stepKey="handlePopupSecondScreen">
+            <argument name="signInButton">{{AmazonPageSection.signInButton}}</argument>
+        </helper>
 
-        <helper class="\Amazon\Pay\Test\Mftf\Helper\SecureSignInWorkaround" method="continueAsUser" stepKey="secureWorkaround">
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\HandlePopupSecondScreen" method="navigateToAddressAndPaymentOptions" stepKey="navigateToAddressAndPaymentOptions">
             <argument name="openerName">{$openerName}</argument>
-            <argument name="editAddressSelector">{{AmazonCheckoutSection.editShippingButton}}</argument>
-            <argument name="addressIdSelector">{{AmazonPageSection.addressId}}</argument>
-            <argument name="changePaymentSelector">{{AmazonPageSection.changePaymentButton}}</argument>
-            <argument name="changeAddressSelector">{{AmazonPageSection.changeAddressButton}}</argument>
+            <argument name="continueButton">{{AmazonPageSection.continueButton}}</argument>
+            <argument name="editShippingButton">{{AmazonCheckoutSection.editShippingButton}}</argument>
+            <argument name="addressId">{{AmazonPageSection.addressId}}</argument>
+            <argument name="checkoutButton">{{AmazonPageSection.checkoutButton}}</argument>
+            <argument name="apButton">{{buttonSelector}}</argument>
         </helper>
 
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="seeAmazonCheckoutButton"/>
diff --git a/Test/Mftf-24/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml b/Test/Mftf-24/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
index 9759d48ba..4fadfcf13 100644
--- a/Test/Mftf-24/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
+++ b/Test/Mftf-24/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
@@ -9,33 +9,37 @@
 
         <!--Save opener window name since popup auto-closes-->
         <executeJS function="return window.name;" stepKey="openerName"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMasks"/>
 
         <!--Go to Amazon Pay from the checkout and login-->
-        <waitForElement selector="{{buttonSelector}}" time="30" stepKey="apWaitForButton"/>
         <wait time="1" stepKey="allowButtonToActivate"/>
         <click selector="{{buttonSelector}}" stepKey="clickAmazonButton"/>
 
         <wait time="1" stepKey="allowPopupToOpen"/>
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\EnsurePopupOpened" method="ensurePopupOpened" stepKey="ensurePopupOpened">
+            <argument name="buttonSelector">{{buttonSelector}}</argument>
+        </helper>
         <switchToNextTab stepKey="switchToLoginPopupWindow"/>
 
         <!-- Fill in login form -->
         <waitForElement selector="{{AmazonPageSection.emailField}}" time="30" stepKey="apWaitForLogin"/>
         <fillField selector="{{AmazonPageSection.emailField}}" userInput="{{AmazonAccount.email}}" stepKey="apEnterEmail"/>
         <fillField selector="{{AmazonPageSection.passwordField}}" userInput="{{AmazonAccount.password}}" stepKey="apEnterPassword"/>
-        <click selector="{{AmazonPageSection.signInButton}}" stepKey="clickSigninButton"/>
-
-        <!--Verify successful login by the presence of the checkout button-->
-        <wait time="3" stepKey="allowButtonToActivate2"/>
+        
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\HandlePopupSecondScreen" method="handleClickOnly" stepKey="handlePopupSecondScreen">
+            <argument name="signInButton">{{AmazonPageSection.signInButton}}</argument>
+        </helper>
 
-        <helper class="\Amazon\Pay\Test\Mftf\Helper\SecureSignInWorkaround" method="continueAsUser" stepKey="secureWorkaround">
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\HandlePopupSecondScreen" method="navigateToAddressAndPaymentOptions" stepKey="navigateToAddressAndPaymentOptions">
             <argument name="openerName">{$openerName}</argument>
-            <argument name="editAddressSelector">{{AmazonCheckoutSection.editShippingButton}}</argument>
-            <argument name="addressIdSelector">{{AmazonPageSection.addressId}}</argument>
-            <argument name="changePaymentSelector">{{AmazonPageSection.changePaymentButton}}</argument>
-            <argument name="changeAddressSelector">{{AmazonPageSection.changeAddressButton}}</argument>
+            <argument name="continueButton">{{AmazonPageSection.continueButton}}</argument>
+            <argument name="editShippingButton">{{AmazonCheckoutSection.editShippingButton}}</argument>
+            <argument name="addressId">{{AmazonPageSection.addressId}}</argument>
+            <argument name="checkoutButton">{{AmazonPageSection.checkoutButton}}</argument>
+            <argument name="apButton">{{buttonSelector}}</argument>
         </helper>
-        <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="seeAmazonCheckoutButton"/>
 
+        <wait time="2" stepKey="waitForCheckoutIfNecessary"/>
         <!-- Load address list in DOM -->
         <helper class="\Amazon\Pay\Test\Mftf\Helper\LoadAddresses" method="loadAddresses" stepKey="loadAddresses">
             <argument name="changeAddressSelector">{{AmazonPageSection.changeAddressButton}}</argument>
@@ -43,6 +47,11 @@
             <argument name="defaultAddressSelector">{{AmazonPageSection.addressId}}</argument>
         </helper>
 
+        <!-- <helper class="\Amazon\Pay\Test\Mftf\Helper\EnsurePopupLoaded" method="reloadPopup" stepKey="reloadPopupIfNecessary">
+            <argument name="openerName">{$openerName}</argument>
+            <argument name="continueButton">{{AmazonPageSection.continueButton}}</argument>
+        </helper> -->
+
         <!--Get shipping address information-->
         <grabAttributeFrom selector="{{AmazonPageSection.addressId}}" userInput="data-address_id" stepKey="amazonAddressId"/>
         <grabAttributeFrom selector="{{AmazonPageSection.addressDetails({$amazonAddressId})}}" userInput="data-name_on_address" stepKey="amazonAddressName"/>
diff --git a/Test/Mftf-24/ActionGroup/AmazonLoginOnlyActionGroup.xml b/Test/Mftf-24/ActionGroup/AmazonLoginOnlyActionGroup.xml
index 006dca33b..d5f54136f 100644
--- a/Test/Mftf-24/ActionGroup/AmazonLoginOnlyActionGroup.xml
+++ b/Test/Mftf-24/ActionGroup/AmazonLoginOnlyActionGroup.xml
@@ -16,12 +16,15 @@
         <wait time="1" stepKey="allowButtonToActivate1"/>
         <fillField selector="{{AmazonPageSection.emailField}}" userInput="{{AmazonAccount.email}}" stepKey="fillAmazonPageEmailField"/>
         <fillField selector="{{AmazonPageSection.passwordField}}" userInput="{{AmazonAccount.password}}" stepKey="fillAmazonPagePasswordField"/>
-        <click selector="{{AmazonPageSection.signInButton}}" stepKey="clickAmazonPageSignInButton"/>
-        <!--Verify successful login by the presence of the continue button-->
-        <wait time="1" stepKey="allowButtonToActivate2"/>
-        <waitForElement selector="{{AmazonLoginSection.consentButton}}" stepKey="seeAmazonConsentButton"/>
-        <click selector="{{AmazonLoginSection.consentButton}}" stepKey="clickAmazonConsentButton"/>
+        
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\HandlePopupSecondScreen" method="handleClickOnly" stepKey="handlePopupSecondScreen">
+            <argument name="signInButton">{{AmazonPageSection.signInButton}}</argument>
+        </helper>
 
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\HandlePopupSecondScreen" method="handleSignInConsent" stepKey="handleSignInConsent">
+            <argument name="consentButton">{{AmazonLoginSection.consentButton}}</argument>
+        </helper>
+        
         <!-- Switch back to main window -->
         <switchToWindow userInput="{$openerName}" stepKey="switchToWindowOpener" />
     </actionGroup>
diff --git a/Test/Mftf-24/ActionGroup/AmazonLoginOnlyRedirectActionGroup.xml b/Test/Mftf-24/ActionGroup/AmazonLoginOnlyRedirectActionGroup.xml
index 172c6829a..ef4fd7d83 100644
--- a/Test/Mftf-24/ActionGroup/AmazonLoginOnlyRedirectActionGroup.xml
+++ b/Test/Mftf-24/ActionGroup/AmazonLoginOnlyRedirectActionGroup.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AmazonLoginOnlyRedirectActionGroup">
-        <waitForElement selector="{{AmazonPageSection.emailField}}" stepKey="waitForEmailField"/>
+        <arguments>
+            <argument name="openerName" type="string"/>
+        </arguments>
+
+        <waitForElement selector="{{AmazonLoginSection.continueButton}}" stepKey="waitForContinueButton"/>
         <wait time="1" stepKey="allowButtonToActivate1"/>
-        <fillField selector="{{AmazonPageSection.emailField}}" userInput="{{AmazonAccount.email}}" stepKey="fillAmazonPageEmailField"/>
-        <fillField selector="{{AmazonPageSection.passwordField}}" userInput="{{AmazonAccount.password}}" stepKey="fillAmazonPagePasswordField"/>
-        <click selector="{{AmazonPageSection.signInButton}}" stepKey="clickAmazonPageSignInButton"/>
-        <!--Verify successful login by the presence of the continue button-->
-        <wait time="1" stepKey="allowButtonToActivate2"/>
-        <waitForElement selector="{{AmazonLoginSection.consentButton}}" stepKey="seeAmazonConsentButton"/>
+        <click selector="{{AmazonLoginSection.continueButton}}" stepKey="clickContinueAsButton"/>
+        <switchToWindow userInput="{{openerName}}" stepKey="switchBackToOpener"/>
     </actionGroup>
 </actionGroups>
diff --git a/Test/Mftf-24/Helper/EnsurePopupOpened.php b/Test/Mftf-24/Helper/EnsurePopupOpened.php
new file mode 100644
index 000000000..08d0170ad
--- /dev/null
+++ b/Test/Mftf-24/Helper/EnsurePopupOpened.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Amazon\Pay\Test\Mftf\Helper;
+
+use Facebook\WebDriver\Exception\TimeoutException;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\WebDriverExpectedCondition;
+use Magento\FunctionalTestingFramework\Helper\Helper;
+
+class EnsurePopupOpened extends Helper
+{
+    public function ensurePopupOpened($buttonSelector)
+    {
+        /** @var \Magento\FunctionalTestingFramework\Module\MagentoWebDriver $magentoWebDriver */
+        $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+        $log = [];
+
+        try {
+            $magentoWebDriver->executeInSelenium(function (RemoteWebDriver $remoteWebDriver) use (
+                $magentoWebDriver,
+                $buttonSelector,
+                $log
+            ) {
+                try {
+                    $remoteWebDriver->wait(15, 100)->until(
+                        WebDriverExpectedCondition::numberOfWindowsToBe(2)
+                    );
+                } catch (TimeoutException $e) {
+                    $log[] = 'Timed out waiting for second window:\n' . $e->getMessage();
+                    $log[] = 'Attempting to click button again';
+                    $magentoWebDriver->click($buttonSelector);
+                    $magentoWebDriver->wait(1);
+                } catch (\Exception $e) {
+                    $log[] = 'General exception thrown while waiting for second window:\n' . $e->getMessage();
+                }
+            });
+        } catch (\Exception $e) {
+            $log[] = 'General exception thrown while executing remote web driver code:\n' . $e->getMessage();
+            // Avoid out of memory error sometimes caused by print_r
+            // print_r($e);
+        } finally {
+            var_dump($log);
+        }
+    }
+}
diff --git a/Test/Mftf-24/Helper/HandlePopupSecondScreen.php b/Test/Mftf-24/Helper/HandlePopupSecondScreen.php
new file mode 100644
index 000000000..707a7fff9
--- /dev/null
+++ b/Test/Mftf-24/Helper/HandlePopupSecondScreen.php
@@ -0,0 +1,200 @@
+<?php
+
+namespace Amazon\Pay\Test\Mftf\Helper;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverExpectedCondition;
+use Magento\FunctionalTestingFramework\Helper\Helper;
+use Magento\FunctionalTestingFramework\Module\MagentoWebDriver;
+
+class HandlePopupSecondScreen extends Helper
+{
+    public function handleClickOnly($signInButton) 
+    {
+        /** @var MagentoWebDriver $magentoWebDriver */
+        $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+
+        $magentoWebDriver->executeInSelenium(function (RemoteWebDriver $remoteWebDriver) use (
+            $magentoWebDriver,
+            $signInButton
+        ) {
+            try {
+                $remoteWebDriver->findElement(
+                    WebDriverBy::cssSelector($signInButton)
+                )->click();
+                $magentoWebDriver->switchToNextTab();
+                $magentoWebDriver->wait(5);
+            } catch (\Exception $ex) {
+
+            } catch (\Error $err) {
+
+            }
+        });
+    }
+
+    public function navigateToAddressAndPaymentOptions(
+        $openerName,
+        $continueButton,
+        $editShippingButton,
+        $addressId,
+        $checkoutButton,
+        $apButton
+    ) {
+        /** @var MagentoWebDriver $magentoWebDriver */
+        $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+        $stepLog = [];
+
+        $magentoWebDriver->executeInSelenium(function (RemoteWebDriver $remoteWebDriver) use (
+            $magentoWebDriver,
+            $stepLog,
+            $openerName,
+            $continueButton,
+            $editShippingButton,
+            $addressId,
+            $checkoutButton,
+            $apButton
+        ) {
+            try {
+                if (count($remoteWebDriver->getWindowHandles()) > 1) {
+                    if ($magentoWebDriver->executeJS('return window.name;') === $openerName) {
+                        $stepLog[] = 'Popup remained open, switching back to it';
+                        $magentoWebDriver->switchToNextTab();
+                    }
+    
+                    $continueAs = $remoteWebDriver->findElements(WebDriverBy::cssSelector($continueButton));
+                    $checkout = $remoteWebDriver->findElements(WebDriverBy::cssSelector($checkoutButton));
+
+                    if (empty($continueAs) && empty($checkout)) {
+                        $stepLog[] = 'Popup didn\'t finish loading, closing popup and re-initiating Amazon Pay';
+
+                        $stepLog[] = 'Closing tab';
+                        $magentoWebDriver->closeTab();
+                        $stepLog[] = 'Switching back to opener';
+                        $magentoWebDriver->switchToWindow($openerName);
+                        $stepLog[] = 'Clicking Amazon button on checkout';
+                        $magentoWebDriver->click($apButton);
+                        $stepLog[] = 'Waiting for popup to load and switching back to it';
+                        $magentoWebDriver->wait(3);
+                        $magentoWebDriver->switchToNextTab();
+                        
+                        $continueAs = $remoteWebDriver->findElements(WebDriverBy::cssSelector($continueButton));
+                    }
+
+                    if (!empty($continueAs)) {
+                        $stepLog[] = 'Click Continue as... button and return to checkout';
+                        $continueAs[0]->click();
+                        $remoteWebDriver->switchTo()->window($openerName);
+                        $magentoWebDriver->waitForPageLoad(30);
+
+                        $stepLog[] = 'Wait for Edit button in address details';
+                        $editAddressSelector = WebDriverBy::cssSelector($editShippingButton);
+                        $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                        $stepLog[] = 'Click Edit button to return to normal flow';
+                        $remoteWebDriver->findElement($editAddressSelector)->click();
+                        
+                        $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                        $magentoWebDriver->switchToNextTab();
+                        $addressIdSelector = WebDriverBy::cssSelector($addressId);
+                        $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                    } else {
+                        $stepLog[] = 'No continue button, standard maxo/pay now';
+                        $addressIdSelector = WebDriverBy::cssSelector($addressId);
+                        $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                    }
+                } else {
+                    $stepLog[] = 'Popup closed, allowing checkout page to load';
+                    $magentoWebDriver->waitForLoadingMaskToDisappear(30);
+                    $stepLog[] = 'Wait for Edit button in address details';
+                    $editAddressSelector = WebDriverBy::cssSelector($editShippingButton);
+                    $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                    $stepLog[] = 'Click Edit button to return to normal flow';
+                    $remoteWebDriver->findElement($editAddressSelector)->click();
+                    
+                    $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                    $magentoWebDriver->switchToNextTab();
+                    $addressIdSelector = WebDriverBy::cssSelector($addressId);
+                    $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                }
+            } catch (\Exception $ex) {
+                $stepLog[] = $ex->getMessage();
+            } finally {
+                var_dump($stepLog);
+            }
+        });
+    }
+
+    public function handleSignInConsent($consentButton) 
+    {
+        /** @var MagentoWebDriver $magentoWebDriver */
+        $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+        $stepLog = [];
+
+        $magentoWebDriver->executeInSelenium(function (RemoteWebDriver $remoteWebDriver) use (
+            $magentoWebDriver,
+            $stepLog,
+            $consentButton
+        ) {
+            try {
+                if (count($remoteWebDriver->getWindowHandles()) > 1) {
+                    $stepLog[] = 'Popup remained open, switching back to it';
+                    $magentoWebDriver->switchToNextTab();
+
+                    $loginConsent = $remoteWebDriver->findElements(WebDriverBy::cssSelector($consentButton));
+
+                    if (!empty($loginConsent)) {
+                        $stepLog[] = 'Click Continue button';
+                        $loginConsent[0]->click();
+                        $magentoWebDriver->switchToNextTab();
+                    }
+                } else {
+                    $stepLog[] = 'Popup closed, following redirect to account screen';
+                }
+            } catch (\Exception $ex) {
+                $stepLog[] = $ex->getMessage();
+            } finally {
+                var_dump($stepLog);
+            }
+        });
+    }
+
+    public function handleCancelSignIn(
+        $loginCancelButton,
+        $openerName
+    ) {
+        /** @var MagentoWebDriver $magentoWebDriver */
+        $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+        $stepLog = [];
+
+        $magentoWebDriver->executeInSelenium(function (RemoteWebDriver $remoteWebDriver) use (
+            $magentoWebDriver,
+            $stepLog,
+            $loginCancelButton,
+            $openerName
+        ) {
+            try {
+                if (count($remoteWebDriver->getWindowHandles()) > 1) {
+                    $stepLog[] = 'Popup remained open, switching back to it';
+                    $magentoWebDriver->switchToNextTab();
+    
+                    $loginCancel = $remoteWebDriver->findElements(WebDriverBy::cssSelector($loginCancelButton));
+    
+                    if (!empty($loginCancel)) {
+                        $stepLog[] = 'Cancel login with Amazon and land back on sign-in Magento page';
+                        $loginCancel[0]->click();
+                        $remoteWebDriver->switchTo()->window($openerName);
+                    }
+                } else {
+                    $stepLog[] = 'Popup closed, signing out manually and returning to login page';
+                    $magentoWebDriver->amOnPage('customer/account/logout/');
+                    $magentoWebDriver->wait(5);
+                    $magentoWebDriver->amOnPage('/customer/account/login/');
+                }
+            } catch (\Exception $ex) {
+                $stepLog[] = $ex->getMessage();
+            } finally {
+                var_dump($stepLog);
+            }
+        });
+    }
+}
diff --git a/Test/Mftf-24/Helper/LoadAddresses.php b/Test/Mftf-24/Helper/LoadAddresses.php
index 3e0a85622..1881277da 100644
--- a/Test/Mftf-24/Helper/LoadAddresses.php
+++ b/Test/Mftf-24/Helper/LoadAddresses.php
@@ -2,7 +2,11 @@
 
 namespace Amazon\Pay\Test\Mftf\Helper;
 
+use Facebook\WebDriver\Exception\TimeoutException;
 use Magento\FunctionalTestingFramework\Helper\Helper;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverExpectedCondition;
 
 class LoadAddresses extends Helper
 {
@@ -11,17 +15,41 @@ public function loadAddresses(
         $addressBackButtonSelector,
         $defaultAddressSelector
     ) {
-        /** @var \Magento\FunctionalTestingFramework\Module\MagentoWebDriver $webDriver */
-        $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
-        $waitTime = 15000;
+        /** @var \Magento\FunctionalTestingFramework\Module\MagentoWebDriver $magentoWebDriver */
+        $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+        $waitTime = 15;
+        $stepLog = [];
 
         try {
-            $webDriver->waitForElementClickable($changeAddressSelector, $waitTime);
-            $webDriver->click($changeAddressSelector);
-            $webDriver->waitForElementClickable($addressBackButtonSelector, $waitTime);
-            $webDriver->click($addressBackButtonSelector);
+            $stepLog[] = 'Waiting for Change Address button';
+            $magentoWebDriver->waitForElementClickable($changeAddressSelector, $waitTime);
+            $magentoWebDriver->click($changeAddressSelector);
+            $stepLog[] = 'Clicked Change Address, waiting for Back button';
+            $magentoWebDriver->waitForElementClickable($addressBackButtonSelector, $waitTime);
+            $magentoWebDriver->click($addressBackButtonSelector);
 
-            $webDriver->waitForElement($defaultAddressSelector, $waitTime);
+            $stepLog[] = 'Looking for default address';
+            $magentoWebDriver->waitForElement($defaultAddressSelector, $waitTime);
+            $stepLog[] = 'Found default address';
+        // } catch (\Exception $e) {
+        //     $magentoWebDriver->switchToNextTab();
+
+        //     try {
+        //         $magentoWebDriver->executeInSelenium(function (RemoteWebDriver $remoteWebDriver) use (
+        //             $magentoWebDriver,
+        //             $editShippingButton
+        //         ) {
+        //             $editAddressSelector = WebDriverBy::cssSelector($editShippingButton);
+        //             $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+        //             $magentoWebDriver->debug('Click Edit button to return to normal flow');
+        //             $remoteWebDriver->findElement($editAddressSelector)->click();
+                    
+        //             $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::numberOfWindowsToBe(2));
+        //             $magentoWebDriver->switchToNextTab();
+        //         });
+        //     } catch (\Exception $e) {
+
+        //     }
         } catch (\Exception $e) {
             // Avoid out of memory error sometimes caused by print_r
             // print_r($e);
diff --git a/Test/Mftf-24/Helper/SignInOrContinue.php b/Test/Mftf-24/Helper/SignInOrContinue.php
new file mode 100644
index 000000000..a4cec5ab8
--- /dev/null
+++ b/Test/Mftf-24/Helper/SignInOrContinue.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace Amazon\Pay\Test\Mftf\Helper;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverExpectedCondition;
+use Magento\FunctionalTestingFramework\Helper\Helper;
+use Codeception\Step\Argument\PasswordArgument;
+
+class SignInOrContinue extends Helper
+{
+    public function signInOrContinue(
+        $emailField,
+        $passwordField,
+        $signInButton,
+        $openerName,
+        $continueButton,
+        $editShippingButton,
+        $addressId
+    ) {
+        /** @var \Magento\FunctionalTestingFramework\Module\MagentoWebDriver $magentoWebDriver */
+        $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+
+        $magentoWebDriver->executeInSelenium(function (RemoteWebDriver $remoteWebDriver) use (
+            $magentoWebDriver,
+            $emailField,
+            $passwordField,
+            $signInButton,
+            $openerName,
+            $continueButton,
+            $editShippingButton,
+            $addressId
+        ) {
+            $email = $remoteWebDriver->findElements(
+                WebDriverBy::cssSelector($emailField)
+            );
+
+            if (!empty($email)) {
+                $magentoWebDriver->fillField($emailField, new PasswordArgument('pay-demo-eu@amazon.com'));
+                $magentoWebDriver->fillField($passwordField, new PasswordArgument('demo123'));
+
+                try {
+                    $remoteWebDriver->findElement(
+                        WebDriverBy::cssSelector($signInButton)
+                    )->click();
+                    $magentoWebDriver->switchToNextTab();
+                    $magentoWebDriver->wait(3);
+                } catch (\Exception $ex) {
+                    $magentoWebDriver->debug('exception caught');
+                } catch (\Error $err) {
+                    $magentoWebDriver->debug('error caught');
+                }
+            } else {
+                $magentoWebDriver->debug('Popup appeared as normal');
+                $continueAs = $remoteWebDriver->findElements(WebDriverBy::cssSelector($continueButton));
+
+                if (!empty($continueAs)) {
+                    $magentoWebDriver->debug('Click Continue as... button and return to checkout');
+                    $continueAs[0]->click();
+                    $remoteWebDriver->switchTo()->window($openerName);
+                    $magentoWebDriver->waitForPageLoad(30);
+
+                    $magentoWebDriver->debug('Wait for Edit button in address details');
+                    $editAddressSelector = WebDriverBy::cssSelector($editShippingButton);
+                    $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                    $magentoWebDriver->debug('Click Edit button to return to normal flow');
+                    $remoteWebDriver->findElement($editAddressSelector)->click();
+                    
+                    $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                    $magentoWebDriver->switchToNextTab();
+                    $addressIdSelector = WebDriverBy::cssSelector($addressId);
+                    $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                } else {
+                    $addressIdSelector = WebDriverBy::cssSelector($addressId);
+                    $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                }
+            }
+        });
+    }
+
+    public function handleSecondScreen(
+        $openerName,
+        $continueButton,
+        $editShippingButton,
+        $addressId
+    ) {
+        /** @var \Magento\FunctionalTestingFramework\Module\MagentoWebDriver $magentoWebDriver */
+        $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+
+        $magentoWebDriver->executeInSelenium(function (RemoteWebDriver $remoteWebDriver) use (
+            $magentoWebDriver,
+            $openerName,
+            $continueButton,
+            $editShippingButton,
+            $addressId
+        ) {
+            try {
+                if (count($remoteWebDriver->getWindowHandles()) > 1) {
+                    if ($magentoWebDriver->executeJS('return window.name;') === $openerName) {
+                        $magentoWebDriver->debug('Popup remained open, switching back to it');
+                        $magentoWebDriver->switchToNextTab();
+                    }
+    
+                    $continueAs = $remoteWebDriver->findElements(WebDriverBy::cssSelector($continueButton));
+
+                    if (!empty($continueAs)) {
+                        $magentoWebDriver->debug('Click Continue as... button and return to checkout');
+                        $continueAs[0]->click();
+                        $remoteWebDriver->switchTo()->window($openerName);
+                        $magentoWebDriver->waitForPageLoad(30);
+
+                        $magentoWebDriver->debug('Wait for Edit button in address details');
+                        $editAddressSelector = WebDriverBy::cssSelector($editShippingButton);
+                        $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                        $magentoWebDriver->debug('Click Edit button to return to normal flow');
+                        $remoteWebDriver->findElement($editAddressSelector)->click();
+                        
+                        $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                        $magentoWebDriver->switchToNextTab();
+                        $addressIdSelector = WebDriverBy::cssSelector($addressId);
+                        $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                    } else {
+                        $addressIdSelector = WebDriverBy::cssSelector($addressId);
+                        $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                    }
+                } else {
+                    $magentoWebDriver->debug('Popup closed, allowing checkout page to load');
+                    $magentoWebDriver->debug('Wait for Edit button in address details');
+                    $editAddressSelector = WebDriverBy::cssSelector($editShippingButton);
+                    $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::elementToBeClickable($editAddressSelector));
+                    $magentoWebDriver->debug('Click Edit button to return to normal flow');
+                    $remoteWebDriver->findElement($editAddressSelector)->click();
+                    
+                    $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::numberOfWindowsToBe(2));
+                    $magentoWebDriver->switchToNextTab();
+                    $addressIdSelector = WebDriverBy::cssSelector($addressId);
+                    $remoteWebDriver->wait(30, 100)->until(WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
+                }
+            } catch (\Exception $ex) {
+
+            }
+        });
+    }
+}
diff --git a/Test/Mftf-24/Section/AmazonLoginSection.xml b/Test/Mftf-24/Section/AmazonLoginSection.xml
index 5ad1e5aac..be780bc5e 100644
--- a/Test/Mftf-24/Section/AmazonLoginSection.xml
+++ b/Test/Mftf-24/Section/AmazonLoginSection.xml
@@ -3,6 +3,7 @@
     <section name="AmazonLoginSection">
         <element name="login" type="button" selector="#AmazonPayButton.login-with-amazon div"/>
         <element name="consentButton" type="button" selector="#consent-form input[type=submit]"/>
+        <element name="continueButton" type="button" selector=".continue-as-consent-button" />
         <element name="linkAccountPassword" type="text" selector=".amazon-validate-container #password"/>
         <element name="linkAccountButton" type="button" selector=".amazon-validate-container button[type=submit]"/>
     </section>
diff --git a/Test/Mftf-24/Section/AmazonPageSection.xml b/Test/Mftf-24/Section/AmazonPageSection.xml
index 2bdefc481..a166087f8 100644
--- a/Test/Mftf-24/Section/AmazonPageSection.xml
+++ b/Test/Mftf-24/Section/AmazonPageSection.xml
@@ -5,7 +5,7 @@
         <element name="passwordField" type="input" selector="#ap_password"/>
         <element name="signInButton" type="button" selector="#signInSubmit"/>
         <element name="checkoutButton" type="button" selector="#default-button-content input[type=submit]"/>
-        <element name="continueButton" type="button" selector="#maxo_buy_now input[type=submit]"/>
+        <element name="continueButton" type="button" selector="#maxo_consent input[type=submit]"/>
         <element name="cancelButton" type="button" selector="#return_back_to_merchant_link"/>
         <element name="loginCancelButton" type="button" selector="#consent-wrapper-content [data-action='cancel-consent'] a"/>
         <element name="addressId" type="text" selector="#default .default_address .address_id"/>
@@ -17,5 +17,8 @@
         <element name="useAddressButton" type="button" selector="#buyer-action-button-bottom .a-button-input"/>
         <element name="paymentMethodRadioButton" type="input" selector="li[data-trail_number='{{cc}}']" parameterized="true"/>
         <element name="usePaymentButton" type="button" selector="#maxo_payment_methods #buyer-action-button-bottom .a-button-input"/>
+        <element name="hiddenAddressForm" type="block" selector="#maxo_addresses.hide"/>
+        <element name="buyerMenu" type="button" selector="#header-buyer-popover"/>
+        <element name="signOutButton" type="button" selector="#sign-out-button"/>
     </section>
 </sections>
diff --git a/Test/Mftf-24/Test/AmazonBillingAddressVisibilityTest.xml b/Test/Mftf-24/Test/AmazonBillingAddressVisibilityTest.xml
index 12a8a1603..e5fd7e17c 100644
--- a/Test/Mftf-24/Test/AmazonBillingAddressVisibilityTest.xml
+++ b/Test/Mftf-24/Test/AmazonBillingAddressVisibilityTest.xml
@@ -37,7 +37,7 @@
         </actionGroup>
 
         <!-- Move to payments page and verify visibility of billing address -->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <seeElement selector="{{AmazonCheckoutSection.billingAddress}}" stepKey="seeBillingAddress"/>
     </test>
 </tests>
diff --git a/Test/Mftf-24/Test/AmazonBillingFormVisibilityTest.xml b/Test/Mftf-24/Test/AmazonBillingFormVisibilityTest.xml
index 12a8a1603..e5fd7e17c 100644
--- a/Test/Mftf-24/Test/AmazonBillingFormVisibilityTest.xml
+++ b/Test/Mftf-24/Test/AmazonBillingFormVisibilityTest.xml
@@ -37,7 +37,7 @@
         </actionGroup>
 
         <!-- Move to payments page and verify visibility of billing address -->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <seeElement selector="{{AmazonCheckoutSection.billingAddress}}" stepKey="seeBillingAddress"/>
     </test>
 </tests>
diff --git a/Test/Mftf-24/Test/AmazonCancelReturnUrl.xml b/Test/Mftf-24/Test/AmazonCancelReturnUrl.xml
index 8ed756859..4b5096862 100644
--- a/Test/Mftf-24/Test/AmazonCancelReturnUrl.xml
+++ b/Test/Mftf-24/Test/AmazonCancelReturnUrl.xml
@@ -41,12 +41,6 @@
 
         <!-- Login to Amazon -->
         <actionGroup ref="AmazonBeginLoginOnlyActionGroup" stepKey="amazonBeginLoginOnlyActionGroup"/>
-        <waitForElement selector="{{AmazonPageSection.loginCancelButton}}" stepKey="waitForCancelLogin"/>
-
-        <!-- Cancel login with Amazon and land back on sign-in Magento page -->
-        <click selector="{{AmazonPageSection.loginCancelButton}}" stepKey="clickLoginCancelButton"/>
-        <!-- Switch back to main window -->
-        <switchToWindow userInput="{$openerName}" stepKey="switchToWindowOpener" />
         <waitForPageLoad stepKey="waitForSigninPageLoad"/>
         <seeInCurrentUrl url="{{StorefrontCustomerSignInPage.url}}" stepKey="assertLoginUrl"/>
 
@@ -59,15 +53,25 @@
 
         <!-- Click Amazon Pay button on product page and login -->
         <click selector="{{AmazonButtonSection.product}}" stepKey="clickAmazonButton"/>
-
         <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="allowPopupToOpen2" />
         <wait time="3" stepKey="allowButtonToActivate"/>
-        <helper class="\Amazon\Pay\Test\Mftf\Helper\SecureSignInWorkaround" method="continueAsUser" stepKey="secureWorkaround">
+        
+        <!-- Sign in or 'Continue As' Amazon buyer -->
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\SignInOrContinue" method="signInOrContinue" stepKey="signInIfNecessary">
+            <argument name="emailField">{{AmazonPageSection.emailField}}</argument>
+            <argument name="passwordField">{{AmazonPageSection.passwordField}}</argument>
+            <argument name="signInButton">{{AmazonPageSection.signInButton}}</argument>
+            <argument name="openerName">{$openerName}</argument>
+            <argument name="continueButton">{{AmazonPageSection.continueButton}}</argument>
+            <argument name="editShippingButton">{{AmazonCheckoutSection.editShippingButton}}</argument>
+            <argument name="addressId">{{AmazonPageSection.addressId}}</argument>
+        </helper>
+
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\SignInOrContinue" method="handleSecondScreen" stepKey="handlePopupSecondScreen">
             <argument name="openerName">{$openerName}</argument>
-            <argument name="editAddressSelector">{{AmazonCheckoutSection.editShippingButton}}</argument>
-            <argument name="addressIdSelector">{{AmazonPageSection.addressId}}</argument>
-            <argument name="changePaymentSelector">{{AmazonPageSection.changePaymentButton}}</argument>
-            <argument name="changeAddressSelector">{{AmazonPageSection.changeAddressButton}}</argument>
+            <argument name="continueButton">{{AmazonPageSection.continueButton}}</argument>
+            <argument name="editShippingButton">{{AmazonCheckoutSection.editShippingButton}}</argument>
+            <argument name="addressId">{{AmazonPageSection.addressId}}</argument>
         </helper>
 
         <!--Come back to checkout with default address-->
diff --git a/Test/Mftf-24/Test/AmazonCheckoutAsyncDeclinedTest.xml b/Test/Mftf-24/Test/AmazonCheckoutAsyncDeclinedTest.xml
index 5481fd6de..11cab5dbf 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutAsyncDeclinedTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutAsyncDeclinedTest.xml
@@ -23,9 +23,7 @@
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup">
             <argument name="cc" value="4354" />
         </actionGroup>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <!--Place order-->
diff --git a/Test/Mftf-24/Test/AmazonCheckoutAsyncSuccessTest.xml b/Test/Mftf-24/Test/AmazonCheckoutAsyncSuccessTest.xml
index 65913debc..8088e6933 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutAsyncSuccessTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutAsyncSuccessTest.xml
@@ -23,9 +23,7 @@
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup">
             <argument name="cc" value="0701" />
         </actionGroup>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <!--Place order-->
diff --git a/Test/Mftf-24/Test/AmazonCheckoutBuyerCanceledTest.xml b/Test/Mftf-24/Test/AmazonCheckoutBuyerCanceledTest.xml
index 8eea58e93..e23edbdbd 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutBuyerCanceledTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutBuyerCanceledTest.xml
@@ -14,9 +14,7 @@
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup">
             <argument name="cc" value="3064" />
         </actionGroup>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify only Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <seeElement selector="{{AmazonCheckoutSection.method}}" stepKey="seeAmazonPaymentMethod"/>
diff --git a/Test/Mftf-24/Test/AmazonCheckoutDeclinedTest.xml b/Test/Mftf-24/Test/AmazonCheckoutDeclinedTest.xml
index 8b1efaedc..64f059f44 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutDeclinedTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutDeclinedTest.xml
@@ -14,9 +14,7 @@
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup">
             <argument name="cc" value="3434" />
         </actionGroup>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify only Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <seeElement selector="{{AmazonCheckoutSection.method}}" stepKey="seeAmazonPaymentMethod"/>
diff --git a/Test/Mftf-24/Test/AmazonCheckoutLoggedInNoGuestButtonTest.xml b/Test/Mftf-24/Test/AmazonCheckoutLoggedInNoGuestButtonTest.xml
index 5bbe81ec4..ab4cda661 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutLoggedInNoGuestButtonTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutLoggedInNoGuestButtonTest.xml
@@ -46,9 +46,7 @@
         <!--Go to Amazon Pay from the checkout and login-->
         <waitForElement selector="{{AmazonButtonSection.checkout}}" stepKey="waitForAmazonChangedShippingPageLoad"/>
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup"/>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify only Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <seeElement selector="{{AmazonCheckoutSection.method}}" stepKey="seeAmazonPaymentMethod"/>
diff --git a/Test/Mftf-24/Test/AmazonCheckoutLoginTest.xml b/Test/Mftf-24/Test/AmazonCheckoutLoginTest.xml
index b06741461..20eaf9e64 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutLoginTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutLoginTest.xml
@@ -16,6 +16,8 @@
         <!--Go to Amazon Pay from the checkout and login-->
         <click selector="{{AmazonButtonSection.checkout}}" stepKey="clickAmazonButton"/>
         <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="allowPopupToOpen" />
-        <actionGroup ref="AmazonLoginActionGroup" stepKey="AmazonLoginActionGroup"/>
+        <actionGroup ref="AmazonLoginActionGroup" stepKey="AmazonLoginActionGroup">
+            <argument name="buttonSelector" value="{{AmazonButtonSection.checkout}}"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/Test/Mftf-24/Test/AmazonCheckoutMulticurrencySuccessTest.xml b/Test/Mftf-24/Test/AmazonCheckoutMulticurrencySuccessTest.xml
index cbbee576f..d8b296db0 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutMulticurrencySuccessTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutMulticurrencySuccessTest.xml
@@ -28,9 +28,7 @@
 
         <!--Go to Amazon Pay from the checkout and login-->
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup"/>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify only Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <seeElement selector="{{AmazonCheckoutSection.method}}" stepKey="seeAmazonPaymentMethod"/>
diff --git a/Test/Mftf-24/Test/AmazonCheckoutOrderTwoItems.xml b/Test/Mftf-24/Test/AmazonCheckoutOrderTwoItems.xml
index 3708e8a4a..06712ca8c 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutOrderTwoItems.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutOrderTwoItems.xml
@@ -41,9 +41,7 @@
 
         <!--Go to Amazon Pay and login-->
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup"/>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify only Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <seeElement selector="{{AmazonCheckoutSection.method}}" stepKey="seeAmazonPaymentMethod"/>
diff --git a/Test/Mftf-24/Test/AmazonCheckoutPayNowDeclinedTest.xml b/Test/Mftf-24/Test/AmazonCheckoutPayNowDeclinedTest.xml
index f0d0e2d52..d26e1af77 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutPayNowDeclinedTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutPayNowDeclinedTest.xml
@@ -28,7 +28,7 @@
         <click selector="{{AmazonButtonSection.payment}}" stepKey="clickAmazonPay" />
 
         <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="switchToPopup" />
-        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin" />
+        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin"/>
 
         <!-- choose card -->
         <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangePaymentMethod"/>
diff --git a/Test/Mftf-24/Test/AmazonCheckoutPayNowMulticurrencySuccessTest.xml b/Test/Mftf-24/Test/AmazonCheckoutPayNowMulticurrencySuccessTest.xml
index 601956581..447dc540e 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutPayNowMulticurrencySuccessTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutPayNowMulticurrencySuccessTest.xml
@@ -41,7 +41,7 @@
         <executeJS function="return window.name;" stepKey="openerName"/>
         <click selector="{{AmazonButtonSection.payment}}" stepKey="clickAmazonPay" />
 
-        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin" />
+        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin"/>
 
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="seePayNow" />
         <click selector="{{AmazonPageSection.checkoutButton}}" stepKey="payNow" />
diff --git a/Test/Mftf-24/Test/AmazonCheckoutPayNowSuccessTest.xml b/Test/Mftf-24/Test/AmazonCheckoutPayNowSuccessTest.xml
index 5a3c337e0..43a42badc 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutPayNowSuccessTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutPayNowSuccessTest.xml
@@ -28,7 +28,7 @@
         <click selector="{{AmazonButtonSection.payment}}" stepKey="clickAmazonPay" />
 
         <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="switchToPopup" />
-        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin" />
+        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin"/>
 
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="seePayNow" />
         <click selector="{{AmazonPageSection.checkoutButton}}" stepKey="payNow" />
diff --git a/Test/Mftf-24/Test/AmazonCheckoutSuccessTest.xml b/Test/Mftf-24/Test/AmazonCheckoutSuccessTest.xml
index 6a745d87f..c86b3b241 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutSuccessTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutSuccessTest.xml
@@ -12,9 +12,7 @@
 
         <!--Go to Amazon Pay from the checkout and login-->
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup"/>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify only Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <seeElement selector="{{AmazonCheckoutSection.method}}" stepKey="seeAmazonPaymentMethod"/>
diff --git a/Test/Mftf-24/Test/AmazonInvoiceMultipleCapture.xml b/Test/Mftf-24/Test/AmazonInvoiceMultipleCapture.xml
index 6b8582400..2de7e6735 100644
--- a/Test/Mftf-24/Test/AmazonInvoiceMultipleCapture.xml
+++ b/Test/Mftf-24/Test/AmazonInvoiceMultipleCapture.xml
@@ -27,9 +27,7 @@
 
         <!--Go to Amazon Pay and login-->
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup"/>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify only Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <seeElement selector="{{AmazonCheckoutSection.method}}" stepKey="seeAmazonPaymentMethod"/>
diff --git a/Test/Mftf-24/Test/AmazonInvoicePendingCapturedTest.xml b/Test/Mftf-24/Test/AmazonInvoicePendingCapturedTest.xml
index 4b9dae11c..35b7070dd 100644
--- a/Test/Mftf-24/Test/AmazonInvoicePendingCapturedTest.xml
+++ b/Test/Mftf-24/Test/AmazonInvoicePendingCapturedTest.xml
@@ -12,9 +12,7 @@
 
         <!--Go to Amazon Pay from the checkout and login-->
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup"/>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <!--Place order-->
diff --git a/Test/Mftf-24/Test/AmazonInvoicePendingDeclinedTest.xml b/Test/Mftf-24/Test/AmazonInvoicePendingDeclinedTest.xml
index 4c3594b6e..29dd08d1f 100644
--- a/Test/Mftf-24/Test/AmazonInvoicePendingDeclinedTest.xml
+++ b/Test/Mftf-24/Test/AmazonInvoicePendingDeclinedTest.xml
@@ -12,9 +12,7 @@
 
         <!--Go to Amazon Pay from the checkout and login-->
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup"/>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <!--Place order-->
diff --git a/Test/Mftf-24/Test/AmazonInvoiceTest.xml b/Test/Mftf-24/Test/AmazonInvoiceTest.xml
index 09398f369..bad82fcd7 100644
--- a/Test/Mftf-24/Test/AmazonInvoiceTest.xml
+++ b/Test/Mftf-24/Test/AmazonInvoiceTest.xml
@@ -12,9 +12,7 @@
 
         <!--Go to Amazon Pay from the checkout and login-->
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup"/>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <!--Place order-->
diff --git a/Test/Mftf-24/Test/AmazonMiniCartLoginTest.xml b/Test/Mftf-24/Test/AmazonMiniCartLoginTest.xml
index 74f970301..56814ecca 100644
--- a/Test/Mftf-24/Test/AmazonMiniCartLoginTest.xml
+++ b/Test/Mftf-24/Test/AmazonMiniCartLoginTest.xml
@@ -16,6 +16,8 @@
         <!--Go to Amazon Pay from the mini cart and login-->
         <click selector="{{AmazonButtonSection.miniCart}}" stepKey="clickAmazonButton"/>
         <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="allowPopupToOpen" />
-        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLoginActionGroup"/>
+        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin">
+            <argument name="buttonSelector" value="{{AmazonButtonSection.miniCart}}"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/Test/Mftf-24/Test/AmazonPaymentLoginTest.xml b/Test/Mftf-24/Test/AmazonPaymentLoginTest.xml
index 87ce7a46a..18b9efc1b 100644
--- a/Test/Mftf-24/Test/AmazonPaymentLoginTest.xml
+++ b/Test/Mftf-24/Test/AmazonPaymentLoginTest.xml
@@ -17,6 +17,6 @@
         <wait time="1" stepKey="allowButtonToActivate"/>
         <click selector="{{AmazonButtonSection.payment}}" stepKey="clickAmazonButton"/>
         <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="allowPopupToOpen" />
-        <actionGroup ref="AmazonLoginActionGroup" stepKey="AmazonLoginActionGroup"/>
+        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin"/>
     </test>
 </tests>
diff --git a/Test/Mftf-24/Test/AmazonProductLoginTest.xml b/Test/Mftf-24/Test/AmazonProductLoginTest.xml
index cd4f98acc..5cf24d75b 100644
--- a/Test/Mftf-24/Test/AmazonProductLoginTest.xml
+++ b/Test/Mftf-24/Test/AmazonProductLoginTest.xml
@@ -16,6 +16,8 @@
         <!--Add to cart via Amazon Pay button on product page and login-->
         <click selector="{{AmazonButtonSection.product}}" stepKey="clickAmazonButton"/>
         <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="allowPopupToOpen" />
-        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLoginActionGroup"/>
+        <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin">
+            <argument name="buttonSelector" value="{{AmazonButtonSection.product}}"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/Test/Mftf-24/Test/AmazonRefund.xml b/Test/Mftf-24/Test/AmazonRefund.xml
index 18a6cbf55..db581b56a 100644
--- a/Test/Mftf-24/Test/AmazonRefund.xml
+++ b/Test/Mftf-24/Test/AmazonRefund.xml
@@ -12,9 +12,7 @@
 
         <!--Go to Amazon Pay from the checkout and login-->
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup"/>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <!--Place order-->
diff --git a/Test/Mftf-24/Test/AmazonSignInToExistingTest.xml b/Test/Mftf-24/Test/AmazonSignInToExistingTest.xml
index 8f24b4bf6..3f799a3a1 100644
--- a/Test/Mftf-24/Test/AmazonSignInToExistingTest.xml
+++ b/Test/Mftf-24/Test/AmazonSignInToExistingTest.xml
@@ -35,17 +35,8 @@
         <executeJS function="return window.name;" stepKey="openerName"/>
 
         <!--Verify Sign in with Amazon Button is present again-->
-        <click selector="{{AmazonLoginSection.login}}" stepKey="clickSignInWithAmazonButton2"/>
-        <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="allowPopupToOpen" />
-
-        <!-- make sure we are logged out from Amazon by clearing ubid-main cookie -->
-        <resetCookie userInput="ubid-main" parameterArray="['domainName' => '.amazon.com']" stepKey="resetCookieForAmazon"/>
-        <reloadPage stepKey="reloadAmazonLoginPage"/>
-
-        <actionGroup ref="AmazonLoginOnlyRedirectActionGroup" stepKey="AmazonLoginOnlyRedirectActionGroup2"/>
-        <click selector="{{AmazonLoginSection.consentButton}}" stepKey="clickAmazonConsentButton"/>
-        <!-- Switch back to main window -->
-        <switchToWindow userInput="{$openerName}" stepKey="switchToWindowOpener" />
+        <seeElement selector="{{AmazonLoginSection.login}}" stepKey="seeSignInWithAmazonButtonCreate"/>
+        <actionGroup ref="AmazonLoginOnlyActionGroup" stepKey="AmazonLoginOnlyActionGroup2"/>
 
         <waitForPageLoad stepKey="waitForMyAccountPageLoad2"/>
         <see userInput="My Account" stepKey="seeMyAccount2"/>
diff --git a/Test/Mftf-24/Test/AmazonSigninCheckoutSuccessTest.xml b/Test/Mftf-24/Test/AmazonSigninCheckoutSuccessTest.xml
index f69a5fa5e..d14a1672c 100644
--- a/Test/Mftf-24/Test/AmazonSigninCheckoutSuccessTest.xml
+++ b/Test/Mftf-24/Test/AmazonSigninCheckoutSuccessTest.xml
@@ -24,9 +24,7 @@
 
         <!--Go to Amazon Pay from the checkout and login-->
         <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup"/>
-        <!--Go to payment method-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
-        <waitForPageLoad stepKey="waitForCheckoutPaymentPageLoad"/>
+        <actionGroup ref="AmazonGoToPaymentMethodActionGroup" stepKey="AmazonGoToPaymentMethodActionGroup"/>
         <!--Verify only Amazon Pay method is visible-->
         <seeNumberOfElements selector="{{CheckoutPaymentSection.availablePaymentSolutions}}" userInput="1" stepKey="seeSingleAvailablePaymentSolution"/>
         <seeElement selector="{{AmazonCheckoutSection.method}}" stepKey="seeAmazonPaymentMethod"/>
diff --git a/composer.json b/composer.json
index 547bfc7e7..1a8226231 100755
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "amzn/amazon-pay-magento-2-module",
   "description": "Official Magento2 Plugin to integrate with Amazon Pay",
   "type": "magento2-module",
-  "version": "5.14.1",
+  "version": "5.14.2",
   "license": [
     "Apache-2.0"
   ],
@@ -18,7 +18,7 @@
     "guzzlehttp/guzzle": "^6.2.0"
   },
   "require": {
-    "php": "~7.0.13||~7.1.0||~7.2.0||~7.3.0||~7.4.0||~8.0.0||~8.1.0",
+    "php": "~7.0.13||~7.1.0||~7.2.0||~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0",
     "magento/framework": "^102.0||^103.0",
     "magento/module-sales": "^100.0||^101.0||^102.0||^103.0",
     "magento/module-checkout": "^100.0",
diff --git a/view/frontend/templates/config.phtml b/view/frontend/templates/config.phtml
index 60dcaba3e..28fb09239 100755
--- a/view/frontend/templates/config.phtml
+++ b/view/frontend/templates/config.phtml
@@ -23,7 +23,7 @@
 <script>
 
     require (['uiRegistry'], function(registry) {
-        registry.set('amazonPay', <?= /* @noEscape */ \Zend_Json::encode($block->getConfig()); ?>);
+        registry.set('amazonPay', <?= /* @noEscape */ $block->getJsonConfig() ?>)
     });
 
     <?php if ($frontName != 'checkout' || (strpos($pathInfo, 'checkout/cart') !== false)): ?>