diff --git a/distro/build.xml b/distro/build.xml
index 0ae4ace0f4d6cb3454e8bebc8c0942869820aead..eabcbb44a0d138444f4adab407e4c9977891a627 100644
--- a/distro/build.xml
+++ b/distro/build.xml
@@ -4,7 +4,7 @@
 
 	<property file="${user.home}/.activiti/build.properties" />
 
-	<property name="activiti.version" value="5.16.4" />
+	<property name="activiti.version" value="5.17.0-SNAPSHOT" />
 	<property name="target.distro.root" value="target/zip/activiti-${activiti.version}" />
 	<property name="activiti.website" value="../../activiti-website" />
 
diff --git a/distro/src/readme.html b/distro/src/readme.html
index 0ec987ca6dbf7ba167df0b70be3a1d95576436b4..99437d29ba8bc16daae058cf958bd11bbb1231cc 100644
--- a/distro/src/readme.html
+++ b/distro/src/readme.html
@@ -35,6 +35,13 @@
 
   <h1>Activiti Release Notes</h1>
   
+  <h3>Release Notes - Activiti - Version 5.17.0</h3>
+  
+  <h4>Highlights</h4>
+   <ul>
+    <li></li>
+   </ul>
+  
   <h3>Release Notes - Activiti - Version 5.16.4</h3>
   
   <h4>Highlights</h4>
diff --git a/modules/activiti-bpmn-converter/pom.xml b/modules/activiti-bpmn-converter/pom.xml
index 901beafaab9243a9dc32d4d7b5c0be46a4b3c9ef..830e9b65d021d79099ee781aa3e7298063469f3f 100644
--- a/modules/activiti-bpmn-converter/pom.xml
+++ b/modules/activiti-bpmn-converter/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
   
   <properties>
diff --git a/modules/activiti-bpmn-layout/pom.xml b/modules/activiti-bpmn-layout/pom.xml
index e61921d8294163a43176def8d335aabde23710b4..d432a32272b4179968093660288cc51817cb893b 100644
--- a/modules/activiti-bpmn-layout/pom.xml
+++ b/modules/activiti-bpmn-layout/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/modules/activiti-bpmn-model/pom.xml b/modules/activiti-bpmn-model/pom.xml
index 1175d5d485c13151b3b8adfd89894afd6383e794..350400ad9fe6a35f97429470a65bc0a21a3cabc0 100644
--- a/modules/activiti-bpmn-model/pom.xml
+++ b/modules/activiti-bpmn-model/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
   
   <properties>
diff --git a/modules/activiti-camel/pom.xml b/modules/activiti-camel/pom.xml
index 518acb61210e25727e0e44081802e1558bb166fa..5555b67f889856858abff126889eacfac69b2ace 100644
--- a/modules/activiti-camel/pom.xml
+++ b/modules/activiti-camel/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
 
diff --git a/modules/activiti-cdi/pom.xml b/modules/activiti-cdi/pom.xml
index 226a0263e36ee4dd971f349d82b5f9649944d6f4..4d276d110f949924e054af09de2bcee5066d2255 100755
--- a/modules/activiti-cdi/pom.xml
+++ b/modules/activiti-cdi/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
 
diff --git a/modules/activiti-common-rest/pom.xml b/modules/activiti-common-rest/pom.xml
index d53e8a27a57b8bd500a186032c27659ee7b65e1f..717bd2735f6426866cba089dd5154db42c58f6fb 100644
--- a/modules/activiti-common-rest/pom.xml
+++ b/modules/activiti-common-rest/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/modules/activiti-crystalball/pom.xml b/modules/activiti-crystalball/pom.xml
index aa649e400302cb19ac7691f8ea979e52704dde8b..9afeb97c5260ff0cbba0b127f22e4cfb4529e24f 100644
--- a/modules/activiti-crystalball/pom.xml
+++ b/modules/activiti-crystalball/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
   
   <build>
diff --git a/modules/activiti-cxf/pom.xml b/modules/activiti-cxf/pom.xml
index 40af3d4b415ed71670d96106da1ff79414dd7d02..d2de186d6ba5288908c9a5c7256fe1f1ed9257cf 100644
--- a/modules/activiti-cxf/pom.xml
+++ b/modules/activiti-cxf/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
   
   <properties>
