diff --git a/README.md b/README.md
index d1e9a580b..fac115681 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,10 @@ Required for the checkout:
 <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6b2ccheckoutaddon"/>
 <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6backoffice"/>
 ```
+Required for the notifications:
+```
+<extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6notification"/>
+```
 
 Additionally, required when using yacceleratorordermanagement (b2c_acc_oms recipe):
 ```
@@ -33,9 +37,9 @@ Additionally, required when using yacceleratorfulfilment (b2c_acc recipe):
 <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6fulfilmentprocess"/>
 ```
 
-### 3. Modify local.properties 
+### 3. Modify local.properties
 
-Modify config/local.properties file: 
+Modify config/local.properties file:
 append ,/[^/]+(/[^?]*)+(adyen-response)$,/adyen(/[^?]*)+$ to the value of csrf.allowed.url.patterns
 
 ### 4. Build
@@ -56,12 +60,11 @@ Please make sure your merchant has Variant true in API and responses section so
 
 ### Credit Cards
 
-Credit Card payments are supported using [Client Side Encryption](https://docs.adyen.com/support/payment-glossary/client-side-encryption-cse).
+Credit Card payments are supported using Checkout Components.
 
-### Klarna
+### Ratepay
 
-Klarna is supported via Adyen API.
-Requires shopper data listed in: https://developers.klarna.com/en/se/kpm/test-credentials
+Ratepay is supported via Adyen API.
 
 ### Boleto
 
@@ -79,7 +82,7 @@ More details can be found here: https://docs.adyen.com/developers/payment-method
 
 ### Other alternative payment methods
 
-Supported via Adyen [Hosted Payment Pages](https://docs.adyen.com/developers/products-and-subscriptions/hosted-payment-pages).
+Supported via Adyen Checkout.
 
 
 ## Usage with OCC
@@ -109,7 +112,7 @@ For Credit Card payments - it expects encrypted card holder data obtained from y
 For Stored Cards payments - selected Adyen recurringReference of the card and encrypted cvc
 
 For Boleto payments - social security number
-    
+
 
 3. OrderData authorisePayment(CartData cartData) throws Exception;
 
@@ -124,13 +127,18 @@ It returns an instance of OrderWSDTO obtained from OrderData of the placed order
 For Boleto, it will contain the pdf url, the base64 encoded data, expiration date and due date
 https://docs.adyen.com/developers/payment-methods/boleto-bancario/boleto-payment-request
 
+ ## 3DS2 configuration
+ By default 3DS2 is disabled. If you want to enable 3DS2 in your system, please set following property in local.properties file, build your environment and restart the server.
+```
+is3DS2allowed = true
+```
 
  ## Documentation
  https://docs.adyen.com/developers/plugins/hybris
- 
+
  ## Support
  You can create issues on our Magento Repository. In case of specific problems with your account, please contact
  support@adyen.com.
- 
+
  ## License
  MIT license. For more information, see the LICENSE file.
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 3b691a568..5225a374f 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/constants/AdyenControllerConstants.java
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/constants/AdyenControllerConstants.java
@@ -24,7 +24,6 @@ public interface AdyenControllerConstants
 {
 	String ADDON_PREFIX = "addon:/adyenv6b2ccheckoutaddon/";
 	String SUMMARY_CHECKOUT_PREFIX = "/checkout/multi/adyen/summary";
-	String NOTIFICATION_PREFIX = "/adyen/v6/notification";
 	String PAYPAL_ECS_PREFIX = "/adyen/paypal-ecs";
 
 	/**
@@ -42,6 +41,7 @@ interface MultiStepCheckout
 				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";
 			}
 		}
 
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenNotificationController.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenNotificationController.java
deleted file mode 100644
index 5e47460da..000000000
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenNotificationController.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *                        ######
- *                        ######
- *  ############    ####( ######  #####. ######  ############   ############
- *  #############  #####( ######  #####. ######  #############  #############
- *         ######  #####( ######  #####. ######  #####  ######  #####  ######
- *  ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
- *  ###### ######  #####( ######  #####. ######  #####          #####  ######
- *  #############  #############  #############  #############  #####  ######
- *   ############   ############  #############   ############  #####  ######
- *                                       ######
- *                                #############
- *                                ############
- *
- *  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.controllers.pages;
-
-import java.io.IOException;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.adyen.v6.constants.AdyenControllerConstants;
-import com.adyen.v6.security.AdyenNotificationAuthenticationProvider;
-import com.adyen.v6.service.AdyenNotificationService;
-
-@Controller
-@RequestMapping(value = AdyenControllerConstants.NOTIFICATION_PREFIX)
-public class AdyenNotificationController {
-    private static final Logger LOG = Logger.getLogger(AdyenNotificationController.class);
-
-    @Resource(name = "adyenNotificationAuthenticationProvider")
-    private AdyenNotificationAuthenticationProvider adyenNotificationAuthenticationProvider;
-
-    @Resource(name = "adyenNotificationService")
-    private AdyenNotificationService adyenNotificationService;
-
-    private static final String RESPONSE_ACCEPTED = "[accepted]";
-    private static final String RESPONSE_NOT_ACCEPTED = "[not-accepted]";
-
-    @RequestMapping(value = "/json", method = RequestMethod.POST)
-    @ResponseBody
-    public String onReceive(final HttpServletRequest request) {
-        String requestString = null;
-        try {
-            //Parse response body by request input stream so that Spring doesn't try to deserialize
-            requestString = IOUtils.toString(request.getInputStream());
-        } catch (IOException e) {
-            LOG.error(e);
-            return RESPONSE_NOT_ACCEPTED;
-        }
-
-        LOG.debug("Received Adyen notification:" + requestString);
-        if (! adyenNotificationAuthenticationProvider.authenticateBasic(request)) {
-            throw new AccessDeniedException("Wrong credentials");
-        }
-
-        adyenNotificationService.saveNotifications(requestString);
-
-        return RESPONSE_ACCEPTED;
-    }
-}
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 63035096b..c21db4b6a 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
@@ -64,7 +64,15 @@
 import de.hybris.platform.site.BaseSiteService;
 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.BrandCodes.PAYPAL_ECS;
+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;
 import static com.adyen.model.checkout.PaymentsResponse.ResultCodeEnum.REDIRECTSHOPPER;
 import static com.adyen.model.checkout.PaymentsResponse.ResultCodeEnum.REFUSED;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO;
@@ -72,6 +80,8 @@
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_ONECLICK;
 import static com.adyen.v6.constants.Adyenv6coreConstants.RATEPAY;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_MULTIBANCO;
+import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_CHECKOUT_SHOPPER_HOST;
+import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_ORIGIN_KEY;
 
 @Controller
 @RequestMapping(value = AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX)
@@ -173,9 +183,7 @@ public String placeOrder(@ModelAttribute("placeOrderForm") final PlaceOrderForm
                 //In case of Boleto, show link to pdf
                 if (PAYMENT_METHOD_BOLETO.equals(cartData.getAdyenPaymentMethod())) {
                     addBoletoMessage(redirectModel, orderData.getCode());
-                }
-
-                else if (PAYMENT_METHOD_MULTIBANCO.equals(cartData.getAdyenPaymentMethod())) {
+                } else if (PAYMENT_METHOD_MULTIBANCO.equals(cartData.getAdyenPaymentMethod())) {
                     addMultibancoMessage(redirectModel, orderData.getCode());
                 }
 
@@ -199,6 +207,26 @@ else if (PAYMENT_METHOD_MULTIBANCO.equals(cartData.getAdyenPaymentMethod())) {
                 if (REFUSED == paymentsResponse.getResultCode()) {
                     errorMessage = getErrorMessageByRefusalReason(paymentsResponse.getRefusalReason());
                 }
+                if (IDENTIFYSHOPPER == paymentsResponse.getResultCode()) {
+                    if (adyenPaymentMethod.equals(PAYMENT_METHOD_CC)|| adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
+                        model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
+                        model.addAttribute(SHOPPER_LOCALE, adyenCheckoutFacade.getShopperLocale());
+                        model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey());
+                        model.addAttribute(PAYMENT_DATA, paymentsResponse.getPaymentData());
+                        model.addAttribute(FINGERPRINT_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_FINGERPRINT_TOKEN));
+                        return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
+                    }
+                }
+                if (CHALLENGESHOPPER == paymentsResponse.getResultCode()) {
+                    if (adyenPaymentMethod.equals(PAYMENT_METHOD_CC)|| adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
+                        model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
+                        model.addAttribute(SHOPPER_LOCALE, adyenCheckoutFacade.getShopperLocale());
+                        model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey());
+                        model.addAttribute(PAYMENT_DATA, paymentsResponse.getPaymentData());
+                        model.addAttribute(CHALLENGE_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_CHALLENGE_TOKEN));
+                        return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
+                    }
+                }
             } catch (Exception e) {
                 LOGGER.error(ExceptionUtils.getStackTrace(e));
             }
@@ -208,6 +236,38 @@ else if (PAYMENT_METHOD_MULTIBANCO.equals(cartData.getAdyenPaymentMethod())) {
         return enterStep(model, redirectModel);
     }
 
+    @RequestMapping(value = "/3ds2-adyen-response", method = RequestMethod.POST)
+    @RequireHardLogIn
+    public String authorise3DS2Payment(final Model model,
+                                       final RedirectAttributes redirectModel,
+                                       final HttpServletRequest request) throws CMSItemNotFoundException, CommerceCartModificationException, UnknownHostException {
+
+        String errorMessage = "checkout.error.authorization.failed";
+        try {
+            OrderData orderData = adyenCheckoutFacade.handle3DS2Response(request);
+            LOGGER.debug("Redirecting to confirmation");
+            return redirectToOrderConfirmationPage(orderData);
+        } catch (AdyenNonAuthorizedPaymentException e) {
+            PaymentsResponse paymentsResponse = e.getPaymentsResponse();
+            if (paymentsResponse != null && paymentsResponse.getResultCode() == CHALLENGESHOPPER) {
+                model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
+                model.addAttribute(SHOPPER_LOCALE, adyenCheckoutFacade.getShopperLocale());
+                model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey());
+                model.addAttribute(PAYMENT_DATA, paymentsResponse.getPaymentData());
+                model.addAttribute(CHALLENGE_TOKEN, paymentsResponse.getAuthentication().get("threeds2.challengeToken"));
+                return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
+            }
+            if (paymentsResponse != null && paymentsResponse.getResultCode() == PaymentsResponse.ResultCodeEnum.REFUSED) {
+                errorMessage = getErrorMessageByRefusalReason(paymentsResponse.getRefusalReason());
+            }
+        } catch (Exception e) {
+            LOGGER.debug("Redirecting to summary" + errorMessage);
+            return redirectToSummaryWithError(redirectModel, errorMessage);
+        }
+        LOGGER.debug("Redirecting to final step of checkout" +errorMessage);
+        return redirectToSummaryWithError(redirectModel, errorMessage);
+    }
+
     @RequestMapping(value = AUTHORISE_3D_SECURE_PAYMENT_URL, method = RequestMethod.POST)
     @RequireHardLogIn
     public String authorise3DSecurePayment(final Model model,
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
index f0f72980d..7495c9274 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
@@ -1,6 +1,6 @@
 
 checkout.error.authorization.transaction.not.permitted=The transaction is not permitted.
-checkout.error.authorization.cvc.declined=Declined due to the Card Security Code(CVC) being incorrect. Please check your CVC code!
+checkout.error.authorization.cvc.declined=The payment is REFUSED. Please check your Card details.
 checkout.error.authorization.restricted.card=The card is restricted.
 checkout.error.authorization.payment.detail.not.found=The payment is REFUSED because the saved card is removed. Please try an other payment method.
 checkout.error.authorization.payment.refused=The payment is REFUSED.
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag
index 299bc826e..034a91760 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag
@@ -35,15 +35,6 @@
     <div class="chckt-pm__details js-chckt-pm__details payment_method_details" id="dd_method_adyen_cc">
         <div class="chckt-form chckt-form--max-width">
             <div id="card-div"></div>
-
-            <c:if test="${showRememberTheseDetails}">
-                <label class="chckt-form-label chckt-form-label--full-width">
-                    <input class="chckt-checkbox" checked="" type="checkbox" name="rememberTheseDetails" value="true">
-                    <span class="chckt-form-label__text">
-                        Save for my next payment
-                    </span>
-                </label>
-            </c:if>
         </div>
     </div>
 </div>
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
new file mode 100644
index 000000000..57b307413
--- /dev/null
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp
@@ -0,0 +1,97 @@
+<%@ 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/2.5.0/adyen.js"></script>
+    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.css"/>
+
+    <script type="text/javascript">
+
+        function initiateCheckout ( locale, loadingContext, originKey ) {
+            var configuration = {
+                locale: locale,// shopper's locale
+                loadingContext: loadingContext,
+                originKey: originKey,
+                risk: {
+                    enabled: false
+                }
+            };
+            this.checkout = new AdyenCheckout( configuration );
+        }
+
+        function perform3DS2Operations () {
+            initiateCheckout( "${shopperLocale}", "https://${checkoutShopperHost}/checkoutshopper/", "${originKey}" );
+            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/selectPaymentMethodPage.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
index 3b9f325d6..1de2c6d57 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,9 @@
 <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/2.1.0/adyen.js"></script>
+        <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.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/2.1.0/adyen.css"/>
+        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.css"/>
 
         <script type="text/javascript">
             AdyenCheckoutHybris.initiateCheckout("${shopperLocale}", "https://${checkoutShopperHost}/checkoutshopper/", "${originKey}" );
@@ -40,6 +40,7 @@
                     return false;
                 }
                 AdyenCheckoutHybris.setCustomPaymentMethodValues();
+                AdyenCheckoutHybris.setBrowserData();
 
                 $( "#adyen-encrypted-form" ).submit();
             } );
@@ -108,6 +109,9 @@
                             <form:hidden path="encryptedExpiryYear"/>
                             <form:hidden path="encryptedSecurityCode"/>
 
+                            <form:hidden path="browserInfo"/>
+                            <form:hidden path="rememberTheseDetails" value="false"/>
+
                             <div class="chckt-pm-list js-chckt-pm-list">
                                 <c:forEach items="${storedCards}" var="storedCard">
                                     <adyen:storedCardMethod
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 4ff91d683..ab7458482 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
@@ -10,6 +10,11 @@ var AdyenCheckoutHybris = (function () {
         card: null,
         oneClickCards: {},
 
+        setBrowserData: function () {
+            var browserData = ThreedDS2Utils.getBrowserInfo();
+            $( 'input[name="browserInfo"]' ).val( JSON.stringify( browserData ) );
+        },
+
         validateForm: function () {
             var paymentMethod = $( 'input[type=radio][name=paymentMethod]:checked' ).val();
 
@@ -55,6 +60,9 @@ var AdyenCheckoutHybris = (function () {
             $( 'input[name="encryptedExpiryYear"]' ).val( state.encryptedExpiryYear );
             $( 'input[name="encryptedSecurityCode"]' ).val( state.encryptedSecurityCode );
             $( 'input[name="cardHolder"]' ).val( state.holderName );
+            if(state.storeDetails!=null){
+            $( 'input[name="rememberTheseDetails"]' ).val( state.storeDetails );}
+
         },
 
         copyOneClickCardData: function ( recurringReference, cvc ) {
@@ -114,12 +122,14 @@ var AdyenCheckoutHybris = (function () {
             var configuration = {
                 locale: locale,// shopper's locale
                 loadingContext: loadingContext,
-                originKey: originKey
+                originKey: originKey,
+                risk: {
+                    enabled: false
+                }
             };
             this.checkout = new AdyenCheckout( configuration );
         },
 
-
         initiateOneClickCard: function(card) {
             var oneClickCardNode = document.getElementById("one-click-card_" + card.reference);
             var details = [{
@@ -152,6 +162,7 @@ var AdyenCheckoutHybris = (function () {
                 type: 'card',
                 hasHolderName: true,
                 holderNameRequired: true,
+                enableStoreDetails: true,
                 groupTypes: allowedCards
 
             });
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/threeds2-js-utils.js b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/threeds2-js-utils.js
new file mode 100644
index 000000000..939262a6f
--- /dev/null
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/threeds2-js-utils.js
@@ -0,0 +1 @@
+!function(e,n){"object"===typeof exports&&"object"===typeof module?module.exports=n():"function"===typeof define&&define.amd?define([],n):"object"===typeof exports?exports.ThreedDS2Utils=n():e.ThreedDS2Utils=n()}(this,function(){return function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}return t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t(t.s=0)}([function(e,n,t){"use strict";t.r(n);var r={container:void 0},o={"01":["250px","400px"],"02":["390px","400px"],"03":["500px","600px"],"04":["600px","400px"],"05":["100%","100%"]};function a(e){return o.hasOwnProperty(e)?e:"01"}var i={createIframe:function(e,n){var t=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"0",o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"0",a=arguments.length>4?arguments[4]:void 0;if(!n||0===n.length)throw new Error("Name parameter missing for iframe");e instanceof HTMLElement?r.container=e:r.container=document.body;var i=document.createElement("iframe");i.classList.add(n+"Class"),i.width=t,i.height=o,i.name=n,i.setAttribute("frameborder","0"),i.setAttribute("border","0");var d=document.createTextNode("<p>Your browser does not support iframes.</p>");return i.appendChild(d),r.container.appendChild(i),function(e,n){e.attachEvent?e.attachEvent("onload",function(){n&&"function"===typeof n&&n(e.contentWindow)}):e.onload=function(){n&&"function"===typeof n&&n(e.contentWindow)}}(i,a),i},createForm:function(e,n,t,r,o){if(!e||!n||!t||!r||!o)throw new Error("Not all required parameters provided for form creation");if(0===e.length||0===n.length||0===t.length||0===r.length||0===o.length)throw new Error("Not all required parameters have suitable values");var a=document.createElement("form");a.style.display="none",a.name=e,a.action=n,a.method="POST",a.target=t;var i=document.createElement("input");return i.name=r,i.value=o,a.appendChild(i),a},getBrowserInfo:function(){var e=window&&window.screen?window.screen.width:"",n=window&&window.screen?window.screen.height:"",t=window&&window.screen?window.screen.colorDepth:"",r=window&&window.navigator?window.navigator.userAgent:"",o=!(!window||!window.navigator)&&navigator.javaEnabled(),a="";return window&&window.navigator&&(a=window.navigator.language?window.navigator.language:window.navigator.browserLanguage),{screenWidth:e,screenHeight:n,colorDepth:t,userAgent:r,timeZoneOffset:(new Date).getTimezoneOffset(),language:a,javaEnabled:o}},base64Url:{encode:function(e){var n=window.btoa(e).split("=")[0];return n=(n=n.replace("/+/g","-")).replace("///g","_")},decode:function(e){var n=e;switch((n=(n=n.replace("/-/g","+")).replace("/_/g","/")).length%4){case 0:break;case 2:n+="==";break;case 3:n+="=";break;default:window.console&&window.console.log&&window.console.log("### base64url::decodeBase64URL::  Illegal base64url string!")}try{return window.atob(n)}catch(e){throw new Error(e)}}},config:{challengeWindowSizes:o,validateChallengeWindowSize:a,getChallengeWindowSize:function(e){return o[a(e)]},THREEDS_METHOD_TIMEOUT:1e4,CHALLENGE_TIMEOUT:6e5}};n.default=i}]).default});
\ No newline at end of file
diff --git a/adyenv6b2ccheckoutaddon/project.properties.template b/adyenv6b2ccheckoutaddon/project.properties.template
index 6f03e7a0d..446dd26a7 100644
--- a/adyenv6b2ccheckoutaddon/project.properties.template
+++ b/adyenv6b2ccheckoutaddon/project.properties.template
@@ -22,7 +22,7 @@ adyenv6b2ccheckoutaddon.application-context=adyenv6b2ccheckoutaddon-spring.xml
 
 yacceleratorstorefront.additionalWebSpringConfigs.adyenv6b2ccheckoutaddon=classpath:/adyenv6b2ccheckoutaddon/web/spring/adyenv6b2ccheckoutaddon-web-spring.xml
 
-adyenv6b2ccheckoutaddon.javascript.paths.responsive=/responsive/common/js/adyen.checkout.js
+adyenv6b2ccheckoutaddon.javascript.paths.responsive=/responsive/common/js/adyen.checkout.js;/responsive/common/js/threeds2-js-utils.js
 adyenv6b2ccheckoutaddon.css.paths.responsive=/responsive/common/css/adyenv6b2ccheckoutaddon.css;/responsive/common/css/adyen.cardtype.css
 
-csrf.allowed.url.patterns=/[^/]+(/[^?]*)+(sop-response)$,/[^/]+(/[^?]*)+(merchant_callback)$,/[^/]+(/[^?]*)+(hop-response)$,/[^/]+(/[^?]*)+(adyen-response)$,/adyen(/[^?]*)+$
+csrf.allowed.url.patterns=/[^/]+(/[^?]*)+(sop-response)$,/[^/]+(/[^?]*)+(merchant_callback)$,/[^/]+(/[^?]*)+(hop-response)$,/[^/]+(/[^?]*)+(adyen-response)$,/adyen(/[^?]*)+$
\ No newline at end of file
diff --git a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
index 8553adf41..82931e5e4 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=4.2.0
-version.api=4.2.0
\ No newline at end of file
+version=5.0.0
+version.api=5.0.0
\ No newline at end of file
diff --git a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon/web/spring/adyenv6b2ccheckoutaddon-web-spring.xml b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon/web/spring/adyenv6b2ccheckoutaddon-web-spring.xml
index b38416bae..460179fc4 100644
--- a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon/web/spring/adyenv6b2ccheckoutaddon-web-spring.xml
+++ b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon/web/spring/adyenv6b2ccheckoutaddon-web-spring.xml
@@ -161,7 +161,4 @@
 		<constructor-arg value="redirect:/checkout/multi/adyen/select-payment-method"/>
 	</bean>
 
-	<bean id="adyenNotificationAuthenticationProvider" class="com.adyen.v6.security.AdyenNotificationAuthenticationProvider">
-		<property name="baseStoreService" ref="baseStoreService" />
-	</bean>
 </beans>
diff --git a/adyenv6backoffice/resources/adyenv6backoffice.build.number b/adyenv6backoffice/resources/adyenv6backoffice.build.number
index 9ec4ababb..31daf5721 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=4.2.0
-version.api=4.2.0
+version=5.0.0
+version.api=5.0.0
\ No newline at end of file
diff --git a/adyenv6core/lib/adyen-java-api-library-2.0.2-rc.jar b/adyenv6core/lib/adyen-java-api-library-2.1.0-rc.jar
similarity index 88%
rename from adyenv6core/lib/adyen-java-api-library-2.0.2-rc.jar
rename to adyenv6core/lib/adyen-java-api-library-2.1.0-rc.jar
index a70c0d84f..a995420a0 100644
Binary files a/adyenv6core/lib/adyen-java-api-library-2.0.2-rc.jar and b/adyenv6core/lib/adyen-java-api-library-2.1.0-rc.jar differ
diff --git a/adyenv6core/resources/adyenv6core-beans.xml b/adyenv6core/resources/adyenv6core-beans.xml
index 889a5203b..fe5c01d62 100644
--- a/adyenv6core/resources/adyenv6core-beans.xml
+++ b/adyenv6core/resources/adyenv6core-beans.xml
@@ -33,6 +33,7 @@
         <property name="adyenLastName" type="java.lang.String"/>
         <property name="adyenPaymentToken" type="java.lang.String"/>
         <property name="adyenReturnUrl" type="java.lang.String"/>
+        <property name="adyenBrowserInfo" 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 2f58d94f4..9109adc28 100644
--- a/adyenv6core/resources/adyenv6core-items.xml
+++ b/adyenv6core/resources/adyenv6core-items.xml
@@ -248,6 +248,14 @@
                     <description>Credit Card Type</description>
                     <persistence type="property"/>
                 </attribute>
+                <attribute qualifier="adyenBrowserInfo" type="java.lang.String">
+                    <description>Browser Info for 3DS 2</description>
+                    <persistence type="property">
+                        <columntype>
+                            <value>HYBRIS.LONG_STRING</value>
+                        </columntype>
+                    </persistence>
+                </attribute>
                 <attribute qualifier="adyenCardExpiry" type="java.util.Date">
                     <description>Credit Card expiration date</description>
                     <persistence type="property"/>
diff --git a/adyenv6core/resources/adyenv6core.build.number b/adyenv6core/resources/adyenv6core.build.number
index 0383af8f0..2466c2569 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=4.2.0
-version.api=4.2.0
+version=5.0.0
+version.api=5.0.0
\ No newline at end of file
diff --git a/adyenv6core/resources/localization/adyenv6core-locales_en.properties b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
index 70bf9c5ed..5d7e448a1 100644
--- a/adyenv6core/resources/localization/adyenv6core-locales_en.properties
+++ b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
@@ -66,6 +66,15 @@ type.paymentinfo.adyenBoletoDueDate.name=Boleto Duedate
 type.paymentinfo.adyenPaypalEcsToken.name=Paypal ECS payment token
 type.paymentinfo.adyenPaypalPayerId.name=Paypal ECS payer ID
 
+type.paymentinfo.adyenInstallments.name=Installments
+type.paymentinfo.cardBrand.name=Card Brand
+type.paymentinfo.adyenBrowserInfo.name=Browser Information
+type.paymentinfo.adyenMultibancoAmount.name= Multibanco Amount
+type.paymentinfo.adyenMultibancoDeadline.name= Multibanco Deadline
+type.paymentinfo.adyenMultibancoEntity.name=Multibanco Entity
+type.paymentinfo.adyenMultibancoReference.name=Multibanco Reference
+
+
 #adyen-cse-web pattern: "(.*)" : "(.*)", -> type.AdyenCardTypeEnum.$1.name=$2
 type.AdyenCardTypeEnum.mc.name=MasterCard
 type.AdyenCardTypeEnum.visadankort.name=Visa Dankort
diff --git a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
index c29cc4f70..cf38a6524 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 = "4.2.0";
+	public static final String PLUGIN_VERSION = "5.0.0";
 	public static final String PAYMENT_PROVIDER = "Adyen";
 
 	final public static String PAYMENT_METHOD_CC = "adyen_cc";
@@ -53,6 +53,8 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	public static final String COUNTRY_CODE_DENMARK = "DK";
 	public static final String COUNTRY_CODE_FINLAND = "FI";
 	public static final String COUNTRY_CODE_NORWAY = "NO";
+	//Prefix for Oney methods like facilpay_3x or facilpay_4x
+	public static final String PAYMENT_METHOD_FACILPAY_PREFIX = "facilypay";
 
 	private Adyenv6coreConstants() {
 		//empty to avoid instantiating this constant class
diff --git a/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
index d2120c898..30a4344dc 100644
--- a/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
@@ -64,6 +64,8 @@ public interface AdyenCheckoutFacade {
      */
     String getOriginKey();
 
+    String getShopperLocale();
+
     /**
      * Retrieve the host of Secured Fields
      */
@@ -143,6 +145,9 @@ public interface AdyenCheckoutFacade {
      * @return OrderData
      * @throws Exception In case order failed to be created
      */
+
+    OrderData handle3DS2Response(HttpServletRequest request) throws Exception;
+
     OrderData handle3DResponse(HttpServletRequest request) throws Exception;
 
     /**
diff --git a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
index 6f1ab0084..877a467b4 100644
--- a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
@@ -91,6 +91,11 @@
 import de.hybris.platform.store.BaseStoreModel;
 import de.hybris.platform.store.services.BaseStoreService;
 import static com.adyen.constants.ApiConstants.Redirect.Data.MD;
+import static com.adyen.constants.ApiConstants.Redirect.Data.PAYMENT_DATA;
+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.BrandCodes.PAYPAL_ECS;
 import static com.adyen.constants.HPPConstants.Fields.BRAND_CODE;
 import static com.adyen.constants.HPPConstants.Fields.COUNTRY_CODE;
@@ -434,6 +439,21 @@ public OrderData authorisePayment(final HttpServletRequest request, final CartDa
             }
             lockSessionCart();
         }
+        if (PaymentsResponse.ResultCodeEnum.IDENTIFYSHOPPER.equals(paymentsResponse.getResultCode())) {
+            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());
+
+            }
+            lockSessionCart();
+        }
+        if (PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER.equals(paymentsResponse.getResultCode())) {
+            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());
+            }
+            lockSessionCart();
+        }
         throw new AdyenNonAuthorizedPaymentException(paymentsResponse);
     }
 
@@ -478,6 +498,44 @@ public OrderData handle3DResponse(final HttpServletRequest request) throws Excep
         }
     }
 
+    @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;
+
+        }
+
+        try {
+            PaymentsResponse paymentsResponse = getAdyenPaymentService().authorise3DS2Payment(paymentData, token, type);
+            if (paymentsResponse.getResultCode() != PaymentsResponse.ResultCodeEnum.IDENTIFYSHOPPER && paymentsResponse.getResultCode() != PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER) {
+                restoreSessionCart();
+            }
+            if (PaymentsResponse.ResultCodeEnum.AUTHORISED == paymentsResponse.getResultCode()) {
+
+                return createAuthorizedOrder(paymentsResponse);
+            }
+            throw new AdyenNonAuthorizedPaymentException(paymentsResponse);
+        } catch (ApiException e) {
+            if (type.equals("challenge")) {
+                LOGGER.debug("Restoring cart because ApiException occurred after challengeResult ");
+                restoreSessionCart();
+            }
+            throw e;
+        }
+    }
+
     @Override
     public Map<String, String> initializeHostedPayment(final CartData cartData, final String redirectUrl) throws SignatureException, InvalidCartException {
         final String sessionValidity = Util.calculateSessionValidity();
@@ -634,7 +692,7 @@ public void initializeCheckoutData(Model model) {
             alternativePaymentMethods = alternativePaymentMethods.stream()
                                                                  .filter(paymentMethod -> ! paymentMethod.getType().isEmpty()
                                                                          && !isHiddenPaymentMethod(paymentMethod))
-                                                                 .collect(Collectors.toList());
+                                                            .collect(Collectors.toList());
         } catch (ApiException | IOException e) {
             LOGGER.error(ExceptionUtils.getStackTrace(e));
         }
@@ -711,7 +769,6 @@ private boolean isHiddenPaymentMethod(PaymentMethod paymentMethod) {
     }
 
 
-
     @Override
     public boolean showBoleto() {
         BaseStoreModel baseStore = baseStoreService.getCurrentBaseStore();
@@ -788,6 +845,9 @@ public PaymentInfoModel createPaymentInfo(final CartModel cartModel, AdyenPaymen
 
         paymentInfo.setAdyenCardHolder(adyenPaymentForm.getCardHolder());
 
+        //required for 3DS2
+        paymentInfo.setAdyenBrowserInfo(adyenPaymentForm.getBrowserInfo());
+
         modelService.save(paymentInfo);
 
         return paymentInfo;
@@ -894,7 +954,8 @@ private PaymentDetailsWsDTO toPaymentDetail(RecurringDetail recurringDetail) {
         return paymentDetailsWsDTO;
     }
 
-    private String getShopperLocale() {
+    @Override
+    public String getShopperLocale() {
         if (commonI18NService.getCurrentLanguage() != null) {
             return commonI18NService.getCurrentLanguage().getIsocode();
         }
diff --git a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
index f0deae7c8..19df5b01d 100644
--- a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
+++ b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
@@ -23,8 +23,10 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Currency;
+import java.util.HashMap;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.configuration.Configuration;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import com.adyen.Util.Util;
@@ -33,6 +35,7 @@
 import com.adyen.model.Address;
 import com.adyen.model.Amount;
 import com.adyen.model.Installments;
+import com.adyen.model.BrowserInfo;
 import com.adyen.model.Name;
 import com.adyen.model.PaymentRequest;
 import com.adyen.model.PaymentRequest3d;
@@ -53,6 +56,7 @@
 import com.adyen.v6.enums.AdyenCardTypeEnum;
 import com.adyen.v6.enums.RecurringContractMode;
 import com.adyen.v6.model.RequestInfo;
+import com.google.gson.Gson;
 import de.hybris.platform.commercefacades.order.data.CartData;
 import de.hybris.platform.commercefacades.order.data.OrderEntryData;
 import de.hybris.platform.commercefacades.user.data.AddressData;
@@ -62,6 +66,7 @@
 import de.hybris.platform.util.TaxValue;
 import static com.adyen.constants.BrandCodes.PAYPAL_ECS;
 import static com.adyen.v6.constants.Adyenv6coreConstants.KLARNA;
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_FACILPAY_PREFIX;
 import static com.adyen.v6.constants.Adyenv6coreConstants.OPENINVOICE_METHODS_API;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO_SANTANDER;
@@ -77,6 +82,8 @@ public class AdyenRequestFactory {
 
     private static final String PLATFORM_NAME = "Hybris";
     private static final String PLATFORM_VERSION_PROPERTY = "build.version.api";
+    private static final String IS_3DS2_ALLOWED_PROPERTY = "is3DS2allowed";
+    private static final String ALLOW_3DS2_PROPERTY = "allow3DS2";
 
     public PaymentRequest3d create3DAuthorizationRequest(final String merchantAccount, final HttpServletRequest request, final String md, final String paRes) {
         return createBasePaymentRequest(new PaymentRequest3d(), request, merchantAccount).set3DRequestData(md, paRes);
@@ -146,6 +153,18 @@ public PaymentsDetailsRequest create3DPaymentsRequest(final String paymentData,
         return paymentsDetailsRequest;
     }
 
+    public PaymentsDetailsRequest create3DS2PaymentsRequest(final String paymentData, final String token, String type) {
+
+        PaymentsDetailsRequest paymentsDetailsRequest = new PaymentsDetailsRequest();
+        if (type.equals("fingerprint")) {
+            paymentsDetailsRequest.setFingerPrint(token, paymentData);
+
+        } else if (type.equals("challenge")) {
+            paymentsDetailsRequest.setChallengeResult(token, paymentData);
+        }
+        return paymentsDetailsRequest;
+    }
+
     public PaymentsRequest createPaymentsRequest(final String merchantAccount,
                                                  final CartData cartData,
                                                  final RequestInfo requestInfo,
@@ -160,10 +179,14 @@ public PaymentsRequest createPaymentsRequest(final String merchantAccount,
         //Update payment request for generic information for all payment method types
 
         updatePaymentRequest(merchantAccount, cartData, requestInfo, customerModel, paymentsRequest);
+        Boolean is3DS2allowed = is3DS2Allowed();
 
         //For credit cards
         if (PAYMENT_METHOD_CC.equals(adyenPaymentMethod)) {
             updatePaymentRequestForCC(paymentsRequest, cartData, recurringContractMode);
+            if (is3DS2allowed) {
+                paymentsRequest = enhanceForThreeDS2(paymentsRequest, cartData);
+            }
         }
         //For one click
         else if (adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
@@ -177,6 +200,9 @@ else if (adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
                     paymentsRequest.setPaymentMethod(paymentMethodDetails);
                 }
             }
+            if (is3DS2allowed) {
+                paymentsRequest = enhanceForThreeDS2(paymentsRequest, cartData);
+            }
         }
         //Set Boleto parameters
         else if (cartData.getAdyenPaymentMethod().indexOf(PAYMENT_METHOD_BOLETO) == 0) {
@@ -192,6 +218,26 @@ else if (cartData.getAdyenPaymentMethod().indexOf(PAYMENT_METHOD_BOLETO) == 0) {
         return paymentsRequest;
     }
 
+    public PaymentsRequest enhanceForThreeDS2(PaymentsRequest paymentsRequest, CartData cartData) {
+        if (paymentsRequest.getAdditionalData() == null) {
+            paymentsRequest.setAdditionalData(new HashMap<>());
+        }
+        paymentsRequest.getAdditionalData().put(ALLOW_3DS2_PROPERTY, is3DS2Allowed().toString());
+        paymentsRequest.setChannel(PaymentsRequest.ChannelEnum.WEB);
+        BrowserInfo browserInfo = new Gson().fromJson(cartData.getAdyenBrowserInfo(), BrowserInfo.class);
+        browserInfo = updateBrowserInfoFromRequest(browserInfo, paymentsRequest);
+        paymentsRequest.setBrowserInfo(browserInfo);
+        return paymentsRequest;
+    }
+
+    public BrowserInfo updateBrowserInfoFromRequest(BrowserInfo browserInfo, PaymentsRequest paymentsRequest) {
+        if (browserInfo != null) {
+            browserInfo.setUserAgent(paymentsRequest.getBrowserInfo().getUserAgent());
+            browserInfo.setAcceptHeader(paymentsRequest.getBrowserInfo().getAcceptHeader());
+        }
+        return browserInfo;
+    }
+
     public ApplicationInfo updateApplicationInfo(ApplicationInfo applicationInfo) {
         if (applicationInfo == null) {
             applicationInfo = new ApplicationInfo();
@@ -223,9 +269,11 @@ private void updatePaymentRequest(final String merchantAccount, final CartData c
         String userAgent = requestInfo.getUserAgent();
         String acceptHeader = requestInfo.getAcceptHeader();
         String shopperIP = requestInfo.getShopperIp();
+        String origin = requestInfo.getOrigin();
 
         paymentsRequest.setAmountData(amount, currency).reference(reference).merchantAccount(merchantAccount).addBrowserInfoData(userAgent, acceptHeader).
                 shopperIP(shopperIP).setCountryCode(getCountryCode(cartData));
+        paymentsRequest.setOrigin(origin);
 
         // set shopper details from CustomerModel.
         if (customerModel != null) {
@@ -295,7 +343,7 @@ private void updatePaymentRequestForAlternateMethod(PaymentsRequest paymentsRequ
         paymentsRequest.setReturnUrl(cartData.getAdyenReturnUrl());
         if (adyenPaymentMethod.equals(PAYMENT_METHOD_IDEAL)) {
             paymentMethod.setIdealIssuer(cartData.getAdyenIssuerId());
-        } else if (KLARNA.contains(adyenPaymentMethod)) {
+        } else if (KLARNA.contains(adyenPaymentMethod)||adyenPaymentMethod.startsWith(PAYMENT_METHOD_FACILPAY_PREFIX)) {
             setOpenInvoiceData(paymentsRequest, cartData, customerModel);
         }
     }
@@ -711,6 +759,16 @@ private String getPlatformVersion() {
         return getConfigurationService().getConfiguration().getString(PLATFORM_VERSION_PROPERTY);
     }
 
+    private Boolean is3DS2Allowed() {
+
+        Configuration configuration = getConfigurationService().getConfiguration();
+        boolean is3DS2AllowedValue = false;
+        if (configuration.containsKey(IS_3DS2_ALLOWED_PROPERTY)) {
+            is3DS2AllowedValue = configuration.getBoolean(IS_3DS2_ALLOWED_PROPERTY);
+        }
+        return is3DS2AllowedValue;
+    }
+
     public ConfigurationService getConfigurationService() {
         return configurationService;
     }
diff --git a/adyenv6core/src/com/adyen/v6/forms/AdyenPaymentForm.java b/adyenv6core/src/com/adyen/v6/forms/AdyenPaymentForm.java
index b42d341c7..0c75c0b72 100644
--- a/adyenv6core/src/com/adyen/v6/forms/AdyenPaymentForm.java
+++ b/adyenv6core/src/com/adyen/v6/forms/AdyenPaymentForm.java
@@ -69,6 +69,17 @@ public class AdyenPaymentForm {
     // used in openinvoice and boleto
     private String socialSecurityNumber;
 
+    //3DS 2.0
+    private String browserInfo;
+
+    public String getBrowserInfo() {
+        return browserInfo;
+    }
+
+    public void setBrowserInfo(String browserInfo) {
+        this.browserInfo = browserInfo;
+    }
+
     public String getCseToken() {
         return cseToken;
     }
@@ -251,6 +262,7 @@ public String toString() {
         sb.append("    lastName: ").append(Util.toIndentedString(lastName)).append("\n");
         sb.append("    dfValue: ").append(Util.toIndentedString(dfValue)).append("\n");
         sb.append("    cardBrand: ").append(Util.toIndentedString(cardBrand)).append("\n");
+        sb.append("    browserInfo: ").append(Util.toIndentedString(browserInfo)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/adyenv6core/src/com/adyen/v6/model/RequestInfo.java b/adyenv6core/src/com/adyen/v6/model/RequestInfo.java
index 7ae2398ff..0820f30e6 100644
--- a/adyenv6core/src/com/adyen/v6/model/RequestInfo.java
+++ b/adyenv6core/src/com/adyen/v6/model/RequestInfo.java
@@ -30,15 +30,29 @@ public class RequestInfo {
     private String userAgent;
     private String acceptHeader;
     private String shopperIp;
+    private String origin;
 
     public RequestInfo(HttpServletRequest request) {
         this.userAgent = request.getHeader(USER_AGENT_HEADER);
         this.acceptHeader = request.getHeader(ACCEPT_HEADER);
         this.shopperIp = request.getRemoteAddr();
+        this.origin = getOrigin(request);
     }
 
     private RequestInfo() {
+    }
+
+    public String getOrigin(HttpServletRequest request) {
+        String currentRequestURL = request.getRequestURL().toString();
+        int requestUrlLength = currentRequestURL.length();
+        int requestUriLength = request.getRequestURI().length();
+
+        String baseURL = currentRequestURL.substring(0, requestUrlLength - requestUriLength);
+        return baseURL;
+    }
 
+    public String getOrigin() {
+        return this.origin;
     }
 
     public static RequestInfo empty() {
diff --git a/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java b/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
index 50b81ba08..0fc77ee9a 100644
--- a/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
+++ b/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
@@ -53,6 +53,7 @@ public void populate(final CartModel source, final CartData target) throws Conve
             target.setAdyenEncryptedExpiryYear(paymentInfo.getEncryptedExpiryYear());
             target.setAdyenEncryptedSecurityCode(paymentInfo.getEncryptedSecurityCode());
             target.setAdyenInstallments(paymentInfo.getAdyenInstallments());
+            target.setAdyenBrowserInfo(paymentInfo.getAdyenBrowserInfo());
         }
     }
 
diff --git a/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java b/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
index 46d7eae79..2857264cc 100644
--- a/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
+++ b/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
@@ -51,6 +51,7 @@ public interface AdyenPaymentService {
     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;
 
     /**
      * Performs Capture request via Adyen API
diff --git a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
index 426c5506b..62efea919 100644
--- a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
+++ b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
@@ -163,6 +163,14 @@ public PaymentsResponse authorise3DPayment(final String paymentData, final Strin
         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);
diff --git a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
index 76dd7cc02..aac4b8c85 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=4.2.0
-version.api=4.2.0
+version=5.0.0
+version.api=5.0.0
diff --git a/adyenv6notification/.gitignore b/adyenv6notification/.gitignore
new file mode 100644
index 000000000..6719069cc
--- /dev/null
+++ b/adyenv6notification/.gitignore
@@ -0,0 +1,39 @@
+eclipsebin/
+.settings/
+.externalToolBuilders/
+.springBeans
+.idea/
+*/platformhome.properties
+*/.pmd
+**.iml
+
+##################
+# Custom Ignores #
+##################
+
+*/.project
+.settings
+.classpath
+*.class
+*/bin/*
+*/target/*
+
+########################
+# Java generated files #
+########################
+*.class
+*.war
+*.ear
+
+##############################
+# hybris Ant generated files #
+##############################
+gensrc/**
+*/build.xml
+extensioninfo.xsd
+hmc.xsd
+platformhome.properties
+*-testclasses.xml
+beans.xsd
+items.xsd
+classes/**
diff --git a/adyenv6notification/buildcallbacks.xml b/adyenv6notification/buildcallbacks.xml
new file mode 100644
index 000000000..54989e7b8
--- /dev/null
+++ b/adyenv6notification/buildcallbacks.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ [y] hybris Platform
+
+ Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+
+ This software is the confidential and proprietary information of SAP
+ ("Confidential Information"). You shall not disclose such Confidential
+ Information and shall use it only in accordance with the terms of the
+ license agreement you entered into with SAP.
+--><!--
+ All hybris buildcallbacks.xml macrodefinitions:
+ 
+ Build/Documentation
+ 
+	 before/after ant macro "clean"
+		 <macrodef name="adyenv6notification_before_clean"/>
+		 <macrodef name="adyenv6notification_after_clean"/>
+	 
+	 before/after ant macro "build"
+		 <macrodef name="adyenv6notification_before_build"/>
+		 <macrodef name="adyenv6notification_after_build"/>
+		 
+	 before/after ant macro "compile_core" - the core module of the extension
+		 <macrodef name="adyenv6notification_before_compile_core">
+		 <macrodef name="adyenv6notification_after_compile_core">
+	 
+	 before/after ant macro "compile_web" - the web module of the extension
+		 <macrodef name="adyenv6notification_before_compile_web" />
+		 <macrodef name="adyenv6notification_after_compile_web" />
+	 
+	 before/after ant macro "compile_hmc" - the hmc module of the extension
+		 <macrodef name="adyenv6notification_before_compile_hmc" />
+		 <macrodef name="adyenv6notification_after_compile_hmc" />
+ 
+ Preparing extension
+ 
+	 will be called in the beginning of the ant call and only once (also when using multiple 
+	 ant targets e.g. ant build yunittest)	
+		 <macrodef name="adyenv6notification_only_once_prepare"/>
+ 
+ Creating ear module/production
+ 
+	 before/after ant macro "ear"
+		 <macrodef name="adyenv6notification_before_ear"/>
+		 <macrodef name="adyenv6notification_after_ear"/>
+
+	 before/after ant macro "production" - for hybris server only
+		 <macrodef name="adyenv6notification_before_production" />
+		 <macrodef name="adyenv6notification_after_production" />
+ 
+ JUnit Test
+ 
+	 before/after ant macro "yunitinit" 
+		 <macrodef name="adyenv6notification_before_yunitinit" />
+		 <macrodef name="adyenv6notification_after_yunitinit" />
+	 
+	 before/after ant macro "yunit"
+		 <macrodef name="adyenv6notification_before_yunit" />
+		 <macrodef name="adyenv6notification_after_yunit" /> 
+		 
+ Distribution package
+ 
+ 	 before/after ant macro "dist" - internal target; only for use when platform is available in source code
+		 <macrodef name="adyenv6notification_after_dist"/>
+		 <macrodef name="adyenv6notification_before_dist"/>
+	 
+	 before/after ant macro "dist_copy" - internal target; only for use when platform is available in source code
+		 <macrodef name="adyenv6notification_before_dist_copy"/>
+		 <macrodef name="adyenv6notification_after_dist_copy"/>
+		  
+ 	 With these filters you can override the default extension filters defined in platform/resources/ant/dist/filtersets.xml
+ 	  	 <patternset id="extension.adyenv6notification.binary.filter">
+ 	  	  	 <patternset refid="extension.filter" />
+ 	  	  	 <exclude name="**/*-source.jar" />
+ 	  	 </patternset>
+ 	  	 <patternset id="extension.adyenv6notification.source.filter">
+ 	  	  	 <exclude name="**/bin/**" />
+ 	  	 </patternset>
+ 
+--><project name="adyenv6notification_buildcallbacks">
+
+	<!-- 
+	    Called whenever 'ant ear' is used. this callback can be used to modify the content of the ear file
+	
+	     ${ear.path}: 			path to ear
+	 -->
+	<macrodef name="adyenv6notification_before_ear">
+		<sequential>
+
+			<!-- you can do anything before the EAR file is being packed -->
+
+		</sequential>
+	</macrodef>
+
+</project>
diff --git a/adyenv6notification/extensioninfo.xml b/adyenv6notification/extensioninfo.xml
new file mode 100644
index 000000000..4abaa4353
--- /dev/null
+++ b/adyenv6notification/extensioninfo.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ [y] hybris Platform
+
+ Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+
+ This software is the confidential and proprietary information of SAP
+ ("Confidential Information"). You shall not disclose such Confidential
+ Information and shall use it only in accordance with the terms of the
+ license agreement you entered into with SAP.
+--><extensioninfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="extensioninfo.xsd">
+
+   <extension abstractclassprefix="Generated" classprefix="Adyenv6notification" managername="Adyenv6notificationManager" managersuperclass="de.hybris.platform.jalo.extension.Extension" name="adyenv6notification" usemaven="false">
+               
+      <requires-extension name="webservicescommons"/>
+      <requires-extension name="adyenv6core"/>
+      <requires-extension name="addonsupport"/>
+       
+      <coremodule generated="true" manager="com.adyen.v6.jalo.Adyenv6notificationManager" packageroot="com.adyen.v6"/>
+
+      <webmodule jspcompile="false" webroot="/adyenv6notification"/>
+
+   </extension>
+      
+</extensioninfo>
\ No newline at end of file
diff --git a/adyenv6notification/external-dependencies.xml b/adyenv6notification/external-dependencies.xml
new file mode 100644
index 000000000..d6f822d80
--- /dev/null
+++ b/adyenv6notification/external-dependencies.xml
@@ -0,0 +1,22 @@
+<!--
+ [y] hybris Platform
+
+ Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+
+ This software is the confidential and proprietary information of SAP
+ ("Confidential Information"). You shall not disclose such Confidential
+ Information and shall use it only in accordance with the terms of the
+ license agreement you entered into with SAP.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>de.hybris.platform</groupId>
+	<artifactId>adyenv6notification</artifactId>
+	<version>6.5.0.0</version>
+
+	<packaging>jar</packaging>
+
+	<dependencies>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/adyenv6notification/project.properties b/adyenv6notification/project.properties
new file mode 100644
index 000000000..980aaa15c
--- /dev/null
+++ b/adyenv6notification/project.properties
@@ -0,0 +1,19 @@
+# -----------------------------------------------------------------------
+# [y] hybris Platform
+#
+# Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+#
+# This software is the confidential and proprietary information of SAP
+# ("Confidential Information"). You shall not disclose such Confidential
+# Information and shall use it only in accordance with the terms of the
+# license agreement you entered into with SAP.
+# -----------------------------------------------------------------------
+
+# you can put key/value pairs here.
+# Use Config.getParameter(..) to retrieve the values during runtime.
+
+# Specifies the location of the spring context file putted automatically to the global platform application context.
+adyenv6notification.application-context=adyenv6notification-spring.xml
+adyenv6notification.webroot=/adyenv6notification
+
+
diff --git a/adyenv6notification/resources/adyenv6notification-items.xml b/adyenv6notification/resources/adyenv6notification-items.xml
new file mode 100644
index 000000000..aad102b8c
--- /dev/null
+++ b/adyenv6notification/resources/adyenv6notification-items.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ [y] hybris Platform
+
+ Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+
+ This software is the confidential and proprietary information of SAP
+ ("Confidential Information"). You shall not disclose such Confidential
+ Information and shall use it only in accordance with the terms of the
+ license agreement you entered into with SAP.
+-->
+<!--
+	ATTENTION: This is just an example file. You have to edit it according to your needs.
+-->
+
+<items 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+			xsi:noNamespaceSchemaLocation="items.xsd">
+
+	<itemtypes>
+	</itemtypes>
+</items>
diff --git a/adyenv6notification/resources/adyenv6notification-spring.xml b/adyenv6notification/resources/adyenv6notification-spring.xml
new file mode 100644
index 000000000..309b73a37
--- /dev/null
+++ b/adyenv6notification/resources/adyenv6notification-spring.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ [y] hybris Platform
+
+ Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+
+ This software is the confidential and proprietary information of SAP
+ ("Confidential Information"). You shall not disclose such Confidential
+ Information and shall use it only in accordance with the terms of the
+ license agreement you entered into with SAP.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+	<bean id="adyenNotificationAuthenticationProvider" class="com.adyen.v6.security.AdyenNotificationAuthenticationProvider" />
+
+</beans>
diff --git a/adyenv6notification/resources/adyenv6notification.build.number b/adyenv6notification/resources/adyenv6notification.build.number
new file mode 100644
index 000000000..cc2f1f97a
--- /dev/null
+++ b/adyenv6notification/resources/adyenv6notification.build.number
@@ -0,0 +1,9 @@
+#Ant properties
+#Thu Oct 12 09:41:54 CEST 2017
+builddate=20171012 0936
+description=adyenv6notification
+name=adyenv6notification
+releasedate=20170803 1323
+vendor=adyen
+version=5.0.0
+version.api=5.0.0
diff --git a/adyenv6notification/ruleset.xml b/adyenv6notification/ruleset.xml
new file mode 100644
index 000000000..6cd1d06b6
--- /dev/null
+++ b/adyenv6notification/ruleset.xml
@@ -0,0 +1,765 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ [y] hybris Platform
+
+ Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+
+ This software is the confidential and proprietary information of SAP
+ ("Confidential Information"). You shall not disclose such Confidential
+ Information and shall use it only in accordance with the terms of the
+ license agreement you entered into with SAP.
+-->
+<ruleset xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         name="pmd-eclipse"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+         
+	<description>Java PMD ruleset for hybris</description>
+
+	<exclude-pattern>.*/generated-sources/.*</exclude-pattern>
+	<exclude-pattern>.*/Generated/.*</exclude-pattern>
+	<exclude-pattern>.*/gensrc/.*</exclude-pattern>
+	<exclude-pattern>.*/jsp/.*</exclude-pattern>
+	<exclude-pattern>.*_jsp.java</exclude-pattern>
+	<exclude-pattern>.*/jax-doclets/.*</exclude-pattern>
+
+   <rule ref="rulesets/java/basic.xml/JumbledIncrementer">
+        <priority>2</priority>
+   </rule>      
+   <rule ref="rulesets/java/basic.xml/ForLoopShouldBeWhileLoop"/>
+   <rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode"/>
+   <rule ref="rulesets/java/basic.xml/DoubleCheckedLocking"/>
+   <rule ref="rulesets/java/basic.xml/ReturnFromFinallyBlock">
+           <priority>1</priority>
+   </rule>      
+   <rule ref="rulesets/java/basic.xml/UnconditionalIfStatement"/>
+   <rule ref="rulesets/java/basic.xml/BooleanInstantiation"/>
+   <rule ref="rulesets/java/basic.xml/CollapsibleIfStatements"> 
+        <priority>2</priority>
+   </rule>        
+   
+   <rule ref="rulesets/java/basic.xml/ClassCastExceptionWithToArray">
+           <priority>1</priority>
+   </rule>      
+   <rule ref="rulesets/java/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
+   <rule ref="rulesets/java/basic.xml/MisplacedNullCheck">
+           <priority>1</priority>
+   </rule>      
+   <rule ref="rulesets/java/basic.xml/AvoidThreadGroup"/>
+   <rule ref="rulesets/java/basic.xml/BrokenNullCheck"/>
+   <rule ref="rulesets/java/basic.xml/BigIntegerInstantiation"/>
+   <rule ref="rulesets/java/basic.xml/AvoidUsingOctalValues"/>
+   <rule ref="rulesets/java/basic.xml/AvoidUsingHardCodedIP"/>
+   <rule ref="rulesets/java/basic.xml/CheckResultSet"/>
+   <rule ref="rulesets/java/basic.xml/AvoidMultipleUnaryOperators"/>
+
+   <rule ref="rulesets/java/braces.xml/IfStmtsMustUseBraces">
+           <priority>2</priority>
+   </rule>      
+   <rule ref="rulesets/java/braces.xml/WhileLoopsMustUseBraces">
+           <priority>2</priority>
+   </rule>      
+   <rule ref="rulesets/java/braces.xml/IfElseStmtsMustUseBraces">
+           <priority>2</priority>
+   </rule>      
+   <rule ref="rulesets/java/braces.xml/ForLoopsMustUseBraces">
+           <priority>2</priority>
+   </rule>      
+
+   <rule ref="rulesets/java/clone.xml/ProperCloneImplementation"/>
+   <rule ref="rulesets/java/clone.xml/CloneThrowsCloneNotSupportedException"/>
+   <rule ref="rulesets/java/clone.xml/CloneMethodMustImplementCloneable"/>
+   <rule ref="rulesets/java/codesize.xml/ExcessiveMethodLength"/>
+
+   <rule name="SpaghettiCodeWithComments" ref="rulesets/java/codesize.xml/ExcessiveMethodLength">
+   <priority>2</priority>
+   <properties>
+    <property name="minimum" description="The method size reporting threshold" value="200"/>
+   </properties>
+   </rule>
+
+   <rule ref="rulesets/java/codesize.xml/ExcessiveParameterList">
+     <priority>3</priority>
+   <properties>
+    <property name="minimum" description="The parameter count reporting threshold" value="7"/>
+   </properties>
+   </rule>
+
+   <rule name="ExcessiveParameterListOver10" ref="rulesets/java/codesize.xml/ExcessiveParameterList">
+        <priority>3</priority>
+   <properties>
+    <property name="minimum" description="The parameter count reporting threshold" value="10"/>
+   </properties>
+   </rule>
+
+   <rule ref="rulesets/java/codesize.xml/ExcessiveClassLength">
+        <properties>
+            <property name="minimum" description="The class size reporting threshold"  value="1500"/>
+        </properties>
+   </rule>
+   
+   <rule ref="rulesets/java/codesize.xml/CyclomaticComplexity"/>
+   <rule ref="rulesets/java/codesize.xml/TooManyFields"/>
+   <rule ref="rulesets/java/codesize.xml/NcssMethodCount">
+        <properties>
+            <property name="minimum" description="The method NCSS count reporting threshold" value="40"/>
+        </properties>
+   </rule>
+       
+   <rule name="SpaghettiCode" ref="rulesets/java/codesize.xml/NcssMethodCount">
+      <priority>2</priority>
+    <properties>
+        <property name="minimum" description="The method NCSS count reporting threshold" value="100"/>
+    </properties>
+    </rule> 
+   <rule ref="rulesets/java/codesize.xml/NcssTypeCount">
+        <properties>
+            <property name="minimum" description="The type NCSS count reporting threshold" value="1000"/>
+        </properties>
+   </rule>
+   
+   
+   <rule ref="rulesets/java/codesize.xml/NcssConstructorCount">
+        <properties>
+            <property name="minimum" description="The constructor NCSS count reporting threshold" value="40"/>
+        </properties> 
+   </rule>
+            
+   <rule ref="rulesets/java/codesize.xml/TooManyMethods">
+        <priority>4</priority>
+        <properties>                
+                  <property name="maxmethods"  description="The method count reporting threshold " value="30"/> 
+   <property name="violationSuppressXPath">
+   	                <value><![CDATA[
+//./ClassOrInterfaceDeclaration[(ends-with(@Image, 'Test'))]
+	             ]]></value>
+	            </property>
+        </properties>
+   </rule> 
+   
+      <!-- Custom Rule -->
+   <rule name="TooManyPublicMethods" ref="rulesets/java/codesize.xml/TooManyMethods">
+        <priority>4</priority>
+        <properties>
+                <property name="maxmethods"  description="The method count reporting threshold " value="10"/>
+                <property name="xpath">
+                <value>
+                    <![CDATA[
+					//ClassOrInterfaceDeclaration/ClassOrInterfaceBody [
+						count(descendant::MethodDeclarator[
+							not
+							(
+								starts-with(@Image,'get')
+								or
+								starts-with(@Image,'set')
+								or
+								starts-with(@Image,'is')
+								or
+								starts-with(@Image,'should')
+								or
+								starts-with(@Image,'test')
+							)
+							and ( ../@Public = 'true' )
+						]) > $maxmethods
+					]
+                    ]]>
+                </value>
+            </property>
+        </properties>
+    </rule>   
+   
+   <rule ref="rulesets/java/controversial.xml/UnnecessaryConstructor">
+        <priority>4</priority>
+   </rule>   
+   <rule ref="rulesets/java/controversial.xml/DontImportSun">
+           <priority>2</priority>
+   </rule>   
+   
+   <rule ref="rulesets/java/controversial.xml/SuspiciousOctalEscape"/>
+   <rule ref="rulesets/java/controversial.xml/UnnecessaryParentheses">
+           <priority>4</priority>
+   </rule>   
+   
+   <rule ref="rulesets/java/controversial.xml/AvoidAccessibilityAlteration"/>
+  <!--  Modified Rule to ignore Performancetests -->  
+   <rule ref="rulesets/java/controversial.xml/DoNotCallGarbageCollectionExplicitly">
+           <priority>3</priority> 
+      <properties>
+         <property name="xpath">
+            <value>
+            <![CDATA[
+//ClassOrInterfaceDeclaration[not((starts-with(@Image, 'Performance')))]//Name[
+(starts-with(@Image, 'System.') and
+(starts-with(@Image, 'System.gc') or
+starts-with(@Image, 'System.runFinalization'))) or
+(starts-with(@Image,'Runtime.getRuntime') and
+../../PrimarySuffix[ends-with(@Image,'gc')])]
+ ]]>
+</value> 
+         </property>
+      </properties>
+   </rule>
+
+   <rule ref="rulesets/java/coupling.xml/CouplingBetweenObjects"/>
+   <rule ref="rulesets/java/coupling.xml/ExcessiveImports">
+     <properties>
+     <property name="minimum" description="The import count reporting threshold" value="35"/>
+   <property name="violationSuppressXPath">
+   	                <value><![CDATA[
+//./ClassOrInterfaceDeclaration[(ends-with(@Image, 'Test'))]
+	             ]]></value>
+	            </property>
+  
+    </properties>
+    </rule> 
+    
+   <rule ref="rulesets/java/coupling.xml/LooseCoupling">
+         <priority>2</priority>   
+   </rule> 
+    
+   <rule ref="rulesets/java/design.xml/UseUtilityClass"/>
+   <rule ref="rulesets/java/design.xml/SimplifyBooleanReturns"/>
+   <rule ref="rulesets/java/design.xml/SimplifyBooleanExpressions"/>
+   <rule ref="rulesets/java/design.xml/SwitchStmtsShouldHaveDefault"/>
+   <rule ref="rulesets/java/design.xml/AvoidDeeplyNestedIfStmts"/>
+   <rule ref="rulesets/java/design.xml/SwitchDensity"/>
+   <rule ref="rulesets/java/design.xml/ConstructorCallsOverridableMethod"/>   
+   <rule ref="rulesets/java/design.xml/FinalFieldCouldBeStatic">
+            <priority>2</priority>   
+   </rule> 
+   
+   <rule ref="rulesets/java/design.xml/CloseResource">
+            <priority>2</priority>   
+   </rule> 
+   
+   <rule ref="rulesets/java/design.xml/NonStaticInitializer">
+               <priority>4</priority>   
+   </rule> 
+   
+   <rule ref="rulesets/java/design.xml/DefaultLabelNotLastInSwitchStmt"/>
+   <rule ref="rulesets/java/design.xml/NonCaseLabelInSwitchStatement">
+               <priority>2</priority>   
+   </rule> 
+   
+   <rule ref="rulesets/java/design.xml/OptimizableToArrayCall"/>
+   <rule ref="rulesets/java/design.xml/BadComparison">
+               <priority>2</priority>   
+   </rule> 
+   
+   <rule ref="rulesets/java/design.xml/EqualsNull"/>
+   <rule ref="rulesets/java/design.xml/InstantiationToGetClass">
+               <priority>2</priority>   
+   </rule> 
+   
+   <rule ref="rulesets/java/design.xml/IdempotentOperations">
+               <priority>2</priority>   
+   </rule> 
+   
+   <rule ref="rulesets/java/design.xml/ImmutableField"/>
+   <rule ref="rulesets/java/design.xml/UseLocaleWithCaseConversions">
+               <priority>5</priority>   
+   </rule> 
+   
+   <rule ref="rulesets/java/design.xml/AssignmentToNonFinalStatic">
+               <priority>4</priority>   
+   </rule> 
+   
+   <rule ref="rulesets/java/design.xml/MissingStaticMethodInNonInstantiatableClass"/>
+   <rule ref="rulesets/java/design.xml/AvoidSynchronizedAtMethodLevel"/>
+   <rule ref="rulesets/java/design.xml/MissingBreakInSwitch"/>
+   <rule ref="rulesets/java/design.xml/UseNotifyAllInsteadOfNotify"/>
+   <rule ref="rulesets/java/design.xml/AvoidInstanceofChecksInCatchClause"/>
+   <rule ref="rulesets/java/design.xml/AbstractClassWithoutAbstractMethod"/>
+   <rule ref="rulesets/java/design.xml/SimplifyConditional"/>
+   <rule ref="rulesets/java/design.xml/CompareObjectsWithEquals"/>
+   <rule ref="rulesets/java/design.xml/PositionLiteralsFirstInComparisons"/>
+   <rule ref="rulesets/java/design.xml/UnnecessaryLocalBeforeReturn"/>
+   <rule ref="rulesets/java/design.xml/NonThreadSafeSingleton"/>   
+   <rule ref="rulesets/java/design.xml/UncommentedEmptyConstructor"/>
+   <rule ref="rulesets/java/design.xml/AvoidConstantsInterface">
+      <priority>4</priority>   
+    </rule>   
+    
+   <rule ref="rulesets/java/design.xml/UnsynchronizedStaticDateFormatter">
+      <priority>2</priority>   
+   </rule>    
+   
+   <rule ref="rulesets/java/design.xml/PreserveStackTrace">
+       <priority>2</priority>   
+   </rule>    
+        
+   <rule ref="rulesets/java/design.xml/UseCollectionIsEmpty">
+         <priority>4</priority>   
+   </rule>    
+      
+   <rule ref="rulesets/java/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
+
+   <rule ref="rulesets/java/design.xml/SingularField">
+         <priority>1</priority>   
+   </rule>    
+   
+   <rule ref="rulesets/java/design.xml/ReturnEmptyArrayRatherThanNull">
+         <priority>2</priority>   
+   </rule>    
+      
+   <rule ref="rulesets/java/design.xml/AbstractClassWithoutAnyMethod"/>
+   <rule ref="rulesets/java/design.xml/TooFewBranchesForASwitchStatement">
+         <priority>3</priority>   
+   </rule>    
+   
+   <rule name="UncommentedEmptyBlock"
+          language="java"
+          since="3.4"
+          message="Empty and uncommented block"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/design.html#UncommentedEmptyMethod">
+      <description>
+By explicitly commenting empty blocks
+it is easier to distinguish between intentional (commented) and unintentional
+empty block.
+      </description>
+      <priority>3</priority>
+      <properties>
+          <property name="xpath">
+              <value>
+    <![CDATA[
+//Block[count(BlockStatement) = 0 and @containsComment = 'false']
+ ]]>
+             </value>
+          </property>
+      </properties>
+      <example>
+  <![CDATA[
+public void doSomething() {
+}
+ ]]>
+      </example>
+    </rule>
+   
+<rule name="MemberScope"
+            language="java"
+             message="All instance variable must be private."
+        	class="net.sourceforge.pmd.lang.rule.XPathRule">
+         <description>
+All instance and class variables must be private. Class constants (which are static and final) can have other scopes.
+         </description>
+         <priority>2</priority>
+         <properties>
+             <property name="xpath">
+                 <value>
+<![CDATA[
+//FieldDeclaration[not(@Private='true' or (@Static='true' and @Final='true'))]
+ ]]>
+                 </value>
+             </property>
+         </properties>
+        <example>
+<![CDATA[
+public class Bar {
+ private int x;
+ protected int y;  // all members must be private!
+ Bar() {}
+}
+ ]]>
+         </example>
+       </rule>
+       
+   <rule ref="rulesets/java/empty.xml/EmptyCatchBlock">
+      <priority>2</priority>   
+       <properties> 
+            <property name="allowCommentedBlocks" value="true"/>
+      </properties> 
+   </rule>  
+   
+   <rule ref="rulesets/java/empty.xml/EmptyIfStmt">
+      <priority>2</priority>   
+   </rule>  
+
+   <rule ref="rulesets/java/empty.xml/EmptyWhileStmt">
+      <priority>2</priority>   
+   </rule>  
+
+   <rule ref="rulesets/java/empty.xml/EmptyTryBlock">
+       <priority>2</priority>   
+   </rule>    
+   
+   <rule ref="rulesets/java/empty.xml/EmptyFinallyBlock">
+         <priority>2</priority>   
+   </rule>  
+   
+   <rule ref="rulesets/java/empty.xml/EmptySwitchStatements">
+         <priority>2</priority>   
+   </rule>  
+   
+   <rule ref="rulesets/java/empty.xml/EmptySynchronizedBlock">
+          <priority>2</priority>   
+   </rule>    
+   
+   <rule ref="rulesets/java/empty.xml/EmptyStatementNotInLoop">
+           <priority>2</priority>   
+   </rule>   
+    <rule ref="rulesets/java/empty.xml/EmptyInitializer">
+           <priority>2</priority>   
+   </rule>     
+   
+   <rule ref="rulesets/java/empty.xml/EmptyStaticInitializer">
+           <priority>2</priority>   
+   </rule>     
+   
+   <rule ref="rulesets/java/finalizers.xml/EmptyFinalizer">
+           <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/finalizers.xml/FinalizeOnlyCallsSuperFinalize">
+              <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/finalizers.xml/FinalizeOverloaded">
+              <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/finalizers.xml/FinalizeDoesNotCallSuperFinalize">
+              <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/finalizers.xml/FinalizeShouldBeProtected">
+              <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/finalizers.xml/AvoidCallingFinalize">
+              <priority>2</priority>   
+   </rule>   
+   
+
+   <rule ref="rulesets/java/imports.xml/DuplicateImports"/>
+   <rule ref="rulesets/java/imports.xml/DontImportJavaLang"/>
+   <rule ref="rulesets/java/imports.xml/UnusedImports"/>
+   <rule ref="rulesets/java/imports.xml/ImportFromSamePackage"/>
+   
+   <rule name="ImportFromChildPackage" 
+   language="java"
+   class="net.sourceforge.pmd.lang.rule.XPathRule"
+   message="You must not import from a child package.">   
+       <description>
+You must not import from a child package. It usually indicates coupling to a specific implementation rather than referencing the interface of the implementation.
+       </description>
+       <priority>3</priority>
+        <properties>
+            <property name="xpath">
+                <value><![CDATA[
+/ImportDeclaration/Name[starts-with(@Image,concat(/PackageDeclaration/Name/@Image, '.'))]
+]]></value>
+            </property>
+        </properties>
+       <example>
+<![CDATA[
+package com.hybris.cool.stuff;
+
+// OK - importing from parent is totally fine
+import com.hybris.cool;
+
+// OK - importing from package on same hierachy level is fine
+import com.hybris.cool.muuh;
+
+// ERROR - but you must not import from deeper/child packages
+import com.hybris.cool.stuff.impl;
+
+public class MyClass {
+// ...
+}
+]]>
+       </example>
+     </rule>
+   <rule name="DoNotUseImportWildcards" language="java"
+   	        since="4.1"
+        	class="net.sourceforge.pmd.lang.rule.XPathRule"
+        	message="Do not use import wildcards. Keep your code explicit.">
+       		<description> Do not use import wildcards. Keep your code explicit.</description>
+			<priority>3</priority>
+       		<properties>
+	            <property name="xpath">
+	                <value><![CDATA[
+//ImportDeclaration[@ImportedName=@PackageName]
+	             ]]></value>
+	            </property>
+	        </properties>
+    	 	<example><![CDATA[
+import java.util.*; // Please no!
+import java.awt.*; // Which List to use now?
+		  ]]></example>
+    </rule> 
+
+ 
+   <rule ref="rulesets/java/javabeans.xml/MissingSerialVersionUID"/>
+
+   <rule ref="rulesets/java/junit.xml/JUnitStaticSuite"/>
+   <rule ref="rulesets/java/junit.xml/JUnitSpelling"/>
+   <rule ref="rulesets/java/junit.xml/JUnitTestsShouldIncludeAssert">
+              <priority>4</priority>   
+                 <properties>
+   <property name="violationSuppressXPath">
+   	                <value><![CDATA[
+//ClassOrInterfaceDeclaration
+[
+@Interface='false'
+and (ends-with(@Image, 'Test'))
+]
+//ClassOrInterfaceBodyDeclaration
+[
+.//MarkerAnnotation/Name[typeof(@Image, 'org.junit.Test', 'Test')]
+and(
+.//StatementExpression/PrimaryExpression
+[
+starts-with(.//PrimaryPrefix/Name/@Image,'assert')
+or
+starts-with(.//PrimarySuffix/@Image,'assert')
+or
+starts-with(.//PrimaryPrefix/Name/@Image,'Assert.assert')
+or
+starts-with(.//PrimaryPrefix/Name/@Image,'Assertions.assert')
+or
+starts-with(.//PrimarySuffix/@Image,'Assert.assert')
+or
+starts-with(.//PrimaryPrefix/Name/@Image,'fail')
+or
+starts-with(.//PrimarySuffix/@Image,'fail')
+or
+starts-with(.//PrimaryPrefix/Name/@Image,'Assert.fail')
+or
+starts-with(.//PrimarySuffix/@Image,'Assert.fail')
+or
+starts-with(.//PrimaryPrefix/Name/@Image,'verify')
+or
+starts-with(.//PrimarySuffix/@Image,'verify')
+or
+starts-with(.//PrimaryPrefix/Name/@Image,'Mockito.verify')
+or
+starts-with(.//PrimarySuffix/@Image,'Mockito.verify')
+])]
+	             ]]></value>
+	            </property>
+	        </properties>   
+   </rule>   
+   
+   <rule ref="rulesets/java/junit.xml/TestClassWithoutTestCases"/>
+   <rule ref="rulesets/java/junit.xml/UnnecessaryBooleanAssertion"/>
+   <rule ref="rulesets/java/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>
+   <rule ref="rulesets/java/junit.xml/UseAssertSameInsteadOfAssertTrue"/>
+   <rule ref="rulesets/java/junit.xml/UseAssertNullInsteadOfAssertTrue"/>
+   <rule ref="rulesets/java/junit.xml/SimplifyBooleanAssertion"/>
+
+   <rule ref="rulesets/java/logging-jakarta-commons.xml/UseCorrectExceptionLogging">
+                 <priority>2</priority>   
+   </rule>   
+  
+   <rule ref="rulesets/java/logging-java.xml/LoggerIsNotStaticFinal"/>
+   <rule ref="rulesets/java/logging-java.xml/SystemPrintln"/>
+   <rule ref="rulesets/java/logging-java.xml/AvoidPrintStackTrace">
+                 <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/migrating.xml/ReplaceVectorWithList"/>
+   <rule ref="rulesets/java/migrating.xml/ReplaceHashtableWithMap"/>
+   <rule ref="rulesets/java/migrating.xml/ReplaceEnumerationWithIterator">
+                    <priority>4</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/migrating.xml/IntegerInstantiation"/>
+   <rule ref="rulesets/java/migrating.xml/ByteInstantiation"/>
+   <rule ref="rulesets/java/migrating.xml/ShortInstantiation"/>
+   <rule ref="rulesets/java/migrating.xml/LongInstantiation"/>
+   <rule ref="rulesets/java/migrating.xml/JUnit4TestShouldUseBeforeAnnotation"/>
+   <rule ref="rulesets/java/migrating.xml/JUnit4TestShouldUseAfterAnnotation"/>
+   <rule ref="rulesets/java/migrating.xml/JUnit4TestShouldUseTestAnnotation"/>
+   <rule ref="rulesets/java/migrating.xml/JUnit4SuitesShouldUseSuiteAnnotation"/>
+   <rule ref="rulesets/java/migrating.xml/JUnitUseExpected"/>
+
+  <!-- customized to ignore for each loops -->
+   <rule ref="rulesets/java/naming.xml/ShortVariable">
+                    <priority>5</priority>   
+                            <properties>
+                <property name="xpath">
+                    <value>
+                    <![CDATA[
+//VariableDeclaratorId[string-length(@Image) < 3]
+ [not(ancestor::ForInit)]
+ [not((ancestor::FormalParameter) and (ancestor::TryStatement))]
+ [not(parent::*/parent::*/parent::ForStatement)]
+ [not(@Image= 'id')]
+                    ]]>
+                </value>
+                </property>            
+                              </properties>
+                              </rule>   
+   
+   <rule ref="rulesets/java/naming.xml/LongVariable">
+                    <priority>5</priority>
+   <properties>
+         <property name="minimum" description="The variable length reporting threshold" value="36"/>
+             
+   </properties>
+   </rule>   
+   
+   <rule ref="rulesets/java/naming.xml/ShortMethodName">
+                    <priority>5</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/naming.xml/VariableNamingConventions">
+                    <priority>3</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/naming.xml/MethodNamingConventions">
+                    <priority>1</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/naming.xml/ClassNamingConventions">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/naming.xml/AvoidDollarSigns">
+                    <priority>1</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/naming.xml/MethodWithSameNameAsEnclosingClass">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/naming.xml/SuspiciousHashcodeMethodName"/>
+   <rule ref="rulesets/java/naming.xml/SuspiciousConstantFieldName"/>
+   <rule ref="rulesets/java/naming.xml/SuspiciousEqualsMethodName"/>
+   <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingTypeName"/>
+   <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingMethodName"/>
+   <rule ref="rulesets/java/naming.xml/NoPackage">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/naming.xml/PackageCase">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/naming.xml/BooleanGetMethodName">
+                    <priority>5</priority>   
+   </rule>   
+   
+
+   <rule ref="rulesets/java/optimizations.xml/LocalVariableCouldBeFinal"/>
+   <rule ref="rulesets/java/optimizations.xml/MethodArgumentCouldBeFinal"/>
+   <rule ref="rulesets/java/optimizations.xml/SimplifyStartsWith"/>
+   <rule ref="rulesets/java/optimizations.xml/UseStringBufferForStringAppends"/>
+   <rule ref="rulesets/java/optimizations.xml/UseArraysAsList"/>
+   <rule ref="rulesets/java/optimizations.xml/AvoidArrayLoops"/>
+   <rule ref="rulesets/java/optimizations.xml/UnnecessaryWrapperObjectCreation"/>
+   <rule ref="rulesets/java/optimizations.xml/AddEmptyString"/>
+
+   <rule ref="rulesets/java/strictexception.xml/AvoidCatchingThrowable">
+                    <priority>1</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/strictexception.xml/SignatureDeclareThrowsException">
+                    <priority>2</priority> 
+   <properties>
+   <property name="violationSuppressXPath">
+   	                <value><![CDATA[
+//./ClassOrInterfaceDeclaration[(ends-with(@Image, 'Test'))]
+	             ]]></value>
+	            </property>
+	        </properties>     
+   </rule>   
+   
+   <rule ref="rulesets/java/strictexception.xml/ExceptionAsFlowControl">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/strictexception.xml/AvoidCatchingNPE"/>
+   <rule ref="rulesets/java/strictexception.xml/AvoidThrowingRawExceptionTypes"/>
+   <rule ref="rulesets/java/strictexception.xml/AvoidThrowingNullPointerException"/>
+   <rule ref="rulesets/java/strictexception.xml/AvoidRethrowingException">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/strictexception.xml/DoNotExtendJavaLangError"/>
+   <rule ref="rulesets/java/strictexception.xml/DoNotThrowExceptionInFinally">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/strictexception.xml/AvoidThrowingNewInstanceOfSameException"/>
+   
+   <rule ref="rulesets/java/strings.xml/StringToString"/>
+   <rule ref="rulesets/java/strings.xml/InefficientStringBuffering">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/strings.xml/UnnecessaryCaseChange"/>
+   <rule ref="rulesets/java/strings.xml/UseStringBufferLength"/>
+   <rule ref="rulesets/java/strings.xml/AppendCharacterWithChar"/>
+   <rule ref="rulesets/java/strings.xml/UseIndexOfChar"/>
+   <rule ref="rulesets/java/strings.xml/InefficientEmptyStringCheck">   
+                    <priority>4</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/strings.xml/InsufficientStringBufferDeclaration">
+                    <priority>4</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/strings.xml/UselessStringValueOf"/>
+   <rule ref="rulesets/java/strings.xml/StringBufferInstantiationWithChar">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/strings.xml/UseEqualsToCompareStrings">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/strings.xml/AvoidStringBufferField"/>
+
+   <rule ref="rulesets/java/sunsecure.xml/MethodReturnsInternalArray"/>   
+   <rule ref="rulesets/java/sunsecure.xml/ArrayIsStoredDirectly"/>     
+    
+   <rule ref="rulesets/java/unnecessary.xml/UnnecessaryConversionTemporary">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/unnecessary.xml/UnnecessaryReturn"/>
+   <rule ref="rulesets/java/unnecessary.xml/UnnecessaryFinalModifier"/>
+   <rule ref="rulesets/java/unnecessary.xml/UselessOperationOnImmutable">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/unnecessary.xml/UselessOverridingMethod">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/unnecessary.xml/UnusedNullCheckInEquals">  
+                    <priority>2</priority>   
+   </rule>   
+   
+   
+   <rule ref="rulesets/java/unusedcode.xml/UnusedPrivateField"> 
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/unusedcode.xml/UnusedLocalVariable">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/unusedcode.xml/UnusedPrivateMethod">
+                    <priority>2</priority>   
+   </rule>   
+   
+   <rule ref="rulesets/java/unusedcode.xml/UnusedFormalParameter"/>
+   <rule ref="rulesets/java/unusedcode.xml/UnusedModifier"/>    
+
+   <rule ref="rulesets/jsp/basic.xml/NoLongScripts"/>   
+   <rule ref="rulesets/jsp/basic.xml/NoScriptlets"/>   
+   <rule ref="rulesets/jsp/basic.xml/NoInlineStyleInformation"/>  
+   <rule ref="rulesets/jsp/basic.xml/NoClassAttribute"/>   
+   <rule ref="rulesets/jsp/basic.xml/NoJspForward"/>   
+   <rule ref="rulesets/jsp/basic.xml/IframeMissingSrcAttribute"/>   
+   <rule ref="rulesets/jsp/basic.xml/NoHtmlComments"/>   
+   <rule ref="rulesets/jsp/basic.xml/DuplicateJspImports"/>   
+   <rule ref="rulesets/jsp/basic.xml/JspEncoding"/>     
+   <rule ref="rulesets/jsp/basic.xml/NoInlineScript"/>   
+   
+   <rule ref="rulesets/xml/basic.xml/MistypedCDATASection"/> 
+   
+</ruleset>   
\ No newline at end of file
diff --git a/adyenv6notification/src/com/adyen/v6/constants/Adyenv6notificationConstants.java b/adyenv6notification/src/com/adyen/v6/constants/Adyenv6notificationConstants.java
new file mode 100644
index 000000000..903482b5c
--- /dev/null
+++ b/adyenv6notification/src/com/adyen/v6/constants/Adyenv6notificationConstants.java
@@ -0,0 +1,27 @@
+/*
+ * [y] hybris Platform
+ *
+ * Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+ *
+ * This software is the confidential and proprietary information of SAP
+ * ("Confidential Information"). You shall not disclose such Confidential
+ * Information and shall use it only in accordance with the terms of the
+ * license agreement you entered into with SAP.
+ */
+package com.adyen.v6.constants;
+
+/**
+ * Global class for all Adyenv6notification constants. You can add global constants for your extension into this class.
+ */
+@SuppressWarnings("deprecation")
+public final class Adyenv6notificationConstants extends GeneratedAdyenv6notificationConstants //NOSONAR
+{
+	public static final String EXTENSIONNAME = "adyenv6notification";
+
+	private Adyenv6notificationConstants()
+	{
+		//empty to avoid instantiating this constant class
+	}
+
+	// implement here constants used by this extension
+}
diff --git a/adyenv6notification/src/com/adyen/v6/jalo/Adyenv6notificationManager.java b/adyenv6notification/src/com/adyen/v6/jalo/Adyenv6notificationManager.java
new file mode 100644
index 000000000..7d6d160c8
--- /dev/null
+++ b/adyenv6notification/src/com/adyen/v6/jalo/Adyenv6notificationManager.java
@@ -0,0 +1,30 @@
+/*
+ * [y] hybris Platform
+ *
+ * Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+ *
+ * This software is the confidential and proprietary information of SAP
+ * ("Confidential Information"). You shall not disclose such Confidential
+ * Information and shall use it only in accordance with the terms of the
+ * license agreement you entered into with SAP.
+ */
+package com.adyen.v6.jalo;
+
+import de.hybris.platform.jalo.JaloSession;
+import de.hybris.platform.jalo.extension.ExtensionManager;
+import org.apache.log4j.Logger;
+import com.adyen.v6.constants.Adyenv6notificationConstants;
+
+@SuppressWarnings("PMD")
+public class Adyenv6notificationManager extends GeneratedAdyenv6notificationManager
+{
+	@SuppressWarnings("unused")
+	private static final Logger LOG = Logger.getLogger( Adyenv6notificationManager.class.getName() );
+	
+	public static final Adyenv6notificationManager getInstance()
+	{
+		ExtensionManager em = JaloSession.getCurrentSession().getExtensionManager();
+		return (Adyenv6notificationManager) em.getExtension(Adyenv6notificationConstants.EXTENSIONNAME);
+	}
+	
+}
diff --git a/adyenv6b2ccheckoutaddon/src/com/adyen/v6/security/AdyenNotificationAuthenticationProvider.java b/adyenv6notification/src/com/adyen/v6/security/AdyenNotificationAuthenticationProvider.java
similarity index 70%
rename from adyenv6b2ccheckoutaddon/src/com/adyen/v6/security/AdyenNotificationAuthenticationProvider.java
rename to adyenv6notification/src/com/adyen/v6/security/AdyenNotificationAuthenticationProvider.java
index e2d1f7374..5a1419cd5 100644
--- a/adyenv6b2ccheckoutaddon/src/com/adyen/v6/security/AdyenNotificationAuthenticationProvider.java
+++ b/adyenv6notification/src/com/adyen/v6/security/AdyenNotificationAuthenticationProvider.java
@@ -20,39 +20,60 @@
  */
 package com.adyen.v6.security;
 
-import de.hybris.platform.store.BaseStoreModel;
-import de.hybris.platform.store.services.BaseStoreService;
-import org.apache.log4j.Logger;
-import org.springframework.util.Assert;
-
-import javax.servlet.http.HttpServletRequest;
 import java.nio.charset.Charset;
 import java.util.Base64;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.http.HTTPException;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+import de.hybris.platform.basecommerce.model.site.BaseSiteModel;
+import de.hybris.platform.site.BaseSiteService;
+import de.hybris.platform.store.BaseStoreModel;
+import de.hybris.platform.store.services.BaseStoreService;
 
 /**
  * Authenticates a request that is using Basic Authentication
  */
+@Component
 public class AdyenNotificationAuthenticationProvider {
+    @Resource(name = "baseStoreService")
     private BaseStoreService baseStoreService;
 
+    @Resource(name = "baseSiteService")
+    private BaseSiteService baseSiteService;
+
     private static final Logger LOG = Logger.getLogger(AdyenNotificationAuthenticationProvider.class);
 
-    public boolean authenticateBasic(final HttpServletRequest request) {
+    public boolean authenticateBasic(final HttpServletRequest request, String baseSiteId) {
         final String authorization = request.getHeader("Authorization");
         if (authorization != null && authorization.startsWith("Basic")) {
             String base64Credentials = authorization.substring("Basic".length()).trim();
-            String credentials = new String(Base64.getDecoder().decode(base64Credentials),
-                    Charset.forName("UTF-8"));
+            String credentials = new String(Base64.getDecoder().decode(base64Credentials), Charset.forName("UTF-8"));
             final String[] values = credentials.split(":", 2);
-
-            return tryToAuthenticate(values[0], values[1]);
+            return tryToAuthenticate(values[0], values[1], baseSiteId);
         }
         return false;
     }
 
-    private boolean tryToAuthenticate(String name, String password) {
+    private boolean tryToAuthenticate(String name, String password, String baseSiteId) {
+
+        LOG.debug("Trying to authenticate for baseSiteId " + baseSiteId);
+        final BaseSiteModel requestedBaseSite = getBaseSiteService().getBaseSiteForUID(baseSiteId);
+        if (requestedBaseSite != null) {
+            final BaseSiteModel currentBaseSite = getBaseSiteService().getCurrentBaseSite();
+
+            if (! requestedBaseSite.equals(currentBaseSite)) {
+                getBaseSiteService().setCurrentBaseSite(requestedBaseSite, true);
+            }
+        }
         BaseStoreModel baseStore = baseStoreService.getCurrentBaseStore();
 
+        if (baseStore == null) {
+            return false;
+        }
+
         String notificationUsername = baseStore.getAdyenNotificationUsername();
         String notificationPassword = baseStore.getAdyenNotificationPassword();
 
@@ -74,6 +95,10 @@ public BaseStoreService getBaseStoreService() {
         return baseStoreService;
     }
 
+    protected BaseSiteService getBaseSiteService() {
+        return baseSiteService;
+    }
+
     public void setBaseStoreService(BaseStoreService baseStoreService) {
         this.baseStoreService = baseStoreService;
     }
diff --git a/adyenv6notification/web/src/com/adyen/v6/controllers/AdyenNotificationController.java b/adyenv6notification/web/src/com/adyen/v6/controllers/AdyenNotificationController.java
new file mode 100644
index 000000000..3be026f09
--- /dev/null
+++ b/adyenv6notification/web/src/com/adyen/v6/controllers/AdyenNotificationController.java
@@ -0,0 +1,63 @@
+/*
+ * [y] hybris Platform
+ *
+ * Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+ *
+ * This software is the confidential and proprietary information of SAP
+ * ("Confidential Information"). You shall not disclose such Confidential
+ * Information and shall use it only in accordance with the terms of the
+ * license agreement you entered into with SAP.
+ */
+package com.adyen.v6.controllers;
+
+import java.io.IOException;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.adyen.v6.security.AdyenNotificationAuthenticationProvider;
+import com.adyen.v6.service.AdyenNotificationService;
+
+
+@Controller
+@RequestMapping(value = "/adyen/v6/notification/{baseSiteId}")
+
+public class AdyenNotificationController {
+	private static final Logger LOG = Logger.getLogger(AdyenNotificationController.class);
+
+	@Resource(name = "adyenNotificationAuthenticationProvider")
+	private AdyenNotificationAuthenticationProvider adyenNotificationAuthenticationProvider;
+
+	@Resource(name = "adyenNotificationService")
+	private AdyenNotificationService adyenNotificationService;
+
+	private static final String RESPONSE_ACCEPTED = "[accepted]";
+	private static final String RESPONSE_NOT_ACCEPTED = "[not-accepted]";
+
+	@RequestMapping(value = "/json", method = RequestMethod.POST)
+	@ResponseBody
+	public String onReceive(@PathVariable final String baseSiteId, final HttpServletRequest request) {
+		String requestString = null;
+		try {
+			//Parse response body by request input stream so that Spring doesn't try to deserialize
+			requestString = IOUtils.toString(request.getInputStream());
+		} catch (IOException e) {
+			LOG.error(e);
+			return RESPONSE_NOT_ACCEPTED;
+		}
+
+		LOG.debug("Received Adyen notification1:" + requestString);
+		if (! adyenNotificationAuthenticationProvider.authenticateBasic(request, baseSiteId)) {
+			throw new AccessDeniedException("Wrong credentials. Please check your basesite, username and password.");
+		}
+		adyenNotificationService.saveNotifications(requestString);
+
+        return RESPONSE_ACCEPTED;
+    }
+}
diff --git a/adyenv6notification/web/webroot/WEB-INF/adyenv6notification-web-spring.xml b/adyenv6notification/web/webroot/WEB-INF/adyenv6notification-web-spring.xml
new file mode 100644
index 000000000..4b2df41a4
--- /dev/null
+++ b/adyenv6notification/web/webroot/WEB-INF/adyenv6notification-web-spring.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ [y] hybris Platform
+
+ Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+
+ This software is the confidential and proprietary information of SAP
+ ("Confidential Information"). You shall not disclose such Confidential
+ Information and shall use it only in accordance with the terms of the
+ license agreement you entered into with SAP.
+-->
+<!-- WARNING: This is the Spring WEB configuration file. If you want to replace items or managers you have to do this from the extensions 
+	core configuration file (adyenv6notification/resources/adyenv6notification-spring.xml) -->
+
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans.xsd
+           http://www.springframework.org/schema/context
+			  http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<context:annotation-config/>
+	<context:component-scan base-package="com.adyen.v6"/>
+
+
+
+	<bean id="adyenNotificationAuthenticationProvider" class="com.adyen.v6.security.AdyenNotificationAuthenticationProvider">
+		<property name="baseStoreService" ref="baseStoreService" />
+	</bean>
+
+	<!-- Spring managed FilterChain for hybris Filter stack -->
+	<bean id="adyenv6notificationPlatformFilterChain" class="de.hybris.platform.servicelayer.web.PlatformFilterChain">
+		<constructor-arg>
+			<list>
+				<!-- Filter that catches and resolves exceptions thrown from other filters. Can be uncommented if you need such functionality -->
+				<!-- <ref bean="exceptionTranslationFilter" /> -->
+
+				<ref bean="log4jFilter" />
+				<ref bean="tenantActivationFilter" />
+				<!-- This filter creates new jalo session and close it after request is handled. -->
+				<ref bean="restSessionFilter" />
+				<!-- If you want to track user session:
+					- uncomment filter below
+					- comment or remove restSessionFilter above
+					- comment or remove SessionHindingRequestFilter in web.xml -->
+				<!-- ref bean="sessionFilter" /-->
+
+				<!-- Security -->
+				<!--				<ref bean="springSecurityFilterChain" />-->
+			</list>
+		</constructor-arg>
+	</bean>
+
+	<bean id="restSessionFilter" class="de.hybris.platform.webservicescommons.filter.RestSessionFilter">
+		<property name="sessionService" ref="sessionService" />
+	</bean>
+
+
+
+</beans>
diff --git a/adyenv6notification/web/webroot/WEB-INF/messages/messages.properties b/adyenv6notification/web/webroot/WEB-INF/messages/messages.properties
new file mode 100644
index 000000000..1c7962ffe
--- /dev/null
+++ b/adyenv6notification/web/webroot/WEB-INF/messages/messages.properties
@@ -0,0 +1,12 @@
+# -----------------------------------------------------------------------
+# [y] hybris Platform
+#
+# Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+#
+# This software is the confidential and proprietary information of SAP
+# ("Confidential Information"). You shall not disclose such Confidential
+# Information and shall use it only in accordance with the terms of the
+# license agreement you entered into with SAP.
+# -----------------------------------------------------------------------
+
+field.required=This field is required.
diff --git a/adyenv6notification/web/webroot/WEB-INF/springmvc-servlet.xml b/adyenv6notification/web/webroot/WEB-INF/springmvc-servlet.xml
new file mode 100644
index 000000000..6647acd73
--- /dev/null
+++ b/adyenv6notification/web/webroot/WEB-INF/springmvc-servlet.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ [y] hybris Platform
+
+ Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+
+ This software is the confidential and proprietary information of SAP
+ ("Confidential Information"). You shall not disclose such Confidential
+ Information and shall use it only in accordance with the terms of the
+ license agreement you entered into with SAP.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:security="http://www.springframework.org/schema/security"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:cache="http://www.springframework.org/schema/cache"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+		http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context
+		http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/mvc
+		http://www.springframework.org/schema/mvc/spring-mvc.xsd
+		http://www.springframework.org/schema/security 
+		http://www.springframework.org/schema/security/spring-security.xsd
+		http://www.springframework.org/schema/cache
+     	http://www.springframework.org/schema/cache/spring-cache.xsd
+		http://www.springframework.org/schema/util
+		http://www.springframework.org/schema/util/spring-util.xsd">
+		
+	<context:annotation-config />
+	<context:component-scan base-package="com.adyen.v6" scope-resolver="de.hybris.platform.spring.IgnoreTenantScopeMetadataResolver" />
+	
+	<!-- json and xml conversion -->
+	
+	<!-- 
+	jsonHttpMessageConverter and xmlHttpMessageConverter are default message converters declared in webservicescommons.
+	If custom configuration is needed for this web service please remove jsonHttpMessageConverter and xmlHttpMessageConverter from message-converters list and uncomment 
+	customJsonHttpMessageConverter and customXmlHttpMessageConverter declarations.
+	Changes done in custom message converters like adapter list will affect only this web service.
+	 -->
+	<mvc:annotation-driven>
+		<mvc:message-converters>
+			<ref bean="jsonHttpMessageConverter"/>
+			<ref bean="xmlHttpMessageConverter"/>
+<!-- 			<ref bean="customJsonHttpMessageConverter" /> -->
+<!-- 			<ref bean="customXmlHttpMessageConverter" /> -->
+		</mvc:message-converters>
+	</mvc:annotation-driven>	
+	
+	
+	<!-- 
+	Custom message converters which can override some of the default settings provided by webservicescommons.
+	 -->
+	<!-- 
+	<bean id="customJsonHttpMessageConverter" parent="jsonHttpMessageConverter">
+		<property name="jaxbContextFactory" ref="customJaxbContextFactory" />
+	</bean>
+		
+	<bean id="customXmlHttpMessageConverter" parent="xmlHttpMessageConverter">
+		<property name="jaxbContextFactory" ref="customJaxbContextFactory" />
+	</bean>
+	-->
+
+	<!-- 
+	Custom Moxy Jaxb context factory declaration.
+	Adapters can be declared here.
+	 -->	
+	<!-- 
+	<bean id="customJaxbContextFactory" parent="jaxbContextFactory">
+		<property name="metadataSourceFactory" ref="customMetadataSourceFactory" />
+	</bean>
+	
+	<bean id="customMetadataSourceFactory" parent="metadataSourceFactory">
+		<property name="nameProvider" ref="customMetadataNameProvider" />
+	</bean>
+	
+	<bean id="customMetadataNameProvider" parent="metadataNameProvider"></bean>
+	-->
+
+	<!-- This tag allows for mapping the DispatcherServlet to "/" (thus overriding the mapping of the container's default Servlet), while 
+		still allowing static resource requests to be handled by the container's default Servlet. It configures a DefaultServletHttpRequestHandler 
+		with a URL mapping (given a lowest precedence order) of "/**". This handler will forward all requests to the default Servlet. -->
+	<mvc:default-servlet-handler />
+
+	<!-- Support for @CacheControl annotation -->
+	<mvc:interceptors>
+		<bean class="de.hybris.platform.webservicescommons.interceptors.CacheControlHandlerInterceptor"/>
+	</mvc:interceptors>
+	
+	<!-- Load additional configuration -->
+
+	<bean id="jspViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
+		<property name="prefix" value="/WEB-INF/jsp/" />
+		<property name="suffix" value=".jsp" />
+	</bean>
+
+	<security:global-method-security pre-post-annotations="enabled" proxy-target-class="true" secured-annotations="enabled" />
+	
+	<mvc:resources mapping="**/swagger-ui.html" location="classpath:/META-INF/resources/"/>
+	<mvc:resources mapping="/webjars/**" location="classpath:/META-INF/resources/webjars/"/>
+
+</beans>
diff --git a/adyenv6notification/web/webroot/WEB-INF/web.xml b/adyenv6notification/web/webroot/WEB-INF/web.xml
new file mode 100644
index 000000000..1052361b6
--- /dev/null
+++ b/adyenv6notification/web/webroot/WEB-INF/web.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ [y] hybris Platform
+
+ Copyright (c) 2017 SAP SE or an SAP affiliate company.  All rights reserved.
+
+ This software is the confidential and proprietary information of SAP
+ ("Confidential Information"). You shall not disclose such Confidential
+ Information and shall use it only in accordance with the terms of the
+ license agreement you entered into with SAP.
+-->
+<web-app id="adyenv6notification" version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" 
+         metadata-complete="true">
+  <absolute-ordering />
+  
+	<display-name>adyenv6notification</display-name>
+	
+	<welcome-file-list>
+		<welcome-file/>
+	</welcome-file-list>
+	
+	<login-config>
+		<auth-method>BASIC</auth-method>
+	</login-config>
+
+	<filter>
+   		<filter-name>XSSFilter</filter-name>
+		<filter-class>de.hybris.platform.servicelayer.web.XSSFilter</filter-class>
+	</filter>
+	
+	<filter-mapping>
+		<filter-name>XSSFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	
+	<filter>
+   	<filter-name>characterEncodingFilter</filter-name>
+		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>UTF-8</param-value>
+		</init-param>
+		<init-param>
+			<param-name>forceEncoding</param-name>
+			<param-value>true</param-value>
+		</init-param>
+	</filter>
+	
+	
+	<!-- SessionHidingRequestFilter prevents creating Http session.
+		 If you want to track user session :
+		  - comment or remove SessionHidingRequestFilter
+		  - uncomment sessionFilter in adyenv6notification-web-spring.xml
+		  - comment or remove restSessionFilter in adyenv6notification-web-spring.xml
+	-->
+	<filter>
+		<filter-name>SessionHidingRequestFilter</filter-name>
+		<filter-class>de.hybris.platform.webservicescommons.filter.SessionHidingFilter</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>SessionHidingRequestFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	
+<!--
+	Enabling Spring managed Delegating Filter Proxy for hybris Filter Stack.
+-->
+	<filter>
+		<filter-name>adyenv6notificationPlatformFilterChain</filter-name>
+		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+	</filter>
+	
+	<filter-mapping>
+		<filter-name>characterEncodingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	
+	<filter-mapping>
+		<filter-name>adyenv6notificationPlatformFilterChain</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>	
+
+	<servlet>
+		<servlet-name>springmvc</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>springmvc</servlet-name>
+		<url-pattern>/</url-pattern>
+	</servlet-mapping>
+	
+<!--
+	Enabling a Spring web application context with 'session' and 'request' scope.
+	- The 'contextConfigLocation' param specifies where your configuration files are located.
+	- The HybrisContextLoaderListener extends the usual SpringContextLoaderListener (which loads
+	  the context from specified location) by adding the global application context of
+	  the platform as parent context. 
+	- The RequestContextListener is needed for exposing the 'request' scope to the context.
+	  Furthermore it is needed when overriding the 'jalosession' bean for your web application.
+ -->
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>WEB-INF/adyenv6notification-web-spring.xml</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>contextInitializerClasses</param-name>
+		<param-value>de.hybris.platform.webservicescommons.initializer.HybrisPropertiesWebApplicationContextInitializer</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>de.hybris.platform.spring.HybrisContextLoaderListener</listener-class>
+	</listener>
+	
+	<listener>
+    	<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+	</listener>
+		
+
+</web-app> 
diff --git a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
index c3b9d1ee5..fc6aadc4c 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=4.2.0
-version.api=4.2.0
+version=5.0.0
+version.api=5.0.0