diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
index 8bec005..cdaba3d 100755
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
@@ -298,8 +298,7 @@ public class RDBDocumentStore implements DocumentStore {
 
     @Override
     public <T extends Document> List<T> createOrUpdate(Collection<T> collection, List<UpdateOp> updateOps) {
-        if (!BATCHUPDATES
-                || dbInfo == RDBDocumentStoreDB.ORACLE /* see OAK-3938 */) {
+        if (!BATCHUPDATES) {
             List<T> results = new ArrayList<T>(updateOps.size());
             for (UpdateOp update : updateOps) {
                 results.add(createOrUpdate(collection, update));
@@ -782,7 +781,7 @@ public class RDBDocumentStore implements DocumentStore {
                 .build();
         String versionDiags = dbInfo.checkVersion(md);
         if (!versionDiags.isEmpty()) {
-            LOG.info(versionDiags);
+            LOG.error(versionDiags);
         }
 
         if (! "".equals(dbInfo.getInitializationStatement())) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
index d8b5ec7..4dd2870 100755
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
@@ -193,7 +193,13 @@ public enum RDBDocumentStoreDB {
     ORACLE("Oracle") {
         @Override
         public String checkVersion(DatabaseMetaData md) throws SQLException {
-            return RDBJDBCTools.versionCheck(md, 12, 1, description);
+            StringBuilder builder = new StringBuilder();
+            builder.append(RDBJDBCTools.versionCheck(md, 12, 1, description));
+
+            int driverMaj = md.getDriverMajorVersion();
+            int driverMin = md.getDriverMinorVersion();
+            builder.append(RDBJDBCTools.versionCheck(driverMaj, driverMin, 12, 1, description + " driver"));
+            return builder.toString();
         }
 
         @Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
index 58bb221..917e1bd 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
@@ -211,6 +211,10 @@ public class RDBJDBCTools {
     protected static String versionCheck(DatabaseMetaData md, int xmaj, int xmin, String description) throws SQLException {
         int maj = md.getDatabaseMajorVersion();
         int min = md.getDatabaseMinorVersion();
+        return versionCheck(maj, min, xmaj, xmin, description);
+    }
+
+    protected static String versionCheck(int maj, int min, int xmaj, int xmin, String description) throws SQLException {
         if (maj < xmaj || (maj == xmaj && min < xmin)) {
             return "Unsupported " + description + " version: " + maj + "." + min + ", expected at least " + xmaj + "." + xmin;
         }