diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 168c64b5d..838cd761d 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 0b11f8e63..ed902d0d8 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 5af1fa1ef..26e1ca1ab 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index e27f722c1..16a25b8ef 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 8e18af012..5a380c065 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 311af73ee..d83c273cc 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 883e05f73..09b6fb24f 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 565aac29c..ba3e4a9f8 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 159917357..d558a5b0f 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 313d9fe07..3f9d4085c 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index f89ebc5f1..9cef6eb30 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index ddfd35458..8a7e3d710 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 8b1a9b582..f9a25c775 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 48e5146f8..93dac2314 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/pom.xml b/composites/pom.xml
index 8cf659c0c..b5737db90 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 280698ef9..d093864a0 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/DatabaseConfigTest.java b/ebean-api/src/test/java/io/ebean/config/DatabaseConfigTest.java
similarity index 96%
rename from ebean-test/src/test/java/io/ebean/xtest/config/DatabaseConfigTest.java
rename to ebean-api/src/test/java/io/ebean/config/DatabaseConfigTest.java
index 3568595b0..6b17cdc84 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/config/DatabaseConfigTest.java
+++ b/ebean-api/src/test/java/io/ebean/config/DatabaseConfigTest.java
@@ -1,4 +1,4 @@
-package io.ebean.xtest.config;
+package io.ebean.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.annotation.MutationDetection;
@@ -17,11 +17,10 @@ import java.util.Properties;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class DatabaseConfigTest {
+class DatabaseConfigTest {
 
   @Test
-  public void testLoadFromEbeanProperties() {
-
+  void testLoadFromEbeanProperties() {
     DatabaseConfig config = new DatabaseConfig();
     config.loadFromProperties();
 
@@ -30,8 +29,7 @@ public class DatabaseConfigTest {
   }
 
   @Test
-  public void evalPropertiesInput() {
-
+  void evalPropertiesInput() {
     String home = System.getProperty("user.home");
     String fileSeparator = System.getProperty("file.separator");
 
@@ -46,8 +44,7 @@ public class DatabaseConfigTest {
   }
 
   @Test
-  public void testLoadWithProperties() {
-
+  void testLoadWithProperties() {
     DatabaseConfig config = new DatabaseConfig();
     config.setPersistBatch(PersistBatch.NONE);
     config.setPersistBatchOnCascade(PersistBatch.NONE);
@@ -154,8 +151,7 @@ public class DatabaseConfigTest {
   }
 
   @Test
-  public void test_defaults() {
-
+  void test_defaults() {
     DatabaseConfig config = new DatabaseConfig();
     assertTrue(config.isIdGeneratorAutomatic());
     assertTrue(config.isDefaultServer());
@@ -186,8 +182,7 @@ public class DatabaseConfigTest {
   }
 
   @Test
-  public void test_putServiceObject() {
-
+  void test_putServiceObject() {
     ObjectMapper objectMapper = new ObjectMapper();
 
     DatabaseConfig config = new DatabaseConfig();
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 5edec5c80..7cec7796f 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index a3ab412dc..13111f4a6 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,25 +71,25 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
@@ -101,64 +101,64 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index bfc7a9b9a..14e9e36d4 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 2c215bb6b..56e0a1581 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -35,19 +35,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -138,21 +138,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-dbmigration-runner/pom.xml b/ebean-dbmigration-runner/pom.xml
index ce13de761..5282cf764 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean dbmigration runner</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 530a54797..4dfbf009b 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,14 +58,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 144f066e7..9966cdeaf 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index d7d12e0b0..3dd36e1e3 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <scm>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index b7fd2e89e..4b81d57d6 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -2,19 +2,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>ebean-kotlin</artifactId>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <ebean-maven-plugin.version>12.14.1</ebean-maven-plugin.version>
     <kotlin.version>1.6.0</kotlin.version>
   </properties>
 
@@ -29,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -51,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index b5c399b83..e0c9962e6 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index bfdb92ad7..a06806e38 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 32036c8bc..d6bc05cdc 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index bb19f8949..4f2e29c0c 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java b/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
index afd83b4d0..c751732cf 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
@@ -29,16 +29,17 @@ public class AutoConfigureForTesting implements AutoConfigure {
 
   @Override
   public void preConfigure(DatabaseConfig config) {
-
+    if (!config.isDefaultServer()) {
+      log.info("skip automatic testing config on non-default server name:{} register:{}", config.getName(), config.isRegister());
+      return;
+    }
     Properties properties = config.getProperties();
     if (isExtraServer(config, properties)) {
       setupExtraDataSourceIfNecessary(config);
       return;
     }
-
     String testPlatform = properties.getProperty("ebean.test.platform");
-    log.debug("automatic testing config - with ebean.test.platform:{} environment db:{} name:{}", testPlatform, environmentDb, config.getName());
-
+    log.debug("automatic testing config - with ebean.test.platform:{} name:{} environmentDb:{}", testPlatform, config.getName(), environmentDb);
     if (RunOnceMarker.isRun()) {
       setupPlatform(environmentDb, config);
     }
@@ -46,8 +47,10 @@ public class AutoConfigureForTesting implements AutoConfigure {
 
   @Override
   public void postConfigure(DatabaseConfig config) {
+    if (!config.isDefaultServer()) {
+      return;
+    }
     setupProviders(config);
-    
     if (org.h2.engine.Constants.VERSION_MAJOR == 1) {
       // This code may be removed later, when droppinv H2 1.xxx compatibility
       System.err.println("Running tests in H2 1.xxx compatibility mode");
diff --git a/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java b/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java
index 880946f7f..2c1aeb245 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java
@@ -68,6 +68,8 @@ public abstract class BaseTestCase {
       DB_CLOCK_DELTA = 100;
     }
     try {
+      String propsFile = System.getProperty("props.file");
+      System.out.println("BaseTestCase: -Dprops.file=" + propsFile); // help debug CI
       // First try, if we get the default server. If this fails, all tests will fail.
       DB.getDefault();
     } catch (Throwable e) {
diff --git a/ebean-test/src/test/resources/logback-test.xml b/ebean-test/src/test/resources/logback-test.xml
index bfe4a1ede..3f022e12c 100644
--- a/ebean-test/src/test/resources/logback-test.xml
+++ b/ebean-test/src/test/resources/logback-test.xml
@@ -72,11 +72,12 @@
     <appender-ref ref="STDOUT"/>
   </root>
 
-
   <logger name="org.tests" level="INFO"/>
   <logger name="io.ebean" level="INFO"/>
-
+  <logger name="io.avaje.config" level="TRACE"/>
   <logger name="io.ebean.docker" level="TRACE"/>
+  <logger name="io.ebean.test" level="TRACE"/>
+
 <!--  <logger name="io.ebean.DDL" level="DEBUG"/>-->
 
 <!--  <logger name="io.ebean.SQL" level="TRACE"/>-->
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 3d2d7e1fe..d382456d5 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 72f0b03bc..48e23547d 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,67 +14,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index ca1b257a6..773f7cce2 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index c7cbca8d9..1ecc98d2f 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 2173463f7..122dd9e64 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-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 9ac7e0008..0b6d7e551 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 122853f1d..93e1a71c5 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index d8862a159..86e246fee 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,13 +14,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 279524149..92bc56ee9 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 2d51a3517..b1fa00633 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index f881969d9..8e1a9ccc4 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 50d668b17..35c956ca1 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 430399682..8f58bed21 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 57f14f074..a5996b85e 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index b47d4707d..c1dc81816 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 1bf51b1ac..a27cfa255 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index 172a3084d..8fe03d488 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.3.0-SNAPSHOT</version>
+  <version>13.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 167a610e3..caf1edae6 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.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index c17b65724..234eae4a0 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-<!--  <parent>-->
-<!--    <groupId>org.avaje</groupId>-->
-<!--    <artifactId>java11-oss</artifactId>-->
-<!--    <version>2.3</version>-->
-<!--  </parent>-->
 
   <groupId>io.ebean</groupId>
   <artifactId>test-java16</artifactId>
@@ -13,26 +9,25 @@
 
   <properties>
     <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-    <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -58,11 +53,24 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.3.0-SNAPSHOT</version>
+              <version>13.3.1-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>io.repaint.maven</groupId>
+        <artifactId>tiles-maven-plugin</artifactId>
+        <version>2.24</version>
+        <extensions>true</extensions>
+        <configuration>
+          <tiles>
+            <tile>io.ebean.tile:enhancement:13.3.0</tile>
+          </tiles>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 24377e868..cdce9e262 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -4,8 +4,8 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>3.4</version>
-    <relativePath />
+    <version>3.7</version>
+    <relativePath/>
   </parent>
 
   <name>test-kotlin</name>
@@ -17,10 +17,9 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
 
-    <ebean-maven-plugin.version>12.14.1</ebean-maven-plugin.version>
+    <ebean-maven-plugin.version>13.3.0</ebean-maven-plugin.version>
     <kotlin.version>1.6.0</kotlin.version>
     <jackson.version>2.12.1</jackson.version>
-    <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
   <dependencies>
@@ -34,14 +33,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>