diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index a86376fbbb..187a2aa961 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -32,11 +32,11 @@
     -->
     <bean id="shutdownBackstop" class="org.alfresco.repo.shutdown.ShutdownBackstop">
        <property name="timeout">
-       	  <value>${shutdown.backstop.timeout}</value>
+            <value>${shutdown.backstop.timeout}</value>
        </property>
        <property name="enabled">
           <value>${shutdown.backstop.enabled}</value>
-       </property>	
+       </property>   
     </bean>  
 
 
@@ -90,7 +90,7 @@
              <ref bean="patch.schemaUpdateScript-V1.4-2" />
              <ref bean="patch.db-V2.1-NotNullColumns" />
              <ref bean="patch.db-V2.2-ACL-From-2.1-A" />
-			 <ref bean="patch.db-V2.2-ACL" />
+          <ref bean="patch.db-V2.2-ACL" />
              <ref bean="patch.db-V2.2-0-CreateMissingTables" />
              <ref bean="patch.db-V2.2-Upgrade-From-2.1" />
              <ref bean="patch.db-V2.2-Upgrade-From-2.2SP1" />
@@ -111,6 +111,7 @@
              <ref bean="patch.db-V3.0-0-CreateActivitiesExtras" />
              <ref bean="patch.db-V3.2-Remove-AVM-Issuer" />
              <ref bean="patch.db-V3.2-Modify-AVM-MimeType" />
+             <ref bean="patch.db-V3.2-Upgrade-JBPM" />
           </list>
        </property>
     </bean>
@@ -204,7 +205,7 @@
             <value>alfresco</value>
         </property>
     </bean>
-	
+   
     <bean id="workflowBootstrap" parent="workflowDeployer">
         <property name="workflowDefinitions">
             <list>
@@ -289,9 +290,9 @@
          <ref bean="personDaoImpl"/>
        </property>
     </bean>
-	
+   
     <!-- Bootstrap any extensions -->
-	
+   
     <import resource="classpath*:alfresco/extension/bootstrap/*-context.xml" />
 
     <!-- Perform index recovery before applying any patches -->
@@ -486,7 +487,7 @@
         </property>
     </bean>
 
-	<!-- Repository helper class -->
+   <!-- Repository helper class -->
    <bean id="repositoryHelper" class="org.alfresco.repo.model.Repository">
       <property name="transactionHelper" ref="retryingTransactionHelper" />
       <property name="namespaceService" ref="namespaceService" />
