diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index e92270b9c..dfc31c3b9 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index e993c680e..eb9fadc37 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index f4785c6cc..beb04af0f 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 47ab90ed5..acde72197 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 5dbc0946a..6bfdc7189 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index e84a47689..ca7ef06b1 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 834c1b997..5e8599e2e 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 0c7eb6b41..949131730 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 03a3480f7..86c6ad0e5 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index ec63dbd6b..fe44dbfd3 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 0f3155556..c8b0c2b43 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 668dfff05..b114c0baa 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index bf6cf5293..3a26f7027 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index db14bf24c..182ad450e 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/pom.xml b/composites/pom.xml
index ea8e0ec24..d7c460c66 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index dcf780061..85e97369c 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index c2ca33791..39288102d 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 6227b2867..6ec6a69d0 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,94 +71,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-dbmigration-runner</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.5.1-FOC2-SNAPSHOT</version>
+        <version>13.6.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 39212b229..1a5499f5e 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index f665ddf37..02984d583 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -35,19 +35,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -138,21 +138,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-dbmigration-runner/pom.xml b/ebean-dbmigration-runner/pom.xml
index c0ba5240c..137a94e99 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean dbmigration runner</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 6ec1ef377..e39fdcd2e 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,14 +58,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 27b46c7d6..43749cadf 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 04d257612..95f437c3c 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <scm>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index d713ca7f5..1232ddbbf 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index fdd617eb9..b0aaa2757 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 6971fa507..cf245fdb4 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 0e44b3e15..b0f875e3e 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 501c10f31..f9983aa9b 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -106,14 +106,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 7dc042333..758a6fba3 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 291dabf84..f72041769 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,67 +14,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index fd4554cc3..40d97bded 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 13ca5340c..2ed4bb7e2 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 8190fa566..db8795282 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 8a6680f7a..18d82cb89 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index e0295b5dd..51407635e 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index de48a324a..2ae8e8f79 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,13 +14,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 579627c45..f8428d1a9 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index aa032413b..875149dab 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 701eba65d..5af870445 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 9f9a7f971..cf7c1e992 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index c7ea2bd64..00c5fd959 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 9b481a20d..7011a06ef 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index d42dadf52..f99093539 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index cf01f1137..f7be6b555 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index 41b86f87f..829f9a53b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.5.1-FOC2-SNAPSHOT</version>
+  <version>13.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index d15e2ce89..371589870 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.5.1-FOC2-SNAPSHOT</version>
+    <version>13.6.0-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>
diff --git a/release.properties b/release.properties
deleted file mode 100644
index 90cbc0464..000000000
--- a/release.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-#release configuration
-#Tue Apr 26 14:36:01 CEST 2022
-projectVersionPolicyId=default
-project.scm.io.ebean\:ebean-clickhouse.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-platform-h2.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-redis.empty=true
-scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel}
-project.scm.io.ebean\:ebean-bom.empty=true
-project.scm.io.ebean\:ebean-platform-clickhouse.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-yugabyte.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:tests.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-core.developerConnection=scm\:git\:git@github.com\:FOCONIS/ebean.git
-project.scm.io.ebean\:ebean-platform-postgres.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-cockroach.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-platform-sqlite.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-core-type.empty=true
-project.scm.io.ebean\:ebean-autotune.developerConnection=scm\:git\:git@github.com\:FOCONIS/ebean.git
-project.scm.io.ebean\:ebean-platform-sqlanywhere.tag=ebean-parent-13.3.1-FOC1
-scm.commentPrefix=[maven-release-plugin] 
-releaseStrategyId=default
-project.scm.io.ebean\:ebean-oracle.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-mysql.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-h2.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:querybean-generator.empty=true
-completedPhase=check-poms
-project.scm.io.ebean\:ebean-dbmigration-runner.empty=true
-project.scm.io.ebean\:ebean-platform-db2.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-platform-mysql.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-db2.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-platform-sqlserver.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-sqlserver.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-externalmapping-xml.tag=ebean-parent-13.3.1-FOC1
-preparationGoals=clean verify
-exec.pomFileName=pom.xml
-project.scm.io.ebean\:ebean-platform-mariadb.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-hana.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-mariadb.tag=ebean-parent-13.3.1-FOC1
-pinExternals=false
-project.scm.io.ebean\:ebean-platform-all.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-api.empty=true
-project.scm.io.ebean\:ebean-postgis.empty=true
-project.scm.io.ebean\:ebean-ddl-generator.empty=true
-project.scm.org.avaje\:test-kotlin.empty=true
-project.scm.io.ebean\:ebean-postgres.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-parent.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-externalmapping-xml.developerConnection=scm\:git\:git@github.com\:FOCONIS/ebean.git
-pushChanges=true
-project.scm.io.ebean\:tests.developerConnection=scm\:git\:git@github.com\:FOCONIS/ebean.git
-project.scm.io.ebean\:ebean-sqlite.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-autotune.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-querybean.empty=true
-project.scm.io.ebean\:composites.empty=true
-project.scm.io.ebean\:ebean-core.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-test.empty=true
-project.scm.io.ebean\:ebean-kotlin.empty=true
-scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel}
-remoteTagging=true
-project.scm.io.ebean\:platforms.empty=true
-project.scm.io.ebean\:ebean-nuodb.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-parent.developerConnection=scm\:git\:git@github.com\:FOCONIS/ebean.git
-project.scm.io.ebean\:ebean-externalmapping-api.empty=true
-scm.url=scm\:git\:git@github.com\:FOCONIS/ebean.git
-scm.developmentCommitComment=@{prefix} prepare for next development iteration
-project.scm.io.ebean\:ebean-platform-oracle.tag=ebean-parent-13.3.1-FOC1
-scm.tagNameFormat=@{project.artifactId}-@{project.version}
-exec.additionalArguments=-Dgpg.skip -DskipTests
-project.scm.io.ebean\:ebean-platform-hana.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:ebean-platform-nuodb.tag=ebean-parent-13.3.1-FOC1
-project.scm.io.ebean\:kotlin-querybean-generator.empty=true
-project.scm.io.ebean\:ebean-platform-hsqldb.tag=ebean-parent-13.3.1-FOC1
-exec.snapshotReleasePluginAllowed=false
-scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel}
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index f153114d9..9e4681ae7 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -52,7 +52,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.5.1-SNAPSHOT</version>
+              <version>13.6.0-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index d11741cf6..179574525 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -33,14 +33,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC2-SNAPSHOT</version>
+      <version>13.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>