diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 26a2e8f4b..9306d6b0a 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index b3bb86182..d9f984738 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index a47b40e8a..97617253e 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 0d0957ab8..adeb35ff2 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 143223ed8..54eb6b470 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 237b612f1..896ae3f80 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 438325c17..b7355e559 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index b3de935b0..186fe66a6 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 6023ef77b..17d47dcd1 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index a8c5bc0ef..d6dba90a4 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index b98a545e1..2a1a5b7b7 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 1bf4aa51d..69f9c456b 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index b39367d67..8998eab4f 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 5f1983e15..b1c47316b 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 1b8de0b00..80ca13195 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 8d5a3bbd8..994b3504a 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index b0204c236..a93c1f2d7 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index c52d004ae..40f5fff2a 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,94 +71,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-dbmigration-runner</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.6.0-FOC1</version>
+        <version>13.6.0-FOC2-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 582bb4de9..c94109bd2 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index e12b1a903..d791dee7e 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 
   <dependencies>
@@ -35,19 +35,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -138,21 +138,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-dbmigration-runner/pom.xml b/ebean-dbmigration-runner/pom.xml
index 9b122c885..fa8d1bfe0 100644
--- a/ebean-dbmigration-runner/pom.xml
+++ b/ebean-dbmigration-runner/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean dbmigration runner</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index a9c967835..705848682 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,14 +58,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index da736de79..c1c3f9b29 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 3ce80120f..dc9bd8791 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 9fc05321e..0688e2b8f 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index f91be70de..0f416e939 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index ea19a1c8f..1e4936d97 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 1d6c677eb..4016f5cf8 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -106,14 +106,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 7c7347b5c..d20986909 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index fc140ed6f..687ea1827 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index cfeba4fef..6fb39fcdb 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 6dd2c77b8..56b1331f0 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 5b12980a0..2a8ba9e5f 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -36,6 +36,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 1058ca46a..a4b5bc8e7 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 885d8f499..0887903a8 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index b7b7e360a..83fc3e7bc 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index e2405d0e1..84a9d11f7 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 0aedd9ecb..03b36fb56 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 0dd87771b..87896ae13 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 3cfdfd68b..c01a8e3b3 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index f1568796e..5ea466ce8 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 2779fbfe6..9fb063284 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 90315343d..543709207 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 67ec2e1fb..4db11d9a2 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC1</version>
+      <version>13.6.0-FOC2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index d6a2e0fea..1cab739da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.6.0-FOC1</version>
+  <version>13.6.0-FOC2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>ebean-parent-13.6.0-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index f22111e07..b7dba4d26 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.0-FOC1</version>
+    <version>13.6.0-FOC2-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>