diff --git a/repository/pom.xml b/repository/pom.xml
index 3b1e842695..b182bcc49d 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -427,12 +427,12 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.3.0</version>
+            <version>3.5.9</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis-spring</artifactId>
-            <version>1.2.5</version>
+            <version>2.0.6</version>
         </dependency>
 
         <!-- Activiti -->
diff --git a/repository/src/main/java/org/alfresco/ibatis/SqlSessionMetricsWrapper.java b/repository/src/main/java/org/alfresco/ibatis/SqlSessionMetricsWrapper.java
index 69435cdaa9..668f56fb7f 100644
--- a/repository/src/main/java/org/alfresco/ibatis/SqlSessionMetricsWrapper.java
+++ b/repository/src/main/java/org/alfresco/ibatis/SqlSessionMetricsWrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -28,6 +28,7 @@ package org.alfresco.ibatis;
 import org.alfresco.metrics.db.DBMetricsReporter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.ibatis.cursor.Cursor;
 import org.apache.ibatis.executor.BatchResult;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.ResultContext;
@@ -246,6 +247,48 @@ public class SqlSessionMetricsWrapper implements SqlSession
         }
     }
 
+    @Override
+    public <T> Cursor<T> selectCursor(String statement)
+    {
+        long startTime = System.currentTimeMillis();
+        try
+        {
+            return this.sqlSession.selectCursor(statement);
+        }
+        finally
+        {
+            reportQueryExecuted(startTime, SELECT_LABEL, statement);
+        }
+    }
+
+    @Override
+    public <T> Cursor<T> selectCursor(String statement, Object parameter)
+    {
+        long startTime = System.currentTimeMillis();
+        try
+        {
+            return this.sqlSession.selectCursor(statement, parameter);
+        }
+        finally
+        {
+            reportQueryExecuted(startTime, SELECT_LABEL, statement);
+        }
+    }
+
+    @Override
+    public <T> Cursor<T> selectCursor(String statement, Object parameter, RowBounds rowBounds)
+    {
+        long startTime = System.currentTimeMillis();
+        try
+        {
+            return this.sqlSession.selectCursor(statement, parameter, rowBounds);
+        }
+        finally
+        {
+            reportQueryExecuted(startTime, SELECT_LABEL, statement);
+        }
+    }
+
     @Override
     public int insert(String statement)
     {
diff --git a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/tenants-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/tenants-common-SqlMap.xml
index ec294384ab..493207bfdf 100644
--- a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/tenants-common-SqlMap.xml
+++ b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/tenants-common-SqlMap.xml
@@ -49,12 +49,12 @@
     
     <select id="select_Tenant" resultMap="result_Tenant">
         select
-            tenant_domain as tenantDomain,
+            tenant_domain as tenant_domain,
             version as version,
-            enabled as enabled,
-            tenant_name as tenantName,
-            content_root as contentRoot,
-            db_url as dbUrl
+            enabled enabled,
+            tenant_name tenant_name,
+            content_root content_root,
+            db_url db_url
         from
             alf_tenant
         where
@@ -63,12 +63,12 @@
     
     <select id="select_Tenants" parameterType="TenantQuery" resultMap="result_Tenant">
         select
-            tenant_domain   as tenantDomain,
-            version         as version,
-            enabled         as enabled,
-            tenant_name     as tenantName,
-            content_root    as contentRoot,
-            db_url          as dbUrl
+            tenant_domain as tenant_domain,
+            version as version,
+            enabled as enabled,
+            tenant_name as tenant_name,
+            content_root as content_root,
+            db_url as db_url
         from
             alf_tenant
         <where>
diff --git a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml
index 7df7528b81..af1388f3fb 100644
--- a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml
+++ b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml
@@ -15,7 +15,7 @@
         </if>
     </select>
 
-    <select id="select_ChildNodeIds_Limited" parameterType="Ids" resultMap="alfresco.node.result_ChildAssocIds" fetchSize="-2147483648">
+    <select id="select_ChildNodeIds_Limited" parameterType="ChildAssoc" resultMap="alfresco.node.result_ChildAssocIds" fetchSize="-2147483648">
         <include refid="alfresco.node.select_ChildNodeIds_Limited_Snippet"/>
     </select>