diff --git a/README.md b/README.md
index f39aad12a..ea24040fe 100644
--- a/README.md
+++ b/README.md
@@ -65,13 +65,18 @@ Please make sure your merchant has Variant true in API and responses section so
 
 Credit Card payments are supported using Checkout Components.
 
+### Apple Pay
+
+[Apple Pay](https://docs.adyen.com/payment-methods/apple-pay/) is supported using Checkout Components.
+
+
 ### Ratepay
 
 Ratepay is supported via Adyen API.
 
 ### Boleto
 
-[Boleto](https://docs.adyen.com/developers/payment-methods/boleto-bancario) is supported via Adyen API.
+[Boleto](https://docs.adyen.com/payment-methods/boleto-bancario) is supported via Adyen API.
 
 ### Paypal Express Checkout Shortcut
 
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenComponentController.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenComponentController.java
index a18cc312b..34aa3b7fb 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenComponentController.java
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenComponentController.java
@@ -22,6 +22,7 @@
 
 import com.adyen.model.checkout.PaymentMethodDetails;
 import com.adyen.model.checkout.PaymentsResponse;
+import com.adyen.model.checkout.details.ApplePayDetails;
 import com.adyen.model.checkout.details.MbwayDetails;
 import com.adyen.model.checkout.details.PayPalDetails;
 import com.adyen.service.exception.ApiException;
@@ -98,6 +99,8 @@ public String componentPayment(final HttpServletRequest request) throws AdyenCom
                 paymentMethodDetails = gson.fromJson(requestJson.get("paymentMethodDetails"), PayPalDetails.class);
             } else if("mbway".equals(paymentMethod)) {
                 paymentMethodDetails = gson.fromJson(requestJson.get("paymentMethodDetails"), MbwayDetails.class);
+            } else if("applepay".equals(paymentMethod)) {
+                paymentMethodDetails = gson.fromJson(requestJson.get("paymentMethodDetails"), ApplePayDetails.class);
             } else {
                 throw new InvalidCartException("checkout.error.paymentethod.formentry.invalid");
             }
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 1e17d616f..905c37e6e 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
@@ -63,7 +63,6 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -83,6 +82,7 @@
 import static com.adyen.v6.constants.AdyenControllerConstants.CART_PREFIX;
 import static com.adyen.v6.constants.AdyenControllerConstants.SELECT_PAYMENT_METHOD_PREFIX;
 import static com.adyen.v6.constants.AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX;
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_APPLEPAY;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_CC;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_MULTIBANCO;
@@ -607,7 +607,8 @@ private String redirectToOrderSummaryWithError(final Model model,
                                                    final RedirectAttributes redirectAttributes,
                                                    final String messageKey) throws CommerceCartModificationException, CMSItemNotFoundException {
         final CartData cartData = getCheckoutFacade().getCheckoutCart();
-        if(cartData == null || cartData.getAdyenPaymentMethod() == null) {
+        if(cartData == null || cartData.getAdyenPaymentMethod() == null
+                || PAYMENT_METHOD_APPLEPAY.equals(cartData.getAdyenPaymentMethod())) {
             return redirectToSelectPaymentMethodWithError(redirectAttributes, messageKey);
         }
 
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
index 74cdef5c7..f2a4a4028 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
@@ -34,3 +34,4 @@ payment.method.terminal.selector=Select your terminal
 
 checkout.summary.spinner.message=Please wait while your payment is processed. Do not click back or refresh the page.
 checkout.summary.component.mbway.payment=Provide your MB WAY account data to finalize your payment
+checkout.summary.component.notavailable=This payment method is not available on your current browser or device
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_en.properties b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_en.properties
index 74cdef5c7..f2a4a4028 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_en.properties
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_en.properties
@@ -34,3 +34,4 @@ payment.method.terminal.selector=Select your terminal
 
 checkout.summary.spinner.message=Please wait while your payment is processed. Do not click back or refresh the page.
 checkout.summary.component.mbway.payment=Provide your MB WAY account data to finalize your payment
+checkout.summary.component.notavailable=This payment method is not available on your current browser or device
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
index aee1c36be..6cdf69502 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
@@ -11,9 +11,9 @@
 <spring:url value="/checkout/multi/termsAndConditions" var="getTermsAndConditionsUrl"/>
 
 <%-- Components --%>
-<c:if test="${selectedPaymentMethod eq 'mbway' || selectedPaymentMethod eq 'paypal'}">
-    <%-- Paypal button --%>
-    <c:if test="${selectedPaymentMethod eq 'paypal'}">
+<c:if test="${selectedPaymentMethod eq 'mbway' || selectedPaymentMethod eq 'paypal' || selectedPaymentMethod eq 'applepay'}">
+    <%-- Render Paypal or Apple Pay button --%>
+    <c:if test="${selectedPaymentMethod eq 'paypal' || selectedPaymentMethod eq 'applepay'}">
         <div class="checkbox">
             <label>
                 <input type="checkbox" id="terms-conditions-check-${label}" />
@@ -21,7 +21,7 @@
                     ${ycommerce:sanitizeHTML(readTermsAndConditions)}
             </label>
         </div>
-        <div id="adyen-paypal-container-${label}"></div>
+        <div id="adyen-component-button-container-${label}"></div>
     </c:if>
 
     <c:if test="${selectedPaymentMethod eq 'mbway'}">
@@ -32,8 +32,8 @@
     </c:if>
 </c:if>
 
-<%-- Paypal has it's own button --%>
-<c:if test="${selectedPaymentMethod ne 'paypal'}">
+<%-- Paypal and Apple Pay has it's own button --%>
+<c:if test="${selectedPaymentMethod ne 'paypal' && selectedPaymentMethod ne 'applepay'}">
     <form:form action="${placeOrderUrl}" id="placeOrderForm-${label}" modelAttribute="placeOrderForm">
         <div class="checkbox">
             <label> <form:checkbox id="terms-conditions-check-${label}" path="termsCheck" />
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp
index 4f7247596..a613b6a79 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp
@@ -14,9 +14,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/3.18.2/adyen.js"></script>
+    <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.19.0/adyen.js"></script>
     <link rel="stylesheet" href="https://checkoutshopper-live.adyen.com/checkoutshopper/css/chckt-default-v1.css"/>
-    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.18.2/adyen.css"/>
+    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.19.0/adyen.css"/>
 
     <script type="text/javascript">
         AdyenCheckoutHybris.initiateCheckout("${shopperLocale}", "${environmentMode}", "${clientKey}");
@@ -27,13 +27,19 @@
                 var amountJS = {value: "${amount.value}", currency: "${amount.currency}"};
                 AdyenCheckoutHybris.initiatePaypal(amountJS, "${immediateCapture}", "${paypalMerchantId}", "hidden-xs");
                 AdyenCheckoutHybris.initiatePaypal(amountJS, "${immediateCapture}", "${paypalMerchantId}", "visible-xs");
-        </c:when>
+            </c:when>
 
             <c:when test="${selectedPaymentMethod eq 'mbway'}">
                 AdyenCheckoutHybris.initiateMbway("hidden-xs");
                 AdyenCheckoutHybris.initiateMbway("visible-xs");
             </c:when>
 
+            <c:when test="${selectedPaymentMethod eq 'applepay'}">
+                var amountJS = {value: "${amount.value}", currency: "${amount.currency}"};
+                AdyenCheckoutHybris.initiateApplePay(amountJS, "${countryCode}", "${applePayMerchantIdentifier}", "${applePayMerchantName}", "hidden-xs");
+                AdyenCheckoutHybris.initiateApplePay(amountJS, "${countryCode}", "${applePayMerchantIdentifier}", "${applePayMerchantName}", "visible-xs");
+            </c:when>
+
             <%-- API only payments methods --%>
             <c:otherwise>
                 AdyenCheckoutHybris.configureButton($( "#placeOrderForm-hidden-xs" ), true, "hidden-xs");
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 674ebfbc9..9b90a4878 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/3.18.2/adyen.js"></script>
+        <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.19.0/adyen.js"></script>
         <link rel="stylesheet" href="https://checkoutshopper-live.adyen.com/checkoutshopper/css/chckt-default-v1.css"/>
-        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.18.2/adyen.css"/>
+        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.19.0/adyen.css"/>
 
         <script type="text/javascript">
             AdyenCheckoutHybris.initiateCheckout( "${shopperLocale}", "${environmentMode}", "${clientKey}" );
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/css/adyenv6b2ccheckoutaddon.css b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/css/adyenv6b2ccheckoutaddon.css
index e5e1a8139..525ccd2c6 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/css/adyenv6b2ccheckoutaddon.css
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/css/adyenv6b2ccheckoutaddon.css
@@ -92,4 +92,10 @@ div#section_break {
     padding: 5px;
     margin: 10px 0 5px;
     clear: both;
+}
+
+@supports not (-webkit-appearance: -apple-pay-button) {
+    .chckt-pm-applepay {
+        display: none;
+    }
 }
\ No newline at end of file
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 14b87d71a..4d72c9d95 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
@@ -12,7 +12,9 @@ var AdyenCheckoutHybris = (function () {
 
     var ErrorMessages = {
         PaymentCancelled: 'checkout.error.authorization.payment.cancelled',
-        PaymentError: 'checkout.error.authorization.payment.error'
+        PaymentError: 'checkout.error.authorization.payment.error',
+        PaymentNotAvailable: 'checkout.summary.component.notavailable',
+        TermsNotAccepted: 'checkout.error.terms.not.accepted'
     };
 
     return {
@@ -301,7 +303,7 @@ var AdyenCheckoutHybris = (function () {
         },
 
         initiatePaypal: function (amount, isImmediateCapture, paypalMerchantId, label) {
-            var paypalNode = document.getElementById('adyen-paypal-container-' + label);
+            var paypalNode = document.getElementById('adyen-component-button-container-' + label);
 
             var adyenComponent = this.checkout.create("paypal", {
                 environment: this.checkout.options.environment,
@@ -343,6 +345,54 @@ var AdyenCheckoutHybris = (function () {
             }
         },
 
+        initiateApplePay: function (amount, countryCode, applePayMerchantIdentifier, applePayMerchantName, label) {
+            var applePayNode = document.getElementById('adyen-component-button-container-' + label);
+            var adyenComponent = this.checkout.create("applepay", {
+                amount: {
+                    currency: amount.currency,
+                    value: amount.value
+                },
+                countryCode: countryCode,
+                configuration: {
+                    merchantName: applePayMerchantName,
+                    merchantIdentifier: applePayMerchantIdentifier
+                },
+                // Button config
+                buttonType: "plain",
+                buttonColor: "black",
+                onChange: (state, component) => {
+                    if (!state.isValid) {
+                        this.enablePlaceOrder(label);
+                    }
+                },
+                onSubmit: (state, component) => {
+                    if (!state.isValid) {
+                        this.enablePlaceOrder(label);
+                        return false;
+                    }
+                    this.makePayment(state.data.paymentMethod, component, this.handleResult, label);
+                },
+                onClick: (resolve, reject) => {
+                    if (this.isTermsAccepted(label)) {
+                        resolve();
+                    } else {
+                        reject();
+                        this.handleResult(ErrorMessages.TermsNotAccepted, true);
+                    }
+                }
+            });
+
+            adyenComponent.isAvailable()
+                .then(() => {
+                    adyenComponent.mount(applePayNode);
+                })
+                .catch(e => {
+                    // Apple Pay is not available
+                    console.log('Something went wrong trying to mount the Apple Pay component: ' + e);
+                    this.handleResult(ErrorMessages.PaymentNotAvailable, true);
+                });
+        },
+
         initiateMbway: function (label) {
             var mbwayNode = document.getElementById('adyen-component-container-' + label);
 
@@ -403,6 +453,8 @@ var AdyenCheckoutHybris = (function () {
                         var response = JSON.parse(data);
                         if (response.resultCode && response.resultCode === 'Pending' && response.action) {
                             component.handleAction(response.action);
+                        } else if (response.resultCode && response.resultCode === 'Authorised') {
+                            handleResult(response, false);
                         } else {
                             handleResult(ErrorMessages.PaymentError, true);
                         }
@@ -454,6 +506,10 @@ var AdyenCheckoutHybris = (function () {
             })
         },
 
+        isTermsAccepted: function(label) {
+            return document.getElementById('terms-conditions-check-' + label).checked;
+        },
+
         handleResult: function (data, error) {
             if (error) {
                 document.querySelector("#resultData").value = data;
diff --git a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
index 3ce0af0e2..f53d86b31 100644
--- a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
+++ b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6b2ccheckoutaddon
 releasedate=20170509 1903
 vendor=adyen
-version=9.0.0
-version.api=9.0.0
+version=9.1.0
+version.api=9.1.0
diff --git a/adyenv6backoffice/resources/adyenv6backoffice.build.number b/adyenv6backoffice/resources/adyenv6backoffice.build.number
index 523b3f365..41fe95ecf 100644
--- a/adyenv6backoffice/resources/adyenv6backoffice.build.number
+++ b/adyenv6backoffice/resources/adyenv6backoffice.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6backoffice
 releasedate=20170509 1903
 vendor=adyen
-version=9.0.0
-version.api=9.0.0
+version=9.1.0
+version.api=9.1.0
diff --git a/adyenv6core/resources/adyenv6core-beans.xml b/adyenv6core/resources/adyenv6core-beans.xml
index 202e2df64..d1e677ca3 100644
--- a/adyenv6core/resources/adyenv6core-beans.xml
+++ b/adyenv6core/resources/adyenv6core-beans.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ [y] hybris Platform
-  ~ 
+  ~
   ~ Copyright (c) 2000-2016 SAP SE
   ~ All rights reserved.
-  ~ 
-  ~ This software is the confidential and proprietary information of SAP 
-  ~ Hybris ("Confidential Information"). You shall not disclose such 
-  ~ Confidential Information and shall use it only in accordance with the 
+  ~
+  ~ This software is the confidential and proprietary information of SAP
+  ~ Hybris ("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 Hybris.
   -->
 
@@ -38,6 +38,8 @@
         <property name="adyenTerminalId" type="java.lang.String"/>
         <property name="adyenBrowserInfo" type="java.lang.String"/>
         <property name="adyenBillingAddress" type="de.hybris.platform.commercefacades.user.data.AddressData"/>
+        <property name="adyenApplePayMerchantName" type="java.lang.String"/>
+        <property name="adyenApplePayMerchantIdentifier" type="java.lang.String"/>
     </bean>
 
     <bean class="de.hybris.platform.commercefacades.order.data.AbstractOrderData">
@@ -73,6 +75,8 @@
         <property name="terminalId" type="String" />
         <property name="adyenLastName" type="String" />
         <property name="adyenBillingAddress" type="de.hybris.platform.commercewebservicescommons.dto.user.AddressWsDTO"/>
+        <property name="adyenApplePayMerchantName" type="java.lang.String"/>
+        <property name="adyenApplePayMerchantIdentifier" type="java.lang.String"/>
     </bean>
 
     <bean class="de.hybris.platform.commercewebservicescommons.dto.order.AbstractOrderWsDTO">
diff --git a/adyenv6core/resources/adyenv6core-items.xml b/adyenv6core/resources/adyenv6core-items.xml
index f9be6835e..ebb2c8c9d 100644
--- a/adyenv6core/resources/adyenv6core-items.xml
+++ b/adyenv6core/resources/adyenv6core-items.xml
@@ -64,6 +64,15 @@
                         </columntype>
                     </persistence>
                 </attribute>
+                <!-- Apple Pay -->
+                <attribute qualifier="adyenApplePayMerchantName" type="java.lang.String">
+                    <description>Apple Pay merchant name</description>
+                    <persistence type="property"/>
+                </attribute>
+                <attribute qualifier="adyenApplePayMerchantIdentifier" type="java.lang.String">
+                    <description>Apple Pay merchant identifier</description>
+                    <persistence type="property"/>
+                </attribute>
             </attributes>
         </itemtype>
 
@@ -414,6 +423,16 @@
                         </columntype>
                     </persistence>
                 </attribute>
+                <!-- Apple Pay -->
+                <attribute qualifier="adyenApplePayMerchantName" type="java.lang.String">
+                    <description>Apple Pay merchant name</description>
+                    <persistence type="property"/>
+                </attribute>
+                <attribute qualifier="adyenApplePayMerchantIdentifier" type="java.lang.String">
+                    <description>Apple Pay merchant identifier</description>
+                    <persistence type="property"/>
+                </attribute>
+
                 <attribute qualifier="encryptedCardNumber" type="java.lang.String">
                     <description>Adyen Encrypted Card Number</description>
                     <persistence type="property">
diff --git a/adyenv6core/resources/adyenv6core.build.number b/adyenv6core/resources/adyenv6core.build.number
index c28a19153..b0eb618f3 100644
--- a/adyenv6core/resources/adyenv6core.build.number
+++ b/adyenv6core/resources/adyenv6core.build.number
@@ -6,5 +6,5 @@ group.id=com.adyen.v6
 module.name=platform-module
 name=adyenv6core
 vendor=adyen
-version=9.0.0
-version.api=9.0.0
+version=9.1.0
+version.api=9.1.0
diff --git a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
index 3230580d0..b4ca31cc5 100644
--- a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
+++ b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
@@ -31,7 +31,7 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	public static final String EXTENSIONNAME = "adyenv6core";
 
 	public static final String PLUGIN_NAME = "adyen-hybris";
-	public static final String PLUGIN_VERSION = "9.0.0";
+	public static final String PLUGIN_VERSION = "9.1.0";
 	public static final String PAYMENT_PROVIDER = "Adyen";
 	public static final String PAYMENT_METHOD ="paymentMethod";
 
@@ -46,6 +46,8 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	final public static String PAYMENT_METHOD_POS = "pos";
 	final public static String PAYMENT_METHOD_PAYPAL = "paypal";
 	final public static String PAYMENT_METHOD_SCHEME = "scheme";
+	final public static String PAYMENT_METHOD_APPLEPAY = "applepay";
+
 
 	public static final String PROCESS_EVENT_ADYEN_CAPTURED = "AdyenCaptured";
 	public static final String PROCESS_EVENT_ADYEN_PAYMENT_RESULT = "AdyenPaymentResult";
diff --git a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
index c635cdbcc..77da0b5b7 100644
--- a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
@@ -144,6 +144,7 @@
 import static com.adyen.v6.constants.Adyenv6coreConstants.OPENINVOICE_METHODS_ALLOW_SOCIAL_SECURITY_NUMBER;
 import static com.adyen.v6.constants.Adyenv6coreConstants.OPENINVOICE_METHODS_API;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD;
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_APPLEPAY;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_CC;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_MULTIBANCO;
@@ -223,6 +224,9 @@ public class DefaultAdyenCheckoutFacade implements AdyenCheckoutFacade {
     public static final String MODEL_AMOUNT = "amount";
     public static final String MODEL_IMMEDIATE_CAPTURE = "immediateCapture";
     public static final String MODEL_PAYPAL_MERCHANT_ID = "paypalMerchantId";
+    public static final String MODEL_COUNTRY_CODE = "countryCode";
+    public static final String MODEL_APPLEPAY_MERCHANT_IDENTIFIER = "applePayMerchantIdentifier";
+    public static final String MODEL_APPLEPAY_MERCHANT_NAME = "applePayMerchantName";
     public static final String ECOMMERCE_SHOPPER_INTERACTION = "Ecommerce";
 
     protected static final Set<String> HPP_RESPONSE_PARAMETERS = new HashSet<>(Arrays.asList(HPPConstants.Response.MERCHANT_REFERENCE,
@@ -528,14 +532,16 @@ public PaymentsResponse componentPayment(final HttpServletRequest request, final
         requestInfo.setShopperLocale(getShopperLocale());
 
         PaymentsResponse paymentsResponse = getAdyenPaymentService().componentPayment(cartData, paymentMethodDetails, requestInfo, customer);
-        if (PaymentsResponse.ResultCodeEnum.PENDING != paymentsResponse.getResultCode()) {
-            throw new AdyenNonAuthorizedPaymentException(paymentsResponse);
+        if (PaymentsResponse.ResultCodeEnum.PENDING == paymentsResponse.getResultCode()) {
+            placePendingOrder(paymentsResponse.getResultCode());
+            return paymentsResponse;
+        }
+        if (PaymentsResponse.ResultCodeEnum.AUTHORISED == paymentsResponse.getResultCode()) {
+            createAuthorizedOrder(paymentsResponse);
+            return paymentsResponse;
         }
 
-        //Lock the cart to prevent changes while the payment is pending
-        placePendingOrder(paymentsResponse.getResultCode());
-
-        return paymentsResponse;
+        throw new AdyenNonAuthorizedPaymentException(paymentsResponse);
     }
 
     @Override
@@ -844,6 +850,19 @@ public void initializeCheckoutData(Model model) {
             model.addAttribute(PAYMENT_METHOD_SEPA_DIRECTDEBIT, true);
         }
 
+        //apple pay
+        Optional<PaymentMethod> applePayMethod = alternativePaymentMethods.stream()
+                .filter(paymentMethod -> !paymentMethod.getType().isEmpty()
+                        && PAYMENT_METHOD_APPLEPAY.contains(paymentMethod.getType()))
+                .findFirst();
+        if(applePayMethod.isPresent()) {
+            Map<String, String> applePayConfiguration = applePayMethod.get().getConfiguration();
+            if(!CollectionUtils.isEmpty(applePayConfiguration)) {
+                cartModel.setAdyenApplePayMerchantName(applePayConfiguration.get("merchantName"));
+                cartModel.setAdyenApplePayMerchantIdentifier(applePayConfiguration.get("merchantId"));
+            }
+        }
+
         baseStore = baseStoreService.getCurrentBaseStore();
 
         //Verify allowedCards
@@ -876,7 +895,6 @@ public void initializeCheckoutData(Model model) {
                 recurringDetailReferences = storedPaymentMethodList.stream().map(StoredPaymentMethod::getId).collect(Collectors.toSet());
             }
             cartModel.setAdyenStoredCards(recurringDetailReferences);
-
         }
 
         Amount amount = Util.createAmount(cartData.getTotalPrice().getValue(), cartData.getTotalPrice().getCurrencyIso());
@@ -945,6 +963,10 @@ public void initializeSummaryData(Model model) {
         model.addAttribute(MODEL_AMOUNT, amount);
         model.addAttribute(MODEL_IMMEDIATE_CAPTURE, isImmediateCapture());
         model.addAttribute(MODEL_PAYPAL_MERCHANT_ID, baseStore.getAdyenPaypalMerchantId());
+        model.addAttribute(MODEL_APPLEPAY_MERCHANT_IDENTIFIER, cartData.getAdyenApplePayMerchantIdentifier());
+        model.addAttribute(MODEL_APPLEPAY_MERCHANT_NAME, cartData.getAdyenApplePayMerchantName());
+        model.addAttribute(MODEL_COUNTRY_CODE, cartData.getDeliveryAddress().getCountry().getIsocode());
+
     }
 
     private boolean isHiddenPaymentMethod(PaymentMethod paymentMethod) {
@@ -1085,11 +1107,15 @@ public PaymentInfoModel createPaymentInfo(final CartModel cartModel, AdyenPaymen
         //pos field(s)
         paymentInfo.setAdyenTerminalId(adyenPaymentForm.getTerminalId());
 
+        //apple pay
+        paymentInfo.setAdyenApplePayMerchantName(cartModel.getAdyenApplePayMerchantName());
+        paymentInfo.setAdyenApplePayMerchantIdentifier(cartModel.getAdyenApplePayMerchantIdentifier());
+
         //combo card fields
         paymentInfo.setCardType(adyenPaymentForm.getCardType());
         paymentInfo.setCardBrand(adyenPaymentForm.getCardBrand());
 
-         modelService.save(paymentInfo);
+        modelService.save(paymentInfo);
 
         return paymentInfo;
     }
diff --git a/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java b/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
index 4f179709e..64cf6573d 100644
--- a/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
+++ b/adyenv6core/src/com/adyen/v6/populator/CartPopulator.java
@@ -57,6 +57,8 @@ public void populate(final CartModel source, final CartData target) throws Conve
             target.setAdyenBrowserInfo(paymentInfo.getAdyenBrowserInfo());
             target.setAdyenSepaOwnerName(paymentInfo.getAdyenSepaOwnerName());
             target.setAdyenSepaIbanNumber(paymentInfo.getAdyenSepaIbanNumber());
+            target.setAdyenApplePayMerchantName(paymentInfo.getAdyenApplePayMerchantName());
+            target.setAdyenApplePayMerchantIdentifier(paymentInfo.getAdyenApplePayMerchantIdentifier());
         }
     }
 
diff --git a/adyenv6core/src/com/adyen/v6/service/AdyenNotificationService.java b/adyenv6core/src/com/adyen/v6/service/AdyenNotificationService.java
index f1a38d857..5b1cb1611 100644
--- a/adyenv6core/src/com/adyen/v6/service/AdyenNotificationService.java
+++ b/adyenv6core/src/com/adyen/v6/service/AdyenNotificationService.java
@@ -29,6 +29,7 @@
  * Service for Adyen notifications manipulation
  */
 public interface AdyenNotificationService {
+
     /**
      * Process NotificationItemModel
      * Handles multiple eventCodes
@@ -69,4 +70,11 @@ public interface AdyenNotificationService {
      * Process notification with eventCode=REFUND
      */
     PaymentTransactionEntryModel processRefundEvent(NotificationItemModel notificationItem);
+
+    /**
+     * Process notification with eventCode=OFFER_CLOSED
+     * @return
+     */
+    PaymentTransactionModel processOfferClosedEvent(NotificationItemModel notificationItem);
+
 }
diff --git a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenNotificationService.java b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenNotificationService.java
index 4f81fcf94..306a1afce 100644
--- a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenNotificationService.java
+++ b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenNotificationService.java
@@ -23,7 +23,9 @@
 import java.util.Date;
 import java.util.UUID;
 
-import com.adyen.v6.facades.AdyenCheckoutFacade;
+import de.hybris.platform.core.enums.OrderStatus;
+import de.hybris.platform.payment.dto.TransactionStatus;
+import de.hybris.platform.payment.enums.PaymentTransactionType;
 import org.apache.log4j.Logger;
 import com.adyen.model.notification.NotificationRequest;
 import com.adyen.model.notification.NotificationRequestItem;
@@ -34,19 +36,12 @@
 import com.adyen.v6.repository.OrderRepository;
 import com.adyen.v6.repository.PaymentTransactionRepository;
 import com.google.gson.Gson;
-import de.hybris.platform.commerceservices.enums.SalesApplication;
 import de.hybris.platform.commerceservices.order.CommercePlaceOrderStrategy;
-import de.hybris.platform.commerceservices.service.data.CommerceCheckoutParameter;
-import de.hybris.platform.commerceservices.service.data.CommerceOrderResult;
-import de.hybris.platform.core.model.order.CartModel;
 import de.hybris.platform.core.model.order.OrderModel;
-import de.hybris.platform.order.InvalidCartException;
 import de.hybris.platform.payment.dto.TransactionStatusDetails;
 import de.hybris.platform.payment.model.PaymentTransactionEntryModel;
 import de.hybris.platform.payment.model.PaymentTransactionModel;
-import de.hybris.platform.servicelayer.internal.i18n.I18NConstants;
 import de.hybris.platform.servicelayer.model.ModelService;
-import de.hybris.platform.servicelayer.session.SessionExecutionBody;
 import de.hybris.platform.servicelayer.session.SessionService;
 
 public class DefaultAdyenNotificationService implements AdyenNotificationService {
@@ -195,6 +190,61 @@ public PaymentTransactionEntryModel processRefundEvent(NotificationItemModel not
         return paymentTransactionEntryModel;
     }
 
+    @Override
+    public PaymentTransactionModel processOfferClosedEvent(NotificationItemModel notificationItemModel) {
+        String orderCode = notificationItemModel.getMerchantReference();
+        if(!notificationItemModel.getSuccess()) {
+            LOG.warn("Order " + orderCode + " received unexpected OFFER_CLOSED event with success=false");
+            return null;
+        }
+
+        OrderModel orderModel = orderRepository.getOrderModel(orderCode);
+        if (orderModel == null) {
+            LOG.warn("Order " + orderCode + " was not found, skipping OFFER_CLOSED event...");
+            return null;
+        }
+        if (isOrderAuthorized(orderModel)) {
+            LOG.warn("Order " + orderCode + " already authorised, skipping OFFER_CLOSED event...");
+            return null;
+        }
+        if (OrderStatus.CANCELLED.equals(orderModel.getStatus()) || OrderStatus.PROCESSING_ERROR.equals(orderModel.getStatus())) {
+            LOG.warn("Order " + orderCode + " already cancelled, skipping OFFER_CLOSED event...");
+            return null;
+        }
+
+        orderModel.setStatus(OrderStatus.PROCESSING_ERROR);
+        orderModel.setStatusInfo("Adyen OFFER_CLOSED: " + notificationItemModel.getPspReference());
+        getModelService().save(orderModel);
+
+        return adyenTransactionService.storeFailedAuthorizationFromNotification(notificationItemModel, orderModel);
+    }
+
+    private boolean isTransactionAuthorized(final PaymentTransactionModel paymentTransactionModel) {
+        for (final PaymentTransactionEntryModel entry : paymentTransactionModel.getEntries()) {
+            if (entry.getType().equals(PaymentTransactionType.AUTHORIZATION)
+                    && TransactionStatus.ACCEPTED.name().equals(entry.getTransactionStatus())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private boolean isOrderAuthorized(final OrderModel order) {
+        if(order.getPaymentTransactions() == null || order.getPaymentTransactions().isEmpty()) {
+            return false;
+        }
+
+        //A single not authorized transaction means not authorized
+        for (final PaymentTransactionModel paymentTransactionModel : order.getPaymentTransactions()) {
+            if (!isTransactionAuthorized(paymentTransactionModel)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     @Override
     public void processNotification(NotificationItemModel notificationItemModel) {
         PaymentTransactionModel paymentTransaction;
@@ -218,6 +268,9 @@ public void processNotification(NotificationItemModel notificationItemModel) {
             case NotificationRequestItem.EVENT_CODE_REFUND:
                 processRefundEvent(notificationItemModel);
                 break;
+            case NotificationRequestItem.EVENT_CODE_OFFER_CLOSED:
+                processOfferClosedEvent(notificationItemModel);
+                break;
         }
     }
 
diff --git a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
index 98130cb8d..6f9598ff3 100644
--- a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
+++ b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
@@ -6,5 +6,5 @@ group.id=com.adyen.v6
 module.name=platform-module
 name=adyenv6fulfilmentprocess
 vendor=adyen
-version=9.0.0
-version.api=9.0.0
+version=9.1.0
+version.api=9.1.0
diff --git a/adyenv6notification/resources/adyenv6notification.build.number b/adyenv6notification/resources/adyenv6notification.build.number
index 790e26370..34cb53729 100644
--- a/adyenv6notification/resources/adyenv6notification.build.number
+++ b/adyenv6notification/resources/adyenv6notification.build.number
@@ -5,5 +5,5 @@ description=adyenv6notification
 name=adyenv6notification
 releasedate=20170803 1323
 vendor=adyen
-version=9.0.0
-version.api=9.0.0
+version=9.1.0
+version.api=9.1.0
diff --git a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
index 5e56e6195..4ebe3cb0a 100644
--- a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
+++ b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6ordermanagement
 releasedate=20170509 1754
 vendor=adyen
-version=9.0.0
-version.api=9.0.0
+version=9.1.0
+version.api=9.1.0