diff --git a/README.md b/README.md
index f61c4faea..f88ddf59c 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,11 @@
 
 This plugin supports SAP Commerce (Hybris) versions 6.x
 
+The plugin is using following adyen libraries and API.
+- [adyen-java-api-library](https://github.com/Adyen/adyen-java-api-library) (v14.0.0)
+- [adyen-web](https://github.com/Adyen/adyen-web) (v4.3.1)
+- [Adyen Checkout API](https://docs.adyen.com/api-explorer/) (v67)
+
 ## Integration
 
 The SAP Commerce integrates Adyen Checkout for all card payments and local/redirect payment methods.
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/constants/AdyenControllerConstants.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/constants/AdyenControllerConstants.java
index 0d1ce1bac..f36b2ac70 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/constants/AdyenControllerConstants.java
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/constants/AdyenControllerConstants.java
@@ -41,9 +41,7 @@ interface MultiStepCheckout
 			{
 				String CheckoutSummaryPage = ADDON_PREFIX + "pages/checkout/multi/checkoutSummaryPage";
 				String SelectPaymentMethod = ADDON_PREFIX + "pages/checkout/multi/selectPaymentMethodPage";
-				String Validate3DSecurePaymentPage = ADDON_PREFIX + "pages/checkout/multi/3d-secure-payment-validation";
-				String HppPaymentPage = ADDON_PREFIX + "pages/checkout/multi/hpp-payment";
-				String Validate3DS2PaymentPage = ADDON_PREFIX + "pages/checkout/multi/3ds2_payment";
+				String Validate3DSPaymentPage = ADDON_PREFIX + "pages/checkout/multi/3ds_payment";
 				String BillingAddressformPage = ADDON_PREFIX + "pages/checkout/multi/billingAddressForm";
 			}
 		}
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenComponentController.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenComponentController.java
index f34c9e455..ad97fac7d 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenComponentController.java
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenComponentController.java
@@ -22,8 +22,10 @@
 
 import com.adyen.model.checkout.DefaultPaymentMethodDetails;
 import com.adyen.model.checkout.PaymentMethodDetails;
+import com.adyen.model.checkout.PaymentsDetailsResponse;
 import com.adyen.model.checkout.PaymentsResponse;
 import com.adyen.model.checkout.details.ApplePayDetails;
+import com.adyen.model.checkout.details.GooglePayDetails;
 import com.adyen.model.checkout.details.MbwayDetails;
 import com.adyen.model.checkout.details.PayPalDetails;
 import com.adyen.service.exception.ApiException;
@@ -61,6 +63,7 @@
 import java.util.Map;
 
 import static com.adyen.v6.constants.AdyenControllerConstants.COMPONENT_PREFIX;
+import static com.adyen.v6.constants.AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_PIX;
 
 @RestController
@@ -103,6 +106,8 @@ public String componentPayment(final HttpServletRequest request) throws AdyenCom
                 paymentMethodDetails = gson.fromJson(requestJson.get("paymentMethodDetails"), MbwayDetails.class);
             } else if(ApplePayDetails.APPLEPAY.equals(paymentMethod)) {
                 paymentMethodDetails = gson.fromJson(requestJson.get("paymentMethodDetails"), ApplePayDetails.class);
+            } else if(GooglePayDetails.GOOGLEPAY.equals(paymentMethod)) {
+                paymentMethodDetails = gson.fromJson(requestJson.get("paymentMethodDetails"), GooglePayDetails.class);
             } else if(PAYMENT_METHOD_PIX.equals(paymentMethod)) {
                 paymentMethodDetails = new DefaultPaymentMethodDetails();
                 paymentMethodDetails.setType(PAYMENT_METHOD_PIX);
@@ -110,7 +115,7 @@ public String componentPayment(final HttpServletRequest request) throws AdyenCom
                 throw new InvalidCartException("checkout.error.paymentethod.formentry.invalid");
             }
 
-            cartData.setAdyenReturnUrl(getReturnUrl());
+            cartData.setAdyenReturnUrl(getReturnUrl(paymentMethod));
 
             PaymentsResponse paymentsResponse = getAdyenCheckoutFacade().componentPayment(request, cartData, paymentMethodDetails);
             return gson.toJson(paymentsResponse);
@@ -121,7 +126,7 @@ public String componentPayment(final HttpServletRequest request) throws AdyenCom
         catch ( ApiException e) {
             LOGGER.error("ApiException: " + e.toString());
             throw new AdyenComponentException("checkout.error.authorization.payment.refused");
-        }  catch (AdyenNonAuthorizedPaymentException  e) {
+        }  catch (AdyenNonAuthorizedPaymentException e) {
             LOGGER.debug("AdyenNonAuthorizedPaymentException occurred. Payment is refused.");
             throw new AdyenComponentException("checkout.error.authorization.payment.refused");
         } catch (Exception e) {
@@ -142,7 +147,7 @@ public String submitDetails(final HttpServletRequest request) throws AdyenCompon
             Map<String, String> details = gson.fromJson(requestJson.get("details"), mapType);
             String paymentData = gson.fromJson(requestJson.get("paymentData"), String.class);
 
-            PaymentsResponse paymentsResponse = getAdyenCheckoutFacade().componentDetails(request, details, paymentData);
+            PaymentsDetailsResponse paymentsResponse = getAdyenCheckoutFacade().componentDetails(request, details, paymentData);
             return gson.toJson(paymentsResponse);
         } catch (ApiException e) {
             LOGGER.error("ApiException: " + e.toString());
@@ -200,8 +205,14 @@ protected void validateOrderForm(JsonObject requestJson) throws InvalidCartExcep
         }
     }
 
