diff --git a/README.md b/README.md
index f88ddf59c..e9f5e8183 100644
--- a/README.md
+++ b/README.md
@@ -89,16 +89,6 @@ Ratepay is supported via Adyen API.
 ### Pix
 [Pix](https://docs.adyen.com/payment-methods/pix) is supported via Adyen component and API.
 
-### Paypal Express Checkout Shortcut
-
-Requires both Adyen API and HPP credentials.
-
-The plugin offers:
- - a facade (AdyenPaypalFacade) that takes care of the communication from and to Adyen regarding Paypal ECS
- - a default controller that given a valid Cart, can initiate such payment "/en/adyen/paypal-ecs/initialize"
-
-More details can be found here: https://docs.adyen.com/developers/payment-methods/paypal/express-checkout-shortcut
-
 ### Other alternative payment methods
 
 Supported via Adyen Checkout.
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 06df9b71c..599f209aa 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
@@ -61,11 +61,14 @@
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import static com.adyen.v6.constants.AdyenControllerConstants.COMPONENT_PREFIX;
 import static com.adyen.v6.constants.AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_AMAZONPAY;
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BCMC_MOBILE;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_PIX;
 
 @RestController
@@ -88,6 +91,10 @@ public class AdyenComponentController {
     @Resource(name = "baseSiteService")
     private BaseSiteService baseSiteService;
 
+    private final List<String> PAYMENT_METHODS_WITH_VALIDATED_TERMS = Arrays.asList(PAYMENT_METHOD_AMAZONPAY,
+                                                                                PAYMENT_METHOD_BCMC_MOBILE,
+                                                                                PAYMENT_METHOD_PIX);
+
     @RequestMapping(value = "/payment", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
     public String componentPayment(final HttpServletRequest request) throws AdyenComponentException {
@@ -112,9 +119,9 @@ public String componentPayment(final HttpServletRequest request) throws AdyenCom
                 paymentMethodDetails = gson.fromJson(requestJson.get("paymentMethodDetails"), GooglePayDetails.class);
             } else if(AmazonPayDetails.AMAZONPAY.equals(paymentMethod)) {
                 paymentMethodDetails = gson.fromJson(requestJson.get("paymentMethodDetails"), AmazonPayDetails.class);
-            } else if(PAYMENT_METHOD_PIX.equals(paymentMethod)) {
+            } else if(PAYMENT_METHOD_PIX.equals(paymentMethod) || PAYMENT_METHOD_BCMC_MOBILE.equals(paymentMethod)) {
                 paymentMethodDetails = new DefaultPaymentMethodDetails();
-                paymentMethodDetails.setType(PAYMENT_METHOD_PIX);
+                paymentMethodDetails.setType(paymentMethod);
             } else {
                 throw new InvalidCartException("checkout.error.paymentethod.formentry.invalid");
             }
@@ -180,8 +187,8 @@ protected void validateOrderForm(JsonObject requestJson) throws InvalidCartExcep
         JsonObject paymentMethodDetails = requestJson.get("paymentMethodDetails").getAsJsonObject();
         String paymentMethod = gson.fromJson(paymentMethodDetails.get("type"), String.class);
 
-        // Pix and Amazon already have the terms validated on a previous step
-        if(!PAYMENT_METHOD_PIX.equals(paymentMethod) && !PAYMENT_METHOD_AMAZONPAY.equals(paymentMethod)
+        // Some methods already have the terms validated on a previous step
+        if (!PAYMENT_METHODS_WITH_VALIDATED_TERMS.contains(paymentMethod)
                 && (termsCheck == null || !termsCheck)) {
             throw new InvalidCartException("checkout.error.terms.not.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 b6617b48d..f1abbb23e 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
@@ -84,6 +84,7 @@
 import static com.adyen.v6.constants.AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX;
 import static com.adyen.v6.constants.Adyenv6coreConstants.AFTERPAY_TOUCH;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_APPLEPAY;
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BCMC;
 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;
@@ -102,7 +103,7 @@ public class AdyenSummaryCheckoutStepController extends AbstractCheckoutStepCont
 
     private final static String SUMMARY = "summary";
     private static final String AUTHORISE_3D_SECURE_PAYMENT_URL = "/authorise-3d-adyen-response";
-    private static final String HPP_RESULT_URL = "/hpp-adyen-response";
+    private static final String CHECKOUT_RESULT_URL = "/checkout-adyen-response";
     private static final String REDIRECT_RESULT = "redirectResult";
     private static final String ACTION = "action";
 
@@ -342,7 +343,7 @@ public String authorise3DSPayment(final RedirectAttributes redirectModel,
         return REDIRECT_PREFIX + CART_PREFIX;
     }
 
-    @RequestMapping(value = HPP_RESULT_URL, method = RequestMethod.GET)
+    @RequestMapping(value = CHECKOUT_RESULT_URL, method = RequestMethod.GET)
     @RequireHardLogIn
     public String handleAdyenResponse(final HttpServletRequest request, final RedirectAttributes redirectModel) {
         String redirectResult = request.getParameter(REDIRECT_RESULT);
@@ -423,7 +424,7 @@ private void addMultibancoMessage(RedirectAttributes redirectModel, final String
 
 
     private boolean is3DSPaymentMethod(String adyenPaymentMethod) {
-        return adyenPaymentMethod.equals(PAYMENT_METHOD_CC) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0;
+        return adyenPaymentMethod.equals(PAYMENT_METHOD_CC) || adyenPaymentMethod.equals(PAYMENT_METHOD_BCMC) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0;
     }
 
     private String redirectToSelectPaymentMethodWithError(final RedirectAttributes redirectModel, final String messageKey) {
@@ -455,7 +456,7 @@ private String getReturnUrl(String adyenPaymentMethod) {
         if (is3DSPaymentMethod(adyenPaymentMethod)) {
             url = SUMMARY_CHECKOUT_PREFIX + AUTHORISE_3D_SECURE_PAYMENT_URL;
         } else {
-            url = SUMMARY_CHECKOUT_PREFIX + HPP_RESULT_URL;
+            url = SUMMARY_CHECKOUT_PREFIX + CHECKOUT_RESULT_URL;
         }
         BaseSiteModel currentBaseSite = baseSiteService.getCurrentBaseSite();
 
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
index 154fee068..92e012792 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
@@ -36,4 +36,4 @@ payment.method.telephonenumber=Phone Number
 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
-checkout.summary.component.pix.generateqr = Generate QR Code
\ No newline at end of file
+checkout.summary.component.generateqr = Generate QR Code
\ No newline at end of file
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 154fee068..92e012792 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_en.properties
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_en.properties
@@ -36,4 +36,4 @@ payment.method.telephonenumber=Phone Number
 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
-checkout.summary.component.pix.generateqr = Generate QR Code
\ No newline at end of file
+checkout.summary.component.generateqr = Generate QR Code
\ No newline at end of file
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_pt.properties b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_pt.properties
index 23d945d12..ec926c6c1 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_pt.properties
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base_pt.properties
@@ -34,4 +34,4 @@ payment.method.terminal.selector=Selecione o terminal
 payment.method.telephonenumber=Número de telefone
 
 checkout.summary.spinner.message=Aguarde...
-checkout.summary.component.pix.generateqr = Gerar QR Code
\ No newline at end of file
+checkout.summary.component.generateqr = Gerar QR Code
\ No newline at end of file
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag
index cba7eeaae..f2038403c 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/alternativeMethod.tag
@@ -145,6 +145,10 @@
             <c:if test="${brandCode eq 'afterpay_default'}">
                 <div id="afterpay-container"></div>
             </c:if>
+
+            <c:if test="${brandCode eq 'bcmc'}">
+                <div id="bcmc-container"></div>
+            </c:if>
         </div>
     </div>
 </div>
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 6c0d94cc1..2b1d54b5b 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
@@ -10,10 +10,11 @@
 <spring:url value="/checkout/multi/adyen/summary/placeOrder" var="placeOrderUrl"/>
 <spring:url value="/checkout/multi/termsAndConditions" var="getTermsAndConditionsUrl"/>
 
-<c:set var="componentsWithPayButton" value="amazonpay,applepay,paypal,paywithgoogle,pix" />
+<c:set var="componentsWithPayButton" value="[amazonpay],[applepay],[paypal],[paywithgoogle],[pix],[bcmc_mobile]" />
+<c:set var="componentPaymentMethod" value="[${selectedPaymentMethod}]" />
 
 <%-- Components --%>
-<c:if test="${fn:contains(componentsWithPayButton, selectedPaymentMethod)}">
+<c:if test="${fn:contains(componentsWithPayButton, componentPaymentMethod)}">
     <div class="checkbox">
         <label>
             <input type="checkbox" id="terms-conditions-check-${label}" />
@@ -23,12 +24,12 @@
     </div>
 
     <c:choose>
-        <c:when test="${selectedPaymentMethod eq 'pix'}">
-            <%-- Render Pix QR code --%>
+        <c:when test="${componentPaymentMethod eq '[pix]' || componentPaymentMethod eq '[bcmc_mobile]'}">
+            <%-- Render QR code --%>
             <button id="generateqr-${label}" type="submit" class="btn btn-primary btn-block">
-                <spring:theme code="checkout.summary.component.pix.generateqr" text="Generate QR Code" />
+                <spring:theme code="checkout.summary.component.generateqr" text="Generate QR Code" />
             </button>
-            <div id="pix-container-${label}"></div>
+            <div id="qrcode-container-${label}"></div>
         </c:when>
         <c:otherwise>
             <%-- Render payment button --%>
@@ -37,7 +38,7 @@
     </c:choose>
 </c:if>
 
-<c:if test="${selectedPaymentMethod eq 'mbway'}">
+<c:if test="${componentPaymentMethod eq '[mbway]'}">
     <div class="chckt-pm__header js-chckt-pm__header">
         <spring:theme code="checkout.summary.component.mbway.payment"/>
     </div>
@@ -45,7 +46,7 @@
 </c:if>
 
 <%-- For components that do not have it's own button --%>
-<c:if test="${not fn:contains(componentsWithPayButton, selectedPaymentMethod)}">
+<c:if test="${not fn:contains(componentsWithPayButton, componentPaymentMethod)}">
     <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 f34fe258f..ceb3174ac 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
@@ -60,7 +60,12 @@
                 var amountJS = {value: "${amount.value}", currency: "${amount.currency}"};
                 AdyenCheckoutHybris.initiateAmazonPay(amountJS, ${deliveryAddress}, ${amazonPayConfiguration});
             </c:when>
-
+        
+            <c:when test="${selectedPaymentMethod eq 'bcmc_mobile'}">
+                AdyenCheckoutHybris.initiateBcmcMobile("hidden-xs");
+                AdyenCheckoutHybris.initiateBcmcMobile("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 1b7c95349..8ef99fde4 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
@@ -80,6 +80,9 @@
                 <c:if test="${paymentMethod.type eq 'afterpay_default'}">
                     AdyenCheckoutHybris.initiateAfterPay("${countryCode}");
                 </c:if>
+                <c:if test="${paymentMethod.type eq 'bcmc'}">
+                    AdyenCheckoutHybris.initiateBcmc("${countryCode}");
+                </c:if>
             </c:forEach>
 
             <c:forEach items="${storedCards}" var="storedCard">
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 85f861a8c..33f44bc0c 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
@@ -29,6 +29,7 @@ var AdyenCheckoutHybris = (function () {
         selectedCardBrand: null,
         sepaDirectDebit:null,
         afterPay: null,
+        bcmc: null,
 
         convertCardBrand: function () {
             var cardBrand = this.selectedCardBrand;
@@ -148,6 +149,24 @@ var AdyenCheckoutHybris = (function () {
             if (paymentMethod === "giftcard") {
                 $( 'input[name="giftCardBrand"]' ).val($( 'input[type=radio][name=paymentMethod]:checked' ).attr('brand'));
             }
+            
+            if (paymentMethod === "bcmc") {
+                if (!this.bcmc.state.isValid) {
+                    window.alert("Please fill all the details");
+                    this.bcmc.showValidation();
+                    document.getElementById("bcmc-container").scrollIntoView();
+                    return false;
+                }
+                var state = this.bcmc.data.paymentMethod;
+                $( 'input[name="encryptedCardNumber"]' ).val( state.encryptedCardNumber );
+                $( 'input[name="encryptedExpiryMonth"]' ).val( state.encryptedExpiryMonth );
+                $( 'input[name="encryptedExpiryYear"]' ).val( state.encryptedExpiryYear );
+                $( 'input[name="cardHolder"]' ).val( state.holderName );
+                $( 'input[name="cardBrand"]' ).val( 'bcmc' );
+                $( 'input[name="cardType"]' ).val( 'debit' );
+                $( 'input[name="browserInfo"]' ).val( JSON.stringify( this.bcmc.data.browserInfo ) );
+            }
+                        
             return true;
         },
 
@@ -612,7 +631,7 @@ var AdyenCheckoutHybris = (function () {
                                     AdyenCheckoutHybris.hideSpinner();
                                     AdyenCheckoutHybris.submitDetails(state.data, AdyenCheckoutHybris.handleResult);
                                 }
-                            }).mount('#pix-container-' + label);
+                            }).mount('#qrcode-container-' + label);
                             AdyenCheckoutHybris.hideSpinner();
                         }
                     };
@@ -621,6 +640,43 @@ var AdyenCheckoutHybris = (function () {
             });
         },
 
+        initiateBcmc: function () {
+            this.bcmc = this.checkout.create("bcmc", {
+                hasHolderName: true,
+                holderNameRequired: true
+            });
+
+            try {
+                this.bcmc.mount('#bcmc-container');
+            } catch (e) {
+                console.log('Something went wrong trying to mount the BCMC component: ' + e);
+            }
+        },
+
+        initiateBcmcMobile: function (label) {
+            $("#generateqr-" + label).click(function () {
+                AdyenCheckoutHybris.showSpinner();
+                if (!AdyenCheckoutHybris.isTermsAccepted(label)) {
+                    AdyenCheckoutHybris.handleResult(ErrorMessages.TermsNotAccepted, true)
+                } else {
+                    $("#generateqr-" + label).hide();
+                    $(".checkbox").hide();
+                    var actionHandler  = {
+                        handleAction : function (action) {
+                            AdyenCheckoutHybris.checkout.createFromAction(action, {
+                                onAdditionalDetails : function(state) {
+                                    AdyenCheckoutHybris.hideSpinner();
+                                    AdyenCheckoutHybris.submitDetails(state.data, AdyenCheckoutHybris.handleResult);
+                                }
+                            }).mount('#qrcode-container-' + label);
+                            AdyenCheckoutHybris.hideSpinner();
+                        }
+                    };
+                    AdyenCheckoutHybris.makePayment({ type: "bcmc_mobile" }, actionHandler, AdyenCheckoutHybris.handleResult, label);
+                }
+            });
+        },
+
         configureButton: function (form, useSpinner, label) {
             $(document).ready(function () {
                 $("#placeOrder-" + label).click(function () {
diff --git a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
index bc6999c8c..c84e5745e 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=10.1.0
-version.api=10.1.0
+version=10.2.0
+version.api=10.2.0
diff --git a/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java b/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java
index aa9a048b1..223ff352b 100644
--- a/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java
+++ b/adyenv6b2ccheckoutaddon/testsrc/com/adyen/v6/facades/AdyenCheckoutFacadeTest.java
@@ -24,7 +24,6 @@
 import com.adyen.model.checkout.CheckoutPaymentsAction;
 import com.adyen.model.checkout.PaymentsDetailsResponse;
 import com.adyen.model.checkout.PaymentsResponse;
-import com.adyen.util.HMACValidator;
 import com.adyen.v6.converters.PaymentsResponseConverter;
 import com.adyen.v6.exceptions.AdyenNonAuthorizedPaymentException;
 import com.adyen.v6.factory.AdyenPaymentServiceFactory;
@@ -63,16 +62,11 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.security.NoSuchAlgorithmException;
 import java.security.SignatureException;
 import java.util.Collections;
 import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
 
 import static com.adyen.constants.ApiConstants.Redirect.Data.MD;
-import static com.adyen.constants.HPPConstants.Fields.CURRENCY_CODE;
-import static com.adyen.constants.HPPConstants.Fields.PAYMENT_AMOUNT;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_CC;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_ONECLICK;
 import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.SESSION_LOCKED_CART;
@@ -120,9 +114,6 @@ public class AdyenCheckoutFacadeTest {
     @Mock
     private CheckoutCustomerStrategy checkoutCustomerStrategyMock;
 
-    @Mock
-    private HMACValidator hmacValidatorMock;
-
     @Mock
     private AdyenPaymentServiceFactory adyenPaymentServiceFactoryMock;
 
@@ -153,14 +144,9 @@ public void setUp() throws SignatureException, InvalidCartException {
         paymentsDetailsResponseMock = mock(PaymentsDetailsResponse.class);
         CartData cartDataMock = mock(CartData.class);
 
-        when(baseStoreModelMock.getAdyenSkinHMAC()).thenReturn("hmacKey");
         when(baseStoreModelMock.getAdyenMerchantAccount()).thenReturn("merchantAccount");
-        when(baseStoreModelMock.getAdyenSkinCode()).thenReturn("skinCode");
         when(baseStoreServiceMock.getCurrentBaseStore()).thenReturn(baseStoreModelMock);
 
-        when(hmacValidatorMock.calculateHMAC(isA(String.class), isA(String.class))).thenReturn("merchantSig");
-        when(hmacValidatorMock.getDataToSign(isA(SortedMap.class))).thenReturn("dataToSign");
-
         when(cartModelMock.getCode()).thenReturn("code");
         when(cartServiceMock.getSessionCart()).thenReturn(cartModelMock);
 
@@ -217,20 +203,6 @@ public void testLockSessionCart() {
         verify(sessionServiceMock).removeAttribute(SESSION_CART_PARAMETER_NAME);
     }
 
-    @Test
-    public void testValidateHPPResponse() throws NoSuchAlgorithmException, SignatureException {
-        SortedMap<String, String> hppResponseData = new TreeMap<>();
-
-        adyenCheckoutFacade.validateHPPResponse(hppResponseData, "merchantSig");
-
-        try {
-            adyenCheckoutFacade.validateHPPResponse(hppResponseData, "wrongMerchantSig");
-
-            fail("Expected exception!");
-        } catch (SignatureException ignored) {
-        }
-    }
-
     @Test
     public void testAuthorizeCardPayment() throws Exception {
         HttpServletRequest requestMock = mock(HttpServletRequest.class);
@@ -319,16 +291,6 @@ public void testHandle3DResponse() throws Exception {
         }
     }
 
-    @Test
-    public void testInitializeHostedPayment() throws SignatureException, InvalidCartException {
-        CartData cartData = createCartData();
-
-        Map<String, String> hppFormData = adyenCheckoutFacade.initializeHostedPayment(cartData, "redirectUrl");
-
-        assertEquals("1234", hppFormData.get(PAYMENT_AMOUNT));
-        assertEquals("EUR", hppFormData.get(CURRENCY_CODE));
-    }
-
     private CartData createCartData() {
         CartData cartData = new CartData();
 
diff --git a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
index d30b50393..b79b87743 100644
--- a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
+++ b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
@@ -45,10 +45,6 @@
 					<editorArea:attribute qualifier="adyenPosStoreId"/>
 					<editorArea:attribute qualifier="adyenPosRecurringContractMode"/>
 				</editorArea:section>
-				<editorArea:section name="hmc.adyen.hpp">
-					<editorArea:attribute qualifier="adyenSkinCode"/>
-					<editorArea:attribute qualifier="adyenSkinHMAC" editor="com.hybris.cockpitng.editor.defaultpassword"/>
-				</editorArea:section>
 				<editorArea:section name="hmc.adyen.advanced">
 					<editorArea:attribute qualifier="adyenBoleto"/>
 					<editorArea:attribute qualifier="adyenPaypalMerchantId"/>
diff --git a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-labels/labels_en.properties b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-labels/labels_en.properties
index d6dff5f40..043194abb 100644
--- a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-labels/labels_en.properties
+++ b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-labels/labels_en.properties
@@ -21,6 +21,5 @@ hmc.adyen=Adyen
 hmc.adyen.account=Account Settings
 hmc.adyen.notifications=Server Notification Settings
 hmc.adyen.api=API Settings
-hmc.adyen.hpp=Hosted Payment Pages Settings
 hmc.adyen.advanced=Advanced Settings
 hmc.adyen.pos=POS settings
diff --git a/adyenv6backoffice/resources/adyenv6backoffice.build.number b/adyenv6backoffice/resources/adyenv6backoffice.build.number
index fef83e621..9b786070d 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=10.1.0
-version.api=10.1.0
+version=10.2.0
+version.api=10.2.0
diff --git a/adyenv6core/resources/adyenv6core-items.xml b/adyenv6core/resources/adyenv6core-items.xml
index 2111ef615..653b2726b 100644
--- a/adyenv6core/resources/adyenv6core-items.xml
+++ b/adyenv6core/resources/adyenv6core-items.xml
@@ -190,15 +190,6 @@
                     <description>Merchant account name</description>
                     <persistence type="property"/>
                 </attribute>
-                <attribute qualifier="adyenSkinCode" type="java.lang.String">
-                    <description>HPP skin code</description>
-                    <persistence type="property"/>
-                </attribute>
-                <attribute qualifier="adyenSkinHMAC" type="java.lang.String">
-                    <description>HPP skin HMAC key</description>
-                    <persistence type="property"/>
-                    <modifiers encrypted="true"/>
-                </attribute>
                 <attribute qualifier="adyenImmediateCapture" type="java.lang.boolean">
                     <description>Immediate capture flow</description>
                     <persistence type="property"/>
diff --git a/adyenv6core/resources/adyenv6core.build.number b/adyenv6core/resources/adyenv6core.build.number
index dd774a866..2b27ecdcb 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=10.1.0
-version.api=10.1.0
+version=10.2.0
+version.api=10.2.0
diff --git a/adyenv6core/resources/localization/adyenv6core-locales_en.properties b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
index eb92ddc84..42ff88364 100644
--- a/adyenv6core/resources/localization/adyenv6core-locales_en.properties
+++ b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
@@ -26,10 +26,6 @@ type.basestore.adyenNotificationPassword.name=Server Communication HTTP Basic pa
 type.basestore.adyenNotificationPassword.description=Set your own password and copy it over to Adyen Customer Area => Settings => Server Communication => Standard Notification => Password.
 type.basestore.adyenMerchantAccount.name=Merchant account name
 type.basestore.adyenMerchantAccount.description=The merchant account identifier you want to process the (transaction) request with. Find this at the top of the screen in the Adyen Customer Area (CA), where you will see [YourCompanyAccount] > [YourMerchantAccount] .
-type.basestore.adyenSkinCode.name=HPP skin code
-type.basestore.adyenSkinCode.description=Copy and paste the skin code of the skin you want to use from Customer Area => Skins. Leave empty to disable Alternative Payment Methods.
-type.basestore.adyenSkinHMAC.name=HPP skin HMAC key
-type.basestore.adyenSkinHMAC.description=Copy and paste the skin code of the skin you want to use from Customer Area => Skins => click on [skin code] => Edit => HMAC for Test platform
 type.basestore.adyenImmediateCapture.name=Immediate capture flow
 type.basestore.adyenImmediateCapture.description=Set to false if you want to perform the capture of funds manually later (only affects credit cards and a few alternative payment methods). You need to change this setting as well in Adyen Backoffice => Settings => Merchant Settings => Capture Delay. Set to true if you have selected a capture delay of a couple of days in Adyen CA.
 type.basestore.adyenTestMode.name=Adyen Test mode
diff --git a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
index 6f1ab0605..5e5b3020c 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 = "10.1.0";
+	public static final String PLUGIN_VERSION = "10.2.0";
 	public static final String PAYMENT_PROVIDER = "Adyen";
 	public static final String PAYMENT_METHOD ="paymentMethod";
 
@@ -49,6 +49,8 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	final public static String PAYMENT_METHOD_SCHEME = "scheme";
 	final public static String PAYMENT_METHOD_APPLEPAY = "applepay";
 	final public static String PAYMENT_METHOD_AMAZONPAY = "amazonpay";
+	final public static String PAYMENT_METHOD_BCMC = "bcmc";
+	final public static String PAYMENT_METHOD_BCMC_MOBILE = "bcmc_mobile";
 
 
 	public static final String PROCESS_EVENT_ADYEN_CAPTURED = "AdyenCaptured";
diff --git a/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
index bb7e492fe..7cdb1df3c 100644
--- a/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
@@ -39,32 +39,14 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.security.SignatureException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.SortedMap;
 
 /**
  * Adyen Checkout Facade for initiating payments using CC or APM
  */
 public interface AdyenCheckoutFacade {
-    /**
-     * Validates an HPP response based on Map
-     *
-     * @param hppResponseData map with hpp data
-     * @param merchantSig     merchant signature
-     * @throws SignatureException in case signature doesn't match
-     */
-    void validateHPPResponse(SortedMap<String, String> hppResponseData, String merchantSig) throws SignatureException;
-
-    /**
-     * Validates an HPP response based on the HTTP request object
-     *
-     * @param request HTTP request object
-     * @throws SignatureException in case signature doesn't match
-     */
-    void validateHPPResponse(HttpServletRequest request) throws SignatureException;
 
     String getShopperLocale();
 
@@ -78,13 +60,6 @@ public interface AdyenCheckoutFacade {
      */
     String getEnvironmentMode();
 
-    /**
-     * Retrieve the HPP base URL for the current basestore
-     *
-     * @return HPP url
-     */
-    String getHppUrl();
-
     /**
      * Removes cart from the session so that users can't update it while being in a payment page
      */
@@ -158,18 +133,6 @@ public interface AdyenCheckoutFacade {
 
     OrderData handle3DSResponse(Map<String, String> details) throws Exception;
 
-    /**
-     * Initializes an HPP payment
-     * Returns map of data to be submitted to Adyen HPP
-     *
-     * @param cartData    Shopper's cart
-     * @param redirectUrl HPP result url
-     * @return HPP data
-     * @throws SignatureException   In case signature cannot be generated
-     * @throws InvalidCartException In case there is an existing locked cart
-     */
-    Map<String, String> initializeHostedPayment(CartData cartData, String redirectUrl) throws SignatureException, InvalidCartException;
-
     /**
      * Retrieve available payment methods
      */
diff --git a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
index 7acacd9de..f25646289 100644
--- a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
@@ -20,7 +20,6 @@
  */
 package com.adyen.v6.facades;
 
-import com.adyen.constants.HPPConstants;
 import com.adyen.model.Amount;
 import com.adyen.model.Card;
 import com.adyen.model.PaymentResult;
@@ -39,7 +38,6 @@
 import com.adyen.model.terminal.TerminalAPIResponse;
 import com.adyen.service.exception.ApiException;
 import com.adyen.util.DateUtil;
-import com.adyen.util.HMACValidator;
 import com.adyen.util.Util;
 import com.adyen.v6.constants.Adyenv6coreConstants;
 import com.adyen.v6.converters.PaymentsDetailsResponseConverter;
@@ -104,7 +102,6 @@
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.ui.Model;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 
@@ -112,8 +109,6 @@
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.security.SignatureException;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -121,26 +116,12 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static com.adyen.constants.ApiConstants.ThreeDS2Property.THREEDS2_CHALLENGE_TOKEN;
 import static com.adyen.constants.ApiConstants.ThreeDS2Property.THREEDS2_FINGERPRINT_TOKEN;
-import static com.adyen.constants.HPPConstants.Fields.BRAND_CODE;
-import static com.adyen.constants.HPPConstants.Fields.COUNTRY_CODE;
-import static com.adyen.constants.HPPConstants.Fields.CURRENCY_CODE;
-import static com.adyen.constants.HPPConstants.Fields.ISSUER_ID;
-import static com.adyen.constants.HPPConstants.Fields.MERCHANT_ACCOUNT;
-import static com.adyen.constants.HPPConstants.Fields.MERCHANT_REFERENCE;
-import static com.adyen.constants.HPPConstants.Fields.MERCHANT_SIG;
-import static com.adyen.constants.HPPConstants.Fields.PAYMENT_AMOUNT;
-import static com.adyen.constants.HPPConstants.Fields.RES_URL;
-import static com.adyen.constants.HPPConstants.Fields.SESSION_VALIDITY;
-import static com.adyen.constants.HPPConstants.Fields.SHIP_BEFORE_DATE;
-import static com.adyen.constants.HPPConstants.Fields.SKIN_CODE;
 import static com.adyen.constants.HPPConstants.Response.SHOPPER_LOCALE;
 import static com.adyen.v6.constants.Adyenv6coreConstants.ISSUER_PAYMENT_METHODS;
 import static com.adyen.v6.constants.Adyenv6coreConstants.KLARNA;
@@ -175,7 +156,6 @@ public class DefaultAdyenCheckoutFacade implements AdyenCheckoutFacade {
     private OrderRepository orderRepository;
     private AdyenOrderService adyenOrderService;
     private CheckoutCustomerStrategy checkoutCustomerStrategy;
-    private HMACValidator hmacValidator;
     private AdyenPaymentServiceFactory adyenPaymentServiceFactory;
     private ModelService modelService;
     private CommonI18NService commonI18NService;
@@ -242,56 +222,7 @@ public class DefaultAdyenCheckoutFacade implements AdyenCheckoutFacade {
     public static final String MODEL_CARD_HOLDER_NAME_REQUIRED = "cardHolderNameRequired";
     public static final String IS_CARD_HOLDER_NAME_REQUIRED_PROPERTY = "isCardHolderNameRequired";
 
-    protected static final Set<String> HPP_RESPONSE_PARAMETERS = new HashSet<>(Arrays.asList(HPPConstants.Response.MERCHANT_REFERENCE,
-                                                                                             HPPConstants.Response.SKIN_CODE,
-                                                                                             HPPConstants.Response.SHOPPER_LOCALE,
-                                                                                             HPPConstants.Response.PAYMENT_METHOD,
-                                                                                             HPPConstants.Response.AUTH_RESULT,
-                                                                                             HPPConstants.Response.PSP_REFERENCE,
-                                                                                             HPPConstants.Response.MERCHANT_RETURN_DATA));
-
     public DefaultAdyenCheckoutFacade() {
-        hmacValidator = new HMACValidator();
-    }
-
-    @Override
-    public void validateHPPResponse(SortedMap<String, String> hppResponseData, String merchantSig) throws SignatureException {
-        BaseStoreModel baseStore = getBaseStoreService().getCurrentBaseStore();
-
-        String hmacKey = baseStore.getAdyenSkinHMAC();
-        if (StringUtils.isEmpty(hmacKey)) {
-            LOGGER.error("Empty HMAC Key");
-            throw new SignatureException("Empty HMAC Key");
-        }
-        String dataToSign = getHmacValidator().getDataToSign(hppResponseData);
-        String calculatedMerchantSig = getHmacValidator().calculateHMAC(dataToSign, hmacKey);
-        LOGGER.debug("Calculated signature: " + calculatedMerchantSig + " from data: " + dataToSign);
-        if (StringUtils.isEmpty(calculatedMerchantSig) || ! calculatedMerchantSig.equals(merchantSig)) {
-            LOGGER.error("Signature does not match!");
-            throw new SignatureException("Signatures doesn't match");
-        }
-    }
-
-    @Override
-    public void validateHPPResponse(final HttpServletRequest request) throws SignatureException {
-        SortedMap<String, String> hppResponseData = getQueryParameters(request);
-
-        LOGGER.debug("Received HPP response: " + hppResponseData);
-
-        String merchantSig = request.getParameter(HPPConstants.Response.MERCHANT_SIG);
-        if (StringUtils.isEmpty(merchantSig)) {
-            LOGGER.error("MerchantSig was not provided");
-            throw new SignatureException("MerchantSig was not provided");
-        }
-
-        validateHPPResponse(hppResponseData, merchantSig);
-    }
-
-    public String getBaseURL(HttpServletRequest request) {
-        String currentRequestURL = request.getRequestURL().toString();
-        int requestUrlLength = currentRequestURL.length();
-        int requestUriLength = request.getRequestURI().length();
-        return currentRequestURL.substring(0, requestUrlLength - requestUriLength);
     }
 
     @Override
@@ -314,11 +245,6 @@ public String getEnvironmentMode() {
         return "live";
     }
 
-    @Override
-    public String getHppUrl() {
-        return getAdyenPaymentService().getHppEndpoint() + "/details.shtml";
-    }
-
     @Override
     public String getClientKey() {
         return baseStoreService.getCurrentBaseStore().getAdyenClientKey();
@@ -594,71 +520,6 @@ public OrderData handle3DSResponse(final Map<String, String> details) throws Exc
         throw new AdyenNonAuthorizedPaymentException(paymentsDetailsResponse);
     }
 
-    @Override
-    public Map<String, String> initializeHostedPayment(final CartData cartData, final String redirectUrl) throws SignatureException {
-        final String sessionValidity = Util.calculateSessionValidity();
-        final SortedMap<String, String> hppFormData = new TreeMap<>();
-
-        BaseStoreModel baseStore = baseStoreService.getCurrentBaseStore();
-
-        String merchantAccount = baseStore.getAdyenMerchantAccount();
-        String skinCode = baseStore.getAdyenSkinCode();
-        String hmacKey = baseStore.getAdyenSkinHMAC();
-
-        Assert.notNull(merchantAccount);
-        Assert.notNull(skinCode);
-        Assert.notNull(hmacKey);
-
-        Amount amount = Util.createAmount(cartData.getTotalPrice().getValue(), cartData.getTotalPrice().getCurrencyIso());
-
-        //Identify country code based on shopper's delivery address
-        String countryCode = "";
-        AddressData deliveryAddress = cartData.getDeliveryAddress();
-        if (deliveryAddress != null) {
-            CountryData deliveryCountry = deliveryAddress.getCountry();
-            if (deliveryCountry != null) {
-                countryCode = deliveryCountry.getIsocode();
-            }
-        }
-
-        CartModel cartModel = regenerateCartCode();
-        String merchantReference = cartModel.getCode();
-
-        hppFormData.put(PAYMENT_AMOUNT, String.valueOf(amount.getValue()));
-        hppFormData.put(CURRENCY_CODE, cartData.getTotalPrice().getCurrencyIso());
-        hppFormData.put(SHIP_BEFORE_DATE, sessionValidity);
-        hppFormData.put(MERCHANT_REFERENCE, merchantReference);
-        hppFormData.put(SKIN_CODE, skinCode);
-        hppFormData.put(MERCHANT_ACCOUNT, merchantAccount);
-        hppFormData.put(SESSION_VALIDITY, sessionValidity);
-        hppFormData.put(BRAND_CODE, cartData.getAdyenPaymentMethod());
-        hppFormData.put(ISSUER_ID, cartData.getAdyenIssuerId());
-        hppFormData.put(COUNTRY_CODE, countryCode);
-        hppFormData.put(RES_URL, redirectUrl);
-        hppFormData.put(DF_VALUE, cartData.getAdyenDfValue());
-
-        if (! StringUtils.isEmpty(getShopperLocale())) {
-            hppFormData.put(SHOPPER_LOCALE, getShopperLocale());
-        }
-
-        String dataToSign = getHmacValidator().getDataToSign(hppFormData);
-        String merchantSig = getHmacValidator().calculateHMAC(dataToSign, hmacKey);
-
-        hppFormData.put(MERCHANT_SIG, merchantSig);
-
-        //Lock the cart
-        lockSessionCart();
-
-        return hppFormData;
-    }
-
-    private CartModel regenerateCartCode() {
-        final CartModel cartModel = cartService.getSessionCart();
-        cartModel.setCode(String.valueOf(keyGenerator.generate()));
-        cartService.saveOrder(cartModel);
-        return cartModel;
-    }
-
     /**
      * Create order and authorized TX
      */
@@ -835,7 +696,7 @@ public void initializeCheckoutData(Model model) {
                                        .collect(Collectors.toSet());
         }
 
-        //Exclude cards, boleto, bcmc and bcmc_mobile_QR and iDeal
+        //Exclude cards, boleto and iDeal
         alternativePaymentMethods = alternativePaymentMethods.stream()
                                                              .filter(paymentMethod -> ! paymentMethod.getType().isEmpty() && ! isHiddenPaymentMethod(paymentMethod))
                                                              .collect(Collectors.toList());
@@ -855,7 +716,7 @@ public void initializeCheckoutData(Model model) {
         // current selected PaymentMethod
         model.addAttribute(MODEL_SELECTED_PAYMENT_METHOD, cartData.getAdyenPaymentMethod());
 
-        //Set HPP payment methods
+        //Set payment methods
         model.addAttribute(MODEL_PAYMENT_METHODS, alternativePaymentMethods);
 
         //Set allowed Credit Cards
@@ -932,8 +793,6 @@ private boolean isHiddenPaymentMethod(PaymentMethod paymentMethod) {
 
         if (paymentMethodType == null || paymentMethodType.isEmpty() ||
                 paymentMethodType.equals("scheme") ||
-                paymentMethodType.equals("bcmc") ||
-                paymentMethodType.equals("bcmc_mobile_QR") ||
                 (paymentMethodType.contains("wechatpay")
                         && ! paymentMethodType.equals("wechatpayWeb")) ||
                 paymentMethodType.startsWith(PAYMENT_METHOD_BOLETO) ||
@@ -1236,36 +1095,6 @@ public String getShopperLocale() {
         return null;
     }
 
-    /**
-     * Helper function for retrieving only GET parameters (of querystring)
-     *
-     * @param request HttpServletRequest request object
-     * @return Sorted map with parameters
-     */
-    private static SortedMap<String, String> getQueryParameters(HttpServletRequest request) {
-        SortedMap<String, String> queryParameters = new TreeMap<>();
-        String queryString = request.getQueryString();
-
-        if (StringUtils.isEmpty(queryString)) {
-            return queryParameters;
-        }
-
-        String[] parameters = queryString.split("&");
-
-        for (String parameter : parameters) {
-            String[] keyValuePair = parameter.split("=");
-            String key = keyValuePair[0];
-            String value = request.getParameter(key);
-
-            // Add only HPP parameters for signature calculation
-            if (HPP_RESPONSE_PARAMETERS.contains(key) || key.startsWith("additionalData.")) {
-                queryParameters.put(key, value);
-            }
-        }
-
-        return queryParameters;
-    }
-
     protected String generateCcPaymentInfoCode(final CartModel cartModel) {
         return cartModel.getCode() + "_" + UUID.randomUUID();
     }
@@ -1553,14 +1382,6 @@ public void setCheckoutCustomerStrategy(CheckoutCustomerStrategy checkoutCustome
         this.checkoutCustomerStrategy = checkoutCustomerStrategy;
     }
 
-    public HMACValidator getHmacValidator() {
-        return hmacValidator;
-    }
-
-    public void setHmacValidator(HMACValidator hmacValidator) {
-        this.hmacValidator = hmacValidator;
-    }
-
     public AdyenPaymentServiceFactory getAdyenPaymentServiceFactory() {
         return adyenPaymentServiceFactory;
     }
diff --git a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
index 77426059d..9a302ba30 100644
--- a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
+++ b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
@@ -92,6 +92,7 @@
 import static com.adyen.v6.constants.Adyenv6coreConstants.KLARNA;
 import static com.adyen.v6.constants.Adyenv6coreConstants.OPENINVOICE_METHODS_API;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYBRIGHT;
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BCMC;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO_SANTANDER;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_CC;
@@ -193,7 +194,7 @@ public PaymentsRequest createPaymentsRequest(final String merchantAccount,
         Boolean is3DS2allowed = is3DS2Allowed();
 
         //For credit cards
-        if (PAYMENT_METHOD_CC.equals(adyenPaymentMethod)) {
+        if (PAYMENT_METHOD_CC.equals(adyenPaymentMethod) || PAYMENT_METHOD_BCMC.equals(adyenPaymentMethod)) {
             if (CARD_TYPE_DEBIT.equals(cartData.getAdyenCardType())) {
                 updatePaymentRequestForDC(paymentsRequest, cartData, recurringContractMode);
             }
diff --git a/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java b/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
index a8a2607a0..95310af79 100644
--- a/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
+++ b/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
@@ -109,11 +109,6 @@ public interface AdyenPaymentService {
      */
     PaymentsDetailsResponse getPaymentDetailsFromPayload( HashMap<String, String> details) throws Exception;
 
-    /**
-     * Returns the HPP base URL for the current basestore
-     */
-    String getHppEndpoint();
-
     /**
      * Returns the Device Fingerprint url
      */
diff --git a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
index 1e74c6b09..66c600e9f 100644
--- a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
+++ b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
@@ -109,8 +109,6 @@ public DefaultAdyenPaymentService(final BaseStoreModel baseStore) {
 
         String apiKey = baseStore.getAdyenAPIKey();
         String merchantAccount = baseStore.getAdyenMerchantAccount();
-        String skinCode = baseStore.getAdyenSkinCode();
-        String hmacKey = baseStore.getAdyenSkinHMAC();
         String apiEndpointPrefix = baseStore.getAdyenAPIEndpointPrefix();
         boolean isTestMode = baseStore.getAdyenTestMode();
         boolean isPosEnabled = baseStore.getAdyenPosEnabled();
@@ -135,8 +133,6 @@ public DefaultAdyenPaymentService(final BaseStoreModel baseStore) {
         config = new Config();
         config.setApiKey(apiKey);
         config.setMerchantAccount(merchantAccount);
-        config.setSkinCode(skinCode);
-        config.setHmacKey(hmacKey);
         config.setApplicationName(PLUGIN_NAME + " v" + PLUGIN_VERSION);
         client = new Client(config);
 
@@ -382,11 +378,6 @@ public PaymentsDetailsResponse getPaymentDetailsFromPayload(Map<String, String>
         return paymentsResponse;
     }
 
-    @Override
-    public String getHppEndpoint() {
-        return config.getHppEndpoint();
-    }
-
     @Override
     public String getDeviceFingerprintUrl() {
         DateFormat df = new SimpleDateFormat("yyyyMMdd");
diff --git a/adyenv6core/testsrc/com/adyen/v6/factory/AdyenRequestFactoryTest.java b/adyenv6core/testsrc/com/adyen/v6/factory/AdyenRequestFactoryTest.java
index 13f26c60c..8a7a120e4 100644
--- a/adyenv6core/testsrc/com/adyen/v6/factory/AdyenRequestFactoryTest.java
+++ b/adyenv6core/testsrc/com/adyen/v6/factory/AdyenRequestFactoryTest.java
@@ -90,7 +90,7 @@ public class AdyenRequestFactoryTest {
     private static final String REMOTE_ADDRESS = "1.2.3.4";
     private static final String REQUEST_URL = "https://localhost:9002/electronics/en/checkout/multi/adyen/summary/placeOrder";
     private static final String REQUEST_URI = "/electronics/en/checkout/multi/adyen/summary/placeOrder";
-    private static final String RETURN_URL ="https://localhost:9002/electronics/en/checkout/multi/adyen/summary/hpp-adyen-response";
+    private static final String RETURN_URL ="https://localhost:9002/electronics/en/checkout/multi/adyen/summary/checkout-adyen-response";
     //POS
     private static final String SERVICE_ID = "serviceId";
     private static final String TERMINAL_ID = "V400m-123456789";
diff --git a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
index 25dce7709..314dc63b2 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=10.1.0
-version.api=10.1.0
+version=10.2.0
+version.api=10.2.0
diff --git a/adyenv6notification/resources/adyenv6notification.build.number b/adyenv6notification/resources/adyenv6notification.build.number
index 79ec66071..fff9fb5a5 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=10.1.0
-version.api=10.1.0
+version=10.2.0
+version.api=10.2.0
diff --git a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
index b70753026..51927fb3f 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=10.1.0
-version.api=10.1.0
+version=10.2.0
+version.api=10.2.0