diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 18c87b9db..8aed4a84c 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 c5e31f7fe..a7efe4cd8 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 9d8e4cdc1..c842d6f3c 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 6c7f7da00..f0a139c1a 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 61929aeba..beebd638c 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 a0ef096f9..11f4fc729 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 ed44911e4..21e17ec1d 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 70ce2bfda..70c90009c 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 e61b0b0b4..5a9353620 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 d021c8153..b99249d5f 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 336eab524..a98ed0b06 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 9bd6c30eb..9fcb367b0 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</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 23874f822..a9676df86 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 1abe0af86..80a881077 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 5caa79283..c1dd79aae 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index a84134216..5da867e38 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 9f40136e3..9085f1c7f 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 7c64b693c..ba20e7b64 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,94 +71,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-dbmigration-runner</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.6.0-FOC2</version>
+        <version>13.6.0-FOC3-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 28e272ea4..53536a205 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index f409f3a75..0d2768de3 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -138,21 +138,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-dbmigration-runner/pom.xml b/ebean-dbmigration-runner/pom.xml
index eefde3021..bb6b6bb1f 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index c68406f44..99bc699cf 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,14 +58,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index dc80d5840..68b2dd365 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index d082c440c..cd459af41 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>ebean-parent-13.6.0-FOC2</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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 0df9788ab..f728ca5a4 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index bb7ba7780..06f3cc0d7 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index c4e2492bb..f1fe77f79 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index a74927905..870475844 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -106,14 +106,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index b896029d6..9e454d2ec 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 608c37357..2cb714b77 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index daed3ab60..9bbe43471 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index cf9c68047..732534481 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index d66966a46..980a9e883 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-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-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index f81beac6c..8c83f737c 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index e65004ead..01781e6e7 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 3071e0331..8d4468bd5 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.6.0-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 05671442b..6d9c3fdff 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 36f514fe7..5287fe4e1 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 1c98d26ec..d0ac897c6 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 0b6cb0518..a90b6be70 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 7e52303e9..9315ef7a4 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 01f7b8e88..9ed177aa3 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 61b91e8c3..2b84deba4 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 85f175aca..fb1d91912 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-FOC2</version>
+    <version>13.6.0-FOC3-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-FOC2</version>
+      <version>13.6.0-FOC3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.0-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index cd36bfa04..1207759cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.6.0-FOC2</version>
+  <version>13.6.0-FOC3-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-FOC2</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 05bb30901..c35320858 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-FOC2</version>
+    <version>13.6.0-FOC3-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>