-    private String getReturnUrl() {
-        String url = COMPONENT_PREFIX + "/submit-details";
+    private String getReturnUrl(String paymentMethod) {
+        String url;
+        if(GooglePayDetails.GOOGLEPAY.equals(paymentMethod)) {
+            //Google Pay will only use returnUrl if redirected to 3DS authentication
+            url = SUMMARY_CHECKOUT_PREFIX + "/authorise-3d-adyen-response";
+        } else {
+            url = COMPONENT_PREFIX + "/submit-details";
+        }
         BaseSiteModel currentBaseSite = baseSiteService.getCurrentBaseSite();
         return siteBaseUrlResolutionService.getWebsiteUrlForSite(currentBaseSite, true, url);
     }
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
index 0fcfa8116..b6617b48d 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
@@ -22,12 +22,16 @@
 
 import com.adyen.constants.ApiConstants.RefusalReason;
 import com.adyen.model.PaymentResult;
+import com.adyen.model.checkout.CheckoutPaymentsAction;
+import com.adyen.model.checkout.PaymentsDetailsResponse;
 import com.adyen.model.checkout.PaymentsResponse;
 import com.adyen.service.exception.ApiException;
 import com.adyen.v6.constants.AdyenControllerConstants;
 import com.adyen.v6.exceptions.AdyenNonAuthorizedPaymentException;
 import com.adyen.v6.facades.AdyenCheckoutFacade;
 import com.adyen.v6.util.TerminalAPIUtil;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import de.hybris.platform.acceleratorservices.enums.CheckoutPciOptionEnum;
 import de.hybris.platform.acceleratorservices.urlresolver.SiteBaseUrlResolutionService;
 import de.hybris.platform.acceleratorstorefrontcommons.annotations.PreValidateCheckoutStep;
@@ -63,17 +67,13 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Type;
 import java.net.SocketTimeoutException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 
-import static com.adyen.constants.ApiConstants.Redirect.Data.MD;
-import static com.adyen.constants.ApiConstants.Redirect.Data.PAREQ;
-import static com.adyen.constants.ApiConstants.Redirect.Data.PAYMENT_DATA;
-import static com.adyen.constants.ApiConstants.ThreeDS2Property.CHALLENGE_TOKEN;
-import static com.adyen.constants.ApiConstants.ThreeDS2Property.FINGERPRINT_TOKEN;
-import static com.adyen.constants.ApiConstants.ThreeDS2Property.THREEDS2_CHALLENGE_TOKEN;
-import static com.adyen.constants.ApiConstants.ThreeDS2Property.THREEDS2_FINGERPRINT_TOKEN;
 import static com.adyen.constants.HPPConstants.Response.SHOPPER_LOCALE;
 import static com.adyen.model.checkout.PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER;
 import static com.adyen.model.checkout.PaymentsResponse.ResultCodeEnum.IDENTIFYSHOPPER;
@@ -90,7 +90,9 @@
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_ONECLICK;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_POS;
 import static com.adyen.v6.constants.Adyenv6coreConstants.RATEPAY;
+import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.DETAILS;
 import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_CHECKOUT_SHOPPER_HOST;
+import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_CLIENT_KEY;
 import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_ENVIRONMENT_MODE;
 
 @Controller
@@ -101,8 +103,8 @@ public class AdyenSummaryCheckoutStepController extends AbstractCheckoutStepCont
     private final static String SUMMARY = "summary";
     private static final String AUTHORISE_3D_SECURE_PAYMENT_URL = "/authorise-3d-adyen-response";
     private static final String HPP_RESULT_URL = "/hpp-adyen-response";
-    private static final String ADYEN_PAYLOAD = "payload";
     private static final String REDIRECT_RESULT = "redirectResult";
+    private static final String ACTION = "action";
 
     private static final int POS_TOTALTIMEOUT_DEFAULT = 130;
     private static final String POS_TOTALTIMEOUT_KEY = "pos.totaltimeout";
@@ -260,7 +262,7 @@ public String placeOrder(@ModelAttribute("placeOrderForm") final PlaceOrderForm
                         return REDIRECT_PREFIX + paymentsResponse.getAction().getUrl();
                     }
                     LOGGER.debug("PaymentResponse resultCode is REDIRECTSHOPPER, redirecting shopper to local payment method page");
-                    return REDIRECT_PREFIX + paymentsResponse.getRedirect().getUrl();
+                    return REDIRECT_PREFIX + paymentsResponse.getAction().getUrl();
                 }
                 if (REFUSED == paymentsResponse.getResultCode()) {
                     LOGGER.debug("PaymentResponse is REFUSED");
@@ -268,7 +270,7 @@ public String placeOrder(@ModelAttribute("placeOrderForm") final PlaceOrderForm
                 }
                 if (CHALLENGESHOPPER == paymentsResponse.getResultCode() || IDENTIFYSHOPPER == paymentsResponse.getResultCode()) {
                     LOGGER.debug("PaymentResponse is "+paymentsResponse.getResultCode()+", redirecting to 3DS2 flow");
-                    return redirectTo3DS2Validation(model, paymentsResponse);
+                    return redirectTo3DSValidation(model, paymentsResponse);
                 }
             } catch (Exception e) {
                 LOGGER.error(ExceptionUtils.getStackTrace(e));
@@ -279,37 +281,27 @@ public String placeOrder(@ModelAttribute("placeOrderForm") final PlaceOrderForm
         return enterStep(model, redirectModel);
     }
 
-    @RequestMapping(value = "/3ds2-adyen-response", method = RequestMethod.POST)
+    @RequestMapping(value = AUTHORISE_3D_SECURE_PAYMENT_URL, method = RequestMethod.GET)
     @RequireHardLogIn
-    public String authorise3DS2Payment(final Model model,
-                                       final RedirectAttributes redirectModel,
+    public String authorise3DS1Payment(final RedirectAttributes redirectModel,
                                        final HttpServletRequest request) {
-
-        String errorMessage = "checkout.error.authorization.failed";
+        String redirectResult = request.getParameter(REDIRECT_RESULT);
         try {
-            OrderData orderData = adyenCheckoutFacade.handle3DS2Response(request);
+            OrderData orderData = adyenCheckoutFacade.handle3DSResponse(Collections.singletonMap(REDIRECT_RESULT, redirectResult));
             LOGGER.debug("Redirecting to confirmation");
             return redirectToOrderConfirmationPage(orderData);
         } catch (AdyenNonAuthorizedPaymentException e) {
-            LOGGER.debug("Handling AdyenNonAuthorizedPaymentException. Checking PaymentResponse.");
-            PaymentsResponse paymentsResponse = e.getPaymentsResponse();
-            if(paymentsResponse != null) {
-                if (paymentsResponse.getResultCode() == CHALLENGESHOPPER || paymentsResponse.getResultCode() == IDENTIFYSHOPPER) {
-                    LOGGER.debug("PaymentResponse is " + paymentsResponse.getResultCode() + ", redirecting to 3DS2 flow");
-                    return redirectTo3DS2Validation(model, paymentsResponse);
-                }
-                if (paymentsResponse.getResultCode() == REDIRECTSHOPPER) {
-                    LOGGER.debug("PaymentResponse is " + paymentsResponse.getResultCode() + ", redirecting to 3DS flow");
-                    return redirectTo3DSValidation(model, paymentsResponse);
-                }
-                if (paymentsResponse.getResultCode() == PaymentsResponse.ResultCodeEnum.REFUSED) {
-                    errorMessage = getErrorMessageByRefusalReason(paymentsResponse.getRefusalReason());
-                    LOGGER.debug("PaymentResponse is REFUSED: " + errorMessage);
-                }
+            LOGGER.debug("Handling AdyenNonAuthorizedPaymentException");
+            String errorMessage = "checkout.error.authorization.failed";
+            PaymentsDetailsResponse response = e.getPaymentsDetailsResponse();
+            if (response != null && response.getResultCode() == PaymentsResponse.ResultCodeEnum.REFUSED) {
+                LOGGER.debug("PaymentResponse is REFUSED: " + response);
+                errorMessage = getErrorMessageByRefusalReason(response.getRefusalReason());
             }
+            LOGGER.debug("Redirecting to select payment method..");
             return redirectToSelectPaymentMethodWithError(redirectModel, errorMessage);
         } catch (CalculationException | InvalidCartException e) {
-            LOGGER.warn(e.getMessage(), e);
+            LOGGER.error(e.getMessage(), e);
         } catch (Exception e) {
             LOGGER.error(ExceptionUtils.getStackTrace(e));
         }
@@ -320,26 +312,28 @@ public String authorise3DS2Payment(final Model model,
 
     @RequestMapping(value = AUTHORISE_3D_SECURE_PAYMENT_URL, method = RequestMethod.POST)
     @RequireHardLogIn
-    public String authorise3DSecurePayment(final RedirectAttributes redirectModel,
-                                           final HttpServletRequest request) {
-        String errorMessage = "checkout.error.authorization.failed";
+    public String authorise3DSPayment(final RedirectAttributes redirectModel,
+                                      final HttpServletRequest request) {
 
+        String detailsJson = request.getParameter(DETAILS);
         try {
-            OrderData orderData = adyenCheckoutFacade.handle3DResponse(request);
-
+            Map<String, String> details = parseDetailsFromComponent(detailsJson);
+            OrderData orderData = adyenCheckoutFacade.handle3DSResponse(details);
             LOGGER.debug("Redirecting to confirmation");
             return redirectToOrderConfirmationPage(orderData);
         } catch (AdyenNonAuthorizedPaymentException e) {
-            LOGGER.debug("Handling AdyenNonAuthorizedPaymentException");
-            PaymentsResponse paymentsResponse = e.getPaymentsResponse();
-            if (paymentsResponse != null && paymentsResponse.getResultCode() == PaymentsResponse.ResultCodeEnum.REFUSED) {
-                LOGGER.debug("PaymentResponse is REFUSED: " + paymentsResponse);
-                errorMessage = getErrorMessageByRefusalReason(paymentsResponse.getRefusalReason());
+            LOGGER.debug("Handling AdyenNonAuthorizedPaymentException. Checking PaymentResponse.");
+            String errorMessage = "checkout.error.authorization.failed";
+            PaymentsDetailsResponse paymentsDetailsResponse = e.getPaymentsDetailsResponse();
+            if(paymentsDetailsResponse != null) {
+                if (paymentsDetailsResponse.getResultCode() == PaymentsResponse.ResultCodeEnum.REFUSED) {
+                    errorMessage = getErrorMessageByRefusalReason(paymentsDetailsResponse.getRefusalReason());
+                    LOGGER.debug("PaymentResponse is REFUSED: " + errorMessage);
+                }
             }
-            LOGGER.debug("Redirecting to select payment method..");
             return redirectToSelectPaymentMethodWithError(redirectModel, errorMessage);
         } catch (CalculationException | InvalidCartException e) {
-            LOGGER.error(e.getMessage(), e);
+            LOGGER.warn(e.getMessage(), e);
         } catch (Exception e) {
             LOGGER.error(ExceptionUtils.getStackTrace(e));
         }
@@ -351,19 +345,15 @@ public String authorise3DSecurePayment(final RedirectAttributes redirectModel,
     @RequestMapping(value = HPP_RESULT_URL, method = RequestMethod.GET)
     @RequireHardLogIn
     public String handleAdyenResponse(final HttpServletRequest request, final RedirectAttributes redirectModel) {
-        String payload = request.getParameter(ADYEN_PAYLOAD);
         String redirectResult = request.getParameter(REDIRECT_RESULT);
         HashMap<String, String> details = new HashMap<>();
 
-        if (payload != null && ! payload.isEmpty()) {
-            details.put(ADYEN_PAYLOAD, payload);
-        }
         if (redirectResult != null && ! redirectResult.isEmpty()) {
             details.put(REDIRECT_RESULT, redirectResult);
         }
 
         try {
-            PaymentsResponse response = adyenCheckoutFacade.handleRedirectPayload(details);
+            PaymentsDetailsResponse response = adyenCheckoutFacade.handleRedirectPayload(details);
 
             switch (response.getResultCode()) {
                 case AUTHORISED:
@@ -450,26 +440,14 @@ private String redirectToSelectPaymentMethodWithError(final RedirectAttributes r
     }
 
     private String redirectTo3DSValidation(Model model, PaymentsResponse paymentsResponse) {
-        if (paymentsResponse.getRedirect() != null && paymentsResponse.getRedirect().getData() != null) {
-            model.addAttribute("termUrl", paymentsResponse.getRedirect().getData().get("TermUrl"));
-            model.addAttribute("paReq", paymentsResponse.getRedirect().getData().get(PAREQ));
-            model.addAttribute("md", paymentsResponse.getRedirect().getData().get(MD));
-            model.addAttribute("issuerUrl", paymentsResponse.getRedirect().getUrl());
-        }
-        return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DSecurePaymentPage;
-    }
+        CheckoutPaymentsAction action = paymentsResponse.getAction();
 
-    private String redirectTo3DS2Validation(Model model, PaymentsResponse paymentsResponse) {
+        model.addAttribute(MODEL_CLIENT_KEY, adyenCheckoutFacade.getClientKey());
         model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
         model.addAttribute(MODEL_ENVIRONMENT_MODE, adyenCheckoutFacade.getEnvironmentMode());
         model.addAttribute(SHOPPER_LOCALE, adyenCheckoutFacade.getShopperLocale());
-        model.addAttribute(PAYMENT_DATA, paymentsResponse.getPaymentData());
-        if (paymentsResponse.getResultCode() == CHALLENGESHOPPER) {
-            model.addAttribute(CHALLENGE_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_CHALLENGE_TOKEN));
-        } else {
-            model.addAttribute(FINGERPRINT_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_FINGERPRINT_TOKEN));
-        }
-        return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
+        model.addAttribute(ACTION, new Gson().toJson(action));
+        return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DSPaymentPage;
     }
 
     private String getReturnUrl(String adyenPaymentMethod) {
@@ -583,6 +561,9 @@ public String handleComponentResult(final HttpServletRequest request,
                 PaymentsResponse paymentsResponse = e.getPaymentsResponse();
                 if (paymentsResponse != null && paymentsResponse.getResultCode() != null) {
                     switch (paymentsResponse.getResultCode()) {
+                        case REDIRECTSHOPPER:
+                            LOGGER.debug("Component PaymentResponse resultCode is REDIRECTSHOPPER, redirecting shopper to 3DS flow");
+                            return redirectTo3DSValidation(model, paymentsResponse);
                         case REFUSED:
                             errorMessageKey = "checkout.error.authorization.payment.refused";
                             break;
@@ -627,6 +608,12 @@ private boolean isValidResult(String resultData, String isResultError) {
                 && StringUtils.isNotBlank(resultData);
     }
 
+    private Map<String, String> parseDetailsFromComponent(String details) {
+        Gson gson = new Gson();
+        Type mapType = new TypeToken<Map<String, String>>() {}.getType();
+        return gson.fromJson(details, mapType);
+    }
+
     @RequestMapping(value = "/back", method = RequestMethod.GET)
     @RequireHardLogIn
     @Override
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag
index 42e62741d..8b7792b6e 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag
@@ -19,6 +19,7 @@
   ~  See the LICENSE file for more info.
   --%>
 <%@ attribute name="brandCode" required="true" type="java.lang.String" %>
+<%@ attribute name="brand" required="false" type="java.lang.String" %>
 <%@ attribute name="name" required="true" type="java.lang.String" %>
 <%@ attribute name="issuers" required="false" type="java.util.List" %>
 <%@ attribute name="showDob" required="false" type="java.lang.Boolean" %>
@@ -34,7 +35,7 @@
 
 <div class="chckt-pm chckt-pm-${brandCode} js-chckt-pm" data-pm="${brandCode}">
     <div class="chckt-pm__header js-chckt-pm__header">
-        <adyen:methodSelector name="${brandCode}"/>
+        <adyen:methodSelector name="${brandCode}" brand="${brand}"/>
         <span class="chckt-pm__name js-chckt-pm__name">${name}</span>
         <span class="chckt-pm__image">
             <img width="40" src="https://checkoutshopper-live.adyen.com/checkoutshopper/images/logos/${brandCode}.svg" alt="">
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
index 14b01ba4e..a7a1f5b22 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
@@ -11,40 +11,39 @@
 <spring:url value="/checkout/multi/termsAndConditions" var="getTermsAndConditionsUrl"/>
 
 <%-- Components --%>
-<c:if test="${selectedPaymentMethod eq 'mbway' || selectedPaymentMethod eq 'paypal' || selectedPaymentMethod eq 'applepay'  || selectedPaymentMethod eq 'pix'}">
-    <%-- Render Paypal or Apple Pay button --%>
-    <c:if test="${selectedPaymentMethod eq 'paypal' || selectedPaymentMethod eq 'applepay' || selectedPaymentMethod eq 'pix'}">
-        <div class="checkbox">
-            <label>
-                <input type="checkbox" id="terms-conditions-check-${label}" />
-                <spring:theme var="readTermsAndConditions" code="checkout.summary.placeOrder.readTermsAndConditions" arguments="${fn:escapeXml(getTermsAndConditionsUrl)}" htmlEscape="false"/>
-                    ${ycommerce:sanitizeHTML(readTermsAndConditions)}
-            </label>
-        </div>
+<c:if test="${selectedPaymentMethod eq 'paypal' || selectedPaymentMethod eq 'applepay' || selectedPaymentMethod eq 'pix' || selectedPaymentMethod eq 'paywithgoogle'}">
+    <div class="checkbox">
+        <label>
+            <input type="checkbox" id="terms-conditions-check-${label}" />
+            <spring:theme var="readTermsAndConditions" code="checkout.summary.placeOrder.readTermsAndConditions" arguments="${fn:escapeXml(getTermsAndConditionsUrl)}" htmlEscape="false"/>
+                ${ycommerce:sanitizeHTML(readTermsAndConditions)}
+        </label>
+    </div>
+
+    <c:choose>
+        <c:when test="${selectedPaymentMethod eq 'pix'}">
+            <%-- Render Pix QR code --%>
+            <button id="generateqr-${label}" type="submit" class="btn btn-primary btn-block">
+                <spring:theme code="checkout.summary.component.pix.generateqr" text="Generate QR Code" />
+            </button>
+            <div id="pix-container-${label}"></div>
+        </c:when>
+        <c:otherwise>
+            <%-- Render Paypal, Apple or Google Pay button --%>
+            <div id="adyen-component-button-container-${label}"></div>
+        </c:otherwise>
+    </c:choose>
+</c:if>
 
-        <c:choose>
-            <c:when test="${selectedPaymentMethod eq 'pix'}">
-                <button id="generateqr-${label}" type="submit" class="btn btn-primary btn-block">
-                    <spring:theme code="checkout.summary.component.pix.generateqr" text="Generate QR Code" />
-                </button>
-                <div id="pix-container-${label}"></div>
-            </c:when>
-            <c:otherwise>
-                <div id="adyen-component-button-container-${label}"></div>
-            </c:otherwise>
-        </c:choose>
-    </c:if>
-
-    <c:if test="${selectedPaymentMethod eq 'mbway'}">
-        <div class="chckt-pm__header js-chckt-pm__header">
-            <spring:theme code="checkout.summary.component.mbway.payment"/>
-        </div>
-        <div id="adyen-component-container-${label}"></div>
-    </c:if>
+<c:if test="${selectedPaymentMethod eq 'mbway'}">
+    <div class="chckt-pm__header js-chckt-pm__header">
+        <spring:theme code="checkout.summary.component.mbway.payment"/>
+    </div>
+    <div id="adyen-component-container-${label}"></div>
 </c:if>
 
-<%-- Paypal and Apple Pay has it's own button --%>
-<c:if test="${selectedPaymentMethod ne 'paypal' && selectedPaymentMethod ne 'applepay' && selectedPaymentMethod ne 'pix'}">
+<%-- For components that do not have it's own button --%>
+<c:if test="${selectedPaymentMethod ne 'paypal' && selectedPaymentMethod ne 'applepay' && selectedPaymentMethod ne 'pix' && selectedPaymentMethod ne 'paywithgoogle'}">
     <form:form action="${placeOrderUrl}" id="placeOrderForm-${label}" modelAttribute="placeOrderForm">
         <div class="checkbox">
             <label> <form:checkbox id="terms-conditions-check-${label}" path="termsCheck" />
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/methodSelector.tag b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/methodSelector.tag
index 0ff2ea7b3..50604d634 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/methodSelector.tag
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/methodSelector.tag
@@ -19,5 +19,6 @@
   ~  See the LICENSE file for more info.
   --%>
 <%@ attribute name="name" required="true" type="java.lang.String" %>
+<%@ attribute name="brand" required="false" type="java.lang.String" %>
 
-<input class="chckt-pm__radio-button js-chckt-pm-radio-button" type="radio" name="paymentMethod" value="${name}" data-chckt-submit-link="" id="paymentMethod-${name}">
+<input class="chckt-pm__radio-button js-chckt-pm-radio-button" type="radio" name="paymentMethod" value="${name}" data-chckt-submit-link="" id="paymentMethod-${name}" brand="${brand}">
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3d-secure-payment-validation.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3d-secure-payment-validation.jsp
deleted file mode 100644
index 85abbcd2d..000000000
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3d-secure-payment-validation.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>Adyen 3D Secure Payment</title>
-	</head>
-	<%--<body>--%>
-	<body onload="document.getElementById('3dform').submit();">
-		<form method="POST" action="${issuerUrl}" id="3dform">
-			<input type="hidden" name="PaReq" value="${paReq}" />
-			<input type="hidden" name="MD" value="${md}" />
-			<input type="hidden" name="TermUrl" value="${termUrl}" />
-			<noscript>
-				<br>
-				<br>
-				<div style="text-align: center">
-					<h1>Processing your 3-D Secure Transaction</h1>
-					<p>Please click continue to continue the processing of your 3-D Secure transaction.</p>
-					<input type="submit" class="button" value="continue"/>
-				</div>
-			</noscript>
-		</form>
-	</body>
-</html>
\ No newline at end of file
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp
deleted file mode 100644
index ccdc0cfed..000000000
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp
+++ /dev/null
@@ -1,96 +0,0 @@
-<%@ page trimDirectiveWhitespaces="true" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<html>
-<head>
-
-    <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.4.0/adyen.js"></script>
-    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.4.0/adyen.css"/>
-
-    <script type="text/javascript">
-
-        function initiateCheckout ( locale, environmentMode ) {
-            var configuration = {
-                locale: locale,// shopper's locale
-                environment: environmentMode, //test or live
-                risk: {
-                    enabled: false
-                }
-            };
-            this.checkout = new AdyenCheckout( configuration );
-        }
-
-        function perform3DS2Operations () {
-            initiateCheckout( "${shopperLocale}", "${environmentMode}" );
-            var challengeToken = "${challengeToken}";
-            var fingerprintToken = "${fingerprintToken}";
-            if ( challengeToken ) {
-                initiate3DS2ChallengeShopper( challengeToken );
-            } else {
-                if ( fingerprintToken ) {
-                    initiate3DS2IdentifyShopper( fingerprintToken );
-                }
-            }
-        }
-
-        function initiate3DS2IdentifyShopper ( fingerprintToken ) {
-            var threeDS2IdentifyShopperNode = document.getElementById( 'threeDS2' );
-
-            var identifyShopperComponent = this.checkout.create( 'threeDS2DeviceFingerprint', {
-                fingerprintToken: fingerprintToken,
-                onComplete: function ( fingerprintData ) {
-                    fingerprintResult = fingerprintData.data.details[ "threeds2.fingerprint" ];
-
-                    var fingerprintResultField = document.getElementById( 'fingerprintResult' );
-                    fingerprintResultField.value = fingerprintResult;
-                    document.getElementById( "3ds2-form" ).submit();
-
-                }, // Gets triggered whenever the ThreeDS2 component has a result
-
-                onError: function ( error ) {
-                    //alert( "Payment Refused with error ["+ error.errorCode +"] and reason is "+ error.message );
-                    console.log(JSON.stringify(error));
-                } // Gets triggered on error
-            } );
-            identifyShopperComponent.mount( threeDS2IdentifyShopperNode );
-        }
-
-        function initiate3DS2ChallengeShopper ( challengeToken ) {
-            var threeDS2ChallengeShopperNode = document.getElementById( 'threeDS2' );
-            var challengeShopperComponent = this.checkout
-                .create( 'threeDS2Challenge', {
-                    challengeToken: challengeToken,
-                    onComplete: function ( challengeData ) {
-                        challengeResult = challengeData.data.details[ "threeds2.challengeResult" ];
-                        var challengeResultField = document.getElementById( 'challengeResult' );
-                        challengeResultField.value = challengeResult;
-                        document.getElementById( "3ds2-form" ).submit();
-                    },
-                    onError: function ( error ) {
-                        console.log(JSON.stringify(error));
-//                        alert( "Payment Refused with error ["+ error.errorCode +"] and reason is "+ error.message );
-
-                    }, // Gets triggered on error
-                    size: '05' // Defaults to '01'
-                } );
-            challengeShopperComponent.mount( threeDS2ChallengeShopperNode );
-        }
-    </script>
-
-</head>
-<body onload=perform3DS2Operations()>
-<form method="post"
-      class="create_update_payment_form"
-      id="3ds2-form"
-      action="3ds2-adyen-response">
-    <div class="row">
-        <div class="col-sm-6">
-            <div id="threeDS2"></div>
-            <input type="hidden" name="challengeToken" value="${challengeToken}"/>
-            <input type="hidden" name="fingerprintToken" value="${fingerprintToken}"/>
-            <input type="hidden" id="fingerprintResult" name="fingerprintResult"/>
-            <input type="hidden" id="challengeResult" name="challengeResult"/>
-        </div>
-    </div>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds_payment.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds_payment.jsp
new file mode 100644
index 000000000..2afa0d4d7
--- /dev/null
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds_payment.jsp
@@ -0,0 +1,48 @@
+<%@ page trimDirectiveWhitespaces="true" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<html>
+<head>
+    <script src="https://${checkoutShopperHost}/checkoutshopper/sdk/4.3.1/adyen.js"
+            integrity="sha384-eNk32fgfYxvzNLyV19j4SLSHPQdLNR+iUS1t/D7rO4gwvbHrj6y77oJLZI7ikzBH"
+            crossorigin="anonymous"></script>
+    <link rel="stylesheet"
+          href="https://${checkoutShopperHost}/checkoutshopper/sdk/4.3.1/adyen.css"
+          integrity="sha384-5CDvDZiVPuf+3ZID0lh0aaUHAeky3/ACF1YAKzPbn3GEmzWgO53gP6stiYHWIdpB"
+          crossorigin="anonymous"/>
+
+    <script type="text/javascript">
+        function initiateCheckout ( locale, environmentMode, clientKey ) {
+            var configuration = {
+                clientKey: clientKey,
+                locale: locale,// shopper's locale
+                environment: environmentMode, //test or live
+                risk: {
+                    enabled: false
+                },
+                onAdditionalDetails: this.handleOnAdditionalDetails
+            };
+            this.checkout = new AdyenCheckout( configuration );
+        }
+
+        function handleOnAdditionalDetails(state, component) {
+            document.getElementById("details").value = JSON.stringify(state.data.details);
+            document.getElementById("3ds2-form").submit();
+        }
+
+        function perform3DSOperations () {
+            initiateCheckout( "${shopperLocale}", "${environmentMode}", "${clientKey}");
+            var action = ${action};
+            this.checkout.createFromAction(action).mount('#threeDS');
+        }
+    </script>
+</head>
+<body onload=perform3DSOperations()>
+    <div id="threeDS"/>
+    <form method="post"
+          class="create_update_payment_form"
+          id="3ds2-form"
+          action="authorise-3d-adyen-response">
+        <input type="hidden" id="details" name="details"/>
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp
index 532f6aaff..77db3cf65 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp
@@ -14,9 +14,14 @@
 <template:page pageTitle="${pageTitle}" hideHeaderLinks="true">
 <jsp:attribute name="pageScripts">
     <script type="text/javascript" src="${dfUrl}"></script>
-    <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.23.0/adyen.js"></script>
-    <link rel="stylesheet" href="https://checkoutshopper-live.adyen.com/checkoutshopper/css/chckt-default-v1.css"/>
-    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.23.0/adyen.css"/>
+    <script src="https://${checkoutShopperHost}/checkoutshopper/sdk/4.3.1/adyen.js"
+            integrity="sha384-eNk32fgfYxvzNLyV19j4SLSHPQdLNR+iUS1t/D7rO4gwvbHrj6y77oJLZI7ikzBH"
+            crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/css/chckt-default-v1.css"/>
+    <link rel="stylesheet"
+          href="https://${checkoutShopperHost}/checkoutshopper/sdk/4.3.1/adyen.css"
+          integrity="sha384-5CDvDZiVPuf+3ZID0lh0aaUHAeky3/ACF1YAKzPbn3GEmzWgO53gP6stiYHWIdpB"
+          crossorigin="anonymous"/>
 
     <script type="text/javascript">
         AdyenCheckoutHybris.initiateCheckout("${shopperLocale}", "${environmentMode}", "${clientKey}");
@@ -44,6 +49,12 @@
                 AdyenCheckoutHybris.initiatePix("hidden-xs");
                 AdyenCheckoutHybris.initiatePix("visible-xs");
             </c:when>
+        
+            <c:when test="${selectedPaymentMethod eq 'paywithgoogle'}">
+                var amountJS = {value: "${amount.value}", currency: "${amount.currency}"};
+                AdyenCheckoutHybris.initiateGooglePay(amountJS, "${merchantAccount}", "hidden-xs");
+                AdyenCheckoutHybris.initiateGooglePay(amountJS, "${merchantAccount}", "visible-xs");
+            </c:when>
 
             <%-- API only payments methods --%>
             <c:otherwise>
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/hpp-payment.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/hpp-payment.jsp
deleted file mode 100644
index 6914eee8e..000000000
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/hpp-payment.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>Adyen Hosted Payment Pages</title>
-	</head>
-	<body onload="document.getElementById('hppForm').submit();">
-		<form method="POST" action="${hppUrl}" id="hppForm">
-			<c:forEach items="${hppFormData}" var="entry">
-				<input type="hidden" name="${entry.key}" value="${entry.value}" />
-			</c:forEach>
-			<noscript>
-				<br>
-				<br>
-				<div style="text-align: center">
-					<h1>Processing your Transaction</h1>
-					<p>Please click continue to continue the processing of your transaction.</p>
-					<input type="submit" class="button" value="continue"/>
-				</div>
-			</noscript>
-		</form>
-	</body>
-</html>
\ No newline at end of file
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
index 8a3f04cae..4fe5fb304 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
@@ -17,9 +17,14 @@
 <template:page pageTitle="${pageTitle}" hideHeaderLinks="true">
     <jsp:attribute name="pageScripts">
         <script type="text/javascript" src="${dfUrl}"></script>
-        <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.23.0/adyen.js"></script>
-        <link rel="stylesheet" href="https://checkoutshopper-live.adyen.com/checkoutshopper/css/chckt-default-v1.css"/>
-        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.23.0/adyen.css"/>
+        <script src="https://${checkoutShopperHost}/checkoutshopper/sdk/4.3.1/adyen.js"
+                integrity="sha384-eNk32fgfYxvzNLyV19j4SLSHPQdLNR+iUS1t/D7rO4gwvbHrj6y77oJLZI7ikzBH"
+                crossorigin="anonymous"></script>
+        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/css/chckt-default-v1.css"/>
+        <link rel="stylesheet"
+              href="https://${checkoutShopperHost}/checkoutshopper/sdk/4.3.1/adyen.css"
+              integrity="sha384-5CDvDZiVPuf+3ZID0lh0aaUHAeky3/ACF1YAKzPbn3GEmzWgO53gP6stiYHWIdpB"
+              crossorigin="anonymous"/>
 
         <script type="text/javascript">
             AdyenCheckoutHybris.initiateCheckout( "${shopperLocale}", "${environmentMode}", "${clientKey}" );
@@ -134,6 +139,7 @@
                             <form:hidden path="rememberTheseDetails" value="false"/>
                             <form:hidden path="sepaOwnerName"/>
                             <form:hidden path="sepaIbanNumber"/>
+                            <form:hidden path="giftCardBrand"/>
 
                             <%-- Billing Information --%>
                             <div class="headline">
@@ -188,6 +194,7 @@
                                 <c:forEach items="${paymentMethods}" var="paymentMethod">
                                     <adyen:alternativeMethod
                                             brandCode="${paymentMethod.type}"
+                                            brand="${paymentMethod.brand}"
                                             name="${paymentMethod.name}"
                                             showDob="${paymentMethod.type=='ratepay'}"
                                             showFirstName="${paymentMethod.type=='pix'}"
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js
index 5d62b1b9e..cbf3cdeb7 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js
@@ -136,6 +136,9 @@ var AdyenCheckoutHybris = (function () {
                 }
             }
 
+            if (paymentMethod === "giftcard") {
+                $( 'input[name="giftCardBrand"]' ).val($( 'input[type=radio][name=paymentMethod]:checked' ).attr('brand'));
+            }
             return true;
         },
 
@@ -418,6 +421,53 @@ var AdyenCheckoutHybris = (function () {
                     this.handleResult(ErrorMessages.PaymentNotAvailable, true);
                 });
         },
+        
+        initiateGooglePay: function (amount, merchantAccount, label) {
+            var googlePayNode = document.getElementById('adyen-component-button-container-' + label);
+            var adyenComponent = this.checkout.create("paywithgoogle", {
+                environment: this.checkout.options.environment,
+                amount: {
+                    currency: amount.currency,
+                    value: amount.value
+                },
+                configuration: {
+                    gatewayMerchantId: merchantAccount,
+                    merchantName: merchantAccount
+                },
+                buttonColor: "white",
+                onChange: (state, component) => {
+                    if (!state.isValid) {
+                        this.hideSpinner();
+                    }
+                },
+                onSubmit: (state, component) => {
+                    if (!state.isValid) {
+                        this.hideSpinner();
+                        return false;
+                    }
+                    this.showSpinner();
+                    this.makePayment(state.data.paymentMethod, component, this.handleResult, label);
+                },
+                onClick: (resolve, reject) => {
+                    if (this.isTermsAccepted(label)) {
+                        resolve();
+                    } else {
+                        reject();
+                        this.handleResult(ErrorMessages.TermsNotAccepted, true);
+                    }
+                }
+            });
+
+            adyenComponent.isAvailable()
+                .then(() => {
+                    adyenComponent.mount(googlePayNode);
+                })
+                .catch(e => {
+                    // Google Pay is not available
+                    console.log('Something went wrong trying to mount the Google Pay component: ' + e);
+                    this.handleResult(ErrorMessages.PaymentNotAvailable, true);
+                });
+        },
 
         initiateMbway: function (label) {
             var mbwayNode = document.getElementById('adyen-component-container-' + label);
@@ -520,7 +570,7 @@ var AdyenCheckoutHybris = (function () {
                         var response = JSON.parse(data);
                         if (response.resultCode && response.resultCode === 'Pending' && response.action) {
                             component.handleAction(response.action);
-                        } else if (response.resultCode && response.resultCode === 'Authorised') {
+                        } else if (response.resultCode && (response.resultCode === 'Authorised' || response.resultCode === 'RedirectShopper') ) {
                             handleResult(response, false);
                         } else {
                             handleResult(ErrorMessages.PaymentError, true);
diff --git a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
index 9eeb7179a..3278a6af0 100644
--- a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
+++ b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6b2ccheckoutaddon
 releasedate=20170509 1903
 vendor=adyen
-version=9.3.0
-version.api=9.3.0
+version=10.0.0
+version.api=10.0.0
diff --git a/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java b/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java
index 3f97da280..aa9a048b1 100644
--- a/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java
+++ b/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java
@@ -21,8 +21,9 @@
 package com.adyen.v6.facades;
 
 import com.adyen.model.PaymentResult;
+import com.adyen.model.checkout.CheckoutPaymentsAction;
+import com.adyen.model.checkout.PaymentsDetailsResponse;
 import com.adyen.model.checkout.PaymentsResponse;
-import com.adyen.model.checkout.Redirect;
 import com.adyen.util.HMACValidator;
 import com.adyen.v6.converters.PaymentsResponseConverter;
 import com.adyen.v6.exceptions.AdyenNonAuthorizedPaymentException;
@@ -64,7 +65,7 @@
 import java.math.BigDecimal;
 import java.security.NoSuchAlgorithmException;
 import java.security.SignatureException;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -75,13 +76,10 @@
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_CC;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_ONECLICK;
 import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.SESSION_LOCKED_CART;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.SESSION_MD;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.SESSION_PAYMENT_DATA;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.THREE_D_MD;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.THREE_D_PARES;
 import static de.hybris.platform.order.impl.DefaultCartService.SESSION_CART_PARAMETER_NAME;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
+import static org.mockito.Matchers.anyMap;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.any;
@@ -141,6 +139,7 @@ public class AdyenCheckoutFacadeTest {
 
     private PaymentResult paymentResultMock;
     private PaymentsResponse paymentsResponseMock;
+    private PaymentsDetailsResponse paymentsDetailsResponseMock;
 
     private PaymentsResponse paymentsResponse;
 
@@ -151,6 +150,7 @@ public void setUp() throws SignatureException, InvalidCartException {
         OrderData orderDataMock = mock(OrderData.class);
         paymentResultMock = mock(PaymentResult.class);
         paymentsResponseMock = mock(PaymentsResponse.class);
+        paymentsDetailsResponseMock = mock(PaymentsDetailsResponse.class);
         CartData cartDataMock = mock(CartData.class);
 
         when(baseStoreModelMock.getAdyenSkinHMAC()).thenReturn("hmacKey");
@@ -176,10 +176,10 @@ public void setUp() throws SignatureException, InvalidCartException {
         when(paymentsResponseMock.getPspReference()).thenReturn("pspRef");
         paymentsResponse = new PaymentsResponse();
         paymentsResponse.setPspReference("pspRef");
-        paymentsResponse.setRedirect(new Redirect());
-        paymentsResponse.getRedirect().setData(new HashMap<>());
-        paymentsResponse.getRedirect().getData().put(MD, "md");
-        paymentsResponse.setPaymentData("This is test payment data");
+        CheckoutPaymentsAction action = new CheckoutPaymentsAction();
+        action.setData(Collections.singletonMap(MD, "md"));
+        action.setPaymentData("This is test payment data");
+        paymentsResponse.setAction(action);
 
         when(adyenPaymentServiceFactoryMock.createFromBaseStore(baseStoreModelMock)).thenReturn(adyenPaymentServiceMock);
 
@@ -260,8 +260,6 @@ public void testAuthorizeCardPayment() throws Exception {
             assertEquals(paymentsResponse, e.getPaymentsResponse());
         }
 
-        //store MD to session
-        verify(sessionServiceMock).setAttribute(SESSION_MD, "md");
         //Lock the cart
         verify(sessionServiceMock).setAttribute(SESSION_LOCKED_CART, cartModelMock);
         verify(sessionServiceMock).removeAttribute(SESSION_CART_PARAMETER_NAME);
@@ -281,20 +279,14 @@ public void testAuthorizeCardPayment() throws Exception {
 
     @Test
     public void testHandle3DResponse() throws Exception {
-        HttpServletRequest requestMock = mock(HttpServletRequest.class);
+        Map detailsMap = mock(Map.class);
         OrderModel orderModelMock = mock(OrderModel.class);
         PaymentInfoModel paymentInfoModelMock = mock(PaymentInfoModel.class);
 
-        when(requestMock.getParameter(THREE_D_PARES)).thenReturn("PaRes");
-        when(requestMock.getParameter(THREE_D_MD)).thenReturn("md");
-
         //When payment is authorized
         when(paymentResultMock.isAuthorised()).thenReturn(true);
-        when(sessionServiceMock.getAttribute(SESSION_MD)).thenReturn("md");
-        when(sessionServiceMock.getAttribute(SESSION_PAYMENT_DATA)).thenReturn("This is test payment data");
         when(sessionServiceMock.getAttribute(SESSION_LOCKED_CART)).thenReturn(cartModelMock);
-        when(adyenPaymentServiceMock.authorise3D(requestMock, "PaRes", "md")).thenReturn(paymentResultMock);
-        when(adyenPaymentServiceMock.authorise3DPayment("This is test payment data", "PaRes", "md")).thenReturn(paymentsResponseMock);
+        when(adyenPaymentServiceMock.authorise3DSPayment(anyMap())).thenReturn(paymentsDetailsResponseMock);
         when(orderRepositoryMock.getOrderModel("code")).thenReturn(orderModelMock);
 
         //When payment is authorized
@@ -303,7 +295,7 @@ public void testHandle3DResponse() throws Exception {
         when(cartModelMock.getPaymentInfo()).thenReturn(paymentInfoModelMock);
         when(paymentInfoModelMock.getAdyenPaymentMethod()).thenReturn(PAYMENT_METHOD_ONECLICK);
 
-        adyenCheckoutFacade.handle3DResponse(requestMock);
+        adyenCheckoutFacade.handle3DSResponse(detailsMap);
 
         //the order should be created
         verifyAuthorized(orderModelMock);
@@ -312,19 +304,15 @@ public void testHandle3DResponse() throws Exception {
         when(paymentsResponseMock.getResultCode()).thenReturn(PaymentsResponse.ResultCodeEnum.REFUSED);
 
         try {
-            adyenCheckoutFacade.handle3DResponse(requestMock);
+            adyenCheckoutFacade.handle3DSResponse(detailsMap);
             fail("Expecting exception");
         } catch (AdyenNonAuthorizedPaymentException e) {
             //throw exception with getPaymentsResponse details
             assertEquals(paymentsResponseMock, e.getPaymentsResponse());
         }
 
-
-        //When the MD is different
-        when(sessionServiceMock.getAttribute(SESSION_MD)).thenReturn("differentMd");
-
         try {
-            adyenCheckoutFacade.handle3DResponse(requestMock);
+            adyenCheckoutFacade.handle3DSResponse(detailsMap);
             //throw SignatureException
             fail("Expecting exception");
         } catch (SignatureException ignored) {
diff --git a/adyenv6backoffice/resources/adyenv6backoffice.build.number b/adyenv6backoffice/resources/adyenv6backoffice.build.number
index 606569803..f4d38d7d1 100644
--- a/adyenv6backoffice/resources/adyenv6backoffice.build.number
+++ b/adyenv6backoffice/resources/adyenv6backoffice.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6backoffice
 releasedate=20170509 1903
 vendor=adyen
-version=9.3.0
-version.api=9.3.0
+version=10.0.0
+version.api=10.0.0
diff --git a/adyenv6core/lib/adyen-java-api-library-12.0.1.jar b/adyenv6core/lib/adyen-java-api-library-14.0.0.jar
similarity index 74%
rename from adyenv6core/lib/adyen-java-api-library-12.0.1.jar
rename to adyenv6core/lib/adyen-java-api-library-14.0.0.jar
index c4d020411..db2602465 100644
Binary files a/adyenv6core/lib/adyen-java-api-library-12.0.1.jar and b/adyenv6core/lib/adyen-java-api-library-14.0.0.jar differ
diff --git a/adyenv6core/resources/adyenv6core-beans.xml b/adyenv6core/resources/adyenv6core-beans.xml
index 8e942d482..904313fc0 100644
--- a/adyenv6core/resources/adyenv6core-beans.xml
+++ b/adyenv6core/resources/adyenv6core-beans.xml
@@ -43,6 +43,7 @@
         <property name="adyenShopperGender" type="java.lang.String"/>
         <property name="adyenShopperEmail" type="java.lang.String"/>
         <property name="adyenShopperTelephone" type="java.lang.String"/>
+        <property name="adyenGiftCardBrand" type="java.lang.String"/>
     </bean>
 
     <bean class="de.hybris.platform.commercefacades.order.data.AbstractOrderData">
diff --git a/adyenv6core/resources/adyenv6core-items.xml b/adyenv6core/resources/adyenv6core-items.xml
index 113be70b6..48c6db4ee 100644
--- a/adyenv6core/resources/adyenv6core-items.xml
+++ b/adyenv6core/resources/adyenv6core-items.xml
@@ -477,6 +477,10 @@
                         </columntype>
                     </persistence>
                 </attribute>
+                <attribute qualifier="adyenGiftCardBrand" type="java.lang.String">
+                    <description>Gift Card Brand</description>
+                    <persistence type="property"/>
+                </attribute>
             </attributes>
         </itemtype>
     </itemtypes>
diff --git a/adyenv6core/resources/adyenv6core-spring.xml b/adyenv6core/resources/adyenv6core-spring.xml
index 398b43606..1aa32c1ac 100644
--- a/adyenv6core/resources/adyenv6core-spring.xml
+++ b/adyenv6core/resources/adyenv6core-spring.xml
@@ -134,6 +134,7 @@
     </bean>
 
     <bean id="adyenPaymentsResponseConverter" class="com.adyen.v6.converters.PaymentsResponseConverter" />
+    <bean id="adyenPaymentsDetailsResponseConverter" class="com.adyen.v6.converters.PaymentsDetailsResponseConverter" />
     <bean id="adyenPaymentMethodConverter" class="com.adyen.v6.converters.PaymentMethodConverter" />
     <bean id="adyenPosPaymentResponseConverter" class="com.adyen.v6.converters.PosPaymentResponseConverter" />
 
@@ -205,6 +206,7 @@
         <property name="flexibleSearchService" ref="flexibleSearchService"/>
         <property name="addressReverseConverter" ref="addressReverseConverter"/>
         <property name="posPaymentResponseConverter" ref="adyenPosPaymentResponseConverter"/>
+        <property name="paymentsDetailsResponseConverter" ref="adyenPaymentsDetailsResponseConverter"/>
         <property name="orderConverter" ref="orderConverter" />
         <property name="cartFactory" ref="cartFactory" />
         <property name="calculationService" ref="calculationService" />
diff --git a/adyenv6core/resources/adyenv6core.build.number b/adyenv6core/resources/adyenv6core.build.number
index 08204b0cd..4c5634e12 100644
--- a/adyenv6core/resources/adyenv6core.build.number
+++ b/adyenv6core/resources/adyenv6core.build.number
@@ -6,5 +6,5 @@ group.id=com.adyen.v6
 module.name=platform-module
 name=adyenv6core
 vendor=adyen
-version=9.3.0
-version.api=9.3.0
+version=10.0.0
+version.api=10.0.0
diff --git a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
index adf8f6cd9..8ecfcf463 100644
--- a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
+++ b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
@@ -31,7 +31,7 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	public static final String EXTENSIONNAME = "adyenv6core";
 
 	public static final String PLUGIN_NAME = "adyen-hybris";
-	public static final String PLUGIN_VERSION = "9.3.0";
+	public static final String PLUGIN_VERSION = "10.0.0";
 	public static final String PAYMENT_PROVIDER = "Adyen";
 	public static final String PAYMENT_METHOD ="paymentMethod";
 
@@ -68,6 +68,7 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	public static final String CARD_TYPE_DEBIT = "debit";
 	public static final String AFFIRM = "affirm";
 	public static final String CLEARPAY = "clearpay";
+	public static final String GIFT_CARD = "giftcard";
 
 	private Adyenv6coreConstants() {
 		//empty to avoid instantiating this constant class
diff --git a/adyenv6core/src/com/adyen/v6/converters/PaymentsDetailsResponseConverter.java b/adyenv6core/src/com/adyen/v6/converters/PaymentsDetailsResponseConverter.java
new file mode 100644
index 000000000..40f675254
--- /dev/null
+++ b/adyenv6core/src/com/adyen/v6/converters/PaymentsDetailsResponseConverter.java
@@ -0,0 +1,45 @@
+/*
+ *                        ######
+ *                        ######
+ *  ############    ####( ######  #####. ######  ############   ############
+ *  #############  #####( ######  #####. ######  #############  #############
+ *         ######  #####( ######  #####. ######  #####  ######  #####  ######
+ *  ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ *  ###### ######  #####( ######  #####. ######  #####          #####  ######
+ *  #############  #############  #############  #############  #####  ######
+ *   ############   ############  #############   ############  #####  ######
+ *                                       ######
+ *                                #############
+ *                                ############
+ *
+ *  Adyen Hybris Extension
+ *
+ *  Copyright (c) 2017 Adyen B.V.
+ *  This file is open source and available under the MIT license.
+ *  See the LICENSE file for more info.
+ */
+package com.adyen.v6.converters;
+
+import com.adyen.model.checkout.PaymentsDetailsResponse;
+import com.adyen.model.checkout.PaymentsResponse;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.core.convert.converter.Converter;
+
+import java.lang.reflect.InvocationTargetException;
+
+public class PaymentsDetailsResponseConverter implements Converter<PaymentsDetailsResponse, PaymentsResponse> {
+    @Override
+    public PaymentsResponse convert(PaymentsDetailsResponse paymentsDetailsResponse) {
+        if (paymentsDetailsResponse == null) {
+            throw new IllegalArgumentException("Null PaymentsDetailsResponse");
+        }
+        PaymentsResponse paymentsResponse = new PaymentsResponse();
+
+        try {
+            BeanUtils.copyProperties(paymentsResponse, paymentsDetailsResponse);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException("Bean copy error, Cannot convert from PaymentsDetailsResponse to PaymentsResponse", e);
+        }
+        return paymentsResponse;
+    }
+}
diff --git a/adyenv6core/src/com/adyen/v6/exceptions/AdyenNonAuthorizedPaymentException.java b/adyenv6core/src/com/adyen/v6/exceptions/AdyenNonAuthorizedPaymentException.java
index e43e39dbb..d10473cef 100644
--- a/adyenv6core/src/com/adyen/v6/exceptions/AdyenNonAuthorizedPaymentException.java
+++ b/adyenv6core/src/com/adyen/v6/exceptions/AdyenNonAuthorizedPaymentException.java
@@ -21,6 +21,7 @@
 package com.adyen.v6.exceptions;
 
 import com.adyen.model.PaymentResult;
+import com.adyen.model.checkout.PaymentsDetailsResponse;
 import com.adyen.model.checkout.PaymentsResponse;
 import com.adyen.model.terminal.TerminalAPIResponse;
 
@@ -28,6 +29,7 @@ public class AdyenNonAuthorizedPaymentException extends Exception {
     private PaymentResult paymentResult;
     private PaymentsResponse paymentsResponse;
     private TerminalAPIResponse terminalApiResponse;
+    private PaymentsDetailsResponse paymentsDetailsResponse;
 
     public AdyenNonAuthorizedPaymentException(PaymentResult paymentResult) {
         this.paymentResult = paymentResult;
@@ -41,6 +43,10 @@ public AdyenNonAuthorizedPaymentException(TerminalAPIResponse terminalApiRespons
         this.terminalApiResponse = terminalApiResponse;
     }
 
+    public AdyenNonAuthorizedPaymentException(PaymentsDetailsResponse paymentsDetailsResponse) {
+        this.paymentsDetailsResponse = paymentsDetailsResponse;
+    }
+
     public AdyenNonAuthorizedPaymentException(String message) {
         super(message);
     }
@@ -68,4 +74,12 @@ public TerminalAPIResponse getTerminalApiResponse() {
     public void setTerminalApiResponse(TerminalAPIResponse terminalApiResponse) {
         this.terminalApiResponse = terminalApiResponse;
     }
+
+    public PaymentsDetailsResponse getPaymentsDetailsResponse() {
+        return paymentsDetailsResponse;
+    }
+
+    public void setPaymentsDetailsResponse(PaymentsDetailsResponse paymentsDetailsResponse) {
+        this.paymentsDetailsResponse = paymentsDetailsResponse;
+    }
 }
diff --git a/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
index 14ab34a7b..bb7e492fe 100644
--- a/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
@@ -21,6 +21,7 @@
 package com.adyen.v6.facades;
 
 import com.adyen.model.checkout.PaymentMethodDetails;
+import com.adyen.model.checkout.PaymentsDetailsResponse;
 import com.adyen.model.checkout.PaymentsResponse;
 import com.adyen.service.exception.ApiException;
 import com.adyen.v6.forms.AdyenPaymentForm;
@@ -29,9 +30,7 @@
 import de.hybris.platform.commercefacades.user.data.CountryData;
 import de.hybris.platform.commercewebservicescommons.dto.order.PaymentDetailsListWsDTO;
 import de.hybris.platform.commercewebservicescommons.dto.order.PaymentDetailsWsDTO;
-import de.hybris.platform.core.enums.OrderStatus;
 import de.hybris.platform.core.model.order.CartModel;
-import de.hybris.platform.core.model.order.OrderModel;
 import de.hybris.platform.core.model.order.payment.PaymentInfoModel;
 import de.hybris.platform.order.InvalidCartException;
 import de.hybris.platform.order.exceptions.CalculationException;
@@ -106,7 +105,7 @@ public interface AdyenCheckoutFacade {
      * @param details consisting of parameters present in response query string
      * @return PaymentsResponse
      */
-    PaymentsResponse handleRedirectPayload(HashMap<String,String> details) throws Exception;
+    PaymentsDetailsResponse handleRedirectPayload(HashMap<String,String> details) throws Exception;
 
     /**
      * Authorizes a payment using Adyen API
@@ -141,7 +140,7 @@ public interface AdyenCheckoutFacade {
      * @return PaymentsResponse
      * @throws Exception In case request failed
      */
-    PaymentsResponse componentDetails(HttpServletRequest request, Map<String, String> details, String paymentData) throws Exception;
+    PaymentsDetailsResponse componentDetails(HttpServletRequest request, Map<String, String> details, String paymentData) throws Exception;
 
     /**
      * Add payment details to cart
@@ -152,14 +151,12 @@ public interface AdyenCheckoutFacade {
      * Handles an 3D response
      * In case of authorized, it places an order from cart
      *
-     * @param request HTTP Request object
+     * @param details HTTP Request object
      * @return OrderData
      * @throws Exception In case order failed to be created
      */
 
-    OrderData handle3DS2Response(HttpServletRequest request) throws Exception;
-
-    OrderData handle3DResponse(HttpServletRequest request) throws Exception;
+    OrderData handle3DSResponse(Map<String, String> details) throws Exception;
 
     /**
      * Initializes an HPP payment
@@ -241,4 +238,6 @@ public interface AdyenCheckoutFacade {
     OrderData handleComponentResult(String resultJson) throws Exception;
 
     void restoreCartFromOrderCodeInSession() throws InvalidCartException, CalculationException;
+
+    String getClientKey();
 }
diff --git a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
index 84094771e..f97d02dc4 100644
--- a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
@@ -25,9 +25,11 @@
 import com.adyen.model.Card;
 import com.adyen.model.PaymentResult;
 import com.adyen.model.checkout.CheckoutPaymentsAction;
+import com.adyen.model.checkout.CheckoutPaymentsAction.CheckoutActionType;
 import com.adyen.model.checkout.PaymentMethod;
 import com.adyen.model.checkout.PaymentMethodDetails;
 import com.adyen.model.checkout.PaymentMethodsResponse;
+import com.adyen.model.checkout.PaymentsDetailsResponse;
 import com.adyen.model.checkout.PaymentsResponse;
 import com.adyen.model.checkout.StoredPaymentMethod;
 import com.adyen.model.nexo.ErrorConditionType;
@@ -36,9 +38,11 @@
 import com.adyen.model.recurring.RecurringDetail;
 import com.adyen.model.terminal.TerminalAPIResponse;
 import com.adyen.service.exception.ApiException;
+import com.adyen.util.DateUtil;
 import com.adyen.util.HMACValidator;
 import com.adyen.util.Util;
 import com.adyen.v6.constants.Adyenv6coreConstants;
+import com.adyen.v6.converters.PaymentsDetailsResponseConverter;
 import com.adyen.v6.converters.PaymentsResponseConverter;
 import com.adyen.v6.converters.PosPaymentResponseConverter;
 import com.adyen.v6.enums.AdyenCardTypeEnum;
@@ -123,9 +127,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static com.adyen.constants.ApiConstants.Redirect.Data.MD;
-import static com.adyen.constants.ApiConstants.ThreeDS2Property.CHALLENGE_RESULT;
-import static com.adyen.constants.ApiConstants.ThreeDS2Property.FINGERPRINT_RESULT;
 import static com.adyen.constants.ApiConstants.ThreeDS2Property.THREEDS2_CHALLENGE_TOKEN;
 import static com.adyen.constants.ApiConstants.ThreeDS2Property.THREEDS2_FINGERPRINT_TOKEN;
 import static com.adyen.constants.HPPConstants.Fields.BRAND_CODE;
@@ -141,7 +142,6 @@
 import static com.adyen.constants.HPPConstants.Fields.SHIP_BEFORE_DATE;
 import static com.adyen.constants.HPPConstants.Fields.SKIN_CODE;
 import static com.adyen.constants.HPPConstants.Response.SHOPPER_LOCALE;
-import static com.adyen.v6.constants.Adyenv6coreConstants.AFTERPAY_TOUCH;
 import static com.adyen.v6.constants.Adyenv6coreConstants.ISSUER_PAYMENT_METHODS;
 import static com.adyen.v6.constants.Adyenv6coreConstants.KLARNA;
 import static com.adyen.v6.constants.Adyenv6coreConstants.OPENINVOICE_METHODS_ALLOW_SOCIAL_SECURITY_NUMBER;
@@ -150,9 +150,8 @@
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHODS_ALLOW_SOCIAL_SECURITY_NUMBER;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_APPLEPAY;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO;
-import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_CC;
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO_SANTANDER;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_MULTIBANCO;
-import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_ONECLICK;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_SCHEME;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_SEPA_DIRECTDEBIT;
 import static com.adyen.v6.constants.Adyenv6coreConstants.RATEPAY;
@@ -163,7 +162,7 @@
  */
 public class DefaultAdyenCheckoutFacade implements AdyenCheckoutFacade {
 
-    private static final String ADYEN_PAYLOAD = "payload";
+    public static final String DETAILS = "details";
 
     private BaseStoreService baseStoreService;
     private SessionService sessionService;
@@ -180,6 +179,7 @@ public class DefaultAdyenCheckoutFacade implements AdyenCheckoutFacade {
     private CommonI18NService commonI18NService;
     private KeyGenerator keyGenerator;
     private PaymentsResponseConverter paymentsResponseConverter;
+    private PaymentsDetailsResponseConverter paymentsDetailsResponseConverter;
     private FlexibleSearchService flexibleSearchService;
     private Converter<AddressData, AddressModel> addressReverseConverter;
     private PosPaymentResponseConverter posPaymentResponseConverter;
@@ -201,16 +201,12 @@ public class DefaultAdyenCheckoutFacade implements AdyenCheckoutFacade {
 
     public static final String SESSION_LOCKED_CART = "adyen_cart";
     public static final String SESSION_PENDING_ORDER_CODE = "adyen_pending_order_code";
-    public static final String SESSION_MD = "adyen_md";
     public static final String SESSION_CSE_TOKEN = "adyen_cse_token";
     public static final String SESSION_SF_CARD_NUMBER = "encryptedCardNumber";
     public static final String SESSION_SF_EXPIRY_MONTH = "encryptedExpiryMonth";
     public static final String SESSION_SF_EXPIRY_YEAR = "encryptedExpiryYear";
     public static final String SESSION_SF_SECURITY_CODE = "encryptedSecurityCode";
     public static final String SESSION_CARD_BRAND = "cardBrand";
-    public static final String THREE_D_MD = "MD";
-    public static final String THREE_D_PARES = "PaRes";
-    public static final String SESSION_PAYMENT_DATA = "adyen_payment_data";
     public static final String MODEL_SELECTED_PAYMENT_METHOD = "selectedPaymentMethod";
     public static final String MODEL_PAYMENT_METHODS = "paymentMethods";
     public static final String MODEL_CREDIT_CARD_LABEL = "creditCardLabel";
@@ -219,6 +215,7 @@ public class DefaultAdyenCheckoutFacade implements AdyenCheckoutFacade {
     public static final String MODEL_STORED_CARDS = "storedCards";
     public static final String MODEL_DF_URL = "dfUrl";
     public static final String MODEL_CLIENT_KEY = "clientKey";
+    public static final String MODEL_MERCHANT_ACCOUNT = "merchantAccount";
     public static final String MODEL_CHECKOUT_SHOPPER_HOST = "checkoutShopperHost";
     public static final String DF_VALUE = "dfValue";
     public static final String MODEL_OPEN_INVOICE_METHODS = "openInvoiceMethods";
@@ -318,6 +315,11 @@ public String getHppUrl() {
         return getAdyenPaymentService().getHppEndpoint() + "/details.shtml";
     }
 
+    @Override
+    public String getClientKey() {
+        return baseStoreService.getCurrentBaseStore().getAdyenClientKey();
+    }
+
     @Override
     public void lockSessionCart() {
         getSessionService().setAttribute(SESSION_LOCKED_CART, cartService.getSessionCart());
@@ -338,7 +340,6 @@ public CartModel restoreSessionCart() throws InvalidCartException {
 
         getCartService().setSessionCart(cartModel);
         getSessionService().removeAttribute(SESSION_LOCKED_CART);
-        getSessionService().removeAttribute(SESSION_PAYMENT_DATA);
         getSessionService().removeAttribute(THREEDS2_FINGERPRINT_TOKEN);
         getSessionService().removeAttribute(THREEDS2_CHALLENGE_TOKEN);
         getSessionService().removeAttribute(PAYMENT_METHOD);
@@ -405,14 +406,10 @@ private AddressModel createBillingAddress(PaymentDetailsWsDTO paymentDetails) {
     }
 
     @Override
-    public PaymentsResponse handleRedirectPayload(HashMap<String, String> details) throws Exception {
-        PaymentsResponse response;
+    public PaymentsDetailsResponse handleRedirectPayload(HashMap<String, String> details) throws Exception {
+        PaymentsDetailsResponse response;
         try {
-            if (details.containsKey(ADYEN_PAYLOAD)) {
-                response = getAdyenPaymentService().getPaymentDetailsFromPayload(details);
-            } else {
-                response = getAdyenPaymentService().getPaymentDetailsFromPayload(details, getSessionService().getAttribute(SESSION_PAYMENT_DATA));
-            }
+            response = getAdyenPaymentService().getPaymentDetailsFromPayload(details);
         } catch (Exception e) {
             LOGGER.debug(e instanceof ApiException ? e.toString() : e.getMessage());
             restoreCartFromOrderCodeInSession();
@@ -421,7 +418,8 @@ public PaymentsResponse handleRedirectPayload(HashMap<String, String> details) t
 
         String orderCode = response.getMerchantReference();
         OrderModel orderModel = retrievePendingOrder(orderCode);
-        updateOrderPaymentStatusAndInfo(orderModel, response);
+        PaymentsResponse paymentsResponse = getPaymentsDetailsResponseConverter().convert(response);
+        updateOrderPaymentStatusAndInfo(orderModel, paymentsResponse);
 
         if (PaymentsResponse.ResultCodeEnum.AUTHORISED != response.getResultCode()
                 && PaymentsResponse.ResultCodeEnum.RECEIVED != response.getResultCode()) {
@@ -482,6 +480,7 @@ public OrderData authorisePayment(final HttpServletRequest request, final CartDa
 
         PaymentsResponse paymentsResponse = getAdyenPaymentService().authorisePayment(cartData, requestInfo, customer);
         PaymentsResponse.ResultCodeEnum resultCode = paymentsResponse.getResultCode();
+        CheckoutPaymentsAction action = paymentsResponse.getAction();
         if (PaymentsResponse.ResultCodeEnum.AUTHORISED == resultCode) {
             return createAuthorizedOrder(paymentsResponse);
         }
@@ -493,27 +492,11 @@ public OrderData authorisePayment(final HttpServletRequest request, final CartDa
         }
         if (PaymentsResponse.ResultCodeEnum.REDIRECTSHOPPER == resultCode) {
             placePendingOrder(resultCode);
-            getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData());
-            if (PAYMENT_METHOD_CC.equals(adyenPaymentMethod) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
-                getSessionService().setAttribute(SESSION_MD, paymentsResponse.getRedirect().getData().get(MD));
-            }
             if (adyenPaymentMethod.startsWith(KLARNA)) {
                 getSessionService().setAttribute(PAYMENT_METHOD, adyenPaymentMethod);
             }
-        }
-        if (PaymentsResponse.ResultCodeEnum.IDENTIFYSHOPPER == resultCode) {
-            placePendingOrder(resultCode);
-            if (PAYMENT_METHOD_CC.equals(adyenPaymentMethod) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
-                getSessionService().setAttribute(THREEDS2_FINGERPRINT_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_FINGERPRINT_TOKEN));
-                getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData());
-            }
-        }
-        if (PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER == resultCode) {
+        } else if (action != null && CheckoutActionType.THREEDS2.equals(action.getType())) {
             placePendingOrder(resultCode);
-            if (PAYMENT_METHOD_CC.equals(adyenPaymentMethod) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
-                getSessionService().setAttribute(THREEDS2_CHALLENGE_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_CHALLENGE_TOKEN));
-                getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData());
-            }
         }
 
         throw new AdyenNonAuthorizedPaymentException(paymentsResponse);
@@ -531,7 +514,7 @@ private boolean isGuestUserTokenizationEnabled() {
     @Override
     public PaymentsResponse componentPayment(final HttpServletRequest request, final CartData cartData, final PaymentMethodDetails paymentMethodDetails) throws Exception {
         CustomerModel customer = null;
-        if (! getCheckoutCustomerStrategy().isAnonymousCheckout()) {
+        if (!getCheckoutCustomerStrategy().isAnonymousCheckout()) {
             customer = getCheckoutCustomerStrategy().getCurrentUserForCheckout();
         }
 
@@ -541,7 +524,7 @@ public PaymentsResponse componentPayment(final HttpServletRequest request, final
         requestInfo.setShopperLocale(getShopperLocale());
 
         PaymentsResponse paymentsResponse = getAdyenPaymentService().componentPayment(cartData, paymentMethodDetails, requestInfo, customer);
-        if (PaymentsResponse.ResultCodeEnum.PENDING == paymentsResponse.getResultCode()) {
+        if (PaymentsResponse.ResultCodeEnum.PENDING == paymentsResponse.getResultCode() || PaymentsResponse.ResultCodeEnum.REDIRECTSHOPPER == paymentsResponse.getResultCode()) {
             placePendingOrder(paymentsResponse.getResultCode());
             return paymentsResponse;
         }
@@ -554,12 +537,13 @@ public PaymentsResponse componentPayment(final HttpServletRequest request, final
     }
 
     @Override
-    public PaymentsResponse componentDetails(final HttpServletRequest request, final Map<String, String> details, final String paymentData) throws Exception {
-        PaymentsResponse response = getAdyenPaymentService().getPaymentDetailsFromPayload(details, paymentData);
+    public PaymentsDetailsResponse componentDetails(final HttpServletRequest request, final Map<String, String> details, final String paymentData) throws Exception {
+        PaymentsDetailsResponse response = getAdyenPaymentService().getPaymentDetailsFromPayload(details, paymentData);
+        PaymentsResponse paymentsResponse = getPaymentsDetailsResponseConverter().convert(response);
 
         String orderCode = response.getMerchantReference();
         OrderModel orderModel = retrievePendingOrder(orderCode);
-        updateOrderPaymentStatusAndInfo(orderModel, response);
+        updateOrderPaymentStatusAndInfo(orderModel, paymentsResponse);
 
         return response;
     }
@@ -579,88 +563,31 @@ private void updateCartWithSessionData(CartData cartData) {
         getSessionService().removeAttribute(SESSION_SF_SECURITY_CODE);
         getSessionService().removeAttribute(SESSION_CARD_BRAND);
         getSessionService().removeAttribute(PAYMENT_METHOD);
-        getSessionService().removeAttribute(SESSION_PAYMENT_DATA);
     }
 
     @Override
-    public OrderData handle3DResponse(final HttpServletRequest request) throws Exception {
-        String paRes = request.getParameter(THREE_D_PARES);
-        String md = request.getParameter(THREE_D_MD);
-
-        String sessionPaymentData = getSessionService().getAttribute(SESSION_PAYMENT_DATA);
-
-        PaymentsResponse paymentsResponse;
+    public OrderData handle3DSResponse(final Map<String, String> details) throws Exception {
+        PaymentsDetailsResponse paymentsDetailsResponse;
         try {
-            paymentsResponse = getAdyenPaymentService().authorise3DPayment(sessionPaymentData, paRes, md);
+            paymentsDetailsResponse = getAdyenPaymentService().authorise3DSPayment(details);
         } catch (Exception e) {
             LOGGER.debug(e instanceof ApiException ? e.toString() : e.getMessage());
             restoreCartFromOrderCodeInSession();
             throw new AdyenNonAuthorizedPaymentException(e.getMessage());
         }
 
-        String orderCode = paymentsResponse.getMerchantReference();
+        String orderCode = paymentsDetailsResponse.getMerchantReference();
         OrderModel orderModel = retrievePendingOrder(orderCode);
-        updateOrderPaymentStatusAndInfo(orderModel, paymentsResponse);
+        updateOrderPaymentStatusAndInfo(orderModel, getPaymentsDetailsResponseConverter().convert(paymentsDetailsResponse));
 
-        if (PaymentsResponse.ResultCodeEnum.AUTHORISED == paymentsResponse.getResultCode()) {
+        PaymentsResponse.ResultCodeEnum resultCode = paymentsDetailsResponse.getResultCode();
+
+        if (PaymentsResponse.ResultCodeEnum.AUTHORISED == resultCode) {
             return getOrderConverter().convert(orderModel);
         }
 
         restoreCartFromOrder(orderCode);
-        throw new AdyenNonAuthorizedPaymentException(paymentsResponse);
-    }
-
-    @Override
-    public OrderData handle3DS2Response(final HttpServletRequest request) throws Exception {
-
-        String fingerprintResult = request.getParameter(FINGERPRINT_RESULT);
-        String challengeResult = request.getParameter(CHALLENGE_RESULT);
-        String paymentData = getSessionService().getAttribute(SESSION_PAYMENT_DATA);
-
-        String type = "";
-        String token = "";
-
-        if (challengeResult != null && ! challengeResult.isEmpty()) {
-            type = "challenge";
-            token = challengeResult;
-        } else if (fingerprintResult != null && ! fingerprintResult.isEmpty()) {
-            type = "fingerprint";
-            token = fingerprintResult;
-
-        }
-
-        PaymentsResponse paymentsResponse;
-        try {
-            paymentsResponse = getAdyenPaymentService().authorise3DS2Payment(paymentData, token, type);
-        } catch (Exception e) {
-            LOGGER.debug(e instanceof ApiException ? e.toString() : e.getMessage());
-            if (type.equals("challenge")) {
-                LOGGER.debug("Restoring cart because ApiException occurred after challengeResult ");
-                restoreCartFromOrderCodeInSession();
-            }
-            throw new AdyenNonAuthorizedPaymentException(e.getMessage());
-        }
-
-        PaymentsResponse.ResultCodeEnum resultCode = paymentsResponse.getResultCode();
-
-        if(resultCode == PaymentsResponse.ResultCodeEnum.REDIRECTSHOPPER) {
-            //3DS1 fallback, update payment data
-            getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData());
-        }
-        else if (resultCode != PaymentsResponse.ResultCodeEnum.IDENTIFYSHOPPER
-                && resultCode != PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER) {
-            String orderCode = paymentsResponse.getMerchantReference();
-            OrderModel orderModel = retrievePendingOrder(orderCode);
-            updateOrderPaymentStatusAndInfo(orderModel, paymentsResponse);
-
-            if (PaymentsResponse.ResultCodeEnum.AUTHORISED == resultCode) {
-                return getOrderConverter().convert(orderModel);
-            }
-
-            restoreCartFromOrder(orderCode);
-        }
-
-        throw new AdyenNonAuthorizedPaymentException(paymentsResponse);
+        throw new AdyenNonAuthorizedPaymentException(paymentsDetailsResponse);
     }
 
     @Override
@@ -764,18 +691,19 @@ private OrderData createOrderFromPaymentsResponse(final PaymentsResponse payment
     }
 
     private OrderData fillOrderDataWithPaymentInfo(OrderData orderData, PaymentsResponse paymentsResponse) {
-        orderData.setAdyenBoletoUrl(paymentsResponse.getBoletoUrl());
-        orderData.setAdyenBoletoData(paymentsResponse.getBoletoData());
-        orderData.setAdyenBoletoBarCodeReference(paymentsResponse.getBoletoBarCodeReference());
-        orderData.setAdyenBoletoExpirationDate(paymentsResponse.getBoletoExpirationDate());
-        orderData.setAdyenBoletoDueDate(paymentsResponse.getBoletoDueDate());
 
         CheckoutPaymentsAction action = paymentsResponse.getAction();
-        if (action != null && PAYMENT_METHOD_MULTIBANCO.equals(action.getPaymentMethodType())) {
-            orderData.setAdyenMultibancoEntity(action.getEntity());
-            orderData.setAdyenMultibancoAmount(BigDecimal.valueOf(action.getInitialAmount().getValue()));
-            orderData.setAdyenMultibancoDeadline(action.getExpiresAt());
-            orderData.setAdyenMultibancoReference(action.getReference());
+        if (action != null) {
+            if (PAYMENT_METHOD_MULTIBANCO.equals(action.getPaymentMethodType())) {
+                orderData.setAdyenMultibancoEntity(action.getEntity());
+                orderData.setAdyenMultibancoAmount(BigDecimal.valueOf(action.getInitialAmount().getValue()));
+                orderData.setAdyenMultibancoDeadline(action.getExpiresAt());
+                orderData.setAdyenMultibancoReference(action.getReference());
+            } else if (PAYMENT_METHOD_BOLETO.equals(action.getPaymentMethodType()) || PAYMENT_METHOD_BOLETO_SANTANDER.equals(action.getPaymentMethodType())) {
+                orderData.setAdyenBoletoUrl(action.getDownloadUrl());
+                orderData.setAdyenBoletoBarCodeReference(action.getReference());
+                orderData.setAdyenBoletoExpirationDate(DateUtil.parseYmdDate(action.getExpiresAt()));
+            }
         }
 
         if (paymentsResponse.getAdditionalData() != null) {
@@ -971,6 +899,7 @@ public void initializeSummaryData(Model model) {
 
         //Include information for components
         model.addAttribute(MODEL_CLIENT_KEY, baseStore.getAdyenClientKey());
+        model.addAttribute(MODEL_MERCHANT_ACCOUNT, baseStore.getAdyenMerchantAccount());
         model.addAttribute(MODEL_AMOUNT, amount);
         model.addAttribute(MODEL_IMMEDIATE_CAPTURE, isImmediateCapture());
         model.addAttribute(MODEL_PAYPAL_MERCHANT_ID, baseStore.getAdyenPaypalMerchantId());
@@ -1131,6 +1060,9 @@ public PaymentInfoModel createPaymentInfo(final CartModel cartModel, AdyenPaymen
         paymentInfo.setCardType(adyenPaymentForm.getCardType());
         paymentInfo.setCardBrand(adyenPaymentForm.getCardBrand());
 
+        // Gift card
+        paymentInfo.setAdyenGiftCardBrand(adyenPaymentForm.getGiftCardBrand());
+
         modelService.save(paymentInfo);
 
         return paymentInfo;
@@ -1418,15 +1350,16 @@ public OrderData handleComponentResult(String resultJson) throws Exception {
         }.getType());
 
         String orderCode = paymentsResponse.getMerchantReference();
-        OrderModel orderModel = retrievePendingOrder(orderCode);
 
         if (PaymentsResponse.ResultCodeEnum.AUTHORISED == paymentsResponse.getResultCode()
                 || PaymentsResponse.ResultCodeEnum.RECEIVED == paymentsResponse.getResultCode()) {
+            OrderModel orderModel = retrievePendingOrder(orderCode);
             return getOrderConverter().convert(orderModel);
         }
-
-        restoreCartFromOrder(orderCode);
-
+        
+        if (PaymentsResponse.ResultCodeEnum.REDIRECTSHOPPER != paymentsResponse.getResultCode()) {
+            restoreCartFromOrder(orderCode);
+        }
         throw new AdyenNonAuthorizedPaymentException(paymentsResponse);
     }
 
@@ -1441,8 +1374,6 @@ private OrderModel retrievePendingOrder(String orderCode) throws InvalidCartExce
         }
 
         getSessionService().removeAttribute(SESSION_PENDING_ORDER_CODE);
-        getSessionService().removeAttribute(SESSION_PAYMENT_DATA);
-        getSessionService().removeAttribute(SESSION_MD);
         getSessionService().removeAttribute(THREEDS2_FINGERPRINT_TOKEN);
         getSessionService().removeAttribute(THREEDS2_CHALLENGE_TOKEN);
         getSessionService().removeAttribute(PAYMENT_METHOD);
@@ -1512,8 +1443,6 @@ public void restoreCartFromOrderCodeInSession() throws InvalidCartException, Cal
         getAdyenBusinessProcessService().triggerOrderProcessEvent(orderModel, Adyenv6coreConstants.PROCESS_EVENT_ADYEN_PAYMENT_RESULT);
 
         getSessionService().removeAttribute(SESSION_PENDING_ORDER_CODE);
-        getSessionService().removeAttribute(SESSION_PAYMENT_DATA);
-        getSessionService().removeAttribute(SESSION_MD);
         getSessionService().removeAttribute(THREEDS2_FINGERPRINT_TOKEN);
         getSessionService().removeAttribute(THREEDS2_CHALLENGE_TOKEN);
         getSessionService().removeAttribute(PAYMENT_METHOD);
@@ -1730,4 +1659,12 @@ public AdyenBusinessProcessService getAdyenBusinessProcessService() {
     public void setAdyenBusinessProcessService(AdyenBusinessProcessService adyenBusinessProcessService) {
         this.adyenBusinessProcessService = adyenBusinessProcessService;
     }
+
+    public PaymentsDetailsResponseConverter getPaymentsDetailsResponseConverter() {
+        return paymentsDetailsResponseConverter;
+    }
+
+    public void setPaymentsDetailsResponseConverter(PaymentsDetailsResponseConverter paymentsDetailsResponseConverter) {
+        this.paymentsDetailsResponseConverter = paymentsDetailsResponseConverter;
+    }
 }
diff --git a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
index d5f59d91e..582dc4d61 100644
--- a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
+++ b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
@@ -83,9 +83,11 @@
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.adyen.v6.constants.Adyenv6coreConstants.AFTERPAY;
 import static com.adyen.v6.constants.Adyenv6coreConstants.CARD_TYPE_DEBIT;
+import static com.adyen.v6.constants.Adyenv6coreConstants.GIFT_CARD;
 import static com.adyen.v6.constants.Adyenv6coreConstants.ISSUER_PAYMENT_METHODS;
 import static com.adyen.v6.constants.Adyenv6coreConstants.KLARNA;
 import static com.adyen.v6.constants.Adyenv6coreConstants.OPENINVOICE_METHODS_API;
@@ -166,22 +168,9 @@ public PaymentRequest createAuthorizationRequest(final String merchantAccount,
         return paymentRequest;
     }
 
-    public PaymentsDetailsRequest create3DPaymentsRequest(final String paymentData, final String md, final String paRes) {
-
-        PaymentsDetailsRequest paymentsDetailsRequest = new PaymentsDetailsRequest();
-        paymentsDetailsRequest.set3DRequestData(md, paRes, paymentData);
-        return paymentsDetailsRequest;
-    }
-
-    public PaymentsDetailsRequest create3DS2PaymentsRequest(final String paymentData, final String token, String type) {
-
+    public PaymentsDetailsRequest create3DSPaymentsRequest(final Map<String, String> details) {
         PaymentsDetailsRequest paymentsDetailsRequest = new PaymentsDetailsRequest();
-        if (type.equals("fingerprint")) {
-            paymentsDetailsRequest.setFingerPrint(token, paymentData);
-
-        } else if (type.equals("challenge")) {
-            paymentsDetailsRequest.setChallengeResult(token, paymentData);
-        }
+        paymentsDetailsRequest.setDetails(details);
         return paymentsDetailsRequest;
     }
 
@@ -460,6 +449,8 @@ private void updatePaymentRequestForAlternateMethod(PaymentsRequest paymentsRequ
         } else if (adyenPaymentMethod.equals(PAYMENT_METHOD_PAYPAL) && cartData.getDeliveryAddress() != null) {
             Name shopperName = getShopperNameFromAddress(cartData.getDeliveryAddress());
             paymentsRequest.setShopperName(shopperName);
+        } else if (adyenPaymentMethod.equals(GIFT_CARD)) {
+            paymentMethod.setBrand(cartData.getAdyenGiftCardBrand());
         }
     }
 
diff --git a/adyenv6core/src/com/adyen/v6/forms/AdyenPaymentForm.java b/adyenv6core/src/com/adyen/v6/forms/AdyenPaymentForm.java
index 53f1dac40..eab1e1aa3 100644
--- a/adyenv6core/src/com/adyen/v6/forms/AdyenPaymentForm.java
+++ b/adyenv6core/src/com/adyen/v6/forms/AdyenPaymentForm.java
@@ -85,6 +85,9 @@ public class AdyenPaymentForm {
     private String telephoneNumber;
     private String shopperEmail;
 
+    // Gift Card
+    private String giftCardBrand;
+
     //Billing address related fields
     private boolean useAdyenDeliveryAddress;
     private AddressForm billingAddress;
@@ -334,6 +337,14 @@ public void setShopperEmail(String shopperEmail) {
         this.shopperEmail = shopperEmail;
     }
 
+    public String getGiftCardBrand() {
+        return giftCardBrand;
+    }
+
+    public void setGiftCardBrand(String giftCardBrand) {
+        this.giftCardBrand = giftCardBrand;
+    }
+
     public void resetFormExceptBillingAddress() {
         this.paymentMethod = null;
         this.cseToken = null;
@@ -362,6 +373,7 @@ public void resetFormExceptBillingAddress() {
         this.shopperEmail = null;
         this.telephoneNumber = null;
         this.gender = null;
+        this.giftCardBrand = null;
     }
 
     @Override
@@ -395,6 +407,7 @@ public String toString() {
         sb.append("    browserInfo: ").append(Util.toIndentedString(browserInfo)).append("\n");
         sb.append("    useAdyenDeliveryAddress: ").append(Util.toIndentedString(useAdyenDeliveryAddress)).append("\n");
         sb.append("    billingAddress: ").append(Util.toIndentedString(billingAddress)).append("\n");
+        sb.append("    giftCardBrand: ").append(Util.toIndentedString(giftCardBrand)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java b/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
index fe0ea2a3f..121549be5 100644
--- a/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
+++ b/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
@@ -62,6 +62,7 @@ public void populate(final CartModel source, final CartData target) throws Conve
             target.setAdyenShopperGender(paymentInfo.getAdyenShopperGender());
             target.setAdyenShopperEmail(paymentInfo.getAdyenShopperEmail());
             target.setAdyenShopperTelephone(paymentInfo.getAdyenTelephone());
+            target.setAdyenGiftCardBrand(paymentInfo.getAdyenGiftCardBrand());
         }
     }
 
diff --git a/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java b/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
index f8143407d..a8a2607a0 100644
--- a/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
+++ b/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
@@ -25,6 +25,7 @@
 import com.adyen.model.checkout.PaymentMethod;
 import com.adyen.model.checkout.PaymentMethodDetails;
 import com.adyen.model.checkout.PaymentMethodsResponse;
+import com.adyen.model.checkout.PaymentsDetailsResponse;
 import com.adyen.model.checkout.PaymentsResponse;
 import com.adyen.model.modification.ModificationResult;
 import com.adyen.model.recurring.RecurringDetail;
@@ -56,13 +57,7 @@ public interface AdyenPaymentService {
 
     PaymentsResponse componentPayment(CartData cartData, PaymentMethodDetails paymentMethodDetails, RequestInfo requestInfo, CustomerModel customerModel) throws Exception;
 
-    /**
-     * Performs 3D secure authorization request via Adyen API
-     */
-    PaymentResult authorise3D(HttpServletRequest request, String paRes, String md) throws Exception;
-
-    PaymentsResponse authorise3DPayment(String paymentData, String paRes, String md) throws Exception;
-    PaymentsResponse authorise3DS2Payment(String paymentData, String token, String type) throws Exception;
+    PaymentsDetailsResponse authorise3DSPayment(Map<String, String> details) throws Exception;
 
     /**
      * Performs Capture request via Adyen API
@@ -107,12 +102,12 @@ public interface AdyenPaymentService {
     /**
      * Retrieves payment response from /payments/details for redirect methods like klarna
      */
-    PaymentsResponse getPaymentDetailsFromPayload(Map<String, String> details, String paymentData) throws Exception;
+    PaymentsDetailsResponse getPaymentDetailsFromPayload(Map<String, String> details, String paymentData) throws Exception;
 
     /**
      * Retrieves payment response from /payments/details
      */
-    PaymentsResponse getPaymentDetailsFromPayload( HashMap<String, String> details) throws Exception;
+    PaymentsDetailsResponse getPaymentDetailsFromPayload( HashMap<String, String> details) throws Exception;
 
     /**
      * Returns the HPP base URL for the current basestore
diff --git a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenOrderService.java b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenOrderService.java
index 87ca981f4..444ada896 100644
--- a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenOrderService.java
+++ b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenOrderService.java
@@ -24,6 +24,8 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
+import com.adyen.util.DateUtil;
 import org.apache.log4j.Logger;
 import com.adyen.model.FraudCheckResult;
 import com.adyen.model.FraudResult;
@@ -37,6 +39,9 @@
 import de.hybris.platform.fraud.model.FraudReportModel;
 import de.hybris.platform.fraud.model.FraudSymptomScoringModel;
 import de.hybris.platform.servicelayer.model.ModelService;
+
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO;
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO_SANTANDER;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_MULTIBANCO;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_PROVIDER;
 
@@ -141,20 +146,21 @@ public void updateOrderFromPaymentsResponse(OrderModel order, PaymentsResponse p
         paymentInfo.setAdyenThreeDOffered(paymentsResponse.get3DOffered());
         paymentInfo.setAdyenThreeDAuthenticated(paymentsResponse.get3DAuthenticated());
 
-        //Boleto data
-        paymentInfo.setAdyenBoletoUrl(paymentsResponse.getBoletoUrl());
-        paymentInfo.setAdyenBoletoBarCodeReference(paymentsResponse.getBoletoBarCodeReference());
-        paymentInfo.setAdyenBoletoDueDate(paymentsResponse.getBoletoDueDate());
-        paymentInfo.setAdyenBoletoExpirationDate(paymentsResponse.getBoletoExpirationDate());
-
         CheckoutPaymentsAction action = paymentsResponse.getAction();
 
-        if (action != null && PAYMENT_METHOD_MULTIBANCO.equals(action.getPaymentMethodType())) {
-            //Multibanco data
-            paymentInfo.setAdyenMultibancoEntity(action.getEntity());
-            paymentInfo.setAdyenMultibancoAmount(BigDecimal.valueOf(action.getInitialAmount().getValue()));
-            paymentInfo.setAdyenMultibancoDeadline(action.getExpiresAt());
-            paymentInfo.setAdyenMultibancoReference(action.getReference());
+        if (action != null) {
+            if (PAYMENT_METHOD_MULTIBANCO.equals(action.getPaymentMethodType())) {
+                //Multibanco data
+                paymentInfo.setAdyenMultibancoEntity(action.getEntity());
+                paymentInfo.setAdyenMultibancoAmount(BigDecimal.valueOf(action.getInitialAmount().getValue()));
+                paymentInfo.setAdyenMultibancoDeadline(action.getExpiresAt());
+                paymentInfo.setAdyenMultibancoReference(action.getReference());
+            } else if (PAYMENT_METHOD_BOLETO.equals(action.getPaymentMethodType()) || PAYMENT_METHOD_BOLETO_SANTANDER.equals(action.getPaymentMethodType())) {
+                //Boleto data
+                paymentInfo.setAdyenBoletoUrl(action.getDownloadUrl());
+                paymentInfo.setAdyenBoletoBarCodeReference(action.getReference());
+                paymentInfo.setAdyenBoletoExpirationDate(DateUtil.parseYmdDate(action.getExpiresAt()));
+            }
         }
 
         //pos receipt
diff --git a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
index 96c6ae1d0..1e74c6b09 100644
--- a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
+++ b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
@@ -25,13 +25,13 @@
 import com.adyen.enums.Environment;
 import com.adyen.httpclient.HTTPClientException;
 import com.adyen.model.PaymentRequest;
-import com.adyen.model.PaymentRequest3d;
 import com.adyen.model.PaymentResult;
 import com.adyen.model.checkout.PaymentMethod;
 import com.adyen.model.checkout.PaymentMethodDetails;
 import com.adyen.model.checkout.PaymentMethodsRequest;
 import com.adyen.model.checkout.PaymentMethodsResponse;
 import com.adyen.model.checkout.PaymentsDetailsRequest;
+import com.adyen.model.checkout.PaymentsDetailsResponse;
 import com.adyen.model.checkout.PaymentsRequest;
 import com.adyen.model.checkout.PaymentsResponse;
 import com.adyen.model.modification.CancelOrRefundRequest;
@@ -216,37 +216,15 @@ public PaymentsResponse componentPayment(final CartData cartData, final PaymentM
     }
 
     @Override
-    public PaymentsResponse authorise3DPayment(final String paymentData, final String paRes, final String md) throws Exception {
+    public PaymentsDetailsResponse authorise3DSPayment(Map<String, String> details) throws Exception {
         Checkout checkout = new Checkout(client);
+        PaymentsDetailsRequest paymentsDetailsRequest = getAdyenRequestFactory().create3DSPaymentsRequest(details);
 
-        PaymentsDetailsRequest paymentsDetailsRequest = getAdyenRequestFactory().create3DPaymentsRequest(paymentData, md, paRes);
         LOG.debug(paymentsDetailsRequest);
+        PaymentsDetailsResponse paymentsDetailsResponse = checkout.paymentsDetails(paymentsDetailsRequest);
+        LOG.debug(paymentsDetailsResponse);
 
-        PaymentsResponse paymentsResponse = checkout.paymentsDetails(paymentsDetailsRequest);
-        LOG.debug(paymentsResponse);
-
-        return paymentsResponse;
-    }
-
-    @Override
-    public PaymentsResponse authorise3DS2Payment(String paymentData, String token, String type) throws Exception {
-        Checkout checkout = new Checkout(client);
-        PaymentsDetailsRequest paymentsDetailsRequest = getAdyenRequestFactory().create3DS2PaymentsRequest(paymentData, token, type);
-        PaymentsResponse paymentsResponse = checkout.paymentsDetails(paymentsDetailsRequest);
-        return paymentsResponse;
-    }
-
-    @Override
-    public PaymentResult authorise3D(final HttpServletRequest request, final String paRes, final String md) throws Exception {
-        Payment payment = new Payment(client);
-
-        PaymentRequest3d paymentRequest3d = getAdyenRequestFactory().create3DAuthorizationRequest(client.getConfig().getMerchantAccount(), request, md, paRes);
-
-        LOG.debug(paymentRequest3d);
-        PaymentResult paymentResult = payment.authorise3D(paymentRequest3d);
-        LOG.debug(paymentResult);
-
-        return paymentResult;
+        return paymentsDetailsResponse;
     }
 
     @Override
@@ -377,28 +355,28 @@ public boolean disableStoredCard(final String customerId, final String recurring
     }
 
     @Override
-    public PaymentsResponse getPaymentDetailsFromPayload(HashMap<String, String> details) throws Exception {
+    public PaymentsDetailsResponse getPaymentDetailsFromPayload(HashMap<String, String> details) throws Exception {
         Checkout checkout = new Checkout(client);
 
         PaymentsDetailsRequest paymentsDetailsRequest = new PaymentsDetailsRequest();
         paymentsDetailsRequest.setDetails(details);
 
         LOG.debug(paymentsDetailsRequest);
-        PaymentsResponse paymentsResponse = checkout.paymentsDetails(paymentsDetailsRequest);
+        PaymentsDetailsResponse paymentsResponse = checkout.paymentsDetails(paymentsDetailsRequest);
         LOG.debug(paymentsResponse);
 
         return paymentsResponse;
     }
 
     @Override
-    public PaymentsResponse getPaymentDetailsFromPayload(Map<String, String> details, String paymentData) throws Exception {
+    public PaymentsDetailsResponse getPaymentDetailsFromPayload(Map<String, String> details, String paymentData) throws Exception {
         Checkout checkout = new Checkout(client);
         PaymentsDetailsRequest paymentsDetailsRequest = new PaymentsDetailsRequest();
         paymentsDetailsRequest.setDetails(details);
         paymentsDetailsRequest.setPaymentData(paymentData);
 
         LOG.debug(paymentsDetailsRequest);
-        PaymentsResponse paymentsResponse = checkout.paymentsDetails(paymentsDetailsRequest);
+        PaymentsDetailsResponse paymentsResponse = checkout.paymentsDetails(paymentsDetailsRequest);
         LOG.debug(paymentsResponse);
 
         return paymentsResponse;
diff --git a/adyenv6core/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java b/adyenv6core/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java
index 65f658a08..ffe957161 100644
--- a/adyenv6core/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java
+++ b/adyenv6core/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java
@@ -25,6 +25,7 @@
 import com.adyen.model.checkout.Item;
 import com.adyen.model.checkout.PaymentMethod;
 import com.adyen.model.checkout.PaymentMethodsResponse;
+import com.adyen.model.checkout.PaymentsDetailsResponse;
 import com.adyen.model.checkout.PaymentsResponse;
 import com.adyen.model.nexo.DocumentQualifierType;
 import com.adyen.model.nexo.ErrorConditionType;
@@ -44,8 +45,6 @@
 import com.adyen.v6.converters.PosPaymentResponseConverter;
 import com.adyen.v6.enums.RecurringContractMode;
 import com.adyen.v6.exceptions.AdyenNonAuthorizedPaymentException;
-import com.adyen.v6.facades.AdyenCheckoutFacade;
-import com.adyen.v6.facades.DefaultAdyenCheckoutFacade;
 import com.adyen.v6.factory.AdyenPaymentServiceFactory;
 import com.adyen.v6.repository.OrderRepository;
 import com.adyen.v6.service.AdyenBusinessProcessService;
@@ -105,16 +104,13 @@
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_EPS;
 import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_ISSUER_LISTS;
 import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_SELECTED_PAYMENT_METHOD;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.SESSION_MD;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.SESSION_PAYMENT_DATA;
 import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.SESSION_PENDING_ORDER_CODE;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.THREE_D_MD;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.THREE_D_PARES;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyMap;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.doNothing;
@@ -129,10 +125,7 @@ public class AdyenCheckoutFacadeTest {
 
     private static final String DELIVERY_MODE = "deliveryMode";
     private static final String EXCEPTION = "exception";
-    private static final String MD = "md";
     private static final String MERCHANT_REFERENCE = "merchantReference";
-    private static final String PA_RES = "paRes";
-    private static final String PAYMENT_DATA = "paymentData";
     private static final String PAYMENT_METHOD = "paymentMethod";
     private static final String PENDING_ORDER_CODE = "pendingOrder";
     private static final String RESULT = "result";
@@ -184,12 +177,16 @@ public class AdyenCheckoutFacadeTest {
     @Mock
     HttpServletRequest request;
     @Mock
+    Map<String, String> details;
+    @Mock
     CartData cartData;
     @Mock
     CartModel cartModel;
     @Mock
     PaymentsResponse paymentsResponse;
     @Mock
+    PaymentsDetailsResponse paymentsDetailsResponse;
+    @Mock
     OrderData orderData;
     @Mock
     OrderModel orderModel;
@@ -492,11 +489,7 @@ public void testAuthorisePaymentRedirect() throws Exception {
 
     @Test
     public void testHandle3DResponseAuthorised() throws Exception {
-        when(request.getParameter(THREE_D_PARES)).thenReturn(PA_RES);
-        when(request.getParameter(THREE_D_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(adyenPaymentService.authorise3DPayment(any(), any(), any())).thenReturn(paymentsResponse);
+        when(adyenPaymentService.authorise3DSPayment(any())).thenReturn(paymentsDetailsResponse);
         when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
         when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
         doNothing().when(sessionService).removeAttribute(any());
@@ -507,20 +500,16 @@ public void testHandle3DResponseAuthorised() throws Exception {
         when(orderConverter.convert(any())).thenReturn(orderData);
         doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
 
-        OrderData orderDataResult = adyenCheckoutFacade.handle3DResponse(request);
+        OrderData orderDataResult = adyenCheckoutFacade.handle3DSResponse(details);
         assertEquals(orderData, orderDataResult);
-        verify(adyenPaymentService).authorise3DPayment(PAYMENT_DATA, PA_RES, MD);
+        verify(adyenPaymentService).authorise3DSPayment(anyMap());
         verify(orderRepository).getOrderModel(MERCHANT_REFERENCE);
         verify(orderConverter).convert(orderModel);
     }
 
     @Test
     public void testHandle3DResponseError() throws Exception {
-        when(request.getParameter(THREE_D_PARES)).thenReturn(PA_RES);
-        when(request.getParameter(THREE_D_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(adyenPaymentService.authorise3DPayment(any(), any(), any())).thenReturn(paymentsResponse);
+        when(adyenPaymentService.authorise3DSPayment(any())).thenReturn(paymentsDetailsResponse);
         when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
         when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
         doNothing().when(sessionService).removeAttribute(any());
@@ -547,10 +536,10 @@ public void testHandle3DResponseError() throws Exception {
         when(cartModel.getStore()).thenReturn(storeModel);
 
         try {
-            adyenCheckoutFacade.handle3DResponse(request);
+            adyenCheckoutFacade.handle3DSResponse(details);
             fail("Expected AdyenNonAuthorizedPaymentException");
         } catch (AdyenNonAuthorizedPaymentException e) {
-            verify(adyenPaymentService).authorise3DPayment(PAYMENT_DATA, PA_RES, MD);
+            verify(adyenPaymentService).authorise3DSPayment(anyMap());
             verify(orderRepository, times(2)).getOrderModel(MERCHANT_REFERENCE);
             verify(cartFactory).createCart();
             verify(cartService).setSessionCart(cartModel);
@@ -560,12 +549,8 @@ public void testHandle3DResponseError() throws Exception {
 
     @Test
     public void testHandle3DResponseThrowsApiException() throws Exception {
-        when(request.getParameter(THREE_D_PARES)).thenReturn(PA_RES);
-        when(request.getParameter(THREE_D_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
         when(sessionService.getAttribute(SESSION_PENDING_ORDER_CODE)).thenReturn(PENDING_ORDER_CODE);
-        when(adyenPaymentService.authorise3DPayment(any(), any(), any())).thenThrow(new ApiException(EXCEPTION, 999));
+        when(adyenPaymentService.authorise3DSPayment(any())).thenThrow(new ApiException(EXCEPTION, 999));
         when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
         doNothing().when(sessionService).removeAttribute(any());
         doNothing().when(modelService).save(any());
@@ -588,11 +573,11 @@ public void testHandle3DResponseThrowsApiException() throws Exception {
         when(cartModel.getStore()).thenReturn(storeModel);
 
         try {
-            adyenCheckoutFacade.handle3DResponse(request);
+            adyenCheckoutFacade.handle3DSResponse(details);
             fail("Expected AdyenNonAuthorizedPaymentException");
         } catch (AdyenNonAuthorizedPaymentException e) {
             assertEquals(e.getMessage(), EXCEPTION);
-            verify(adyenPaymentService).authorise3DPayment(PAYMENT_DATA, PA_RES, MD);
+            verify(adyenPaymentService).authorise3DSPayment(anyMap());
             verify(orderRepository, times(2)).getOrderModel(PENDING_ORDER_CODE);
             verify(cartFactory).createCart();
             verify(cartService).setSessionCart(cartModel);
@@ -602,13 +587,8 @@ public void testHandle3DResponseThrowsApiException() throws Exception {
 
     @Test
     public void testHandle3DResponseWrongSignature() throws Exception {
-        when(request.getParameter(THREE_D_PARES)).thenReturn(PA_RES);
-        when(request.getParameter(THREE_D_MD)).thenReturn(MD);
-        when(sessionService.getAttribute(SESSION_MD)).thenReturn("different_" + MD);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-
         try {
-            adyenCheckoutFacade.handle3DResponse(request);
+            adyenCheckoutFacade.handle3DSResponse(details);
             fail("Expected SignatureException");
         } catch (SignatureException e) {
             assertEquals("MD does not match!", e.getMessage());
@@ -619,8 +599,7 @@ public void testHandle3DResponseWrongSignature() throws Exception {
     public void testHandle3DS2ResponseAuthorised() throws Exception {
         when(request.getParameter(FINGERPRINT_RESULT)).thenReturn(null);
         when(request.getParameter(CHALLENGE_RESULT)).thenReturn(RESULT);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(adyenPaymentService.authorise3DS2Payment(any(), any(), any())).thenReturn(paymentsResponse);
+        when(adyenPaymentService.authorise3DSPayment(anyMap())).thenReturn(paymentsDetailsResponse);
         when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
         when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
         doNothing().when(sessionService).removeAttribute(any());
@@ -631,9 +610,9 @@ public void testHandle3DS2ResponseAuthorised() throws Exception {
         when(orderConverter.convert(any())).thenReturn(orderData);
         doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
 
-        OrderData orderDataResult = adyenCheckoutFacade.handle3DS2Response(request);
+        OrderData orderDataResult = adyenCheckoutFacade.handle3DSResponse(details);
         assertEquals(orderData, orderDataResult);
-        verify(adyenPaymentService).authorise3DS2Payment(PAYMENT_DATA, RESULT, "challenge");
+        verify(adyenPaymentService).authorise3DSPayment(anyMap());
         verify(orderRepository).getOrderModel(MERCHANT_REFERENCE);
         verify(orderConverter).convert(orderModel);
     }
@@ -642,15 +621,14 @@ public void testHandle3DS2ResponseAuthorised() throws Exception {
     public void testHandle3DS2ResponseChallengeShopper() throws Exception {
         when(request.getParameter(FINGERPRINT_RESULT)).thenReturn(RESULT);
         when(request.getParameter(CHALLENGE_RESULT)).thenReturn(null);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(adyenPaymentService.authorise3DS2Payment(any(), any(), any())).thenReturn(paymentsResponse);
+        when(adyenPaymentService.authorise3DSPayment(anyMap())).thenReturn(paymentsDetailsResponse);
         when(paymentsResponse.getResultCode()).thenReturn(PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER);
 
         try {
-            adyenCheckoutFacade.handle3DS2Response(request);
+            adyenCheckoutFacade.handle3DSResponse(details);
             fail("Expected AdyenNonAuthorizedPaymentException");
         } catch (AdyenNonAuthorizedPaymentException e) {
-            verify(adyenPaymentService).authorise3DS2Payment(PAYMENT_DATA, RESULT, "fingerprint");
+            verify(adyenPaymentService).authorise3DSPayment(anyMap());
             assertNotNull(e.getPaymentsResponse());
             assertEquals(PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER, e.getPaymentsResponse().getResultCode());
         }
@@ -660,8 +638,7 @@ public void testHandle3DS2ResponseChallengeShopper() throws Exception {
     public void testHandle3DS2ResponseError() throws Exception {
         when(request.getParameter(FINGERPRINT_RESULT)).thenReturn(null);
         when(request.getParameter(CHALLENGE_RESULT)).thenReturn(RESULT);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
-        when(adyenPaymentService.authorise3DS2Payment(any(), any(), any())).thenReturn(paymentsResponse);
+        when(adyenPaymentService.authorise3DSPayment(anyMap())).thenReturn(paymentsDetailsResponse);
         when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
         when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
         doNothing().when(sessionService).removeAttribute(any());
@@ -688,10 +665,10 @@ public void testHandle3DS2ResponseError() throws Exception {
         when(cartModel.getStore()).thenReturn(storeModel);
 
         try {
-            adyenCheckoutFacade.handle3DS2Response(request);
+            adyenCheckoutFacade.handle3DSResponse(details);
             fail("Expected AdyenNonAuthorizedPaymentException");
         } catch (AdyenNonAuthorizedPaymentException e) {
-            verify(adyenPaymentService).authorise3DS2Payment(PAYMENT_DATA, RESULT, "challenge");
+            verify(adyenPaymentService).authorise3DSPayment(anyMap());
             verify(orderRepository, times(2)).getOrderModel(MERCHANT_REFERENCE);
             verify(cartFactory).createCart();
             verify(cartService).setSessionCart(cartModel);
@@ -703,9 +680,8 @@ public void testHandle3DS2ResponseError() throws Exception {
     public void testHandle3DS2ResponseThrowsApiException() throws Exception {
         when(request.getParameter(FINGERPRINT_RESULT)).thenReturn(null);
         when(request.getParameter(CHALLENGE_RESULT)).thenReturn(RESULT);
-        when(sessionService.getAttribute(SESSION_PAYMENT_DATA)).thenReturn(PAYMENT_DATA);
         when(sessionService.getAttribute(SESSION_PENDING_ORDER_CODE)).thenReturn(PENDING_ORDER_CODE);
-        when(adyenPaymentService.authorise3DS2Payment(any(), any(), any())).thenThrow(new ApiException(EXCEPTION, 999));
+        when(adyenPaymentService.authorise3DSPayment(anyMap())).thenThrow(new ApiException(EXCEPTION, 999));
         when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
         doNothing().when(sessionService).removeAttribute(any());
         doNothing().when(modelService).save(any());
@@ -728,11 +704,11 @@ public void testHandle3DS2ResponseThrowsApiException() throws Exception {
         when(cartModel.getStore()).thenReturn(storeModel);
 
         try {
-            adyenCheckoutFacade.handle3DS2Response(request);
+            adyenCheckoutFacade.handle3DSResponse(details);
             fail("Expected AdyenNonAuthorizedPaymentException");
         } catch (AdyenNonAuthorizedPaymentException e) {
             assertEquals(e.getMessage(), EXCEPTION);
-            verify(adyenPaymentService).authorise3DS2Payment(PAYMENT_DATA, RESULT, "challenge");
+            verify(adyenPaymentService).authorise3DSPayment(anyMap());
             verify(orderRepository, times(2)).getOrderModel(PENDING_ORDER_CODE);
             verify(cartFactory).createCart();
             verify(cartService).setSessionCart(cartModel);
@@ -743,7 +719,7 @@ public void testHandle3DS2ResponseThrowsApiException() throws Exception {
     @Test
     public void testHandleRedirectPayloadAuthorised() throws Exception {
         when(sessionService.getAttribute(Adyenv6coreConstants.PAYMENT_METHOD)).thenReturn(PAYMENT_METHOD);
-        when(adyenPaymentService.getPaymentDetailsFromPayload(any())).thenReturn(paymentsResponse);
+        when(adyenPaymentService.getPaymentDetailsFromPayload(any())).thenReturn(paymentsDetailsResponse);
         when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
         when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
         doNothing().when(sessionService).removeAttribute(any());
@@ -753,9 +729,9 @@ public void testHandleRedirectPayloadAuthorised() throws Exception {
         doNothing().when(adyenBusinessProcessService).triggerOrderProcessEvent(any(), any());
 
         HashMap<String, String> details = new HashMap<>();
-        PaymentsResponse paymentsResponseReturned = adyenCheckoutFacade.handleRedirectPayload(details);
-        assertEquals(paymentsResponseReturned, paymentsResponse);
-        assertEquals(PaymentsResponse.ResultCodeEnum.AUTHORISED, paymentsResponseReturned.getResultCode());
+        PaymentsDetailsResponse paymentsDetailsResponseReturned = adyenCheckoutFacade.handleRedirectPayload(details);
+        assertEquals(paymentsDetailsResponseReturned, paymentsDetailsResponse);
+        assertEquals(PaymentsResponse.ResultCodeEnum.AUTHORISED, paymentsDetailsResponseReturned.getResultCode());
         verify(adyenPaymentService).getPaymentDetailsFromPayload(details);
         verify(orderRepository).getOrderModel(MERCHANT_REFERENCE);
     }
@@ -763,7 +739,7 @@ public void testHandleRedirectPayloadAuthorised() throws Exception {
     @Test
     public void testHandleRedirectPayloadNotAuthorised() throws Exception {
         when(sessionService.getAttribute(Adyenv6coreConstants.PAYMENT_METHOD)).thenReturn(PAYMENT_METHOD);
-        when(adyenPaymentService.getPaymentDetailsFromPayload(any())).thenReturn(paymentsResponse);
+        when(adyenPaymentService.getPaymentDetailsFromPayload(any())).thenReturn(paymentsDetailsResponse);
         when(paymentsResponse.getMerchantReference()).thenReturn(MERCHANT_REFERENCE);
         when(orderRepository.getOrderModel(any())).thenReturn(orderModel);
         doNothing().when(sessionService).removeAttribute(any());
@@ -790,9 +766,9 @@ public void testHandleRedirectPayloadNotAuthorised() throws Exception {
         when(cartModel.getStore()).thenReturn(storeModel);
 
         HashMap<String, String> details = new HashMap<>();
-        PaymentsResponse paymentsResponseReturned = adyenCheckoutFacade.handleRedirectPayload(details);
-        assertEquals(paymentsResponseReturned, paymentsResponse);
-        assertEquals(PaymentsResponse.ResultCodeEnum.REFUSED, paymentsResponseReturned.getResultCode());
+        PaymentsDetailsResponse paymentsDetailsResponseReturned = adyenCheckoutFacade.handleRedirectPayload(details);
+        assertEquals(paymentsDetailsResponseReturned, paymentsDetailsResponse);
+        assertEquals(PaymentsResponse.ResultCodeEnum.REFUSED, paymentsDetailsResponseReturned.getResultCode());
         verify(adyenPaymentService).getPaymentDetailsFromPayload(details);
         verify(orderRepository, times(2)).getOrderModel(MERCHANT_REFERENCE);
         verify(cartFactory).createCart();
diff --git a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
index c1f915640..7f340fe0d 100644
--- a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
+++ b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
@@ -6,5 +6,5 @@ group.id=com.adyen.v6
 module.name=platform-module
 name=adyenv6fulfilmentprocess
 vendor=adyen
-version=9.3.0
-version.api=9.3.0
+version=10.0.0
+version.api=10.0.0
diff --git a/adyenv6notification/resources/adyenv6notification.build.number b/adyenv6notification/resources/adyenv6notification.build.number
index 19744ad0d..19820dbc1 100644
--- a/adyenv6notification/resources/adyenv6notification.build.number
+++ b/adyenv6notification/resources/adyenv6notification.build.number
@@ -5,5 +5,5 @@ description=adyenv6notification
 name=adyenv6notification
 releasedate=20170803 1323
 vendor=adyen
-version=9.3.0
-version.api=9.3.0
+version=10.0.0
+version.api=10.0.0
diff --git a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
index d898de261..1a598929c 100644
--- a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
+++ b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6ordermanagement
 releasedate=20170509 1754
 vendor=adyen
-version=9.3.0
-version.api=9.3.0
+version=10.0.0
+version.api=10.0.0