diff --git a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
index 4ecadfa46..4b6128f04 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=6.1.0
-version.api=6.1.0
\ No newline at end of file
+version=6.1.1
+version.api=6.1.1
\ No newline at end of file
diff --git a/adyenv6backoffice/resources/adyenv6backoffice.build.number b/adyenv6backoffice/resources/adyenv6backoffice.build.number
index 92d548692..d9026cb8d 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=6.1.0
-version.api=6.1.0
\ No newline at end of file
+version=6.1.1
+version.api=6.1.1
\ No newline at end of file
diff --git a/adyenv6core/resources/adyenv6core.build.number b/adyenv6core/resources/adyenv6core.build.number
index b93d76ece..d3694486d 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=6.1.0
-version.api=6.1.0
\ No newline at end of file
+version=6.1.1
+version.api=6.1.1
\ No newline at end of file
diff --git a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
index 48f87a8e7..3d0bbfc0c 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 = "6.1.0";
+	public static final String PLUGIN_VERSION = "6.1.1";
 	public static final String PAYMENT_PROVIDER = "Adyen";
 	public static final String PAYMENT_METHOD ="paymentMethod";
 
diff --git a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
index 9573fa770..25ac478e0 100644
--- a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
@@ -507,6 +507,8 @@ private void updateCartWithSessionData(CartData cartData) {
         getSessionService().removeAttribute(SESSION_SF_EXPIRY_YEAR);
         getSessionService().removeAttribute(SESSION_SF_SECURITY_CODE);
         getSessionService().removeAttribute(SESSION_CARD_BRAND);
+        getSessionService().removeAttribute(PAYMENT_METHOD);
+        getSessionService().removeAttribute(SESSION_PAYMENT_DATA);
     }
 
     @Override
diff --git a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
index 6e56836d1..4705985ac 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=6.1.0
-version.api=6.1.0
+version=6.1.1
+version.api=6.1.1
diff --git a/adyenv6notification/resources/adyenv6notification.build.number b/adyenv6notification/resources/adyenv6notification.build.number
index e4a80cf5a..2390d6ae2 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=6.1.0
-version.api=6.1.0
+version=6.1.1
+version.api=6.1.1
diff --git a/adyenv6ordermanagement/resources/adyenv6ordermanagement-process-definitions-spring.xml b/adyenv6ordermanagement/resources/adyenv6ordermanagement-process-definitions-spring.xml
index f3c797133..741c25de7 100644
--- a/adyenv6ordermanagement/resources/adyenv6ordermanagement-process-definitions-spring.xml
+++ b/adyenv6ordermanagement/resources/adyenv6ordermanagement-process-definitions-spring.xml
@@ -17,6 +17,12 @@
         <property name="resource" value="classpath:/adyenv6ordermanagement/process/return-process.xml"/>
     </bean>
 
+    <alias name="orderConfirmationEmailProcessResource" alias="orderConfirmationEmailProcessResource"/>
+    <bean id="orderConfirmationEmailProcessResource"
+          class="de.hybris.platform.processengine.definition.ProcessDefinitionResource">
+        <property name="resource" value="classpath:/adyenv6ordermanagement/process/orderConfirmationEmailProcess.xml"/>
+    </bean>
+
     <!--order-process beans-->
     <import resource="adyenv6ordermanagement/process/order-process-spring.xml"/>
 