diff --git a/modules/activiti-diagram-rest/pom.xml b/modules/activiti-diagram-rest/pom.xml
index 443e5855b92c74e443e54d6ff99edb9616e5de20..5363c329f9904c2f50a1ad353d8c14087c83035d 100644
--- a/modules/activiti-diagram-rest/pom.xml
+++ b/modules/activiti-diagram-rest/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/modules/activiti-engine/pom.xml b/modules/activiti-engine/pom.xml
index c6e059dc3b78b2823bd49babbbc0defd2d0b581f..5460336146b605ee33effda5f00a30bc6b71e58d 100755
--- a/modules/activiti-engine/pom.xml
+++ b/modules/activiti-engine/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngine.java b/modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngine.java
index 335c42957d0d4595a84eb9caaa87a62d11a7dbd4..d841272dc77cbff598304f2724e9dc98b1b57cd7 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngine.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngine.java
@@ -49,7 +49,7 @@ package org.activiti.engine;
 public interface ProcessEngine extends EngineServices {
 
   /** the version of the activiti library */
-  public static String VERSION = "5.16.4.0";
+  public static String VERSION = "5.17.0.0";
 
   /** The name as specified in 'process-engine-name' in 
    * the activiti.cfg.xml configuration file.
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql
index 02746cfbd9f3ba1896394e74f666ac1b4ea5051a..bb321194bcce5219fcf52df3a3641436f060e52b 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.16.4.0', 1);
+values ('schema.version', '5.17.0.0', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.16.4.0)', 1);
+values ('schema.history', 'create(5.17.0.0)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql
index 03c704463c6a13e91dde7706a9828dc1fa1cf80e..1d5da4172e98e4b4dd982a588d204e170bc9aa53 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.16.4.0', 1);
+values ('schema.version', '5.17.0.0', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.16.4.0)', 1);
+values ('schema.history', 'create(5.17.0.0)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql
index cb02c3e4fecb1d512953446cd6ea9f6b9ec8ec59..9dd5b4b4b80ed6ea61ed8e32679c97a65a2cb712 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.16.4.0', 1);
+values ('schema.version', '5.17.0.0', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.16.4.0)', 1);
+values ('schema.history', 'create(5.17.0.0)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql
index c6578e743a8e58d8518fc7487fcc7b200aca8b9a..48809ab0f377359443fd814da854ef240f36aa6c 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.16.4.0', 1);
+values ('schema.version', '5.17.0.0', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.16.4.0)', 1);
+values ('schema.history', 'create(5.17.0.0)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql55.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql55.create.engine.sql
index da9bb81ae5a20267431322426cb505d0b4822b69..a1c8ea3f9aa72de635701afc76a6bd9e7fef8fb3 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql55.create.engine.sql
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql55.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.16.4.0', 1);
+values ('schema.version', '5.17.0.0', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.16.4.0)', 1);
+values ('schema.history', 'create(5.17.0.0)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql
index c53d3768c2ee020e5faabe4988100afbcc86e98e..58032dc3251fcc83cbdcb6a26ec1247161f9094b 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.16.4.0', 1);
+values ('schema.version', '5.17.0.0', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.16.4.0)', 1);
+values ('schema.history', 'create(5.17.0.0)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql
index 5cc499d5f4838f515a15488b6304a63449728e5f..2a2154e99c22940f0718fd9a926344360021c6cd 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.16.4.0', 1);
+values ('schema.version', '5.17.0.0', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.16.4.0)', 1);
+values ('schema.history', 'create(5.17.0.0)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.51640.to.51700.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.51640.to.51700.engine.sql
new file mode 100644
index 0000000000000000000000000000000000000000..c7a6d027781ed124ac20eb2b1f42bfc72d8771d2
--- /dev/null
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.51640.to.51700.engine.sql
@@ -0,0 +1 @@
+update ACT_GE_PROPERTY set VALUE_ = '5.17.0.0' where NAME_ = 'schema.version';
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.51640.to.51700.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.51640.to.51700.engine.sql
new file mode 100644
index 0000000000000000000000000000000000000000..c7a6d027781ed124ac20eb2b1f42bfc72d8771d2
--- /dev/null
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.51640.to.51700.engine.sql
@@ -0,0 +1 @@
+update ACT_GE_PROPERTY set VALUE_ = '5.17.0.0' where NAME_ = 'schema.version';
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.51640.to.51700.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.51640.to.51700.engine.sql
new file mode 100644
index 0000000000000000000000000000000000000000..c7a6d027781ed124ac20eb2b1f42bfc72d8771d2
--- /dev/null
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.51640.to.51700.engine.sql
@@ -0,0 +1 @@
+update ACT_GE_PROPERTY set VALUE_ = '5.17.0.0' where NAME_ = 'schema.version';
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.51640.to.51700.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.51640.to.51700.engine.sql
new file mode 100644
index 0000000000000000000000000000000000000000..c7a6d027781ed124ac20eb2b1f42bfc72d8771d2
--- /dev/null
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.51640.to.51700.engine.sql
@@ -0,0 +1 @@
+update ACT_GE_PROPERTY set VALUE_ = '5.17.0.0' where NAME_ = 'schema.version';
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql55.upgradestep.51640.to.51700.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql55.upgradestep.51640.to.51700.engine.sql
new file mode 100644
index 0000000000000000000000000000000000000000..c7a6d027781ed124ac20eb2b1f42bfc72d8771d2
--- /dev/null
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql55.upgradestep.51640.to.51700.engine.sql
@@ -0,0 +1 @@
+update ACT_GE_PROPERTY set VALUE_ = '5.17.0.0' where NAME_ = 'schema.version';
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.51640.to.51700.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.51640.to.51700.engine.sql
new file mode 100644
index 0000000000000000000000000000000000000000..c7a6d027781ed124ac20eb2b1f42bfc72d8771d2
--- /dev/null
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.51640.to.51700.engine.sql
@@ -0,0 +1 @@
+update ACT_GE_PROPERTY set VALUE_ = '5.17.0.0' where NAME_ = 'schema.version';
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.51640.to.51700.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.51640.to.51700.engine.sql
new file mode 100644
index 0000000000000000000000000000000000000000..c7a6d027781ed124ac20eb2b1f42bfc72d8771d2
--- /dev/null
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.51640.to.51700.engine.sql
@@ -0,0 +1 @@
+update ACT_GE_PROPERTY set VALUE_ = '5.17.0.0' where NAME_ = 'schema.version';
\ No newline at end of file
diff --git a/modules/activiti-explorer/pom.xml b/modules/activiti-explorer/pom.xml
index fa9550ffcab1812d5f52a859220c68a2b6ad6fdc..5fb80755442fdae31df3a4091ee90df9c21c6ab9 100644
--- a/modules/activiti-explorer/pom.xml
+++ b/modules/activiti-explorer/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/modules/activiti-image-generator/pom.xml b/modules/activiti-image-generator/pom.xml
index bf0db1b0d30c44b5ebd605dc574f059e40adaca0..b98df5ce8ff278d1041f9d45e1b22604d1b27247 100644
--- a/modules/activiti-image-generator/pom.xml
+++ b/modules/activiti-image-generator/pom.xml
@@ -11,7 +11,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.16.4</version>
+		<version>5.17.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/modules/activiti-json-converter/pom.xml b/modules/activiti-json-converter/pom.xml
index d4957798f46d4d1e9ef250e75b20fec2f0dc3e58..e1ac1625be62ca7c81362d650a47d982fc1b1e69 100644
--- a/modules/activiti-json-converter/pom.xml
+++ b/modules/activiti-json-converter/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
   
   <properties>
diff --git a/modules/activiti-ldap/pom.xml b/modules/activiti-ldap/pom.xml
index e818be7d9b92a64d1d881fde76aeab91c6f18fcf..95b969c501e55015fc7f71d9f0ed336305b5d9b7 100644
--- a/modules/activiti-ldap/pom.xml
+++ b/modules/activiti-ldap/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.16.4</version>
+		<version>5.17.0-SNAPSHOT</version>
 	</parent>
   
   <properties>
diff --git a/modules/activiti-modeler/pom.xml b/modules/activiti-modeler/pom.xml
index 187e08379971b73c6e483546d1f7a2367c6deafc..1bb73959c91fb652314cc830455525cac35112dc 100644
--- a/modules/activiti-modeler/pom.xml
+++ b/modules/activiti-modeler/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/modules/activiti-mule/pom.xml b/modules/activiti-mule/pom.xml
index 79a7c8f3aec68e82bedf9477d2b193988d65e51f..9038ffe2a2f855a9188e5abc9aa56c4875b40ef1 100644
--- a/modules/activiti-mule/pom.xml
+++ b/modules/activiti-mule/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
   
   <properties>
diff --git a/modules/activiti-osgi/pom.xml b/modules/activiti-osgi/pom.xml
index c1980249d581972e4ca46a8fa7803090e311d0fb..927bba9cc32e8e451c475de36112dbef74576b9a 100644
--- a/modules/activiti-osgi/pom.xml
+++ b/modules/activiti-osgi/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java b/modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
index d2d3ec163adbc993706dc674880e8ff422fdf889..89e815c54769982462058488e515f674e2612a4f 100755
--- a/modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
+++ b/modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
@@ -79,11 +79,11 @@ public class BlueprintBasicTest {
   @Configuration
   public Option[] createConfiguration() {
     Option[] coreBundles = options(
-        mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-model").version("5.16.4"),
-        mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-converter").version("5.16.4"),
-        mavenBundle().groupId("org.activiti").artifactId("activiti-process-validation").version("5.16.4"),
-        mavenBundle().groupId("org.activiti").artifactId("activiti-image-generator").version("5.16.4"),
-        mavenBundle().groupId("org.activiti").artifactId("activiti-engine").version("5.16.4"),
+        mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-model").version("5.17.0-SNAPSHOT"),
+        mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-converter").version("5.17.0-SNAPSHOT"),
+        mavenBundle().groupId("org.activiti").artifactId("activiti-process-validation").version("5.17.0-SNAPSHOT"),
+        mavenBundle().groupId("org.activiti").artifactId("activiti-image-generator").version("5.17.0-SNAPSHOT"),
+        mavenBundle().groupId("org.activiti").artifactId("activiti-engine").version("5.17.0-SNAPSHOT"),
         mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version("3.3.2"),
         mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.2.3"),
         mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.2.3"),
diff --git a/modules/activiti-process-validation/pom.xml b/modules/activiti-process-validation/pom.xml
index 2b271f60d76be2bce743ff197af622dd24689462..bd0c17c7c4cd5b5b634e6501242b67513205f03e 100644
--- a/modules/activiti-process-validation/pom.xml
+++ b/modules/activiti-process-validation/pom.xml
@@ -11,7 +11,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.16.4</version>
+		<version>5.17.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/modules/activiti-rest/pom.xml b/modules/activiti-rest/pom.xml
index f41cd216f07b7bdb13ce98be15857bd780b329f0..83ef3a116bc6c58eae2ff3ebef3b8112dad5532d 100644
--- a/modules/activiti-rest/pom.xml
+++ b/modules/activiti-rest/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/modules/activiti-simple-workflow-alfresco/pom.xml b/modules/activiti-simple-workflow-alfresco/pom.xml
index a5b07f92e5102bd50ec6df2758746a360d344e2f..393e939c07a3cf7734b1a0216ab9f9057879ceb6 100644
--- a/modules/activiti-simple-workflow-alfresco/pom.xml
+++ b/modules/activiti-simple-workflow-alfresco/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/modules/activiti-simple-workflow/pom.xml b/modules/activiti-simple-workflow/pom.xml
index 0dd3fe14768a53e2da783e58c4201c36d34aaee5..b99340a3fd63efe0c23629e5357fea617f8d1e83 100644
--- a/modules/activiti-simple-workflow/pom.xml
+++ b/modules/activiti-simple-workflow/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/modules/activiti-spring-boot/pom.xml b/modules/activiti-spring-boot/pom.xml
index d343ccd8ba1721df701399bf8b6777c469ac0b6c..0f599a6319abfc77acb8933a631dcb4931de54dc 100644
--- a/modules/activiti-spring-boot/pom.xml
+++ b/modules/activiti-spring-boot/pom.xml
@@ -7,7 +7,7 @@
         <groupId>org.activiti</groupId>
         <artifactId>activiti-root</artifactId>
         <relativePath>../..</relativePath>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
 
diff --git a/modules/activiti-spring-boot/spring-boot-samples/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/pom.xml
index 1e5aa481058a6bddd0eb0ad7d01a748e8b3ba77e..5eb5fa7ae5e0c9ec0e9d98f2a61227c6f7b82125 100644
--- a/modules/activiti-spring-boot/spring-boot-samples/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-samples/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-samples</artifactId>
diff --git a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-actuator/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-actuator/pom.xml
index d11481a0eb63f4cf46bfec8879fb7b38a79c7140..276c07e13c886d1fd09e09526576a5b48fab052b 100644
--- a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-actuator/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-actuator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-samples</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-sample-actuator</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-            <version>5.16.4</version>
+            <version>5.17.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-basic/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-basic/pom.xml
index 135c7c2fcbf1cf152fa4cafd8ea2fc3cdb7845e4..28291db41335ce9c0f1dfca08d718977e2f90c41 100644
--- a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-basic/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-basic/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.activiti</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>5.16.4</version>
+		<version>5.17.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-boot-sample-basic</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.activiti</groupId>
 			<artifactId>spring-boot-starter-basic</artifactId>
-			<version>5.16.4</version>
+			<version>5.17.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-integration/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-integration/pom.xml
index 931e79957e2a259b539821c5aecabfe127f062b3..611a4bb892bbd4a706df375bb81a658973c275a2 100644
--- a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-integration/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-integration/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-samples</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-sample-integration</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>spring-boot-starter-integration</artifactId>
-            <version>5.16.4</version>
+            <version>5.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-jpa/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-jpa/pom.xml
index 8b8c4a82759a90d1eacaa186173c768695009ff4..2d0e6c943d4bf1abda2f385eb7297e2e82b5afc7 100644
--- a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-jpa/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-jpa/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-samples</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-sample-jpa</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>spring-boot-starter-jpa</artifactId>
-            <version>5.16.4</version>
+            <version>5.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api-security/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api-security/pom.xml
index 67d1402a45b4b71f0a19cb752ec586a4b71b0c98..bdb8acd0cef4ca1d29e25c4deaf0db80e9d24425 100644
--- a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api-security/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api-security/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-samples</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-sample-rest-api-security</artifactId>
@@ -15,13 +15,13 @@
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>spring-boot-starter-rest-api</artifactId>
-            <version>5.16.4</version>
+            <version>5.17.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
-            <version>5.16.4</version>
+            <version>5.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api/pom.xml
index 83b6691ff8992d2b6848edb940713cddfec953bb..5536982e68e77101c35498e511b395a663442918 100644
--- a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-samples</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-sample-rest-api</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>spring-boot-starter-rest-api</artifactId>
-            <version>5.16.4</version>
+            <version>5.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-security/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-security/pom.xml
index c6777e0ae528d0670d1e40c35273db249c1a781c..edcc6f43e88df1c17929a4213945da50de177bfd 100644
--- a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-security/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-samples</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-sample-security</artifactId>
diff --git a/modules/activiti-spring-boot/spring-boot-starters/pom.xml b/modules/activiti-spring-boot/spring-boot-starters/pom.xml
index 1e3234a60cdf60eec881c2323e178b017a6be8c5..c423d976f715b4cf63147e6e8233a970bf24e3db 100644
--- a/modules/activiti-spring-boot/spring-boot-starters/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-starters</artifactId>
diff --git a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-actuator/pom.xml b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-actuator/pom.xml
index 700a54f55126879e06da0bc6b7e766ae05ecd787..d2522acdfe2465b595812d2737c6385256cd4748 100644
--- a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-actuator/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-actuator/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-starters</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-starter-actuator</artifactId>
diff --git a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-basic/pom.xml b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-basic/pom.xml
index 89a7a13c0bf9c63a9d08b9678d5d868c97ed3a2f..7f60603e68e24fc3a5c116f6c2e183e3c1ddb963 100644
--- a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-basic/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-basic/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-starters</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-starter-basic</artifactId>
diff --git a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-integration/pom.xml b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-integration/pom.xml
index 27e7648dac01cd84c9d6a4265f6da52fac0ed382..d0f361d6284d644471e39f6644847a046e954aa1 100644
--- a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-integration/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-integration/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-starters</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-starter-integration</artifactId>
diff --git a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-jpa/pom.xml b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-jpa/pom.xml
index f8ebd560b1a0dd57908d0efb2a260542ec980739..c117074cf6ed0d9346e2e1eadf788d593acf5108 100644
--- a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-jpa/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-jpa/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-starters</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-starter-jpa</artifactId>
diff --git a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-rest-api/pom.xml b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-rest-api/pom.xml
index 875a1abf7529868aeda34b9109cd177a0ecaf0e1..cfac300744cb65be366f886bc6e996a2a6927589 100644
--- a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-rest-api/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-rest-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-starters</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-starter-rest-api</artifactId>
diff --git a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-security/pom.xml b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-security/pom.xml
index f10cd6e28e96b35ee9dbe4346c05be443a83887b..77b4ab85be0c7bfce7861356f12ae560676cff4e 100644
--- a/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-security/pom.xml
+++ b/modules/activiti-spring-boot/spring-boot-starters/spring-boot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.activiti</groupId>
         <artifactId>spring-boot-starters</artifactId>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-boot-starter-security</artifactId>
diff --git a/modules/activiti-spring/pom.xml b/modules/activiti-spring/pom.xml
index b210980af334563bb3f1c1393805e4f5469b01a5..a068032b0be1aed9c0aa20d62d0812460f4629f3 100644
--- a/modules/activiti-spring/pom.xml
+++ b/modules/activiti-spring/pom.xml
@@ -9,7 +9,7 @@
         <groupId>org.activiti</groupId>
         <artifactId>activiti-root</artifactId>
         <relativePath>../..</relativePath>
-        <version>5.16.4</version>
+        <version>5.17.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/modules/activiti-webapp-angular/pom.xml b/modules/activiti-webapp-angular/pom.xml
index f9097ad4bd809a4c054394aea6f6efffe0cb4a0c..b2b451d795506db34006489dcc4eba598821d450 100644
--- a/modules/activiti-webapp-angular/pom.xml
+++ b/modules/activiti-webapp-angular/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.16.4</version>
+		<version>5.17.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/modules/activiti-webapp-explorer2/pom.xml b/modules/activiti-webapp-explorer2/pom.xml
index 30f68453d771209f5e63e0b357828e6e64613480..830885ddd81e910ebb0a20fbad0bd8fe685256d4 100644
--- a/modules/activiti-webapp-explorer2/pom.xml
+++ b/modules/activiti-webapp-explorer2/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/modules/activiti-webapp-rest2/pom.xml b/modules/activiti-webapp-rest2/pom.xml
index c58b496650503e96af38a0070d5cc390c2d8b34c..5ce23a5d24c3b1e92ca3dde544b3c7fef4dd376c 100644
--- a/modules/activiti-webapp-rest2/pom.xml
+++ b/modules/activiti-webapp-rest2/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
   
   <build>
diff --git a/pom.xml b/pom.xml
index ea7a70d0d2f8460d84db9c40cc6431145cd6b0ba..4c2c363a9eff1dab01bad5b88c30e6e5c92f6205 100755
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   </parent>
 
   <packaging>pom</packaging>
-  <version>5.16.4</version>
+  <version>5.17.0-SNAPSHOT</version>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spring.framework.version>4.0.6.RELEASE</spring.framework.version>
diff --git a/qa/dbclean/pom.xml b/qa/dbclean/pom.xml
index 84112e1c548ca8d3b731f4aa56571df4b3b8a708..e1e1365244399a5d55547abf1e7567f2098c2f11 100644
--- a/qa/dbclean/pom.xml
+++ b/qa/dbclean/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>activiti-dbclean</artifactId>
 
   <packaging>pom</packaging>
-  <version>5.16.4</version>
+  <version>5.17.0-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
diff --git a/qa/upgrade/pom.xml b/qa/upgrade/pom.xml
index 4a9ed041dd96faf84a9def87fbb13fabc6e7ff0f..99e2bd1976cd678f68c8129a94a014181be96dbb 100644
--- a/qa/upgrade/pom.xml
+++ b/qa/upgrade/pom.xml
@@ -6,13 +6,13 @@
   <name>Activiti - Upgrade Fetcher</name>
   <groupId>org.activiti</groupId>
   <artifactId>activiti-upgrade-fetcher</artifactId>
-  <version>5.16.4</version>
+  <version>5.17.0-SNAPSHOT</version>
 
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.16.4</version>
+    <version>5.17.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/userguide/src/en/index.xml b/userguide/src/en/index.xml
index 76991dd838f4a27c44d24d35d9c08c16e27c3c0d..bd0ac15fce8c49b259ec6fb896075a560542da8e 100644
--- a/userguide/src/en/index.xml
+++ b/userguide/src/en/index.xml
@@ -23,7 +23,7 @@
 
 <book>
 
-  <bookinfo><title>Activiti 5.16.4 User Guide</title></bookinfo>
+  <bookinfo><title>Activiti 5.17.0-SNAPSHOT User Guide</title></bookinfo>
   
   <toc />