diff --git a/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.MySQLInnoDBDialect/jbpm-upgrade.sql b/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.MySQLInnoDBDialect/jbpm-upgrade.sql
new file mode 100755
index 0000000000..af131065cc
--- /dev/null
+++ b/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.MySQLInnoDBDialect/jbpm-upgrade.sql
@@ -0,0 +1,25 @@
+--
+-- Title:      Upgrade to V3.2 - upgrade jbpm tables to jbpm 3.3.1 
+-- Database:   MySql
+-- Since:      V3.2 schema 2013
+-- Author:     
+--
+-- upgrade jbpm tables to jbpm 3.3.1
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+-- we mark next statement as optional to not fail the upgrade from 2.1.a  (as it doesn't contain jbpm)
+alter table JBPM_MODULEDEFINITION modify NAME_ varchar(255);  -- (optional)
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.2-Upgrade-JBPM';
+INSERT INTO alf_applied_patch
+  (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+  VALUES
+  (
+    'patch.db-V3.2-Upgrade-JBPM', 'Manually executed script upgrade V3.2 to jbpm version 3.3.1 usage',
+     0, 2017, -1, 2018, null, 'UNKOWN', 1, 1, 'Script completed'
+   );
\ No newline at end of file
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 81b76641d5..c39850342f 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -576,10 +576,10 @@
         <property name="userImporterBootstrap">
             <ref bean="userBootstrap" />
         </property>
-          <property name="spacesImporterBootstrap">
+        <property name="spacesImporterBootstrap">
             <ref bean="spacesBootstrap" />
         </property>
-          <property name="indexerAndSearcher">
+        <property name="indexerAndSearcher">
             <ref bean="indexerAndSearcherFactory" />
         </property>
     </bean>
@@ -1079,8 +1079,8 @@
             </list>
         </property>
     </bean>
-	
-	<bean id="patch.db-V2.2-ACL-From-2.1-A" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+   
+   <bean id="patch.db-V2.2-ACL-From-2.1-A" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V2.2-ACL-From-2.1-A</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1095,7 +1095,7 @@
             </list>
         </property>
     </bean>
-	
+   
     <bean id="patch.db-V2.2-ACL" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V2.2-ACL</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
@@ -1110,7 +1110,7 @@
                 <ref bean="patch.db-V2.1-NotNullColumns" />
             </list>
         </property>
-		<property name="alternatives" >
+      <property name="alternatives" >
             <list>
                 <ref bean="patch.db-V2.2-ACL-From-2.1-A" />
             </list>
@@ -1455,7 +1455,7 @@
             <ref bean="qnameDAO" />
         </property>
     </bean>
-	
+   
     <bean id="patch.db-V2.1-AuditPathIndex" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V2.1-AuditPathIndex</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
@@ -1542,30 +1542,30 @@
         </property>
     </bean>
 
-    <bean id="patch.resetWCMToGroupBasedPermissionsPatch" class="org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch" parent="basePatch" >
-        <property name="id"><value>patch.resetWCMToGroupBasedPermissionsPatch</value></property>
-        <property name="description"><value>patch.resetWCMToGroupBasedPermissionsPatch.description</value></property>
+    <bean id="patch.resetWCMToGroupBasedPermissionsPatch" class="org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch" parent="basePatch" >
+        <property name="id"><value>patch.resetWCMToGroupBasedPermissionsPatch</value></property>
+        <property name="description"><value>patch.resetWCMToGroupBasedPermissionsPatch.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>2001</value></property>
         <property name="targetSchema"><value>2002</value></property>
-        <property name="sessionFactory">
-            <ref bean="sessionFactory" />
-        </property>
+        <property name="sessionFactory">
+            <ref bean="sessionFactory" />
+        </property>
         <property name="avmService">
             <ref bean="avmService" />
         </property>
         <property name="permissionService">
             <ref bean="permissionService" />
         </property>
-        <property name="personService">
-            <ref bean="personService" />
+        <property name="personService">
+            <ref bean="personService" />
         </property>
         <property name="authorityService">
             <ref bean="authorityService" />
         </property>
-        <property name="qnameDAO">
-            <ref bean="qnameDAO" />
-        </property>
+        <property name="qnameDAO">
+            <ref bean="qnameDAO" />
+        </property>
         <property name="replaceAllWith">
             <value>ContentManager</value>
         </property>
@@ -1575,21 +1575,21 @@
                 <ref bean="patch.zonedAuthorities" />
             </list>
         </property>
-        <property name="alternatives" >
-            <list>
-                <ref bean="patch.moveWCMToGroupBasedPermissionsPatch" />
-            </list>
-        </property>
+        <property name="alternatives" >
+            <list>
+                <ref bean="patch.moveWCMToGroupBasedPermissionsPatch" />
+            </list>
+        </property>
     </bean>
-
-    <!-- note: does not need to be run if patch.wcmPostPermissionSnapshotPatch2 already applied -->
-    <bean id="patch.wcmPostPermissionSnapshotPatch3" class="org.alfresco.repo.admin.patch.impl.WCMPostPermissionSnapshotPatch" parent="basePatch" >
-        <property name="id"><value>patch.wcmPostPermissionSnapshotPatch3</value></property>
+
+    <!-- note: does not need to be run if patch.wcmPostPermissionSnapshotPatch2 already applied -->
+    <bean id="patch.wcmPostPermissionSnapshotPatch3" class="org.alfresco.repo.admin.patch.impl.WCMPostPermissionSnapshotPatch" parent="basePatch" >
+        <property name="id"><value>patch.wcmPostPermissionSnapshotPatch3</value></property>
         <property name="description"><value>patch.wcmPostPermissionSnapshotPatch.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>2001</value></property>
         <property name="targetSchema"><value>2002</value></property>
-
+
         <property name="avmService">
             <ref bean="AVMService" />
         </property>
@@ -1601,47 +1601,47 @@
         </property>
         <property name="dependsOn" >
             <list>
-                <ref bean="patch.resetWCMToGroupBasedPermissionsPatch" />
+                <ref bean="patch.resetWCMToGroupBasedPermissionsPatch" />
+            </list>
+        </property>
+        <property name="alternatives" >
+            <list>
+                <ref bean="patch.wcmPostPermissionSnapshotPatch2" />
             </list>
         </property>
-        <property name="alternatives" >
-            <list>
-                <ref bean="patch.wcmPostPermissionSnapshotPatch2" />
-            </list>
-        </property>
     </bean>
     
-    <!-- note: NOOP - superceded by patch.resetWCMToGroupBasedPermissionsPatch -->
-    <bean id="patch.moveWCMToGroupBasedPermissionsPatch" class="org.alfresco.repo.admin.patch.impl.NoOpPatch" parent="basePatch" >
-        <property name="id"><value>patch.moveWCMToGroupBasedPermissionsPatch</value></property>
-        <property name="description"><value>patch.noOpPatch.description</value></property>
-        <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>2001</value></property>
+    <!-- note: NOOP - superceded by patch.resetWCMToGroupBasedPermissionsPatch -->
+    <bean id="patch.moveWCMToGroupBasedPermissionsPatch" class="org.alfresco.repo.admin.patch.impl.NoOpPatch" parent="basePatch" >
+        <property name="id"><value>patch.moveWCMToGroupBasedPermissionsPatch</value></property>
+        <property name="description"><value>patch.noOpPatch.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>2001</value></property>
         <property name="targetSchema"><value>2002</value></property>
-        
-        <property name="dependsOn" >
-            <list>
-                <ref bean="patch.resetWCMToGroupBasedPermissionsPatch" />
-            </list>
-        </property>
-    </bean>
-    
-    <!-- note: NOOP - superceded by patch.wcmPostPermissionSnapshotPatch3 -->
-    <bean id="patch.wcmPostPermissionSnapshotPatch2" class="org.alfresco.repo.admin.patch.impl.NoOpPatch" parent="basePatch" >
-        <property name="id"><value>patch.wcmPostPermissionSnapshotPatch2</value></property>
-        <property name="description"><value>patch.noOpPatch.description</value></property>
-        <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>2001</value></property>
+        
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.resetWCMToGroupBasedPermissionsPatch" />
+            </list>
+        </property>
+    </bean>
+    
+    <!-- note: NOOP - superceded by patch.wcmPostPermissionSnapshotPatch3 -->
+    <bean id="patch.wcmPostPermissionSnapshotPatch2" class="org.alfresco.repo.admin.patch.impl.NoOpPatch" parent="basePatch" >
+        <property name="id"><value>patch.wcmPostPermissionSnapshotPatch2</value></property>
+        <property name="description"><value>patch.noOpPatch.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>2001</value></property>
         <property name="targetSchema"><value>2002</value></property>
-        
-        <property name="dependsOn" >
-            <list>
-                <ref bean="patch.wcmPostPermissionSnapshotPatch3" />
-            </list>
-        </property>
-    </bean>
-    
-    
+        
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.wcmPostPermissionSnapshotPatch3" />
+            </list>
+        </property>
+    </bean>
+    
+    
     <!--  Redeploy both direct and indirect submit processes for addition submit failure handling -->
     <bean id="patch.redeploySubmitProcess6" class="org.alfresco.repo.admin.patch.impl.GenericWorkflowPatch" parent="basePatch" >
         <property name="id"><value>patch.redeploySubmitProcess6</value></property>
@@ -1718,7 +1718,7 @@
         <property name="fixesToSchema"><value>2006</value></property>
         <property name="targetSchema"><value>2007</value></property>
         <property name="permissionService">
-        	<ref bean="permissionService"/>
+           <ref bean="permissionService"/>
         </property>
         <property name="nodeService">
             <ref bean="nodeService"/>
@@ -1742,7 +1742,7 @@
         </property>
     </bean>
     
-	<bean id="patch.db-V3.2-Remove-AVM-Issuer" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+   <bean id="patch.db-V3.2-Remove-AVM-Issuer" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V3.2-Remove-AVM-Issuer</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1809,7 +1809,7 @@
         </property>
     </bean>
     
-	<bean id="patch.db-V3.2-LockTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+   <bean id="patch.db-V3.2-LockTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V3.2-LockTables</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1860,8 +1860,8 @@
             </list>
         </property>
     </bean>
-	
-	<bean id="patch.authorityDefaultZonesPatch" class="org.alfresco.repo.admin.patch.impl.AuthorityDefaultZonesPatch" parent="basePatch" >
+   
+   <bean id="patch.authorityDefaultZonesPatch" class="org.alfresco.repo.admin.patch.impl.AuthorityDefaultZonesPatch" parent="basePatch" >
         <property name="id"><value>patch.authorityDefaultZonesPatch</value></property>
         <property name="description"><value>patch.authorityDefaultZonesPatch.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1870,13 +1870,13 @@
         <property name="authorityService">
             <ref bean="authorityService" />
         </property>
-		<property name="avmService">
+      <property name="avmService">
             <ref bean="avmService" />
         </property>
-		<property name="siteService">
+      <property name="siteService">
             <ref bean="siteService" />
         </property>
-		<property name="hibernateSessionHelper">
+      <property name="hibernateSessionHelper">
             <ref bean="hibernateSessionHelper"/>
         </property>
         <property name="dependsOn">
@@ -1910,7 +1910,7 @@
         </property>
     </bean>
     
-	<bean id="patch.db-V3.2-ContentTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+   <bean id="patch.db-V3.2-ContentTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V3.2-ContentTables</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1932,5 +1932,16 @@
             <value>classpath:alfresco/dbscripts/upgrade/3.2/${db.script.dialect}/modify-AVM-mimetype.sql</value>
         </property>
     </bean>
+
+    <bean id="patch.db-V3.2-Upgrade-JBPM" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V3.2-Upgrade-JBPM</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>2017</value></property>
+        <property name="targetSchema"><value>2018</value></property>
+        <property name="scriptUrl">           
+            <value>classpath:alfresco/dbscripts/upgrade/3.2/${db.script.dialect}/jbpm-upgrade.sql</value>
+        </property>
+    </bean>
     
 </beans>
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 5379781021..2240c7027d 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=2017
+version.schema=2018