diff --git a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
index e85bfdc20..4e0f31e80 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=6.1.0
-version.api=6.1.0
+version=6.1.1
+version.api=6.1.1
diff --git a/adyenv6ordermanagement/resources/adyenv6ordermanagement/process/orderConfirmationEmailProcess.xml b/adyenv6ordermanagement/resources/adyenv6ordermanagement/process/orderConfirmationEmailProcess.xml
new file mode 100644
index 000000000..e718593c7
--- /dev/null
+++ b/adyenv6ordermanagement/resources/adyenv6ordermanagement/process/orderConfirmationEmailProcess.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ [y] hybris Platform
+
+ Copyright (c) 2018 SAP SE or an SAP affiliate company.  All rights reserved.
+
+ This software is the confidential and proprietary information of SAP
+ ("Confidential Information"). You shall not disclose such Confidential
+ Information and shall use it only in accordance with the terms of the
+ license agreement you entered into with SAP.
+-->
+<process xmlns="http://www.hybris.de/xsd/processdefinition" start="generateOrderConfirmationEmail" name="orderConfirmationEmailProcess"
+		processClass="de.hybris.platform.orderprocessing.model.OrderProcessModel" onError="error">
+
+	<action id="generateOrderConfirmationEmail" bean="generateOrderConfirmationEmail">
+		<transition name="OK" to="sendEmail"/>
+		<transition name="NOK" to="error"/>
+	</action>
+
+	<action id="sendEmail" bean="sendEmail">
+		<transition name="OK" to="removeSentEmail"/>
+		<transition name="NOK" to="failed"/>
+	</action>
+
+	<action id="removeSentEmail" bean="removeSentEmail">
+		<transition name="OK" to="success"/>
+		<transition name="NOK" to="error"/>
+	</action>
+
+	<end id="error" state="ERROR">Something went wrong.</end>
+	<end id="failed" state="FAILED">Could not send order confirmation email.</end>
+	<end id="success" state="SUCCEEDED">Sent order confirmation email.</end>
+
+</process>
\ No newline at end of file
diff --git a/adyenv6ordermanagement/resources/impex/projectdata-dynamic-business-process-order.impex.6.7.dist b/adyenv6ordermanagement/resources/impex/projectdata-dynamic-business-process-order.impex.6.7.dist
new file mode 100644
index 000000000..b08ed1154
--- /dev/null
+++ b/adyenv6ordermanagement/resources/impex/projectdata-dynamic-business-process-order.impex.6.7.dist
@@ -0,0 +1,159 @@
+#                        ######
+#                        ######
+#  ############    ####( ######  #####. ######  ############   ############
+#  #############  #####( ######  #####. ######  #############  #############
+#         ######  #####( ######  #####. ######  #####  ######  #####  ######
+#  ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+#  ###### ######  #####( ######  #####. ######  #####          #####  ######
+#  #############  #############  #############  #############  #####  ######
+#   ############   ############  #############   ############  #####  ######
+#                                       ######
+#                                #############
+#                                ############
+#
+#  Adyen Hybris Extension
+#
+#  Copyright (c) 2017 Adyen B.V.
+#  This file is open source and available under the MIT license.
+#  See the LICENSE file for more info.
+
+INSERT_UPDATE DynamicProcessDefinition;code[unique=true];active[unique=true];content
+;adyen-order-process;true;"<process xmlns='http://www.hybris.de/xsd/processdefinition' start='checkOrder'
+name='adyen-order-process' processClass='de.hybris.platform.orderprocessing.model.OrderProcessModel'>
+
+<!-- Check Order -->
+<action id='checkOrder' bean='checkOrderAction'>
+        <transition name='OK' to='adyenCheckAuthorization'/>
+    <transition name='NOK' to='error'/>
+</action>
+
+<!-- Wait for HPP/3Ds authorization -->
+<action id='adyenCheckAuthorization' bean='adyenCheckAuthorizationAction'>
+    <transition name='OK' to='fraudCheck'/>
+    <transition name='NOK' to='error'/>
+    <transition name='WAIT' to='waitForAdyenAuthorization'/>
+</action>
+
+<!--Check authorization completion-->
+<wait id='waitForAdyenAuthorization' then='adyenCheckAuthorization' prependProcessCode='true'>
+    <event>AdyenAuthorized</event>
+</wait>
+
+<!-- Fraud Check -->
+<action id='fraudCheck' bean='fraudCheckOrderInternalAction'>
+    <transition name='OK' to='sendOrderPlacedNotification'/>
+    <transition name='POTENTIAL' to='manualOrderCheckCSA'/>
+    <transition name='FRAUD' to='cancelOrder'/>
+</action>
+
+<!-- Fraud Check : OK -->
+<action id='sendOrderPlacedNotification' bean='sendOrderPlacedNotificationAction'>
+    <transition name='OK' to='geocodeShippingAddress'/>
+</action>
+
+<!-- Fraud Check : FRAUD -->
+<action id='cancelOrder' bean='cancelOrderAction'>
+    <transition name='OK' to='notifyCustomer'/>
+</action>
+
+<action id='notifyCustomer' bean='notifyCustomerAboutFraudAction'>
+<transition name='OK' to='failed'/>
+</action>
+
+<!-- Fraud Check : POTENTIAL -->
+<action id='manualOrderCheckCSA' bean='prepareOrderForManualCheckAction'>
+    <transition name='OK' to='waitForManualOrderCheckCSA'/>
+</action>
+
+<wait id='waitForManualOrderCheckCSA' then='orderManualChecked' prependProcessCode='true'>
+    <event>CSAOrderVerified</event>
+</wait>
+
+<action id='orderManualChecked' bean='orderManualCheckedAction'>
+    <transition name='OK' to='sendOrderPlacedNotification'/>
+    <transition name='NOK' to='cancelOrder'/>
+    <transition name='CANCELLED' to='success'/>
+</action>
+
+<!-- Sourcing and Allocation -->
+<action id='geocodeShippingAddress' bean='geocodeShippingAddressAction'>
+    <transition name='OK' to='sourceOrder'/>
+</action>
+
+<action id='sourceOrder' bean='sourceOrderAction'>
+    <transition name='OK' to='waitForOrderAction'/>
+</action>
+
+<!-- Wait to perform action on Order -->
+<wait id='waitForOrderAction' prependProcessCode='true' then='failed'>
+    <case event='OrderActionEvent'>
+        <choice id='consignmentProcessEnded' then='verifyOrderCompletion'/>
+        <choice id='cancelOrder' then='processOrderCancellation'/>
+        <choice id='cancelled' then='success'/>
+        <choice id='reSource' then='sourceOrder'/>
+        <choice id='putOnHold' then='putOrderOnHold'/>
+    </case>
+</wait>
+
+<!-- Wait for order cancellation to be completed -->
+<action id='processOrderCancellation' bean='processOrderCancellationAction'>
+        <transition name='OK' to='adyenCancelOrRefund'/>
+    <transition name='WAIT' to='waitForOrderAction'/>
+    <transition name='SOURCING' to='sourceOrder'/>
+</action>
+
+    <action id='adyenCancelOrRefund' bean='adyenCancelOrRefundAction'>
+        <transition name='OK' to='verifyOrderCompletion'/>
+    </action>
+
+<action id='verifyOrderCompletion' bean='verifyOrderCompletionAction'>
+    <transition name='OK' to='postTaxes'/>
+    <transition name='WAIT' to='waitForOrderAction'/>
+    <transition name='CANCELLED' to='success'/>
+</action>
+
+<action id='putOrderOnHold' bean='putOrderOnHoldAction'>
+    <transition name='OK' to='waitForOrderAction'/>
+</action>
+
+<!-- Tax and Payment -->
+<action id='postTaxes' bean='postTaxesAction'>
+    <transition name='OK' to='takePayment'/>
+</action>
+
+<action id='takePayment' bean='takePaymentAction'>
+        <transition name='OK' to='adyenCheckCapture'/>
+    <transition name='NOK' to='sendPaymentFailedNotification'/>
+</action>
+
+<!--Check if the payment is already captured-->
+<action id='adyenCheckCapture' bean='adyenCheckCaptureAction'>
+    <transition name='OK' to='completeOrder'/>
+    <transition name='NOK' to='sendPaymentFailedNotification'/>
+    <transition name='WAIT' to='waitForAdyenCapture'/>
+</action>
+
+<!--Check Capture completion-->
+<wait id='waitForAdyenCapture' then='adyenCheckCapture' prependProcessCode='true'>
+    <event>AdyenCaptured</event>
+</wait>
+
+<action id='completeOrder' bean='completeOrderAction'>
+    <transition name='OK' to='success'/>
+</action>
+
+<action id='sendPaymentFailedNotification' bean='sendPaymentFailedNotificationAction'>
+    <transition name='OK' to='failed'/>
+</action>
+
+<end id='error' state='ERROR'>Order process error.</end>
+<end id='failed' state='FAILED'>Order process failed.</end>
+<end id='success' state='SUCCEEDED'>Order process completed.</end>
+
+</process>"
+
+$storeUid=electronics
+$orderProcessCode=adyen-order-process
+
+UPDATE BaseStore;uid[unique=true];submitOrderProcessCode
+;$storeUid;$orderProcessCode
diff --git a/adyenv6ordermanagement/resources/impex/projectdata-dynamic-business-return-order.impex.6.7.dist b/adyenv6ordermanagement/resources/impex/projectdata-dynamic-business-return-order.impex.6.7.dist
new file mode 100644
index 000000000..2d616133a
--- /dev/null
+++ b/adyenv6ordermanagement/resources/impex/projectdata-dynamic-business-return-order.impex.6.7.dist
@@ -0,0 +1,120 @@
+#                        ######
+#                        ######
+#  ############    ####( ######  #####. ######  ############   ############
+#  #############  #####( ######  #####. ######  #############  #############
+#         ######  #####( ######  #####. ######  #####  ######  #####  ######
+#  ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+#  ###### ######  #####( ######  #####. ######  #####          #####  ######
+#  #############  #############  #############  #############  #####  ######
+#   ############   ############  #############   ############  #####  ######
+#                                       ######
+#                                #############
+#                                ############
+#
+#  Adyen Hybris Extension
+#
+#  Copyright (c) 2017 Adyen B.V.
+#  This file is open source and available under the MIT license.
+#  See the LICENSE file for more info.
+
+INSERT_UPDATE DynamicProcessDefinition;code[unique=true];active[unique=true];content
+;adyen-return-process;true;"<process xmlns='http://www.hybris.de/xsd/processdefinition' start='initialReturnAction'
+name='adyen-return-process' processClass='de.hybris.platform.returns.model.ReturnProcessModel'>
+
+<action id='initialReturnAction' bean='initialReturnAction'>
+   <transition name='ONLINE' to='waitForConfirmOrCancelReturnAction'/>
+   <transition name='INSTORE' to='captureRefundAction'/>
+</action>
+
+<wait id='waitForConfirmOrCancelReturnAction' prependProcessCode='true' then='failed'>
+   <case event='ConfirmOrCancelRefundEvent'>
+       <choice id='cancelReturn' then='cancelReturnAction'/>
+       <choice id='approveReturn' then='approveReturnAction'/>
+   </case>
+</wait>
+
+<action id='cancelReturnAction' bean='cancelReturnAction'>
+   <transition name='OK' to='success'/>
+</action>
+
+<action id='approveReturnAction' bean='approveReturnAction'>
+   <transition name='OK' to='printReturnLabelAction'/>
+</action>
+
+<action id='printReturnLabelAction' bean='printReturnLabelAction'>
+   <transition name='OK' to='printPackingLabelAction'/>
+</action>
+
+<action id='printPackingLabelAction' bean='printPackingLabelAction'>
+   <transition name='OK' to='waitForGoodsAction'/>
+</action>
+<!-- This step can be skipped if only testing on payment flow and not inventory flow-->
+<wait id='waitForGoodsAction' prependProcessCode='true' then='failed'>
+   <case event='ApproveOrCancelGoodsEvent'>
+       <choice id='cancelReturn' then='cancelReturnAction'/>
+       <choice id='acceptGoods' then='acceptGoodsAction'/>
+   </case>
+</wait>
+
+<action id='acceptGoodsAction' bean='acceptGoodsAction'>
+   <transition name='OK' to='captureRefundAction'/>
+</action>
+
+<action id='captureRefundAction' bean='captureRefundAction'>
+   <transition name='OK' to='adyenCaptureRefundAction'/>
+   <transition name='NOK' to='waitForFailCaptureAction'/>
+</action>
+
+<!--Refund action for Adyen payments-->
+<action id='adyenCaptureRefundAction' bean='adyenCaptureRefundAction'>
+   <transition name='OK' to='successCaptureAction'/>
+   <transition name='WAIT' to='waitForAdyenRefunded'/>
+   <transition name='NOK' to='waitForFailCaptureAction'/>
+</action>
+
+<!--Wait for refund notification-->
+<wait id='waitForAdyenRefunded' then='adyenCaptureRefundAction' prependProcessCode='true'>
+   <event>AdyenRefunded</event>
+</wait>
+
+<wait id='waitForFailCaptureAction' prependProcessCode='true' then='failed'>
+   <case event='FailCaptureActionEvent'>
+       <choice id='bypassCapture' then='taxReverseAction'/>
+       <choice id='cancelReturn' then='cancelReturnAction'/>
+   </case>
+</wait>
+
+<action id='successCaptureAction' bean='successCaptureAction'>
+   <transition name='OK' to='taxReverseAction'/>
+</action>
+
+<action id='taxReverseAction' bean='taxReverseAction'>
+   <transition name='OK' to='successTaxReverseAction'/>
+   <transition name='NOK' to='waitForFailTaxReverseAction'/>
+</action>
+
+<wait id='waitForFailTaxReverseAction' then='inventoryUpdateAction' prependProcessCode='true'>
+   <event>FailTaxReverseEvent</event>
+</wait>
+
+<action id='successTaxReverseAction' bean='successTaxReverseAction'>
+   <transition name='OK' to='inventoryUpdateAction'/>
+</action>
+
+<action id='inventoryUpdateAction' bean='inventoryUpdateAction'>
+   <transition name='OK' to='completeReturnAction'/>
+</action>
+
+<action id='completeReturnAction' bean='completeReturnAction'>
+   <transition name='OK' to='success'/>
+</action>
+
+<end id='failed' state='FAILED'>Return issue detected.</end>
+<end id='success' state='SUCCEEDED'>Return process ended as expected.</end>
+</process>"
+
+$storeUid=electronics
+$orderReturnCode=adyen-return-process
+
+UPDATE BaseStore;uid[unique=true];createReturnProcessCode
+;$storeUid;$orderReturnCode