From 78fa896ad4d2dd095ef5cbcc98a93c1d2192e2b1 Mon Sep 17 00:00:00 2001
From: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Fri, 5 Nov 2021 11:07:57 -0300
Subject: [PATCH 01/14] [FIX] Advanced LDAP Sync Features (#23608)

* [FIX] Advanced LDAP Sync Features

* lint fixes

* Update ee/server/settings/ldap.ts

Co-authored-by: Diego Sampaio <chinello@gmail.com>

* Update ee/server/settings/ldap.ts

Co-authored-by: Diego Sampaio <chinello@gmail.com>

* Removed unnecessary try..finally

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 .../server/classes/ImportDataConverter.ts     | 19 +++++--
 ee/server/lib/ldap/Manager.ts                 | 53 ++++++++++++-------
 ee/server/settings/ldap.ts                    | 24 +++++++--
 packages/rocketchat-i18n/i18n/en.i18n.json    |  4 ++
 server/lib/ldap/Connection.ts                 |  9 +++-
 5 files changed, 82 insertions(+), 27 deletions(-)

diff --git a/app/importer/server/classes/ImportDataConverter.ts b/app/importer/server/classes/ImportDataConverter.ts
index 9f09a44d49bd..906ead79effc 100644
--- a/app/importer/server/classes/ImportDataConverter.ts
+++ b/app/importer/server/classes/ImportDataConverter.ts
@@ -219,11 +219,18 @@ export class ImportDataConverter {
 
 		userData._id = _id;
 
+		if (!userData.roles && !existingUser.roles) {
+			userData.roles = ['user'];
+		}
+		if (!userData.type && !existingUser.type) {
+			userData.type = 'user';
+		}
+
 		// #ToDo: #TODO: Move this to the model class
 		const updateData: Record<string, any> = {
 			$set: {
-				roles: userData.roles || ['user'],
-				type: userData.type || 'user',
+				...userData.roles && { roles: userData.roles },
+				...userData.type && { type: userData.type },
 				...userData.statusText && { statusText: userData.statusText },
 				...userData.bio && { bio: userData.bio },
 				...userData.services?.ldap && { ldap: true },
@@ -235,7 +242,13 @@ export class ImportDataConverter {
 		this.addUserServices(updateData, userData);
 		this.addUserImportId(updateData, userData);
 		this.addUserEmails(updateData, userData, existingUser.emails || []);
-		Users.update({ _id }, updateData);
+
+		if (Object.keys(updateData.$set).length === 0) {
+			delete updateData.$set;
+		}
+		if (Object.keys(updateData).length > 0) {
+			Users.update({ _id }, updateData);
+		}
 
 		if (userData.utcOffset) {
 			Users.setUtcOffset(_id, userData.utcOffset);
diff --git a/ee/server/lib/ldap/Manager.ts b/ee/server/lib/ldap/Manager.ts
index 5e4c96fca602..d2f70921dd5b 100644
--- a/ee/server/lib/ldap/Manager.ts
+++ b/ee/server/lib/ldap/Manager.ts
@@ -36,17 +36,13 @@ export class LDAPEEManager extends LDAPManager {
 		try {
 			await ldap.connect();
 
-			try {
-				const createNewUsers = settings.get<boolean>('LDAP_Background_Sync_Import_New_Users') ?? true;
-				const updateExistingUsers = settings.get<boolean>('LDAP_Background_Sync_Keep_Existant_Users_Updated') ?? true;
+			const createNewUsers = settings.get<boolean>('LDAP_Background_Sync_Import_New_Users') ?? true;
+			const updateExistingUsers = settings.get<boolean>('LDAP_Background_Sync_Keep_Existant_Users_Updated') ?? true;
 
-				if (createNewUsers) {
-					await this.importNewUsers(ldap, converter, updateExistingUsers);
-				} else if (updateExistingUsers) {
-					await this.updateExistingUsers(ldap, converter);
-				}
-			} finally {
-				ldap.disconnect();
+			if (createNewUsers) {
+				await this.importNewUsers(ldap, converter, updateExistingUsers);
+			} else if (updateExistingUsers) {
+				await this.updateExistingUsers(ldap, converter);
 			}
 
 			converter.convertUsers({
@@ -55,6 +51,8 @@ export class LDAPEEManager extends LDAPManager {
 		} catch (error) {
 			logger.error(error);
 		}
+
+		ldap.disconnect();
 	}
 
 	public static async syncAvatars(): Promise<void> {
@@ -116,12 +114,12 @@ export class LDAPEEManager extends LDAPManager {
 	public static async advancedSyncForUser(ldap: LDAPConnection, user: IUser, isNewRecord: boolean, dn: string): Promise<void> {
 		await this.syncUserRoles(ldap, user, dn);
 		await this.syncUserChannels(ldap, user, dn);
-		await this.syncUserTeams(ldap, user, isNewRecord);
+		await this.syncUserTeams(ldap, user, dn, isNewRecord);
 	}
 
 	private static async advancedSync(ldap: LDAPConnection, importUser: IImportUser, converter: LDAPDataConverter, isNewRecord: boolean): Promise<void> {
 		const user = converter.findExistingUser(importUser);
-		if (!user || user.username) {
+		if (!user?.username) {
 			return;
 		}
 
@@ -140,6 +138,7 @@ export class LDAPEEManager extends LDAPManager {
 		};
 
 		const result = await ldap.searchRaw(baseDN, searchOptions);
+
 		if (!Array.isArray(result) || result.length === 0) {
 			logger.debug(`${ username } is not in ${ groupName } group!!!`);
 		} else {
@@ -314,7 +313,7 @@ export class LDAPEEManager extends LDAPManager {
 		}
 	}
 
-	private static async syncUserTeams(ldap: LDAPConnection, user: IUser, isNewRecord: boolean): Promise<void> {
+	private static async syncUserTeams(ldap: LDAPConnection, user: IUser, dn: string, isNewRecord: boolean): Promise<void> {
 		if (!user.username) {
 			return;
 		}
@@ -324,7 +323,7 @@ export class LDAPEEManager extends LDAPManager {
 			return;
 		}
 
-		const ldapUserTeams = await this.getLdapTeamsByUsername(ldap, user.username);
+		const ldapUserTeams = await this.getLdapTeamsByUsername(ldap, user.username, dn);
 		const mapJson = settings.get<string>('LDAP_Groups_To_Rocket_Chat_Teams');
 		if (!mapJson) {
 			return;
@@ -369,24 +368,42 @@ export class LDAPEEManager extends LDAPManager {
 		return [...new Set(filteredTeams.map((ldapTeam) => mappedTeams[ldapTeam]).flat())];
 	}
 
-	private static async getLdapTeamsByUsername(ldap: LDAPConnection, username: string): Promise<Array<string>> {
+	private static async getLdapTeamsByUsername(ldap: LDAPConnection, username: string, dn: string): Promise<Array<string>> {
+		const baseDN = (settings.get<string>('LDAP_Teams_BaseDN') ?? '').trim() || ldap.options.baseDN;
 		const query = settings.get<string>('LDAP_Query_To_Get_User_Teams');
 		if (!query) {
 			return [];
 		}
 
 		const searchOptions = {
-			filter: query.replace(/#{username}/g, username),
+			filter: query.replace(/#{username}/g, username).replace(/#{userdn}/g, dn),
 			scope: ldap.options.userSearchScope || 'sub',
 			sizeLimit: ldap.options.searchSizeLimit,
 		};
 
-		const ldapUserGroups = await ldap.searchRaw(ldap.options.baseDN, searchOptions);
+		const attributeNames = (settings.get<string>('LDAP_Teams_Name_Field') ?? '').split(',').map((attributeName) => attributeName.trim());
+		if (!attributeNames.length) {
+			attributeNames.push('ou');
+		}
+
+		const ldapUserGroups = await ldap.searchRaw(baseDN, searchOptions);
 		if (!Array.isArray(ldapUserGroups)) {
 			return [];
 		}
 
-		return ldapUserGroups.filter((entry) => entry?.raw?.ou).map((entry) => (ldap.extractLdapAttribute(entry.raw.ou) as string)).flat();
+		return ldapUserGroups.map((entry) => {
+			if (!entry?.raw) {
+				return undefined;
+			}
+
+			for (const attributeName of attributeNames) {
+				if (entry.raw[attributeName]) {
+					return ldap.extractLdapAttribute(entry.raw[attributeName]) as string;
+				}
+			}
+
+			return undefined;
+		}).filter((entry): entry is string => Boolean(entry)).flat();
 	}
 
 	private static isUserDeactivated(ldapUser: ILDAPEntry): boolean {
diff --git a/ee/server/settings/ldap.ts b/ee/server/settings/ldap.ts
index 18517bf6b620..48b11830fd69 100644
--- a/ee/server/settings/ldap.ts
+++ b/ee/server/settings/ldap.ts
@@ -200,20 +200,34 @@ export function addSettings(): void {
 					enableQuery: { _id: 'LDAP_Enable', value: true },
 					invalidValue: false,
 				});
+
+				const enableQueryTeams = { _id: 'LDAP_Enable_LDAP_Groups_To_RC_Teams', value: true };
+
 				this.add('LDAP_Groups_To_Rocket_Chat_Teams', '{}', {
 					type: 'code',
-					enableQuery: { _id: 'LDAP_Enable_LDAP_Groups_To_RC_Teams', value: true },
+					enableQuery: enableQueryTeams,
 					invalidValue: '{}',
 				});
 				this.add('LDAP_Validate_Teams_For_Each_Login', false, {
 					type: 'boolean',
-					enableQuery: { _id: 'LDAP_Enable_LDAP_Groups_To_RC_Teams', value: true },
+					enableQuery: enableQueryTeams,
 					invalidValue: false,
 				});
-				this.add('LDAP_Query_To_Get_User_Teams', '(&(ou=*)(uniqueMember=uid=#{username},dc=example,dc=com))', {
+				this.add('LDAP_Teams_BaseDN', '', {
+					type: 'string',
+					enableQuery: enableQueryTeams,
+					invalidValue: '',
+				});
+				this.add('LDAP_Teams_Name_Field', 'ou,cn', {
 					type: 'string',
-					enableQuery: { _id: 'LDAP_Enable_LDAP_Groups_To_RC_Teams', value: true },
-					invalidValue: '(&(ou=*)(uniqueMember=uid=#{username},dc=example,dc=com))',
+					enableQuery: enableQueryTeams,
+					invalidValue: '',
+				});
+
+				this.add('LDAP_Query_To_Get_User_Teams', '(&(ou=*)(uniqueMember=#{userdn}))', {
+					type: 'string',
+					enableQuery: enableQueryTeams,
+					invalidValue: '',
 				});
 			});
 		});
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index c2e32ce53de4..8f16c2930cd6 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2552,6 +2552,10 @@
   "LDAP_Sync_User_Data_Roles_Filter_Description": "The LDAP search filter used to check if a user is in a group.",
   "LDAP_Sync_User_Data_RolesMap": "User Data Group Map",
   "LDAP_Sync_User_Data_RolesMap_Description": "Map LDAP groups to Rocket.Chat user roles <br/>As an example, `{\"rocket-admin\":\"admin\", \"tech-support\":\"support\"}` will map the rocket-admin LDAP group to Rocket's \"admin\" role.",
+  "LDAP_Teams_BaseDN": "LDAP Teams BaseDN",
+  "LDAP_Teams_BaseDN_Description": "The LDAP BaseDN used to lookup user teams.",
+  "LDAP_Teams_Name_Field": "LDAP Team Name Attribute",
+  "LDAP_Teams_Name_Field_Description": "The LDAP attribute that Rocket.Chat should use to load the team's name. You can specify more than one possible attribute name if you separate them with a comma.",
   "LDAP_Timeout": "Timeout (ms)",
   "LDAP_Timeout_Description": "How many mileseconds wait for a search result before return an error",
   "LDAP_Unique_Identifier_Field": "Unique Identifier Field",
diff --git a/server/lib/ldap/Connection.ts b/server/lib/ldap/Connection.ts
index 1d4c9130fd22..c83b8d1393b2 100644
--- a/server/lib/ldap/Connection.ts
+++ b/server/lib/ldap/Connection.ts
@@ -278,7 +278,14 @@ export class LDAPConnection {
 		Object.keys(values._raw).forEach((key) => {
 			values[key] = this.extractLdapAttribute(values._raw[key]);
 
-			mapLogger.debug({ msg: 'Extracted Attribute', key, type: typeof values[key], value: values[key] });
+			const dataType = typeof values[key];
+			// eslint-disable-next-line no-control-regex
+			if (dataType === 'string' && values[key].length > 100 && /[\x00-\x1F]/.test(values[key])) {
+				mapLogger.debug({ msg: 'Extracted Attribute', key, type: dataType, length: values[key].length, value: `${ values[key].substr(0, 100) }...` });
+				return;
+			}
+
+			mapLogger.debug({ msg: 'Extracted Attribute', key, type: dataType, value: values[key] });
 		});
 
 		return values;

From 65cb240247540daf8165f900a3bf38b43ae06e00 Mon Sep 17 00:00:00 2001
From: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Fri, 5 Nov 2021 11:07:37 -0300
Subject: [PATCH 02/14] [FIX] LDAP users not being re-activated on login
 (#23627)

---
 ee/server/lib/ldap/Manager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/server/lib/ldap/Manager.ts b/ee/server/lib/ldap/Manager.ts
index d2f70921dd5b..7230dbdb6c6d 100644
--- a/ee/server/lib/ldap/Manager.ts
+++ b/ee/server/lib/ldap/Manager.ts
@@ -456,7 +456,7 @@ export class LDAPEEManager extends LDAPManager {
 		}
 
 		const deleted = this.isUserDeactivated(ldapUser);
-		if (deleted === userData.deleted || (userData.deleted === undefined && !deleted)) {
+		if (deleted === userData.deleted) {
 			return;
 		}
 

From 6dbd6aae66e59be476f875f1e92fc2e3d3ecad47 Mon Sep 17 00:00:00 2001
From: Duda Nogueira <dudanogueira@gmail.com>
Date: Thu, 4 Nov 2021 09:00:47 -0300
Subject: [PATCH 03/14] [FIX] Cannot deactive a regular user if there's only
 one admin

user admin check  at setUserActiveStatus
---
 app/lib/server/functions/setUserActiveStatus.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/server/functions/setUserActiveStatus.js b/app/lib/server/functions/setUserActiveStatus.js
index 8f1207ad898c..8089fbf7d1cf 100644
--- a/app/lib/server/functions/setUserActiveStatus.js
+++ b/app/lib/server/functions/setUserActiveStatus.js
@@ -43,7 +43,7 @@ export function setUserActiveStatus(userId, active, confirmRelinquish = false) {
 
 	// Users without username can't do anything, so there is no need to check for owned rooms
 	if (user.username != null && !active) {
-		const userAdmin = Users.findOneAdmin(userId.count);
+		const userAdmin = Users.findOneAdmin(userId);
 		const adminsCount = Users.findActiveUsersInRoles(['admin']).count();
 		if (userAdmin && adminsCount === 1) {
 			throw new Meteor.Error('error-action-not-allowed', 'Leaving the app without an active admin is not allowed', {

From 1131e0014c12a2f6a758ddc19a718f13e6ec9bbd Mon Sep 17 00:00:00 2001
From: Douglas Gubert <douglas.gubert@gmail.com>
Date: Wed, 3 Nov 2021 08:56:35 -0300
Subject: [PATCH 04/14] [FIX] App update flow failing in HA setups (#23607)

* Update method call for Apps-Engine method

* Update Apps-Engine
---
 app/apps/server/communication/websockets.js | 3 ++-
 package-lock.json                           | 6 +++---
 package.json                                | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/apps/server/communication/websockets.js b/app/apps/server/communication/websockets.js
index 8be3edc38e0e..dd8da2b64c89 100644
--- a/app/apps/server/communication/websockets.js
+++ b/app/apps/server/communication/websockets.js
@@ -71,7 +71,8 @@ export class AppServerListener {
 
 		const appPackage = await this.orch.getAppSourceStorage().fetch(storageItem);
 
-		await this.orch.getManager().update(appPackage);
+		await this.orch.getManager().updateLocal(storageItem, appPackage);
+
 		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_UPDATED, appId);
 	}
 
diff --git a/package-lock.json b/package-lock.json
index b4f4b752b5aa..53f2e0e0cd55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5318,9 +5318,9 @@
       }
     },
     "@rocket.chat/apps-engine": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.28.0.tgz",
-      "integrity": "sha512-ALrlGHVO1IhgAQ/rdZVS9nuPHwSE2VtPy3e2xbLzhMloZSpcG/ht9PPrDqIX6ZHHwiDxLbBd2/yT8vt86lXZeg==",
+      "version": "1.28.1",
+      "resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.28.1.tgz",
+      "integrity": "sha512-Cg3/sn/vkJ0tVBOmPysTj7syHMPOMWaBwzaumEO+U9oMhDyAAYU53itnV2oUw58fNveYprRracQBLhl8U/kDCg==",
       "requires": {
         "adm-zip": "^0.4.9",
         "cryptiles": "^4.1.3",
diff --git a/package.json b/package.json
index 8c4109ab850d..c15b83db3a55 100644
--- a/package.json
+++ b/package.json
@@ -160,7 +160,7 @@
 		"@nivo/heatmap": "0.73.0",
 		"@nivo/line": "0.62.0",
 		"@nivo/pie": "0.73.0",
-		"@rocket.chat/apps-engine": "1.28.0",
+		"@rocket.chat/apps-engine": "^1.28.1",
 		"@rocket.chat/css-in-js": "^0.30.1",
 		"@rocket.chat/emitter": "^0.30.1",
 		"@rocket.chat/fuselage": "^0.30.1",

From 672fe95d7e8afbd7d306cf176f54c65dd9be0eea Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 5 Nov 2021 18:55:03 -0300
Subject: [PATCH 05/14] Bump version to 4.1.1

---
 .docker/Dockerfile.rhel                       |    2 +-
 .github/history-manual.json                   |    7 +
 .github/history.json                          |   45 +-
 .snapcraft/resources/prepareRocketChat        |    2 +-
 .snapcraft/snap/snapcraft.yaml                |    2 +-
 HISTORY.md                                    | 2123 +++++++++--------
 app/api/server/v1/channels.js                 |    6 +-
 app/api/server/v1/chat.js                     |    8 +-
 app/api/server/v1/commands.js                 |   20 +-
 app/api/server/v1/im.js                       |    4 +-
 app/api/server/v1/rooms.js                    |   12 +-
 .../methods/getUsersOfRoomWithoutKey.js       |   13 +-
 app/e2e/server/methods/setRoomKeyID.js        |   16 +-
 app/lib/server/lib/processDirectEmail.js      |   24 +-
 app/lib/server/methods/getChannelHistory.js   |   10 +-
 app/lib/server/methods/getMessages.js         |   24 +-
 app/lib/server/methods/getSingleMessage.js    |    5 +-
 .../client/views/app/livechatReadOnly.js      |    2 +-
 app/message-pin/server/pinMessage.js          |   21 +-
 app/message-star/server/starMessage.js        |   14 +-
 app/models/server/models/Messages.js          |   11 +
 app/reactions/server/setReaction.js           |   18 +-
 .../server/service/validationService.js       |   44 +-
 app/threads/server/methods/followMessage.js   |    4 +-
 app/threads/server/methods/unfollowMessage.js |    8 +-
 app/utils/rocketchat.info                     |    2 +-
 app/videobridge/server/methods/bbb.js         |   31 +-
 .../server/api/methods/getReadReceipts.js     |    6 +-
 package-lock.json                             |    2 +-
 package.json                                  |    2 +-
 server/methods/canAccessRoom.js               |   85 +-
 server/methods/getUsersOfRoom.js              |   16 +-
 server/methods/loadHistory.js                 |   16 +-
 server/methods/loadMissedMessages.js          |   12 +-
 server/methods/loadNextMessages.js            |   11 +-
 server/methods/loadSurroundingMessages.js     |    7 +-
 server/methods/messageSearch.js               |    7 +-
 server/publications/messages.js               |    9 +-
 server/publications/room/index.js             |   10 +-
 tests/end-to-end/api/05-chat.js               |   31 +-
 tests/end-to-end/api/24-methods.js            |    3 +-
 41 files changed, 1512 insertions(+), 1183 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 8822de22ef80..f91e8ee83d61 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 4.1.0
+ENV RC_VERSION 4.1.1
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history-manual.json b/.github/history-manual.json
index de60527e3d41..6258a78a3d94 100644
--- a/.github/history-manual.json
+++ b/.github/history-manual.json
@@ -123,5 +123,12 @@
 			"sampaiodiego",
 			"pierre-lehnen-rc"
 		]
+	}],
+	"4.1.1": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego"
+		]
 	}]
 }
diff --git a/.github/history.json b/.github/history.json
index 890111d8e940..206a280bd24e 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -67032,6 +67032,49 @@
         "5.0"
       ],
       "pull_requests": []
+    },
+    "4.1.1": {
+      "node_version": "12.22.1",
+      "npm_version": "6.14.1",
+      "apps_engine_version": "1.28.1",
+      "mongo_versions": [
+        "3.6",
+        "4.0",
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "23607",
+          "title": "[FIX] App update flow failing in HA setups",
+          "userLogin": "d-gubert",
+          "description": "The flow for app updates is broken in specific scenarios with HA setups. Here we change the method calls in the Apps-Engine to avoid race conditions",
+          "milestone": "4.1.1",
+          "contributors": [
+            "d-gubert"
+          ]
+        },
+        {
+          "pr": "23627",
+          "title": "[FIX] LDAP users not being re-activated on login",
+          "userLogin": "pierre-lehnen-rc",
+          "milestone": "4.1.1",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        },
+        {
+          "pr": "23608",
+          "title": "[FIX] Advanced LDAP Sync Features",
+          "userLogin": "pierre-lehnen-rc",
+          "milestone": "4.1.1",
+          "contributors": [
+            "pierre-lehnen-rc",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
index 92c8f26d454d..8326ee76187e 100755
--- a/.snapcraft/resources/prepareRocketChat
+++ b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/4.1.0/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/4.1.1/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 
diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml
index 9c13354e4f6a..d9d599fa7ca0 100644
--- a/.snapcraft/snap/snapcraft.yaml
+++ b/.snapcraft/snap/snapcraft.yaml
@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 4.1.0
+version: 4.1.1
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict
diff --git a/HISTORY.md b/HISTORY.md
index e3aa63d8aa17..68f00f36e9ae 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,35 @@
 
+# 4.1.1
+`2021-11-05  ·  4 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.22.1`
+- NPM: `6.14.1`
+- MongoDB: `3.6, 4.0, 4.2, 4.4, 5.0`
+- Apps-Engine: `1.28.1`
+
+### 🐛 Bug fixes
+
+
+- Advanced LDAP Sync Features ([#23608](https://github.com/RocketChat/Rocket.Chat/pull/23608))
+
+- App update flow failing in HA setups ([#23607](https://github.com/RocketChat/Rocket.Chat/pull/23607))
+
+  The flow for app updates is broken in specific scenarios with HA setups. Here we change the method calls in the Apps-Engine to avoid race conditions
+
+- LDAP users not being re-activated on login ([#23627](https://github.com/RocketChat/Rocket.Chat/pull/23627))
+
+- Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)
+
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 4.1.0
-`2021-10-27  ·  1 🎉  ·  4 🚀  ·  25 🐛  ·  38 🔍  ·  23 👩‍💻👨‍💻`
+`2021-10-28  ·  1 🎉  ·  4 🚀  ·  25 🐛  ·  38 🔍  ·  23 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `12.22.1`
@@ -24,19 +53,19 @@
 
 - Make Livechat Instructions setting multi-line ([#23515](https://github.com/RocketChat/Rocket.Chat/pull/23515))
 
-  Since now we're supporting markdown text on this field (via this PR   - https://github.com/RocketChat/Rocket.Chat.Livechat/pull/648), it would be nice to make this setting multiline so users can have more space to edit the text
+  Since now we're supporting markdown text on this field (via this PR   - https://github.com/RocketChat/Rocket.Chat.Livechat/pull/648), it would be nice to make this setting multiline so users can have more space to edit the text
   ![image](https://user-images.githubusercontent.com/34130764/138146712-13e4968b-5312-4d53-b44c-b5699c5e49c1.png)
 
 - optimized groups.listAll response time ([#22941](https://github.com/RocketChat/Rocket.Chat/pull/22941))
 
-  groups.listAll endpoint was having performance issues, specially when the total number of groups was high. This happened because the endpoint was loading all objects in memory then using splice to paginate, instead of paginating beforehand.
-
-  Considering 70k groups, this was the performance improvement:
-
-  before
-  ![image](https://user-images.githubusercontent.com/28611993/129601314-bdf89337-79fa-4446-9f44-95264af4adb3.png)
-
-  after
+  groups.listAll endpoint was having performance issues, specially when the total number of groups was high. This happened because the endpoint was loading all objects in memory then using splice to paginate, instead of paginating beforehand.
+
+  Considering 70k groups, this was the performance improvement:
+
+  before
+  ![image](https://user-images.githubusercontent.com/28611993/129601314-bdf89337-79fa-4446-9f44-95264af4adb3.png)
+
+  after
   ![image](https://user-images.githubusercontent.com/28611993/129601358-5872e166-f923-4c1c-b21d-eb9507365ecf.png)
 
 ### 🐛 Bug fixes
@@ -44,7 +73,8 @@
 
 - **APPS:** Communication problem when updating and uninstalling apps in cluster ([#23418](https://github.com/RocketChat/Rocket.Chat/pull/23418))
 
-  - Make the hook responsible for receiving app update events inside a cluster fetch the app's package (zip file) in the correct place.
  
+  - Make the hook responsible for receiving app update events inside a cluster fetch the app's package (zip file) in the correct place.
+
   - Also shows a warning message on uninstalls inside a cluster. As there are many servers writing to the same place, some race conditions may occur. This prevents problems related to terminating the process in the middle due to errors being thrown and leaving the server in a faulty state.
 
 - **ENTERPRISE:** Omnichannel agent is not leaving the room when a forwarded chat is queued ([#23404](https://github.com/RocketChat/Rocket.Chat/pull/23404))
@@ -71,10 +101,10 @@
 
 - Markdown quote message style ([#23462](https://github.com/RocketChat/Rocket.Chat/pull/23462))
 
-  Before:
-  ![image](https://user-images.githubusercontent.com/17487063/137496669-3abecab4-cf90-45cb-8b1b-d9411a5682dd.png)
-
-  After:
+  Before:
+  ![image](https://user-images.githubusercontent.com/17487063/137496669-3abecab4-cf90-45cb-8b1b-d9411a5682dd.png)
+
+  After:
   ![image](https://user-images.githubusercontent.com/17487063/137496905-fd727f90-f707-4ec6-8139-ba2eb1a2146e.png)
 
 - MONGO_OPTIONS being ignored for oplog connection ([#23314](https://github.com/RocketChat/Rocket.Chat/pull/23314) by [@cuonghuunguyen](https://github.com/cuonghuunguyen))
@@ -93,8 +123,8 @@
 
 - Read only description in team creation ([#23213](https://github.com/RocketChat/Rocket.Chat/pull/23213))
 
-  ![image](https://user-images.githubusercontent.com/27704687/133608433-8ca788a3-71a8-4d40-8c40-8156ab03c606.png)
-
+  ![image](https://user-images.githubusercontent.com/27704687/133608433-8ca788a3-71a8-4d40-8c40-8156ab03c606.png)
+
   ![image](https://user-images.githubusercontent.com/27704687/133608400-4cdc7a67-95e5-46c6-8c65-29ab107cd314.png)
 
 - resumeToken not working ([#23379](https://github.com/RocketChat/Rocket.Chat/pull/23379))
@@ -103,7 +133,8 @@
 
 - SAML Users' roles being reset to default on login ([#23411](https://github.com/RocketChat/Rocket.Chat/pull/23411))
 
-  - Remove `roles` field update on `insertOrUpdateSAMLUser` function;
  
+  - Remove `roles` field update on `insertOrUpdateSAMLUser` function;
+
   - Add SAML `syncRoles` event;
 
 - Server crashing when Routing method is not available at start ([#23473](https://github.com/RocketChat/Rocket.Chat/pull/23473))
@@ -184,14 +215,14 @@
 
 - Chore: Startup Time ([#23210](https://github.com/RocketChat/Rocket.Chat/pull/23210))
 
-  The settings logic has been improved as a whole.
-
-  All the logic to get the data from the env var was confusing.
-
-  Setting default values was tricky to understand.
-
-  Every time the server booted, all settings were updated and callbacks were called 2x or more (horrible for environments with multiple instances and generating a turbulent startup).
-
+  The settings logic has been improved as a whole.
+
+  All the logic to get the data from the env var was confusing.
+
+  Setting default values was tricky to understand.
+
+  Every time the server booted, all settings were updated and callbacks were called 2x or more (horrible for environments with multiple instances and generating a turbulent startup).
+
   `Settings.get(......, callback);` was deprecated. We now have better methods for each case.
 
 - Chore: Update Apps-Engine version ([#23375](https://github.com/RocketChat/Rocket.Chat/pull/23375))
@@ -214,10 +245,10 @@
 
 - Regression: Mail body contains `undefined` text ([#23552](https://github.com/RocketChat/Rocket.Chat/pull/23552))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/2263066/138733018-10449892-5c2d-46fb-9355-00e98e0d6c9f.png)
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/2263066/138733018-10449892-5c2d-46fb-9355-00e98e0d6c9f.png)
+
+  ### After
   ![image](https://user-images.githubusercontent.com/2263066/138733074-a1b88a77-bf64-41c3-a6c3-ac9e1cb63de1.png)
 
 - Regression: Prevent settings from getting updated ([#23556](https://github.com/RocketChat/Rocket.Chat/pull/23556))
@@ -308,7 +339,8 @@
 
 - SAML Users' roles being reset to default on login ([#23411](https://github.com/RocketChat/Rocket.Chat/pull/23411))
 
-  - Remove `roles` field update on `insertOrUpdateSAMLUser` function;
  
+  - Remove `roles` field update on `insertOrUpdateSAMLUser` function;
+
   - Add SAML `syncRoles` event;
 
 <details>
@@ -340,7 +372,8 @@
 
 - **APPS:** Communication problem when updating and uninstalling apps in cluster ([#23418](https://github.com/RocketChat/Rocket.Chat/pull/23418))
 
-  - Make the hook responsible for receiving app update events inside a cluster fetch the app's package (zip file) in the correct place.
  
+  - Make the hook responsible for receiving app update events inside a cluster fetch the app's package (zip file) in the correct place.
+
   - Also shows a warning message on uninstalls inside a cluster. As there are many servers writing to the same place, some race conditions may occur. This prevents problems related to terminating the process in the middle due to errors being thrown and leaving the server in a faulty state.
 
 - Server crashing when Routing method is not available at start ([#23473](https://github.com/RocketChat/Rocket.Chat/pull/23473))
@@ -467,18 +500,20 @@
 
 - **ENTERPRISE:** "Download CSV" button doesn't work in the Engagement Dashboard's Active Users section ([#23013](https://github.com/RocketChat/Rocket.Chat/pull/23013))
 
-  - Fix "Download CSV" button in the Engagement Dashboard's Active Users section;
  
-  - Add column headers to the CSV file downloaded from the Engagement Dashboard's Active Users section;
  
+  - Fix "Download CSV" button in the Engagement Dashboard's Active Users section;
+
+  - Add column headers to the CSV file downloaded from the Engagement Dashboard's Active Users section;
+
   - Split the data in multiple CSV files.
 
 - **ENTERPRISE:** CSV file downloaded in the Engagement Dashboard's New Users section contains undefined data ([#23014](https://github.com/RocketChat/Rocket.Chat/pull/23014))
 
-  - Fix CSV file downloaded in the Engagement Dashboard's New Users section;
+  - Fix CSV file downloaded in the Engagement Dashboard's New Users section;
    - Add column headers to the CSV file downloaded from the Engagement Dashboard's New Users section.
 
 - **ENTERPRISE:** Missing headers in CSV files downloaded from the Engagement Dashboard ([#23223](https://github.com/RocketChat/Rocket.Chat/pull/23223))
 
-  - Add headers to all CSV files downloaded from the "Messages" and "Channels" tabs from the Engagement Dashboard;
+  - Add headers to all CSV files downloaded from the "Messages" and "Channels" tabs from the Engagement Dashboard;
    - Add headers to the CSV file downloaded from the "Users by time of day" section (in the "Users" tab).
 
 - LDAP Refactoring ([#23171](https://github.com/RocketChat/Rocket.Chat/pull/23171))
@@ -493,17 +528,24 @@
 
 - Remove deprecated endpoints ([#23162](https://github.com/RocketChat/Rocket.Chat/pull/23162))
 
-  The following REST endpoints were removed:
-
  
-  - `/api/v1/emoji-custom`
  
-  - `/api/v1/info`
  
-  - `/api/v1/permissions`
  
-  - `/api/v1/permissions.list`
-
-  The following Real time API Methods were removed:
-
  
-  - `getFullUserData`
  
-  - `getServerInfo`
  
+  The following REST endpoints were removed:
+
+
+  - `/api/v1/emoji-custom`
+
+  - `/api/v1/info`
+
+  - `/api/v1/permissions`
+
+  - `/api/v1/permissions.list`
+
+  The following Real time API Methods were removed:
+
+
+  - `getFullUserData`
+
+  - `getServerInfo`
+
   - `livechat:saveOfficeHours`
 
 - Remove Google Vision features ([#23160](https://github.com/RocketChat/Rocket.Chat/pull/23160))
@@ -512,8 +554,8 @@
 
 - Remove old migrations up to version 2.4.14 ([#23277](https://github.com/RocketChat/Rocket.Chat/pull/23277))
 
-  To update to version 4.0.0 you'll need to be running at least version 3.0.0, otherwise you might loose some database migrations which might have unexpected effects.
-
+  To update to version 4.0.0 you'll need to be running at least version 3.0.0, otherwise you might loose some database migrations which might have unexpected effects.
+
   This aims to clean up the code, since upgrades jumping 2 major versions are too risky and hard to maintain, we'll keep only migration from that last major (in this case 3.x).
 
 - Remove patch info from endpoint /api/info for non-logged in users ([#16050](https://github.com/RocketChat/Rocket.Chat/pull/16050) by [@MarcosSpessatto](https://github.com/MarcosSpessatto))
@@ -522,18 +564,18 @@
 
 - Stop sending audio notifications via stream ([#23108](https://github.com/RocketChat/Rocket.Chat/pull/23108))
 
-  Remove audio preferences and make them tied to desktop notification preferences.
-
+  Remove audio preferences and make them tied to desktop notification preferences.
+
   TL;DR: new message sounds will play only if you receive a desktop notification. you'll still be able to chose to not play any sound though
 
 - Webhook will fail if user is not part of the channel ([#23310](https://github.com/RocketChat/Rocket.Chat/pull/23310))
 
-  Remove deprecated behavior added by https://github.com/RocketChat/Rocket.Chat/pull/18024 that accepts webhook integrations sending messages even if the user is not part of the channel.
-
-  Starting from 4.0.0 the webhook request will fail with `error-not-allowed` error:
-
-  ```
-  {"success":false,"error":"error-not-allowed"}
+  Remove deprecated behavior added by https://github.com/RocketChat/Rocket.Chat/pull/18024 that accepts webhook integrations sending messages even if the user is not part of the channel.
+
+  Starting from 4.0.0 the webhook request will fail with `error-not-allowed` error:
+
+  ```
+  {"success":false,"error":"error-not-allowed"}
   ```
 
 ### 🎉 New features
@@ -551,23 +593,26 @@
 
 - Seats Cap ([#23017](https://github.com/RocketChat/Rocket.Chat/pull/23017) by [@g-thome](https://github.com/g-thome))
 
-  - Adding New Members
-    - Awareness of seats usage while adding new members
-    - Seats Cap about to be reached
-    - Seats Cap reached
-    - Request more seats
  
-  - Warning Admins
-    - System telling admins max seats are about to exceed
-    - System telling admins max seats were exceed
-    - Metric on Info Page
-    - Request more seats
  
-  - Warning Members
-    - Invite link
-      - Block creating new invite links
-      - Block existing invite links (feedback on register process) 
-    - Register to Workspaces
  
-  - Emails
-    - System telling admins max seats are about to exceed
+  - Adding New Members
+    - Awareness of seats usage while adding new members
+    - Seats Cap about to be reached
+    - Seats Cap reached
+    - Request more seats
+
+  - Warning Admins
+    - System telling admins max seats are about to exceed
+    - System telling admins max seats were exceed
+    - Metric on Info Page
+    - Request more seats
+
+  - Warning Members
+    - Invite link
+      - Block creating new invite links
+      - Block existing invite links (feedback on register process)
+    - Register to Workspaces
+
+  - Emails
+    - System telling admins max seats are about to exceed
     - System telling admins max seats were exceed
 
 ### 🚀 Improvements
@@ -575,10 +620,10 @@
 
 - **APPS:** New storage strategy for Apps-Engine file packages ([#22657](https://github.com/RocketChat/Rocket.Chat/pull/22657))
 
-  This is an enabler for our initiative to support NPM packages in the Apps-Engine. 
-
-  Currently, the packages (zip files) for Rocket.Chat Apps are stored as a base64 encoded string in a document in the database, which constrains us due to the size limit of a document in MongoDB (16Mb).
-
+  This is an enabler for our initiative to support NPM packages in the Apps-Engine.
+
+  Currently, the packages (zip files) for Rocket.Chat Apps are stored as a base64 encoded string in a document in the database, which constrains us due to the size limit of a document in MongoDB (16Mb).
+
   When we allow apps to include NPM packages, the size of the App package itself will be potentially _very large_ (I'm looking at you `node_modules`). Thus we'll be changing the strategy to store apps either with GridFS or the host's File System itself.
 
 - **APPS:** Return task ids when using the scheduler api ([#23023](https://github.com/RocketChat/Rocket.Chat/pull/23023))
@@ -618,9 +663,9 @@
 
 - "Read Only" and "Allow Reacting" system messages are missing in rooms ([#23037](https://github.com/RocketChat/Rocket.Chat/pull/23037))
 
-  - Add system message to notify changes on the **"Read Only"** setting;
-   - Add system message to notify changes on the **"Allow Reacting"** setting;
-   - Fix "Allow Reacting" setting's description (updated from "Only authorized users can write new messages" to "Only authorized users can react to messages").
+  - Add system message to notify changes on the **"Read Only"** setting;
+   - Add system message to notify changes on the **"Allow Reacting"** setting;
+   - Fix "Allow Reacting" setting's description (updated from "Only authorized users can write new messages" to "Only authorized users can react to messages").
   ![system-messages](https://user-images.githubusercontent.com/36537004/130883527-9eb47fcd-c8e5-41fb-af34-5d99bd0a6780.PNG)
 
 - Add check before placing chat on-hold to confirm that contact sent last message ([#23053](https://github.com/RocketChat/Rocket.Chat/pull/23053))
@@ -635,9 +680,9 @@
 
 - Inaccurate use of 'Mobile notifications' instead of 'Push notifications' in i18n strings ([#22978](https://github.com/RocketChat/Rocket.Chat/pull/22978))
 
-  - Fix inaccurate use of 'Mobile notifications' (which is misleading in German) by 'Push notifications';
-   - Update `'Notification_Mobile_Default_For'` key to `'Notification_Push_Default_For'` (and text to 'Send Push Notifications For' for English Language);
-   - Update `'Accounts_Default_User_Preferences_mobileNotifications'` key to `'Accounts_Default_User_Preferences_pushNotifications'`;
+  - Fix inaccurate use of 'Mobile notifications' (which is misleading in German) by 'Push notifications';
+   - Update `'Notification_Mobile_Default_For'` key to `'Notification_Push_Default_For'` (and text to 'Send Push Notifications For' for English Language);
+   - Update `'Accounts_Default_User_Preferences_mobileNotifications'` key to `'Accounts_Default_User_Preferences_pushNotifications'`;
    - Update `'Mobile_Notifications_Default_Alert'` key to `'Mobile_Push_Notifications_Default_Alert'`;
 
 - Logging out from other clients ([#23276](https://github.com/RocketChat/Rocket.Chat/pull/23276))
@@ -646,7 +691,7 @@
 
 - Modals is cutting pixels of the content ([#23243](https://github.com/RocketChat/Rocket.Chat/pull/23243))
 
-  Fuselage Dependency: [543](https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/543)
+  Fuselage Dependency: [543](https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/543)
   ![image](https://user-images.githubusercontent.com/27704687/134049227-3cd1deed-34ba-454f-a95e-e99b79a7a7b9.png)
 
 - Omnichannel On hold chats being forwarded to offline agents ([#23185](https://github.com/RocketChat/Rocket.Chat/pull/23185))
@@ -655,15 +700,15 @@
 
 - Prevent users to edit an existing role when adding a new one with the same name used before. ([#22407](https://github.com/RocketChat/Rocket.Chat/pull/22407) by [@lucassartor](https://github.com/lucassartor))
 
-  ### before
-  ![Peek 2021-07-13 16-31](https://user-images.githubusercontent.com/27704687/125513721-953d84f4-1c95-45ca-80e1-b00992b874f6.gif)
-
-  ### after
+  ### before
+  ![Peek 2021-07-13 16-31](https://user-images.githubusercontent.com/27704687/125513721-953d84f4-1c95-45ca-80e1-b00992b874f6.gif)
+
+  ### after
   ![Peek 2021-07-13 16-34](https://user-images.githubusercontent.com/27704687/125514098-91ee8014-51e5-4c62-9027-5538acf57d08.gif)
 
 - Remove doubled "Canned Responses" strings ([#23056](https://github.com/RocketChat/Rocket.Chat/pull/23056))
 
-  - Remove doubled canned response setting introduced in #22703 (by setting id change);
+  - Remove doubled canned response setting introduced in #22703 (by setting id change);
    - Update "Canned Responses" keys to "Canned_Responses".
 
 - Remove margin from quote inside quote ([#21779](https://github.com/RocketChat/Rocket.Chat/pull/21779))
@@ -674,16 +719,21 @@
 
 - Sidebar not closing when clicking in Home or Directory on mobile view ([#23218](https://github.com/RocketChat/Rocket.Chat/pull/23218))
 
-  ### Additional fixed
  
-  - Merge Burger menu components into a single component
  
-  - Show a badge with no-read messages in the Burger Button:
-  ![image](https://user-images.githubusercontent.com/27704687/133679378-20fea2c0-4ac1-4b4e-886e-45154cc6afea.png)
  
+  ### Additional fixed
+
+  - Merge Burger menu components into a single component
+
+  - Show a badge with no-read messages in the Burger Button:
+  ![image](https://user-images.githubusercontent.com/27704687/133679378-20fea2c0-4ac1-4b4e-886e-45154cc6afea.png)
+
   - remove useSidebarClose hook
 
 - Stop queue when Omnichannel is disabled or the routing method does not support it ([#23261](https://github.com/RocketChat/Rocket.Chat/pull/23261))
 
-  - Add missing key logs
  
-  - Stop queue (and logs) when livechat is disabled or when routing method does not support queue
  
+  - Add missing key logs
+
+  - Stop queue (and logs) when livechat is disabled or when routing method does not support queue
+
   - Stop ignoring offline bot agents from delegation (previously, if a bot was offline, even with "Assign new conversations to bot agent" enabled, bot will be ignored and chat will be left in limbo (since bot was assigned, but offline).
 
 - Toolbox click not working on Safari(iOS) ([#23244](https://github.com/RocketChat/Rocket.Chat/pull/23244))
@@ -790,17 +840,17 @@
 
 - Regression: Blank screen in Jitsi video calls ([#23322](https://github.com/RocketChat/Rocket.Chat/pull/23322))
 
-  - Fix Jitsi calls being disposed even when "Open in new window" setting is disabled;
+  - Fix Jitsi calls being disposed even when "Open in new window" setting is disabled;
    - Fix misspelling on `CallJitsWithData.js` file name.
 
 - Regression: Create new loggers based on server log level ([#23297](https://github.com/RocketChat/Rocket.Chat/pull/23297))
 
 - Regression: Fix app storage migration ([#23286](https://github.com/RocketChat/Rocket.Chat/pull/23286))
 
-  The previous version of this migration didn't take into consideration apps that were installed prior to [Rocket.Chat@3.8.0](https://github.com/RocketChat/Rocket.Chat/releases/tag/3.8.0), which [removed the typescript compiler from the server](https://github.com/RocketChat/Rocket.Chat/pull/18687) and into the CLI. As a result, the zip files inside each installed app's document in the database had typescript files in them instead of the now required javascript files.
-
-  As the new strategy of source code storage for apps changes the way the app is loaded, those zip files containing the source code are read everytime the app is started (or [in this particular case, updated](https://github.com/RocketChat/Rocket.Chat/pull/23286/files#diff-caf9f7a22478639e58d6514be039140a42ce1ab2d999c3efe5678c38ee36d0ccR43)), and as the zips' contents were wrong, the operation was failing.
-
+  The previous version of this migration didn't take into consideration apps that were installed prior to [Rocket.Chat@3.8.0](https://github.com/RocketChat/Rocket.Chat/releases/tag/3.8.0), which [removed the typescript compiler from the server](https://github.com/RocketChat/Rocket.Chat/pull/18687) and into the CLI. As a result, the zip files inside each installed app's document in the database had typescript files in them instead of the now required javascript files.
+
+  As the new strategy of source code storage for apps changes the way the app is loaded, those zip files containing the source code are read everytime the app is started (or [in this particular case, updated](https://github.com/RocketChat/Rocket.Chat/pull/23286/files#diff-caf9f7a22478639e58d6514be039140a42ce1ab2d999c3efe5678c38ee36d0ccR43)), and as the zips' contents were wrong, the operation was failing.
+
   The fix extract the data from old apps and creates new zip files with the compiled `js` already present.
 
 - Regression: Fix Bugsnag not started error ([#23308](https://github.com/RocketChat/Rocket.Chat/pull/23308))
@@ -977,8 +1027,10 @@
 
 - **ENTERPRISE:** Maximum waiting time for chats in Omnichannel queue ([#22955](https://github.com/RocketChat/Rocket.Chat/pull/22955))
 
-  - Add new settings to support closing chats that have been too long on waiting queue
  
-  - Moved old settings to new "Queue Management" section
  
+  - Add new settings to support closing chats that have been too long on waiting queue
+
+  - Moved old settings to new "Queue Management" section
+
   - Fix issue when closing a livechat room that caused client to not to know if room was open or not
 
 - Banner for the updates regarding authentication services ([#23055](https://github.com/RocketChat/Rocket.Chat/pull/23055) by [@g-thome](https://github.com/g-thome))
@@ -993,10 +1045,10 @@
 
 - Separate RegEx Settings for Channels and Usernames validation ([#21937](https://github.com/RocketChat/Rocket.Chat/pull/21937) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  Now, there are 2 separate settings for validating names   - One for **channels** and another for **usernames**.
-
-  This change also removes the old `UTF8_Names_Validation` setting and adds 2 new settings `UTF8_User_Names_Validation` and `UTF8_Channel_Names_Validation`.
-
+  Now, there are 2 separate settings for validating names   - One for **channels** and another for **usernames**.
+
+  This change also removes the old `UTF8_Names_Validation` setting and adds 2 new settings `UTF8_User_Names_Validation` and `UTF8_Channel_Names_Validation`.
+
   https://user-images.githubusercontent.com/55396651/116969904-af5bb800-acd4-11eb-9fc4-dacac60cb08f.mp4
 
 ### 🚀 Improvements
@@ -1012,13 +1064,13 @@
 
 - Rewrite File Upload Modal ([#22750](https://github.com/RocketChat/Rocket.Chat/pull/22750))
 
-  Image preview:
-  ![image](https://user-images.githubusercontent.com/40830821/127223432-dccd2182-aec0-430f-8d70-03ac88aec791.png)
-
-  Video preview:
-  ![image](https://user-images.githubusercontent.com/40830821/127225982-f8b21840-0d9c-4aff-a354-16188c7ed66e.png)
-
-  Files larger than 10mb:
+  Image preview:
+  ![image](https://user-images.githubusercontent.com/40830821/127223432-dccd2182-aec0-430f-8d70-03ac88aec791.png)
+
+  Video preview:
+  ![image](https://user-images.githubusercontent.com/40830821/127225982-f8b21840-0d9c-4aff-a354-16188c7ed66e.png)
+
+  Files larger than 10mb:
   ![image](https://user-images.githubusercontent.com/40830821/127222611-5265040f-a06b-4ec5-b528-89b40e6a9072.png)
 
 - Types from currentChatsPage.tsx ([#22967](https://github.com/RocketChat/Rocket.Chat/pull/22967))
@@ -1034,14 +1086,14 @@
 
 - "Users By Time of the Day" chart displays incorrect data for Local Timezone ([#22836](https://github.com/RocketChat/Rocket.Chat/pull/22836))
 
-  - Add local timezone conversion to the "Users By Time of the Day" chart in the Engagement Dashboard;
+  - Add local timezone conversion to the "Users By Time of the Day" chart in the Engagement Dashboard;
    - Simplify date creations by using `endOf` and `startOf` methods.
 
 - Atlassian Crowd connection not working ([#22996](https://github.com/RocketChat/Rocket.Chat/pull/22996) by [@piotrkochan](https://github.com/piotrkochan))
 
 - Audio recording doesn't stop in direct messages on channel switch ([#22880](https://github.com/RocketChat/Rocket.Chat/pull/22880))
 
-  - Cancel audio recordings on message bar destroy event.
+  - Cancel audio recordings on message bar destroy event.
   ![test-22372](https://user-images.githubusercontent.com/36537004/128569780-d83747b0-fb9c-4dc6-9bc5-7ae573e720c8.gif)
 
 - Bad words falling if message is empty ([#22930](https://github.com/RocketChat/Rocket.Chat/pull/22930))
@@ -1066,21 +1118,23 @@
 
 - Return transcript/dashboards based on timezone settings ([#22850](https://github.com/RocketChat/Rocket.Chat/pull/22850))
 
-  - Added new setting to manage timezones
  
-  - Applied new setting to omnichannel dashboards (realtime, analytics) [NOTE: Other dashboards aren't using this setting actually)
  
+  - Added new setting to manage timezones
+
+  - Applied new setting to omnichannel dashboards (realtime, analytics) [NOTE: Other dashboards aren't using this setting actually)
+
   - Change getAnalyticsBetweenDate query to filter out system messages instead of substracting them
 
 - Tab margin style ([#22851](https://github.com/RocketChat/Rocket.Chat/pull/22851))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/128103848-2a25ba7e-0e59-4502-9bcd-2569cad9379a.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/128103848-2a25ba7e-0e59-4502-9bcd-2569cad9379a.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/128103633-ec7b93fc-4667-4dc9-bad3-bfffaff3974e.png)
 
 - Threads and discussions searches don't display proper results ([#22914](https://github.com/RocketChat/Rocket.Chat/pull/22914))
 
-  - _Fix_ issue in discussions search (which wasn't working after a search with no results was made);
+  - _Fix_ issue in discussions search (which wasn't working after a search with no results was made);
    - _Improve_ discussions and threads searches: both searches (`chat.getDiscussions` and `chat.getThreadsList`) are now case insensitive (do NOT differ capital from lower letters) and match incomplete words or terms.
 
 - Threads List being requested more than expected ([#22879](https://github.com/RocketChat/Rocket.Chat/pull/22879))
@@ -1115,8 +1169,8 @@
 
 - Chore: Script to start Rocket.Chat in HA mode during development ([#22398](https://github.com/RocketChat/Rocket.Chat/pull/22398))
 
-  Sometimes we need to start Rocket.Chat in High-Availability mode (cluster) during development to test how a feature behaves or hunt down a bug. Currently, this involves a lot of commands with details that might be lost if you haven't done it in a while.
-
+  Sometimes we need to start Rocket.Chat in High-Availability mode (cluster) during development to test how a feature behaves or hunt down a bug. Currently, this involves a lot of commands with details that might be lost if you haven't done it in a while.
+
   This PR intends to provide a really simple way for us to start many instances of Rocket.Chat connected in a cluster.
 
 - Chore: Update Livechat widget to 1.9.4 ([#22990](https://github.com/RocketChat/Rocket.Chat/pull/22990))
@@ -1133,13 +1187,13 @@
 
 - Regression: File upload name suggestion ([#22953](https://github.com/RocketChat/Rocket.Chat/pull/22953))
 
-  Before:
-  ![image](https://user-images.githubusercontent.com/40830821/129774936-ecdbe9a1-5e3f-4a0a-ad1e-6f13eb15c60b.png)
-  ![image](https://user-images.githubusercontent.com/40830821/129775011-fb0df01d-74e4-41ae-bb47-dcf4cc17735e.png)
-
-
-  After:
-  ![image](https://user-images.githubusercontent.com/40830821/129774877-928a8aa0-c003-4e57-8b33-ea6accc32774.png)
+  Before:
+  ![image](https://user-images.githubusercontent.com/40830821/129774936-ecdbe9a1-5e3f-4a0a-ad1e-6f13eb15c60b.png)
+  ![image](https://user-images.githubusercontent.com/40830821/129775011-fb0df01d-74e4-41ae-bb47-dcf4cc17735e.png)
+
+
+  After:
+  ![image](https://user-images.githubusercontent.com/40830821/129774877-928a8aa0-c003-4e57-8b33-ea6accc32774.png)
   ![image](https://user-images.githubusercontent.com/40830821/129774972-d67debaf-0ce9-44fb-93cb-d7612dd18edf.png)
 
 - Regression: Fix creation of self-DMs ([#23015](https://github.com/RocketChat/Rocket.Chat/pull/23015))
@@ -1207,7 +1261,8 @@
 
 - Fix Auto Selection algorithm on community edition ([#22991](https://github.com/RocketChat/Rocket.Chat/pull/22991))
 
-  - When using the autoselection algo on community editions, all agents were marked as unavailable due to an unapplied filter
  
+  - When using the autoselection algo on community editions, all agents were marked as unavailable due to an unapplied filter
+
   - Fixed an issue when both user & system setting to manange EE max number of chats allowed were set to 0
 
 <details>
@@ -1247,7 +1302,7 @@
 
 - Apps-Engine's scheduler failing to update run tasks ([#22882](https://github.com/RocketChat/Rocket.Chat/pull/22882))
 
-  [Agenda](https://github.com/agenda/agenda), the library that manages scheduling, depended on setting a job property named `nextRunAt` as `undefined` to signal whether it should be run on schedule or not. [Rocket.Chat's current Mongo driver](https://github.com/RocketChat/Rocket.Chat/pull/22399) ignores `undefined` values when updating documents and this was causing jobs to never stop running as Agenda couldn't clear that property (set them as `undefined`). 
+  [Agenda](https://github.com/agenda/agenda), the library that manages scheduling, depended on setting a job property named `nextRunAt` as `undefined` to signal whether it should be run on schedule or not. [Rocket.Chat's current Mongo driver](https://github.com/RocketChat/Rocket.Chat/pull/22399) ignores `undefined` values when updating documents and this was causing jobs to never stop running as Agenda couldn't clear that property (set them as `undefined`).
   This updates Rocket.Chat's dependency on Agenda.js to point to [a fork that fixes the problem](https://github.com/RocketChat/agenda/releases/tag/3.1.2).
 
 - Close omnichannel conversations when agent is deactivated ([#22917](https://github.com/RocketChat/Rocket.Chat/pull/22917))
@@ -1301,7 +1356,7 @@
 
 - Monitoring Track messages' round trip time ([#22676](https://github.com/RocketChat/Rocket.Chat/pull/22676))
 
-  Track messages' roundtrip time from backend saves time to the time when received back from the oplog allowing track of oplog slowness.
+  Track messages' roundtrip time from backend saves time to the time when received back from the oplog allowing track of oplog slowness.
   Prometheus metric: `rocketchat_messages_roundtrip_time`
 
 - REST endpoint to remove User from Role ([#20485](https://github.com/RocketChat/Rocket.Chat/pull/20485) by [@Cosnavel](https://github.com/Cosnavel) & [@lucassartor](https://github.com/lucassartor))
@@ -1313,19 +1368,22 @@
 
 - Change message deletion confirmation modal to toast ([#22544](https://github.com/RocketChat/Rocket.Chat/pull/22544))
 
-  Changed a timed modal for a toast message
+  Changed a timed modal for a toast message
   ![image](https://user-images.githubusercontent.com/40830821/124192670-0646f900-da9c-11eb-941c-9ae35421f6ef.png)
 
 - Configuration for indices in Apps-Engine models ([#22705](https://github.com/RocketChat/Rocket.Chat/pull/22705))
 
-  * Add `appId` field to the data saved by the Scheduler
  
-  * Add `appId` index to `rocketchat_apps_persistence` model
  
-  * Skip "trash collection" when deleting records from `rocketchat_apps_persistence`
  
-  * Add a new setting to control for how long we should keep logs from the apps
-
-  ![image](https://user-images.githubusercontent.com/1810309/126246666-907f9d98-1d84-4dfe-a80a-7dd874d36fa8.png)
-
-
+  * Add `appId` field to the data saved by the Scheduler
+
+  * Add `appId` index to `rocketchat_apps_persistence` model
+
+  * Skip "trash collection" when deleting records from `rocketchat_apps_persistence`
+
+  * Add a new setting to control for how long we should keep logs from the apps
+
+  ![image](https://user-images.githubusercontent.com/1810309/126246666-907f9d98-1d84-4dfe-a80a-7dd874d36fa8.png)
+
+
   ![image](https://user-images.githubusercontent.com/1810309/126246655-2ce3cb5f-b2f5-456e-a9c4-beccd9b3ef41.png)
 
 - Make `shortcut` field of canned responses unique ([#22700](https://github.com/RocketChat/Rocket.Chat/pull/22700))
@@ -1348,37 +1406,38 @@
 
 - Replace remaing discussion creation modals with React modal. ([#22448](https://github.com/RocketChat/Rocket.Chat/pull/22448))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/123840524-cbe72b80-d8e4-11eb-9ddb-23a9f9d90aac.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/123840524-cbe72b80-d8e4-11eb-9ddb-23a9f9d90aac.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/123840219-74e15680-d8e4-11eb-95aa-00a990ffe0e7.png)
 
 - Return open room if available for visitors ([#22742](https://github.com/RocketChat/Rocket.Chat/pull/22742))
 
 - Rewrite Enter Encryption Password Modal ([#22456](https://github.com/RocketChat/Rocket.Chat/pull/22456))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/123182889-bbf3c580-d466-11eb-8d4d-9cfc3d224e33.png)
-
-  ### after
-  ![image](https://user-images.githubusercontent.com/27704687/123182916-cada7800-d466-11eb-96ee-850be190d419.png)
-
-  ### Aditional Improves:
  
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/123182889-bbf3c580-d466-11eb-8d4d-9cfc3d224e33.png)
+
+  ### after
+  ![image](https://user-images.githubusercontent.com/27704687/123182916-cada7800-d466-11eb-96ee-850be190d419.png)
+
+  ### Aditional Improves:
+
   - Added a visual validation in the password field
 
 - Rewrite OTR modals ([#22583](https://github.com/RocketChat/Rocket.Chat/pull/22583))
 
-  ![image](https://user-images.githubusercontent.com/40830821/124513267-cb510800-ddb0-11eb-8165-f103029c348f.png)
-  ![image](https://user-images.githubusercontent.com/40830821/124513354-04897800-ddb1-11eb-96f4-41fe906ca0d7.png)
+  ![image](https://user-images.githubusercontent.com/40830821/124513267-cb510800-ddb0-11eb-8165-f103029c348f.png)
+  ![image](https://user-images.githubusercontent.com/40830821/124513354-04897800-ddb1-11eb-96f4-41fe906ca0d7.png)
   ![image](https://user-images.githubusercontent.com/40830821/124513395-1b2fcf00-ddb1-11eb-83e4-3f8f9b4676ba.png)
 
 - Rewrite Save Encryption Password Modal ([#22447](https://github.com/RocketChat/Rocket.Chat/pull/22447))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/122980201-c337a800-d36e-11eb-8e2b-68534cea8e1e.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/122980201-c337a800-d36e-11eb-8e2b-68534cea8e1e.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/122980409-f8dc9100-d36e-11eb-9c15-aff779c84a91.png)
 
 - Rewrite sidebar footer as React Component ([#22687](https://github.com/RocketChat/Rocket.Chat/pull/22687))
@@ -1393,12 +1452,12 @@
 
 - Wrong error message when trying to create a blocked username ([#22452](https://github.com/RocketChat/Rocket.Chat/pull/22452) by [@lucassartor](https://github.com/lucassartor))
 
-  When trying to create a user with a blocked username, the UI was showing generic error message that it wasn't very detailed.
-
-  Old error message:
-  ![image](https://user-images.githubusercontent.com/49413772/123120080-6d203e80-d41a-11eb-8c87-64e34334c856.png)
-
-  New error message:
+  When trying to create a user with a blocked username, the UI was showing generic error message that it wasn't very detailed.
+
+  Old error message:
+  ![image](https://user-images.githubusercontent.com/49413772/123120080-6d203e80-d41a-11eb-8c87-64e34334c856.png)
+
+  New error message:
   ![aaa](https://user-images.githubusercontent.com/49413772/123120251-8c1ed080-d41a-11eb-8dc2-d7484923d851.PNG)
 
 ### 🐛 Bug fixes
@@ -1406,19 +1465,19 @@
 
 - **ENTERPRISE:** Engagement Dashboard displaying incorrect data about active users ([#22381](https://github.com/RocketChat/Rocket.Chat/pull/22381))
 
-  - Fix sessions' and users' grouping in the Engagement Dashboard API endpoints;
-   - Fix the data displayed in the charts from the "Active users", "Users by time of day" and "When is the chat busier?" sections of the Engagement Dashboard;
+  - Fix sessions' and users' grouping in the Engagement Dashboard API endpoints;
+   - Fix the data displayed in the charts from the "Active users", "Users by time of day" and "When is the chat busier?" sections of the Engagement Dashboard;
    - Replace label used to describe the amount of Active Users in the License section of the Info page.
 
 - **ENTERPRISE:** Make AutoSelect algo take current agent load in consideration ([#22611](https://github.com/RocketChat/Rocket.Chat/pull/22611))
 
 - **ENTERPRISE:** Race condition on Omnichannel visitor abandoned callback ([#22413](https://github.com/RocketChat/Rocket.Chat/pull/22413))
 
-  As you can see [here](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/ee/app/livechat-enterprise/server/lib/Helper.js#L127) the `predictedVisitorAbandonment` flag is not set if the room object doesn't have  `v.lastMessageTs` property. So we need to always make sure the `v.lastMessageTs` is set before this method is called.
-
-  Currently the `v.lastMessageTs` is being set in [this](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/app/livechat/server/hooks/saveLastVisitorMessageTs.js#L4) (lets call this **hook-1**) hook which has `HIGH` priority
-  and the `predictedVisitorAbandonment` check is inturn performed in [this](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/ee/app/livechat-enterprise/server/hooks/setPredictedVisitorAbandonmentTime.js#L5) (let call this **hook-2**) hook which is also `HIGH` priority.
-
+  As you can see [here](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/ee/app/livechat-enterprise/server/lib/Helper.js#L127) the `predictedVisitorAbandonment` flag is not set if the room object doesn't have  `v.lastMessageTs` property. So we need to always make sure the `v.lastMessageTs` is set before this method is called.
+
+  Currently the `v.lastMessageTs` is being set in [this](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/app/livechat/server/hooks/saveLastVisitorMessageTs.js#L4) (lets call this **hook-1**) hook which has `HIGH` priority
+  and the `predictedVisitorAbandonment` check is inturn performed in [this](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/ee/app/livechat-enterprise/server/hooks/setPredictedVisitorAbandonmentTime.js#L5) (let call this **hook-2**) hook which is also `HIGH` priority.
+
   So ideally we'd except the **hook-1** to be called b4 **hook-2**, however currently since both of them are at same priority, there is no way to control which one is executed first. Hence in this PR, I'm making the priority of **hook-2** as `MEDIUM` to keeping the priority of **hook-1** the same as b4, i.e. `HIGH`. This should make sure that the **hook-1** is always executed b4 **hook-2**
 
 - Admin page crashing when commit hash is null ([#22057](https://github.com/RocketChat/Rocket.Chat/pull/22057) by [@cprice-kgi](https://github.com/cprice-kgi))
@@ -1427,39 +1486,41 @@
 
 - Blank screen in message auditing DM tab ([#22763](https://github.com/RocketChat/Rocket.Chat/pull/22763))
 
-  The DM tab in message auditing was displaying a blank screen, instead of the actual tab.
-
+  The DM tab in message auditing was displaying a blank screen, instead of the actual tab.
+
   ![image](https://user-images.githubusercontent.com/28611993/127041404-dfca7f6a-2b8b-4c15-9cbd-c6238fac0063.png)
 
 - Bugs in AutoCompleteDepartment ([#22414](https://github.com/RocketChat/Rocket.Chat/pull/22414))
 
 - Call button is still displayed when the user doesn't have permission to use it ([#22170](https://github.com/RocketChat/Rocket.Chat/pull/22170))
 
-  - Hide 'Call' buttons from the tab bar for muted users;
  
+  - Hide 'Call' buttons from the tab bar for muted users;
+
   - Display an error when a muted user attempts to enter a call using the 'Click to Join!' button.
 
 - Can't see full user profile on team's room ([#22355](https://github.com/RocketChat/Rocket.Chat/pull/22355))
 
-  ### before
-  ![before](https://user-images.githubusercontent.com/27704687/121966860-bbac4980-cd45-11eb-8d48-2b0457110fc7.gif)
-
-  ### after
-  ![after](https://user-images.githubusercontent.com/27704687/121966870-bea73a00-cd45-11eb-9c89-ec52ac17e20f.gif)
-
-  ### aditional fix :rocket:
  
+  ### before
+  ![before](https://user-images.githubusercontent.com/27704687/121966860-bbac4980-cd45-11eb-8d48-2b0457110fc7.gif)
+
+  ### after
+  ![after](https://user-images.githubusercontent.com/27704687/121966870-bea73a00-cd45-11eb-9c89-ec52ac17e20f.gif)
+
+  ### aditional fix :rocket:
+
   - unnecessary `TeamsMembers` component removed
 
 - Cannot create a discussion from top left sidebar as a user ([#22618](https://github.com/RocketChat/Rocket.Chat/pull/22618) by [@lucassartor](https://github.com/lucassartor))
 
-  When trying to create a discussion using the top left sidebar modal with an role that don't have the `view-other-user-channels ` permission, an empty list would be shown, which is a wrong behavior.
-  Also, when being able to use this modal, discussions were listed as options, which is also a wrong behavior as there can't be nested discussions.
-
-  This PR looks to fix both these issues.
-
-  **Old behavior:**
-  ![old](https://user-images.githubusercontent.com/49413772/124960017-3c333280-dff2-11eb-86cd-b2638311517e.png)
-
-  **New behavior:**
+  When trying to create a discussion using the top left sidebar modal with an role that don't have the `view-other-user-channels ` permission, an empty list would be shown, which is a wrong behavior.
+  Also, when being able to use this modal, discussions were listed as options, which is also a wrong behavior as there can't be nested discussions.
+
+  This PR looks to fix both these issues.
+
+  **Old behavior:**
+  ![old](https://user-images.githubusercontent.com/49413772/124960017-3c333280-dff2-11eb-86cd-b2638311517e.png)
+
+  **New behavior:**
   ![image](https://user-images.githubusercontent.com/49413772/124958882-05a8e800-dff1-11eb-8203-b34a4f1c98a0.png)
 
 - Channel is automatically getting added to the first option in move to team feature ([#22670](https://github.com/RocketChat/Rocket.Chat/pull/22670))
@@ -1474,12 +1535,12 @@
 
 - Create discussion modal - cancel button and invite users alignment ([#22718](https://github.com/RocketChat/Rocket.Chat/pull/22718))
 
-  Changes in "open discussion" modal
-
-  > Added cancel button
-  > Fixed alignment in invite user
-
-
+  Changes in "open discussion" modal
+
+  > Added cancel button
+  > Fixed alignment in invite user
+
+
   ![image](https://user-images.githubusercontent.com/28611993/126388304-6ac76574-6924-426e-843d-afd53dc1c874.png)
 
 - crush in the getChannelHistory method ([#22667](https://github.com/RocketChat/Rocket.Chat/pull/22667) by [@MaestroArt](https://github.com/MaestroArt))
@@ -1514,27 +1575,29 @@
 
 - Quote message not working for Livechat visitors ([#22586](https://github.com/RocketChat/Rocket.Chat/pull/22586))
 
-  ### Before:
-  ![image](https://user-images.githubusercontent.com/34130764/124583613-de2b1180-de70-11eb-82aa-18564b317626.png)
-  ### After:
+  ### Before:
+  ![image](https://user-images.githubusercontent.com/34130764/124583613-de2b1180-de70-11eb-82aa-18564b317626.png)
+  ### After:
   ![image](https://user-images.githubusercontent.com/34130764/124583775-12063700-de71-11eb-8ab5-b0169fac2d40.png)
 
 - Redirect to login after delete own account ([#22499](https://github.com/RocketChat/Rocket.Chat/pull/22499))
 
-  Redirect the user to login after delete own account
-
-  ### Aditional fixes:
  
-  - Visual issue in password input on Delete Own Account Modal
-
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/123711503-f5ea1080-d846-11eb-96aa-8ed638ca665c.png)
-
-  ### after
+  Redirect the user to login after delete own account
+
+  ### Aditional fixes:
+
+  - Visual issue in password input on Delete Own Account Modal
+
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/123711503-f5ea1080-d846-11eb-96aa-8ed638ca665c.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/123711336-b3c0cf00-d846-11eb-9408-a686d8668ba5.png)
 
 - Remove stack traces from Meteor errors when debug setting is disabled ([#22699](https://github.com/RocketChat/Rocket.Chat/pull/22699))
 
-  - Fix 'not iterable' errors in the `normalizeMessage` function;
  
+  - Fix 'not iterable' errors in the `normalizeMessage` function;
+
   - Remove stack traces from errors thrown by the `jitsi:updateTimeout` (and other `Meteor.Error`s) method.
 
 - Rewrite CurrentChats to TS ([#22424](https://github.com/RocketChat/Rocket.Chat/pull/22424))
@@ -1623,15 +1686,16 @@
 
 - Regression: Data in the "Active Users" section is delayed in 1 day ([#22794](https://github.com/RocketChat/Rocket.Chat/pull/22794))
 
-  - Fix 1 day delay in the Engagement Dashboard's "Active Users" section;
  
-  - Downgrade `@nivo/line` version.
-  **Expected behavior:**
+  - Fix 1 day delay in the Engagement Dashboard's "Active Users" section;
+
+  - Downgrade `@nivo/line` version.
+  **Expected behavior:**
   ![active-users-engagement-dashboard](https://user-images.githubusercontent.com/36537004/127372185-390dc42f-bc90-4841-a22b-731f0aafcafe.PNG)
 
 - Regression: Data in the "New Users" section is delayed in 1 day ([#22751](https://github.com/RocketChat/Rocket.Chat/pull/22751))
 
-  - Update nivo version (which was causing errors in the bar chart);
-   - Fix 1 day delay in '7 days' and '30 days' periods;
+  - Update nivo version (which was causing errors in the bar chart);
+   - Fix 1 day delay in '7 days' and '30 days' periods;
    - Update tooltip theme.
 
 - Regression: Federation warnings on ci ([#22765](https://github.com/RocketChat/Rocket.Chat/pull/22765) by [@g-thome](https://github.com/g-thome))
@@ -1656,9 +1720,9 @@
 
 - Regression: Fix tooltip style in the "Busiest Chat Times" chart ([#22813](https://github.com/RocketChat/Rocket.Chat/pull/22813))
 
-  - Fix tooltip in the Engagement Dashboard's "Busiest Chat Times" chart (Hours).
-
-  **Expected behavior:**
+  - Fix tooltip in the Engagement Dashboard's "Busiest Chat Times" chart (Hours).
+
+  **Expected behavior:**
   ![busiest-times-ed](https://user-images.githubusercontent.com/36537004/127527827-465397ed-f089-4fb7-9ab2-6fa8cea6abdf.PNG)
 
 - Regression: Fix users not being able to see the scope of the canned m… ([#22760](https://github.com/RocketChat/Rocket.Chat/pull/22760))
@@ -1675,10 +1739,10 @@
 
 - Regression: Prevent custom status from being visible in sequential messages ([#22733](https://github.com/RocketChat/Rocket.Chat/pull/22733))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/126641946-866dae96-1983-43a5-b689-b24670473ad0.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/126641946-866dae96-1983-43a5-b689-b24670473ad0.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/126641752-3163eb95-1cd4-4d99-a61a-4d06d9e7e13e.png)
 
 - Regression: Properly force newline in attachment fields ([#22727](https://github.com/RocketChat/Rocket.Chat/pull/22727))
@@ -1859,30 +1923,32 @@
 
 - Add `teams.convertToChannel` endpoint ([#22188](https://github.com/RocketChat/Rocket.Chat/pull/22188))
 
-  - Add new `teams.converToChannel` endpoint;
  
-  - Update `ConvertToTeam` modal text (since this action can now be reversed);
  
+  - Add new `teams.converToChannel` endpoint;
+
+  - Update `ConvertToTeam` modal text (since this action can now be reversed);
+
   - Remove corresponding team memberships when a team is deleted or converted to a channel;
 
 - Add setting to configure default role for user on manual registration ([#20650](https://github.com/RocketChat/Rocket.Chat/pull/20650) by [@lucassartor](https://github.com/lucassartor))
 
-  Add an `admin` setting to determine the initial `role` for new users who registered manually (through the register form and via API, not using an authentication service), normally all new users are assigned to the `user` role.
-
-  The setting can be found in `Admin`->`Accounts`->`Registration`.
-
-  ![image](https://user-images.githubusercontent.com/49413772/107252603-47b70900-6a14-11eb-9cc6-df76720b7365.png)
-  The setting initial value is false, so the default behaviour stays the same while creating a new server or upgrading one.
-
-  https://user-images.githubusercontent.com/49413772/107253220-ddeb2f00-6a14-11eb-85b4-f770dbbe4970.mp4
-
+  Add an `admin` setting to determine the initial `role` for new users who registered manually (through the register form and via API, not using an authentication service), normally all new users are assigned to the `user` role.
+
+  The setting can be found in `Admin`->`Accounts`->`Registration`.
+
+  ![image](https://user-images.githubusercontent.com/49413772/107252603-47b70900-6a14-11eb-9cc6-df76720b7365.png)
+  The setting initial value is false, so the default behaviour stays the same while creating a new server or upgrading one.
+
+  https://user-images.githubusercontent.com/49413772/107253220-ddeb2f00-6a14-11eb-85b4-f770dbbe4970.mp4
+
   Video showing an example of the setting being used and creating an new user with the default roles via API.
 
 - Content-Security-Policy for inline scripts ([#20724](https://github.com/RocketChat/Rocket.Chat/pull/20724))
 
-  Security policies were applied for inline scripts cases. Due to the libraries and components we use it is not possible to disable inline styles and images as they would break Oembeds and other libraries.
-
-
-  basically the inline scripts were moved to a js file
-
+  Security policies were applied for inline scripts cases. Due to the libraries and components we use it is not possible to disable inline styles and images as they would break Oembeds and other libraries.
+
+
+  basically the inline scripts were moved to a js file
+
   and besides that some suggars syntax like `addScript` and `addStyle` were added, this way the application already takes care of inserting the elements and providing the content automatically.
 
 - Open modals in side effects outside React ([#22247](https://github.com/RocketChat/Rocket.Chat/pull/22247))
@@ -1898,15 +1964,17 @@
 
 - Add BBB and Jitsi to Team ([#22312](https://github.com/RocketChat/Rocket.Chat/pull/22312))
 
-  Added 2 new settings:
  
-  - `Admin > Video Conference > Big Blue Button > Enable for teams`
  
+  Added 2 new settings:
+
+  - `Admin > Video Conference > Big Blue Button > Enable for teams`
+
   - `Admin > Video Conference > Jitsi > Enable in teams`
 
 - Add debouncing to units selects filters ([#22097](https://github.com/RocketChat/Rocket.Chat/pull/22097))
 
 - Add modal to close chats when tags/comments are not required ([#22245](https://github.com/RocketChat/Rocket.Chat/pull/22245) by [@rafaelblink](https://github.com/rafaelblink))
 
-  When neither tags or comments are required to close a livechat, show this modal instead: 
+  When neither tags or comments are required to close a livechat, show this modal instead:
   ![Screen Shot 2021-05-20 at 7 33 19 PM](https://user-images.githubusercontent.com/20868078/119057741-6af23c80-b9a3-11eb-902f-f8a7458ad11c.png)
 
 - Fallback messages on contextual bar ([#22376](https://github.com/RocketChat/Rocket.Chat/pull/22376))
@@ -1929,10 +1997,10 @@
 
 - Remove differentiation between public x private channels in sidebar ([#22160](https://github.com/RocketChat/Rocket.Chat/pull/22160))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/119752184-e7d55880-be72-11eb-9167-be2f305ddb3f.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/119752184-e7d55880-be72-11eb-9167-be2f305ddb3f.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/119752125-c8d6c680-be72-11eb-8444-2e0c7cb1c600.png)
 
 - Rewrite create direct modal ([#22209](https://github.com/RocketChat/Rocket.Chat/pull/22209))
@@ -1941,8 +2009,8 @@
 
 - Rewrite Create Discussion Modal (only through sidebar) ([#22224](https://github.com/RocketChat/Rocket.Chat/pull/22224))
 
-  This is only available by creating a new discussion when clicking on the sidebar button. Other places will be implemented afterwards.
-
+  This is only available by creating a new discussion when clicking on the sidebar button. Other places will be implemented afterwards.
+
   ![image](https://user-images.githubusercontent.com/40830821/120556093-6af63180-c3d2-11eb-97ea-63c5423049dc.png)
 
 - Send only relevant data via WebSocket ([#22258](https://github.com/RocketChat/Rocket.Chat/pull/22258))
@@ -1956,12 +2024,12 @@
 
 - **EE:** Canned responses can't be deleted ([#22095](https://github.com/RocketChat/Rocket.Chat/pull/22095) by [@rafaelblink](https://github.com/rafaelblink))
 
-  Deletion button has been removed from the edition option.
-
-  ## Before
-  ![image](https://user-images.githubusercontent.com/2493803/119059416-9f1b2c80-b9a6-11eb-933a-4efa1ac0552a.png)
-
-  ### After
+  Deletion button has been removed from the edition option.
+
+  ## Before
+  ![image](https://user-images.githubusercontent.com/2493803/119059416-9f1b2c80-b9a6-11eb-933a-4efa1ac0552a.png)
+
+  ### After
   ![Rocket Chat (2)](https://user-images.githubusercontent.com/2493803/119172517-72b1ef80-ba3c-11eb-9178-04a12176f312.gif)
 
 - **ENTERPRISE:** Omnichannel enterprise permissions being added back to its default roles ([#22322](https://github.com/RocketChat/Rocket.Chat/pull/22322))
@@ -1970,19 +2038,19 @@
 
 - **ENTERPRISE:** Prevent Visitor Abandonment after forwarding chat ([#22243](https://github.com/RocketChat/Rocket.Chat/pull/22243))
 
-  Currently the Visitor Abandonment timer isn't affected when the chat is forwarded. However this is affecting the UX in certain situations like eg: A bot forwarding a chat to an human agent
-  ![image](https://user-images.githubusercontent.com/34130764/120896383-e4925780-c63e-11eb-937e-ffd7c4836159.png)
-
+  Currently the Visitor Abandonment timer isn't affected when the chat is forwarded. However this is affecting the UX in certain situations like eg: A bot forwarding a chat to an human agent
+  ![image](https://user-images.githubusercontent.com/34130764/120896383-e4925780-c63e-11eb-937e-ffd7c4836159.png)
+
   To solve this issue, we'll now be stoping the Visitor Abandonment timer once a chat is forwarded.
 
 - **IMPROVE:** Prevent creation of duplicated roles and new `roles.update` endpoint ([#22279](https://github.com/RocketChat/Rocket.Chat/pull/22279) by [@lucassartor](https://github.com/lucassartor))
 
-  Currently, the action of updating a role is broken: because roles have their `_id` = `name`, when updating a role there's no way to validate if the user is trying to update or create a new role with a name that already exists   -  which causes wrong behaviors, such as roles with the same name and not being able to update them.
-
-  To proper fix this, this PR looks to change the creation of roles. Now, roles have a unique  `_id` value and there's a endpoint to update roles: `/api/v1/roles.update`.
-
-  Doing so, it's possible to validate on both endpoints (`roles.create` and `roles.update`) to not allow roles with duplicated names.
-
+  Currently, the action of updating a role is broken: because roles have their `_id` = `name`, when updating a role there's no way to validate if the user is trying to update or create a new role with a name that already exists   -  which causes wrong behaviors, such as roles with the same name and not being able to update them.
+
+  To proper fix this, this PR looks to change the creation of roles. Now, roles have a unique  `_id` value and there's a endpoint to update roles: `/api/v1/roles.update`.
+
+  Doing so, it's possible to validate on both endpoints (`roles.create` and `roles.update`) to not allow roles with duplicated names.
+
   **OBS:** The unique id changes only reflect new roles, the standard roles (such as admin and user) still have `_id` = `name`, but new roles now **can't** have the same name as them.
 
 - `channels.history`, `groups.history` and `im.history` REST endpoints not respecting hide system message config ([#22364](https://github.com/RocketChat/Rocket.Chat/pull/22364))
@@ -1999,10 +2067,10 @@
 
 - Can't delete file from Room's file list ([#22191](https://github.com/RocketChat/Rocket.Chat/pull/22191))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/120215931-bb239700-c20c-11eb-9494-d4bc017df390.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/120215931-bb239700-c20c-11eb-9494-d4bc017df390.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/120216113-f8882480-c20c-11eb-9afb-b127e66a43da.png)
 
 - Cancel button and success toast at Leave Team modal ([#22373](https://github.com/RocketChat/Rocket.Chat/pull/22373))
@@ -2013,10 +2081,10 @@
 
 - Convert and Move team permission ([#22350](https://github.com/RocketChat/Rocket.Chat/pull/22350))
 
-  ### before
-  https://user-images.githubusercontent.com/45966964/114909360-5c04f100-9e1d-11eb-9363-f308e5d0be68.mp4
-
-  ### after
+  ### before
+  https://user-images.githubusercontent.com/45966964/114909360-5c04f100-9e1d-11eb-9363-f308e5d0be68.mp4
+
+  ### after
   https://user-images.githubusercontent.com/45966964/114909388-61fad200-9e1d-11eb-9bbe-114b55954a9f.mp4
 
 - CORS error while interacting with any action button on Livechat  ([#22150](https://github.com/RocketChat/Rocket.Chat/pull/22150))
@@ -2035,50 +2103,50 @@
 
 - Members tab visual issues ([#22138](https://github.com/RocketChat/Rocket.Chat/pull/22138))
 
-  ## Before
-  ![image](https://user-images.githubusercontent.com/27704687/119558283-95fbd800-bd77-11eb-91b4-91821f365bf3.png)
-
-  ## After
+  ## Before
+  ![image](https://user-images.githubusercontent.com/27704687/119558283-95fbd800-bd77-11eb-91b4-91821f365bf3.png)
+
+  ## After
   ![image](https://user-images.githubusercontent.com/27704687/119558120-6947c080-bd77-11eb-8ecb-7fedc07afa82.png)
 
 - Memory leak generated by Stream Cast usage ([#22329](https://github.com/RocketChat/Rocket.Chat/pull/22329))
 
-  Stream Cast uses a different approach to broadcast data to the instances, it uses the DDP subscription method that requires a collection on the other side, if no collection exists with the given name `broadcast-stream` it caches in memory waiting for the collection to be set later. The cache is cleared only when a reconnection happens.
-
+  Stream Cast uses a different approach to broadcast data to the instances, it uses the DDP subscription method that requires a collection on the other side, if no collection exists with the given name `broadcast-stream` it caches in memory waiting for the collection to be set later. The cache is cleared only when a reconnection happens.
+
   This PR overrides the function that processes the data for that specific connection, preventing the cache and everything else to be processed since we already have our low-level listener to process the data.
 
 - Message box hiding on mobile view (Safari) ([#22212](https://github.com/RocketChat/Rocket.Chat/pull/22212))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/120404256-5b1c1600-c31c-11eb-96e9-860e4132db5f.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/120404256-5b1c1600-c31c-11eb-96e9-860e4132db5f.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/120404406-acc4a080-c31c-11eb-9efb-c2ad88664fda.png)
 
 - Missing burger menu on direct messages ([#22211](https://github.com/RocketChat/Rocket.Chat/pull/22211))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/120403671-09bf5700-c31b-11eb-92a1-a2f589bd85fc.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/120403671-09bf5700-c31b-11eb-92a1-a2f589bd85fc.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/120403693-1643af80-c31b-11eb-8027-dbdc4f560647.png)
 
 - Missing Throbber while thread list is loading ([#22316](https://github.com/RocketChat/Rocket.Chat/pull/22316))
 
-  ### before
-  List was starting with no results even if there's results:
-
-  ![image](https://user-images.githubusercontent.com/27704687/121606744-1e8ba100-ca25-11eb-9b31-706fb998d05f.png)
-
-  ### after
+  ### before
+  List was starting with no results even if there's results:
+
+  ![image](https://user-images.githubusercontent.com/27704687/121606744-1e8ba100-ca25-11eb-9b31-706fb998d05f.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/121606635-e97f4e80-ca24-11eb-81f7-af8b0cc41c89.png)
 
 - Not possible to edit some messages inside threads ([#22325](https://github.com/RocketChat/Rocket.Chat/pull/22325))
 
-  ### Before
-  ![before](https://user-images.githubusercontent.com/27704687/121755733-4eeb4200-caee-11eb-9d77-1b498c38c478.gif)
-
-  ### After
+  ### Before
+  ![before](https://user-images.githubusercontent.com/27704687/121755733-4eeb4200-caee-11eb-9d77-1b498c38c478.gif)
+
+  ### After
   ![after](https://user-images.githubusercontent.com/27704687/121755736-514d9c00-caee-11eb-9897-78fcead172f2.gif)
 
 - Notifications not using user's name ([#22309](https://github.com/RocketChat/Rocket.Chat/pull/22309))
@@ -2105,10 +2173,10 @@
 
 - Sidebar not closing when clicking on a channel ([#22271](https://github.com/RocketChat/Rocket.Chat/pull/22271))
 
-  ### before
-  ![before](https://user-images.githubusercontent.com/27704687/121074843-c6e20100-c7aa-11eb-88db-76e39b57b064.gif)
-
-  ### after
+  ### before
+  ![before](https://user-images.githubusercontent.com/27704687/121074843-c6e20100-c7aa-11eb-88db-76e39b57b064.gif)
+
+  ### after
   ![after](https://user-images.githubusercontent.com/27704687/121074860-cb0e1e80-c7aa-11eb-9e96-06d75044b763.gif)
 
 - Sound notification is not emitted when the Omnichannel chat comes from another department ([#22291](https://github.com/RocketChat/Rocket.Chat/pull/22291))
@@ -2119,9 +2187,9 @@
 
 - Undefined error when forwarding chats to offline department ([#22154](https://github.com/RocketChat/Rocket.Chat/pull/22154) by [@rafaelblink](https://github.com/rafaelblink))
 
-  ![Screen Shot 2021-05-26 at 5 29 17 PM](https://user-images.githubusercontent.com/59577424/119727520-c495b380-be48-11eb-88a2-158017c7ad0a.png)
-
-  Omnichannel agents are facing the error shown above when forwarding chats to offline departments.
+  ![Screen Shot 2021-05-26 at 5 29 17 PM](https://user-images.githubusercontent.com/59577424/119727520-c495b380-be48-11eb-88a2-158017c7ad0a.png)
+
+  Omnichannel agents are facing the error shown above when forwarding chats to offline departments.
   The error usually takes place when the routing system algorithm is **Manual Selection**.
 
 - Unread bar in channel flash quickly and then disappear ([#22275](https://github.com/RocketChat/Rocket.Chat/pull/22275))
@@ -2152,15 +2220,15 @@
 
 - Chore: Change modals for remove user from team && leave team ([#22141](https://github.com/RocketChat/Rocket.Chat/pull/22141))
 
-  ![image](https://user-images.githubusercontent.com/40830821/119576154-93f14380-bd8e-11eb-8885-f889f2939bf4.png)
+  ![image](https://user-images.githubusercontent.com/40830821/119576154-93f14380-bd8e-11eb-8885-f889f2939bf4.png)
   ![image](https://user-images.githubusercontent.com/40830821/119576219-b5eac600-bd8e-11eb-832c-ea7a17a56bdd.png)
 
 - Chore: Check PR Title on every submission ([#22140](https://github.com/RocketChat/Rocket.Chat/pull/22140))
 
 - Chore: Enable push gateway only if the server is registered ([#22346](https://github.com/RocketChat/Rocket.Chat/pull/22346) by [@lucassartor](https://github.com/lucassartor))
 
-  Currently, when creating an unregistered server, the default value of the push gateway setting is set to true and is disabled (it can't be changed unless the server is registered). This is a wrong behavior as an unregistered server **can't** use the push gateway.
-
+  Currently, when creating an unregistered server, the default value of the push gateway setting is set to true and is disabled (it can't be changed unless the server is registered). This is a wrong behavior as an unregistered server **can't** use the push gateway.
+
   This PR creates a validation to check if the server is registered when enabling the push gateway. That way, even if the push gateway setting is turned on, but the server is unregistered, the push gateway **won't** work   - it will behave like it is off.
 
 - Chore: Enforce TypeScript on Storybook ([#22317](https://github.com/RocketChat/Rocket.Chat/pull/22317))
@@ -2177,7 +2245,7 @@
 
 - Chore: Update delete team modal to new design ([#22127](https://github.com/RocketChat/Rocket.Chat/pull/22127))
 
-  Now the modal has only 2 steps (steps 1 and 2 were merged)
+  Now the modal has only 2 steps (steps 1 and 2 were merged)
   ![image](https://user-images.githubusercontent.com/40830821/119414580-2e398480-bcc6-11eb-9a47-515568257974.png)
 
 - Language update from LingoHub 🤖 on 2021-05-31Z ([#22196](https://github.com/RocketChat/Rocket.Chat/pull/22196))
@@ -2204,10 +2272,10 @@
 
 - Regression: Missing flexDirection on select field ([#22300](https://github.com/RocketChat/Rocket.Chat/pull/22300))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/121425905-532a2a80-c949-11eb-885f-e8ddaf5c8d5c.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/121425905-532a2a80-c949-11eb-885f-e8ddaf5c8d5c.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/121425770-283fd680-c949-11eb-8d94-86886f174599.png)
 
 - Regression: RoomProvider using wrong types ([#22370](https://github.com/RocketChat/Rocket.Chat/pull/22370))
@@ -2348,50 +2416,50 @@
 
 - **ENTERPRISE:** Introduce Load Rotation routing algorithm for Omnichannel ([#22090](https://github.com/RocketChat/Rocket.Chat/pull/22090) by [@rafaelblink](https://github.com/rafaelblink))
 
-  This PR introduces a new Auto Chat Distribution (ACD) algorithm for Omnichannel: **Load Rotation**.
-  The algorithm distributes chats to agents one by one, which means that when a new chat arrives, the agent with the oldest routing assignment time will be selected to serve the chat, regardless of the number of chats in progress each agent has.
-
+  This PR introduces a new Auto Chat Distribution (ACD) algorithm for Omnichannel: **Load Rotation**.
+  The algorithm distributes chats to agents one by one, which means that when a new chat arrives, the agent with the oldest routing assignment time will be selected to serve the chat, regardless of the number of chats in progress each agent has.
+
   ![Screen Shot 2021-05-20 at 5 17 40 PM](https://user-images.githubusercontent.com/59577424/119043752-c61a3400-b98f-11eb-8543-f3176879af1d.png)
 
 - Back button for Omnichannel ([#21647](https://github.com/RocketChat/Rocket.Chat/pull/21647) by [@rafaelblink](https://github.com/rafaelblink))
 
 - New Message Parser ([#21962](https://github.com/RocketChat/Rocket.Chat/pull/21962))
 
-  The objective is to put an end to the confusion that we face having multiple parsers, and the problems that this brings, it is still experimental then users need to choose to use it.
-
-  The benefits are multiple. no more unexpected cases or grammatical collisions (in addition to more flexible nested cases like bold within link labels).
-  Besides, we no longer render raw html, instead we use components, so the xss attacks are over (the easy ones at least). Without further discoveries and at the fronted, we only reder what is delivered thus improving our performance.
+  The objective is to put an end to the confusion that we face having multiple parsers, and the problems that this brings, it is still experimental then users need to choose to use it.
+
+  The benefits are multiple. no more unexpected cases or grammatical collisions (in addition to more flexible nested cases like bold within link labels).
+  Besides, we no longer render raw html, instead we use components, so the xss attacks are over (the easy ones at least). Without further discoveries and at the fronted, we only reder what is delivered thus improving our performance.
   This can be used in multiple places, (message, alert, sidenav and in the entire mobile application.)
 
 - Option to notify failed login attempts to a channel ([#21968](https://github.com/RocketChat/Rocket.Chat/pull/21968))
 
 - Option to prevent users from using Invisible status ([#20084](https://github.com/RocketChat/Rocket.Chat/pull/20084) by [@lucassartor](https://github.com/lucassartor))
 
-  Add an `admin` option to allow/disallow the `Invisible` status option from all users. This option is available in the `Accounts` section.
-
-  ![2021-01-06-11-55-22](https://user-images.githubusercontent.com/49413772/103782988-ebc52300-5016-11eb-8a29-dd540c21e11c.gif)
-
-  If the option is turned off, the `users.setStatus` endpoint is also restricted from users trying to change their status to `Invisible`, throwing the following error:
-  ```json
-  {
-    "success": false,
-    "error": "Invisible status is disabled [error-not-allowed]",
-    "stack": "Error: Invisible status is disabled [error-not-allowed]\n    at DDPCommon.MethodInvocation.<anonymous> (app/api/server/v1/users.js:425:13)\n    at packages/dispatch_run-as-user.js:211:14\n    at Meteor.EnvironmentVariable.EVp.withValue (packages/meteor.js:1234:12)\n    at Object.Meteor.runAsUser (packages/dispatch_run-as-user.js:210:33)\n    at Object.post (app/api/server/v1/users.js:415:10)\n    at app/api/server/api.js:394:82\n    at Meteor.EnvironmentVariable.EVp.withValue (packages/meteor.js:1234:12)\n    at Object._internalRouteActionHandler [as action] (app/api/server/api.js:394:39)\n    at Route.share.Route.Route._callEndpoint (packages/nimble_restivus/lib/route.coffee:150:32)\n    at packages/nimble_restivus/lib/route.coffee:59:33\n    at packages/simple_json-routes.js:98:9",
-    "errorType": "error-not-allowed",
-    "details": {
-        "method": "users.setStatus"
-    }
-  }
+  Add an `admin` option to allow/disallow the `Invisible` status option from all users. This option is available in the `Accounts` section.
+
+  ![2021-01-06-11-55-22](https://user-images.githubusercontent.com/49413772/103782988-ebc52300-5016-11eb-8a29-dd540c21e11c.gif)
+
+  If the option is turned off, the `users.setStatus` endpoint is also restricted from users trying to change their status to `Invisible`, throwing the following error:
+  ```json
+  {
+    "success": false,
+    "error": "Invisible status is disabled [error-not-allowed]",
+    "stack": "Error: Invisible status is disabled [error-not-allowed]\n    at DDPCommon.MethodInvocation.<anonymous> (app/api/server/v1/users.js:425:13)\n    at packages/dispatch_run-as-user.js:211:14\n    at Meteor.EnvironmentVariable.EVp.withValue (packages/meteor.js:1234:12)\n    at Object.Meteor.runAsUser (packages/dispatch_run-as-user.js:210:33)\n    at Object.post (app/api/server/v1/users.js:415:10)\n    at app/api/server/api.js:394:82\n    at Meteor.EnvironmentVariable.EVp.withValue (packages/meteor.js:1234:12)\n    at Object._internalRouteActionHandler [as action] (app/api/server/api.js:394:39)\n    at Route.share.Route.Route._callEndpoint (packages/nimble_restivus/lib/route.coffee:150:32)\n    at packages/nimble_restivus/lib/route.coffee:59:33\n    at packages/simple_json-routes.js:98:9",
+    "errorType": "error-not-allowed",
+    "details": {
+        "method": "users.setStatus"
+    }
+  }
   ```
 
 - Paginated and Filtered selects on new/edit unit ([#22052](https://github.com/RocketChat/Rocket.Chat/pull/22052) by [@rafaelblink](https://github.com/rafaelblink))
 
-  REQUIRES https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/447
-
-  Adds infinite scrolling selects to the units edit/create  with the ability to be filtered by text as well
-
-  ![Screen Shot 2021-05-17 at 9 24 19 AM](https://user-images.githubusercontent.com/20868078/118487999-abc32a80-b6f1-11eb-8d58-d031111ea0fb.png)
-
+  REQUIRES https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/447
+
+  Adds infinite scrolling selects to the units edit/create  with the ability to be filtered by text as well
+
+  ![Screen Shot 2021-05-17 at 9 24 19 AM](https://user-images.githubusercontent.com/20868078/118487999-abc32a80-b6f1-11eb-8d58-d031111ea0fb.png)
+
   This Affects the monitors and departments inputs
 
 - Remove exif metadata from uploaded files ([#22044](https://github.com/RocketChat/Rocket.Chat/pull/22044))
@@ -2419,13 +2487,17 @@
 
 - Inconsistent and misleading 2FA settings ([#22042](https://github.com/RocketChat/Rocket.Chat/pull/22042) by [@lucassartor](https://github.com/lucassartor))
 
-  Currently, there are some inconsistencies and incorrect behaviors on the 2FA settings, such as:
-
  
-  - When disabling the TOTP 2FA, all 2FA are disabled;
  
-  - There are no option to disable only the TOTP 2FA;
  
-  - If 2FA are disabled, the other settings aren't blocked (the e-mail 2FA setting, for example);
  
-  - It lacks some labels to warn the user of some specific 2FA options.
-
+  Currently, there are some inconsistencies and incorrect behaviors on the 2FA settings, such as:
+
+
+  - When disabling the TOTP 2FA, all 2FA are disabled;
+
+  - There are no option to disable only the TOTP 2FA;
+
+  - If 2FA are disabled, the other settings aren't blocked (the e-mail 2FA setting, for example);
+
+  - It lacks some labels to warn the user of some specific 2FA options.
+
   This PR looks to fix those issues.
 
 - LDAP port setting input type to allow only numbers ([#21912](https://github.com/RocketChat/Rocket.Chat/pull/21912) by [@Deepak-learner](https://github.com/Deepak-learner))
@@ -2447,16 +2519,16 @@
 
 - **APPS:** Scheduler duplicating recurrent tasks after server restart ([#21866](https://github.com/RocketChat/Rocket.Chat/pull/21866))
 
-  Reintroduces the old method for creating recurring tasks in the apps' scheduler bridge to ensure tasks won't be duplicated.
-
-  By introducing the [`skipImmediate` property option](https://github.com/RocketChat/Rocket.Chat/pull/21353)  at the [`scheduleRecurring`](https://github.com/RocketChat/Rocket.Chat/blob/f8171f464ed8a7487795651767695fb33a1c709e/app/apps/server/bridges/scheduler.js#L119) method, the `every` method from _agenda.js_, which ensured no duplicates were created, was removed in favor of a more manual procedure. The new procedure was not taking into account the management of duplicates and as a result multiple copies of the same task could be created and they would get executed at the same time.
-
+  Reintroduces the old method for creating recurring tasks in the apps' scheduler bridge to ensure tasks won't be duplicated.
+
+  By introducing the [`skipImmediate` property option](https://github.com/RocketChat/Rocket.Chat/pull/21353)  at the [`scheduleRecurring`](https://github.com/RocketChat/Rocket.Chat/blob/f8171f464ed8a7487795651767695fb33a1c709e/app/apps/server/bridges/scheduler.js#L119) method, the `every` method from _agenda.js_, which ensured no duplicates were created, was removed in favor of a more manual procedure. The new procedure was not taking into account the management of duplicates and as a result multiple copies of the same task could be created and they would get executed at the same time.
+
   In the case of server restarts, every time this event happened and the app had the `startupSetting` configured to use _recurring tasks_, they would get recreated the same number of times. In the case of a server that restarts frequently (_n_ times), there would be the same (_n_) number of tasks duplicated (and running) in the system.
 
 - **ENTERPRISE:** Omnichannel Monitors can't forward chats to departments that they are not supervising ([#22128](https://github.com/RocketChat/Rocket.Chat/pull/22128))
 
-  Currently, Omnichannel Monitors just can't forward chats to a department that is part of a `Business Unit` they're not supervising. This issue is causing critical problems on customer operations since this behaviour is not by design.
-  The reason this issue is taking place is that, by design, Monitors just have access to departments related to the `Business Units` they're monitoring, but this restriction is designed only for Omnichannel management areas, which means in case the monitor is, also, an agent, they're supposed to be able to forward a chat to any available departments regardless the `Business Units` it's associated with.
+  Currently, Omnichannel Monitors just can't forward chats to a department that is part of a `Business Unit` they're not supervising. This issue is causing critical problems on customer operations since this behaviour is not by design.
+  The reason this issue is taking place is that, by design, Monitors just have access to departments related to the `Business Units` they're monitoring, but this restriction is designed only for Omnichannel management areas, which means in case the monitor is, also, an agent, they're supposed to be able to forward a chat to any available departments regardless the `Business Units` it's associated with.
   So, initially, the restriction was implemented on the `Department Model` and, now, we're implementing the logic properly and introducing a new parameter to department endpoints, so the client will define which type of departments it needs.
 
 - **ENTERPRISE:** Omnichannel Monitors can't forward chats to departments that they are not supervising ([#22142](https://github.com/RocketChat/Rocket.Chat/pull/22142))
@@ -2495,18 +2567,18 @@
 
 - Correcting a the wrong Archived label in edit room ([#21717](https://github.com/RocketChat/Rocket.Chat/pull/21717) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  ![image](https://user-images.githubusercontent.com/45966964/116584997-3cd78a80-a918-11eb-81fa-8a7eb5318ae9.png)
-
+  ![image](https://user-images.githubusercontent.com/45966964/116584997-3cd78a80-a918-11eb-81fa-8a7eb5318ae9.png)
+
   A label exists for Archived, and it has not been used. So I replaced it with the existing one. the label 'Archived' does not exist.
 
 - Custom OAuth not being completely deleted ([#21637](https://github.com/RocketChat/Rocket.Chat/pull/21637) by [@siva2204](https://github.com/siva2204))
 
 - Directory Table's Sort Function ([#21921](https://github.com/RocketChat/Rocket.Chat/pull/21921))
 
-  ### TableRow Margin Issue:
-  ![image](https://user-images.githubusercontent.com/27704687/116907348-d6a07f80-ac17-11eb-9411-edfe0906bfe1.png)
-
-  ### Table Sort Action Issue:
+  ### TableRow Margin Issue:
+  ![image](https://user-images.githubusercontent.com/27704687/116907348-d6a07f80-ac17-11eb-9411-edfe0906bfe1.png)
+
+  ### Table Sort Action Issue:
   ![directory](https://user-images.githubusercontent.com/27704687/116907441-f20b8a80-ac17-11eb-8790-bfce19e89a67.gif)
 
 - Discussion names showing a random value ([#22172](https://github.com/RocketChat/Rocket.Chat/pull/22172))
@@ -2517,54 +2589,54 @@
 
 - Emails being sent with HTML entities getting escaped multiple times ([#21994](https://github.com/RocketChat/Rocket.Chat/pull/21994) by [@bhavayAnand9](https://github.com/bhavayAnand9))
 
-  fixes an issue where if password contains special HTML character like &, in the email it would end up something like `&amp;amp;`
-
- 
-  password was going through multiple escapeHTML function calls
-  `secure&123 => secure&amp;123 => secure&amp;amp;123
+  fixes an issue where if password contains special HTML character like &, in the email it would end up something like `&amp;amp;`
+
+
+  password was going through multiple escapeHTML function calls
+  `secure&123 => secure&amp;123 => secure&amp;amp;123
   `
 
 - Error when you look at the members list of a room in which you are not a member ([#21952](https://github.com/RocketChat/Rocket.Chat/pull/21952) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  Before, when you look at the members of a room in which you are not a member the app crashed, i corrected this problem.
-  Indeed, there was a check on each currentSubscription.<somehting> to see if it was not undefined except on currentSubscription.blocker
-
+  Before, when you look at the members of a room in which you are not a member the app crashed, i corrected this problem.
+  Indeed, there was a check on each currentSubscription.<somehting> to see if it was not undefined except on currentSubscription.blocker
+
   https://user-images.githubusercontent.com/45966964/117087470-d3101400-ad4f-11eb-8f44-0ebca830a4d8.mp4
 
 - errors when viewing a room that you're not subscribed to ([#21984](https://github.com/RocketChat/Rocket.Chat/pull/21984))
 
 - Files list will not show deleted files. ([#21732](https://github.com/RocketChat/Rocket.Chat/pull/21732) by [@Darshilp326](https://github.com/Darshilp326))
 
-  When you delete files from the header option, deleted files will not be shown.
-
+  When you delete files from the header option, deleted files will not be shown.
+
   https://user-images.githubusercontent.com/55157259/115730786-38552400-a3a4-11eb-9684-7f510920db66.mp4
 
 - Fixed the fact that when a team was deleted, not all channels were unlinked from the team ([#21942](https://github.com/RocketChat/Rocket.Chat/pull/21942) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  Fixed the fact that when a team was deleted, not all channels were unlinked from the team. Only the first room of the rooms list was unlinked.
-
-  After the fix, there is nos more errors:
-
-
+  Fixed the fact that when a team was deleted, not all channels were unlinked from the team. Only the first room of the rooms list was unlinked.
+
+  After the fix, there is nos more errors:
+
+
   https://user-images.githubusercontent.com/45966964/117055182-2a47c180-ad1b-11eb-806f-07fb3fa7ec12.mp4
 
 - Fixing Jitsi call ended Issue. ([#21808](https://github.com/RocketChat/Rocket.Chat/pull/21808))
 
-  The new rewrite in react of contextual call component broke the Jitsi "click to join" messages. The issue being after 10 seconds of initiating the call, the message "click to join" always returned "Call Ended" even if the call was still going on.
-  This was due to the fact that after closing the contextual bar, the react component gets unmounted and we are not able to keep track of ongoing call and increase jitsi room timeout. 
-
-  This PR solves this issue by using the setInterval methods on component will unmount. When the call component unmounts, we keep on checking the state of jitsi call and based on conditions increase the jitsi room timeout. After the call is ended all setInterval calls are closed.
-
+  The new rewrite in react of contextual call component broke the Jitsi "click to join" messages. The issue being after 10 seconds of initiating the call, the message "click to join" always returned "Call Ended" even if the call was still going on.
+  This was due to the fact that after closing the contextual bar, the react component gets unmounted and we are not able to keep track of ongoing call and increase jitsi room timeout.
+
+  This PR solves this issue by using the setInterval methods on component will unmount. When the call component unmounts, we keep on checking the state of jitsi call and based on conditions increase the jitsi room timeout. After the call is ended all setInterval calls are closed.
+
   This PR also removes the implementation of HEARTBEAT events of JitsiBridge. This is because this is no longer needed and all logic is being taken care of by the unmount function.
 
 - Handle NPS errors instead of throwing them ([#21945](https://github.com/RocketChat/Rocket.Chat/pull/21945))
 
 - Header Tag Visual Issues ([#21991](https://github.com/RocketChat/Rocket.Chat/pull/21991))
 
-  ### Normal 
-  ![image](https://user-images.githubusercontent.com/27704687/117504793-69635600-af59-11eb-8b79-9d8f631490ee.png)
-
-  ### Hover
+  ### Normal
+  ![image](https://user-images.githubusercontent.com/27704687/117504793-69635600-af59-11eb-8b79-9d8f631490ee.png)
+
+  ### Hover
   ![image](https://user-images.githubusercontent.com/27704687/117504934-97489a80-af59-11eb-87c3-0a62731e9ce3.png)
 
 - Horizontal scrollbar not showing on tables ([#21852](https://github.com/RocketChat/Rocket.Chat/pull/21852))
@@ -2573,17 +2645,17 @@
 
 - iFrame size on embedded videos ([#21992](https://github.com/RocketChat/Rocket.Chat/pull/21992))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/27704687/117508802-8bf86d80-af5f-11eb-9eb8-29e55b73eac5.png)
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/27704687/117508802-8bf86d80-af5f-11eb-9eb8-29e55b73eac5.png)
+
+  ### After
   ![image](https://user-images.githubusercontent.com/27704687/117508870-a4688800-af5f-11eb-9176-7f24de5fc424.png)
 
 - Incorrect error message when opening channel in anonymous read ([#22066](https://github.com/RocketChat/Rocket.Chat/pull/22066) by [@lucassartor](https://github.com/lucassartor))
 
-  Every time you open a public channel with threads in it when using anonymous read an `Incorrect User` error will be thrown. 
-  This is an incorrect behaviour as everything that is public should be valid for an anonymous user.
-
+  Every time you open a public channel with threads in it when using anonymous read an `Incorrect User` error will be thrown.
+  This is an incorrect behaviour as everything that is public should be valid for an anonymous user.
+
   Some files are adapted to that and have already removed this kind of incorrect error, but there are some that need some fix, this PR aims to do that.
 
 - Incorrect Team's Info spacing ([#22021](https://github.com/RocketChat/Rocket.Chat/pull/22021))
@@ -2596,19 +2668,21 @@
 
 - Make the FR translation consistent with the 'room' translation + typos ([#21913](https://github.com/RocketChat/Rocket.Chat/pull/21913) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  In the FR translation files, there were two terms that were used to refer to **'room'**:
  
-  - 'salon' (149 times used)
-
-  ![image](https://user-images.githubusercontent.com/45966964/116829860-ac62a980-aba6-11eb-8212-e6f15ed0af82.png)
-
  
-  - 'salle' (46 times used)
-
-  ![image](https://user-images.githubusercontent.com/45966964/116829871-be444c80-aba6-11eb-9b42-e213fee6586a.png)
-
-  The problem is that both were used in the same context and sometimes even in the same option list. 
-  However, since 'salon' is a better translation and was also in the majority, I used the translation 'salon' wherever 'salle' was marked.  
-
-  For example:
+  In the FR translation files, there were two terms that were used to refer to **'room'**:
+
+  - 'salon' (149 times used)
+
+  ![image](https://user-images.githubusercontent.com/45966964/116829860-ac62a980-aba6-11eb-8212-e6f15ed0af82.png)
+
+
+  - 'salle' (46 times used)
+
+  ![image](https://user-images.githubusercontent.com/45966964/116829871-be444c80-aba6-11eb-9b42-e213fee6586a.png)
+
+  The problem is that both were used in the same context and sometimes even in the same option list.
+  However, since 'salon' is a better translation and was also in the majority, I used the translation 'salon' wherever 'salle' was marked.
+
+  For example:
   ![image](https://user-images.githubusercontent.com/45966964/116830523-1da45b80-abab-11eb-81f8-5225d51cecc6.png)
 
 - Maximum 25 channels can be loaded in the teams' channels list ([#21708](https://github.com/RocketChat/Rocket.Chat/pull/21708) by [@Jeanstaquet](https://github.com/Jeanstaquet))
@@ -2623,8 +2697,8 @@
 
 - No warning message is sent when user is removed from a team's main channel ([#21949](https://github.com/RocketChat/Rocket.Chat/pull/21949))
 
-  - Send a warning message to a team's main channel when a user is removed from the team;
-   - Trigger events while removing a user from a team's main channel;
+  - Send a warning message to a team's main channel when a user is removed from the team;
+   - Trigger events while removing a user from a team's main channel;
    - Fix `usersCount` field in the team's main room when a user is removed from the team (`usersCount` is now decreased by 1).
 
 - Not possible accept video call if "Hide right sidebar with click" is enabled ([#22175](https://github.com/RocketChat/Rocket.Chat/pull/22175))
@@ -2645,14 +2719,14 @@
 
 - Prevent the userInfo tab to return 'User not found' each time if a certain member of a DM group has been deleted ([#21970](https://github.com/RocketChat/Rocket.Chat/pull/21970) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  Prevent the userInfo tab to return 'User not found' if a member of a DM group has been deleted.
-  This happens if the user that has been deleted is the one originally displayed on the userInfo tab in a DM group with >2 users.
-
+  Prevent the userInfo tab to return 'User not found' if a member of a DM group has been deleted.
+  This happens if the user that has been deleted is the one originally displayed on the userInfo tab in a DM group with >2 users.
+
   https://user-images.githubusercontent.com/45966964/117221081-db785580-ae08-11eb-9b33-2314a99eb037.mp4
 
 - Prune messages not cleaning up unread threads ([#21326](https://github.com/RocketChat/Rocket.Chat/pull/21326) by [@renancleyson-dev](https://github.com/renancleyson-dev))
 
-  Fixes permanent unread messages when admin prune at least two different thread messages in the room that were unread by some user.
+  Fixes permanent unread messages when admin prune at least two different thread messages in the room that were unread by some user.
   ![screencapture-localhost-3000-channel-general-thread-2021-03-26-13_17_16](https://user-images.githubusercontent.com/43624243/112678973-62b9cd00-8e4a-11eb-9af9-56f17cc66baf.png)
 
 - Redirect on remove user from channel by user profile tab ([#21951](https://github.com/RocketChat/Rocket.Chat/pull/21951))
@@ -2663,8 +2737,8 @@
 
 - Removed fields from User Info for which the user doesn't have permissions. ([#20923](https://github.com/RocketChat/Rocket.Chat/pull/20923) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Removed LastLogin, CreatedAt and Roles for users who don't have permission.
-
+  Removed LastLogin, CreatedAt and Roles for users who don't have permission.
+
   https://user-images.githubusercontent.com/55157259/109381351-f2c62e80-78ff-11eb-9289-e11072bf62f8.mp4
 
 - Replace `query` param by `name`, `username` and `status` on the `teams.members` endpoint ([#21539](https://github.com/RocketChat/Rocket.Chat/pull/21539))
@@ -2677,39 +2751,39 @@
 
 - Unable to edit a 'direct' room setting in the admin due to the room name ([#21636](https://github.com/RocketChat/Rocket.Chat/pull/21636) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  When you are in the admin and want to change a room 'd' setting, it doesn't work because it takes into account the name that is set automatically and therefore tries to save that name. Since the name is not valid and should not be registered, we cannot change the setting for the 'd' room. 
-  I made sure that when you want to change a setting in a 'd' room, that you don't take the name into account
-
-
-  https://user-images.githubusercontent.com/45966964/115150919-cd85af00-a06a-11eb-9667-ef3dcfc5adb6.mp4
-
-
+  When you are in the admin and want to change a room 'd' setting, it doesn't work because it takes into account the name that is set automatically and therefore tries to save that name. Since the name is not valid and should not be registered, we cannot change the setting for the 'd' room.
+  I made sure that when you want to change a setting in a 'd' room, that you don't take the name into account
+
+
+  https://user-images.githubusercontent.com/45966964/115150919-cd85af00-a06a-11eb-9667-ef3dcfc5adb6.mp4
+
+
   Behind the scene, the name is not saved
 
 - Unable to edit a user who does not have an email via the admin or via the user's profile ([#21626](https://github.com/RocketChat/Rocket.Chat/pull/21626) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  If a user does not have an email address, they cannot change it via their profile or via the admin. I fixed this issue. I have created several profiles and there was one that didn't have an email, I don't know how I did it, I am working on it. I had not modified the db to delete his email, hence the fix
-
-  in admin
-
-  https://user-images.githubusercontent.com/45966964/115112617-9b9b1c80-9f86-11eb-8e3a-950c3c1a1746.mp4
-
-
-
-  in the user profile
-
+  If a user does not have an email address, they cannot change it via their profile or via the admin. I fixed this issue. I have created several profiles and there was one that didn't have an email, I don't know how I did it, I am working on it. I had not modified the db to delete his email, hence the fix
+
+  in admin
+
+  https://user-images.githubusercontent.com/45966964/115112617-9b9b1c80-9f86-11eb-8e3a-950c3c1a1746.mp4
+
+
+
+  in the user profile
+
   https://user-images.githubusercontent.com/45966964/115112620-a0f86700-9f86-11eb-97b1-56eaba42216b.mp4
 
 - Unable to get channels, sort by most recent message ([#21701](https://github.com/RocketChat/Rocket.Chat/pull/21701) by [@sumukhah](https://github.com/sumukhah))
 
 - Unable to update app manually ([#21215](https://github.com/RocketChat/Rocket.Chat/pull/21215))
 
-  It allows for update of apps using a zip file.
-
-  When installing apps using the zip file, either by url or the file form, if the app was already installed, an error would be thrown stating the condition and forbidding the installation. Now, when sending a zip file of an app that is already installed, the user is presented with the following modal:
-
-  ![2021-04-30-113936_627x235_scrot](https://user-images.githubusercontent.com/733282/116711383-2cbbbb80-a9a9-11eb-8c77-22d6802cb9f5.png)
-
+  It allows for update of apps using a zip file.
+
+  When installing apps using the zip file, either by url or the file form, if the app was already installed, an error would be thrown stating the condition and forbidding the installation. Now, when sending a zip file of an app that is already installed, the user is presented with the following modal:
+
+  ![2021-04-30-113936_627x235_scrot](https://user-images.githubusercontent.com/733282/116711383-2cbbbb80-a9a9-11eb-8c77-22d6802cb9f5.png)
+
   If the app also requires permissions to be reviewed, the modal that handles permission reviews will be shown after this one is accepted.
 
 - Unpin message reactivity ([#22029](https://github.com/RocketChat/Rocket.Chat/pull/22029))
@@ -2720,20 +2794,20 @@
 
 - User Impersonation through sendMessage API ([#20391](https://github.com/RocketChat/Rocket.Chat/pull/20391) by [@lucassartor](https://github.com/lucassartor))
 
-  Create a new permission: `message-impersonate`. For new installs only bot role will have the permission and for updating installs the permission will also be given to user role, so it won't break running deployments.
-
-  If a message is being sent with `avatar` or `alias` properties, it validates if the sender has the `message-impersonate` permission, if not, an error is throwed:
-  ```json
-  {
-    "success": false,
-    "error": "Not enough permission",
-    "stack": "Error: Not enough permission\n ..."
-  }
+  Create a new permission: `message-impersonate`. For new installs only bot role will have the permission and for updating installs the permission will also be given to user role, so it won't break running deployments.
+
+  If a message is being sent with `avatar` or `alias` properties, it validates if the sender has the `message-impersonate` permission, if not, an error is throwed:
+  ```json
+  {
+    "success": false,
+    "error": "Not enough permission",
+    "stack": "Error: Not enough permission\n ..."
+  }
   ```
 
 - Visibility of burger menu on certain width ([#20736](https://github.com/RocketChat/Rocket.Chat/pull/20736) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  Burger was not visible on a certain width, specifically between 600 to   780. if width is more than 780px sidebar is shown, if less than 600 then burger icon was shown. But it wasn't shown between 600px to 780 px.
+  Burger was not visible on a certain width, specifically between 600 to   780. if width is more than 780px sidebar is shown, if less than 600 then burger icon was shown. But it wasn't shown between 600px to 780 px.
   It was because for showing burger icon we were only checking for `isMobile` which is lenght only less than   600. So i added one more check for condition if length is less than 780 px.
 
 - When closing chats a comment is always required ([#21947](https://github.com/RocketChat/Rocket.Chat/pull/21947))
@@ -2748,8 +2822,8 @@
 
 - Wrong icon on "Move to team" option in the channel info actions ([#21944](https://github.com/RocketChat/Rocket.Chat/pull/21944))
 
-  ![image](https://user-images.githubusercontent.com/40830821/117061659-d9bf6c80-acf8-11eb-8e29-be47e702dedd.png)
-
+  ![image](https://user-images.githubusercontent.com/40830821/117061659-d9bf6c80-acf8-11eb-8e29-be47e702dedd.png)
+
   Depends on https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/444
 
 <details>
@@ -2766,8 +2840,10 @@
 
 - Add two more test cases to the slash-command test suite ([#21317](https://github.com/RocketChat/Rocket.Chat/pull/21317) by [@EduardoPicolo](https://github.com/EduardoPicolo))
 
-  Added two more test cases to the slash-command test suite: 
  
-  - 'should return an error when the command does not exist'';
  
+  Added two more test cases to the slash-command test suite:
+
+  - 'should return an error when the command does not exist'';
+
   - 'should return an error when no command is provided';
 
 - Bump actions/stale from v3.0.8 to v3.0.18 ([#21877](https://github.com/RocketChat/Rocket.Chat/pull/21877) by [@dependabot[bot]](https://github.com/dependabot[bot]))
@@ -2802,9 +2878,9 @@
 
 - i18n: Add missing translation string in account preference ([#21448](https://github.com/RocketChat/Rocket.Chat/pull/21448) by [@sumukhah](https://github.com/sumukhah))
 
-  "Test Desktop Notifications" was missing in translation, Added to the file.
-  <img width="691" alt="Screenshot 2021-04-05 at 3 58 01 PM" src="https://user-images.githubusercontent.com/23723464/113565830-475c7800-9629-11eb-8d93-3c177b9d0030.png">
-
+  "Test Desktop Notifications" was missing in translation, Added to the file.
+  <img width="691" alt="Screenshot 2021-04-05 at 3 58 01 PM" src="https://user-images.githubusercontent.com/23723464/113565830-475c7800-9629-11eb-8d93-3c177b9d0030.png">
+
   <img width="701" alt="Screenshot 2021-04-05 at 3 58 32 PM" src="https://user-images.githubusercontent.com/23723464/113565823-44fa1e00-9629-11eb-9af1-839f42e132ca.png">
 
 - i18n: Correct a typo in German ([#21711](https://github.com/RocketChat/Rocket.Chat/pull/21711) by [@Jeanstaquet](https://github.com/Jeanstaquet))
@@ -2831,10 +2907,10 @@
 
 - Regression: discussions display on sidebar ([#22157](https://github.com/RocketChat/Rocket.Chat/pull/22157))
 
-  ### group by type active
-  ![image](https://user-images.githubusercontent.com/27704687/119741996-37a92500-be5d-11eb-8b36-4067a7a229f1.png)
-
-  ### group by type inactive
+  ### group by type active
+  ![image](https://user-images.githubusercontent.com/27704687/119741996-37a92500-be5d-11eb-8b36-4067a7a229f1.png)
+
+  ### group by type inactive
   ![image](https://user-images.githubusercontent.com/27704687/119742054-56a7b700-be5d-11eb-8810-e31d4216f573.png)
 
 - regression: fix departments with empty ancestors not being returned ([#22068](https://github.com/RocketChat/Rocket.Chat/pull/22068))
@@ -2845,8 +2921,8 @@
 
 - regression: Fix Users list in the Administration  ([#22034](https://github.com/RocketChat/Rocket.Chat/pull/22034) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  The app crashed if no custom fields for user profiles have been created by the admin. I fixed this issue. This bug was introduced by a recent commit.
-
+  The app crashed if no custom fields for user profiles have been created by the admin. I fixed this issue. This bug was introduced by a recent commit.
+
   https://user-images.githubusercontent.com/45966964/118210838-5b3a9b80-b46b-11eb-9fe5-5b813848190c.mp4
 
 - Regression: Improve migration 225 ([#22099](https://github.com/RocketChat/Rocket.Chat/pull/22099))
@@ -2863,7 +2939,7 @@
 
 - Regression: not allowed to edit roles due to a new verification ([#22159](https://github.com/RocketChat/Rocket.Chat/pull/22159))
 
-  introduced by https://github.com/RocketChat/Rocket.Chat/pull/21905
+  introduced by https://github.com/RocketChat/Rocket.Chat/pull/21905
   ![Peek 2021-05-26 22-21](https://user-images.githubusercontent.com/27704687/119750970-b9567e00-be70-11eb-9d52-04c8595950df.gif)
 
 - regression: Select Team Modal margin ([#22030](https://github.com/RocketChat/Rocket.Chat/pull/22030))
@@ -2874,10 +2950,10 @@
 
 - Regression: Visual issue on sort list item  ([#22158](https://github.com/RocketChat/Rocket.Chat/pull/22158))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/119743703-d84d1400-be60-11eb-97cc-c8256b2c8b07.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/119743703-d84d1400-be60-11eb-97cc-c8256b2c8b07.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/119743638-b18edd80-be60-11eb-828d-22cc5e1b2f5b.png)
 
 - Release 3.14.2 ([#22135](https://github.com/RocketChat/Rocket.Chat/pull/22135))
@@ -3063,12 +3139,12 @@
 
 - Paginated and Filtered selects on new/edit unit ([#22052](https://github.com/RocketChat/Rocket.Chat/pull/22052) by [@rafaelblink](https://github.com/rafaelblink))
 
-  REQUIRES https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/447
-
-  Adds infinite scrolling selects to the units edit/create  with the ability to be filtered by text as well
-
-  ![Screen Shot 2021-05-17 at 9 24 19 AM](https://user-images.githubusercontent.com/20868078/118487999-abc32a80-b6f1-11eb-8d58-d031111ea0fb.png)
-
+  REQUIRES https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/447
+
+  Adds infinite scrolling selects to the units edit/create  with the ability to be filtered by text as well
+
+  ![Screen Shot 2021-05-17 at 9 24 19 AM](https://user-images.githubusercontent.com/20868078/118487999-abc32a80-b6f1-11eb-8d58-d031111ea0fb.png)
+
   This Affects the monitors and departments inputs
 
 ### 🚀 Improvements
@@ -3144,18 +3220,24 @@
 
 - New set of rules for client code ([#21318](https://github.com/RocketChat/Rocket.Chat/pull/21318))
 
-  This _small_ PR does the following:
-
  
-  - Now **React** is the web client's first-class citizen, being **loaded before Blaze**. Thus, `BlazeLayout` calls render templates inside of a React component (`BlazeLayoutWrapper`);
  
-  - Main client startup code, including polyfills, is written in **TypeScript**;
  
-  - At the moment, routes are treated as regular startup code; it's expected that `FlowRouter` will be deprecated in favor of a new routing library;
  
-  - **React** was updated to major version **17**, deprecating the usage of `React` as namespace (e.g. use `memo()` instead of `React.memo()`);
  
-  - The `client/` and `ee/client/` directory are linted with a **custom ESLint configuration** that includes:
-    - **Prettier**;
-    - `react-hooks/*` rules for TypeScript files;
-    - `react/no-multi-comp`, enforcing the rule of **one single React component per module**;
-    - `react/display-name`, which enforces that **React components must have a name for debugging**;
-    - `import/named`, avoiding broken named imports.
  
+  This _small_ PR does the following:
+
+
+  - Now **React** is the web client's first-class citizen, being **loaded before Blaze**. Thus, `BlazeLayout` calls render templates inside of a React component (`BlazeLayoutWrapper`);
+
+  - Main client startup code, including polyfills, is written in **TypeScript**;
+
+  - At the moment, routes are treated as regular startup code; it's expected that `FlowRouter` will be deprecated in favor of a new routing library;
+
+  - **React** was updated to major version **17**, deprecating the usage of `React` as namespace (e.g. use `memo()` instead of `React.memo()`);
+
+  - The `client/` and `ee/client/` directory are linted with a **custom ESLint configuration** that includes:
+    - **Prettier**;
+    - `react-hooks/*` rules for TypeScript files;
+    - `react/no-multi-comp`, enforcing the rule of **one single React component per module**;
+    - `react/display-name`, which enforces that **React components must have a name for debugging**;
+    - `import/named`, avoiding broken named imports.
+
   - A bunch of components were refactored to match the new ESLint rules.
 
 - On Hold system messages ([#21360](https://github.com/RocketChat/Rocket.Chat/pull/21360) by [@rafaelblink](https://github.com/rafaelblink))
@@ -3164,12 +3246,15 @@
 
 - Password history ([#21607](https://github.com/RocketChat/Rocket.Chat/pull/21607))
 
-  - Store each user's previously used passwords in a `passwordHistory` field (in the `users` record);
  
-  - Users' previously used passwords are stored in their `passwordHistory` even when the setting is disabled;
  
-  - Add "Password History" setting -- when enabled, it blocks users from reusing their most recent passwords;
  
-  - Convert `comparePassword` file to TypeScript.
-
-  ![Password_Change](https://user-images.githubusercontent.com/36537004/115035168-ac726200-9ea2-11eb-93c6-fc8182ba5f3f.png)
+  - Store each user's previously used passwords in a `passwordHistory` field (in the `users` record);
+
+  - Users' previously used passwords are stored in their `passwordHistory` even when the setting is disabled;
+
+  - Add "Password History" setting -- when enabled, it blocks users from reusing their most recent passwords;
+
+  - Convert `comparePassword` file to TypeScript.
+
+  ![Password_Change](https://user-images.githubusercontent.com/36537004/115035168-ac726200-9ea2-11eb-93c6-fc8182ba5f3f.png)
   ![Password_History](https://user-images.githubusercontent.com/36537004/115035175-ad0af880-9ea2-11eb-9f40-94c6327a9854.png)
 
 - REST endpoint `teams.update` ([#21134](https://github.com/RocketChat/Rocket.Chat/pull/21134) by [@g-thome](https://github.com/g-thome))
@@ -3187,14 +3272,18 @@
 
 - Add error messages to the creation of channels or usernames containing reserved words ([#21016](https://github.com/RocketChat/Rocket.Chat/pull/21016))
 
-  Display error messages when the user attempts to create or edit users' or channels' names with any of the following words (**case-insensitive**):
  
-  - admin;
  
-  - administrator;
  
-  - system;
  
-  - user.
-  ![create-channel](https://user-images.githubusercontent.com/36537004/110132223-b421ef80-7da9-11eb-82bc-f0d4e1df967f.png)
-  ![register-username](https://user-images.githubusercontent.com/36537004/110132234-b71ce000-7da9-11eb-904e-580233625951.png)
-  ![change-channel](https://user-images.githubusercontent.com/36537004/110143057-96f31e00-7db5-11eb-994a-39ae9e63392e.png)
+  Display error messages when the user attempts to create or edit users' or channels' names with any of the following words (**case-insensitive**):
+
+  - admin;
+
+  - administrator;
+
+  - system;
+
+  - user.
+  ![create-channel](https://user-images.githubusercontent.com/36537004/110132223-b421ef80-7da9-11eb-82bc-f0d4e1df967f.png)
+  ![register-username](https://user-images.githubusercontent.com/36537004/110132234-b71ce000-7da9-11eb-904e-580233625951.png)
+  ![change-channel](https://user-images.githubusercontent.com/36537004/110143057-96f31e00-7db5-11eb-994a-39ae9e63392e.png)
   ![change-username](https://user-images.githubusercontent.com/36537004/110143065-98244b00-7db5-11eb-9d13-afc5dc9866de.png)
 
 - add permission check when adding a channel to a team ([#21689](https://github.com/RocketChat/Rocket.Chat/pull/21689) by [@g-thome](https://github.com/g-thome))
@@ -3219,7 +3308,8 @@
 
 - Resize custom emojis on upload instead of saving at max res ([#21593](https://github.com/RocketChat/Rocket.Chat/pull/21593))
 
-  - Create new MediaService (ideally, should be in charge of all media-related operations)
  
+  - Create new MediaService (ideally, should be in charge of all media-related operations)
+
   - Resize emojis to 128x128
 
 ### 🐛 Bug fixes
@@ -3239,25 +3329,25 @@
 
 - Allows more than 25 discussions/files to be loaded in the contextualbar ([#21511](https://github.com/RocketChat/Rocket.Chat/pull/21511) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  In some places, you could not load more than 25 threads/discussions/files on the screen when searching the lists in the contextualbar.
-  Threads & list are numbered for a better view of the solution
-
-
+  In some places, you could not load more than 25 threads/discussions/files on the screen when searching the lists in the contextualbar.
+  Threads & list are numbered for a better view of the solution
+
+
   https://user-images.githubusercontent.com/45966964/114222225-93335800-996e-11eb-833f-568e83129aae.mp4
 
 - Allows more than 25 threads to be loaded, fixes #21507 ([#21508](https://github.com/RocketChat/Rocket.Chat/pull/21508) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
 - Allows to display more than 25 users maximum in the users list ([#21518](https://github.com/RocketChat/Rocket.Chat/pull/21518) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  Now when you scroll to the bottom of the users list, it shows more users. Before the fix, the limit for the query for loadMore was calculated so that no additional users could be loaded.
-
-  Before
-
-  https://user-images.githubusercontent.com/45966964/114249739-baece500-999b-11eb-9bb0-3a5bcee18ad8.mp4
-
-  After
-
-
+  Now when you scroll to the bottom of the users list, it shows more users. Before the fix, the limit for the query for loadMore was calculated so that no additional users could be loaded.
+
+  Before
+
+  https://user-images.githubusercontent.com/45966964/114249739-baece500-999b-11eb-9bb0-3a5bcee18ad8.mp4
+
+  After
+
+
   https://user-images.githubusercontent.com/45966964/114249895-364e9680-999c-11eb-985c-47aedc763488.mp4
 
 - App installation from marketplace not correctly displaying the permissions ([#21470](https://github.com/RocketChat/Rocket.Chat/pull/21470))
@@ -3324,19 +3414,19 @@
 
 - Margins on contextual bar information ([#21457](https://github.com/RocketChat/Rocket.Chat/pull/21457))
 
-  ### Room
-  **Before**
-  ![image](https://user-images.githubusercontent.com/27704687/115080812-ba8fa500-9ed9-11eb-9078-3625603bf92b.png)
-
-  **After**
-  ![image](https://user-images.githubusercontent.com/27704687/115080966-e9a61680-9ed9-11eb-929f-6516c1563e99.png)
-
-  ### Livechat
+  ### Room
+  **Before**
+  ![image](https://user-images.githubusercontent.com/27704687/115080812-ba8fa500-9ed9-11eb-9078-3625603bf92b.png)
+
+  **After**
+  ![image](https://user-images.githubusercontent.com/27704687/115080966-e9a61680-9ed9-11eb-929f-6516c1563e99.png)
+
+  ### Livechat
   ![image](https://user-images.githubusercontent.com/27704687/113640101-1859fc80-9651-11eb-88f8-09a899953988.png)
 
 - Message Block ordering  ([#21464](https://github.com/RocketChat/Rocket.Chat/pull/21464))
 
-  Reactions should come before reply button.
+  Reactions should come before reply button.
   ![image](https://user-images.githubusercontent.com/40830821/113748926-6f0e1780-96df-11eb-93a5-ddcfa891413e.png)
 
 - Message link null corrupts message rendering ([#21579](https://github.com/RocketChat/Rocket.Chat/pull/21579) by [@g-thome](https://github.com/g-thome))
@@ -3389,15 +3479,19 @@
 
 - Typos/missing elements in the French translation ([#21525](https://github.com/RocketChat/Rocket.Chat/pull/21525) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  - I have corrected some typos in the translation
  
-  - I added a translation for missing words
  
-  - I took the opportunity to correct a mistranslated word
  
-  - Test_Desktop_Notifications was missing in the EN and FR file
+  - I have corrected some typos in the translation
+
+  - I added a translation for missing words
+
+  - I took the opportunity to correct a mistranslated word
+
+  - Test_Desktop_Notifications was missing in the EN and FR file
   ![image](https://user-images.githubusercontent.com/45966964/114290186-e7792d80-9a7d-11eb-8164-3b5e72e93703.png)
 
 - Updating a message causing URLs to be parsed even within markdown code ([#21489](https://github.com/RocketChat/Rocket.Chat/pull/21489))
 
-  - Fix `updateMessage` to avoid parsing URLs inside markdown
  
+  - Fix `updateMessage` to avoid parsing URLs inside markdown
+
   - Honor `parseUrls` property when updating messages
 
 - Use async await in TeamChannels delete channel action ([#21534](https://github.com/RocketChat/Rocket.Chat/pull/21534))
@@ -3410,8 +3504,8 @@
 
 - Wrong user in user info ([#21451](https://github.com/RocketChat/Rocket.Chat/pull/21451))
 
-  Fixed some race conditions in admin.
-
+  Fixed some race conditions in admin.
+
   Self DMs used to be created with the userId duplicated. Sometimes rooms can have 2 equal uids, but it's a self DM. Fixed a getter so this isn't a problem anymore.
 
 <details>
@@ -3420,22 +3514,30 @@
 
 -  Doc: Corrected links to documentation of rocket.chat README.md  ([#20478](https://github.com/RocketChat/Rocket.Chat/pull/20478) by [@joshi008](https://github.com/joshi008))
 
-  The link for documentation in the readme was previously https://rocket.chat/docs/ while that was not working and according to the website it was https://docs.rocket.chat/
-  The link for deployment methods in readme was corrected from https://rocket.chat/docs/installation/paas-deployments/ to https://docs.rocket.chat/installation/paas-deployments
+  The link for documentation in the readme was previously https://rocket.chat/docs/ while that was not working and according to the website it was https://docs.rocket.chat/
+  The link for deployment methods in readme was corrected from https://rocket.chat/docs/installation/paas-deployments/ to https://docs.rocket.chat/installation/paas-deployments
   Some more links to the documentations were giving 404 error which hence updated.
 
 - [Improve] Remove useless tabbar options from Omnichannel rooms ([#21561](https://github.com/RocketChat/Rocket.Chat/pull/21561) by [@rafaelblink](https://github.com/rafaelblink))
 
 - A React-based replacement for BlazeLayout ([#21527](https://github.com/RocketChat/Rocket.Chat/pull/21527))
 
-  - The Meteor package **`kadira:blaze-layout` was removed**;
  
-  - A **global subscription** for the current application layout (**`appLayout`**) replaces `BlazeLayout` entirely;
  
-  - The **`#react-root` element** is rendered on server-side instead of dynamically injected into the DOM tree;
  
-  - The **"page loading" throbber** is now rendered on the React tree;
  
-  - The **`renderRouteComponent` helper was removed**;
  
-  - Some code run without any criteria on **`main` template** module was moved into **client startup modules**;
  
-  - React portals used to embed Blaze templates have their own subscription (**`blazePortals`**);
  
-  - Some **route components were refactored** to remove a URL path trap originally disabled by `renderRouteComponent`;
  
+  - The Meteor package **`kadira:blaze-layout` was removed**;
+
+  - A **global subscription** for the current application layout (**`appLayout`**) replaces `BlazeLayout` entirely;
+
+  - The **`#react-root` element** is rendered on server-side instead of dynamically injected into the DOM tree;
+
+  - The **"page loading" throbber** is now rendered on the React tree;
+
+  - The **`renderRouteComponent` helper was removed**;
+
+  - Some code run without any criteria on **`main` template** module was moved into **client startup modules**;
+
+  - React portals used to embed Blaze templates have their own subscription (**`blazePortals`**);
+
+  - Some **route components were refactored** to remove a URL path trap originally disabled by `renderRouteComponent`;
+
   - A new component to embed the DOM nodes generated by **`RoomManager`** was created.
 
 - Add ')' after Date and Time in DB migration ([#21519](https://github.com/RocketChat/Rocket.Chat/pull/21519) by [@im-adithya](https://github.com/im-adithya))
@@ -3458,8 +3560,8 @@
 
 - Chore: Meteor update to 2.1.1 ([#21494](https://github.com/RocketChat/Rocket.Chat/pull/21494))
 
-  Basically Node update to version 12.22.1
-
+  Basically Node update to version 12.22.1
+
   Meteor change log https://github.com/meteor/meteor/blob/devel/History.md#v211-2021-04-06
 
 - Chore: Remove control character from room model operation ([#21493](https://github.com/RocketChat/Rocket.Chat/pull/21493))
@@ -3468,7 +3570,8 @@
 
 - Fix: Missing module `eventemitter3` for micro services ([#21611](https://github.com/RocketChat/Rocket.Chat/pull/21611))
 
-  - Fix error when running micro services after version 3.12
  
+  - Fix error when running micro services after version 3.12
+
   - Fix build of docker image version latest for micro services
 
 - Language update from LingoHub 🤖 on 2021-04-05Z ([#21446](https://github.com/RocketChat/Rocket.Chat/pull/21446))
@@ -3481,9 +3584,12 @@
 
 - QoL improvements to add channel to team flow ([#21778](https://github.com/RocketChat/Rocket.Chat/pull/21778))
 
-  - Fixed canAccessRoom validation
  
-  - Added e2e tests
  
-  - Removed channels that user cannot add to the team from autocomplete suggestions
  
+  - Fixed canAccessRoom validation
+
+  - Added e2e tests
+
+  - Removed channels that user cannot add to the team from autocomplete suggestions
+
   - Improved error messages
 
 - Regression: Bold, italic and strike render (Original markdown) ([#21747](https://github.com/RocketChat/Rocket.Chat/pull/21747))
@@ -3506,10 +3612,10 @@
 
 - Regression: Legacy Banner Position ([#21598](https://github.com/RocketChat/Rocket.Chat/pull/21598))
 
-  ### Before:
-  ![image](https://user-images.githubusercontent.com/27704687/114961773-dc3c4e00-9e3f-11eb-9a32-e882db3fbfbc.png)
-
-  ### After
+  ### Before:
+  ![image](https://user-images.githubusercontent.com/27704687/114961773-dc3c4e00-9e3f-11eb-9a32-e882db3fbfbc.png)
+
+  ### After
   ![image](https://user-images.githubusercontent.com/27704687/114961673-a6976500-9e3f-11eb-9238-a12870d7db8f.png)
 
 - regression: Markdown broken on safari ([#21780](https://github.com/RocketChat/Rocket.Chat/pull/21780))
@@ -3719,56 +3825,62 @@
 
 - **APPS:** New event interfaces for pre/post user leaving a room ([#20917](https://github.com/RocketChat/Rocket.Chat/pull/20917) by [@lucassartor](https://github.com/lucassartor))
 
-  Added events and errors that trigger when a user leaves a room. 
+  Added events and errors that trigger when a user leaves a room.
   That way it can communicate with the Apps-Engine by the `IPreRoomUserLeave` and `IPostRoomUserLeave` event interfaces.
 
 - **Enterprise:** Omnichannel On-Hold Queue ([#20945](https://github.com/RocketChat/Rocket.Chat/pull/20945))
 
-  ### About this feature
-  This feature has been introduced to deal with Inactive chats. A chat is considered Inactive if an Omnichannel End User (aka Visitor) has not replied back to an agent in some time. These types of inactive chats become very important when an organisation has a limit set for `Max Simultaneous Chats per agent` which is defined by the following setting :point_down:  , as more number of Inactive chats would directly affect an agent's productivity.
-  ![image](https://user-images.githubusercontent.com/34130764/111533003-4d7ad980-878c-11eb-8c1c-2796678a07db.png)
-
-  Before this feature, we only had one option to deal with such Inactive/Abandoned chats   - which was to auto close abandoned chats via this setting :point_down: 
-  ![image](https://user-images.githubusercontent.com/34130764/111534353-e65e2480-878d-11eb-82a5-71368064ef45.png)
-
-  however closing a chat isn't a best option for some cases. Let me take an example to explain a scenario
-
-  > An agent is assisting a customer for installing a very huge software which is likely to take more than 20-30 minutes to download. In such scenarios closing a chat isn't the best approach since even after the lengthy download the customer might still need some assist from the agent.
-  > So basically this chat is going to block the agent's queue until the customer is able to finish his time-consuming download task in which he/she doesn't require any agent's assistance. Due to the `Max Simultaneous Chats per agent` limit, the agent is also not able to use this extra time to help other customer thus affecting his overall productivity.
-
-  **So how does the On-Hold feature solve this problem?**
-  With the On-Hold feature, an agent is now able to place a chat on-hold. On-Hold chats **don’t count towards the maximum number of concurrent chats** an agent can have. So in our above example, the agent can simply now place the customer on-hold for 20-30 minutes until the customer downloads the software and within this time, the agent can serve other customers   - hence increasing the productivity of an agent.
-
-  ----------------------------------------
-  ### Working of the new On-Hold feature
-
-  #### How can you place a chat on Hold ?
-
-  A chat can be placed on-hold via 2 means
  
-  1. Automatically place Abandoned chats On-hold
-      ![image](https://user-images.githubusercontent.com/34130764/111537074-06431780-8791-11eb-8d23-99f5d9f8ec45.png)
-    Via this :top: option you can define a timer which will get started when a customer sends a message. If we don't receive any message from the customer within this timer, the timer will get expired and the chat will be considered as Abandoned. 
-      ![image](https://user-images.githubusercontent.com/34130764/111537346-53bf8480-8791-11eb-8dc7-260633b4e98f.png)
-    The via this :top:  setting you can choose to automatically place this abandoned chat On Hold
  
-  2.  Manually place a chat On Hold 
-      As an admin, you can allow an agent to manually place a chat on-hold. To do so, you'll need to turn on this :point_down: setting
-      ![image](https://user-images.githubusercontent.com/34130764/111537545-97b28980-8791-11eb-86fd-db45b87e9cc1.png)
-      Now an agent will be able to see a new `On Hold` button within their `Visitor Info Panel` like this :point_down: , provided the agent has sent the last message
-      ![image](https://user-images.githubusercontent.com/34130764/111537853-f24be580-8791-11eb-9561-d77ba430c625.png)
-
-  #### How can you resume a On Hold chat ?
-  An On Hold chat can be resumed via 2 means
-
  
-  1. If the Customer sends a message
-     If the Customer / Omnichannel End User sends a message to the On Hold chat, the On Hold chat will get automatically resumed.
  
-  2. Manually by agent
-    An Agent can manually resume the On Hold chat via clicking the `Resume` button in the bottom of a chat room. 
-   ![image](https://user-images.githubusercontent.com/34130764/111538666-f88e9180-8792-11eb-8d14-01453b8e3db0.png)
-
-  #### What would happen if the agent already reached maximum chats, and a On-Hold chat gets resumed ?
-  Based on how the chat was resumed, there are multiple cases are each case is dealt differently
-
  
-  - If an agent manually tries to resume the On Hold chat, he/she will get an error saying  `Maximum Simultaneous chat limit reached`
  
+  ### About this feature
+  This feature has been introduced to deal with Inactive chats. A chat is considered Inactive if an Omnichannel End User (aka Visitor) has not replied back to an agent in some time. These types of inactive chats become very important when an organisation has a limit set for `Max Simultaneous Chats per agent` which is defined by the following setting :point_down:  , as more number of Inactive chats would directly affect an agent's productivity.
+  ![image](https://user-images.githubusercontent.com/34130764/111533003-4d7ad980-878c-11eb-8c1c-2796678a07db.png)
+
+  Before this feature, we only had one option to deal with such Inactive/Abandoned chats   - which was to auto close abandoned chats via this setting :point_down:
+  ![image](https://user-images.githubusercontent.com/34130764/111534353-e65e2480-878d-11eb-82a5-71368064ef45.png)
+
+  however closing a chat isn't a best option for some cases. Let me take an example to explain a scenario
+
+  > An agent is assisting a customer for installing a very huge software which is likely to take more than 20-30 minutes to download. In such scenarios closing a chat isn't the best approach since even after the lengthy download the customer might still need some assist from the agent.
+  > So basically this chat is going to block the agent's queue until the customer is able to finish his time-consuming download task in which he/she doesn't require any agent's assistance. Due to the `Max Simultaneous Chats per agent` limit, the agent is also not able to use this extra time to help other customer thus affecting his overall productivity.
+
+  **So how does the On-Hold feature solve this problem?**
+  With the On-Hold feature, an agent is now able to place a chat on-hold. On-Hold chats **don’t count towards the maximum number of concurrent chats** an agent can have. So in our above example, the agent can simply now place the customer on-hold for 20-30 minutes until the customer downloads the software and within this time, the agent can serve other customers   - hence increasing the productivity of an agent.
+
+  ----------------------------------------
+  ### Working of the new On-Hold feature
+
+  #### How can you place a chat on Hold ?
+
+  A chat can be placed on-hold via 2 means
+
+  1. Automatically place Abandoned chats On-hold
+      ![image](https://user-images.githubusercontent.com/34130764/111537074-06431780-8791-11eb-8d23-99f5d9f8ec45.png)
+    Via this :top: option you can define a timer which will get started when a customer sends a message. If we don't receive any message from the customer within this timer, the timer will get expired and the chat will be considered as Abandoned.
+      ![image](https://user-images.githubusercontent.com/34130764/111537346-53bf8480-8791-11eb-8dc7-260633b4e98f.png)
+    The via this :top:  setting you can choose to automatically place this abandoned chat On Hold
+
+  2.  Manually place a chat On Hold
+      As an admin, you can allow an agent to manually place a chat on-hold. To do so, you'll need to turn on this :point_down: setting
+      ![image](https://user-images.githubusercontent.com/34130764/111537545-97b28980-8791-11eb-86fd-db45b87e9cc1.png)
+      Now an agent will be able to see a new `On Hold` button within their `Visitor Info Panel` like this :point_down: , provided the agent has sent the last message
+      ![image](https://user-images.githubusercontent.com/34130764/111537853-f24be580-8791-11eb-9561-d77ba430c625.png)
+
+  #### How can you resume a On Hold chat ?
+  An On Hold chat can be resumed via 2 means
+
+
+  1. If the Customer sends a message
+     If the Customer / Omnichannel End User sends a message to the On Hold chat, the On Hold chat will get automatically resumed.
+
+  2. Manually by agent
+    An Agent can manually resume the On Hold chat via clicking the `Resume` button in the bottom of a chat room.
+   ![image](https://user-images.githubusercontent.com/34130764/111538666-f88e9180-8792-11eb-8d14-01453b8e3db0.png)
+
+  #### What would happen if the agent already reached maximum chats, and a On-Hold chat gets resumed ?
+  Based on how the chat was resumed, there are multiple cases are each case is dealt differently
+
+
+  - If an agent manually tries to resume the On Hold chat, he/she will get an error saying  `Maximum Simultaneous chat limit reached`
+
   - If a customer replies back on an On Hold chat and the last serving agent has reached maximum capacity, then this customer will be placed on the queue again from where based on the Routing Algorithm selected, the chat will get transferred to any available agent
 
 - Ability to hide 'Room topic changed' system messages ([#21062](https://github.com/RocketChat/Rocket.Chat/pull/21062) by [@Tirieru](https://github.com/Tirieru))
@@ -3779,33 +3891,39 @@
 
 - Teams ([#20966](https://github.com/RocketChat/Rocket.Chat/pull/20966) by [@g-thome](https://github.com/g-thome))
 
-  ## Teams
-
-
-
-  You can easily group your users as Teams on Rocket.Chat. The feature takes the hassle out of managing multiple users one by one and allows you to handle them at the same time efficiently.
-
-
  
-  - Teams can be public or private and each team can have its own channels, which also can be public or private.
  
-  - It's possible to add existing channels to a Team or create new ones inside a Team.
  
-  - It's possible to invite people outside a Team to join Team's channels.
  
-  - It's possible to convert channels to Teams
  
-  - It's possible to add all team members to a channel at once
  
-  - Team members have roles
-
-
-  ![image](https://user-images.githubusercontent.com/70927132/113421955-4f56b680-93a2-11eb-80dc-9b70a3f09b3e.png)
-
-
-
-  **Quickly onboard new users with Autojoin channels**
-
-  Teams can have Auto-join channels –  channels to which the team members are automatically added, so you don’t need to go through the manual process of adding users repetitively
-
-  ![image](https://user-images.githubusercontent.com/70927132/113419284-81194e80-939d-11eb-9fff-aeb05cbc8089.png)
-
-  **Instantly mention multiple members at once** (available in EE)
-
+  ## Teams
+
+
+
+  You can easily group your users as Teams on Rocket.Chat. The feature takes the hassle out of managing multiple users one by one and allows you to handle them at the same time efficiently.
+
+
+
+  - Teams can be public or private and each team can have its own channels, which also can be public or private.
+
+  - It's possible to add existing channels to a Team or create new ones inside a Team.
+
+  - It's possible to invite people outside a Team to join Team's channels.
+
+  - It's possible to convert channels to Teams
+
+  - It's possible to add all team members to a channel at once
+
+  - Team members have roles
+
+
+  ![image](https://user-images.githubusercontent.com/70927132/113421955-4f56b680-93a2-11eb-80dc-9b70a3f09b3e.png)
+
+
+
+  **Quickly onboard new users with Autojoin channels**
+
+  Teams can have Auto-join channels –  channels to which the team members are automatically added, so you don’t need to go through the manual process of adding users repetitively
+
+  ![image](https://user-images.githubusercontent.com/70927132/113419284-81194e80-939d-11eb-9fff-aeb05cbc8089.png)
+
+  **Instantly mention multiple members at once** (available in EE)
+
   With Teams, you don’t need to remember everyone’s name to communicate with a team quickly. Just mention a Team — @engineers, for instance —  and all members will be instantly notified.
 
 ### 🚀 Improvements
@@ -3815,22 +3933,22 @@
 
 - Added modal-box for preview after recording audio. ([#20370](https://github.com/RocketChat/Rocket.Chat/pull/20370) by [@Darshilp326](https://github.com/Darshilp326))
 
-  A modal box will be displayed so that users can change the filename and add description.
-
-  **Before**
-
-  https://user-images.githubusercontent.com/55157259/105687301-4e2a8880-5f1e-11eb-873d-dc8a880a2fc8.mp4
-
-  **After**
-
+  A modal box will be displayed so that users can change the filename and add description.
+
+  **Before**
+
+  https://user-images.githubusercontent.com/55157259/105687301-4e2a8880-5f1e-11eb-873d-dc8a880a2fc8.mp4
+
+  **After**
+
   https://user-images.githubusercontent.com/55157259/105687342-597db400-5f1e-11eb-8b61-8f9d9ebad0c4.mp4
 
 - Adds toast after follow/unfollow messages and following icon for followed messages without threads. ([#20025](https://github.com/RocketChat/Rocket.Chat/pull/20025) by [@RonLek](https://github.com/RonLek))
 
-  There was no alert on following/unfollowing a message previously. Also, it was impossible to make out a followed message with no threads from an unfollowed one. 
-
-  This PR would show an alert on following/unfollowing a message and also display a small bell icon (similar to the ones for starred and pinned messages) when a message with no thread is followed.
-
+  There was no alert on following/unfollowing a message previously. Also, it was impossible to make out a followed message with no threads from an unfollowed one.
+
+  This PR would show an alert on following/unfollowing a message and also display a small bell icon (similar to the ones for starred and pinned messages) when a message with no thread is followed.
+
   https://user-images.githubusercontent.com/28918901/103813540-43e73e00-5086-11eb-8592-2877eb650f3e.mp4
 
 - Back to threads list button on threads contextual bar ([#20882](https://github.com/RocketChat/Rocket.Chat/pull/20882))
@@ -3843,12 +3961,12 @@
 
 - Improve Apps permission modal ([#21193](https://github.com/RocketChat/Rocket.Chat/pull/21193) by [@lucassartor](https://github.com/lucassartor))
 
-  Improve the UI of the Apps permission modal when installing an App that requires permissions.
-
-  **New UI:**
-  ![after](https://user-images.githubusercontent.com/49413772/111685622-e817fe80-8806-11eb-998d-b56623560e74.PNG)
-
-  **Old UI:**
+  Improve the UI of the Apps permission modal when installing an App that requires permissions.
+
+  **New UI:**
+  ![after](https://user-images.githubusercontent.com/49413772/111685622-e817fe80-8806-11eb-998d-b56623560e74.PNG)
+
+  **Old UI:**
   ![before](https://user-images.githubusercontent.com/49413772/111685897-375e2f00-8807-11eb-814e-cb8060dc1830.PNG)
 
 - Make debug logs of Apps configurable via Log_Level setting in the Admin panel ([#21000](https://github.com/RocketChat/Rocket.Chat/pull/21000) by [@cuonghuunguyen](https://github.com/cuonghuunguyen))
@@ -3859,15 +3977,15 @@
 
 - Sort Users List In Case Insensitive Manner ([#20790](https://github.com/RocketChat/Rocket.Chat/pull/20790) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  The users listed in the admin panel were sorted in a case-sensitive manner , where the capitals came first and then the small letters (like   - *A B C a b c*). This Change fixes this by sorting the names in a caseinsensitive manner (now   - *A a B b C c*).
-
-  ### Before
-
-  ![before](https://user-images.githubusercontent.com/55396651/108189880-3fa74980-7137-11eb-99da-6498707b4bf8.png)
-
-
-  ### With This Change
-
+  The users listed in the admin panel were sorted in a case-sensitive manner , where the capitals came first and then the small letters (like   - *A B C a b c*). This Change fixes this by sorting the names in a caseinsensitive manner (now   - *A a B b C c*).
+
+  ### Before
+
+  ![before](https://user-images.githubusercontent.com/55396651/108189880-3fa74980-7137-11eb-99da-6498707b4bf8.png)
+
+
+  ### With This Change
+
   ![after](https://user-images.githubusercontent.com/55396651/108190177-9dd42c80-7137-11eb-8b4e-b7cef4ba512f.png)
 
 ### 🐛 Bug fixes
@@ -3881,12 +3999,12 @@
 
 - **APPS:** Warn message while installing app in air-gapped environment ([#20992](https://github.com/RocketChat/Rocket.Chat/pull/20992) by [@lucassartor](https://github.com/lucassartor))
 
-  Change **error** message to a **warn** message when uploading a  `.zip` file app into a air-gapped environment.
-
-  The **error** message was giving the impression for the user that the app wasn't properly being installed , which it wasn't the case:
-  ![error](https://user-images.githubusercontent.com/49413772/109855273-d3e4d680-7c36-11eb-824b-ad455d24710c.PNG)
-
-  A more detailed **warn** message can fix that impression for the user:
+  Change **error** message to a **warn** message when uploading a  `.zip` file app into a air-gapped environment.
+
+  The **error** message was giving the impression for the user that the app wasn't properly being installed , which it wasn't the case:
+  ![error](https://user-images.githubusercontent.com/49413772/109855273-d3e4d680-7c36-11eb-824b-ad455d24710c.PNG)
+
+  A more detailed **warn** message can fix that impression for the user:
   ![warn](https://user-images.githubusercontent.com/49413772/109855383-f2e36880-7c36-11eb-8d61-c442980bd8fd.PNG)
 
 - Add missing `unreads` field to `users.info` REST endpoint ([#20905](https://github.com/RocketChat/Rocket.Chat/pull/20905))
@@ -3901,10 +4019,10 @@
 
 - Correct direction for admin mapview text ([#20897](https://github.com/RocketChat/Rocket.Chat/pull/20897) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  ![Screenshot from 2021-02-25 02-49-21](https://user-images.githubusercontent.com/38764067/109068512-f8602080-7715-11eb-8e22-d610f9d046d8.png)
-  ![Screenshot from 2021-02-25 02-49-46](https://user-images.githubusercontent.com/38764067/109068516-fa29e400-7715-11eb-9119-1c79abce278f.png)
-  ![Screenshot from 2021-02-25 02-49-57](https://user-images.githubusercontent.com/38764067/109068519-fbf3a780-7715-11eb-8b3d-0dc32f898725.png)
-
+  ![Screenshot from 2021-02-25 02-49-21](https://user-images.githubusercontent.com/38764067/109068512-f8602080-7715-11eb-8e22-d610f9d046d8.png)
+  ![Screenshot from 2021-02-25 02-49-46](https://user-images.githubusercontent.com/38764067/109068516-fa29e400-7715-11eb-9119-1c79abce278f.png)
+  ![Screenshot from 2021-02-25 02-49-57](https://user-images.githubusercontent.com/38764067/109068519-fbf3a780-7715-11eb-8b3d-0dc32f898725.png)
+
   The text says the share button will be on the left of the messagebox once enabled. However, it actually is on the right.
 
 - Correct ignored message CSS ([#20928](https://github.com/RocketChat/Rocket.Chat/pull/20928) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
@@ -3921,13 +4039,13 @@
 
 - Custom emojis to override default ([#20359](https://github.com/RocketChat/Rocket.Chat/pull/20359) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  Due to the sequence of the imports and how the emojiRenderer prioritizes lists, the custom emojis could not override the emojione emojis. Making two small changes fixed the issue.
-
-  With the custom emoji for `:facepalm:` added, you can check out the result below:
-  ### Before
-  ![Screenshot from 2021-01-25 02-20-04](https://user-images.githubusercontent.com/38764067/105643088-dfb0e080-5eb3-11eb-8a00-582c53fbe9a4.png)
-
-  ### After
+  Due to the sequence of the imports and how the emojiRenderer prioritizes lists, the custom emojis could not override the emojione emojis. Making two small changes fixed the issue.
+
+  With the custom emoji for `:facepalm:` added, you can check out the result below:
+  ### Before
+  ![Screenshot from 2021-01-25 02-20-04](https://user-images.githubusercontent.com/38764067/105643088-dfb0e080-5eb3-11eb-8a00-582c53fbe9a4.png)
+
+  ### After
   ![Screenshot from 2021-01-25 02-18-58](https://user-images.githubusercontent.com/38764067/105643076-cdcf3d80-5eb3-11eb-84b8-5dbc4f1135df.png)
 
 - Empty URL in user avatar doesn't show error and enables save ([#20440](https://github.com/RocketChat/Rocket.Chat/pull/20440) by [@im-adithya](https://github.com/im-adithya))
@@ -3940,12 +4058,12 @@
 
 - Fix the search list showing the last channel ([#21160](https://github.com/RocketChat/Rocket.Chat/pull/21160) by [@shrinish123](https://github.com/shrinish123))
 
-  The search list now also properly shows the last channel 
-  Before  :
-
-  ![searchlist](https://user-images.githubusercontent.com/56491104/111471487-f3a7ee80-874e-11eb-9c6e-19bbf0731d60.png)
-
-  After : 
+  The search list now also properly shows the last channel
+  Before  :
+
+  ![searchlist](https://user-images.githubusercontent.com/56491104/111471487-f3a7ee80-874e-11eb-9c6e-19bbf0731d60.png)
+
+  After :
   ![search_final](https://user-images.githubusercontent.com/56491104/111471521-fe628380-874e-11eb-8fa3-d1edb57587e1.png)
 
 - Follow thread action on threads list  ([#20881](https://github.com/RocketChat/Rocket.Chat/pull/20881))
@@ -3970,13 +4088,13 @@
 
 - Multi Select isn't working in Export Messages ([#21236](https://github.com/RocketChat/Rocket.Chat/pull/21236) by [@PriyaBihani](https://github.com/PriyaBihani))
 
-  While exporting messages, we were not able to select multiple Users like this: 
-
-  https://user-images.githubusercontent.com/69837339/111953057-169a2000-8b0c-11eb-94a4-0e1657683f96.mp4
-
-  Now we can select multiple users: 
-
-
+  While exporting messages, we were not able to select multiple Users like this:
+
+  https://user-images.githubusercontent.com/69837339/111953057-169a2000-8b0c-11eb-94a4-0e1657683f96.mp4
+
+  Now we can select multiple users:
+
+
   https://user-images.githubusercontent.com/69837339/111953097-274a9600-8b0c-11eb-9177-bec388b042bd.mp4
 
 - New Channel popover not closing ([#21080](https://github.com/RocketChat/Rocket.Chat/pull/21080))
@@ -3985,31 +4103,31 @@
 
 - OEmbedURLWidget - Show Full Embedded Text Description ([#20569](https://github.com/RocketChat/Rocket.Chat/pull/20569) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  Embeds were cutoff when either _urls had a long description_.
-  This was handled by removing `overflow:hidden;text-overflow:ellipsis;` from the inline styles in [`oembedUrlWidget.html`](https://github.com/RocketChat/Rocket.Chat/blob/develop/app/oembed/client/oembedUrlWidget.html#L28).
-
-  ### Earlier
-
-  ![earlier](https://user-images.githubusercontent.com/55396651/107110825-00dcde00-6871-11eb-866e-13cabc5b0d05.png)
-
-  ### Now
-
+  Embeds were cutoff when either _urls had a long description_.
+  This was handled by removing `overflow:hidden;text-overflow:ellipsis;` from the inline styles in [`oembedUrlWidget.html`](https://github.com/RocketChat/Rocket.Chat/blob/develop/app/oembed/client/oembedUrlWidget.html#L28).
+
+  ### Earlier
+
+  ![earlier](https://user-images.githubusercontent.com/55396651/107110825-00dcde00-6871-11eb-866e-13cabc5b0d05.png)
+
+  ### Now
+
   ![now](https://user-images.githubusercontent.com/55396651/107110794-ca06c800-6870-11eb-9b3b-168679936612.png)
 
 - Reactions list showing users in reactions option of message action. ([#20753](https://github.com/RocketChat/Rocket.Chat/pull/20753) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Reactions list shows emojis with respected users who have reacted with that emoji.
-
+  Reactions list shows emojis with respected users who have reacted with that emoji.
+
   https://user-images.githubusercontent.com/55157259/107857609-5870e000-6e55-11eb-8137-494a9f71b171.mp4
 
 - Removing truncation from profile ([#20352](https://github.com/RocketChat/Rocket.Chat/pull/20352) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  Truncating text in profile view was making some information completely inaccessible. Removed it from the user status and the custom fields where if the information is longer, the user would actually want to see all of it.
-
-  ### Before
-  ![Screenshot from 2021-01-24 20-54-44](https://user-images.githubusercontent.com/38764067/105634935-7e264d00-5e86-11eb-8a6c-9f2a363e0f6c.png)
-
-  ### After
+  Truncating text in profile view was making some information completely inaccessible. Removed it from the user status and the custom fields where if the information is longer, the user would actually want to see all of it.
+
+  ### Before
+  ![Screenshot from 2021-01-24 20-54-44](https://user-images.githubusercontent.com/38764067/105634935-7e264d00-5e86-11eb-8a6c-9f2a363e0f6c.png)
+
+  ### After
   ![Screenshot from 2021-01-24 20-54-06](https://user-images.githubusercontent.com/38764067/105634940-82eb0100-5e86-11eb-8b90-e97a43c5e938.png)
 
 - Replace wrong field description on Room Information panel ([#21395](https://github.com/RocketChat/Rocket.Chat/pull/21395) by [@rafaelblink](https://github.com/rafaelblink))
@@ -4020,8 +4138,8 @@
 
 - Set establishing to false if OTR timeouts ([#21183](https://github.com/RocketChat/Rocket.Chat/pull/21183) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Set establishing false if OTR timeouts.
-
+  Set establishing false if OTR timeouts.
+
   https://user-images.githubusercontent.com/55157259/111617086-b30cab80-8808-11eb-8740-3b4ffacfc322.mp4
 
 - Sidebar scroll missing full height ([#21071](https://github.com/RocketChat/Rocket.Chat/pull/21071))
@@ -4060,20 +4178,33 @@
 
 - Chore: Add tests for Meteor methods ([#20901](https://github.com/RocketChat/Rocket.Chat/pull/20901))
 
-  Add end-to-end tests for the following meteor methods
-
  
-  - [x] public-settings:get
  
-  - [x] rooms:get
  
-  - [x] subscriptions:get
  
-  - [x] permissions:get
  
-  - [x] loadMissedMessages
  
-  - [x] loadHistory
  
-  - [x] listCustomUserStatus
  
-  - [x] getUserRoles
  
-  - [x] getRoomRoles  (called by the API, already covered)
  
-  - [x] getMessages
  
-  - [x] getUsersOfRoom
  
-  - [x] loadNextMessages
  
+  Add end-to-end tests for the following meteor methods
+
+
+  - [x] public-settings:get
+
+  - [x] rooms:get
+
+  - [x] subscriptions:get
+
+  - [x] permissions:get
+
+  - [x] loadMissedMessages
+
+  - [x] loadHistory
+
+  - [x] listCustomUserStatus
+
+  - [x] getUserRoles
+
+  - [x] getRoomRoles  (called by the API, already covered)
+
+  - [x] getMessages
+
+  - [x] getUsersOfRoom
+
+  - [x] loadNextMessages
+
   - [x] getThreadMessages
 
 - Chore: Meteor update 2.1 ([#21061](https://github.com/RocketChat/Rocket.Chat/pull/21061))
@@ -4086,8 +4217,10 @@
 
 - Improve: Increase testing coverage ([#21015](https://github.com/RocketChat/Rocket.Chat/pull/21015))
 
-  Add test for
  
-  - settings/raw
  
+  Add test for
+
+  - settings/raw
+
   - minimongo/comparisons
 
 - Improve: NPS survey fetch ([#21263](https://github.com/RocketChat/Rocket.Chat/pull/21263))
@@ -4106,17 +4239,19 @@
 
 - Regression: Add scope to permission checks in Team's endpoints ([#21369](https://github.com/RocketChat/Rocket.Chat/pull/21369))
 
-  - Include scope (team's main room ID) in the permission checks;
+  - Include scope (team's main room ID) in the permission checks;
    - Remove the `teamName` parameter from the `members`, `addMembers`, `updateMember` and `removeMembers` methods (since `teamId` will always be defined).
 
 - Regression: Add support to filter on `teams.listRooms` endpoint ([#21327](https://github.com/RocketChat/Rocket.Chat/pull/21327))
 
-  - Add support for queries (within the `query` parameter);
  
+  - Add support for queries (within the `query` parameter);
+
   - Add support to pagination (`offset` and `count`) when an user doesn't have the permission to get all rooms.
 
 - Regression: Add teams support to directory ([#21351](https://github.com/RocketChat/Rocket.Chat/pull/21351))
 
-  - Change `directory.js` to reduce function complexity
  
+  - Change `directory.js` to reduce function complexity
+
   - Add `teams` type of item. Directory will return all public teams & private teams the user is part of.
 
 - Regression: add view room action on Teams Channels ([#21295](https://github.com/RocketChat/Rocket.Chat/pull/21295))
@@ -4169,18 +4304,19 @@
 
 - Regression: Quick action button missing for Omnichannel On-Hold queue ([#21285](https://github.com/RocketChat/Rocket.Chat/pull/21285))
 
-  - Move the Manual On Hold button to the new Omnichannel Header
-  ![image](https://user-images.githubusercontent.com/34130764/112291749-6ae10380-8cb6-11eb-94cd-e05efc14b1bf.png)
-  ![image](https://user-images.githubusercontent.com/34130764/112304146-27d95d00-8cc3-11eb-85db-dde04a110dd1.png)
-
  
+  - Move the Manual On Hold button to the new Omnichannel Header
+  ![image](https://user-images.githubusercontent.com/34130764/112291749-6ae10380-8cb6-11eb-94cd-e05efc14b1bf.png)
+  ![image](https://user-images.githubusercontent.com/34130764/112304146-27d95d00-8cc3-11eb-85db-dde04a110dd1.png)
+
+
   - Minor fixes
 
 - regression: Remove Breadcrumbs and update Tag component ([#21399](https://github.com/RocketChat/Rocket.Chat/pull/21399))
 
 - Regression: Remove channel action on add channel's modal don't work ([#21356](https://github.com/RocketChat/Rocket.Chat/pull/21356))
 
-  ![removechannel-on-add-existing-modal](https://user-images.githubusercontent.com/27704687/112911017-eda8fa80-90ca-11eb-9c24-47a70be0c314.gif)
-
+  ![removechannel-on-add-existing-modal](https://user-images.githubusercontent.com/27704687/112911017-eda8fa80-90ca-11eb-9c24-47a70be0c314.gif)
+
   ![image](https://user-images.githubusercontent.com/27704687/112911052-02858e00-90cb-11eb-85a2-0ef1f5f9ffd9.png)
 
 - Regression: Remove primary color from button in TeamChannels component ([#21293](https://github.com/RocketChat/Rocket.Chat/pull/21293))
@@ -4209,10 +4345,10 @@
 
 - Regression: Unify Contact information displayed on the Room header and Room Info ([#21312](https://github.com/RocketChat/Rocket.Chat/pull/21312) by [@rafaelblink](https://github.com/rafaelblink))
 
-  ![image](https://user-images.githubusercontent.com/34130764/112586659-35592900-8e22-11eb-94be-32bdff7ca883.png)
-
-  ![image](https://user-images.githubusercontent.com/2493803/112913130-788bf400-90cf-11eb-84c6-782b203e100a.png)
-
+  ![image](https://user-images.githubusercontent.com/34130764/112586659-35592900-8e22-11eb-94be-32bdff7ca883.png)
+
+  ![image](https://user-images.githubusercontent.com/2493803/112913130-788bf400-90cf-11eb-84c6-782b203e100a.png)
+
   ![image](https://user-images.githubusercontent.com/2493803/112913146-817cc580-90cf-11eb-87ad-ef79766be2b3.png)
 
 - Regression: Unify team actions to add a room to a team ([#21386](https://github.com/RocketChat/Rocket.Chat/pull/21386))
@@ -4221,8 +4357,10 @@
 
 - Regression: Update .invite endpoints to support multiple users at once ([#21328](https://github.com/RocketChat/Rocket.Chat/pull/21328))
 
-  - channels.invite now supports passing an array as a param (either with usernames or userIds) via `usernames` or `userIds` properties.
  
-  - You can still use the endpoint to invite only one user via the old params `userId`, `username` or `user`.
  
+  - channels.invite now supports passing an array as a param (either with usernames or userIds) via `usernames` or `userIds` properties.
+
+  - You can still use the endpoint to invite only one user via the old params `userId`, `username` or `user`.
+
   - Same changes apply to groups.invite
 
 - Regression: user actions in admin ([#21307](https://github.com/RocketChat/Rocket.Chat/pull/21307))
@@ -4357,7 +4495,7 @@
 
 - Close Call contextual bar after starting jitsi call. ([#21004](https://github.com/RocketChat/Rocket.Chat/pull/21004) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  After jitsi call is started, if the call is started in a new window then we should close contextual tab bar.
+  After jitsi call is started, if the call is started in a new window then we should close contextual tab bar.
   So, when 'YES' is pressed on modal, we call handleClose function if openNewWindow is true, as call doesn't starts on tab bar, it starts on new window.
 
 ### 🐛 Bug fixes
@@ -4367,7 +4505,7 @@
 
 - Stopping Jitsi reload ([#20973](https://github.com/RocketChat/Rocket.Chat/pull/20973) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  The Function where Jitsi call is started gets called many times due to `room.usernames` dep of useMemo, this dep triggers reloading of this function many times.
+  The Function where Jitsi call is started gets called many times due to `room.usernames` dep of useMemo, this dep triggers reloading of this function many times.
   So removing this dep from useMemo dependencies
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -4395,10 +4533,10 @@
 
 - Cloud Workspace bridge ([#20838](https://github.com/RocketChat/Rocket.Chat/pull/20838))
 
-  Adds the new CloudWorkspace functionality.
-
-  It allows apps to request the access token for the workspace it's installed on, so it can perform actions with other Rocket.Chat services, such as the Omni Gateway.
-
+  Adds the new CloudWorkspace functionality.
+
+  It allows apps to request the access token for the workspace it's installed on, so it can perform actions with other Rocket.Chat services, such as the Omni Gateway.
+
   https://github.com/RocketChat/Rocket.Chat.Apps-engine/pull/382
 
 - Header with Breadcrumbs ([#20609](https://github.com/RocketChat/Rocket.Chat/pull/20609))
@@ -4416,10 +4554,10 @@
 
 - Add symbol to indicate apps' required settings in the UI ([#20447](https://github.com/RocketChat/Rocket.Chat/pull/20447))
 
-  - Apps are able to define **required** settings. These settings should not be left blank by the user and an error will be thrown and shown in the interface if an user attempts to save changes in the app details page leaving any required fields blank;
-  ![prt_screen_required_app_settings_warning](https://user-images.githubusercontent.com/36537004/106032964-e73cd900-60af-11eb-8eab-c11fd651b593.png)
-
-   - A sign (*) is added to the label of app settings' fields that are required so as to highlight the fields which must not be left blank.
+  - Apps are able to define **required** settings. These settings should not be left blank by the user and an error will be thrown and shown in the interface if an user attempts to save changes in the app details page leaving any required fields blank;
+  ![prt_screen_required_app_settings_warning](https://user-images.githubusercontent.com/36537004/106032964-e73cd900-60af-11eb-8eab-c11fd651b593.png)
+
+   - A sign (*) is added to the label of app settings' fields that are required so as to highlight the fields which must not be left blank.
   ![prt_screen_required_app_settings](https://user-images.githubusercontent.com/36537004/106014879-ae473900-609c-11eb-9b9e-95de7bbf20a5.png)
 
 - Add visual validation on users admin forms ([#20308](https://github.com/RocketChat/Rocket.Chat/pull/20308))
@@ -4440,20 +4578,20 @@
 
 - Adds tooltip for sidebar header icons ([#19934](https://github.com/RocketChat/Rocket.Chat/pull/19934) by [@RonLek](https://github.com/RonLek))
 
-  Previously the header icons in the sidebar didn't show a tooltip when hovered over. This PR fixes that.
-
+  Previously the header icons in the sidebar didn't show a tooltip when hovered over. This PR fixes that.
+
   ![Screenshot from 2020-12-22 15-17-41](https://user-images.githubusercontent.com/28918901/102874804-f2756700-4468-11eb-8324-b7f3194e62fe.png)
 
 - Better Presentation of Blockquotes ([#20750](https://github.com/RocketChat/Rocket.Chat/pull/20750) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  Changed the values of `margin-top` and `margin-bottom` for *first* and *last* childs in blockquotes to increase readability.
-
-  ### Before
-
-  ![before](https://user-images.githubusercontent.com/55396651/107858662-3e3a0080-6e5b-11eb-8274-9bd956807235.png)
-
-  ### Now
-
+  Changed the values of `margin-top` and `margin-bottom` for *first* and *last* childs in blockquotes to increase readability.
+
+  ### Before
+
+  ![before](https://user-images.githubusercontent.com/55396651/107858662-3e3a0080-6e5b-11eb-8274-9bd956807235.png)
+
+  ### Now
+
   ![now](https://user-images.githubusercontent.com/55396651/107858471-480f3400-6e5a-11eb-9ccb-3f1be2fed0a4.png)
 
 - Change header based on room type ([#20612](https://github.com/RocketChat/Rocket.Chat/pull/20612))
@@ -4474,13 +4612,18 @@
 
 - Replace react-window for react-virtuoso package ([#20392](https://github.com/RocketChat/Rocket.Chat/pull/20392))
 
-  Remove:
  
-  - react-window
  
-  - react-window-infinite-loader
  
-  - simplebar-react
-
-  Include:
  
-  - react-virtuoso
  
+  Remove:
+
+  - react-window
+
+  - react-window-infinite-loader
+
+  - simplebar-react
+
+  Include:
+
+  - react-virtuoso
+
   - rc-scrollbars
 
 - Rewrite Call as React component  ([#19778](https://github.com/RocketChat/Rocket.Chat/pull/19778))
@@ -4496,13 +4639,13 @@
 
 - Add debouncing to add users search field. ([#20297](https://github.com/RocketChat/Rocket.Chat/pull/20297) by [@Darshilp326](https://github.com/Darshilp326))
 
-  BEFORE
-
-  https://user-images.githubusercontent.com/55157259/105350722-98a3c080-5c11-11eb-82f3-d9a62a4fa50b.mp4
-
-
-  AFTER
-
+  BEFORE
+
+  https://user-images.githubusercontent.com/55157259/105350722-98a3c080-5c11-11eb-82f3-d9a62a4fa50b.mp4
+
+
+  AFTER
+
   https://user-images.githubusercontent.com/55157259/105350757-a2c5bf00-5c11-11eb-91db-25c0b9e01a28.mp4
 
 - Add tooltips to Thread header buttons ([#20456](https://github.com/RocketChat/Rocket.Chat/pull/20456) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
@@ -4515,8 +4658,8 @@
 
 - Added check for view admin permission page ([#20403](https://github.com/RocketChat/Rocket.Chat/pull/20403) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  Admin Permission page was visible to all, if you add admin/permissions after the base url. This should not be visible to all user, only people with certain permissions should be able to see this page.
-  I am also able to see permissions page for open workspace of Rocket chat.
+  Admin Permission page was visible to all, if you add admin/permissions after the base url. This should not be visible to all user, only people with certain permissions should be able to see this page.
+  I am also able to see permissions page for open workspace of Rocket chat.
   ![image](https://user-images.githubusercontent.com/58601732/105829728-bfd00880-5fea-11eb-9121-6c53a752f140.png)
 
 - Adding the accidentally deleted tag template, used by other templates ([#20772](https://github.com/RocketChat/Rocket.Chat/pull/20772) by [@yash-rajpal](https://github.com/yash-rajpal))
@@ -4525,8 +4668,8 @@
 
 - Admin cannot clear user details like bio or nickname ([#20785](https://github.com/RocketChat/Rocket.Chat/pull/20785) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  When the API users.update is called to update user data, it passes data to saveUser function. Here before saving data like bio or nickname we are checking if they are available or not. If data is available then we are saving it, but we are not doing anything when data isn't available.
-
+  When the API users.update is called to update user data, it passes data to saveUser function. Here before saving data like bio or nickname we are checking if they are available or not. If data is available then we are saving it, but we are not doing anything when data isn't available.
+
   So unsetting data if data isn't available to save. Will also fix bio and other fields. :)
 
 - Admin Panel pages not visible in Safari ([#20912](https://github.com/RocketChat/Rocket.Chat/pull/20912))
@@ -4543,24 +4686,24 @@
 
 - Blank Personal Access Token Bug ([#20193](https://github.com/RocketChat/Rocket.Chat/pull/20193) by [@RonLek](https://github.com/RonLek))
 
-  Adds error when personal access token is blank thereby disallowing the creation of one.
-
+  Adds error when personal access token is blank thereby disallowing the creation of one.
+
   https://user-images.githubusercontent.com/28918901/104483631-5adde100-55ee-11eb-9938-64146bce127e.mp4
 
 - CAS login failing due to TOTP requirement ([#20840](https://github.com/RocketChat/Rocket.Chat/pull/20840))
 
 - Changed password input field for password access in edit room info. ([#20356](https://github.com/RocketChat/Rocket.Chat/pull/20356) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Password field would be secured with asterisks in edit room info
-
-  https://user-images.githubusercontent.com/55157259/105641758-cad04f00-5eab-11eb-90de-0c91263edd55.mp4
-
+  Password field would be secured with asterisks in edit room info
+
+  https://user-images.githubusercontent.com/55157259/105641758-cad04f00-5eab-11eb-90de-0c91263edd55.mp4
+
   .
 
 - Channel mentions showing user subscribed channels twice ([#20484](https://github.com/RocketChat/Rocket.Chat/pull/20484) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Channel mention shows user subscribed channels twice.
-
+  Channel mention shows user subscribed channels twice.
+
   https://user-images.githubusercontent.com/55157259/106183033-b353d780-61c5-11eb-8aab-1dbb62b02ff8.mp4
 
 - CORS config not accepting multiple origins ([#20696](https://github.com/RocketChat/Rocket.Chat/pull/20696) by [@g-thome](https://github.com/g-thome))
@@ -4571,26 +4714,26 @@
 
 - Default Attachments - Remove Extra Margin in Field Attachments ([#20618](https://github.com/RocketChat/Rocket.Chat/pull/20618) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  A large amount of unnecessary margin which existed in the **Field Attachments inside the `DefaultAttachments`** has been fixed.
-
-  ### Earlier
-
-  ![earlier](https://user-images.githubusercontent.com/55396651/107056792-ba4b9d00-67f8-11eb-9153-05281416cddb.png)
-
-  ### Now
-
+  A large amount of unnecessary margin which existed in the **Field Attachments inside the `DefaultAttachments`** has been fixed.
+
+  ### Earlier
+
+  ![earlier](https://user-images.githubusercontent.com/55396651/107056792-ba4b9d00-67f8-11eb-9153-05281416cddb.png)
+
+  ### Now
+
   ![now](https://user-images.githubusercontent.com/55396651/107057196-3219c780-67f9-11eb-84db-e4a0addfc168.png)
 
 - Default Attachments - Show Full Attachment.Text with Markdown ([#20606](https://github.com/RocketChat/Rocket.Chat/pull/20606) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  Removed truncating of text in `Attachment.Text`. 
-  Added `Attachment.Text` to be parsed to markdown by default.
-
-  ### Earlier
-  ![earlier](https://user-images.githubusercontent.com/55396651/106910781-92d8cf80-6727-11eb-82ec-818df7544ff0.png)
-
-  ### Now
-
+  Removed truncating of text in `Attachment.Text`.
+  Added `Attachment.Text` to be parsed to markdown by default.
+
+  ### Earlier
+  ![earlier](https://user-images.githubusercontent.com/55396651/106910781-92d8cf80-6727-11eb-82ec-818df7544ff0.png)
+
+  ### Now
+
   ![now](https://user-images.githubusercontent.com/55396651/106910840-a126eb80-6727-11eb-8bd6-d86383dd9181.png)
 
 - Don't ask again not rendering ([#20745](https://github.com/RocketChat/Rocket.Chat/pull/20745))
@@ -4611,21 +4754,21 @@
 
 - Feedback on bulk invite ([#20339](https://github.com/RocketChat/Rocket.Chat/pull/20339) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  Resolved structure where no response was being received. Changed from callback to async/await.
-  Added error in case of empty submission, or if no valid emails were found.
-
+  Resolved structure where no response was being received. Changed from callback to async/await.
+  Added error in case of empty submission, or if no valid emails were found.
+
   https://user-images.githubusercontent.com/38764067/105613964-dfe5a900-5deb-11eb-80f2-21fc8dee57c0.mp4
 
 - Filters are not being applied correctly in Omnichannel Current Chats list ([#20320](https://github.com/RocketChat/Rocket.Chat/pull/20320) by [@rafaelblink](https://github.com/rafaelblink))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/2493803/105537672-082cb500-5cd1-11eb-8f1b-1726ba60420a.png)
-
-  ### After
-  ![image](https://user-images.githubusercontent.com/2493803/105537773-2d212800-5cd1-11eb-8746-048deb9502d9.png)
-
-  ![image](https://user-images.githubusercontent.com/2493803/106494728-88090b00-6499-11eb-922e-5386107e2389.png)
-
+  ### Before
+  ![image](https://user-images.githubusercontent.com/2493803/105537672-082cb500-5cd1-11eb-8f1b-1726ba60420a.png)
+
+  ### After
+  ![image](https://user-images.githubusercontent.com/2493803/105537773-2d212800-5cd1-11eb-8746-048deb9502d9.png)
+
+  ![image](https://user-images.githubusercontent.com/2493803/106494728-88090b00-6499-11eb-922e-5386107e2389.png)
+
   ![image](https://user-images.githubusercontent.com/2493803/106494751-90f9dc80-6499-11eb-901b-5e4dbdc678ba.png)
 
 - Fix Empty highlighted words field ([#20329](https://github.com/RocketChat/Rocket.Chat/pull/20329) by [@yash-rajpal](https://github.com/yash-rajpal))
@@ -4654,11 +4797,11 @@
 
 - List of Omnichannel triggers is not listing data ([#20624](https://github.com/RocketChat/Rocket.Chat/pull/20624) by [@rafaelblink](https://github.com/rafaelblink))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/2493803/107095379-7308e080-67e7-11eb-8251-7e7ff891087a.png)
-
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/2493803/107095379-7308e080-67e7-11eb-8251-7e7ff891087a.png)
+
+
+  ### After
   ![image](https://user-images.githubusercontent.com/2493803/107095261-3b019d80-67e7-11eb-8425-8612b03ac50a.png)
 
 - Livechat bridge permission checkers ([#20653](https://github.com/RocketChat/Rocket.Chat/pull/20653) by [@lolimay](https://github.com/lolimay))
@@ -4681,7 +4824,8 @@
 
 - Missing setting to control when to send the ReplyTo field in email notifications ([#20744](https://github.com/RocketChat/Rocket.Chat/pull/20744))
 
-  - Add a new setting ("Add Reply-To header") in the Email settings' page to control when the Reply-To header is used in e-mail notifications;
  
+  - Add a new setting ("Add Reply-To header") in the Email settings' page to control when the Reply-To header is used in e-mail notifications;
+
   - The new setting is turned off (`false` value) by default.
 
 - New Integration page was not being displayed ([#20670](https://github.com/RocketChat/Rocket.Chat/pull/20670) by [@yash-rajpal](https://github.com/yash-rajpal))
@@ -4714,15 +4858,15 @@
 
 - Remove duplicate getCommonRoomEvents() event binding for starredMessages ([#20185](https://github.com/RocketChat/Rocket.Chat/pull/20185) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  The getCommonRoomEvents() returned functions were bound to the starredMessages template twice. This was causing some bugs, as detailed in the Issue mentioned below.
+  The getCommonRoomEvents() returned functions were bound to the starredMessages template twice. This was causing some bugs, as detailed in the Issue mentioned below.
   I removed the top events call that only bound the getCommonRoomEvents(). Therefore, only one call for the same is left, which is at the end of the file. Having the events bound just once removes the bugs mentioned.
 
 - Remove warning problems from console ([#20800](https://github.com/RocketChat/Rocket.Chat/pull/20800))
 
 - Removed tooltip in kebab menu options. ([#20498](https://github.com/RocketChat/Rocket.Chat/pull/20498) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Removed tooltip as it was not needed.
-
+  Removed tooltip as it was not needed.
+
   https://user-images.githubusercontent.com/55157259/106246146-a53ca000-6233-11eb-9874-cbd1b4331bc0.mp4
 
 - Retry icon comes out of the div ([#20390](https://github.com/RocketChat/Rocket.Chat/pull/20390) by [@im-adithya](https://github.com/im-adithya))
@@ -4737,8 +4881,8 @@
 
 - Room's last message's update date format on IE ([#20680](https://github.com/RocketChat/Rocket.Chat/pull/20680))
 
-  The proposed change fixes a bug when updates the cached records on Internet Explorer and it breaks the sidebar as shown on the screenshot below:
-
+  The proposed change fixes a bug when updates the cached records on Internet Explorer and it breaks the sidebar as shown on the screenshot below:
+
   ![image](https://user-images.githubusercontent.com/27704687/107578007-f2285b00-6bd1-11eb-9250-1e76ae67f9c9.png)
 
 - Save user password and email from My Account ([#20737](https://github.com/RocketChat/Rocket.Chat/pull/20737))
@@ -4747,8 +4891,8 @@
 
 - Selected hide system messages would now be viewed in vertical bar. ([#20358](https://github.com/RocketChat/Rocket.Chat/pull/20358) by [@Darshilp326](https://github.com/Darshilp326))
 
-  All selected hide system messages are now in vertical Bar.
-
+  All selected hide system messages are now in vertical Bar.
+
   https://user-images.githubusercontent.com/55157259/105642624-d5411780-5eb0-11eb-8848-93e4b02629cb.mp4
 
 - Selected messages don't get unselected ([#20408](https://github.com/RocketChat/Rocket.Chat/pull/20408) by [@im-adithya](https://github.com/im-adithya))
@@ -4763,14 +4907,22 @@
 
 - Several Slack Importer issues ([#20216](https://github.com/RocketChat/Rocket.Chat/pull/20216))
 
-  - Fix: Slack Importer crashes when importing a large users.json file
  
-  - Fix: Slack importer crashes when messages have invalid mentions
  
-  - Skip listing all users on the preparation screen when the user count is too large.
  
-  - Split avatar download into a separate process.
  
-  - Update room's last message when the import is complete.
  
-  - Prevent invalid or duplicated channel names
  
-  - Improve message error handling.
  
-  - Reduce max allowed BSON size to avoid possible issues in some servers.
  
+  - Fix: Slack Importer crashes when importing a large users.json file
+
+  - Fix: Slack importer crashes when messages have invalid mentions
+
+  - Skip listing all users on the preparation screen when the user count is too large.
+
+  - Split avatar download into a separate process.
+
+  - Update room's last message when the import is complete.
+
+  - Prevent invalid or duplicated channel names
+
+  - Improve message error handling.
+
+  - Reduce max allowed BSON size to avoid possible issues in some servers.
+
   - Improve handling of very large channel files.
 
 - star icon was visible after unstarring a message ([#19645](https://github.com/RocketChat/Rocket.Chat/pull/19645) by [@bhavayAnand9](https://github.com/bhavayAnand9))
@@ -4789,15 +4941,15 @@
 
 - User statuses in admin user info panel ([#20341](https://github.com/RocketChat/Rocket.Chat/pull/20341) by [@RonLek](https://github.com/RonLek))
 
-  Modifies user statuses in admin info panel based on their actual status instead of their `statusConnection`. This enables correct and consistent change in user statuses. 
-  Also, bot users having status as online were classified as offline, with this change they are now correctly classified based on their corresponding statuses.
-
+  Modifies user statuses in admin info panel based on their actual status instead of their `statusConnection`. This enables correct and consistent change in user statuses.
+  Also, bot users having status as online were classified as offline, with this change they are now correctly classified based on their corresponding statuses.
+
   https://user-images.githubusercontent.com/28918901/105624438-b8bcc500-5e47-11eb-8d1e-3a4180da1304.mp4
 
 - Users autocomplete showing duplicated results ([#20481](https://github.com/RocketChat/Rocket.Chat/pull/20481) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Added new query for outside room users so that room members are not shown twice.
-
+  Added new query for outside room users so that room members are not shown twice.
+
   https://user-images.githubusercontent.com/55157259/106174582-33c10b00-61bb-11eb-9716-377ef7bba34e.mp4
 
 <details>
@@ -4818,7 +4970,7 @@
 
 - Chore: Disable Sessions Aggregates tests locally ([#20607](https://github.com/RocketChat/Rocket.Chat/pull/20607))
 
-  Disable Session aggregates tests in local environments
+  Disable Session aggregates tests in local environments
   For context, refer to: #20161
 
 - Chore: Improve performance of messages’ watcher ([#20519](https://github.com/RocketChat/Rocket.Chat/pull/20519))
@@ -5027,18 +5179,20 @@
 
 - **ENTERPRISE:** Omnichannel Contact Manager as preferred agent for routing ([#20244](https://github.com/RocketChat/Rocket.Chat/pull/20244))
 
-  If the `Contact-Manager` is assigned to a Visitor, the chat will automatically get transferred to the respective Contact-Manager, provided the Contact-Manager is online. In-case the Contact-Manager is offline, the chat will be transferred to any other online agent.
-  We have provided a setting to control this auto-assignment feature
-  ![image](https://user-images.githubusercontent.com/34130764/104880961-8104d780-5986-11eb-9d87-82b99814b028.png)
-
-  Behavior based-on Routing method
-
  
-  1. Auto-selection, Load-Balancing, or External Service (`autoAssignAgent = true`)
-    This is straightforward, 
-        - if the Contact-manager is online, the chat will be transferred to the Contact-Manger only
-        - if the Contact-manager is offline, the chat will be transferred to any other online-agent based on the Routing system
  
-  2. Manual-selection (`autoAssignAgent = false`)
-        - If the Contact-Manager is online, the chat will appear in the Queue of Contact-Manager **ONLY**
+  If the `Contact-Manager` is assigned to a Visitor, the chat will automatically get transferred to the respective Contact-Manager, provided the Contact-Manager is online. In-case the Contact-Manager is offline, the chat will be transferred to any other online agent.
+  We have provided a setting to control this auto-assignment feature
+  ![image](https://user-images.githubusercontent.com/34130764/104880961-8104d780-5986-11eb-9d87-82b99814b028.png)
+
+  Behavior based-on Routing method
+
+
+  1. Auto-selection, Load-Balancing, or External Service (`autoAssignAgent = true`)
+    This is straightforward,
+        - if the Contact-manager is online, the chat will be transferred to the Contact-Manger only
+        - if the Contact-manager is offline, the chat will be transferred to any other online-agent based on the Routing system
+
+  2. Manual-selection (`autoAssignAgent = false`)
+        - If the Contact-Manager is online, the chat will appear in the Queue of Contact-Manager **ONLY**
         - If the Contact-Manager is offline, the chat will appear in the Queue of all related Agents/Manager ( like it's done right now )
 
 - Banner system and NPS ([#20221](https://github.com/RocketChat/Rocket.Chat/pull/20221))
@@ -5047,34 +5201,34 @@
 
 - Email Inboxes for Omnichannel ([#20101](https://github.com/RocketChat/Rocket.Chat/pull/20101) by [@rafaelblink](https://github.com/rafaelblink))
 
-  With this new feature, email accounts will receive email messages(threads) which will be transformed into Omnichannel chats. It'll be possible to set up multiple email accounts, test the connection with email server(email provider) and define the behaviour of each account.
-
-  https://user-images.githubusercontent.com/2493803/105430398-242d4980-5c32-11eb-835a-450c94837d23.mp4
-
-  ### New item on admin menu
-
-  ![image](https://user-images.githubusercontent.com/2493803/105428723-bc293400-5c2e-11eb-8c02-e8d36ea82726.png)
-
-
-  ### Send test email tooltip
-
-  ![image](https://user-images.githubusercontent.com/2493803/104366986-eaa16380-54f8-11eb-9ba7-831cfde2319c.png)
-
-
-  ### Inbox Info
-
-  ![image](https://user-images.githubusercontent.com/2493803/104366796-ab731280-54f8-11eb-9941-a3cc8eb610e1.png)
-
-  ### SMTP Info
-
-  ![image](https://user-images.githubusercontent.com/2493803/104366868-c47bc380-54f8-11eb-969e-ccc29070957c.png)
-
-  ### IMAP Info
-
-  ![image](https://user-images.githubusercontent.com/2493803/104366897-cd6c9500-54f8-11eb-80c4-97d5b0c002d5.png)
-
-  ### Messages
-
+  With this new feature, email accounts will receive email messages(threads) which will be transformed into Omnichannel chats. It'll be possible to set up multiple email accounts, test the connection with email server(email provider) and define the behaviour of each account.
+
+  https://user-images.githubusercontent.com/2493803/105430398-242d4980-5c32-11eb-835a-450c94837d23.mp4
+
+  ### New item on admin menu
+
+  ![image](https://user-images.githubusercontent.com/2493803/105428723-bc293400-5c2e-11eb-8c02-e8d36ea82726.png)
+
+
+  ### Send test email tooltip
+
+  ![image](https://user-images.githubusercontent.com/2493803/104366986-eaa16380-54f8-11eb-9ba7-831cfde2319c.png)
+
+
+  ### Inbox Info
+
+  ![image](https://user-images.githubusercontent.com/2493803/104366796-ab731280-54f8-11eb-9941-a3cc8eb610e1.png)
+
+  ### SMTP Info
+
+  ![image](https://user-images.githubusercontent.com/2493803/104366868-c47bc380-54f8-11eb-969e-ccc29070957c.png)
+
+  ### IMAP Info
+
+  ![image](https://user-images.githubusercontent.com/2493803/104366897-cd6c9500-54f8-11eb-80c4-97d5b0c002d5.png)
+
+  ### Messages
+
   ![image](https://user-images.githubusercontent.com/2493803/105428971-45d90180-5c2f-11eb-992a-022a3df94471.png)
 
 - Encrypted Discussions and new Encryption Permissions ([#20201](https://github.com/RocketChat/Rocket.Chat/pull/20201))
@@ -5086,7 +5240,7 @@
 
 - Add extra SAML settings to update room subs and add private room subs. ([#19489](https://github.com/RocketChat/Rocket.Chat/pull/19489) by [@tlskinneriv](https://github.com/tlskinneriv))
 
-  Added a SAML setting to support updating room subscriptions each time a user logs in via SAML.
+  Added a SAML setting to support updating room subscriptions each time a user logs in via SAML.
   Added a SAML setting to support including private rooms in SAML updated subscriptions (whether initial or on each logon).
 
 - Autofocus on directory ([#20509](https://github.com/RocketChat/Rocket.Chat/pull/20509))
@@ -5113,7 +5267,7 @@
 
 - Tooltip added for Kebab menu on chat header ([#20116](https://github.com/RocketChat/Rocket.Chat/pull/20116) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  Added the missing Tooltip for kebab menu on chat header.
+  Added the missing Tooltip for kebab menu on chat header.
   ![tooltip after](https://user-images.githubusercontent.com/58601732/104031406-b07f4b80-51f2-11eb-87a4-1e8da78a254f.gif)
 
 ### 🐛 Bug fixes
@@ -5135,7 +5289,7 @@
 
 - Added context check for closing active tabbar for member-list ([#20228](https://github.com/RocketChat/Rocket.Chat/pull/20228) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  When we click on a username and then click on see user's full profile, a tab gets active and shows us the user's profile, the problem occurs when the tab is still active and we try to see another user's profile. In this case, tabbar gets closed.
+  When we click on a username and then click on see user's full profile, a tab gets active and shows us the user's profile, the problem occurs when the tab is still active and we try to see another user's profile. In this case, tabbar gets closed.
   To resolve this, added context check for closing action of active tabbar.
 
 - Added Margin between status bullet and status label ([#20199](https://github.com/RocketChat/Rocket.Chat/pull/20199) by [@yash-rajpal](https://github.com/yash-rajpal))
@@ -5144,8 +5298,8 @@
 
 - Added success message on saving notification preference. ([#20220](https://github.com/RocketChat/Rocket.Chat/pull/20220) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Added success message after saving notification preferences.
-
+  Added success message after saving notification preferences.
+
   https://user-images.githubusercontent.com/55157259/104774617-03ca3e80-579d-11eb-8fa4-990b108dd8d9.mp4
 
 - Admin User Info email verified status ([#20110](https://github.com/RocketChat/Rocket.Chat/pull/20110) by [@bdelwood](https://github.com/bdelwood))
@@ -5154,10 +5308,10 @@
 
 - Change header's favorite icon to filled star ([#20174](https://github.com/RocketChat/Rocket.Chat/pull/20174))
 
-  ### Before: 
-  ![image](https://user-images.githubusercontent.com/27704687/104351819-a60bcd00-54e4-11eb-8b43-7d281a6e5dcb.png)
-
-  ### After:
+  ### Before:
+  ![image](https://user-images.githubusercontent.com/27704687/104351819-a60bcd00-54e4-11eb-8b43-7d281a6e5dcb.png)
+
+  ### After:
   ![image](https://user-images.githubusercontent.com/27704687/104351632-67761280-54e4-11eb-87ba-25b940494bb5.png)
 
 - Changed success message for adding custom sound. ([#20272](https://github.com/RocketChat/Rocket.Chat/pull/20272) by [@Darshilp326](https://github.com/Darshilp326))
@@ -5166,24 +5320,24 @@
 
 - Changed success message for ignoring member. ([#19996](https://github.com/RocketChat/Rocket.Chat/pull/19996) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Different messages for ignoring/unignoring will be displayed.
-
+  Different messages for ignoring/unignoring will be displayed.
+
   https://user-images.githubusercontent.com/55157259/103310307-4241c880-4a3d-11eb-8c6c-4c9b99d023db.mp4
 
 - Creation of Omnichannel rooms not working correctly through the Apps when the agent parameter is set ([#19997](https://github.com/RocketChat/Rocket.Chat/pull/19997))
 
 - Engagement dashboard graphs labels superposing each other ([#20267](https://github.com/RocketChat/Rocket.Chat/pull/20267))
 
-  Now after a certain breakpoint, the graphs should stack vertically, and overlapping text rotated.
-
+  Now after a certain breakpoint, the graphs should stack vertically, and overlapping text rotated.
+
   ![image](https://user-images.githubusercontent.com/40830821/105098926-93b40500-5a89-11eb-9a56-2fc3b1552914.png)
 
 - Fields overflowing page ([#20287](https://github.com/RocketChat/Rocket.Chat/pull/20287))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/40830821/105246952-c1b14c00-5b52-11eb-8671-cff88edf242d.png)
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/40830821/105246952-c1b14c00-5b52-11eb-8671-cff88edf242d.png)
+
+  ### After
   ![image](https://user-images.githubusercontent.com/40830821/105247125-0a690500-5b53-11eb-9f3c-d6a68108e336.png)
 
 - Fix error that occurs on changing archive status of room ([#20098](https://github.com/RocketChat/Rocket.Chat/pull/20098) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
@@ -5200,7 +5354,7 @@
 
 - Livechat.RegisterGuest method removing unset fields ([#20124](https://github.com/RocketChat/Rocket.Chat/pull/20124) by [@rafaelblink](https://github.com/rafaelblink))
 
-  After changes made on https://github.com/RocketChat/Rocket.Chat/pull/19931, the `Livechat.RegisterGuest` method started removing properties from the visitor inappropriately. The properties that did not receive value were removed from the object.
+  After changes made on https://github.com/RocketChat/Rocket.Chat/pull/19931, the `Livechat.RegisterGuest` method started removing properties from the visitor inappropriately. The properties that did not receive value were removed from the object.
   Those changes were made to support the new Contact Form, but now the form has its own method to deal with Contact data so those changes are no longer necessary.
 
 - Markdown added for Header Room topic ([#20021](https://github.com/RocketChat/Rocket.Chat/pull/20021) by [@yash-rajpal](https://github.com/yash-rajpal))
@@ -5221,18 +5375,18 @@
 
 - Omnichannel - Contact Center form is not validating custom fields properly ([#20196](https://github.com/RocketChat/Rocket.Chat/pull/20196) by [@rafaelblink](https://github.com/rafaelblink))
 
-  The contact form is accepting undefined values in required custom fields when creating or editing contacts, and, the errror message isn't following Rocket.chat design system.
-
-  ### Before
-  ![image](https://user-images.githubusercontent.com/2493803/104522668-31688980-55dd-11eb-92c5-83f96073edc4.png)
-
-  ### After
-
-  #### New
-  ![image](https://user-images.githubusercontent.com/2493803/104770494-68f74300-574f-11eb-94a3-c8fd73365308.png)
-
-
-  #### Edit
+  The contact form is accepting undefined values in required custom fields when creating or editing contacts, and, the errror message isn't following Rocket.chat design system.
+
+  ### Before
+  ![image](https://user-images.githubusercontent.com/2493803/104522668-31688980-55dd-11eb-92c5-83f96073edc4.png)
+
+  ### After
+
+  #### New
+  ![image](https://user-images.githubusercontent.com/2493803/104770494-68f74300-574f-11eb-94a3-c8fd73365308.png)
+
+
+  #### Edit
   ![image](https://user-images.githubusercontent.com/2493803/104770538-7b717c80-574f-11eb-829f-1ae304103369.png)
 
 - Omnichannel Agents unable to take new chats in the queue ([#20022](https://github.com/RocketChat/Rocket.Chat/pull/20022) by [@rafaelblink](https://github.com/rafaelblink))
@@ -5253,15 +5407,15 @@
 
 - Room special name in prompts ([#20277](https://github.com/RocketChat/Rocket.Chat/pull/20277) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  The "Hide room" and "Leave Room" confirmation prompts use the "name" key from the room info. When the setting "
-  Allow Special Characters in Room Names" is enabled, the prompts show the normalized names instead of those that contain the special characters.
-
-  Changed the value being used from name to fname, which always has the user-set name.
-
-  Previous:
-  ![Screenshot from 2021-01-20 15-52-29](https://user-images.githubusercontent.com/38764067/105161642-9b31e780-5b37-11eb-8b0c-ec4b1414c948.png)
-
-  Updated:
+  The "Hide room" and "Leave Room" confirmation prompts use the "name" key from the room info. When the setting "
+  Allow Special Characters in Room Names" is enabled, the prompts show the normalized names instead of those that contain the special characters.
+
+  Changed the value being used from name to fname, which always has the user-set name.
+
+  Previous:
+  ![Screenshot from 2021-01-20 15-52-29](https://user-images.githubusercontent.com/38764067/105161642-9b31e780-5b37-11eb-8b0c-ec4b1414c948.png)
+
+  Updated:
   ![Screenshot from 2021-01-20 15-50-19](https://user-images.githubusercontent.com/38764067/105161627-966d3380-5b37-11eb-9812-3dd9352b4f95.png)
 
 - Room's list showing all rooms with same name ([#20176](https://github.com/RocketChat/Rocket.Chat/pull/20176))
@@ -5272,9 +5426,9 @@
 
 - Saving with blank email in edit user ([#20259](https://github.com/RocketChat/Rocket.Chat/pull/20259) by [@RonLek](https://github.com/RonLek))
 
-  Disallows showing a success popup when email field is made blank in Edit User and instead shows the relevant error popup.
-
-
+  Disallows showing a success popup when email field is made blank in Edit User and instead shows the relevant error popup.
+
+
   https://user-images.githubusercontent.com/28918901/104960749-dbd81680-59fa-11eb-9c7b-2b257936f894.mp4
 
 - Search list filter ([#19937](https://github.com/RocketChat/Rocket.Chat/pull/19937))
@@ -5321,7 +5475,7 @@
 
 - Add translation of Edit Status in all languages ([#19916](https://github.com/RocketChat/Rocket.Chat/pull/19916) by [@sushant52](https://github.com/sushant52))
 
-  Closes [#19915](https://github.com/RocketChat/Rocket.Chat/issues/19915)
+  Closes [#19915](https://github.com/RocketChat/Rocket.Chat/issues/19915)
   The profile options menu is well translated in many languages. However, Edit Status is the only button which is not well translated. With this change, the whole profile options will be properly translated in a lot of languages.
 
 - Bump axios from 0.18.0 to 0.18.1 ([#20055](https://github.com/RocketChat/Rocket.Chat/pull/20055) by [@dependabot[bot]](https://github.com/dependabot[bot]))
@@ -5356,10 +5510,10 @@
 
 - Regression: Announcement bar not showing properly Markdown content ([#20290](https://github.com/RocketChat/Rocket.Chat/pull/20290))
 
-  **Before**:
-  ![image](https://user-images.githubusercontent.com/27704687/105273746-a4907380-5b7a-11eb-8121-aff665251c44.png)
-
-  **After**:
+  **Before**:
+  ![image](https://user-images.githubusercontent.com/27704687/105273746-a4907380-5b7a-11eb-8121-aff665251c44.png)
+
+  **After**:
   ![image](https://user-images.githubusercontent.com/27704687/105274050-2e404100-5b7b-11eb-93b2-b6282a7bed95.png)
 
 - regression: Announcement link open in new tab ([#20435](https://github.com/RocketChat/Rocket.Chat/pull/20435))
@@ -5374,23 +5528,23 @@
 
 - Regression: Change sort icon ([#20177](https://github.com/RocketChat/Rocket.Chat/pull/20177))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/40830821/104366414-1bcd6400-54f8-11eb-9fc7-c6f13f07a61e.png)
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/40830821/104366414-1bcd6400-54f8-11eb-9fc7-c6f13f07a61e.png)
+
+  ### After
   ![image](https://user-images.githubusercontent.com/40830821/104366542-4cad9900-54f8-11eb-83ca-acb99899515a.png)
 
 - Regression: Custom field labels are not displayed properly on Omnichannel Contact Profile form ([#20393](https://github.com/RocketChat/Rocket.Chat/pull/20393) by [@rafaelblink](https://github.com/rafaelblink))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/2493803/105780399-20116c80-5f4f-11eb-9620-0901472e453b.png)
-
-  ![image](https://user-images.githubusercontent.com/2493803/105780420-2e5f8880-5f4f-11eb-8e93-8115ebc685be.png)
-
-  ### After
-
-  ![image](https://user-images.githubusercontent.com/2493803/105780832-1ccab080-5f50-11eb-8042-188dd0c41904.png)
-
+  ### Before
+  ![image](https://user-images.githubusercontent.com/2493803/105780399-20116c80-5f4f-11eb-9620-0901472e453b.png)
+
+  ![image](https://user-images.githubusercontent.com/2493803/105780420-2e5f8880-5f4f-11eb-8e93-8115ebc685be.png)
+
+  ### After
+
+  ![image](https://user-images.githubusercontent.com/2493803/105780832-1ccab080-5f50-11eb-8042-188dd0c41904.png)
+
   ![image](https://user-images.githubusercontent.com/2493803/105780911-500d3f80-5f50-11eb-96e0-7df3f179dbd5.png)
 
 - Regression: ESLint Warning - explicit-function-return-type ([#20434](https://github.com/RocketChat/Rocket.Chat/pull/20434) by [@aditya-mitra](https://github.com/aditya-mitra))
@@ -5407,8 +5561,8 @@
 
 - Regression: Fixed update room avatar issue. ([#20433](https://github.com/RocketChat/Rocket.Chat/pull/20433) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Users can now update their room avatar without any error.
-
+  Users can now update their room avatar without any error.
+
   https://user-images.githubusercontent.com/55157259/105951602-560d3880-6096-11eb-97a5-b5eb9a28b58d.mp4
 
 - Regression: Info Page Icon style and usage graph breaking ([#20180](https://github.com/RocketChat/Rocket.Chat/pull/20180))
@@ -5425,11 +5579,11 @@
 
 - Regression: Unread superposing announcement. ([#20306](https://github.com/RocketChat/Rocket.Chat/pull/20306))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/40830821/105412619-c2f67d80-5c13-11eb-8204-5932ea880c8a.png)
-
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/40830821/105412619-c2f67d80-5c13-11eb-8204-5932ea880c8a.png)
+
+
+  ### After
   ![image](https://user-images.githubusercontent.com/40830821/105411176-d1439a00-5c11-11eb-8d1b-ea27c8485214.png)
 
 - Regression: User Dropdown margin ([#20222](https://github.com/RocketChat/Rocket.Chat/pull/20222))
@@ -5717,8 +5871,8 @@
 
 - Hightlights validation on Account Preferences page ([#19902](https://github.com/RocketChat/Rocket.Chat/pull/19902) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  This PR fixes two issues in the account settings "preferences" panel.
-  Once set, the "Highlighted Words" setting cannot be reset to an empty string. This was fixed by changing the string validation from checking the length to checking the type of variable.
+  This PR fixes two issues in the account settings "preferences" panel.
+  Once set, the "Highlighted Words" setting cannot be reset to an empty string. This was fixed by changing the string validation from checking the length to checking the type of variable.
   Secondly, it tracks the changes to correctly identify if changes after the last "save changes" action have been made, using an "updates" state variable, instead of just comparing against the initialValue that does not change on clicking "save changes".
 
 - Image preview for image URLs on messages ([#19734](https://github.com/RocketChat/Rocket.Chat/pull/19734) by [@g-thome](https://github.com/g-thome))
@@ -5777,10 +5931,14 @@
 
 - Chore: Update Pull Request template ([#19768](https://github.com/RocketChat/Rocket.Chat/pull/19768))
 
-  Improve the template of Pull Requests in order to make it clear reducing duplicated information and removing the visible checklists that were generating noise and misunderstanding with the PR progress.
  
-  - Moved the checklists to inside comments
  
-  - Merge the changelog and proposed changes sections to have a single source of description that goes to the changelog
  
-  - Remove the screenshot section, they can be added inside the description
  
+  Improve the template of Pull Requests in order to make it clear reducing duplicated information and removing the visible checklists that were generating noise and misunderstanding with the PR progress.
+
+  - Moved the checklists to inside comments
+
+  - Merge the changelog and proposed changes sections to have a single source of description that goes to the changelog
+
+  - Remove the screenshot section, they can be added inside the description
+
   - Changed the proposed changes title to incentivizing the usage of images and videos
 
 - Frontend folder structure ([#19631](https://github.com/RocketChat/Rocket.Chat/pull/19631))
@@ -5815,11 +5973,11 @@
 
 - Regression: Double Scrollbars on tables ([#19980](https://github.com/RocketChat/Rocket.Chat/pull/19980))
 
-  Before:
-  ![image](https://user-images.githubusercontent.com/40830821/103242719-0ec84680-4936-11eb-87a7-68b6eea8de7b.png)
-
-
-  After:
+  Before:
+  ![image](https://user-images.githubusercontent.com/40830821/103242719-0ec84680-4936-11eb-87a7-68b6eea8de7b.png)
+
+
+  After:
   ![image](https://user-images.githubusercontent.com/40830821/103242680-ee988780-4935-11eb-99e2-a95de99f78f1.png)
 
 - Regression: Failed autolinker and markdown rendering ([#19831](https://github.com/RocketChat/Rocket.Chat/pull/19831))
@@ -5838,7 +5996,7 @@
 
 - Regression: Omnichannel Custom Fields Form no longer working after refactoring ([#19948](https://github.com/RocketChat/Rocket.Chat/pull/19948))
 
-  The Omnichannel `Custom Fields` form is not working anymore after some refactorings on client-side.
+  The Omnichannel `Custom Fields` form is not working anymore after some refactorings on client-side.
   When the user clicks on `Custom Field` in the Omnichannel menu, a blank page appears.
 
 - Regression: polishing licenses endpoints  ([#19981](https://github.com/RocketChat/Rocket.Chat/pull/19981) by [@g-thome](https://github.com/g-thome))
@@ -6037,8 +6195,8 @@
 
 - Bundle Size Client ([#19533](https://github.com/RocketChat/Rocket.Chat/pull/19533))
 
-  temporarily removes some codeblock languages
-  Moved some libraries to dynamic imports
+  temporarily removes some codeblock languages
+  Moved some libraries to dynamic imports
   Removed some shared code not used on the client side
 
 - Forward Omnichannel room to agent in another department ([#19576](https://github.com/RocketChat/Rocket.Chat/pull/19576) by [@mrfigueiredo](https://github.com/mrfigueiredo))
@@ -7119,8 +7277,10 @@
 
 - **2FA:** Password enforcement setting and 2FA protection when saving settings or resetting E2E encryption ([#18640](https://github.com/RocketChat/Rocket.Chat/pull/18640))
 
-  - Increase the 2FA remembering time from 5min to 30min
  
-  - Add new setting to enforce 2FA password fallback (enabled only for new installations)
  
+  - Increase the 2FA remembering time from 5min to 30min
+
+  - Add new setting to enforce 2FA password fallback (enabled only for new installations)
+
   - Require 2FA to save settings and reset E2E Encryption keys
 
 - **Omnichannel:** Allow set other agent status via method `livechat:changeLivechatStatus ` ([#18571](https://github.com/RocketChat/Rocket.Chat/pull/18571))
@@ -7138,7 +7298,7 @@
 
 - 2FA by Email setting showing for the user even when disabled by the admin ([#18473](https://github.com/RocketChat/Rocket.Chat/pull/18473))
 
-  The option to disable/enable the **Two-factor authentication via Email** at `Account > Security > Two Factor Authentication
+  The option to disable/enable the **Two-factor authentication via Email** at `Account > Security > Two Factor Authentication
   ` was visible even when the setting **Enable Two Factor Authentication via Email** at `Admin > Accounts > Two Factor Authentication` was disabled leading to misbehavior since the functionality was disabled.
 
 - Agents enabledDepartment attribute not set on collection ([#18614](https://github.com/RocketChat/Rocket.Chat/pull/18614) by [@paulobernardoaf](https://github.com/paulobernardoaf))
@@ -7488,13 +7648,16 @@
 
 - Mention autocomplete UI and performance improvements  ([#18309](https://github.com/RocketChat/Rocket.Chat/pull/18309))
 
-  * New setting to configure the number of suggestions `Admin > Layout > User Interface > Number of users' autocomplete suggestions` (default 5)
  
-  * The UI shows whenever the user is not a member of the room
  
-  * The UI shows when the suggestion came from the last messages for quick selection/reply
  
-  * The suggestions follow this order:
-    * The user with the exact username and member of the room
-    * The user with the exact username but not a member of the room (if allowed to list non-members)
-    * The users containing the text in username, name or nickname and member of the room
+  * New setting to configure the number of suggestions `Admin > Layout > User Interface > Number of users' autocomplete suggestions` (default 5)
+
+  * The UI shows whenever the user is not a member of the room
+
+  * The UI shows when the suggestion came from the last messages for quick selection/reply
+
+  * The suggestions follow this order:
+    * The user with the exact username and member of the room
+    * The user with the exact username but not a member of the room (if allowed to list non-members)
+    * The users containing the text in username, name or nickname and member of the room
     * The users containing the text in username, name or nickname and not a member of the room (if allowed to list non-members)
 
 - Message action styles ([#18190](https://github.com/RocketChat/Rocket.Chat/pull/18190))
@@ -7836,10 +7999,10 @@
 
 - Split NOTIFICATIONS_SCHEDULE_DELAY into three separate variables ([#17669](https://github.com/RocketChat/Rocket.Chat/pull/17669) by [@jazztickets](https://github.com/jazztickets))
 
-  Email notification delay can now be customized with the following environment variables:
-  NOTIFICATIONS_SCHEDULE_DELAY_ONLINE
-  NOTIFICATIONS_SCHEDULE_DELAY_AWAY
-  NOTIFICATIONS_SCHEDULE_DELAY_OFFLINE
+  Email notification delay can now be customized with the following environment variables:
+  NOTIFICATIONS_SCHEDULE_DELAY_ONLINE
+  NOTIFICATIONS_SCHEDULE_DELAY_AWAY
+  NOTIFICATIONS_SCHEDULE_DELAY_OFFLINE
   Setting the value to -1 disable notifications for that type.
 
 - Threads ([#17416](https://github.com/RocketChat/Rocket.Chat/pull/17416))
@@ -8239,11 +8402,11 @@
 
 - **ENTERPRISE:** Omnichannel Last-Chatted Agent Preferred option ([#17666](https://github.com/RocketChat/Rocket.Chat/pull/17666))
 
-  If activated, this feature will store the last agent that assisted each Omnichannel visitor when a conversation is taken. So, when a visitor returns(it works with any entry point, Livechat, Facebook, REST API, and so on) and starts a new chat, the routing system checks:
-
-  1   - The visitor object for any stored agent that the visitor has previously talked to;
-  2   - If a previous agent is not found, the system will try to find a previous conversation of the same visitor. If a room is found, the system will get the previous agent from the room;
-
+  If activated, this feature will store the last agent that assisted each Omnichannel visitor when a conversation is taken. So, when a visitor returns(it works with any entry point, Livechat, Facebook, REST API, and so on) and starts a new chat, the routing system checks:
+
+  1   - The visitor object for any stored agent that the visitor has previously talked to;
+  2   - If a previous agent is not found, the system will try to find a previous conversation of the same visitor. If a room is found, the system will get the previous agent from the room;
+
   After this process, if an agent has been found, the system will check the agent's availability to assist the new chat. If it's not available, then the routing system will get the next available agent in the queue.
 
 - **ENTERPRISE:** Support for custom Livechat registration form fields ([#17581](https://github.com/RocketChat/Rocket.Chat/pull/17581))
@@ -8348,9 +8511,12 @@
 
 - Notification sounds ([#17616](https://github.com/RocketChat/Rocket.Chat/pull/17616))
 
-  * Global CDN config was ignored when loading the sound files
  
-  * Upload of custom sounds wasn't getting the file extension correctly
  
-  * Some translations were missing
  
+  * Global CDN config was ignored when loading the sound files
+
+  * Upload of custom sounds wasn't getting the file extension correctly
+
+  * Some translations were missing
+
   * Edit and delete of custom sounds were not working correctly
 
 - Omnichannel departments are not saved when the offline channel name is not defined ([#17553](https://github.com/RocketChat/Rocket.Chat/pull/17553))
@@ -8638,14 +8804,19 @@
 
 - Better Push and Email Notification logic ([#17357](https://github.com/RocketChat/Rocket.Chat/pull/17357))
 
-  We are still using the same logic to define which notifications every new message will generate, it takes some servers' settings, users's preferences and subscriptions' settings in consideration to determine who will receive each notification type (desktop, audio, email and mobile push), but now it doesn't check the user's status (online, away, offline) for email and mobile push notifications but send those notifications to a new queue with the following rules:
-
  
-  - When the user is online the notification is scheduled to be sent in 120 seconds
  
-  - When the user is away the notification is scheduled to be sent in 120 seconds minus the amount of time he is away
  
-  - When the user is offline the notification is scheduled to be sent right away
  
-  - When the user reads a channel all the notifications for that user are removed (clear queue)
  
-  - When a notification is processed to be sent to a user and there are other scheduled notifications:
-    - All the scheduled notifications for that user are rescheduled to now
+  We are still using the same logic to define which notifications every new message will generate, it takes some servers' settings, users's preferences and subscriptions' settings in consideration to determine who will receive each notification type (desktop, audio, email and mobile push), but now it doesn't check the user's status (online, away, offline) for email and mobile push notifications but send those notifications to a new queue with the following rules:
+
+
+  - When the user is online the notification is scheduled to be sent in 120 seconds
+
+  - When the user is away the notification is scheduled to be sent in 120 seconds minus the amount of time he is away
+
+  - When the user is offline the notification is scheduled to be sent right away
+
+  - When the user reads a channel all the notifications for that user are removed (clear queue)
+
+  - When a notification is processed to be sent to a user and there are other scheduled notifications:
+    - All the scheduled notifications for that user are rescheduled to now
     - The current notification goes back to the queue to be processed ordered by creation date
 
 - Buttons to check/uncheck all users and channels on import ([#17207](https://github.com/RocketChat/Rocket.Chat/pull/17207))
@@ -9008,7 +9179,7 @@
 
 - Translation via MS translate ([#16363](https://github.com/RocketChat/Rocket.Chat/pull/16363) by [@mrsimpson](https://github.com/mrsimpson))
 
-  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
+  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
   In addition to implementing the interface (similar to google and DeepL), a small change has been done in order to display the translation provider on the UI.
 
 - Two Factor authentication via email ([#15949](https://github.com/RocketChat/Rocket.Chat/pull/15949))
@@ -20547,4 +20718,4 @@
 - [@graywolf336](https://github.com/graywolf336)
 - [@marceloschmidt](https://github.com/marceloschmidt)
 - [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
\ No newline at end of file
+- [@sampaiodiego](https://github.com/sampaiodiego)
diff --git a/app/api/server/v1/channels.js b/app/api/server/v1/channels.js
index 8d360a5de505..832aca11ad53 100644
--- a/app/api/server/v1/channels.js
+++ b/app/api/server/v1/channels.js
@@ -285,9 +285,9 @@ API.v1.addRoute('channels.files', { authRequired: true }, {
 			return file;
 		};
 
-		Meteor.runAsUser(this.userId, () => {
-			Meteor.call('canAccessRoom', findResult._id, this.userId);
-		});
+		if (!canAccessRoom(findResult, { _id: this.userId })) {
+			return API.v1.unauthorized();
+		}
 
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
diff --git a/app/api/server/v1/chat.js b/app/api/server/v1/chat.js
index db41290a16f3..eba0e4e3f668 100644
--- a/app/api/server/v1/chat.js
+++ b/app/api/server/v1/chat.js
@@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
 import { Messages } from '../../../models';
-import { canAccessRoom, hasPermission } from '../../../authorization';
+import { canAccessRoom, hasPermission } from '../../../authorization/server';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { processWebhookMessage } from '../../../lib/server';
 import { executeSendMessage } from '../../../lib/server/methods/sendMessage';
@@ -404,12 +404,12 @@ API.v1.addRoute('chat.getPinnedMessages', { authRequired: true }, {
 		if (!roomId) {
 			throw new Meteor.Error('error-roomId-param-not-provided', 'The required "roomId" query param is missing.');
 		}
-		const room = Meteor.call('canAccessRoom', roomId, this.userId);
-		if (!room) {
+
+		if (!canAccessRoom({ _id: roomId }, { _id: this.userId })) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed');
 		}
 
-		const cursor = Messages.findPinnedByRoom(room._id, {
+		const cursor = Messages.findPinnedByRoom(roomId, {
 			skip: offset,
 			limit: count,
 		});
diff --git a/app/api/server/v1/commands.js b/app/api/server/v1/commands.js
index 51059b11221e..a9f6c290d8dd 100644
--- a/app/api/server/v1/commands.js
+++ b/app/api/server/v1/commands.js
@@ -2,8 +2,9 @@ import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import objectPath from 'object-path';
 
-import { slashCommands } from '../../../utils';
-import { Messages } from '../../../models';
+import { slashCommands } from '../../../utils/server';
+import { Messages } from '../../../models/server';
+import { canAccessRoom } from '../../../authorization/server';
 import { API } from '../api';
 
 API.v1.addRoute('commands.get', { authRequired: true }, {
@@ -189,8 +190,9 @@ API.v1.addRoute('commands.run', { authRequired: true }, {
 			return API.v1.failure('The command provided does not exist (or is disabled).');
 		}
 
-		// This will throw an error if they can't or the room is invalid
-		Meteor.call('canAccessRoom', body.roomId, user._id);
+		if (!canAccessRoom({ _id: body.roomId }, user)) {
+			return API.v1.unauthorized();
+		}
 
 		const params = body.params ? body.params : '';
 		const message = {
@@ -238,8 +240,9 @@ API.v1.addRoute('commands.preview', { authRequired: true }, {
 			return API.v1.failure('The command provided does not exist (or is disabled).');
 		}
 
-		// This will throw an error if they can't or the room is invalid
-		Meteor.call('canAccessRoom', query.roomId, user._id);
+		if (!canAccessRoom({ _id: query.roomId }, user)) {
+			return API.v1.unauthorized();
+		}
 
 		const params = query.params ? query.params : '';
 
@@ -288,8 +291,9 @@ API.v1.addRoute('commands.preview', { authRequired: true }, {
 			return API.v1.failure('The command provided does not exist (or is disabled).');
 		}
 
-		// This will throw an error if they can't or the room is invalid
-		Meteor.call('canAccessRoom', body.roomId, user._id);
+		if (!canAccessRoom({ _id: body.roomId }, user)) {
+			return API.v1.unauthorized();
+		}
 
 		const params = body.params ? body.params : '';
 		const message = {
diff --git a/app/api/server/v1/im.js b/app/api/server/v1/im.js
index 21d164ee862b..a0325298f3f2 100644
--- a/app/api/server/v1/im.js
+++ b/app/api/server/v1/im.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
 import { Subscriptions, Uploads, Users, Messages, Rooms } from '../../../models/server';
-import { hasPermission } from '../../../authorization/server';
+import { canAccessRoom, hasPermission } from '../../../authorization/server';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { settings } from '../../../settings/server';
 import { API } from '../api';
@@ -19,7 +19,7 @@ function findDirectMessageRoom(params, user, allowAdminOverride) {
 		nameOrId: params.username || params.roomId,
 	});
 
-	const canAccess = Meteor.call('canAccessRoom', room._id, user._id)
+	const canAccess = canAccessRoom(room, user)
 		|| (allowAdminOverride && hasPermission(user._id, 'view-room-administration'));
 	if (!canAccess || !room || room.t !== 'd') {
 		throw new Meteor.Error('error-room-not-found', 'The required "roomId" or "username" param provided does not match any direct message');
diff --git a/app/api/server/v1/rooms.js b/app/api/server/v1/rooms.js
index eee7230a0bbf..9310ac8c7b22 100644
--- a/app/api/server/v1/rooms.js
+++ b/app/api/server/v1/rooms.js
@@ -65,9 +65,7 @@ API.v1.addRoute('rooms.get', { authRequired: true }, {
 
 API.v1.addRoute('rooms.upload/:rid', { authRequired: true }, {
 	post() {
-		const room = Meteor.call('canAccessRoom', this.urlParams.rid, this.userId);
-
-		if (!room) {
+		if (!canAccessRoom({ _id: this.urlParams.rid }, { _id: this.userId })) {
 			return API.v1.unauthorized();
 		}
 
@@ -191,9 +189,11 @@ API.v1.addRoute('rooms.info', { authRequired: true }, {
 	get() {
 		const room = findRoomByIdOrName({ params: this.requestParams() });
 		const { fields } = this.parseJsonQuery();
-		if (!Meteor.call('canAccessRoom', room._id, this.userId, {})) {
+
+		if (!room || !canAccessRoom(room, { _id: this.userId })) {
 			return API.v1.failure('not-allowed', 'Not Allowed');
 		}
+
 		return API.v1.success({ room: Rooms.findOneByIdOrName(room._id, { fields }) });
 	},
 });
@@ -244,9 +244,11 @@ API.v1.addRoute('rooms.getDiscussions', { authRequired: true }, {
 		const room = findRoomByIdOrName({ params: this.requestParams() });
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
-		if (!Meteor.call('canAccessRoom', room._id, this.userId, {})) {
+
+		if (!room || !canAccessRoom(room, { _id: this.userId })) {
 			return API.v1.failure('not-allowed', 'Not Allowed');
 		}
+
 		const ourQuery = Object.assign(query, { prid: room._id });
 
 		const discussions = Rooms.find(ourQuery, {
diff --git a/app/e2e/server/methods/getUsersOfRoomWithoutKey.js b/app/e2e/server/methods/getUsersOfRoomWithoutKey.js
index a686af5e88c4..2139ac8fde7e 100644
--- a/app/e2e/server/methods/getUsersOfRoomWithoutKey.js
+++ b/app/e2e/server/methods/getUsersOfRoomWithoutKey.js
@@ -1,16 +1,23 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
-import { Subscriptions, Users } from '../../../models';
+import { canAccessRoom } from '../../../authorization/server';
+import { Subscriptions, Users } from '../../../models/server';
 
 Meteor.methods({
 	'e2e.getUsersOfRoomWithoutKey'(rid) {
+		check(rid, String);
+
 		const userId = Meteor.userId();
 		if (!userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'e2e.getUsersOfRoomWithoutKey' });
 		}
 
-		const room = Meteor.call('canAccessRoom', rid, userId);
-		if (!room) {
+		if (!rid) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'e2e.getUsersOfRoomWithoutKey' });
+		}
+
+		if (!canAccessRoom({ _id: rid }, { _id: userId })) {
 			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'e2e.getUsersOfRoomWithoutKey' });
 		}
 
diff --git a/app/e2e/server/methods/setRoomKeyID.js b/app/e2e/server/methods/setRoomKeyID.js
index a273e803b934..e2f8aafa059b 100644
--- a/app/e2e/server/methods/setRoomKeyID.js
+++ b/app/e2e/server/methods/setRoomKeyID.js
@@ -1,19 +1,29 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
-import { Rooms } from '../../../models';
+import { canAccessRoom } from '../../../authorization/server';
+import { Rooms } from '../../../models/server';
 
 Meteor.methods({
 	'e2e.setRoomKeyID'(rid, keyID) {
+		check(rid, String);
+		check(keyID, String);
+
 		const userId = Meteor.userId();
 		if (!userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'e2e.setRoomKeyID' });
 		}
 
-		const room = Meteor.call('canAccessRoom', rid, userId);
-		if (!room) {
+		if (!rid) {
 			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'e2e.setRoomKeyID' });
 		}
 
+		if (!canAccessRoom({ _id: rid }, { _id: userId })) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'e2e.setRoomKeyID' });
+		}
+
+		const room = Rooms.findOneById(rid, { fields: { e2eKeyId: 1 } });
+
 		if (room.e2eKeyId) {
 			throw new Meteor.Error('error-room-e2e-key-already-exists', 'E2E Key ID already exists', { method: 'e2e.setRoomKeyID' });
 		}
diff --git a/app/lib/server/lib/processDirectEmail.js b/app/lib/server/lib/processDirectEmail.js
index 3b97938d4694..98313697028f 100644
--- a/app/lib/server/lib/processDirectEmail.js
+++ b/app/lib/server/lib/processDirectEmail.js
@@ -5,7 +5,7 @@ import moment from 'moment';
 import { settings } from '../../../settings/server';
 import { Rooms, Messages, Users, Subscriptions } from '../../../models/server';
 import { metrics } from '../../../metrics/server';
-import { hasPermission } from '../../../authorization/server';
+import { canAccessRoom, hasPermission } from '../../../authorization/server';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { sendMessage as _sendMessage } from '../functions';
 
@@ -55,29 +55,25 @@ export const processDirectEmail = function(email) {
 		}
 		message.rid = prevMessage.rid;
 
-		const room = Meteor.call('canAccessRoom', message.rid, user._id);
-		if (!room) {
+		const room = Rooms.findOneById(message.rid);
+
+		if (!canAccessRoom(room, user)) {
 			return false;
 		}
 
-		const roomInfo = Rooms.findOneById(message.rid, {
-			t: 1,
-			name: 1,
-		});
-
 		// check mention
-		if (message.msg.indexOf(`@${ prevMessage.u.username }`) === -1 && roomInfo.t !== 'd') {
+		if (message.msg.indexOf(`@${ prevMessage.u.username }`) === -1 && room.t !== 'd') {
 			message.msg = `@${ prevMessage.u.username } ${ message.msg }`;
 		}
 
 		// reply message link
 		let prevMessageLink = `[ ](${ Meteor.absoluteUrl().replace(/\/$/, '') }`;
-		if (roomInfo.t === 'c') {
-			prevMessageLink += `/channel/${ roomInfo.name }?msg=${ email.headers.mid }) `;
-		} else if (roomInfo.t === 'd') {
+		if (room.t === 'c') {
+			prevMessageLink += `/channel/${ room.name }?msg=${ email.headers.mid }) `;
+		} else if (room.t === 'd') {
 			prevMessageLink += `/direct/${ prevMessage.u.username }?msg=${ email.headers.mid }) `;
-		} else if (roomInfo.t === 'p') {
-			prevMessageLink += `/group/${ roomInfo.name }?msg=${ email.headers.mid }) `;
+		} else if (room.t === 'p') {
+			prevMessageLink += `/group/${ room.name }?msg=${ email.headers.mid }) `;
 		}
 		// add reply message link
 		message.msg = prevMessageLink + message.msg;
diff --git a/app/lib/server/methods/getChannelHistory.js b/app/lib/server/methods/getChannelHistory.js
index 25c645231038..80237842b118 100644
--- a/app/lib/server/methods/getChannelHistory.js
+++ b/app/lib/server/methods/getChannelHistory.js
@@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import _ from 'underscore';
 
-import { hasPermission } from '../../../authorization/server';
-import { Subscriptions, Messages } from '../../../models/server';
+import { canAccessRoom, hasPermission } from '../../../authorization/server';
+import { Subscriptions, Messages, Rooms } from '../../../models/server';
 import { settings } from '../../../settings/server';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { getHiddenSystemMessages } from '../lib/getHiddenSystemMessages';
@@ -17,11 +17,15 @@ Meteor.methods({
 		}
 
 		const fromUserId = Meteor.userId();
-		const room = Meteor.call('canAccessRoom', rid, fromUserId);
+		const room = Rooms.findOneById(rid);
 		if (!room) {
 			return false;
 		}
 
+		if (!canAccessRoom(room, { _id: fromUserId })) {
+			return false;
+		}
+
 		// Make sure they can access the room
 		if (room.t === 'c' && !hasPermission(fromUserId, 'preview-c-room') && !Subscriptions.findOneByRoomIdAndUserId(rid, fromUserId, { fields: { _id: 1 } })) {
 			return false;
diff --git a/app/lib/server/methods/getMessages.js b/app/lib/server/methods/getMessages.js
index d4b3ce4bd20a..f8ccbbbb6f74 100644
--- a/app/lib/server/methods/getMessages.js
+++ b/app/lib/server/methods/getMessages.js
@@ -1,28 +1,22 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { Messages } from '../../../models';
+import { canAccessRoom } from '../../../authorization/server';
+import { Messages } from '../../../models/server';
 
 Meteor.methods({
 	getMessages(messages) {
 		check(messages, [String]);
 
-		const cache = {};
+		const msgs = Messages.findVisibleByIds(messages).fetch();
 
-		return messages.map((msgId) => {
-			const msg = Messages.findOneById(msgId);
+		const user = { _id: Meteor.userId() };
 
-			if (!msg || !msg.rid) {
-				return undefined;
-			}
+		const rids = [...new Set(msgs.map((m) => m.rid))];
+		if (!rids.every((_id) => canAccessRoom({ _id }, user))) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'getSingleMessage' });
+		}
 
-			cache[msg.rid] = cache[msg.rid] || Meteor.call('canAccessRoom', msg.rid, Meteor.userId());
-
-			if (!cache[msg.rid]) {
-				throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'getSingleMessage' });
-			}
-
-			return msg;
-		});
+		return msgs;
 	},
 });
diff --git a/app/lib/server/methods/getSingleMessage.js b/app/lib/server/methods/getSingleMessage.js
index 399aa335cab3..604ac2f1b4f7 100644
--- a/app/lib/server/methods/getSingleMessage.js
+++ b/app/lib/server/methods/getSingleMessage.js
@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { Messages } from '../../../models';
+import { canAccessRoom } from '../../../authorization/server';
+import { Messages } from '../../../models/server';
 
 Meteor.methods({
 	getSingleMessage(msgId) {
@@ -13,7 +14,7 @@ Meteor.methods({
 			return undefined;
 		}
 
-		if (!Meteor.call('canAccessRoom', msg.rid, Meteor.userId())) {
+		if (!canAccessRoom({ _id: msg.rid }, { _id: Meteor.userId() })) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'getSingleMessage' });
 		}
 
diff --git a/app/livechat/client/views/app/livechatReadOnly.js b/app/livechat/client/views/app/livechatReadOnly.js
index c751c701e9ea..74dce229f25c 100644
--- a/app/livechat/client/views/app/livechatReadOnly.js
+++ b/app/livechat/client/views/app/livechatReadOnly.js
@@ -64,7 +64,7 @@ Template.livechatReadOnly.onCreated(function() {
 	this.preparing = new ReactiveVar(true);
 
 	this.updateInquiry = async ({ clientAction, ...inquiry }) => {
-		if (clientAction === 'removed' || !await callWithErrorHandling('canAccessRoom', inquiry.rid, Meteor.userId())) {
+		if (clientAction === 'removed') {
 			// this will force to refresh the room
 			// since the client wont get notified of room changes when chats are on queue (no one assigned)
 			// a better approach should be performed when refactoring these templates to use react
diff --git a/app/message-pin/server/pinMessage.js b/app/message-pin/server/pinMessage.js
index 4543496ad2a0..545a350b7d6a 100644
--- a/app/message-pin/server/pinMessage.js
+++ b/app/message-pin/server/pinMessage.js
@@ -1,11 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { settings } from '../../settings';
-import { callbacks } from '../../callbacks';
-import { isTheLastMessage } from '../../lib';
+import { settings } from '../../settings/server';
+import { callbacks } from '../../callbacks/server';
+import { isTheLastMessage } from '../../lib/server';
 import { getUserAvatarURL } from '../../utils/lib/getUserAvatarURL';
-import { hasPermission } from '../../authorization';
+import { canAccessRoom, hasPermission } from '../../authorization/server';
 import { Subscriptions, Messages, Users, Rooms } from '../../models';
 
 const recursiveRemove = (msg, deep = 1) => {
@@ -72,7 +72,11 @@ Meteor.methods({
 		if (settings.get('Message_KeepHistory')) {
 			Messages.cloneAndSaveAsHistoryById(message._id, me);
 		}
-		const room = Meteor.call('canAccessRoom', originalMessage.rid, Meteor.userId());
+
+		const room = Rooms.findOneById(originalMessage.rid);
+		if (!canAccessRoom(room, { _id: Meteor.userId() })) {
+			throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'pinMessage' });
+		}
 
 		originalMessage.pinned = true;
 		originalMessage.pinnedAt = pinnedAt || Date.now;
@@ -166,7 +170,12 @@ Meteor.methods({
 			username: me.username,
 		};
 		originalMessage = callbacks.run('beforeSaveMessage', originalMessage);
-		const room = Meteor.call('canAccessRoom', originalMessage.rid, Meteor.userId());
+
+		const room = Rooms.findOneById(originalMessage.rid, { fields: { lastMessage: 1 } });
+		if (!canAccessRoom(room, { _id: Meteor.userId() })) {
+			throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'unpinMessage' });
+		}
+
 		if (isTheLastMessage(room, message)) {
 			Rooms.setLastMessagePinned(room._id, originalMessage.pinnedBy, originalMessage.pinned);
 		}
diff --git a/app/message-star/server/starMessage.js b/app/message-star/server/starMessage.js
index 4d22d6727835..097b640f31ef 100644
--- a/app/message-star/server/starMessage.js
+++ b/app/message-star/server/starMessage.js
@@ -1,8 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 
-import { settings } from '../../settings';
-import { isTheLastMessage } from '../../lib';
-import { Subscriptions, Rooms, Messages } from '../../models';
+import { settings } from '../../settings/server';
+import { isTheLastMessage } from '../../lib/server';
+import { canAccessRoom } from '../../authorization/server';
+import { Subscriptions, Rooms, Messages } from '../../models/server';
 
 Meteor.methods({
 	starMessage(message) {
@@ -26,7 +27,12 @@ Meteor.methods({
 		if (!Messages.findOneByRoomIdAndMessageId(message.rid, message._id)) {
 			return false;
 		}
-		const room = Meteor.call('canAccessRoom', message.rid, Meteor.userId());
+
+		const room = Rooms.findOneById(message.rid, { fields: { lastMessage: 1 } });
+		if (!canAccessRoom(room, { _id: Meteor.userId() })) {
+			throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'starMessage' });
+		}
+
 		if (isTheLastMessage(room, message)) {
 			Rooms.updateLastMessageStar(room._id, Meteor.userId(), message.starred);
 		}
diff --git a/app/models/server/models/Messages.js b/app/models/server/models/Messages.js
index de09ad1c0b04..3bfff331c4ef 100644
--- a/app/models/server/models/Messages.js
+++ b/app/models/server/models/Messages.js
@@ -246,6 +246,17 @@ export class Messages extends Base {
 		return this.find(query, options);
 	}
 
+	findVisibleByIds(ids, options) {
+		const query = {
+			_id: { $in: ids },
+			_hidden: {
+				$ne: true,
+			},
+		};
+
+		return this.find(query, options);
+	}
+
 	findVisibleThreadByThreadId(tmid, options) {
 		const query = {
 			_hidden: {
diff --git a/app/reactions/server/setReaction.js b/app/reactions/server/setReaction.js
index 53de3fe70c1f..279e4e813d88 100644
--- a/app/reactions/server/setReaction.js
+++ b/app/reactions/server/setReaction.js
@@ -2,11 +2,11 @@ import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 
-import { Messages, EmojiCustom, Rooms } from '../../models';
-import { callbacks } from '../../callbacks';
-import { emoji } from '../../emoji';
-import { isTheLastMessage, msgStream } from '../../lib';
-import { hasPermission } from '../../authorization/server/functions/hasPermission';
+import { Messages, EmojiCustom, Rooms } from '../../models/server';
+import { callbacks } from '../../callbacks/server';
+import { emoji } from '../../emoji/server';
+import { isTheLastMessage, msgStream } from '../../lib/server';
+import { canAccessRoom, hasPermission } from '../../authorization/server';
 import { api } from '../../../server/sdk/api';
 
 const removeUserReaction = (message, reaction, username) => {
@@ -91,17 +91,19 @@ export const executeSetReaction = async function(reaction, messageId, shouldReac
 	}
 
 	const message = Messages.findOneById(messageId);
-
 	if (!message) {
 		throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setReaction' });
 	}
 
-	const room = Meteor.call('canAccessRoom', message.rid, Meteor.userId());
-
+	const room = Rooms.findOneById(message.rid);
 	if (!room) {
 		throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setReaction' });
 	}
 
+	if (!canAccessRoom(room, user)) {
+		throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'setReaction' });
+	}
+
 	return setReaction(room, user, message, reaction, shouldReact);
 };
 
diff --git a/app/search/server/service/validationService.js b/app/search/server/service/validationService.js
index 633d88b7697e..120207bd0e97 100644
--- a/app/search/server/service/validationService.js
+++ b/app/search/server/service/validationService.js
@@ -1,42 +1,46 @@
 import { Meteor } from 'meteor/meteor';
+import mem from 'mem';
 
 import SearchLogger from '../logger/logger';
-import { Users } from '../../../models';
+import { canAccessRoom } from '../../../authorization/server';
+import { Users, Rooms } from '../../../models/server';
 
 class ValidationService {
 	validateSearchResult(result) {
-		const subscriptionCache = {};
+		const getSubscription = mem((rid, uid) => {
+			if (!rid) {
+				return;
+			}
 
-		const getSubscription = (rid, uid) => {
-			if (!subscriptionCache.hasOwnProperty(rid)) {
-				subscriptionCache[rid] = Meteor.call('canAccessRoom', rid, uid);
+			const room = Rooms.findOneById(rid);
+			if (!room) {
+				return;
 			}
 
-			return subscriptionCache[rid];
-		};
+			if (!canAccessRoom(room, { _id: uid })) {
+				return;
+			}
 
-		const userCache = {};
+			return room;
+		});
 
-		const getUsername = (uid) => {
-			if (!userCache.hasOwnProperty(uid)) {
-				try {
-					userCache[uid] = Users.findById(uid).fetch()[0].username;
-				} catch (e) {
-					userCache[uid] = undefined;
-				}
+		const getUser = mem((uid) => {
+			if (!uid) {
+				return;
 			}
-			return userCache[uid];
-		};
+			return Users.findOneById(uid, { fields: { username: 1 } });
+		});
 
 		const uid = Meteor.userId();
 		// get subscription for message
 		if (result.message) {
 			result.message.docs.forEach((msg) => {
+				const user = getUser(msg.user);
 				const subscription = getSubscription(msg.rid, uid);
 
 				if (subscription) {
 					msg.r = { name: subscription.name, t: subscription.t };
-					msg.username = getUsername(msg.user);
+					msg.username = user?.username;
 					msg.valid = true;
 					SearchLogger.debug(`user ${ uid } can access ${ msg.rid } ( ${ subscription.t === 'd' ? subscription.username : subscription.name } )`);
 				} else {
@@ -44,7 +48,7 @@ class ValidationService {
 				}
 			});
 
-			result.message.docs.filter((msg) => msg.valid);
+			result.message.docs = result.message.docs.filter((msg) => msg.valid);
 		}
 
 		if (result.room) {
@@ -60,7 +64,7 @@ class ValidationService {
 				}
 			});
 
-			result.room.docs.filter((room) => room.valid);
+			result.room.docs = result.room.docs.filter((room) => room.valid);
 		}
 
 		return result;
diff --git a/app/threads/server/methods/followMessage.js b/app/threads/server/methods/followMessage.js
index 4ab2e59e2945..642c32e3b633 100644
--- a/app/threads/server/methods/followMessage.js
+++ b/app/threads/server/methods/followMessage.js
@@ -4,6 +4,7 @@ import { check } from 'meteor/check';
 import { Messages } from '../../../models/server';
 import { RateLimiter } from '../../../lib/server';
 import { settings } from '../../../settings/server';
+import { canAccessRoom } from '../../../authorization/server';
 import { follow } from '../functions';
 
 Meteor.methods({
@@ -24,8 +25,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-message', 'Invalid message', { method: 'followMessage' });
 		}
 
-		const room = Meteor.call('canAccessRoom', message.rid, uid);
-		if (!room) {
+		if (!canAccessRoom({ _id: message.rid }, { _id: uid })) {
 			throw new Meteor.Error('error-not-allowed', 'not-allowed', { method: 'followMessage' });
 		}
 
diff --git a/app/threads/server/methods/unfollowMessage.js b/app/threads/server/methods/unfollowMessage.js
index 743d9bd5e719..a5ed0fa50c6a 100644
--- a/app/threads/server/methods/unfollowMessage.js
+++ b/app/threads/server/methods/unfollowMessage.js
@@ -4,6 +4,7 @@ import { check } from 'meteor/check';
 import { Messages } from '../../../models/server';
 import { RateLimiter } from '../../../lib/server';
 import { settings } from '../../../settings/server';
+import { canAccessRoom } from '../../../authorization/server';
 import { unfollow } from '../functions';
 
 Meteor.methods({
@@ -21,12 +22,11 @@ Meteor.methods({
 
 		const message = Messages.findOneById(mid, { fields: { rid: 1, tmid: 1 } });
 		if (!message) {
-			throw new Meteor.Error('error-invalid-message', 'Invalid message', { method: 'followMessage' });
+			throw new Meteor.Error('error-invalid-message', 'Invalid message', { method: 'unfollowMessage' });
 		}
 
-		const room = Meteor.call('canAccessRoom', message.rid, uid);
-		if (!room) {
-			throw new Meteor.Error('error-not-allowed', 'not-allowed', { method: 'followMessage' });
+		if (!canAccessRoom({ _id: message.rid }, { _id: uid })) {
+			throw new Meteor.Error('error-not-allowed', 'not-allowed', { method: 'unfollowMessage' });
 		}
 
 		return unfollow({ rid: message.rid, tmid: message.tmid || message._id, uid });
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index b3e4de0fd745..e0d8e5906fd7 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "4.1.0"
+	"version": "4.1.1"
 }
diff --git a/app/videobridge/server/methods/bbb.js b/app/videobridge/server/methods/bbb.js
index 4721dc9842ce..d4c4db288e32 100644
--- a/app/videobridge/server/methods/bbb.js
+++ b/app/videobridge/server/methods/bbb.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
+import { check } from 'meteor/check';
 import xml2js from 'xml2js';
 
 import BigBlueButtonApi from '../../../bigbluebutton/server';
@@ -7,6 +8,7 @@ import { SystemLogger } from '../../../../server/lib/logger/system';
 import { settings } from '../../../settings/server';
 import { Rooms, Users } from '../../../models/server';
 import { saveStreamingOptions } from '../../../channel-settings/server';
+import { canAccessRoom } from '../../../authorization/server';
 import { API } from '../../../api/server';
 
 const parser = new xml2js.Parser({
@@ -24,11 +26,27 @@ const getBBBAPI = () => {
 
 Meteor.methods({
 	bbbJoin({ rid }) {
+		check(rid, String);
+
 		if (!this.userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'bbbJoin' });
 		}
 
-		if (!Meteor.call('canAccessRoom', rid, this.userId)) {
+		if (!rid) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'bbbJoin' });
+		}
+
+		const user = Users.findOneById(this.userId);
+		if (!user) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'bbbJoin' });
+		}
+
+		const room = Rooms.findOneById(rid);
+		if (!room) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'bbbJoin' });
+		}
+
+		if (!canAccessRoom(room, user)) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'bbbJoin' });
 		}
 
@@ -38,7 +56,6 @@ Meteor.methods({
 
 		const { api } = getBBBAPI();
 		const meetingID = settings.get('uniqueID') + rid;
-		const room = Rooms.findOneById(rid);
 		const createUrl = api.urlFor('create', {
 			name: room.t === 'd' ? 'Direct' : room.name,
 			meetingID,
@@ -56,8 +73,6 @@ Meteor.methods({
 		const doc = parseString(createResult.content);
 
 		if (doc.response.returncode[0]) {
-			const user = Users.findOneById(this.userId);
-
 			const hookApi = api.urlFor('hooks/create', {
 				meetingID,
 				callbackURL: Meteor.absoluteUrl(`api/v1/videoconference.bbb.update/${ meetingID }`),
@@ -90,11 +105,17 @@ Meteor.methods({
 	},
 
 	bbbEnd({ rid }) {
+		check(rid, String);
+
 		if (!this.userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'bbbEnd' });
 		}
 
-		if (!Meteor.call('canAccessRoom', rid, this.userId)) {
+		if (!rid) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'bbbEnd' });
+		}
+
+		if (!canAccessRoom({ _id: rid }, { _id: this.userId })) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'bbbEnd' });
 		}
 
diff --git a/imports/message-read-receipt/server/api/methods/getReadReceipts.js b/imports/message-read-receipt/server/api/methods/getReadReceipts.js
index f73448b92d3c..e13647249217 100644
--- a/imports/message-read-receipt/server/api/methods/getReadReceipts.js
+++ b/imports/message-read-receipt/server/api/methods/getReadReceipts.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Messages } from '../../../../../app/models';
+import { Messages } from '../../../../../app/models/server';
+import { canAccessRoom } from '../../../../../app/authorization/server';
 import { ReadReceipt } from '../../lib/ReadReceipt';
 
 Meteor.methods({
@@ -19,8 +20,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-message', 'Invalid message', { method: 'getReadReceipts' });
 		}
 
-		const room = Meteor.call('canAccessRoom', message.rid, Meteor.userId());
-		if (!room) {
+		if (!canAccessRoom({ _id: message.rid }, { _id: Meteor.userId() })) {
 			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'getReadReceipts' });
 		}
 
diff --git a/package-lock.json b/package-lock.json
index 53f2e0e0cd55..01bb93f30fec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Rocket.Chat",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c15b83db3a55..d0240cf5e594 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "4.1.0",
+	"version": "4.1.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/server/methods/canAccessRoom.js b/server/methods/canAccessRoom.js
index 7aa3e637a867..4b1f7b28098c 100644
--- a/server/methods/canAccessRoom.js
+++ b/server/methods/canAccessRoom.js
@@ -5,54 +5,57 @@ import { Users, Rooms } from '../../app/models/server';
 import { canAccessRoom } from '../../app/authorization/server';
 import { settings } from '../../app/settings/server';
 
-Meteor.methods({
-	canAccessRoom(rid, userId, extraData) {
-		check(rid, String);
-		check(userId, Match.Maybe(String));
-
-		let user;
+if (['yes', 'true'].includes(String(process.env.ALLOW_CANACCESSROOM_METHOD).toLowerCase())) {
+	console.warn('Method canAccessRoom is deprecated and will be removed after version 5.0');
+	Meteor.methods({
+		canAccessRoom(rid, userId, extraData) {
+			check(rid, String);
+			check(userId, Match.Maybe(String));
+
+			let user;
+
+			if (userId) {
+				user = Users.findOneById(userId, {
+					fields: {
+						username: 1,
+					},
+				});
 
-		if (userId) {
-			user = Users.findOneById(userId, {
-				fields: {
-					username: 1,
-				},
-			});
+				if (!user || !user.username) {
+					throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+						method: 'canAccessRoom',
+					});
+				}
+			}
 
-			if (!user || !user.username) {
-				throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+			if (!rid) {
+				throw new Meteor.Error('error-invalid-room', 'Invalid room', {
 					method: 'canAccessRoom',
 				});
 			}
-		}
 
-		if (!rid) {
-			throw new Meteor.Error('error-invalid-room', 'Invalid room', {
-				method: 'canAccessRoom',
-			});
-		}
+			const room = Rooms.findOneById(rid);
 
-		const room = Rooms.findOneById(rid);
+			if (!room) {
+				throw new Meteor.Error('error-invalid-room', 'Invalid room', {
+					method: 'canAccessRoom',
+				});
+			}
 
-		if (!room) {
-			throw new Meteor.Error('error-invalid-room', 'Invalid room', {
-				method: 'canAccessRoom',
-			});
-		}
+			if (canAccessRoom.call(this, room, user, extraData)) {
+				if (user) {
+					room.username = user.username;
+				}
+				return room;
+			}
 
-		if (canAccessRoom.call(this, room, user, extraData)) {
-			if (user) {
-				room.username = user.username;
+			if (!userId && settings.get('Accounts_AllowAnonymousRead') === false) {
+				throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+					method: 'canAccessRoom',
+				});
 			}
-			return room;
-		}
-
-		if (!userId && settings.get('Accounts_AllowAnonymousRead') === false) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
-				method: 'canAccessRoom',
-			});
-		}
-
-		return false;
-	},
-});
+
+			return false;
+		},
+	});
+}
diff --git a/server/methods/getUsersOfRoom.js b/server/methods/getUsersOfRoom.js
index d17d91013cb6..7a97eb194ee3 100644
--- a/server/methods/getUsersOfRoom.js
+++ b/server/methods/getUsersOfRoom.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Subscriptions } from '../../app/models/server';
-import { hasPermission } from '../../app/authorization/server';
+import { Subscriptions, Rooms } from '../../app/models/server';
+import { canAccessRoom, hasPermission } from '../../app/authorization/server';
 import { findUsersOfRoom } from '../lib/findUsersOfRoom';
 
 Meteor.methods({
@@ -11,11 +11,19 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'getUsersOfRoom' });
 		}
 
-		const room = Meteor.call('canAccessRoom', rid, userId);
-		if (!room) {
+		if (!rid) {
 			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'getUsersOfRoom' });
 		}
 
+		const room = Rooms.findOneById(rid, { fields: { broadcast: 1 } });
+		if (!room) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'getUsersOfRoom' });
+		}
+
+		if (!canAccessRoom(room, { _id: userId })) {
+			throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'getUsersOfRoom' });
+		}
+
 		if (room.broadcast && !hasPermission(userId, 'view-broadcast-member-list', rid)) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'getUsersOfRoom' });
 		}
diff --git a/server/methods/loadHistory.js b/server/methods/loadHistory.js
index 9302a8209f22..55096be4df9f 100644
--- a/server/methods/loadHistory.js
+++ b/server/methods/loadHistory.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { Subscriptions } from '../../app/models';
-import { hasPermission } from '../../app/authorization';
-import { settings } from '../../app/settings';
+import { Subscriptions, Rooms } from '../../app/models/server';
+import { canAccessRoom, hasPermission } from '../../app/authorization/server';
+import { settings } from '../../app/settings/server';
 import { loadMessageHistory } from '../../app/lib/server';
 
 Meteor.methods({
@@ -17,7 +17,15 @@ Meteor.methods({
 		}
 
 		const fromId = Meteor.userId();
-		const room = Meteor.call('canAccessRoom', rid, fromId);
+
+		const room = Rooms.findOneById(rid, { fields: { t: 1 } });
+		if (!room) {
+			return false;
+		}
+
+		if (!canAccessRoom(room, { _id: fromId })) {
+			return false;
+		}
 
 		if (!room) {
 			return false;
diff --git a/server/methods/loadMissedMessages.js b/server/methods/loadMissedMessages.js
index bad55e3f5bf3..1c94d33c3cad 100644
--- a/server/methods/loadMissedMessages.js
+++ b/server/methods/loadMissedMessages.js
@@ -1,8 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { Messages } from '../../app/models';
-import { settings } from '../../app/settings';
+import { canAccessRoom } from '../../app/authorization/server';
+import { Messages } from '../../app/models/server';
+import { settings } from '../../app/settings/server';
 
 Meteor.methods({
 	loadMissedMessages(rid, start) {
@@ -10,7 +11,12 @@ Meteor.methods({
 		check(start, Date);
 
 		const fromId = Meteor.userId();
-		if (!Meteor.call('canAccessRoom', rid, fromId)) {
+
+		if (!rid) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'getUsersOfRoom' });
+		}
+
+		if (!canAccessRoom({ _id: rid }, { _id: fromId })) {
 			return false;
 		}
 
diff --git a/server/methods/loadNextMessages.js b/server/methods/loadNextMessages.js
index 7136447873e4..bc7589eae118 100644
--- a/server/methods/loadNextMessages.js
+++ b/server/methods/loadNextMessages.js
@@ -1,8 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { Messages } from '../../app/models';
-import { settings } from '../../app/settings';
+import { canAccessRoom } from '../../app/authorization/server';
+import { Messages } from '../../app/models/server';
+import { settings } from '../../app/settings/server';
 import { normalizeMessagesForUser } from '../../app/utils/server/lib/normalizeMessagesForUser';
 
 Meteor.methods({
@@ -16,9 +17,13 @@ Meteor.methods({
 			});
 		}
 
+		if (!rid) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'loadNextMessages' });
+		}
+
 		const fromId = Meteor.userId();
 
-		if (!Meteor.call('canAccessRoom', rid, fromId)) {
+		if (!canAccessRoom({ _id: rid }, { _id: fromId })) {
 			return false;
 		}
 
diff --git a/server/methods/loadSurroundingMessages.js b/server/methods/loadSurroundingMessages.js
index 180f9f4b3e16..c784c8350909 100644
--- a/server/methods/loadSurroundingMessages.js
+++ b/server/methods/loadSurroundingMessages.js
@@ -1,8 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { Messages } from '../../app/models';
-import { settings } from '../../app/settings';
+import { canAccessRoom } from '../../app/authorization/server';
+import { Messages } from '../../app/models/server';
+import { settings } from '../../app/settings/server';
 import { normalizeMessagesForUser } from '../../app/utils/server/lib/normalizeMessagesForUser';
 
 Meteor.methods({
@@ -28,7 +29,7 @@ Meteor.methods({
 			return false;
 		}
 
-		if (!Meteor.call('canAccessRoom', message.rid, fromId)) {
+		if (!canAccessRoom({ _id: message.rid }, { _id: fromId })) {
 			return false;
 		}
 
diff --git a/server/methods/messageSearch.js b/server/methods/messageSearch.js
index d03bf00cb8af..72ed6a304eea 100644
--- a/server/methods/messageSearch.js
+++ b/server/methods/messageSearch.js
@@ -2,9 +2,10 @@ import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 
+import { canAccessRoom } from '../../app/authorization/server';
 import { Subscriptions } from '../../app/models/server';
 import { Messages } from '../../app/models/server/raw';
-import { settings } from '../../app/settings';
+import { settings } from '../../app/settings/server';
 import { readSecondaryPreferred } from '../database/readSecondaryPreferred';
 
 Meteor.methods({
@@ -30,8 +31,8 @@ Meteor.methods({
 
 		// Don't process anything else if the user can't access the room
 		if (rid) {
-			if (!Meteor.call('canAccessRoom', rid, currentUserId)) {
-				return result;
+			if (!canAccessRoom({ _id: rid }, { _id: currentUserId })) {
+				return false;
 			}
 		} else if (settings.get('Search.defaultProvider.GlobalSearchEnabled') !== true) {
 			return result;
diff --git a/server/publications/messages.js b/server/publications/messages.js
index 6b2f1af649c3..8ff0aa462211 100644
--- a/server/publications/messages.js
+++ b/server/publications/messages.js
@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { Messages } from '../../app/models';
+import { canAccessRoom } from '../../app/authorization/server';
+import { Messages } from '../../app/models/server';
 
 Meteor.methods({
 	'messages/get'(rid, { lastUpdate, latestDate = new Date(), oldestDate, inclusive = false, count = 20, unreads = false }) {
@@ -15,7 +16,11 @@ Meteor.methods({
 			});
 		}
 
-		if (!Meteor.call('canAccessRoom', rid, fromId)) {
+		if (!rid) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'messages/get' });
+		}
+
+		if (!canAccessRoom({ _id: rid }, { _id: fromId })) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
 				method: 'messages/get',
 			});
diff --git a/server/publications/room/index.js b/server/publications/room/index.js
index b31c33610e26..1756623ba73f 100644
--- a/server/publications/room/index.js
+++ b/server/publications/room/index.js
@@ -1,10 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
-import { roomTypes } from '../../../app/utils';
-import { hasPermission } from '../../../app/authorization';
-import { Rooms } from '../../../app/models';
-import { settings } from '../../../app/settings';
+import { roomTypes } from '../../../app/utils/server';
+import { canAccessRoom, hasPermission } from '../../../app/authorization/server';
+import { Rooms } from '../../../app/models/server';
+import { settings } from '../../../app/settings/server';
 import { roomFields } from '../../modules/watchers/publishFields';
 
 const roomMap = (record) => {
@@ -51,7 +51,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'getRoomByTypeAndName' });
 		}
 
-		if (!Meteor.call('canAccessRoom', room._id, userId)) {
+		if (!canAccessRoom(room, { _id: userId })) {
 			throw new Meteor.Error('error-no-permission', 'No permission', { method: 'getRoomByTypeAndName' });
 		}
 
diff --git a/tests/end-to-end/api/05-chat.js b/tests/end-to-end/api/05-chat.js
index d63bd228aa73..84941df7bae7 100644
--- a/tests/end-to-end/api/05-chat.js
+++ b/tests/end-to-end/api/05-chat.js
@@ -750,7 +750,7 @@ describe('[Chat]', function() {
 								.to.have.string('<iframe style="max-width: 100%;width:400px;height:225px"');
 						})
 						.end(done);
-				}, 500);
+				}, 1000);
 			});
 
 			it('should embed an image preview if message has an image url', (done) => {
@@ -1055,20 +1055,21 @@ describe('[Chat]', function() {
 	});
 
 	describe('/chat.search', () => {
-		beforeEach((done) => {
-			const sendMessage = (text) => {
-				request.post(api('chat.sendMessage'))
-					.set(credentials)
-					.send({
-						message: {
-							rid: 'GENERAL',
-							msg: text,
-						},
-					})
-					.end(() => {});
-			};
-			for (let i = 0; i < 5; i++) { sendMessage('msg1'); }
-			done();
+		before(async () => {
+			const sendMessage = (text) => request.post(api('chat.sendMessage'))
+				.set(credentials)
+				.send({
+					message: {
+						rid: 'GENERAL',
+						msg: text,
+					},
+				});
+
+			await sendMessage('msg1');
+			await sendMessage('msg1');
+			await sendMessage('msg1');
+			await sendMessage('msg1');
+			await sendMessage('msg1');
 		});
 
 		it('should return a list of messages when execute successfully', (done) => {
diff --git a/tests/end-to-end/api/24-methods.js b/tests/end-to-end/api/24-methods.js
index 7de9af60f823..c07218e7f82d 100644
--- a/tests/end-to-end/api/24-methods.js
+++ b/tests/end-to-end/api/24-methods.js
@@ -710,8 +710,7 @@ describe('Meteor.methods', function() {
 
 					const data = JSON.parse(res.body.message);
 					expect(data).to.have.a.property('error').that.is.an('object');
-					expect(data.error).to.have.a.property('sanitizedError');
-					expect(data.error.sanitizedError).to.have.property('error', 400);
+					expect(data.error).to.have.a.property('error', 'error-invalid-room');
 				})
 				.end(done);
 		});

From 2291b80cda76125b40454ac951ca59ce8ed7d728 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Mon, 8 Nov 2021 14:57:56 -0300
Subject: [PATCH 06/14] [FIX] Performance issues when running Omnichannel job
 queue dispatcher (#23661)

* Fix Omnichannel job queue dispatcher.

* Keep settings validation.

* Remove console.log.

* Review requests.

* Fix default setting value.
---
 app/livechat/server/lib/Helper.js             |  6 ++--
 app/livechat/server/lib/QueueManager.js       |  2 +-
 app/models/server/models/LivechatInquiry.js   | 16 +++++++---
 app/models/server/models/LivechatRooms.js     |  6 ++--
 app/models/server/raw/Rooms.js                |  4 +--
 app/ui-sidenav/client/roomList.js             |  5 +++
 .../directory/chats/contextualBar/ChatInfo.js |  8 +++--
 .../chats/contextualBar/ChatInfoDirectory.js  |  8 +++--
 definition/IRoom.ts                           |  1 +
 .../server/hooks/afterTakeInquiry.js          |  2 +-
 .../server/hooks/beforeRoutingChat.js         | 10 +++---
 .../server/hooks/onAgentAssignmentFailed.ts   |  3 +-
 .../server/hooks/onCloseLivechat.js           |  6 +---
 .../livechat-enterprise/server/lib/Helper.js  | 18 ++++++++---
 .../server/lib/LivechatEnterprise.js          | 11 +++++--
 ee/app/livechat-enterprise/server/settings.ts | 31 +++++++++++++++++++
 packages/rocketchat-i18n/i18n/en.i18n.json    |  5 ++-
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  5 ++-
 server/modules/watchers/publishFields.ts      |  1 +
 19 files changed, 108 insertions(+), 40 deletions(-)

diff --git a/app/livechat/server/lib/Helper.js b/app/livechat/server/lib/Helper.js
index fb42f3949724..4ed3a225136e 100644
--- a/app/livechat/server/lib/Helper.js
+++ b/app/livechat/server/lib/Helper.js
@@ -40,6 +40,7 @@ export const createLivechatRoom = (rid, name, guest, roomInfo = {}, extraData =
 
 	const extraRoomInfo = callbacks.run('livechat.beforeRoom', roomInfo, extraData);
 	const { _id, username, token, department: departmentId, status = 'online' } = guest;
+	const newRoomAt = new Date();
 
 	logger.debug(`Creating livechat room for visitor ${ _id }`);
 
@@ -47,10 +48,10 @@ export const createLivechatRoom = (rid, name, guest, roomInfo = {}, extraData =
 		_id: rid,
 		msgs: 0,
 		usersCount: 1,
-		lm: new Date(),
+		lm: newRoomAt,
 		fname: name,
 		t: 'l',
-		ts: new Date(),
+		ts: newRoomAt,
 		departmentId,
 		v: {
 			_id,
@@ -67,6 +68,7 @@ export const createLivechatRoom = (rid, name, guest, roomInfo = {}, extraData =
 			type: OmnichannelSourceType.OTHER,
 			alias: 'unknown',
 		},
+		queuedAt: newRoomAt,
 	}, extraRoomInfo);
 
 	const roomId = Rooms.insert(room);
diff --git a/app/livechat/server/lib/QueueManager.js b/app/livechat/server/lib/QueueManager.js
index c3a10ebb5bc4..711aa84351f9 100644
--- a/app/livechat/server/lib/QueueManager.js
+++ b/app/livechat/server/lib/QueueManager.js
@@ -7,7 +7,7 @@ import { callbacks } from '../../../callbacks/server';
 import { Logger } from '../../../logger';
 import { RoutingManager } from './RoutingManager';
 
-const logger = new Logger('QueueMananger');
+const logger = new Logger('QueueManager');
 
 export const saveQueueInquiry = (inquiry) => {
 	LivechatInquiry.queueInquiry(inquiry._id);
diff --git a/app/models/server/models/LivechatInquiry.js b/app/models/server/models/LivechatInquiry.js
index a4d4ec356607..1994e5056cef 100644
--- a/app/models/server/models/LivechatInquiry.js
+++ b/app/models/server/models/LivechatInquiry.js
@@ -48,7 +48,7 @@ export class LivechatInquiry extends Base {
 		this.update({
 			_id: inquiryId,
 		}, {
-			$set: { status: 'taken' },
+			$set: { status: 'taken', takenAt: new Date() },
 			$unset: { defaultAgent: 1, estimatedInactivityCloseTimeAt: 1 },
 		});
 	}
@@ -71,9 +71,17 @@ export class LivechatInquiry extends Base {
 		return this.update({
 			_id: inquiryId,
 		}, {
-			$set: {
-				status: 'queued',
-			},
+			$set: { status: 'queued', queuedAt: new Date() },
+			$unset: { takenAt: 1 },
+		});
+	}
+
+	queueInquiryAndRemoveDefaultAgent(inquiryId) {
+		return this.update({
+			_id: inquiryId,
+		}, {
+			$set: { status: 'queued', queuedAt: new Date() },
+			$unset: { takenAt: 1, defaultAgent: 1 },
 		});
 	}
 
diff --git a/app/models/server/models/LivechatRooms.js b/app/models/server/models/LivechatRooms.js
index dc73c211a2c1..994733ad8bc7 100644
--- a/app/models/server/models/LivechatRooms.js
+++ b/app/models/server/models/LivechatRooms.js
@@ -20,6 +20,7 @@ export class LivechatRooms extends Base {
 		this.tryEnsureIndex({ 'v.token': 1 }, { sparse: true });
 		this.tryEnsureIndex({ 'v.token': 1, 'email.thread': 1 }, { sparse: true });
 		this.tryEnsureIndex({ 'v._id': 1 }, { sparse: true });
+		this.tryEnsureIndex({ t: 1, departmentId: 1, closedAt: 1 }, { partialFilterExpression: { closedAt: { $exists: true } } });
 	}
 
 	findLivechat(filter = {}, offset = 0, limit = 20) {
@@ -719,9 +720,8 @@ export class LivechatRooms extends Base {
 			t: 'l',
 		};
 		const update = {
-			$unset: {
-				servedBy: 1,
-			},
+			$set: { queuedAt: new Date() },
+			$unset: { servedBy: 1 },
 		};
 
 		this.update(query, update);
diff --git a/app/models/server/raw/Rooms.js b/app/models/server/raw/Rooms.js
index 600d55c1fffa..0da61636ef86 100644
--- a/app/models/server/raw/Rooms.js
+++ b/app/models/server/raw/Rooms.js
@@ -27,10 +27,8 @@ export class RoomsRaw extends BaseRaw {
 			{
 				$match: {
 					t: 'l',
-					closedAt: { $exists: true },
-					metrics: { $exists: true },
-					'metrics.chatDuration': { $exists: true },
 					...department && { departmentId: department },
+					closedAt: { $exists: true },
 				},
 			},
 			{ $sort: { closedAt: -1 } },
diff --git a/app/ui-sidenav/client/roomList.js b/app/ui-sidenav/client/roomList.js
index de128304d349..cab1983ad98d 100644
--- a/app/ui-sidenav/client/roomList.js
+++ b/app/ui-sidenav/client/roomList.js
@@ -172,6 +172,7 @@ const mergeSubRoom = (subscription) => {
 			livechatData: 1,
 			departmentId: 1,
 			source: 1,
+			queuedAt: 1,
 		},
 	};
 
@@ -212,6 +213,7 @@ const mergeSubRoom = (subscription) => {
 		departmentId,
 		ts,
 		source,
+		queuedAt,
 	} = room;
 
 	subscription.lm = subscription.lr ? new Date(Math.max(subscription.lr, lastRoomUpdate)) : lastRoomUpdate;
@@ -249,6 +251,7 @@ const mergeSubRoom = (subscription) => {
 		departmentId,
 		ts,
 		source,
+		queuedAt,
 	});
 };
 
@@ -291,6 +294,7 @@ const mergeRoomSub = (room) => {
 		departmentId,
 		ts,
 		source,
+		queuedAt,
 	} = room;
 
 	Subscriptions.update({
@@ -328,6 +332,7 @@ const mergeRoomSub = (room) => {
 			jitsiTimeout,
 			ts,
 			source,
+			queuedAt,
 			...getLowerCaseNames(room, sub.name, sub.fname),
 		},
 	});
diff --git a/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.js b/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.js
index 6ded84b119d2..5f1cb3015d9d 100644
--- a/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.js
+++ b/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.js
@@ -50,6 +50,7 @@ function ChatInfo({ id, route }) {
 		priorityId,
 		livechatData,
 		source,
+		queuedAt,
 	} = room || { room: { v: {} } };
 
 	const routePath = useRoute(route || 'omnichannel-directory');
@@ -58,6 +59,7 @@ function ChatInfo({ id, route }) {
 	const hasGlobalEditRoomPermission = hasPermission('save-others-livechat-room-info');
 	const hasLocalEditRoomPermission = servedBy?._id === Meteor.userId();
 	const visitorId = v?._id;
+	const queueStartedAt = queuedAt || ts;
 
 	const dispatchToastMessage = useToastMessageDispatch();
 	useEffect(() => {
@@ -126,13 +128,13 @@ function ChatInfo({ id, route }) {
 							<Info>{topic}</Info>
 						</Field>
 					)}
-					{ts && (
+					{queueStartedAt && (
 						<Field>
 							<Label>{t('Queue_Time')}</Label>
 							{servedBy ? (
-								<Info>{moment(servedBy.ts).from(moment(ts), true)}</Info>
+								<Info>{moment(servedBy.ts).from(moment(queueStartedAt), true)}</Info>
 							) : (
-								<Info>{moment(ts).fromNow(true)}</Info>
+								<Info>{moment(queueStartedAt).fromNow(true)}</Info>
 							)}
 						</Field>
 					)}
diff --git a/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.js b/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.js
index 8e62089de68d..12823d186cc3 100644
--- a/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.js
+++ b/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.js
@@ -45,6 +45,7 @@ function ChatInfoDirectory({ id, route, room }) {
 		responseBy,
 		priorityId,
 		livechatData,
+		queuedAt,
 	} = room || { room: { v: {} } };
 
 	const routePath = useRoute(route || 'omnichannel-directory');
@@ -53,6 +54,7 @@ function ChatInfoDirectory({ id, route, room }) {
 	const hasGlobalEditRoomPermission = hasPermission('save-others-livechat-room-info');
 	const hasLocalEditRoomPermission = servedBy?._id === Meteor.userId();
 	const visitorId = v?._id;
+	const queueStartedAt = queuedAt || ts;
 
 	const dispatchToastMessage = useToastMessageDispatch();
 	useEffect(() => {
@@ -120,13 +122,13 @@ function ChatInfoDirectory({ id, route, room }) {
 							<Info>{topic}</Info>
 						</Field>
 					)}
-					{ts && (
+					{queueStartedAt && (
 						<Field>
 							<Label>{t('Queue_Time')}</Label>
 							{servedBy ? (
-								<Info>{moment(servedBy.ts).from(moment(ts), true)}</Info>
+								<Info>{moment(servedBy.ts).from(moment(queueStartedAt), true)}</Info>
 							) : (
-								<Info>{moment(ts).fromNow(true)}</Info>
+								<Info>{moment(queueStartedAt).fromNow(true)}</Info>
 							)}
 						</Field>
 					)}
diff --git a/definition/IRoom.ts b/definition/IRoom.ts
index 622844ef2783..62d68e97de2c 100644
--- a/definition/IRoom.ts
+++ b/definition/IRoom.ts
@@ -120,6 +120,7 @@ export interface IOmnichannelRoom extends Omit<IRoom, 'default' | 'featured' | '
 	responseBy: any;
 	priorityId: any;
 	livechatData: any;
+	queuedAt?: Date;
 }
 
 export const isOmnichannelRoom = (room: IRoom): room is IOmnichannelRoom & IRoom => room.t === 'l';
diff --git a/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js b/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
index 424f3840a834..60f407f28c2e 100644
--- a/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
+++ b/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
@@ -17,6 +17,6 @@ callbacks.add('livechat.afterTakeInquiry', async (inquiry) => {
 	const { department } = inquiry;
 	debouncedDispatchWaitingQueueStatus(department);
 
-	cbLogger.debug(`Statuses for queue ${ department || 'Public' } updated succesfully`);
+	cbLogger.debug(`Statuses for queue ${ department || 'Public' } updated successfully`);
 	return inquiry;
 }, callbacks.priority.MEDIUM, 'livechat-after-take-inquiry');
diff --git a/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js b/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
index 61bbd6261be7..671251f7e035 100644
--- a/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
+++ b/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
@@ -31,11 +31,13 @@ callbacks.add('livechat.beforeRouteChat', async (inquiry, agent) => {
 
 	saveQueueInquiry(inquiry);
 
-	const [inq] = await LivechatInquiry.getCurrentSortedQueueAsync({ _id, department });
-	if (inq) {
-		dispatchInquiryPosition(inq);
+	if (settings.get('Omnichannel_calculate_dispatch_service_queue_statistics')) {
+		const [inq] = await LivechatInquiry.getCurrentSortedQueueAsync({ _id, department });
+		if (inq) {
+			dispatchInquiryPosition(inq);
+			cbLogger.debug(`Callback success. Inquiry ${ _id } position has been notified`);
+		}
 	}
 
-	cbLogger.debug(`Callback success. Inquiry ${ _id } position has been notified`);
 	return LivechatInquiry.findOneById(_id);
 }, callbacks.priority.HIGH, 'livechat-before-routing-chat');
diff --git a/ee/app/livechat-enterprise/server/hooks/onAgentAssignmentFailed.ts b/ee/app/livechat-enterprise/server/hooks/onAgentAssignmentFailed.ts
index f8ebf12e436d..b59b31f01215 100644
--- a/ee/app/livechat-enterprise/server/hooks/onAgentAssignmentFailed.ts
+++ b/ee/app/livechat-enterprise/server/hooks/onAgentAssignmentFailed.ts
@@ -16,8 +16,7 @@ const handleOnAgentAssignmentFailed = async ({ inquiry, room, options }: { inqui
 		const { _id: roomId } = room;
 
 		const { _id: inquiryId } = inquiry;
-		LivechatInquiry.queueInquiry(inquiryId);
-		LivechatInquiry.removeDefaultAgentById(inquiryId);
+		LivechatInquiry.queueInquiryAndRemoveDefaultAgent(inquiryId);
 		LivechatRooms.removeAgentByRoomId(roomId);
 		Subscriptions.removeByRoomId(roomId);
 		dispatchAgentDelegated(roomId, null);
diff --git a/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js b/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
index eb52f3ed9752..2bf0ff792be7 100644
--- a/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
+++ b/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
@@ -1,7 +1,6 @@
 import { callbacks } from '../../../../../app/callbacks';
 import { settings } from '../../../../../app/settings/server';
 import { debouncedDispatchWaitingQueueStatus } from '../lib/Helper';
-import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
 import { LivechatEnterprise } from '../lib/LivechatEnterprise';
 
 const onCloseLivechat = (room) => {
@@ -12,10 +11,7 @@ const onCloseLivechat = (room) => {
 	}
 
 	const { departmentId } = room || {};
-	if (!RoutingManager.getConfig().autoAssignAgent) {
-		debouncedDispatchWaitingQueueStatus(departmentId);
-		return room;
-	}
+	debouncedDispatchWaitingQueueStatus(departmentId);
 
 	return room;
 };
diff --git a/ee/app/livechat-enterprise/server/lib/Helper.js b/ee/app/livechat-enterprise/server/lib/Helper.js
index 59e3425657ba..c4f14c440547 100644
--- a/ee/app/livechat-enterprise/server/lib/Helper.js
+++ b/ee/app/livechat-enterprise/server/lib/Helper.js
@@ -95,8 +95,17 @@ export const dispatchInquiryPosition = async (inquiry, queueInfo) => {
 };
 
 export const dispatchWaitingQueueStatus = async (department) => {
+	if (!settings.get('Livechat_waiting_queue') && !settings.get('Omnichannel_calculate_dispatch_service_queue_statistics')) {
+		return;
+	}
+
 	helperLogger.debug(`Updating statuses for queue ${ department || 'Public' }`);
 	const queue = await LivechatInquiry.getCurrentSortedQueueAsync({ department });
+
+	if (!queue.length) {
+		return;
+	}
+
 	const queueInfo = await getQueueInfo(department);
 	queue.forEach((inquiry) => {
 		dispatchInquiryPosition(inquiry, queueInfo);
@@ -126,14 +135,11 @@ export const processWaitingQueue = async (department) => {
 
 	if (room && room.servedBy) {
 		const { _id: rid, servedBy: { _id: agentId } } = room;
-		helperLogger.debug(`Inquiry ${ inquiry._id } taken succesfully by agent ${ agentId }. Notifying`);
+		helperLogger.debug(`Inquiry ${ inquiry._id } taken successfully by agent ${ agentId }. Notifying`);
 		return setTimeout(() => {
 			propagateAgentDelegated(rid, agentId);
 		}, 1000);
 	}
-
-	const { departmentId } = room || {};
-	await debouncedDispatchWaitingQueueStatus(departmentId);
 };
 
 export const setPredictedVisitorAbandonmentTime = (room) => {
@@ -254,6 +260,10 @@ export const getLivechatQueueInfo = async (room) => {
 		return null;
 	}
 
+	if (!settings.get('Omnichannel_calculate_dispatch_service_queue_statistics')) {
+		return null;
+	}
+
 	const { _id: rid, departmentId: department } = room;
 	const inquiry = LivechatInquiry.findOneByRoomId(rid, { fields: { _id: 1, status: 1 } });
 	if (!inquiry) {
diff --git a/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js b/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js
index 0109eceb75fd..0646bced25c9 100644
--- a/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js
+++ b/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js
@@ -199,7 +199,8 @@ export const LivechatEnterprise = {
 	},
 };
 
-const RACE_TIMEOUT = 1000;
+const DEFAULT_RACE_TIMEOUT = 5000;
+let queueDelayTimeout = DEFAULT_RACE_TIMEOUT;
 
 const queueWorker = {
 	running: false,
@@ -242,9 +243,9 @@ const queueWorker = {
 		}
 
 		const queue = await this.nextQueue();
-		queueLogger.debug(`Executing queue ${ queue || 'Public' } with timeout of ${ RACE_TIMEOUT }`);
+		queueLogger.debug(`Executing queue ${ queue || 'Public' } with timeout of ${ queueDelayTimeout }`);
 
-		setTimeout(this.checkQueue.bind(this, queue), RACE_TIMEOUT);
+		setTimeout(this.checkQueue.bind(this, queue), queueDelayTimeout);
 	},
 
 	async checkQueue(queue) {
@@ -292,3 +293,7 @@ settings.watch('Livechat_enabled', (enabled) => {
 	omnichannelIsEnabled = enabled;
 	omnichannelIsEnabled && RoutingManager.isMethodSet() ? shouldQueueStart() : queueWorker.stop();
 });
+
+settings.watch('Omnichannel_queue_delay_timeout', (timeout) => {
+	queueDelayTimeout = timeout < 1 ? DEFAULT_RACE_TIMEOUT : timeout * 1000;
+});
diff --git a/ee/app/livechat-enterprise/server/settings.ts b/ee/app/livechat-enterprise/server/settings.ts
index d3dc3be24135..80c5f53e5ef2 100644
--- a/ee/app/livechat-enterprise/server/settings.ts
+++ b/ee/app/livechat-enterprise/server/settings.ts
@@ -113,6 +113,37 @@ export const createSettings = (): void => {
 				],
 			});
 
+			this.add('Omnichannel_calculate_dispatch_service_queue_statistics', true, {
+				type: 'boolean',
+				group: 'Omnichannel',
+				section: 'Queue_management',
+				i18nLabel: 'Omnichannel_calculate_dispatch_service_queue_statistics',
+				enableQuery: [{ _id: 'Livechat_waiting_queue', value: true }, omnichannelEnabledQuery],
+				enterprise: true,
+				invalidValue: false,
+				modules: [
+					'livechat-enterprise',
+				],
+			});
+
+			this.add('Omnichannel_queue_delay_timeout', 5, {
+				type: 'int',
+				group: 'Omnichannel',
+				section: 'Queue_management',
+				i18nLabel: 'Queue_delay_timeout',
+				i18nDescription: 'Time_in_seconds',
+				enableQuery: [
+					{ _id: 'Livechat_waiting_queue', value: true },
+					{ _id: 'Livechat_Routing_Method', value: { $ne: 'Manual_Selection' } },
+					omnichannelEnabledQuery,
+				],
+				enterprise: true,
+				invalidValue: 5,
+				modules: [
+					'livechat-enterprise',
+				],
+			});
+
 			this.add('Livechat_number_most_recent_chats_estimate_wait_time', 100, {
 				type: 'int',
 				group: 'Omnichannel',
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 508401519776..3e16b0be3cb6 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3176,6 +3176,8 @@
   "Omnichannel": "Omnichannel",
   "Omnichannel_Directory": "Omnichannel Directory",
   "Omnichannel_appearance": "Omnichannel Appearance",
+  "Omnichannel_calculate_dispatch_service_queue_statistics": "Calculate and dispatch Omnichannel waiting queue statistics",
+  "Omnichannel_calculate_dispatch_service_queue_statistics_Description": "Processing and dispatching waiting queue statistics such as position and estimated waiting time. If *Livechat channel* is not in use, it is recommended to disable this setting and prevent the server from doing unnecessary processes.",
   "Omnichannel_Contact_Center": "Omnichannel Contact Center",
   "Omnichannel_contact_manager_routing": "Assign new conversations to the contact manager",
   "Omnichannel_contact_manager_routing_Description": "This setting allocates a chat to the assigned Contact Manager, as long as the Contact Manager is online when the chat starts",
@@ -3403,6 +3405,7 @@
   "Query_description": "Additional conditions for determining which users to send the email to. Unsubscribed users are automatically removed from the query. It must be a valid JSON. Example: \"{\"createdAt\":{\"$gt\":{\"$date\": \"2015-01-01T00:00:00.000Z\"}}}\"",
   "Query_is_not_valid_JSON": "Query is not valid JSON",
   "Queue": "Queue",
+  "Queue_delay_timeout": "Queue processing delay timeout",
   "Queue_Time": "Queue Time",
   "Queue_management": "Queue Management",
   "quote": "quote",
@@ -4728,4 +4731,4 @@
   "Your_temporary_password_is_password": "Your temporary password is <strong>[password]</strong>.",
   "Your_TOTP_has_been_reset": "Your Two Factor TOTP has been reset.",
   "Your_workspace_is_ready": "Your workspace is ready to use 🎉"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index cbedd37797ae..69e66f6ea937 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -3171,6 +3171,8 @@
   "Omnichannel": "Omnichannel",
   "Omnichannel_Directory": "Diretório Omnichannel",
   "Omnichannel_appearance": "Aparência do Omnichannel",
+  "Omnichannel_calculate_dispatch_service_queue_statistics": "Calcular e propagar dados estatísticos da fila de espera Omnichannel",
+  "Omnichannel_calculate_dispatch_service_queue_statistics_Description": "Proessamento de dados estatísticos da fila de espera Omnichannel como as posição e tempo estimado de espera na fila. Se o *canal Livechat* não estiver em uso, é recomendável desabilitar essa configuração e evitar que o servidor execute processos desnecessários.",
   "Omnichannel_Contact_Center": "Central de Contatos Omnichannel",
   "Omnichannel_contact_manager_routing": "Atribuir novas conversas para o Gerente do Contato",
   "Omnichannel_contact_manager_routing_Description": "Aloca novos chats para o Gerente do Contato(quando atribuído), desde que o Gerente do Contato esteja online quando a conversa é iniciado",
@@ -3397,6 +3399,7 @@
   "Query_description": "Condições adicionais para determinar para quais usuários enviar e-mail. Usuários não inscritos são automaticamente removidos a partir da consulta. Deve ser um JSON válido. Exemplo: `{\"createdAt\": {\"$gt\": {\"$date\": \"2015-01-01T00: 00: 00.000Z\"}}}`",
   "Query_is_not_valid_JSON": "Query não é um JSON válido",
   "Queue": "Fila",
+  "Queue_delay_timeout": "Tempo limite de atraso para processamento da fila",
   "Queue_Time": "Tempo na fila",
   "Queue_management": "Gerenciamento de Fila",
   "quote": "citação",
@@ -4722,4 +4725,4 @@
   "Your_temporary_password_is_password": "Sua senha temporária é <strong>[password]</strong>.",
   "Your_TOTP_has_been_reset": "Seu TOTP de dois fatores foi redefinido.",
   "Your_workspace_is_ready": "O seu espaço de trabalho está pronto para usar 🎉"
-}
\ No newline at end of file
+}
diff --git a/server/modules/watchers/publishFields.ts b/server/modules/watchers/publishFields.ts
index 10427adf4853..0e6aa92ab555 100644
--- a/server/modules/watchers/publishFields.ts
+++ b/server/modules/watchers/publishFields.ts
@@ -100,6 +100,7 @@ export const roomFields = {
 	metrics: 1,
 	ts: 1,
 	waitingResponse: 1,
+	queuedAt: 1,
 
 	// fields used by DMs
 	usernames: 1,

From 55fafd0eb38357f78de6e719ff6ed9b6edb7113a Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kevin.aleman@rocket.chat>
Date: Mon, 8 Nov 2021 15:07:02 -0600
Subject: [PATCH 07/14] [FIX] Omnichannel status being changed on page refresh
 (#23587)

* fix omnichannel status being changed on page refresh

* rename key missing

* Remove duplicated function from models
---
 app/livechat/server/business-hour/AbstractBusinessHour.ts | 2 +-
 app/livechat/server/lib/Livechat.js                       | 7 +++++++
 app/livechat/server/startup.js                            | 2 +-
 app/models/server/models/Users.js                         | 1 +
 app/models/server/raw/Users.js                            | 4 +++-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/livechat/server/business-hour/AbstractBusinessHour.ts b/app/livechat/server/business-hour/AbstractBusinessHour.ts
index 3b564b2c4499..01768b5240d0 100644
--- a/app/livechat/server/business-hour/AbstractBusinessHour.ts
+++ b/app/livechat/server/business-hour/AbstractBusinessHour.ts
@@ -47,7 +47,7 @@ export abstract class AbstractBusinessHourBehavior {
 	}
 
 	async changeAgentActiveStatus(agentId: string, status: string): Promise<any> {
-		return this.UsersRepository.setLivechatStatus(agentId, status);
+		return this.UsersRepository.setLivechatStatusIf(agentId, status, { livechatStatusSystemModified: true }, { livechatStatusSystemModified: true });
 	}
 }
 
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index e7145d7def0d..aa2f93eb698d 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -40,6 +40,7 @@ import { normalizeTransferredByData, parseAgentCustomFields, updateDepartmentAge
 import { Apps, AppEvents } from '../../../apps/server';
 import { businessHourManager } from '../business-hour';
 import notifications from '../../../notifications/server/lib/Notifications';
+import { Users as UsersRaw } from '../../../models/server/raw';
 
 const logger = new Logger('Livechat');
 
@@ -886,6 +887,12 @@ export const Livechat = {
 		return user;
 	},
 
+	setUserStatusLivechatIf(userId, status, condition, fields) {
+		const user = Promise.await(UsersRaw.setLivechatStatusIf(userId, status, condition, fields));
+		callbacks.runAsync('livechat.setUserStatusLivechat', { userId, status });
+		return user;
+	},
+
 	cleanGuestHistory(_id) {
 		const guest = LivechatVisitors.findOneById(_id);
 		if (!guest) {
diff --git a/app/livechat/server/startup.js b/app/livechat/server/startup.js
index 50b9bd3dc0ec..729eb4f92979 100644
--- a/app/livechat/server/startup.js
+++ b/app/livechat/server/startup.js
@@ -62,5 +62,5 @@ Meteor.startup(async () => {
 		RoutingManager.setMethodNameAndStartQueue(value);
 	});
 
-	Accounts.onLogout(({ user }) => user?.roles?.includes('livechat-agent') && !user?.roles?.includes('bot') && Livechat.setUserStatusLivechat(user._id, 'not-available'));
+	Accounts.onLogout(({ user }) => user?.roles?.includes('livechat-agent') && !user?.roles?.includes('bot') && Livechat.setUserStatusLivechatIf(user._id, 'not-available', {}, { livechatStatusSystemModified: true }));
 });
diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index f74d4de0c90f..6b755bd01a02 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -262,6 +262,7 @@ export class Users extends Base {
 		const update = {
 			$set: {
 				statusLivechat: status,
+				livechatStatusSystemModified: false,
 			},
 		};
 
diff --git a/app/models/server/raw/Users.js b/app/models/server/raw/Users.js
index a021a91f25e6..6de2fb2f7e56 100644
--- a/app/models/server/raw/Users.js
+++ b/app/models/server/raw/Users.js
@@ -259,14 +259,16 @@ export class UsersRaw extends BaseRaw {
 		return result.value;
 	}
 
-	setLivechatStatus(userId, status) { // TODO: Create class Agent
+	setLivechatStatusIf(userId, status, conditions = {}, extraFields = {}) { // TODO: Create class Agent
 		const query = {
 			_id: userId,
+			...conditions,
 		};
 
 		const update = {
 			$set: {
 				statusLivechat: status,
+				...extraFields,
 			},
 		};
 

From 85619eadcc945c7603efa111c74290e069a7d271 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kevin.aleman@rocket.chat>
Date: Mon, 8 Nov 2021 15:07:02 -0600
Subject: [PATCH 08/14] [FIX] Omnichannel status being changed on page refresh
 (#23587)

* fix omnichannel status being changed on page refresh

* rename key missing

* Remove duplicated function from models
---
 app/livechat/server/business-hour/AbstractBusinessHour.ts | 2 +-
 app/livechat/server/lib/Livechat.js                       | 7 +++++++
 app/livechat/server/startup.js                            | 2 +-
 app/models/server/models/Users.js                         | 1 +
 app/models/server/raw/Users.js                            | 4 +++-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/livechat/server/business-hour/AbstractBusinessHour.ts b/app/livechat/server/business-hour/AbstractBusinessHour.ts
index 3b564b2c4499..01768b5240d0 100644
--- a/app/livechat/server/business-hour/AbstractBusinessHour.ts
+++ b/app/livechat/server/business-hour/AbstractBusinessHour.ts
@@ -47,7 +47,7 @@ export abstract class AbstractBusinessHourBehavior {
 	}
 
 	async changeAgentActiveStatus(agentId: string, status: string): Promise<any> {
-		return this.UsersRepository.setLivechatStatus(agentId, status);
+		return this.UsersRepository.setLivechatStatusIf(agentId, status, { livechatStatusSystemModified: true }, { livechatStatusSystemModified: true });
 	}
 }
 
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index e7145d7def0d..aa2f93eb698d 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -40,6 +40,7 @@ import { normalizeTransferredByData, parseAgentCustomFields, updateDepartmentAge
 import { Apps, AppEvents } from '../../../apps/server';
 import { businessHourManager } from '../business-hour';
 import notifications from '../../../notifications/server/lib/Notifications';
+import { Users as UsersRaw } from '../../../models/server/raw';
 
 const logger = new Logger('Livechat');
 
@@ -886,6 +887,12 @@ export const Livechat = {
 		return user;
 	},
 
+	setUserStatusLivechatIf(userId, status, condition, fields) {
+		const user = Promise.await(UsersRaw.setLivechatStatusIf(userId, status, condition, fields));
+		callbacks.runAsync('livechat.setUserStatusLivechat', { userId, status });
+		return user;
+	},
+
 	cleanGuestHistory(_id) {
 		const guest = LivechatVisitors.findOneById(_id);
 		if (!guest) {
diff --git a/app/livechat/server/startup.js b/app/livechat/server/startup.js
index 50b9bd3dc0ec..729eb4f92979 100644
--- a/app/livechat/server/startup.js
+++ b/app/livechat/server/startup.js
@@ -62,5 +62,5 @@ Meteor.startup(async () => {
 		RoutingManager.setMethodNameAndStartQueue(value);
 	});
 
-	Accounts.onLogout(({ user }) => user?.roles?.includes('livechat-agent') && !user?.roles?.includes('bot') && Livechat.setUserStatusLivechat(user._id, 'not-available'));
+	Accounts.onLogout(({ user }) => user?.roles?.includes('livechat-agent') && !user?.roles?.includes('bot') && Livechat.setUserStatusLivechatIf(user._id, 'not-available', {}, { livechatStatusSystemModified: true }));
 });
diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index f74d4de0c90f..6b755bd01a02 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -262,6 +262,7 @@ export class Users extends Base {
 		const update = {
 			$set: {
 				statusLivechat: status,
+				livechatStatusSystemModified: false,
 			},
 		};
 
diff --git a/app/models/server/raw/Users.js b/app/models/server/raw/Users.js
index a021a91f25e6..6de2fb2f7e56 100644
--- a/app/models/server/raw/Users.js
+++ b/app/models/server/raw/Users.js
@@ -259,14 +259,16 @@ export class UsersRaw extends BaseRaw {
 		return result.value;
 	}
 
-	setLivechatStatus(userId, status) { // TODO: Create class Agent
+	setLivechatStatusIf(userId, status, conditions = {}, extraFields = {}) { // TODO: Create class Agent
 		const query = {
 			_id: userId,
+			...conditions,
 		};
 
 		const update = {
 			$set: {
 				statusLivechat: status,
+				...extraFields,
 			},
 		};
 

From a6d40c6de8474379ae62c7c13ecb65e5f5fc787d Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Mon, 8 Nov 2021 14:57:56 -0300
Subject: [PATCH 09/14] [FIX] Performance issues when running Omnichannel job
 queue dispatcher (#23661)

* Fix Omnichannel job queue dispatcher.

* Keep settings validation.

* Remove console.log.

* Review requests.

* Fix default setting value.
---
 app/livechat/server/lib/Helper.js             |  6 ++--
 app/livechat/server/lib/QueueManager.js       |  2 +-
 app/models/server/models/LivechatInquiry.js   | 16 +++++++---
 app/models/server/models/LivechatRooms.js     |  6 ++--
 app/models/server/raw/Rooms.js                |  4 +--
 app/ui-sidenav/client/roomList.js             |  5 +++
 .../directory/chats/contextualBar/ChatInfo.js |  8 +++--
 .../chats/contextualBar/ChatInfoDirectory.js  |  8 +++--
 definition/IRoom.ts                           |  1 +
 .../server/hooks/afterTakeInquiry.js          |  2 +-
 .../server/hooks/beforeRoutingChat.js         | 10 +++---
 .../server/hooks/onAgentAssignmentFailed.ts   |  3 +-
 .../server/hooks/onCloseLivechat.js           |  6 +---
 .../livechat-enterprise/server/lib/Helper.js  | 18 ++++++++---
 .../server/lib/LivechatEnterprise.js          | 11 +++++--
 ee/app/livechat-enterprise/server/settings.ts | 31 +++++++++++++++++++
 packages/rocketchat-i18n/i18n/en.i18n.json    |  5 ++-
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  5 ++-
 server/modules/watchers/publishFields.ts      |  1 +
 19 files changed, 108 insertions(+), 40 deletions(-)

diff --git a/app/livechat/server/lib/Helper.js b/app/livechat/server/lib/Helper.js
index fb42f3949724..4ed3a225136e 100644
--- a/app/livechat/server/lib/Helper.js
+++ b/app/livechat/server/lib/Helper.js
@@ -40,6 +40,7 @@ export const createLivechatRoom = (rid, name, guest, roomInfo = {}, extraData =
 
 	const extraRoomInfo = callbacks.run('livechat.beforeRoom', roomInfo, extraData);
 	const { _id, username, token, department: departmentId, status = 'online' } = guest;
+	const newRoomAt = new Date();
 
 	logger.debug(`Creating livechat room for visitor ${ _id }`);
 
@@ -47,10 +48,10 @@ export const createLivechatRoom = (rid, name, guest, roomInfo = {}, extraData =
 		_id: rid,
 		msgs: 0,
 		usersCount: 1,
-		lm: new Date(),
+		lm: newRoomAt,
 		fname: name,
 		t: 'l',
-		ts: new Date(),
+		ts: newRoomAt,
 		departmentId,
 		v: {
 			_id,
@@ -67,6 +68,7 @@ export const createLivechatRoom = (rid, name, guest, roomInfo = {}, extraData =
 			type: OmnichannelSourceType.OTHER,
 			alias: 'unknown',
 		},
+		queuedAt: newRoomAt,
 	}, extraRoomInfo);
 
 	const roomId = Rooms.insert(room);
diff --git a/app/livechat/server/lib/QueueManager.js b/app/livechat/server/lib/QueueManager.js
index c3a10ebb5bc4..711aa84351f9 100644
--- a/app/livechat/server/lib/QueueManager.js
+++ b/app/livechat/server/lib/QueueManager.js
@@ -7,7 +7,7 @@ import { callbacks } from '../../../callbacks/server';
 import { Logger } from '../../../logger';
 import { RoutingManager } from './RoutingManager';
 
-const logger = new Logger('QueueMananger');
+const logger = new Logger('QueueManager');
 
 export const saveQueueInquiry = (inquiry) => {
 	LivechatInquiry.queueInquiry(inquiry._id);
diff --git a/app/models/server/models/LivechatInquiry.js b/app/models/server/models/LivechatInquiry.js
index a4d4ec356607..1994e5056cef 100644
--- a/app/models/server/models/LivechatInquiry.js
+++ b/app/models/server/models/LivechatInquiry.js
@@ -48,7 +48,7 @@ export class LivechatInquiry extends Base {
 		this.update({
 			_id: inquiryId,
 		}, {
-			$set: { status: 'taken' },
+			$set: { status: 'taken', takenAt: new Date() },
 			$unset: { defaultAgent: 1, estimatedInactivityCloseTimeAt: 1 },
 		});
 	}
@@ -71,9 +71,17 @@ export class LivechatInquiry extends Base {
 		return this.update({
 			_id: inquiryId,
 		}, {
-			$set: {
-				status: 'queued',
-			},
+			$set: { status: 'queued', queuedAt: new Date() },
+			$unset: { takenAt: 1 },
+		});
+	}
+
+	queueInquiryAndRemoveDefaultAgent(inquiryId) {
+		return this.update({
+			_id: inquiryId,
+		}, {
+			$set: { status: 'queued', queuedAt: new Date() },
+			$unset: { takenAt: 1, defaultAgent: 1 },
 		});
 	}
 
diff --git a/app/models/server/models/LivechatRooms.js b/app/models/server/models/LivechatRooms.js
index 1d71be35aad0..13b4c7984769 100644
--- a/app/models/server/models/LivechatRooms.js
+++ b/app/models/server/models/LivechatRooms.js
@@ -20,6 +20,7 @@ export class LivechatRooms extends Base {
 		this.tryEnsureIndex({ 'v.token': 1 }, { sparse: true });
 		this.tryEnsureIndex({ 'v.token': 1, 'email.thread': 1 }, { sparse: true });
 		this.tryEnsureIndex({ 'v._id': 1 }, { sparse: true });
+		this.tryEnsureIndex({ t: 1, departmentId: 1, closedAt: 1 }, { partialFilterExpression: { closedAt: { $exists: true } } });
 	}
 
 	findLivechat(filter = {}, offset = 0, limit = 20) {
@@ -717,9 +718,8 @@ export class LivechatRooms extends Base {
 			t: 'l',
 		};
 		const update = {
-			$unset: {
-				servedBy: 1,
-			},
+			$set: { queuedAt: new Date() },
+			$unset: { servedBy: 1 },
 		};
 
 		this.update(query, update);
diff --git a/app/models/server/raw/Rooms.js b/app/models/server/raw/Rooms.js
index 600d55c1fffa..0da61636ef86 100644
--- a/app/models/server/raw/Rooms.js
+++ b/app/models/server/raw/Rooms.js
@@ -27,10 +27,8 @@ export class RoomsRaw extends BaseRaw {
 			{
 				$match: {
 					t: 'l',
-					closedAt: { $exists: true },
-					metrics: { $exists: true },
-					'metrics.chatDuration': { $exists: true },
 					...department && { departmentId: department },
+					closedAt: { $exists: true },
 				},
 			},
 			{ $sort: { closedAt: -1 } },
diff --git a/app/ui-sidenav/client/roomList.js b/app/ui-sidenav/client/roomList.js
index de128304d349..cab1983ad98d 100644
--- a/app/ui-sidenav/client/roomList.js
+++ b/app/ui-sidenav/client/roomList.js
@@ -172,6 +172,7 @@ const mergeSubRoom = (subscription) => {
 			livechatData: 1,
 			departmentId: 1,
 			source: 1,
+			queuedAt: 1,
 		},
 	};
 
@@ -212,6 +213,7 @@ const mergeSubRoom = (subscription) => {
 		departmentId,
 		ts,
 		source,
+		queuedAt,
 	} = room;
 
 	subscription.lm = subscription.lr ? new Date(Math.max(subscription.lr, lastRoomUpdate)) : lastRoomUpdate;
@@ -249,6 +251,7 @@ const mergeSubRoom = (subscription) => {
 		departmentId,
 		ts,
 		source,
+		queuedAt,
 	});
 };
 
@@ -291,6 +294,7 @@ const mergeRoomSub = (room) => {
 		departmentId,
 		ts,
 		source,
+		queuedAt,
 	} = room;
 
 	Subscriptions.update({
@@ -328,6 +332,7 @@ const mergeRoomSub = (room) => {
 			jitsiTimeout,
 			ts,
 			source,
+			queuedAt,
 			...getLowerCaseNames(room, sub.name, sub.fname),
 		},
 	});
diff --git a/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.js b/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.js
index 6ded84b119d2..5f1cb3015d9d 100644
--- a/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.js
+++ b/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.js
@@ -50,6 +50,7 @@ function ChatInfo({ id, route }) {
 		priorityId,
 		livechatData,
 		source,
+		queuedAt,
 	} = room || { room: { v: {} } };
 
 	const routePath = useRoute(route || 'omnichannel-directory');
@@ -58,6 +59,7 @@ function ChatInfo({ id, route }) {
 	const hasGlobalEditRoomPermission = hasPermission('save-others-livechat-room-info');
 	const hasLocalEditRoomPermission = servedBy?._id === Meteor.userId();
 	const visitorId = v?._id;
+	const queueStartedAt = queuedAt || ts;
 
 	const dispatchToastMessage = useToastMessageDispatch();
 	useEffect(() => {
@@ -126,13 +128,13 @@ function ChatInfo({ id, route }) {
 							<Info>{topic}</Info>
 						</Field>
 					)}
-					{ts && (
+					{queueStartedAt && (
 						<Field>
 							<Label>{t('Queue_Time')}</Label>
 							{servedBy ? (
-								<Info>{moment(servedBy.ts).from(moment(ts), true)}</Info>
+								<Info>{moment(servedBy.ts).from(moment(queueStartedAt), true)}</Info>
 							) : (
-								<Info>{moment(ts).fromNow(true)}</Info>
+								<Info>{moment(queueStartedAt).fromNow(true)}</Info>
 							)}
 						</Field>
 					)}
diff --git a/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.js b/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.js
index 8e62089de68d..12823d186cc3 100644
--- a/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.js
+++ b/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.js
@@ -45,6 +45,7 @@ function ChatInfoDirectory({ id, route, room }) {
 		responseBy,
 		priorityId,
 		livechatData,
+		queuedAt,
 	} = room || { room: { v: {} } };
 
 	const routePath = useRoute(route || 'omnichannel-directory');
@@ -53,6 +54,7 @@ function ChatInfoDirectory({ id, route, room }) {
 	const hasGlobalEditRoomPermission = hasPermission('save-others-livechat-room-info');
 	const hasLocalEditRoomPermission = servedBy?._id === Meteor.userId();
 	const visitorId = v?._id;
+	const queueStartedAt = queuedAt || ts;
 
 	const dispatchToastMessage = useToastMessageDispatch();
 	useEffect(() => {
@@ -120,13 +122,13 @@ function ChatInfoDirectory({ id, route, room }) {
 							<Info>{topic}</Info>
 						</Field>
 					)}
-					{ts && (
+					{queueStartedAt && (
 						<Field>
 							<Label>{t('Queue_Time')}</Label>
 							{servedBy ? (
-								<Info>{moment(servedBy.ts).from(moment(ts), true)}</Info>
+								<Info>{moment(servedBy.ts).from(moment(queueStartedAt), true)}</Info>
 							) : (
-								<Info>{moment(ts).fromNow(true)}</Info>
+								<Info>{moment(queueStartedAt).fromNow(true)}</Info>
 							)}
 						</Field>
 					)}
diff --git a/definition/IRoom.ts b/definition/IRoom.ts
index 622844ef2783..62d68e97de2c 100644
--- a/definition/IRoom.ts
+++ b/definition/IRoom.ts
@@ -120,6 +120,7 @@ export interface IOmnichannelRoom extends Omit<IRoom, 'default' | 'featured' | '
 	responseBy: any;
 	priorityId: any;
 	livechatData: any;
+	queuedAt?: Date;
 }
 
 export const isOmnichannelRoom = (room: IRoom): room is IOmnichannelRoom & IRoom => room.t === 'l';
diff --git a/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js b/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
index 424f3840a834..60f407f28c2e 100644
--- a/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
+++ b/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
@@ -17,6 +17,6 @@ callbacks.add('livechat.afterTakeInquiry', async (inquiry) => {
 	const { department } = inquiry;
 	debouncedDispatchWaitingQueueStatus(department);
 
-	cbLogger.debug(`Statuses for queue ${ department || 'Public' } updated succesfully`);
+	cbLogger.debug(`Statuses for queue ${ department || 'Public' } updated successfully`);
 	return inquiry;
 }, callbacks.priority.MEDIUM, 'livechat-after-take-inquiry');
diff --git a/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js b/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
index 61bbd6261be7..671251f7e035 100644
--- a/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
+++ b/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
@@ -31,11 +31,13 @@ callbacks.add('livechat.beforeRouteChat', async (inquiry, agent) => {
 
 	saveQueueInquiry(inquiry);
 
-	const [inq] = await LivechatInquiry.getCurrentSortedQueueAsync({ _id, department });
-	if (inq) {
-		dispatchInquiryPosition(inq);
+	if (settings.get('Omnichannel_calculate_dispatch_service_queue_statistics')) {
+		const [inq] = await LivechatInquiry.getCurrentSortedQueueAsync({ _id, department });
+		if (inq) {
+			dispatchInquiryPosition(inq);
+			cbLogger.debug(`Callback success. Inquiry ${ _id } position has been notified`);
+		}
 	}
 
-	cbLogger.debug(`Callback success. Inquiry ${ _id } position has been notified`);
 	return LivechatInquiry.findOneById(_id);
 }, callbacks.priority.HIGH, 'livechat-before-routing-chat');
diff --git a/ee/app/livechat-enterprise/server/hooks/onAgentAssignmentFailed.ts b/ee/app/livechat-enterprise/server/hooks/onAgentAssignmentFailed.ts
index f8ebf12e436d..b59b31f01215 100644
--- a/ee/app/livechat-enterprise/server/hooks/onAgentAssignmentFailed.ts
+++ b/ee/app/livechat-enterprise/server/hooks/onAgentAssignmentFailed.ts
@@ -16,8 +16,7 @@ const handleOnAgentAssignmentFailed = async ({ inquiry, room, options }: { inqui
 		const { _id: roomId } = room;
 
 		const { _id: inquiryId } = inquiry;
-		LivechatInquiry.queueInquiry(inquiryId);
-		LivechatInquiry.removeDefaultAgentById(inquiryId);
+		LivechatInquiry.queueInquiryAndRemoveDefaultAgent(inquiryId);
 		LivechatRooms.removeAgentByRoomId(roomId);
 		Subscriptions.removeByRoomId(roomId);
 		dispatchAgentDelegated(roomId, null);
diff --git a/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js b/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
index eb52f3ed9752..2bf0ff792be7 100644
--- a/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
+++ b/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
@@ -1,7 +1,6 @@
 import { callbacks } from '../../../../../app/callbacks';
 import { settings } from '../../../../../app/settings/server';
 import { debouncedDispatchWaitingQueueStatus } from '../lib/Helper';
-import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
 import { LivechatEnterprise } from '../lib/LivechatEnterprise';
 
 const onCloseLivechat = (room) => {
@@ -12,10 +11,7 @@ const onCloseLivechat = (room) => {
 	}
 
 	const { departmentId } = room || {};
-	if (!RoutingManager.getConfig().autoAssignAgent) {
-		debouncedDispatchWaitingQueueStatus(departmentId);
-		return room;
-	}
+	debouncedDispatchWaitingQueueStatus(departmentId);
 
 	return room;
 };
diff --git a/ee/app/livechat-enterprise/server/lib/Helper.js b/ee/app/livechat-enterprise/server/lib/Helper.js
index 59e3425657ba..c4f14c440547 100644
--- a/ee/app/livechat-enterprise/server/lib/Helper.js
+++ b/ee/app/livechat-enterprise/server/lib/Helper.js
@@ -95,8 +95,17 @@ export const dispatchInquiryPosition = async (inquiry, queueInfo) => {
 };
 
 export const dispatchWaitingQueueStatus = async (department) => {
+	if (!settings.get('Livechat_waiting_queue') && !settings.get('Omnichannel_calculate_dispatch_service_queue_statistics')) {
+		return;
+	}
+
 	helperLogger.debug(`Updating statuses for queue ${ department || 'Public' }`);
 	const queue = await LivechatInquiry.getCurrentSortedQueueAsync({ department });
+
+	if (!queue.length) {
+		return;
+	}
+
 	const queueInfo = await getQueueInfo(department);
 	queue.forEach((inquiry) => {
 		dispatchInquiryPosition(inquiry, queueInfo);
@@ -126,14 +135,11 @@ export const processWaitingQueue = async (department) => {
 
 	if (room && room.servedBy) {
 		const { _id: rid, servedBy: { _id: agentId } } = room;
-		helperLogger.debug(`Inquiry ${ inquiry._id } taken succesfully by agent ${ agentId }. Notifying`);
+		helperLogger.debug(`Inquiry ${ inquiry._id } taken successfully by agent ${ agentId }. Notifying`);
 		return setTimeout(() => {
 			propagateAgentDelegated(rid, agentId);
 		}, 1000);
 	}
-
-	const { departmentId } = room || {};
-	await debouncedDispatchWaitingQueueStatus(departmentId);
 };
 
 export const setPredictedVisitorAbandonmentTime = (room) => {
@@ -254,6 +260,10 @@ export const getLivechatQueueInfo = async (room) => {
 		return null;
 	}
 
+	if (!settings.get('Omnichannel_calculate_dispatch_service_queue_statistics')) {
+		return null;
+	}
+
 	const { _id: rid, departmentId: department } = room;
 	const inquiry = LivechatInquiry.findOneByRoomId(rid, { fields: { _id: 1, status: 1 } });
 	if (!inquiry) {
diff --git a/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js b/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js
index 0109eceb75fd..0646bced25c9 100644
--- a/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js
+++ b/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js
@@ -199,7 +199,8 @@ export const LivechatEnterprise = {
 	},
 };
 
-const RACE_TIMEOUT = 1000;
+const DEFAULT_RACE_TIMEOUT = 5000;
+let queueDelayTimeout = DEFAULT_RACE_TIMEOUT;
 
 const queueWorker = {
 	running: false,
@@ -242,9 +243,9 @@ const queueWorker = {
 		}
 
 		const queue = await this.nextQueue();
-		queueLogger.debug(`Executing queue ${ queue || 'Public' } with timeout of ${ RACE_TIMEOUT }`);
+		queueLogger.debug(`Executing queue ${ queue || 'Public' } with timeout of ${ queueDelayTimeout }`);
 
-		setTimeout(this.checkQueue.bind(this, queue), RACE_TIMEOUT);
+		setTimeout(this.checkQueue.bind(this, queue), queueDelayTimeout);
 	},
 
 	async checkQueue(queue) {
@@ -292,3 +293,7 @@ settings.watch('Livechat_enabled', (enabled) => {
 	omnichannelIsEnabled = enabled;
 	omnichannelIsEnabled && RoutingManager.isMethodSet() ? shouldQueueStart() : queueWorker.stop();
 });
+
+settings.watch('Omnichannel_queue_delay_timeout', (timeout) => {
+	queueDelayTimeout = timeout < 1 ? DEFAULT_RACE_TIMEOUT : timeout * 1000;
+});
diff --git a/ee/app/livechat-enterprise/server/settings.ts b/ee/app/livechat-enterprise/server/settings.ts
index d3dc3be24135..80c5f53e5ef2 100644
--- a/ee/app/livechat-enterprise/server/settings.ts
+++ b/ee/app/livechat-enterprise/server/settings.ts
@@ -113,6 +113,37 @@ export const createSettings = (): void => {
 				],
 			});
 
+			this.add('Omnichannel_calculate_dispatch_service_queue_statistics', true, {
+				type: 'boolean',
+				group: 'Omnichannel',
+				section: 'Queue_management',
+				i18nLabel: 'Omnichannel_calculate_dispatch_service_queue_statistics',
+				enableQuery: [{ _id: 'Livechat_waiting_queue', value: true }, omnichannelEnabledQuery],
+				enterprise: true,
+				invalidValue: false,
+				modules: [
+					'livechat-enterprise',
+				],
+			});
+
+			this.add('Omnichannel_queue_delay_timeout', 5, {
+				type: 'int',
+				group: 'Omnichannel',
+				section: 'Queue_management',
+				i18nLabel: 'Queue_delay_timeout',
+				i18nDescription: 'Time_in_seconds',
+				enableQuery: [
+					{ _id: 'Livechat_waiting_queue', value: true },
+					{ _id: 'Livechat_Routing_Method', value: { $ne: 'Manual_Selection' } },
+					omnichannelEnabledQuery,
+				],
+				enterprise: true,
+				invalidValue: 5,
+				modules: [
+					'livechat-enterprise',
+				],
+			});
+
 			this.add('Livechat_number_most_recent_chats_estimate_wait_time', 100, {
 				type: 'int',
 				group: 'Omnichannel',
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 8f16c2930cd6..c6e6db53394e 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3175,6 +3175,8 @@
   "Omnichannel": "Omnichannel",
   "Omnichannel_Directory": "Omnichannel Directory",
   "Omnichannel_appearance": "Omnichannel Appearance",
+  "Omnichannel_calculate_dispatch_service_queue_statistics": "Calculate and dispatch Omnichannel waiting queue statistics",
+  "Omnichannel_calculate_dispatch_service_queue_statistics_Description": "Processing and dispatching waiting queue statistics such as position and estimated waiting time. If *Livechat channel* is not in use, it is recommended to disable this setting and prevent the server from doing unnecessary processes.",
   "Omnichannel_Contact_Center": "Omnichannel Contact Center",
   "Omnichannel_contact_manager_routing": "Assign new conversations to the contact manager",
   "Omnichannel_contact_manager_routing_Description": "This setting allocates a chat to the assigned Contact Manager, as long as the Contact Manager is online when the chat starts",
@@ -3401,6 +3403,7 @@
   "Query_description": "Additional conditions for determining which users to send the email to. Unsubscribed users are automatically removed from the query. It must be a valid JSON. Example: \"{\"createdAt\":{\"$gt\":{\"$date\": \"2015-01-01T00:00:00.000Z\"}}}\"",
   "Query_is_not_valid_JSON": "Query is not valid JSON",
   "Queue": "Queue",
+  "Queue_delay_timeout": "Queue processing delay timeout",
   "Queue_Time": "Queue Time",
   "Queue_management": "Queue Management",
   "quote": "quote",
@@ -4726,4 +4729,4 @@
   "Your_temporary_password_is_password": "Your temporary password is <strong>[password]</strong>.",
   "Your_TOTP_has_been_reset": "Your Two Factor TOTP has been reset.",
   "Your_workspace_is_ready": "Your workspace is ready to use 🎉"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 6bb6442e9b44..28b4089154bc 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -3168,6 +3168,8 @@
   "Omnichannel": "Omnichannel",
   "Omnichannel_Directory": "Diretório Omnichannel",
   "Omnichannel_appearance": "Aparência do Omnichannel",
+  "Omnichannel_calculate_dispatch_service_queue_statistics": "Calcular e propagar dados estatísticos da fila de espera Omnichannel",
+  "Omnichannel_calculate_dispatch_service_queue_statistics_Description": "Proessamento de dados estatísticos da fila de espera Omnichannel como as posição e tempo estimado de espera na fila. Se o *canal Livechat* não estiver em uso, é recomendável desabilitar essa configuração e evitar que o servidor execute processos desnecessários.",
   "Omnichannel_Contact_Center": "Central de Contatos Omnichannel",
   "Omnichannel_contact_manager_routing": "Atribuir novas conversas para o Gerente do Contato",
   "Omnichannel_contact_manager_routing_Description": "Aloca novos chats para o Gerente do Contato(quando atribuído), desde que o Gerente do Contato esteja online quando a conversa é iniciado",
@@ -3394,6 +3396,7 @@
   "Query_description": "Condições adicionais para determinar para quais usuários enviar e-mail. Usuários não inscritos são automaticamente removidos a partir da consulta. Deve ser um JSON válido. Exemplo: `{\"createdAt\": {\"$gt\": {\"$date\": \"2015-01-01T00: 00: 00.000Z\"}}}`",
   "Query_is_not_valid_JSON": "Query não é um JSON válido",
   "Queue": "Fila",
+  "Queue_delay_timeout": "Tempo limite de atraso para processamento da fila",
   "Queue_Time": "Tempo na fila",
   "Queue_management": "Gerenciamento de Fila",
   "quote": "citação",
@@ -4714,4 +4717,4 @@
   "Your_temporary_password_is_password": "Sua senha temporária é <strong>[password]</strong>.",
   "Your_TOTP_has_been_reset": "Seu TOTP de dois fatores foi redefinido.",
   "Your_workspace_is_ready": "O seu espaço de trabalho está pronto para usar 🎉"
-}
\ No newline at end of file
+}
diff --git a/server/modules/watchers/publishFields.ts b/server/modules/watchers/publishFields.ts
index 10427adf4853..0e6aa92ab555 100644
--- a/server/modules/watchers/publishFields.ts
+++ b/server/modules/watchers/publishFields.ts
@@ -100,6 +100,7 @@ export const roomFields = {
 	metrics: 1,
 	ts: 1,
 	waitingResponse: 1,
+	queuedAt: 1,
 
 	// fields used by DMs
 	usernames: 1,

From 842a0162af76cc6e390ffa0e10c77718bf848650 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Fri, 29 Oct 2021 14:40:04 -0300
Subject: [PATCH 10/14] [FIX] Notifications are not being filtered (#23487)

* Add migration to update push notification setting's value

* Update mobileNotifications preference to pushNotifications
---
 app/api/server/v1/users.js                    |  2 +-
 app/utils/lib/getDefaultSubscriptionPref.js   |  6 ++---
 .../methods/saveUserPreferences.ts            |  2 +-
 .../PreferencesNotificationsSection.js        | 10 +++----
 server/methods/saveUserPreferences.js         | 10 +++----
 server/startup/migrations/index.ts            |  1 +
 server/startup/migrations/v243.ts             | 26 +++++++++++++++++++
 tests/data/user.js                            |  2 +-
 8 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 server/startup/migrations/v243.ts

diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
index 714fc5e9265f..1f3f22e38e6c 100644
--- a/app/api/server/v1/users.js
+++ b/app/api/server/v1/users.js
@@ -593,7 +593,7 @@ API.v1.addRoute('users.setPreferences', { authRequired: true }, {
 				unreadAlert: Match.Maybe(Boolean),
 				notificationsSoundVolume: Match.Maybe(Number),
 				desktopNotifications: Match.Maybe(String),
-				mobileNotifications: Match.Maybe(String),
+				pushNotifications: Match.Maybe(String),
 				enableAutoAway: Match.Maybe(Boolean),
 				highlights: Match.Maybe(Array),
 				desktopNotificationRequireInteraction: Match.Maybe(Boolean),
diff --git a/app/utils/lib/getDefaultSubscriptionPref.js b/app/utils/lib/getDefaultSubscriptionPref.js
index 294a7d50a734..0200cb128e33 100644
--- a/app/utils/lib/getDefaultSubscriptionPref.js
+++ b/app/utils/lib/getDefaultSubscriptionPref.js
@@ -3,7 +3,7 @@ export const getDefaultSubscriptionPref = (userPref) => {
 
 	const {
 		desktopNotifications,
-		mobileNotifications,
+		pushNotifications,
 		emailNotificationMode,
 		highlights,
 	} = (userPref.settings && userPref.settings.preferences) || {};
@@ -17,8 +17,8 @@ export const getDefaultSubscriptionPref = (userPref) => {
 		subscription.desktopPrefOrigin = 'user';
 	}
 
-	if (mobileNotifications && mobileNotifications !== 'default') {
-		subscription.mobilePushNotifications = mobileNotifications;
+	if (pushNotifications && pushNotifications !== 'default') {
+		subscription.mobilePushNotifications = pushNotifications;
 		subscription.mobilePrefOrigin = 'user';
 	}
 
diff --git a/client/contexts/ServerContext/methods/saveUserPreferences.ts b/client/contexts/ServerContext/methods/saveUserPreferences.ts
index 1f5f67100c97..7e6b20ad0bf6 100644
--- a/client/contexts/ServerContext/methods/saveUserPreferences.ts
+++ b/client/contexts/ServerContext/methods/saveUserPreferences.ts
@@ -12,7 +12,7 @@ type UserPreferences = {
 	unreadAlert: boolean;
 	notificationsSoundVolume: number;
 	desktopNotifications: string;
-	mobileNotifications: string;
+	pushNotifications: string;
 	enableAutoAway: boolean;
 	highlights: string[];
 	messageViewMode: number;
diff --git a/client/views/account/preferences/PreferencesNotificationsSection.js b/client/views/account/preferences/PreferencesNotificationsSection.js
index 615b063d8e3e..6419f8df5ffe 100644
--- a/client/views/account/preferences/PreferencesNotificationsSection.js
+++ b/client/views/account/preferences/PreferencesNotificationsSection.js
@@ -50,7 +50,7 @@ const PreferencesNotificationsSection = ({ onChange, commitRef, ...props }) => {
 		{
 			desktopNotificationRequireInteraction: userDesktopNotificationRequireInteraction,
 			desktopNotifications: userDesktopNotifications,
-			mobileNotifications: userMobileNotifications,
+			pushNotifications: userMobileNotifications,
 			emailNotificationMode: userEmailNotificationMode,
 		},
 		onChange,
@@ -59,14 +59,14 @@ const PreferencesNotificationsSection = ({ onChange, commitRef, ...props }) => {
 	const {
 		desktopNotificationRequireInteraction,
 		desktopNotifications,
-		mobileNotifications,
+		pushNotifications,
 		emailNotificationMode,
 	} = values;
 
 	const {
 		handleDesktopNotificationRequireInteraction,
 		handleDesktopNotifications,
-		handleMobileNotifications,
+		handlePushNotifications,
 		handleEmailNotificationMode,
 	} = handlers;
 
@@ -171,8 +171,8 @@ const PreferencesNotificationsSection = ({ onChange, commitRef, ...props }) => {
 					<Field.Label>{t('Notification_Push_Default_For')}</Field.Label>
 					<Field.Row>
 						<Select
-							value={mobileNotifications}
-							onChange={handleMobileNotifications}
+							value={pushNotifications}
+							onChange={handlePushNotifications}
 							options={mobileNotificationOptions}
 						/>
 					</Field.Row>
diff --git a/server/methods/saveUserPreferences.js b/server/methods/saveUserPreferences.js
index bd062f6064b8..ffed9b7adc6d 100644
--- a/server/methods/saveUserPreferences.js
+++ b/server/methods/saveUserPreferences.js
@@ -19,7 +19,7 @@ Meteor.methods({
 			unreadAlert: Match.Optional(Boolean),
 			notificationsSoundVolume: Match.Optional(Number),
 			desktopNotifications: Match.Optional(String),
-			mobileNotifications: Match.Optional(String),
+			pushNotifications: Match.Optional(String),
 			enableAutoAway: Match.Optional(Boolean),
 			highlights: Match.Optional([String]),
 			messageViewMode: Match.Optional(Number),
@@ -46,7 +46,7 @@ Meteor.methods({
 
 		const {
 			desktopNotifications: oldDesktopNotifications,
-			mobileNotifications: oldMobileNotifications,
+			pushNotifications: oldMobileNotifications,
 			emailNotificationMode: oldEmailNotifications,
 		} = (user.settings && user.settings.preferences) || {};
 
@@ -81,11 +81,11 @@ Meteor.methods({
 				}
 			}
 
-			if (settings.mobileNotifications && oldMobileNotifications !== settings.mobileNotifications) {
-				if (settings.mobileNotifications === 'default') {
+			if (settings.pushNotifications && oldMobileNotifications !== settings.pushNotifications) {
+				if (settings.pushNotifications === 'default') {
 					Subscriptions.clearNotificationUserPreferences(user._id, 'mobilePushNotifications', 'mobilePrefOrigin');
 				} else {
-					Subscriptions.updateNotificationUserPreferences(user._id, settings.mobileNotifications, 'mobilePushNotifications', 'mobilePrefOrigin');
+					Subscriptions.updateNotificationUserPreferences(user._id, settings.pushNotifications, 'mobilePushNotifications', 'mobilePrefOrigin');
 				}
 			}
 
diff --git a/server/startup/migrations/index.ts b/server/startup/migrations/index.ts
index 132a7ad3862d..37f25773c4e2 100644
--- a/server/startup/migrations/index.ts
+++ b/server/startup/migrations/index.ts
@@ -66,4 +66,5 @@ import './v239';
 import './v240';
 import './v241';
 import './v242';
+import './v243';
 import './xrun';
diff --git a/server/startup/migrations/v243.ts b/server/startup/migrations/v243.ts
new file mode 100644
index 000000000000..89d3f9f03e70
--- /dev/null
+++ b/server/startup/migrations/v243.ts
@@ -0,0 +1,26 @@
+import { addMigration } from '../../lib/migrations';
+import { Settings, Users } from '../../../app/models/server';
+
+addMigration({
+	version: 243,
+	up() {
+		const mobileNotificationsSetting = Settings.findOneById('Accounts_Default_User_Preferences_mobileNotifications');
+
+		Settings.removeById('Accounts_Default_User_Preferences_mobileNotifications');
+		if (mobileNotificationsSetting && mobileNotificationsSetting.value) {
+			Settings.upsert({
+				_id: 'Accounts_Default_User_Preferences_pushNotifications',
+			}, {
+				$set: {
+					value: mobileNotificationsSetting.value,
+				},
+			});
+		}
+
+		Users.update(
+			{ 'settings.preferences.mobileNotifications': { $exists: 1 } },
+			{ $rename: { 'settings.preferences.mobileNotifications': 'settings.preferences.pushNotifications' } },
+			{ multi: true },
+		);
+	},
+});
diff --git a/tests/data/user.js b/tests/data/user.js
index 1a729c10c1d5..7ba380fcd8c4 100644
--- a/tests/data/user.js
+++ b/tests/data/user.js
@@ -20,7 +20,7 @@ export const preferences = {
 		unreadAlert: true,
 		notificationsSoundVolume: 100,
 		desktopNotifications: 'default',
-		mobileNotifications: 'default',
+		pushNotifications: 'default',
 		enableAutoAway: true,
 		highlights: [],
 		desktopNotificationRequireInteraction: false,

From ba69feecec6ebd91df6151894147af1118c69f26 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 8 Nov 2021 22:02:35 -0300
Subject: [PATCH 11/14] Bump version to 4.1.2

---
 .docker/Dockerfile.rhel                |    2 +-
 .github/history.json                   |   69 +-
 .snapcraft/resources/prepareRocketChat |    2 +-
 .snapcraft/snap/snapcraft.yaml         |    2 +-
 HISTORY.md                             | 2125 +++++++++++-------------
 app/utils/rocketchat.info              |    2 +-
 package-lock.json                      |    2 +-
 package.json                           |    2 +-
 8 files changed, 1079 insertions(+), 1127 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index f91e8ee83d61..f8607432f2fd 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 4.1.1
+ENV RC_VERSION 4.1.2
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 206a280bd24e..5f3b0c6a3950 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -67075,6 +67075,73 @@
           ]
         }
       ]
+    },
+    "3.18.3": {
+      "node_version": "12.22.1",
+      "npm_version": "6.14.1",
+      "apps_engine_version": "1.27.1",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0",
+        "4.2"
+      ],
+      "pull_requests": []
+    },
+    "4.0.6": {
+      "node_version": "12.22.1",
+      "npm_version": "6.14.1",
+      "apps_engine_version": "1.28.0",
+      "mongo_versions": [
+        "3.6",
+        "4.0",
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": []
+    },
+    "4.1.2": {
+      "node_version": "12.22.1",
+      "npm_version": "6.14.1",
+      "apps_engine_version": "1.28.1",
+      "mongo_versions": [
+        "3.6",
+        "4.0",
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "23487",
+          "title": "[FIX] Notifications are not being filtered",
+          "userLogin": "matheusbsilva137",
+          "description": "- Add a migration to update the `Accounts_Default_User_Preferences_pushNotifications` setting's value to the `Accounts_Default_User_Preferences_mobileNotifications` setting's value;\r\n - Remove the `Accounts_Default_User_Preferences_mobileNotifications` setting (replaced by `Accounts_Default_User_Preferences_pushNotifications`);\r\n - Rename 'mobileNotifications' user's preference to 'pushNotifications'.",
+          "milestone": "4.1.2",
+          "contributors": [
+            "matheusbsilva137"
+          ]
+        },
+        {
+          "pr": "23661",
+          "title": "[FIX] Performance issues when running Omnichannel job queue dispatcher",
+          "userLogin": "renatobecker",
+          "milestone": "4.1.2",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "23587",
+          "title": "[FIX] Omnichannel status being changed on page refresh",
+          "userLogin": "KevLehman",
+          "milestone": "4.1.2",
+          "contributors": [
+            "KevLehman"
+          ]
+        }
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
index 8326ee76187e..a5968214af14 100755
--- a/.snapcraft/resources/prepareRocketChat
+++ b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/4.1.1/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/4.1.2/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 
diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml
index d9d599fa7ca0..4bb19f3461dd 100644
--- a/.snapcraft/snap/snapcraft.yaml
+++ b/.snapcraft/snap/snapcraft.yaml
@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 4.1.1
+version: 4.1.2
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict
diff --git a/HISTORY.md b/HISTORY.md
index 68f00f36e9ae..7ee96dd1faa2 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,34 @@
 
+# 4.1.2
+`2021-11-08  ·  3 🐛  ·  3 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.22.1`
+- NPM: `6.14.1`
+- MongoDB: `3.6, 4.0, 4.2, 4.4, 5.0`
+- Apps-Engine: `1.28.1`
+
+### 🐛 Bug fixes
+
+
+- Notifications are not being filtered ([#23487](https://github.com/RocketChat/Rocket.Chat/pull/23487))
+
+  - Add a migration to update the `Accounts_Default_User_Preferences_pushNotifications` setting's value to the `Accounts_Default_User_Preferences_mobileNotifications` setting's value;
+   - Remove the `Accounts_Default_User_Preferences_mobileNotifications` setting (replaced by `Accounts_Default_User_Preferences_pushNotifications`);
+   - Rename 'mobileNotifications' user's preference to 'pushNotifications'.
+
+- Omnichannel status being changed on page refresh ([#23587](https://github.com/RocketChat/Rocket.Chat/pull/23587))
+
+- Performance issues when running Omnichannel job queue dispatcher ([#23661](https://github.com/RocketChat/Rocket.Chat/pull/23661))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@KevLehman](https://github.com/KevLehman)
+- [@matheusbsilva137](https://github.com/matheusbsilva137)
+- [@renatobecker](https://github.com/renatobecker)
+
 # 4.1.1
-`2021-11-05  ·  4 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
+`2021-11-05  ·  4 🐛  ·  3 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `12.22.1`
@@ -21,7 +49,6 @@
 
 - Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)
 
-
 ### 👩‍💻👨‍💻 Core Team 🤓
 
 - [@d-gubert](https://github.com/d-gubert)
@@ -53,19 +80,19 @@
 
 - Make Livechat Instructions setting multi-line ([#23515](https://github.com/RocketChat/Rocket.Chat/pull/23515))
 
-  Since now we're supporting markdown text on this field (via this PR   - https://github.com/RocketChat/Rocket.Chat.Livechat/pull/648), it would be nice to make this setting multiline so users can have more space to edit the text
+  Since now we're supporting markdown text on this field (via this PR   - https://github.com/RocketChat/Rocket.Chat.Livechat/pull/648), it would be nice to make this setting multiline so users can have more space to edit the text
   ![image](https://user-images.githubusercontent.com/34130764/138146712-13e4968b-5312-4d53-b44c-b5699c5e49c1.png)
 
 - optimized groups.listAll response time ([#22941](https://github.com/RocketChat/Rocket.Chat/pull/22941))
 
-  groups.listAll endpoint was having performance issues, specially when the total number of groups was high. This happened because the endpoint was loading all objects in memory then using splice to paginate, instead of paginating beforehand.
-
-  Considering 70k groups, this was the performance improvement:
-
-  before
-  ![image](https://user-images.githubusercontent.com/28611993/129601314-bdf89337-79fa-4446-9f44-95264af4adb3.png)
-
-  after
+  groups.listAll endpoint was having performance issues, specially when the total number of groups was high. This happened because the endpoint was loading all objects in memory then using splice to paginate, instead of paginating beforehand.
+
+  Considering 70k groups, this was the performance improvement:
+
+  before
+  ![image](https://user-images.githubusercontent.com/28611993/129601314-bdf89337-79fa-4446-9f44-95264af4adb3.png)
+
+  after
   ![image](https://user-images.githubusercontent.com/28611993/129601358-5872e166-f923-4c1c-b21d-eb9507365ecf.png)
 
 ### 🐛 Bug fixes
@@ -73,8 +100,7 @@
 
 - **APPS:** Communication problem when updating and uninstalling apps in cluster ([#23418](https://github.com/RocketChat/Rocket.Chat/pull/23418))
 
-  - Make the hook responsible for receiving app update events inside a cluster fetch the app's package (zip file) in the correct place.
-
+  - Make the hook responsible for receiving app update events inside a cluster fetch the app's package (zip file) in the correct place.
  
   - Also shows a warning message on uninstalls inside a cluster. As there are many servers writing to the same place, some race conditions may occur. This prevents problems related to terminating the process in the middle due to errors being thrown and leaving the server in a faulty state.
 
 - **ENTERPRISE:** Omnichannel agent is not leaving the room when a forwarded chat is queued ([#23404](https://github.com/RocketChat/Rocket.Chat/pull/23404))
@@ -101,10 +127,10 @@
 
 - Markdown quote message style ([#23462](https://github.com/RocketChat/Rocket.Chat/pull/23462))
 
-  Before:
-  ![image](https://user-images.githubusercontent.com/17487063/137496669-3abecab4-cf90-45cb-8b1b-d9411a5682dd.png)
-
-  After:
+  Before:
+  ![image](https://user-images.githubusercontent.com/17487063/137496669-3abecab4-cf90-45cb-8b1b-d9411a5682dd.png)
+
+  After:
   ![image](https://user-images.githubusercontent.com/17487063/137496905-fd727f90-f707-4ec6-8139-ba2eb1a2146e.png)
 
 - MONGO_OPTIONS being ignored for oplog connection ([#23314](https://github.com/RocketChat/Rocket.Chat/pull/23314) by [@cuonghuunguyen](https://github.com/cuonghuunguyen))
@@ -123,8 +149,8 @@
 
 - Read only description in team creation ([#23213](https://github.com/RocketChat/Rocket.Chat/pull/23213))
 
-  ![image](https://user-images.githubusercontent.com/27704687/133608433-8ca788a3-71a8-4d40-8c40-8156ab03c606.png)
-
+  ![image](https://user-images.githubusercontent.com/27704687/133608433-8ca788a3-71a8-4d40-8c40-8156ab03c606.png)
+
   ![image](https://user-images.githubusercontent.com/27704687/133608400-4cdc7a67-95e5-46c6-8c65-29ab107cd314.png)
 
 - resumeToken not working ([#23379](https://github.com/RocketChat/Rocket.Chat/pull/23379))
@@ -133,8 +159,7 @@
 
 - SAML Users' roles being reset to default on login ([#23411](https://github.com/RocketChat/Rocket.Chat/pull/23411))
 
-  - Remove `roles` field update on `insertOrUpdateSAMLUser` function;
-
+  - Remove `roles` field update on `insertOrUpdateSAMLUser` function;
  
   - Add SAML `syncRoles` event;
 
 - Server crashing when Routing method is not available at start ([#23473](https://github.com/RocketChat/Rocket.Chat/pull/23473))
@@ -215,14 +240,14 @@
 
 - Chore: Startup Time ([#23210](https://github.com/RocketChat/Rocket.Chat/pull/23210))
 
-  The settings logic has been improved as a whole.
-
-  All the logic to get the data from the env var was confusing.
-
-  Setting default values was tricky to understand.
-
-  Every time the server booted, all settings were updated and callbacks were called 2x or more (horrible for environments with multiple instances and generating a turbulent startup).
-
+  The settings logic has been improved as a whole.
+
+  All the logic to get the data from the env var was confusing.
+
+  Setting default values was tricky to understand.
+
+  Every time the server booted, all settings were updated and callbacks were called 2x or more (horrible for environments with multiple instances and generating a turbulent startup).
+
   `Settings.get(......, callback);` was deprecated. We now have better methods for each case.
 
 - Chore: Update Apps-Engine version ([#23375](https://github.com/RocketChat/Rocket.Chat/pull/23375))
@@ -245,10 +270,10 @@
 
 - Regression: Mail body contains `undefined` text ([#23552](https://github.com/RocketChat/Rocket.Chat/pull/23552))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/2263066/138733018-10449892-5c2d-46fb-9355-00e98e0d6c9f.png)
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/2263066/138733018-10449892-5c2d-46fb-9355-00e98e0d6c9f.png)
+
+  ### After
   ![image](https://user-images.githubusercontent.com/2263066/138733074-a1b88a77-bf64-41c3-a6c3-ac9e1cb63de1.png)
 
 - Regression: Prevent settings from getting updated ([#23556](https://github.com/RocketChat/Rocket.Chat/pull/23556))
@@ -339,8 +364,7 @@
 
 - SAML Users' roles being reset to default on login ([#23411](https://github.com/RocketChat/Rocket.Chat/pull/23411))
 
-  - Remove `roles` field update on `insertOrUpdateSAMLUser` function;
-
+  - Remove `roles` field update on `insertOrUpdateSAMLUser` function;
  
   - Add SAML `syncRoles` event;
 
 <details>
@@ -372,8 +396,7 @@
 
 - **APPS:** Communication problem when updating and uninstalling apps in cluster ([#23418](https://github.com/RocketChat/Rocket.Chat/pull/23418))
 
-  - Make the hook responsible for receiving app update events inside a cluster fetch the app's package (zip file) in the correct place.
-
+  - Make the hook responsible for receiving app update events inside a cluster fetch the app's package (zip file) in the correct place.
  
   - Also shows a warning message on uninstalls inside a cluster. As there are many servers writing to the same place, some race conditions may occur. This prevents problems related to terminating the process in the middle due to errors being thrown and leaving the server in a faulty state.
 
 - Server crashing when Routing method is not available at start ([#23473](https://github.com/RocketChat/Rocket.Chat/pull/23473))
@@ -500,20 +523,18 @@
 
 - **ENTERPRISE:** "Download CSV" button doesn't work in the Engagement Dashboard's Active Users section ([#23013](https://github.com/RocketChat/Rocket.Chat/pull/23013))
 
-  - Fix "Download CSV" button in the Engagement Dashboard's Active Users section;
-
-  - Add column headers to the CSV file downloaded from the Engagement Dashboard's Active Users section;
-
+  - Fix "Download CSV" button in the Engagement Dashboard's Active Users section;
  
+  - Add column headers to the CSV file downloaded from the Engagement Dashboard's Active Users section;
  
   - Split the data in multiple CSV files.
 
 - **ENTERPRISE:** CSV file downloaded in the Engagement Dashboard's New Users section contains undefined data ([#23014](https://github.com/RocketChat/Rocket.Chat/pull/23014))
 
-  - Fix CSV file downloaded in the Engagement Dashboard's New Users section;
+  - Fix CSV file downloaded in the Engagement Dashboard's New Users section;
    - Add column headers to the CSV file downloaded from the Engagement Dashboard's New Users section.
 
 - **ENTERPRISE:** Missing headers in CSV files downloaded from the Engagement Dashboard ([#23223](https://github.com/RocketChat/Rocket.Chat/pull/23223))
 
-  - Add headers to all CSV files downloaded from the "Messages" and "Channels" tabs from the Engagement Dashboard;
+  - Add headers to all CSV files downloaded from the "Messages" and "Channels" tabs from the Engagement Dashboard;
    - Add headers to the CSV file downloaded from the "Users by time of day" section (in the "Users" tab).
 
 - LDAP Refactoring ([#23171](https://github.com/RocketChat/Rocket.Chat/pull/23171))
@@ -528,24 +549,17 @@
 
 - Remove deprecated endpoints ([#23162](https://github.com/RocketChat/Rocket.Chat/pull/23162))
 
-  The following REST endpoints were removed:
-
-
-  - `/api/v1/emoji-custom`
-
-  - `/api/v1/info`
-
-  - `/api/v1/permissions`
-
-  - `/api/v1/permissions.list`
-
-  The following Real time API Methods were removed:
-
-
-  - `getFullUserData`
-
-  - `getServerInfo`
-
+  The following REST endpoints were removed:
+
  
+  - `/api/v1/emoji-custom`
  
+  - `/api/v1/info`
  
+  - `/api/v1/permissions`
  
+  - `/api/v1/permissions.list`
+
+  The following Real time API Methods were removed:
+
  
+  - `getFullUserData`
  
+  - `getServerInfo`
  
   - `livechat:saveOfficeHours`
 
 - Remove Google Vision features ([#23160](https://github.com/RocketChat/Rocket.Chat/pull/23160))
@@ -554,8 +568,8 @@
 
 - Remove old migrations up to version 2.4.14 ([#23277](https://github.com/RocketChat/Rocket.Chat/pull/23277))
 
-  To update to version 4.0.0 you'll need to be running at least version 3.0.0, otherwise you might loose some database migrations which might have unexpected effects.
-
+  To update to version 4.0.0 you'll need to be running at least version 3.0.0, otherwise you might loose some database migrations which might have unexpected effects.
+
   This aims to clean up the code, since upgrades jumping 2 major versions are too risky and hard to maintain, we'll keep only migration from that last major (in this case 3.x).
 
 - Remove patch info from endpoint /api/info for non-logged in users ([#16050](https://github.com/RocketChat/Rocket.Chat/pull/16050) by [@MarcosSpessatto](https://github.com/MarcosSpessatto))
@@ -564,18 +578,18 @@
 
 - Stop sending audio notifications via stream ([#23108](https://github.com/RocketChat/Rocket.Chat/pull/23108))
 
-  Remove audio preferences and make them tied to desktop notification preferences.
-
+  Remove audio preferences and make them tied to desktop notification preferences.
+
   TL;DR: new message sounds will play only if you receive a desktop notification. you'll still be able to chose to not play any sound though
 
 - Webhook will fail if user is not part of the channel ([#23310](https://github.com/RocketChat/Rocket.Chat/pull/23310))
 
-  Remove deprecated behavior added by https://github.com/RocketChat/Rocket.Chat/pull/18024 that accepts webhook integrations sending messages even if the user is not part of the channel.
-
-  Starting from 4.0.0 the webhook request will fail with `error-not-allowed` error:
-
-  ```
-  {"success":false,"error":"error-not-allowed"}
+  Remove deprecated behavior added by https://github.com/RocketChat/Rocket.Chat/pull/18024 that accepts webhook integrations sending messages even if the user is not part of the channel.
+
+  Starting from 4.0.0 the webhook request will fail with `error-not-allowed` error:
+
+  ```
+  {"success":false,"error":"error-not-allowed"}
   ```
 
 ### 🎉 New features
@@ -593,26 +607,23 @@
 
 - Seats Cap ([#23017](https://github.com/RocketChat/Rocket.Chat/pull/23017) by [@g-thome](https://github.com/g-thome))
 
-  - Adding New Members
-    - Awareness of seats usage while adding new members
-    - Seats Cap about to be reached
-    - Seats Cap reached
-    - Request more seats
-
-  - Warning Admins
-    - System telling admins max seats are about to exceed
-    - System telling admins max seats were exceed
-    - Metric on Info Page
-    - Request more seats
-
-  - Warning Members
-    - Invite link
-      - Block creating new invite links
-      - Block existing invite links (feedback on register process)
-    - Register to Workspaces
-
-  - Emails
-    - System telling admins max seats are about to exceed
+  - Adding New Members
+    - Awareness of seats usage while adding new members
+    - Seats Cap about to be reached
+    - Seats Cap reached
+    - Request more seats
  
+  - Warning Admins
+    - System telling admins max seats are about to exceed
+    - System telling admins max seats were exceed
+    - Metric on Info Page
+    - Request more seats
  
+  - Warning Members
+    - Invite link
+      - Block creating new invite links
+      - Block existing invite links (feedback on register process) 
+    - Register to Workspaces
  
+  - Emails
+    - System telling admins max seats are about to exceed
     - System telling admins max seats were exceed
 
 ### 🚀 Improvements
@@ -620,10 +631,10 @@
 
 - **APPS:** New storage strategy for Apps-Engine file packages ([#22657](https://github.com/RocketChat/Rocket.Chat/pull/22657))
 
-  This is an enabler for our initiative to support NPM packages in the Apps-Engine.
-
-  Currently, the packages (zip files) for Rocket.Chat Apps are stored as a base64 encoded string in a document in the database, which constrains us due to the size limit of a document in MongoDB (16Mb).
-
+  This is an enabler for our initiative to support NPM packages in the Apps-Engine. 
+
+  Currently, the packages (zip files) for Rocket.Chat Apps are stored as a base64 encoded string in a document in the database, which constrains us due to the size limit of a document in MongoDB (16Mb).
+
   When we allow apps to include NPM packages, the size of the App package itself will be potentially _very large_ (I'm looking at you `node_modules`). Thus we'll be changing the strategy to store apps either with GridFS or the host's File System itself.
 
 - **APPS:** Return task ids when using the scheduler api ([#23023](https://github.com/RocketChat/Rocket.Chat/pull/23023))
@@ -663,9 +674,9 @@
 
 - "Read Only" and "Allow Reacting" system messages are missing in rooms ([#23037](https://github.com/RocketChat/Rocket.Chat/pull/23037))
 
-  - Add system message to notify changes on the **"Read Only"** setting;
-   - Add system message to notify changes on the **"Allow Reacting"** setting;
-   - Fix "Allow Reacting" setting's description (updated from "Only authorized users can write new messages" to "Only authorized users can react to messages").
+  - Add system message to notify changes on the **"Read Only"** setting;
+   - Add system message to notify changes on the **"Allow Reacting"** setting;
+   - Fix "Allow Reacting" setting's description (updated from "Only authorized users can write new messages" to "Only authorized users can react to messages").
   ![system-messages](https://user-images.githubusercontent.com/36537004/130883527-9eb47fcd-c8e5-41fb-af34-5d99bd0a6780.PNG)
 
 - Add check before placing chat on-hold to confirm that contact sent last message ([#23053](https://github.com/RocketChat/Rocket.Chat/pull/23053))
@@ -680,9 +691,9 @@
 
 - Inaccurate use of 'Mobile notifications' instead of 'Push notifications' in i18n strings ([#22978](https://github.com/RocketChat/Rocket.Chat/pull/22978))
 
-  - Fix inaccurate use of 'Mobile notifications' (which is misleading in German) by 'Push notifications';
-   - Update `'Notification_Mobile_Default_For'` key to `'Notification_Push_Default_For'` (and text to 'Send Push Notifications For' for English Language);
-   - Update `'Accounts_Default_User_Preferences_mobileNotifications'` key to `'Accounts_Default_User_Preferences_pushNotifications'`;
+  - Fix inaccurate use of 'Mobile notifications' (which is misleading in German) by 'Push notifications';
+   - Update `'Notification_Mobile_Default_For'` key to `'Notification_Push_Default_For'` (and text to 'Send Push Notifications For' for English Language);
+   - Update `'Accounts_Default_User_Preferences_mobileNotifications'` key to `'Accounts_Default_User_Preferences_pushNotifications'`;
    - Update `'Mobile_Notifications_Default_Alert'` key to `'Mobile_Push_Notifications_Default_Alert'`;
 
 - Logging out from other clients ([#23276](https://github.com/RocketChat/Rocket.Chat/pull/23276))
@@ -691,7 +702,7 @@
 
 - Modals is cutting pixels of the content ([#23243](https://github.com/RocketChat/Rocket.Chat/pull/23243))
 
-  Fuselage Dependency: [543](https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/543)
+  Fuselage Dependency: [543](https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/543)
   ![image](https://user-images.githubusercontent.com/27704687/134049227-3cd1deed-34ba-454f-a95e-e99b79a7a7b9.png)
 
 - Omnichannel On hold chats being forwarded to offline agents ([#23185](https://github.com/RocketChat/Rocket.Chat/pull/23185))
@@ -700,15 +711,15 @@
 
 - Prevent users to edit an existing role when adding a new one with the same name used before. ([#22407](https://github.com/RocketChat/Rocket.Chat/pull/22407) by [@lucassartor](https://github.com/lucassartor))
 
-  ### before
-  ![Peek 2021-07-13 16-31](https://user-images.githubusercontent.com/27704687/125513721-953d84f4-1c95-45ca-80e1-b00992b874f6.gif)
-
-  ### after
+  ### before
+  ![Peek 2021-07-13 16-31](https://user-images.githubusercontent.com/27704687/125513721-953d84f4-1c95-45ca-80e1-b00992b874f6.gif)
+
+  ### after
   ![Peek 2021-07-13 16-34](https://user-images.githubusercontent.com/27704687/125514098-91ee8014-51e5-4c62-9027-5538acf57d08.gif)
 
 - Remove doubled "Canned Responses" strings ([#23056](https://github.com/RocketChat/Rocket.Chat/pull/23056))
 
-  - Remove doubled canned response setting introduced in #22703 (by setting id change);
+  - Remove doubled canned response setting introduced in #22703 (by setting id change);
    - Update "Canned Responses" keys to "Canned_Responses".
 
 - Remove margin from quote inside quote ([#21779](https://github.com/RocketChat/Rocket.Chat/pull/21779))
@@ -719,21 +730,16 @@
 
 - Sidebar not closing when clicking in Home or Directory on mobile view ([#23218](https://github.com/RocketChat/Rocket.Chat/pull/23218))
 
-  ### Additional fixed
-
-  - Merge Burger menu components into a single component
-
-  - Show a badge with no-read messages in the Burger Button:
-  ![image](https://user-images.githubusercontent.com/27704687/133679378-20fea2c0-4ac1-4b4e-886e-45154cc6afea.png)
-
+  ### Additional fixed
  
+  - Merge Burger menu components into a single component
  
+  - Show a badge with no-read messages in the Burger Button:
+  ![image](https://user-images.githubusercontent.com/27704687/133679378-20fea2c0-4ac1-4b4e-886e-45154cc6afea.png)
  
   - remove useSidebarClose hook
 
 - Stop queue when Omnichannel is disabled or the routing method does not support it ([#23261](https://github.com/RocketChat/Rocket.Chat/pull/23261))
 
-  - Add missing key logs
-
-  - Stop queue (and logs) when livechat is disabled or when routing method does not support queue
-
+  - Add missing key logs
  
+  - Stop queue (and logs) when livechat is disabled or when routing method does not support queue
  
   - Stop ignoring offline bot agents from delegation (previously, if a bot was offline, even with "Assign new conversations to bot agent" enabled, bot will be ignored and chat will be left in limbo (since bot was assigned, but offline).
 
 - Toolbox click not working on Safari(iOS) ([#23244](https://github.com/RocketChat/Rocket.Chat/pull/23244))
@@ -840,17 +846,17 @@
 
 - Regression: Blank screen in Jitsi video calls ([#23322](https://github.com/RocketChat/Rocket.Chat/pull/23322))
 
-  - Fix Jitsi calls being disposed even when "Open in new window" setting is disabled;
+  - Fix Jitsi calls being disposed even when "Open in new window" setting is disabled;
    - Fix misspelling on `CallJitsWithData.js` file name.
 
 - Regression: Create new loggers based on server log level ([#23297](https://github.com/RocketChat/Rocket.Chat/pull/23297))
 
 - Regression: Fix app storage migration ([#23286](https://github.com/RocketChat/Rocket.Chat/pull/23286))
 
-  The previous version of this migration didn't take into consideration apps that were installed prior to [Rocket.Chat@3.8.0](https://github.com/RocketChat/Rocket.Chat/releases/tag/3.8.0), which [removed the typescript compiler from the server](https://github.com/RocketChat/Rocket.Chat/pull/18687) and into the CLI. As a result, the zip files inside each installed app's document in the database had typescript files in them instead of the now required javascript files.
-
-  As the new strategy of source code storage for apps changes the way the app is loaded, those zip files containing the source code are read everytime the app is started (or [in this particular case, updated](https://github.com/RocketChat/Rocket.Chat/pull/23286/files#diff-caf9f7a22478639e58d6514be039140a42ce1ab2d999c3efe5678c38ee36d0ccR43)), and as the zips' contents were wrong, the operation was failing.
-
+  The previous version of this migration didn't take into consideration apps that were installed prior to [Rocket.Chat@3.8.0](https://github.com/RocketChat/Rocket.Chat/releases/tag/3.8.0), which [removed the typescript compiler from the server](https://github.com/RocketChat/Rocket.Chat/pull/18687) and into the CLI. As a result, the zip files inside each installed app's document in the database had typescript files in them instead of the now required javascript files.
+
+  As the new strategy of source code storage for apps changes the way the app is loaded, those zip files containing the source code are read everytime the app is started (or [in this particular case, updated](https://github.com/RocketChat/Rocket.Chat/pull/23286/files#diff-caf9f7a22478639e58d6514be039140a42ce1ab2d999c3efe5678c38ee36d0ccR43)), and as the zips' contents were wrong, the operation was failing.
+
   The fix extract the data from old apps and creates new zip files with the compiled `js` already present.
 
 - Regression: Fix Bugsnag not started error ([#23308](https://github.com/RocketChat/Rocket.Chat/pull/23308))
@@ -1027,10 +1033,8 @@
 
 - **ENTERPRISE:** Maximum waiting time for chats in Omnichannel queue ([#22955](https://github.com/RocketChat/Rocket.Chat/pull/22955))
 
-  - Add new settings to support closing chats that have been too long on waiting queue
-
-  - Moved old settings to new "Queue Management" section
-
+  - Add new settings to support closing chats that have been too long on waiting queue
  
+  - Moved old settings to new "Queue Management" section
  
   - Fix issue when closing a livechat room that caused client to not to know if room was open or not
 
 - Banner for the updates regarding authentication services ([#23055](https://github.com/RocketChat/Rocket.Chat/pull/23055) by [@g-thome](https://github.com/g-thome))
@@ -1045,10 +1049,10 @@
 
 - Separate RegEx Settings for Channels and Usernames validation ([#21937](https://github.com/RocketChat/Rocket.Chat/pull/21937) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  Now, there are 2 separate settings for validating names   - One for **channels** and another for **usernames**.
-
-  This change also removes the old `UTF8_Names_Validation` setting and adds 2 new settings `UTF8_User_Names_Validation` and `UTF8_Channel_Names_Validation`.
-
+  Now, there are 2 separate settings for validating names   - One for **channels** and another for **usernames**.
+
+  This change also removes the old `UTF8_Names_Validation` setting and adds 2 new settings `UTF8_User_Names_Validation` and `UTF8_Channel_Names_Validation`.
+
   https://user-images.githubusercontent.com/55396651/116969904-af5bb800-acd4-11eb-9fc4-dacac60cb08f.mp4
 
 ### 🚀 Improvements
@@ -1064,13 +1068,13 @@
 
 - Rewrite File Upload Modal ([#22750](https://github.com/RocketChat/Rocket.Chat/pull/22750))
 
-  Image preview:
-  ![image](https://user-images.githubusercontent.com/40830821/127223432-dccd2182-aec0-430f-8d70-03ac88aec791.png)
-
-  Video preview:
-  ![image](https://user-images.githubusercontent.com/40830821/127225982-f8b21840-0d9c-4aff-a354-16188c7ed66e.png)
-
-  Files larger than 10mb:
+  Image preview:
+  ![image](https://user-images.githubusercontent.com/40830821/127223432-dccd2182-aec0-430f-8d70-03ac88aec791.png)
+
+  Video preview:
+  ![image](https://user-images.githubusercontent.com/40830821/127225982-f8b21840-0d9c-4aff-a354-16188c7ed66e.png)
+
+  Files larger than 10mb:
   ![image](https://user-images.githubusercontent.com/40830821/127222611-5265040f-a06b-4ec5-b528-89b40e6a9072.png)
 
 - Types from currentChatsPage.tsx ([#22967](https://github.com/RocketChat/Rocket.Chat/pull/22967))
@@ -1086,14 +1090,14 @@
 
 - "Users By Time of the Day" chart displays incorrect data for Local Timezone ([#22836](https://github.com/RocketChat/Rocket.Chat/pull/22836))
 
-  - Add local timezone conversion to the "Users By Time of the Day" chart in the Engagement Dashboard;
+  - Add local timezone conversion to the "Users By Time of the Day" chart in the Engagement Dashboard;
    - Simplify date creations by using `endOf` and `startOf` methods.
 
 - Atlassian Crowd connection not working ([#22996](https://github.com/RocketChat/Rocket.Chat/pull/22996) by [@piotrkochan](https://github.com/piotrkochan))
 
 - Audio recording doesn't stop in direct messages on channel switch ([#22880](https://github.com/RocketChat/Rocket.Chat/pull/22880))
 
-  - Cancel audio recordings on message bar destroy event.
+  - Cancel audio recordings on message bar destroy event.
   ![test-22372](https://user-images.githubusercontent.com/36537004/128569780-d83747b0-fb9c-4dc6-9bc5-7ae573e720c8.gif)
 
 - Bad words falling if message is empty ([#22930](https://github.com/RocketChat/Rocket.Chat/pull/22930))
@@ -1118,23 +1122,21 @@
 
 - Return transcript/dashboards based on timezone settings ([#22850](https://github.com/RocketChat/Rocket.Chat/pull/22850))
 
-  - Added new setting to manage timezones
-
-  - Applied new setting to omnichannel dashboards (realtime, analytics) [NOTE: Other dashboards aren't using this setting actually)
-
+  - Added new setting to manage timezones
  
+  - Applied new setting to omnichannel dashboards (realtime, analytics) [NOTE: Other dashboards aren't using this setting actually)
  
   - Change getAnalyticsBetweenDate query to filter out system messages instead of substracting them
 
 - Tab margin style ([#22851](https://github.com/RocketChat/Rocket.Chat/pull/22851))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/128103848-2a25ba7e-0e59-4502-9bcd-2569cad9379a.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/128103848-2a25ba7e-0e59-4502-9bcd-2569cad9379a.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/128103633-ec7b93fc-4667-4dc9-bad3-bfffaff3974e.png)
 
 - Threads and discussions searches don't display proper results ([#22914](https://github.com/RocketChat/Rocket.Chat/pull/22914))
 
-  - _Fix_ issue in discussions search (which wasn't working after a search with no results was made);
+  - _Fix_ issue in discussions search (which wasn't working after a search with no results was made);
    - _Improve_ discussions and threads searches: both searches (`chat.getDiscussions` and `chat.getThreadsList`) are now case insensitive (do NOT differ capital from lower letters) and match incomplete words or terms.
 
 - Threads List being requested more than expected ([#22879](https://github.com/RocketChat/Rocket.Chat/pull/22879))
@@ -1169,8 +1171,8 @@
 
 - Chore: Script to start Rocket.Chat in HA mode during development ([#22398](https://github.com/RocketChat/Rocket.Chat/pull/22398))
 
-  Sometimes we need to start Rocket.Chat in High-Availability mode (cluster) during development to test how a feature behaves or hunt down a bug. Currently, this involves a lot of commands with details that might be lost if you haven't done it in a while.
-
+  Sometimes we need to start Rocket.Chat in High-Availability mode (cluster) during development to test how a feature behaves or hunt down a bug. Currently, this involves a lot of commands with details that might be lost if you haven't done it in a while.
+
   This PR intends to provide a really simple way for us to start many instances of Rocket.Chat connected in a cluster.
 
 - Chore: Update Livechat widget to 1.9.4 ([#22990](https://github.com/RocketChat/Rocket.Chat/pull/22990))
@@ -1187,13 +1189,13 @@
 
 - Regression: File upload name suggestion ([#22953](https://github.com/RocketChat/Rocket.Chat/pull/22953))
 
-  Before:
-  ![image](https://user-images.githubusercontent.com/40830821/129774936-ecdbe9a1-5e3f-4a0a-ad1e-6f13eb15c60b.png)
-  ![image](https://user-images.githubusercontent.com/40830821/129775011-fb0df01d-74e4-41ae-bb47-dcf4cc17735e.png)
-
-
-  After:
-  ![image](https://user-images.githubusercontent.com/40830821/129774877-928a8aa0-c003-4e57-8b33-ea6accc32774.png)
+  Before:
+  ![image](https://user-images.githubusercontent.com/40830821/129774936-ecdbe9a1-5e3f-4a0a-ad1e-6f13eb15c60b.png)
+  ![image](https://user-images.githubusercontent.com/40830821/129775011-fb0df01d-74e4-41ae-bb47-dcf4cc17735e.png)
+
+
+  After:
+  ![image](https://user-images.githubusercontent.com/40830821/129774877-928a8aa0-c003-4e57-8b33-ea6accc32774.png)
   ![image](https://user-images.githubusercontent.com/40830821/129774972-d67debaf-0ce9-44fb-93cb-d7612dd18edf.png)
 
 - Regression: Fix creation of self-DMs ([#23015](https://github.com/RocketChat/Rocket.Chat/pull/23015))
@@ -1261,8 +1263,7 @@
 
 - Fix Auto Selection algorithm on community edition ([#22991](https://github.com/RocketChat/Rocket.Chat/pull/22991))
 
-  - When using the autoselection algo on community editions, all agents were marked as unavailable due to an unapplied filter
-
+  - When using the autoselection algo on community editions, all agents were marked as unavailable due to an unapplied filter
  
   - Fixed an issue when both user & system setting to manange EE max number of chats allowed were set to 0
 
 <details>
@@ -1302,7 +1303,7 @@
 
 - Apps-Engine's scheduler failing to update run tasks ([#22882](https://github.com/RocketChat/Rocket.Chat/pull/22882))
 
-  [Agenda](https://github.com/agenda/agenda), the library that manages scheduling, depended on setting a job property named `nextRunAt` as `undefined` to signal whether it should be run on schedule or not. [Rocket.Chat's current Mongo driver](https://github.com/RocketChat/Rocket.Chat/pull/22399) ignores `undefined` values when updating documents and this was causing jobs to never stop running as Agenda couldn't clear that property (set them as `undefined`).
+  [Agenda](https://github.com/agenda/agenda), the library that manages scheduling, depended on setting a job property named `nextRunAt` as `undefined` to signal whether it should be run on schedule or not. [Rocket.Chat's current Mongo driver](https://github.com/RocketChat/Rocket.Chat/pull/22399) ignores `undefined` values when updating documents and this was causing jobs to never stop running as Agenda couldn't clear that property (set them as `undefined`). 
   This updates Rocket.Chat's dependency on Agenda.js to point to [a fork that fixes the problem](https://github.com/RocketChat/agenda/releases/tag/3.1.2).
 
 - Close omnichannel conversations when agent is deactivated ([#22917](https://github.com/RocketChat/Rocket.Chat/pull/22917))
@@ -1356,7 +1357,7 @@
 
 - Monitoring Track messages' round trip time ([#22676](https://github.com/RocketChat/Rocket.Chat/pull/22676))
 
-  Track messages' roundtrip time from backend saves time to the time when received back from the oplog allowing track of oplog slowness.
+  Track messages' roundtrip time from backend saves time to the time when received back from the oplog allowing track of oplog slowness.
   Prometheus metric: `rocketchat_messages_roundtrip_time`
 
 - REST endpoint to remove User from Role ([#20485](https://github.com/RocketChat/Rocket.Chat/pull/20485) by [@Cosnavel](https://github.com/Cosnavel) & [@lucassartor](https://github.com/lucassartor))
@@ -1368,22 +1369,19 @@
 
 - Change message deletion confirmation modal to toast ([#22544](https://github.com/RocketChat/Rocket.Chat/pull/22544))
 
-  Changed a timed modal for a toast message
+  Changed a timed modal for a toast message
   ![image](https://user-images.githubusercontent.com/40830821/124192670-0646f900-da9c-11eb-941c-9ae35421f6ef.png)
 
 - Configuration for indices in Apps-Engine models ([#22705](https://github.com/RocketChat/Rocket.Chat/pull/22705))
 
-  * Add `appId` field to the data saved by the Scheduler
-
-  * Add `appId` index to `rocketchat_apps_persistence` model
-
-  * Skip "trash collection" when deleting records from `rocketchat_apps_persistence`
-
-  * Add a new setting to control for how long we should keep logs from the apps
-
-  ![image](https://user-images.githubusercontent.com/1810309/126246666-907f9d98-1d84-4dfe-a80a-7dd874d36fa8.png)
-
-
+  * Add `appId` field to the data saved by the Scheduler
  
+  * Add `appId` index to `rocketchat_apps_persistence` model
  
+  * Skip "trash collection" when deleting records from `rocketchat_apps_persistence`
  
+  * Add a new setting to control for how long we should keep logs from the apps
+
+  ![image](https://user-images.githubusercontent.com/1810309/126246666-907f9d98-1d84-4dfe-a80a-7dd874d36fa8.png)
+
+
   ![image](https://user-images.githubusercontent.com/1810309/126246655-2ce3cb5f-b2f5-456e-a9c4-beccd9b3ef41.png)
 
 - Make `shortcut` field of canned responses unique ([#22700](https://github.com/RocketChat/Rocket.Chat/pull/22700))
@@ -1406,38 +1404,37 @@
 
 - Replace remaing discussion creation modals with React modal. ([#22448](https://github.com/RocketChat/Rocket.Chat/pull/22448))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/123840524-cbe72b80-d8e4-11eb-9ddb-23a9f9d90aac.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/123840524-cbe72b80-d8e4-11eb-9ddb-23a9f9d90aac.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/123840219-74e15680-d8e4-11eb-95aa-00a990ffe0e7.png)
 
 - Return open room if available for visitors ([#22742](https://github.com/RocketChat/Rocket.Chat/pull/22742))
 
 - Rewrite Enter Encryption Password Modal ([#22456](https://github.com/RocketChat/Rocket.Chat/pull/22456))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/123182889-bbf3c580-d466-11eb-8d4d-9cfc3d224e33.png)
-
-  ### after
-  ![image](https://user-images.githubusercontent.com/27704687/123182916-cada7800-d466-11eb-96ee-850be190d419.png)
-
-  ### Aditional Improves:
-
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/123182889-bbf3c580-d466-11eb-8d4d-9cfc3d224e33.png)
+
+  ### after
+  ![image](https://user-images.githubusercontent.com/27704687/123182916-cada7800-d466-11eb-96ee-850be190d419.png)
+
+  ### Aditional Improves:
  
   - Added a visual validation in the password field
 
 - Rewrite OTR modals ([#22583](https://github.com/RocketChat/Rocket.Chat/pull/22583))
 
-  ![image](https://user-images.githubusercontent.com/40830821/124513267-cb510800-ddb0-11eb-8165-f103029c348f.png)
-  ![image](https://user-images.githubusercontent.com/40830821/124513354-04897800-ddb1-11eb-96f4-41fe906ca0d7.png)
+  ![image](https://user-images.githubusercontent.com/40830821/124513267-cb510800-ddb0-11eb-8165-f103029c348f.png)
+  ![image](https://user-images.githubusercontent.com/40830821/124513354-04897800-ddb1-11eb-96f4-41fe906ca0d7.png)
   ![image](https://user-images.githubusercontent.com/40830821/124513395-1b2fcf00-ddb1-11eb-83e4-3f8f9b4676ba.png)
 
 - Rewrite Save Encryption Password Modal ([#22447](https://github.com/RocketChat/Rocket.Chat/pull/22447))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/122980201-c337a800-d36e-11eb-8e2b-68534cea8e1e.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/122980201-c337a800-d36e-11eb-8e2b-68534cea8e1e.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/122980409-f8dc9100-d36e-11eb-9c15-aff779c84a91.png)
 
 - Rewrite sidebar footer as React Component ([#22687](https://github.com/RocketChat/Rocket.Chat/pull/22687))
@@ -1452,12 +1449,12 @@
 
 - Wrong error message when trying to create a blocked username ([#22452](https://github.com/RocketChat/Rocket.Chat/pull/22452) by [@lucassartor](https://github.com/lucassartor))
 
-  When trying to create a user with a blocked username, the UI was showing generic error message that it wasn't very detailed.
-
-  Old error message:
-  ![image](https://user-images.githubusercontent.com/49413772/123120080-6d203e80-d41a-11eb-8c87-64e34334c856.png)
-
-  New error message:
+  When trying to create a user with a blocked username, the UI was showing generic error message that it wasn't very detailed.
+
+  Old error message:
+  ![image](https://user-images.githubusercontent.com/49413772/123120080-6d203e80-d41a-11eb-8c87-64e34334c856.png)
+
+  New error message:
   ![aaa](https://user-images.githubusercontent.com/49413772/123120251-8c1ed080-d41a-11eb-8dc2-d7484923d851.PNG)
 
 ### 🐛 Bug fixes
@@ -1465,19 +1462,19 @@
 
 - **ENTERPRISE:** Engagement Dashboard displaying incorrect data about active users ([#22381](https://github.com/RocketChat/Rocket.Chat/pull/22381))
 
-  - Fix sessions' and users' grouping in the Engagement Dashboard API endpoints;
-   - Fix the data displayed in the charts from the "Active users", "Users by time of day" and "When is the chat busier?" sections of the Engagement Dashboard;
+  - Fix sessions' and users' grouping in the Engagement Dashboard API endpoints;
+   - Fix the data displayed in the charts from the "Active users", "Users by time of day" and "When is the chat busier?" sections of the Engagement Dashboard;
    - Replace label used to describe the amount of Active Users in the License section of the Info page.
 
 - **ENTERPRISE:** Make AutoSelect algo take current agent load in consideration ([#22611](https://github.com/RocketChat/Rocket.Chat/pull/22611))
 
 - **ENTERPRISE:** Race condition on Omnichannel visitor abandoned callback ([#22413](https://github.com/RocketChat/Rocket.Chat/pull/22413))
 
-  As you can see [here](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/ee/app/livechat-enterprise/server/lib/Helper.js#L127) the `predictedVisitorAbandonment` flag is not set if the room object doesn't have  `v.lastMessageTs` property. So we need to always make sure the `v.lastMessageTs` is set before this method is called.
-
-  Currently the `v.lastMessageTs` is being set in [this](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/app/livechat/server/hooks/saveLastVisitorMessageTs.js#L4) (lets call this **hook-1**) hook which has `HIGH` priority
-  and the `predictedVisitorAbandonment` check is inturn performed in [this](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/ee/app/livechat-enterprise/server/hooks/setPredictedVisitorAbandonmentTime.js#L5) (let call this **hook-2**) hook which is also `HIGH` priority.
-
+  As you can see [here](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/ee/app/livechat-enterprise/server/lib/Helper.js#L127) the `predictedVisitorAbandonment` flag is not set if the room object doesn't have  `v.lastMessageTs` property. So we need to always make sure the `v.lastMessageTs` is set before this method is called.
+
+  Currently the `v.lastMessageTs` is being set in [this](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/app/livechat/server/hooks/saveLastVisitorMessageTs.js#L4) (lets call this **hook-1**) hook which has `HIGH` priority
+  and the `predictedVisitorAbandonment` check is inturn performed in [this](https://github.com/RocketChat/Rocket.Chat/blob/857791c39c97b51b5b6fd3718e0c816959a81c3b/ee/app/livechat-enterprise/server/hooks/setPredictedVisitorAbandonmentTime.js#L5) (let call this **hook-2**) hook which is also `HIGH` priority.
+
   So ideally we'd except the **hook-1** to be called b4 **hook-2**, however currently since both of them are at same priority, there is no way to control which one is executed first. Hence in this PR, I'm making the priority of **hook-2** as `MEDIUM` to keeping the priority of **hook-1** the same as b4, i.e. `HIGH`. This should make sure that the **hook-1** is always executed b4 **hook-2**
 
 - Admin page crashing when commit hash is null ([#22057](https://github.com/RocketChat/Rocket.Chat/pull/22057) by [@cprice-kgi](https://github.com/cprice-kgi))
@@ -1486,41 +1483,39 @@
 
 - Blank screen in message auditing DM tab ([#22763](https://github.com/RocketChat/Rocket.Chat/pull/22763))
 
-  The DM tab in message auditing was displaying a blank screen, instead of the actual tab.
-
+  The DM tab in message auditing was displaying a blank screen, instead of the actual tab.
+
   ![image](https://user-images.githubusercontent.com/28611993/127041404-dfca7f6a-2b8b-4c15-9cbd-c6238fac0063.png)
 
 - Bugs in AutoCompleteDepartment ([#22414](https://github.com/RocketChat/Rocket.Chat/pull/22414))
 
 - Call button is still displayed when the user doesn't have permission to use it ([#22170](https://github.com/RocketChat/Rocket.Chat/pull/22170))
 
-  - Hide 'Call' buttons from the tab bar for muted users;
-
+  - Hide 'Call' buttons from the tab bar for muted users;
  
   - Display an error when a muted user attempts to enter a call using the 'Click to Join!' button.
 
 - Can't see full user profile on team's room ([#22355](https://github.com/RocketChat/Rocket.Chat/pull/22355))
 
-  ### before
-  ![before](https://user-images.githubusercontent.com/27704687/121966860-bbac4980-cd45-11eb-8d48-2b0457110fc7.gif)
-
-  ### after
-  ![after](https://user-images.githubusercontent.com/27704687/121966870-bea73a00-cd45-11eb-9c89-ec52ac17e20f.gif)
-
-  ### aditional fix :rocket:
-
+  ### before
+  ![before](https://user-images.githubusercontent.com/27704687/121966860-bbac4980-cd45-11eb-8d48-2b0457110fc7.gif)
+
+  ### after
+  ![after](https://user-images.githubusercontent.com/27704687/121966870-bea73a00-cd45-11eb-9c89-ec52ac17e20f.gif)
+
+  ### aditional fix :rocket:
  
   - unnecessary `TeamsMembers` component removed
 
 - Cannot create a discussion from top left sidebar as a user ([#22618](https://github.com/RocketChat/Rocket.Chat/pull/22618) by [@lucassartor](https://github.com/lucassartor))
 
-  When trying to create a discussion using the top left sidebar modal with an role that don't have the `view-other-user-channels ` permission, an empty list would be shown, which is a wrong behavior.
-  Also, when being able to use this modal, discussions were listed as options, which is also a wrong behavior as there can't be nested discussions.
-
-  This PR looks to fix both these issues.
-
-  **Old behavior:**
-  ![old](https://user-images.githubusercontent.com/49413772/124960017-3c333280-dff2-11eb-86cd-b2638311517e.png)
-
-  **New behavior:**
+  When trying to create a discussion using the top left sidebar modal with an role that don't have the `view-other-user-channels ` permission, an empty list would be shown, which is a wrong behavior.
+  Also, when being able to use this modal, discussions were listed as options, which is also a wrong behavior as there can't be nested discussions.
+
+  This PR looks to fix both these issues.
+
+  **Old behavior:**
+  ![old](https://user-images.githubusercontent.com/49413772/124960017-3c333280-dff2-11eb-86cd-b2638311517e.png)
+
+  **New behavior:**
   ![image](https://user-images.githubusercontent.com/49413772/124958882-05a8e800-dff1-11eb-8203-b34a4f1c98a0.png)
 
 - Channel is automatically getting added to the first option in move to team feature ([#22670](https://github.com/RocketChat/Rocket.Chat/pull/22670))
@@ -1535,12 +1530,12 @@
 
 - Create discussion modal - cancel button and invite users alignment ([#22718](https://github.com/RocketChat/Rocket.Chat/pull/22718))
 
-  Changes in "open discussion" modal
-
-  > Added cancel button
-  > Fixed alignment in invite user
-
-
+  Changes in "open discussion" modal
+
+  > Added cancel button
+  > Fixed alignment in invite user
+
+
   ![image](https://user-images.githubusercontent.com/28611993/126388304-6ac76574-6924-426e-843d-afd53dc1c874.png)
 
 - crush in the getChannelHistory method ([#22667](https://github.com/RocketChat/Rocket.Chat/pull/22667) by [@MaestroArt](https://github.com/MaestroArt))
@@ -1575,29 +1570,27 @@
 
 - Quote message not working for Livechat visitors ([#22586](https://github.com/RocketChat/Rocket.Chat/pull/22586))
 
-  ### Before:
-  ![image](https://user-images.githubusercontent.com/34130764/124583613-de2b1180-de70-11eb-82aa-18564b317626.png)
-  ### After:
+  ### Before:
+  ![image](https://user-images.githubusercontent.com/34130764/124583613-de2b1180-de70-11eb-82aa-18564b317626.png)
+  ### After:
   ![image](https://user-images.githubusercontent.com/34130764/124583775-12063700-de71-11eb-8ab5-b0169fac2d40.png)
 
 - Redirect to login after delete own account ([#22499](https://github.com/RocketChat/Rocket.Chat/pull/22499))
 
-  Redirect the user to login after delete own account
-
-  ### Aditional fixes:
-
-  - Visual issue in password input on Delete Own Account Modal
-
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/123711503-f5ea1080-d846-11eb-96aa-8ed638ca665c.png)
-
-  ### after
+  Redirect the user to login after delete own account
+
+  ### Aditional fixes:
  
+  - Visual issue in password input on Delete Own Account Modal
+
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/123711503-f5ea1080-d846-11eb-96aa-8ed638ca665c.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/123711336-b3c0cf00-d846-11eb-9408-a686d8668ba5.png)
 
 - Remove stack traces from Meteor errors when debug setting is disabled ([#22699](https://github.com/RocketChat/Rocket.Chat/pull/22699))
 
-  - Fix 'not iterable' errors in the `normalizeMessage` function;
-
+  - Fix 'not iterable' errors in the `normalizeMessage` function;
  
   - Remove stack traces from errors thrown by the `jitsi:updateTimeout` (and other `Meteor.Error`s) method.
 
 - Rewrite CurrentChats to TS ([#22424](https://github.com/RocketChat/Rocket.Chat/pull/22424))
@@ -1686,16 +1679,15 @@
 
 - Regression: Data in the "Active Users" section is delayed in 1 day ([#22794](https://github.com/RocketChat/Rocket.Chat/pull/22794))
 
-  - Fix 1 day delay in the Engagement Dashboard's "Active Users" section;
-
-  - Downgrade `@nivo/line` version.
-  **Expected behavior:**
+  - Fix 1 day delay in the Engagement Dashboard's "Active Users" section;
  
+  - Downgrade `@nivo/line` version.
+  **Expected behavior:**
   ![active-users-engagement-dashboard](https://user-images.githubusercontent.com/36537004/127372185-390dc42f-bc90-4841-a22b-731f0aafcafe.PNG)
 
 - Regression: Data in the "New Users" section is delayed in 1 day ([#22751](https://github.com/RocketChat/Rocket.Chat/pull/22751))
 
-  - Update nivo version (which was causing errors in the bar chart);
-   - Fix 1 day delay in '7 days' and '30 days' periods;
+  - Update nivo version (which was causing errors in the bar chart);
+   - Fix 1 day delay in '7 days' and '30 days' periods;
    - Update tooltip theme.
 
 - Regression: Federation warnings on ci ([#22765](https://github.com/RocketChat/Rocket.Chat/pull/22765) by [@g-thome](https://github.com/g-thome))
@@ -1720,9 +1712,9 @@
 
 - Regression: Fix tooltip style in the "Busiest Chat Times" chart ([#22813](https://github.com/RocketChat/Rocket.Chat/pull/22813))
 
-  - Fix tooltip in the Engagement Dashboard's "Busiest Chat Times" chart (Hours).
-
-  **Expected behavior:**
+  - Fix tooltip in the Engagement Dashboard's "Busiest Chat Times" chart (Hours).
+
+  **Expected behavior:**
   ![busiest-times-ed](https://user-images.githubusercontent.com/36537004/127527827-465397ed-f089-4fb7-9ab2-6fa8cea6abdf.PNG)
 
 - Regression: Fix users not being able to see the scope of the canned m… ([#22760](https://github.com/RocketChat/Rocket.Chat/pull/22760))
@@ -1739,10 +1731,10 @@
 
 - Regression: Prevent custom status from being visible in sequential messages ([#22733](https://github.com/RocketChat/Rocket.Chat/pull/22733))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/126641946-866dae96-1983-43a5-b689-b24670473ad0.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/126641946-866dae96-1983-43a5-b689-b24670473ad0.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/126641752-3163eb95-1cd4-4d99-a61a-4d06d9e7e13e.png)
 
 - Regression: Properly force newline in attachment fields ([#22727](https://github.com/RocketChat/Rocket.Chat/pull/22727))
@@ -1923,32 +1915,30 @@
 
 - Add `teams.convertToChannel` endpoint ([#22188](https://github.com/RocketChat/Rocket.Chat/pull/22188))
 
-  - Add new `teams.converToChannel` endpoint;
-
-  - Update `ConvertToTeam` modal text (since this action can now be reversed);
-
+  - Add new `teams.converToChannel` endpoint;
  
+  - Update `ConvertToTeam` modal text (since this action can now be reversed);
  
   - Remove corresponding team memberships when a team is deleted or converted to a channel;
 
 - Add setting to configure default role for user on manual registration ([#20650](https://github.com/RocketChat/Rocket.Chat/pull/20650) by [@lucassartor](https://github.com/lucassartor))
 
-  Add an `admin` setting to determine the initial `role` for new users who registered manually (through the register form and via API, not using an authentication service), normally all new users are assigned to the `user` role.
-
-  The setting can be found in `Admin`->`Accounts`->`Registration`.
-
-  ![image](https://user-images.githubusercontent.com/49413772/107252603-47b70900-6a14-11eb-9cc6-df76720b7365.png)
-  The setting initial value is false, so the default behaviour stays the same while creating a new server or upgrading one.
-
-  https://user-images.githubusercontent.com/49413772/107253220-ddeb2f00-6a14-11eb-85b4-f770dbbe4970.mp4
-
+  Add an `admin` setting to determine the initial `role` for new users who registered manually (through the register form and via API, not using an authentication service), normally all new users are assigned to the `user` role.
+
+  The setting can be found in `Admin`->`Accounts`->`Registration`.
+
+  ![image](https://user-images.githubusercontent.com/49413772/107252603-47b70900-6a14-11eb-9cc6-df76720b7365.png)
+  The setting initial value is false, so the default behaviour stays the same while creating a new server or upgrading one.
+
+  https://user-images.githubusercontent.com/49413772/107253220-ddeb2f00-6a14-11eb-85b4-f770dbbe4970.mp4
+
   Video showing an example of the setting being used and creating an new user with the default roles via API.
 
 - Content-Security-Policy for inline scripts ([#20724](https://github.com/RocketChat/Rocket.Chat/pull/20724))
 
-  Security policies were applied for inline scripts cases. Due to the libraries and components we use it is not possible to disable inline styles and images as they would break Oembeds and other libraries.
-
-
-  basically the inline scripts were moved to a js file
-
+  Security policies were applied for inline scripts cases. Due to the libraries and components we use it is not possible to disable inline styles and images as they would break Oembeds and other libraries.
+
+
+  basically the inline scripts were moved to a js file
+
   and besides that some suggars syntax like `addScript` and `addStyle` were added, this way the application already takes care of inserting the elements and providing the content automatically.
 
 - Open modals in side effects outside React ([#22247](https://github.com/RocketChat/Rocket.Chat/pull/22247))
@@ -1964,17 +1954,15 @@
 
 - Add BBB and Jitsi to Team ([#22312](https://github.com/RocketChat/Rocket.Chat/pull/22312))
 
-  Added 2 new settings:
-
-  - `Admin > Video Conference > Big Blue Button > Enable for teams`
-
+  Added 2 new settings:
  
+  - `Admin > Video Conference > Big Blue Button > Enable for teams`
  
   - `Admin > Video Conference > Jitsi > Enable in teams`
 
 - Add debouncing to units selects filters ([#22097](https://github.com/RocketChat/Rocket.Chat/pull/22097))
 
 - Add modal to close chats when tags/comments are not required ([#22245](https://github.com/RocketChat/Rocket.Chat/pull/22245) by [@rafaelblink](https://github.com/rafaelblink))
 
-  When neither tags or comments are required to close a livechat, show this modal instead:
+  When neither tags or comments are required to close a livechat, show this modal instead: 
   ![Screen Shot 2021-05-20 at 7 33 19 PM](https://user-images.githubusercontent.com/20868078/119057741-6af23c80-b9a3-11eb-902f-f8a7458ad11c.png)
 
 - Fallback messages on contextual bar ([#22376](https://github.com/RocketChat/Rocket.Chat/pull/22376))
@@ -1997,10 +1985,10 @@
 
 - Remove differentiation between public x private channels in sidebar ([#22160](https://github.com/RocketChat/Rocket.Chat/pull/22160))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/119752184-e7d55880-be72-11eb-9167-be2f305ddb3f.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/119752184-e7d55880-be72-11eb-9167-be2f305ddb3f.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/119752125-c8d6c680-be72-11eb-8444-2e0c7cb1c600.png)
 
 - Rewrite create direct modal ([#22209](https://github.com/RocketChat/Rocket.Chat/pull/22209))
@@ -2009,8 +1997,8 @@
 
 - Rewrite Create Discussion Modal (only through sidebar) ([#22224](https://github.com/RocketChat/Rocket.Chat/pull/22224))
 
-  This is only available by creating a new discussion when clicking on the sidebar button. Other places will be implemented afterwards.
-
+  This is only available by creating a new discussion when clicking on the sidebar button. Other places will be implemented afterwards.
+
   ![image](https://user-images.githubusercontent.com/40830821/120556093-6af63180-c3d2-11eb-97ea-63c5423049dc.png)
 
 - Send only relevant data via WebSocket ([#22258](https://github.com/RocketChat/Rocket.Chat/pull/22258))
@@ -2024,12 +2012,12 @@
 
 - **EE:** Canned responses can't be deleted ([#22095](https://github.com/RocketChat/Rocket.Chat/pull/22095) by [@rafaelblink](https://github.com/rafaelblink))
 
-  Deletion button has been removed from the edition option.
-
-  ## Before
-  ![image](https://user-images.githubusercontent.com/2493803/119059416-9f1b2c80-b9a6-11eb-933a-4efa1ac0552a.png)
-
-  ### After
+  Deletion button has been removed from the edition option.
+
+  ## Before
+  ![image](https://user-images.githubusercontent.com/2493803/119059416-9f1b2c80-b9a6-11eb-933a-4efa1ac0552a.png)
+
+  ### After
   ![Rocket Chat (2)](https://user-images.githubusercontent.com/2493803/119172517-72b1ef80-ba3c-11eb-9178-04a12176f312.gif)
 
 - **ENTERPRISE:** Omnichannel enterprise permissions being added back to its default roles ([#22322](https://github.com/RocketChat/Rocket.Chat/pull/22322))
@@ -2038,19 +2026,19 @@
 
 - **ENTERPRISE:** Prevent Visitor Abandonment after forwarding chat ([#22243](https://github.com/RocketChat/Rocket.Chat/pull/22243))
 
-  Currently the Visitor Abandonment timer isn't affected when the chat is forwarded. However this is affecting the UX in certain situations like eg: A bot forwarding a chat to an human agent
-  ![image](https://user-images.githubusercontent.com/34130764/120896383-e4925780-c63e-11eb-937e-ffd7c4836159.png)
-
+  Currently the Visitor Abandonment timer isn't affected when the chat is forwarded. However this is affecting the UX in certain situations like eg: A bot forwarding a chat to an human agent
+  ![image](https://user-images.githubusercontent.com/34130764/120896383-e4925780-c63e-11eb-937e-ffd7c4836159.png)
+
   To solve this issue, we'll now be stoping the Visitor Abandonment timer once a chat is forwarded.
 
 - **IMPROVE:** Prevent creation of duplicated roles and new `roles.update` endpoint ([#22279](https://github.com/RocketChat/Rocket.Chat/pull/22279) by [@lucassartor](https://github.com/lucassartor))
 
-  Currently, the action of updating a role is broken: because roles have their `_id` = `name`, when updating a role there's no way to validate if the user is trying to update or create a new role with a name that already exists   -  which causes wrong behaviors, such as roles with the same name and not being able to update them.
-
-  To proper fix this, this PR looks to change the creation of roles. Now, roles have a unique  `_id` value and there's a endpoint to update roles: `/api/v1/roles.update`.
-
-  Doing so, it's possible to validate on both endpoints (`roles.create` and `roles.update`) to not allow roles with duplicated names.
-
+  Currently, the action of updating a role is broken: because roles have their `_id` = `name`, when updating a role there's no way to validate if the user is trying to update or create a new role with a name that already exists   -  which causes wrong behaviors, such as roles with the same name and not being able to update them.
+
+  To proper fix this, this PR looks to change the creation of roles. Now, roles have a unique  `_id` value and there's a endpoint to update roles: `/api/v1/roles.update`.
+
+  Doing so, it's possible to validate on both endpoints (`roles.create` and `roles.update`) to not allow roles with duplicated names.
+
   **OBS:** The unique id changes only reflect new roles, the standard roles (such as admin and user) still have `_id` = `name`, but new roles now **can't** have the same name as them.
 
 - `channels.history`, `groups.history` and `im.history` REST endpoints not respecting hide system message config ([#22364](https://github.com/RocketChat/Rocket.Chat/pull/22364))
@@ -2067,10 +2055,10 @@
 
 - Can't delete file from Room's file list ([#22191](https://github.com/RocketChat/Rocket.Chat/pull/22191))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/120215931-bb239700-c20c-11eb-9494-d4bc017df390.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/120215931-bb239700-c20c-11eb-9494-d4bc017df390.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/120216113-f8882480-c20c-11eb-9afb-b127e66a43da.png)
 
 - Cancel button and success toast at Leave Team modal ([#22373](https://github.com/RocketChat/Rocket.Chat/pull/22373))
@@ -2081,10 +2069,10 @@
 
 - Convert and Move team permission ([#22350](https://github.com/RocketChat/Rocket.Chat/pull/22350))
 
-  ### before
-  https://user-images.githubusercontent.com/45966964/114909360-5c04f100-9e1d-11eb-9363-f308e5d0be68.mp4
-
-  ### after
+  ### before
+  https://user-images.githubusercontent.com/45966964/114909360-5c04f100-9e1d-11eb-9363-f308e5d0be68.mp4
+
+  ### after
   https://user-images.githubusercontent.com/45966964/114909388-61fad200-9e1d-11eb-9bbe-114b55954a9f.mp4
 
 - CORS error while interacting with any action button on Livechat  ([#22150](https://github.com/RocketChat/Rocket.Chat/pull/22150))
@@ -2103,50 +2091,50 @@
 
 - Members tab visual issues ([#22138](https://github.com/RocketChat/Rocket.Chat/pull/22138))
 
-  ## Before
-  ![image](https://user-images.githubusercontent.com/27704687/119558283-95fbd800-bd77-11eb-91b4-91821f365bf3.png)
-
-  ## After
+  ## Before
+  ![image](https://user-images.githubusercontent.com/27704687/119558283-95fbd800-bd77-11eb-91b4-91821f365bf3.png)
+
+  ## After
   ![image](https://user-images.githubusercontent.com/27704687/119558120-6947c080-bd77-11eb-8ecb-7fedc07afa82.png)
 
 - Memory leak generated by Stream Cast usage ([#22329](https://github.com/RocketChat/Rocket.Chat/pull/22329))
 
-  Stream Cast uses a different approach to broadcast data to the instances, it uses the DDP subscription method that requires a collection on the other side, if no collection exists with the given name `broadcast-stream` it caches in memory waiting for the collection to be set later. The cache is cleared only when a reconnection happens.
-
+  Stream Cast uses a different approach to broadcast data to the instances, it uses the DDP subscription method that requires a collection on the other side, if no collection exists with the given name `broadcast-stream` it caches in memory waiting for the collection to be set later. The cache is cleared only when a reconnection happens.
+
   This PR overrides the function that processes the data for that specific connection, preventing the cache and everything else to be processed since we already have our low-level listener to process the data.
 
 - Message box hiding on mobile view (Safari) ([#22212](https://github.com/RocketChat/Rocket.Chat/pull/22212))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/120404256-5b1c1600-c31c-11eb-96e9-860e4132db5f.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/120404256-5b1c1600-c31c-11eb-96e9-860e4132db5f.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/120404406-acc4a080-c31c-11eb-9efb-c2ad88664fda.png)
 
 - Missing burger menu on direct messages ([#22211](https://github.com/RocketChat/Rocket.Chat/pull/22211))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/120403671-09bf5700-c31b-11eb-92a1-a2f589bd85fc.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/120403671-09bf5700-c31b-11eb-92a1-a2f589bd85fc.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/120403693-1643af80-c31b-11eb-8027-dbdc4f560647.png)
 
 - Missing Throbber while thread list is loading ([#22316](https://github.com/RocketChat/Rocket.Chat/pull/22316))
 
-  ### before
-  List was starting with no results even if there's results:
-
-  ![image](https://user-images.githubusercontent.com/27704687/121606744-1e8ba100-ca25-11eb-9b31-706fb998d05f.png)
-
-  ### after
+  ### before
+  List was starting with no results even if there's results:
+
+  ![image](https://user-images.githubusercontent.com/27704687/121606744-1e8ba100-ca25-11eb-9b31-706fb998d05f.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/121606635-e97f4e80-ca24-11eb-81f7-af8b0cc41c89.png)
 
 - Not possible to edit some messages inside threads ([#22325](https://github.com/RocketChat/Rocket.Chat/pull/22325))
 
-  ### Before
-  ![before](https://user-images.githubusercontent.com/27704687/121755733-4eeb4200-caee-11eb-9d77-1b498c38c478.gif)
-
-  ### After
+  ### Before
+  ![before](https://user-images.githubusercontent.com/27704687/121755733-4eeb4200-caee-11eb-9d77-1b498c38c478.gif)
+
+  ### After
   ![after](https://user-images.githubusercontent.com/27704687/121755736-514d9c00-caee-11eb-9897-78fcead172f2.gif)
 
 - Notifications not using user's name ([#22309](https://github.com/RocketChat/Rocket.Chat/pull/22309))
@@ -2173,10 +2161,10 @@
 
 - Sidebar not closing when clicking on a channel ([#22271](https://github.com/RocketChat/Rocket.Chat/pull/22271))
 
-  ### before
-  ![before](https://user-images.githubusercontent.com/27704687/121074843-c6e20100-c7aa-11eb-88db-76e39b57b064.gif)
-
-  ### after
+  ### before
+  ![before](https://user-images.githubusercontent.com/27704687/121074843-c6e20100-c7aa-11eb-88db-76e39b57b064.gif)
+
+  ### after
   ![after](https://user-images.githubusercontent.com/27704687/121074860-cb0e1e80-c7aa-11eb-9e96-06d75044b763.gif)
 
 - Sound notification is not emitted when the Omnichannel chat comes from another department ([#22291](https://github.com/RocketChat/Rocket.Chat/pull/22291))
@@ -2187,9 +2175,9 @@
 
 - Undefined error when forwarding chats to offline department ([#22154](https://github.com/RocketChat/Rocket.Chat/pull/22154) by [@rafaelblink](https://github.com/rafaelblink))
 
-  ![Screen Shot 2021-05-26 at 5 29 17 PM](https://user-images.githubusercontent.com/59577424/119727520-c495b380-be48-11eb-88a2-158017c7ad0a.png)
-
-  Omnichannel agents are facing the error shown above when forwarding chats to offline departments.
+  ![Screen Shot 2021-05-26 at 5 29 17 PM](https://user-images.githubusercontent.com/59577424/119727520-c495b380-be48-11eb-88a2-158017c7ad0a.png)
+
+  Omnichannel agents are facing the error shown above when forwarding chats to offline departments.
   The error usually takes place when the routing system algorithm is **Manual Selection**.
 
 - Unread bar in channel flash quickly and then disappear ([#22275](https://github.com/RocketChat/Rocket.Chat/pull/22275))
@@ -2220,15 +2208,15 @@
 
 - Chore: Change modals for remove user from team && leave team ([#22141](https://github.com/RocketChat/Rocket.Chat/pull/22141))
 
-  ![image](https://user-images.githubusercontent.com/40830821/119576154-93f14380-bd8e-11eb-8885-f889f2939bf4.png)
+  ![image](https://user-images.githubusercontent.com/40830821/119576154-93f14380-bd8e-11eb-8885-f889f2939bf4.png)
   ![image](https://user-images.githubusercontent.com/40830821/119576219-b5eac600-bd8e-11eb-832c-ea7a17a56bdd.png)
 
 - Chore: Check PR Title on every submission ([#22140](https://github.com/RocketChat/Rocket.Chat/pull/22140))
 
 - Chore: Enable push gateway only if the server is registered ([#22346](https://github.com/RocketChat/Rocket.Chat/pull/22346) by [@lucassartor](https://github.com/lucassartor))
 
-  Currently, when creating an unregistered server, the default value of the push gateway setting is set to true and is disabled (it can't be changed unless the server is registered). This is a wrong behavior as an unregistered server **can't** use the push gateway.
-
+  Currently, when creating an unregistered server, the default value of the push gateway setting is set to true and is disabled (it can't be changed unless the server is registered). This is a wrong behavior as an unregistered server **can't** use the push gateway.
+
   This PR creates a validation to check if the server is registered when enabling the push gateway. That way, even if the push gateway setting is turned on, but the server is unregistered, the push gateway **won't** work   - it will behave like it is off.
 
 - Chore: Enforce TypeScript on Storybook ([#22317](https://github.com/RocketChat/Rocket.Chat/pull/22317))
@@ -2245,7 +2233,7 @@
 
 - Chore: Update delete team modal to new design ([#22127](https://github.com/RocketChat/Rocket.Chat/pull/22127))
 
-  Now the modal has only 2 steps (steps 1 and 2 were merged)
+  Now the modal has only 2 steps (steps 1 and 2 were merged)
   ![image](https://user-images.githubusercontent.com/40830821/119414580-2e398480-bcc6-11eb-9a47-515568257974.png)
 
 - Language update from LingoHub 🤖 on 2021-05-31Z ([#22196](https://github.com/RocketChat/Rocket.Chat/pull/22196))
@@ -2272,10 +2260,10 @@
 
 - Regression: Missing flexDirection on select field ([#22300](https://github.com/RocketChat/Rocket.Chat/pull/22300))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/121425905-532a2a80-c949-11eb-885f-e8ddaf5c8d5c.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/121425905-532a2a80-c949-11eb-885f-e8ddaf5c8d5c.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/121425770-283fd680-c949-11eb-8d94-86886f174599.png)
 
 - Regression: RoomProvider using wrong types ([#22370](https://github.com/RocketChat/Rocket.Chat/pull/22370))
@@ -2416,50 +2404,50 @@
 
 - **ENTERPRISE:** Introduce Load Rotation routing algorithm for Omnichannel ([#22090](https://github.com/RocketChat/Rocket.Chat/pull/22090) by [@rafaelblink](https://github.com/rafaelblink))
 
-  This PR introduces a new Auto Chat Distribution (ACD) algorithm for Omnichannel: **Load Rotation**.
-  The algorithm distributes chats to agents one by one, which means that when a new chat arrives, the agent with the oldest routing assignment time will be selected to serve the chat, regardless of the number of chats in progress each agent has.
-
+  This PR introduces a new Auto Chat Distribution (ACD) algorithm for Omnichannel: **Load Rotation**.
+  The algorithm distributes chats to agents one by one, which means that when a new chat arrives, the agent with the oldest routing assignment time will be selected to serve the chat, regardless of the number of chats in progress each agent has.
+
   ![Screen Shot 2021-05-20 at 5 17 40 PM](https://user-images.githubusercontent.com/59577424/119043752-c61a3400-b98f-11eb-8543-f3176879af1d.png)
 
 - Back button for Omnichannel ([#21647](https://github.com/RocketChat/Rocket.Chat/pull/21647) by [@rafaelblink](https://github.com/rafaelblink))
 
 - New Message Parser ([#21962](https://github.com/RocketChat/Rocket.Chat/pull/21962))
 
-  The objective is to put an end to the confusion that we face having multiple parsers, and the problems that this brings, it is still experimental then users need to choose to use it.
-
-  The benefits are multiple. no more unexpected cases or grammatical collisions (in addition to more flexible nested cases like bold within link labels).
-  Besides, we no longer render raw html, instead we use components, so the xss attacks are over (the easy ones at least). Without further discoveries and at the fronted, we only reder what is delivered thus improving our performance.
+  The objective is to put an end to the confusion that we face having multiple parsers, and the problems that this brings, it is still experimental then users need to choose to use it.
+
+  The benefits are multiple. no more unexpected cases or grammatical collisions (in addition to more flexible nested cases like bold within link labels).
+  Besides, we no longer render raw html, instead we use components, so the xss attacks are over (the easy ones at least). Without further discoveries and at the fronted, we only reder what is delivered thus improving our performance.
   This can be used in multiple places, (message, alert, sidenav and in the entire mobile application.)
 
 - Option to notify failed login attempts to a channel ([#21968](https://github.com/RocketChat/Rocket.Chat/pull/21968))
 
 - Option to prevent users from using Invisible status ([#20084](https://github.com/RocketChat/Rocket.Chat/pull/20084) by [@lucassartor](https://github.com/lucassartor))
 
-  Add an `admin` option to allow/disallow the `Invisible` status option from all users. This option is available in the `Accounts` section.
-
-  ![2021-01-06-11-55-22](https://user-images.githubusercontent.com/49413772/103782988-ebc52300-5016-11eb-8a29-dd540c21e11c.gif)
-
-  If the option is turned off, the `users.setStatus` endpoint is also restricted from users trying to change their status to `Invisible`, throwing the following error:
-  ```json
-  {
-    "success": false,
-    "error": "Invisible status is disabled [error-not-allowed]",
-    "stack": "Error: Invisible status is disabled [error-not-allowed]\n    at DDPCommon.MethodInvocation.<anonymous> (app/api/server/v1/users.js:425:13)\n    at packages/dispatch_run-as-user.js:211:14\n    at Meteor.EnvironmentVariable.EVp.withValue (packages/meteor.js:1234:12)\n    at Object.Meteor.runAsUser (packages/dispatch_run-as-user.js:210:33)\n    at Object.post (app/api/server/v1/users.js:415:10)\n    at app/api/server/api.js:394:82\n    at Meteor.EnvironmentVariable.EVp.withValue (packages/meteor.js:1234:12)\n    at Object._internalRouteActionHandler [as action] (app/api/server/api.js:394:39)\n    at Route.share.Route.Route._callEndpoint (packages/nimble_restivus/lib/route.coffee:150:32)\n    at packages/nimble_restivus/lib/route.coffee:59:33\n    at packages/simple_json-routes.js:98:9",
-    "errorType": "error-not-allowed",
-    "details": {
-        "method": "users.setStatus"
-    }
-  }
+  Add an `admin` option to allow/disallow the `Invisible` status option from all users. This option is available in the `Accounts` section.
+
+  ![2021-01-06-11-55-22](https://user-images.githubusercontent.com/49413772/103782988-ebc52300-5016-11eb-8a29-dd540c21e11c.gif)
+
+  If the option is turned off, the `users.setStatus` endpoint is also restricted from users trying to change their status to `Invisible`, throwing the following error:
+  ```json
+  {
+    "success": false,
+    "error": "Invisible status is disabled [error-not-allowed]",
+    "stack": "Error: Invisible status is disabled [error-not-allowed]\n    at DDPCommon.MethodInvocation.<anonymous> (app/api/server/v1/users.js:425:13)\n    at packages/dispatch_run-as-user.js:211:14\n    at Meteor.EnvironmentVariable.EVp.withValue (packages/meteor.js:1234:12)\n    at Object.Meteor.runAsUser (packages/dispatch_run-as-user.js:210:33)\n    at Object.post (app/api/server/v1/users.js:415:10)\n    at app/api/server/api.js:394:82\n    at Meteor.EnvironmentVariable.EVp.withValue (packages/meteor.js:1234:12)\n    at Object._internalRouteActionHandler [as action] (app/api/server/api.js:394:39)\n    at Route.share.Route.Route._callEndpoint (packages/nimble_restivus/lib/route.coffee:150:32)\n    at packages/nimble_restivus/lib/route.coffee:59:33\n    at packages/simple_json-routes.js:98:9",
+    "errorType": "error-not-allowed",
+    "details": {
+        "method": "users.setStatus"
+    }
+  }
   ```
 
 - Paginated and Filtered selects on new/edit unit ([#22052](https://github.com/RocketChat/Rocket.Chat/pull/22052) by [@rafaelblink](https://github.com/rafaelblink))
 
-  REQUIRES https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/447
-
-  Adds infinite scrolling selects to the units edit/create  with the ability to be filtered by text as well
-
-  ![Screen Shot 2021-05-17 at 9 24 19 AM](https://user-images.githubusercontent.com/20868078/118487999-abc32a80-b6f1-11eb-8d58-d031111ea0fb.png)
-
+  REQUIRES https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/447
+
+  Adds infinite scrolling selects to the units edit/create  with the ability to be filtered by text as well
+
+  ![Screen Shot 2021-05-17 at 9 24 19 AM](https://user-images.githubusercontent.com/20868078/118487999-abc32a80-b6f1-11eb-8d58-d031111ea0fb.png)
+
   This Affects the monitors and departments inputs
 
 - Remove exif metadata from uploaded files ([#22044](https://github.com/RocketChat/Rocket.Chat/pull/22044))
@@ -2487,17 +2475,13 @@
 
 - Inconsistent and misleading 2FA settings ([#22042](https://github.com/RocketChat/Rocket.Chat/pull/22042) by [@lucassartor](https://github.com/lucassartor))
 
-  Currently, there are some inconsistencies and incorrect behaviors on the 2FA settings, such as:
-
-
-  - When disabling the TOTP 2FA, all 2FA are disabled;
-
-  - There are no option to disable only the TOTP 2FA;
-
-  - If 2FA are disabled, the other settings aren't blocked (the e-mail 2FA setting, for example);
-
-  - It lacks some labels to warn the user of some specific 2FA options.
-
+  Currently, there are some inconsistencies and incorrect behaviors on the 2FA settings, such as:
+
  
+  - When disabling the TOTP 2FA, all 2FA are disabled;
  
+  - There are no option to disable only the TOTP 2FA;
  
+  - If 2FA are disabled, the other settings aren't blocked (the e-mail 2FA setting, for example);
  
+  - It lacks some labels to warn the user of some specific 2FA options.
+
   This PR looks to fix those issues.
 
 - LDAP port setting input type to allow only numbers ([#21912](https://github.com/RocketChat/Rocket.Chat/pull/21912) by [@Deepak-learner](https://github.com/Deepak-learner))
@@ -2519,16 +2503,16 @@
 
 - **APPS:** Scheduler duplicating recurrent tasks after server restart ([#21866](https://github.com/RocketChat/Rocket.Chat/pull/21866))
 
-  Reintroduces the old method for creating recurring tasks in the apps' scheduler bridge to ensure tasks won't be duplicated.
-
-  By introducing the [`skipImmediate` property option](https://github.com/RocketChat/Rocket.Chat/pull/21353)  at the [`scheduleRecurring`](https://github.com/RocketChat/Rocket.Chat/blob/f8171f464ed8a7487795651767695fb33a1c709e/app/apps/server/bridges/scheduler.js#L119) method, the `every` method from _agenda.js_, which ensured no duplicates were created, was removed in favor of a more manual procedure. The new procedure was not taking into account the management of duplicates and as a result multiple copies of the same task could be created and they would get executed at the same time.
-
+  Reintroduces the old method for creating recurring tasks in the apps' scheduler bridge to ensure tasks won't be duplicated.
+
+  By introducing the [`skipImmediate` property option](https://github.com/RocketChat/Rocket.Chat/pull/21353)  at the [`scheduleRecurring`](https://github.com/RocketChat/Rocket.Chat/blob/f8171f464ed8a7487795651767695fb33a1c709e/app/apps/server/bridges/scheduler.js#L119) method, the `every` method from _agenda.js_, which ensured no duplicates were created, was removed in favor of a more manual procedure. The new procedure was not taking into account the management of duplicates and as a result multiple copies of the same task could be created and they would get executed at the same time.
+
   In the case of server restarts, every time this event happened and the app had the `startupSetting` configured to use _recurring tasks_, they would get recreated the same number of times. In the case of a server that restarts frequently (_n_ times), there would be the same (_n_) number of tasks duplicated (and running) in the system.
 
 - **ENTERPRISE:** Omnichannel Monitors can't forward chats to departments that they are not supervising ([#22128](https://github.com/RocketChat/Rocket.Chat/pull/22128))
 
-  Currently, Omnichannel Monitors just can't forward chats to a department that is part of a `Business Unit` they're not supervising. This issue is causing critical problems on customer operations since this behaviour is not by design.
-  The reason this issue is taking place is that, by design, Monitors just have access to departments related to the `Business Units` they're monitoring, but this restriction is designed only for Omnichannel management areas, which means in case the monitor is, also, an agent, they're supposed to be able to forward a chat to any available departments regardless the `Business Units` it's associated with.
+  Currently, Omnichannel Monitors just can't forward chats to a department that is part of a `Business Unit` they're not supervising. This issue is causing critical problems on customer operations since this behaviour is not by design.
+  The reason this issue is taking place is that, by design, Monitors just have access to departments related to the `Business Units` they're monitoring, but this restriction is designed only for Omnichannel management areas, which means in case the monitor is, also, an agent, they're supposed to be able to forward a chat to any available departments regardless the `Business Units` it's associated with.
   So, initially, the restriction was implemented on the `Department Model` and, now, we're implementing the logic properly and introducing a new parameter to department endpoints, so the client will define which type of departments it needs.
 
 - **ENTERPRISE:** Omnichannel Monitors can't forward chats to departments that they are not supervising ([#22142](https://github.com/RocketChat/Rocket.Chat/pull/22142))
@@ -2567,18 +2551,18 @@
 
 - Correcting a the wrong Archived label in edit room ([#21717](https://github.com/RocketChat/Rocket.Chat/pull/21717) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  ![image](https://user-images.githubusercontent.com/45966964/116584997-3cd78a80-a918-11eb-81fa-8a7eb5318ae9.png)
-
+  ![image](https://user-images.githubusercontent.com/45966964/116584997-3cd78a80-a918-11eb-81fa-8a7eb5318ae9.png)
+
   A label exists for Archived, and it has not been used. So I replaced it with the existing one. the label 'Archived' does not exist.
 
 - Custom OAuth not being completely deleted ([#21637](https://github.com/RocketChat/Rocket.Chat/pull/21637) by [@siva2204](https://github.com/siva2204))
 
 - Directory Table's Sort Function ([#21921](https://github.com/RocketChat/Rocket.Chat/pull/21921))
 
-  ### TableRow Margin Issue:
-  ![image](https://user-images.githubusercontent.com/27704687/116907348-d6a07f80-ac17-11eb-9411-edfe0906bfe1.png)
-
-  ### Table Sort Action Issue:
+  ### TableRow Margin Issue:
+  ![image](https://user-images.githubusercontent.com/27704687/116907348-d6a07f80-ac17-11eb-9411-edfe0906bfe1.png)
+
+  ### Table Sort Action Issue:
   ![directory](https://user-images.githubusercontent.com/27704687/116907441-f20b8a80-ac17-11eb-8790-bfce19e89a67.gif)
 
 - Discussion names showing a random value ([#22172](https://github.com/RocketChat/Rocket.Chat/pull/22172))
@@ -2589,54 +2573,54 @@
 
 - Emails being sent with HTML entities getting escaped multiple times ([#21994](https://github.com/RocketChat/Rocket.Chat/pull/21994) by [@bhavayAnand9](https://github.com/bhavayAnand9))
 
-  fixes an issue where if password contains special HTML character like &, in the email it would end up something like `&amp;amp;`
-
-
-  password was going through multiple escapeHTML function calls
-  `secure&123 => secure&amp;123 => secure&amp;amp;123
+  fixes an issue where if password contains special HTML character like &, in the email it would end up something like `&amp;amp;`
+
+ 
+  password was going through multiple escapeHTML function calls
+  `secure&123 => secure&amp;123 => secure&amp;amp;123
   `
 
 - Error when you look at the members list of a room in which you are not a member ([#21952](https://github.com/RocketChat/Rocket.Chat/pull/21952) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  Before, when you look at the members of a room in which you are not a member the app crashed, i corrected this problem.
-  Indeed, there was a check on each currentSubscription.<somehting> to see if it was not undefined except on currentSubscription.blocker
-
+  Before, when you look at the members of a room in which you are not a member the app crashed, i corrected this problem.
+  Indeed, there was a check on each currentSubscription.<somehting> to see if it was not undefined except on currentSubscription.blocker
+
   https://user-images.githubusercontent.com/45966964/117087470-d3101400-ad4f-11eb-8f44-0ebca830a4d8.mp4
 
 - errors when viewing a room that you're not subscribed to ([#21984](https://github.com/RocketChat/Rocket.Chat/pull/21984))
 
 - Files list will not show deleted files. ([#21732](https://github.com/RocketChat/Rocket.Chat/pull/21732) by [@Darshilp326](https://github.com/Darshilp326))
 
-  When you delete files from the header option, deleted files will not be shown.
-
+  When you delete files from the header option, deleted files will not be shown.
+
   https://user-images.githubusercontent.com/55157259/115730786-38552400-a3a4-11eb-9684-7f510920db66.mp4
 
 - Fixed the fact that when a team was deleted, not all channels were unlinked from the team ([#21942](https://github.com/RocketChat/Rocket.Chat/pull/21942) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  Fixed the fact that when a team was deleted, not all channels were unlinked from the team. Only the first room of the rooms list was unlinked.
-
-  After the fix, there is nos more errors:
-
-
+  Fixed the fact that when a team was deleted, not all channels were unlinked from the team. Only the first room of the rooms list was unlinked.
+
+  After the fix, there is nos more errors:
+
+
   https://user-images.githubusercontent.com/45966964/117055182-2a47c180-ad1b-11eb-806f-07fb3fa7ec12.mp4
 
 - Fixing Jitsi call ended Issue. ([#21808](https://github.com/RocketChat/Rocket.Chat/pull/21808))
 
-  The new rewrite in react of contextual call component broke the Jitsi "click to join" messages. The issue being after 10 seconds of initiating the call, the message "click to join" always returned "Call Ended" even if the call was still going on.
-  This was due to the fact that after closing the contextual bar, the react component gets unmounted and we are not able to keep track of ongoing call and increase jitsi room timeout.
-
-  This PR solves this issue by using the setInterval methods on component will unmount. When the call component unmounts, we keep on checking the state of jitsi call and based on conditions increase the jitsi room timeout. After the call is ended all setInterval calls are closed.
-
+  The new rewrite in react of contextual call component broke the Jitsi "click to join" messages. The issue being after 10 seconds of initiating the call, the message "click to join" always returned "Call Ended" even if the call was still going on.
+  This was due to the fact that after closing the contextual bar, the react component gets unmounted and we are not able to keep track of ongoing call and increase jitsi room timeout. 
+
+  This PR solves this issue by using the setInterval methods on component will unmount. When the call component unmounts, we keep on checking the state of jitsi call and based on conditions increase the jitsi room timeout. After the call is ended all setInterval calls are closed.
+
   This PR also removes the implementation of HEARTBEAT events of JitsiBridge. This is because this is no longer needed and all logic is being taken care of by the unmount function.
 
 - Handle NPS errors instead of throwing them ([#21945](https://github.com/RocketChat/Rocket.Chat/pull/21945))
 
 - Header Tag Visual Issues ([#21991](https://github.com/RocketChat/Rocket.Chat/pull/21991))
 
-  ### Normal
-  ![image](https://user-images.githubusercontent.com/27704687/117504793-69635600-af59-11eb-8b79-9d8f631490ee.png)
-
-  ### Hover
+  ### Normal 
+  ![image](https://user-images.githubusercontent.com/27704687/117504793-69635600-af59-11eb-8b79-9d8f631490ee.png)
+
+  ### Hover
   ![image](https://user-images.githubusercontent.com/27704687/117504934-97489a80-af59-11eb-87c3-0a62731e9ce3.png)
 
 - Horizontal scrollbar not showing on tables ([#21852](https://github.com/RocketChat/Rocket.Chat/pull/21852))
@@ -2645,17 +2629,17 @@
 
 - iFrame size on embedded videos ([#21992](https://github.com/RocketChat/Rocket.Chat/pull/21992))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/27704687/117508802-8bf86d80-af5f-11eb-9eb8-29e55b73eac5.png)
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/27704687/117508802-8bf86d80-af5f-11eb-9eb8-29e55b73eac5.png)
+
+  ### After
   ![image](https://user-images.githubusercontent.com/27704687/117508870-a4688800-af5f-11eb-9176-7f24de5fc424.png)
 
 - Incorrect error message when opening channel in anonymous read ([#22066](https://github.com/RocketChat/Rocket.Chat/pull/22066) by [@lucassartor](https://github.com/lucassartor))
 
-  Every time you open a public channel with threads in it when using anonymous read an `Incorrect User` error will be thrown.
-  This is an incorrect behaviour as everything that is public should be valid for an anonymous user.
-
+  Every time you open a public channel with threads in it when using anonymous read an `Incorrect User` error will be thrown. 
+  This is an incorrect behaviour as everything that is public should be valid for an anonymous user.
+
   Some files are adapted to that and have already removed this kind of incorrect error, but there are some that need some fix, this PR aims to do that.
 
 - Incorrect Team's Info spacing ([#22021](https://github.com/RocketChat/Rocket.Chat/pull/22021))
@@ -2668,21 +2652,19 @@
 
 - Make the FR translation consistent with the 'room' translation + typos ([#21913](https://github.com/RocketChat/Rocket.Chat/pull/21913) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  In the FR translation files, there were two terms that were used to refer to **'room'**:
-
-  - 'salon' (149 times used)
-
-  ![image](https://user-images.githubusercontent.com/45966964/116829860-ac62a980-aba6-11eb-8212-e6f15ed0af82.png)
-
-
-  - 'salle' (46 times used)
-
-  ![image](https://user-images.githubusercontent.com/45966964/116829871-be444c80-aba6-11eb-9b42-e213fee6586a.png)
-
-  The problem is that both were used in the same context and sometimes even in the same option list.
-  However, since 'salon' is a better translation and was also in the majority, I used the translation 'salon' wherever 'salle' was marked.
-
-  For example:
+  In the FR translation files, there were two terms that were used to refer to **'room'**:
  
+  - 'salon' (149 times used)
+
+  ![image](https://user-images.githubusercontent.com/45966964/116829860-ac62a980-aba6-11eb-8212-e6f15ed0af82.png)
+
  
+  - 'salle' (46 times used)
+
+  ![image](https://user-images.githubusercontent.com/45966964/116829871-be444c80-aba6-11eb-9b42-e213fee6586a.png)
+
+  The problem is that both were used in the same context and sometimes even in the same option list. 
+  However, since 'salon' is a better translation and was also in the majority, I used the translation 'salon' wherever 'salle' was marked.  
+
+  For example:
   ![image](https://user-images.githubusercontent.com/45966964/116830523-1da45b80-abab-11eb-81f8-5225d51cecc6.png)
 
 - Maximum 25 channels can be loaded in the teams' channels list ([#21708](https://github.com/RocketChat/Rocket.Chat/pull/21708) by [@Jeanstaquet](https://github.com/Jeanstaquet))
@@ -2697,8 +2679,8 @@
 
 - No warning message is sent when user is removed from a team's main channel ([#21949](https://github.com/RocketChat/Rocket.Chat/pull/21949))
 
-  - Send a warning message to a team's main channel when a user is removed from the team;
-   - Trigger events while removing a user from a team's main channel;
+  - Send a warning message to a team's main channel when a user is removed from the team;
+   - Trigger events while removing a user from a team's main channel;
    - Fix `usersCount` field in the team's main room when a user is removed from the team (`usersCount` is now decreased by 1).
 
 - Not possible accept video call if "Hide right sidebar with click" is enabled ([#22175](https://github.com/RocketChat/Rocket.Chat/pull/22175))
@@ -2719,14 +2701,14 @@
 
 - Prevent the userInfo tab to return 'User not found' each time if a certain member of a DM group has been deleted ([#21970](https://github.com/RocketChat/Rocket.Chat/pull/21970) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  Prevent the userInfo tab to return 'User not found' if a member of a DM group has been deleted.
-  This happens if the user that has been deleted is the one originally displayed on the userInfo tab in a DM group with >2 users.
-
+  Prevent the userInfo tab to return 'User not found' if a member of a DM group has been deleted.
+  This happens if the user that has been deleted is the one originally displayed on the userInfo tab in a DM group with >2 users.
+
   https://user-images.githubusercontent.com/45966964/117221081-db785580-ae08-11eb-9b33-2314a99eb037.mp4
 
 - Prune messages not cleaning up unread threads ([#21326](https://github.com/RocketChat/Rocket.Chat/pull/21326) by [@renancleyson-dev](https://github.com/renancleyson-dev))
 
-  Fixes permanent unread messages when admin prune at least two different thread messages in the room that were unread by some user.
+  Fixes permanent unread messages when admin prune at least two different thread messages in the room that were unread by some user.
   ![screencapture-localhost-3000-channel-general-thread-2021-03-26-13_17_16](https://user-images.githubusercontent.com/43624243/112678973-62b9cd00-8e4a-11eb-9af9-56f17cc66baf.png)
 
 - Redirect on remove user from channel by user profile tab ([#21951](https://github.com/RocketChat/Rocket.Chat/pull/21951))
@@ -2737,8 +2719,8 @@
 
 - Removed fields from User Info for which the user doesn't have permissions. ([#20923](https://github.com/RocketChat/Rocket.Chat/pull/20923) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Removed LastLogin, CreatedAt and Roles for users who don't have permission.
-
+  Removed LastLogin, CreatedAt and Roles for users who don't have permission.
+
   https://user-images.githubusercontent.com/55157259/109381351-f2c62e80-78ff-11eb-9289-e11072bf62f8.mp4
 
 - Replace `query` param by `name`, `username` and `status` on the `teams.members` endpoint ([#21539](https://github.com/RocketChat/Rocket.Chat/pull/21539))
@@ -2751,39 +2733,39 @@
 
 - Unable to edit a 'direct' room setting in the admin due to the room name ([#21636](https://github.com/RocketChat/Rocket.Chat/pull/21636) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  When you are in the admin and want to change a room 'd' setting, it doesn't work because it takes into account the name that is set automatically and therefore tries to save that name. Since the name is not valid and should not be registered, we cannot change the setting for the 'd' room.
-  I made sure that when you want to change a setting in a 'd' room, that you don't take the name into account
-
-
-  https://user-images.githubusercontent.com/45966964/115150919-cd85af00-a06a-11eb-9667-ef3dcfc5adb6.mp4
-
-
+  When you are in the admin and want to change a room 'd' setting, it doesn't work because it takes into account the name that is set automatically and therefore tries to save that name. Since the name is not valid and should not be registered, we cannot change the setting for the 'd' room. 
+  I made sure that when you want to change a setting in a 'd' room, that you don't take the name into account
+
+
+  https://user-images.githubusercontent.com/45966964/115150919-cd85af00-a06a-11eb-9667-ef3dcfc5adb6.mp4
+
+
   Behind the scene, the name is not saved
 
 - Unable to edit a user who does not have an email via the admin or via the user's profile ([#21626](https://github.com/RocketChat/Rocket.Chat/pull/21626) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  If a user does not have an email address, they cannot change it via their profile or via the admin. I fixed this issue. I have created several profiles and there was one that didn't have an email, I don't know how I did it, I am working on it. I had not modified the db to delete his email, hence the fix
-
-  in admin
-
-  https://user-images.githubusercontent.com/45966964/115112617-9b9b1c80-9f86-11eb-8e3a-950c3c1a1746.mp4
-
-
-
-  in the user profile
-
+  If a user does not have an email address, they cannot change it via their profile or via the admin. I fixed this issue. I have created several profiles and there was one that didn't have an email, I don't know how I did it, I am working on it. I had not modified the db to delete his email, hence the fix
+
+  in admin
+
+  https://user-images.githubusercontent.com/45966964/115112617-9b9b1c80-9f86-11eb-8e3a-950c3c1a1746.mp4
+
+
+
+  in the user profile
+
   https://user-images.githubusercontent.com/45966964/115112620-a0f86700-9f86-11eb-97b1-56eaba42216b.mp4
 
 - Unable to get channels, sort by most recent message ([#21701](https://github.com/RocketChat/Rocket.Chat/pull/21701) by [@sumukhah](https://github.com/sumukhah))
 
 - Unable to update app manually ([#21215](https://github.com/RocketChat/Rocket.Chat/pull/21215))
 
-  It allows for update of apps using a zip file.
-
-  When installing apps using the zip file, either by url or the file form, if the app was already installed, an error would be thrown stating the condition and forbidding the installation. Now, when sending a zip file of an app that is already installed, the user is presented with the following modal:
-
-  ![2021-04-30-113936_627x235_scrot](https://user-images.githubusercontent.com/733282/116711383-2cbbbb80-a9a9-11eb-8c77-22d6802cb9f5.png)
-
+  It allows for update of apps using a zip file.
+
+  When installing apps using the zip file, either by url or the file form, if the app was already installed, an error would be thrown stating the condition and forbidding the installation. Now, when sending a zip file of an app that is already installed, the user is presented with the following modal:
+
+  ![2021-04-30-113936_627x235_scrot](https://user-images.githubusercontent.com/733282/116711383-2cbbbb80-a9a9-11eb-8c77-22d6802cb9f5.png)
+
   If the app also requires permissions to be reviewed, the modal that handles permission reviews will be shown after this one is accepted.
 
 - Unpin message reactivity ([#22029](https://github.com/RocketChat/Rocket.Chat/pull/22029))
@@ -2794,20 +2776,20 @@
 
 - User Impersonation through sendMessage API ([#20391](https://github.com/RocketChat/Rocket.Chat/pull/20391) by [@lucassartor](https://github.com/lucassartor))
 
-  Create a new permission: `message-impersonate`. For new installs only bot role will have the permission and for updating installs the permission will also be given to user role, so it won't break running deployments.
-
-  If a message is being sent with `avatar` or `alias` properties, it validates if the sender has the `message-impersonate` permission, if not, an error is throwed:
-  ```json
-  {
-    "success": false,
-    "error": "Not enough permission",
-    "stack": "Error: Not enough permission\n ..."
-  }
+  Create a new permission: `message-impersonate`. For new installs only bot role will have the permission and for updating installs the permission will also be given to user role, so it won't break running deployments.
+
+  If a message is being sent with `avatar` or `alias` properties, it validates if the sender has the `message-impersonate` permission, if not, an error is throwed:
+  ```json
+  {
+    "success": false,
+    "error": "Not enough permission",
+    "stack": "Error: Not enough permission\n ..."
+  }
   ```
 
 - Visibility of burger menu on certain width ([#20736](https://github.com/RocketChat/Rocket.Chat/pull/20736) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  Burger was not visible on a certain width, specifically between 600 to   780. if width is more than 780px sidebar is shown, if less than 600 then burger icon was shown. But it wasn't shown between 600px to 780 px.
+  Burger was not visible on a certain width, specifically between 600 to   780. if width is more than 780px sidebar is shown, if less than 600 then burger icon was shown. But it wasn't shown between 600px to 780 px.
   It was because for showing burger icon we were only checking for `isMobile` which is lenght only less than   600. So i added one more check for condition if length is less than 780 px.
 
 - When closing chats a comment is always required ([#21947](https://github.com/RocketChat/Rocket.Chat/pull/21947))
@@ -2822,8 +2804,8 @@
 
 - Wrong icon on "Move to team" option in the channel info actions ([#21944](https://github.com/RocketChat/Rocket.Chat/pull/21944))
 
-  ![image](https://user-images.githubusercontent.com/40830821/117061659-d9bf6c80-acf8-11eb-8e29-be47e702dedd.png)
-
+  ![image](https://user-images.githubusercontent.com/40830821/117061659-d9bf6c80-acf8-11eb-8e29-be47e702dedd.png)
+
   Depends on https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/444
 
 <details>
@@ -2840,10 +2822,8 @@
 
 - Add two more test cases to the slash-command test suite ([#21317](https://github.com/RocketChat/Rocket.Chat/pull/21317) by [@EduardoPicolo](https://github.com/EduardoPicolo))
 
-  Added two more test cases to the slash-command test suite:
-
-  - 'should return an error when the command does not exist'';
-
+  Added two more test cases to the slash-command test suite: 
  
+  - 'should return an error when the command does not exist'';
  
   - 'should return an error when no command is provided';
 
 - Bump actions/stale from v3.0.8 to v3.0.18 ([#21877](https://github.com/RocketChat/Rocket.Chat/pull/21877) by [@dependabot[bot]](https://github.com/dependabot[bot]))
@@ -2878,9 +2858,9 @@
 
 - i18n: Add missing translation string in account preference ([#21448](https://github.com/RocketChat/Rocket.Chat/pull/21448) by [@sumukhah](https://github.com/sumukhah))
 
-  "Test Desktop Notifications" was missing in translation, Added to the file.
-  <img width="691" alt="Screenshot 2021-04-05 at 3 58 01 PM" src="https://user-images.githubusercontent.com/23723464/113565830-475c7800-9629-11eb-8d93-3c177b9d0030.png">
-
+  "Test Desktop Notifications" was missing in translation, Added to the file.
+  <img width="691" alt="Screenshot 2021-04-05 at 3 58 01 PM" src="https://user-images.githubusercontent.com/23723464/113565830-475c7800-9629-11eb-8d93-3c177b9d0030.png">
+
   <img width="701" alt="Screenshot 2021-04-05 at 3 58 32 PM" src="https://user-images.githubusercontent.com/23723464/113565823-44fa1e00-9629-11eb-9af1-839f42e132ca.png">
 
 - i18n: Correct a typo in German ([#21711](https://github.com/RocketChat/Rocket.Chat/pull/21711) by [@Jeanstaquet](https://github.com/Jeanstaquet))
@@ -2907,10 +2887,10 @@
 
 - Regression: discussions display on sidebar ([#22157](https://github.com/RocketChat/Rocket.Chat/pull/22157))
 
-  ### group by type active
-  ![image](https://user-images.githubusercontent.com/27704687/119741996-37a92500-be5d-11eb-8b36-4067a7a229f1.png)
-
-  ### group by type inactive
+  ### group by type active
+  ![image](https://user-images.githubusercontent.com/27704687/119741996-37a92500-be5d-11eb-8b36-4067a7a229f1.png)
+
+  ### group by type inactive
   ![image](https://user-images.githubusercontent.com/27704687/119742054-56a7b700-be5d-11eb-8810-e31d4216f573.png)
 
 - regression: fix departments with empty ancestors not being returned ([#22068](https://github.com/RocketChat/Rocket.Chat/pull/22068))
@@ -2921,8 +2901,8 @@
 
 - regression: Fix Users list in the Administration  ([#22034](https://github.com/RocketChat/Rocket.Chat/pull/22034) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  The app crashed if no custom fields for user profiles have been created by the admin. I fixed this issue. This bug was introduced by a recent commit.
-
+  The app crashed if no custom fields for user profiles have been created by the admin. I fixed this issue. This bug was introduced by a recent commit.
+
   https://user-images.githubusercontent.com/45966964/118210838-5b3a9b80-b46b-11eb-9fe5-5b813848190c.mp4
 
 - Regression: Improve migration 225 ([#22099](https://github.com/RocketChat/Rocket.Chat/pull/22099))
@@ -2939,7 +2919,7 @@
 
 - Regression: not allowed to edit roles due to a new verification ([#22159](https://github.com/RocketChat/Rocket.Chat/pull/22159))
 
-  introduced by https://github.com/RocketChat/Rocket.Chat/pull/21905
+  introduced by https://github.com/RocketChat/Rocket.Chat/pull/21905
   ![Peek 2021-05-26 22-21](https://user-images.githubusercontent.com/27704687/119750970-b9567e00-be70-11eb-9d52-04c8595950df.gif)
 
 - regression: Select Team Modal margin ([#22030](https://github.com/RocketChat/Rocket.Chat/pull/22030))
@@ -2950,10 +2930,10 @@
 
 - Regression: Visual issue on sort list item  ([#22158](https://github.com/RocketChat/Rocket.Chat/pull/22158))
 
-  ### before
-  ![image](https://user-images.githubusercontent.com/27704687/119743703-d84d1400-be60-11eb-97cc-c8256b2c8b07.png)
-
-  ### after
+  ### before
+  ![image](https://user-images.githubusercontent.com/27704687/119743703-d84d1400-be60-11eb-97cc-c8256b2c8b07.png)
+
+  ### after
   ![image](https://user-images.githubusercontent.com/27704687/119743638-b18edd80-be60-11eb-828d-22cc5e1b2f5b.png)
 
 - Release 3.14.2 ([#22135](https://github.com/RocketChat/Rocket.Chat/pull/22135))
@@ -3139,12 +3119,12 @@
 
 - Paginated and Filtered selects on new/edit unit ([#22052](https://github.com/RocketChat/Rocket.Chat/pull/22052) by [@rafaelblink](https://github.com/rafaelblink))
 
-  REQUIRES https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/447
-
-  Adds infinite scrolling selects to the units edit/create  with the ability to be filtered by text as well
-
-  ![Screen Shot 2021-05-17 at 9 24 19 AM](https://user-images.githubusercontent.com/20868078/118487999-abc32a80-b6f1-11eb-8d58-d031111ea0fb.png)
-
+  REQUIRES https://github.com/RocketChat/Rocket.Chat.Fuselage/pull/447
+
+  Adds infinite scrolling selects to the units edit/create  with the ability to be filtered by text as well
+
+  ![Screen Shot 2021-05-17 at 9 24 19 AM](https://user-images.githubusercontent.com/20868078/118487999-abc32a80-b6f1-11eb-8d58-d031111ea0fb.png)
+
   This Affects the monitors and departments inputs
 
 ### 🚀 Improvements
@@ -3220,24 +3200,18 @@
 
 - New set of rules for client code ([#21318](https://github.com/RocketChat/Rocket.Chat/pull/21318))
 
-  This _small_ PR does the following:
-
-
-  - Now **React** is the web client's first-class citizen, being **loaded before Blaze**. Thus, `BlazeLayout` calls render templates inside of a React component (`BlazeLayoutWrapper`);
-
-  - Main client startup code, including polyfills, is written in **TypeScript**;
-
-  - At the moment, routes are treated as regular startup code; it's expected that `FlowRouter` will be deprecated in favor of a new routing library;
-
-  - **React** was updated to major version **17**, deprecating the usage of `React` as namespace (e.g. use `memo()` instead of `React.memo()`);
-
-  - The `client/` and `ee/client/` directory are linted with a **custom ESLint configuration** that includes:
-    - **Prettier**;
-    - `react-hooks/*` rules for TypeScript files;
-    - `react/no-multi-comp`, enforcing the rule of **one single React component per module**;
-    - `react/display-name`, which enforces that **React components must have a name for debugging**;
-    - `import/named`, avoiding broken named imports.
-
+  This _small_ PR does the following:
+
  
+  - Now **React** is the web client's first-class citizen, being **loaded before Blaze**. Thus, `BlazeLayout` calls render templates inside of a React component (`BlazeLayoutWrapper`);
  
+  - Main client startup code, including polyfills, is written in **TypeScript**;
  
+  - At the moment, routes are treated as regular startup code; it's expected that `FlowRouter` will be deprecated in favor of a new routing library;
  
+  - **React** was updated to major version **17**, deprecating the usage of `React` as namespace (e.g. use `memo()` instead of `React.memo()`);
  
+  - The `client/` and `ee/client/` directory are linted with a **custom ESLint configuration** that includes:
+    - **Prettier**;
+    - `react-hooks/*` rules for TypeScript files;
+    - `react/no-multi-comp`, enforcing the rule of **one single React component per module**;
+    - `react/display-name`, which enforces that **React components must have a name for debugging**;
+    - `import/named`, avoiding broken named imports.
  
   - A bunch of components were refactored to match the new ESLint rules.
 
 - On Hold system messages ([#21360](https://github.com/RocketChat/Rocket.Chat/pull/21360) by [@rafaelblink](https://github.com/rafaelblink))
@@ -3246,15 +3220,12 @@
 
 - Password history ([#21607](https://github.com/RocketChat/Rocket.Chat/pull/21607))
 
-  - Store each user's previously used passwords in a `passwordHistory` field (in the `users` record);
-
-  - Users' previously used passwords are stored in their `passwordHistory` even when the setting is disabled;
-
-  - Add "Password History" setting -- when enabled, it blocks users from reusing their most recent passwords;
-
-  - Convert `comparePassword` file to TypeScript.
-
-  ![Password_Change](https://user-images.githubusercontent.com/36537004/115035168-ac726200-9ea2-11eb-93c6-fc8182ba5f3f.png)
+  - Store each user's previously used passwords in a `passwordHistory` field (in the `users` record);
  
+  - Users' previously used passwords are stored in their `passwordHistory` even when the setting is disabled;
  
+  - Add "Password History" setting -- when enabled, it blocks users from reusing their most recent passwords;
  
+  - Convert `comparePassword` file to TypeScript.
+
+  ![Password_Change](https://user-images.githubusercontent.com/36537004/115035168-ac726200-9ea2-11eb-93c6-fc8182ba5f3f.png)
   ![Password_History](https://user-images.githubusercontent.com/36537004/115035175-ad0af880-9ea2-11eb-9f40-94c6327a9854.png)
 
 - REST endpoint `teams.update` ([#21134](https://github.com/RocketChat/Rocket.Chat/pull/21134) by [@g-thome](https://github.com/g-thome))
@@ -3272,18 +3243,14 @@
 
 - Add error messages to the creation of channels or usernames containing reserved words ([#21016](https://github.com/RocketChat/Rocket.Chat/pull/21016))
 
-  Display error messages when the user attempts to create or edit users' or channels' names with any of the following words (**case-insensitive**):
-
-  - admin;
-
-  - administrator;
-
-  - system;
-
-  - user.
-  ![create-channel](https://user-images.githubusercontent.com/36537004/110132223-b421ef80-7da9-11eb-82bc-f0d4e1df967f.png)
-  ![register-username](https://user-images.githubusercontent.com/36537004/110132234-b71ce000-7da9-11eb-904e-580233625951.png)
-  ![change-channel](https://user-images.githubusercontent.com/36537004/110143057-96f31e00-7db5-11eb-994a-39ae9e63392e.png)
+  Display error messages when the user attempts to create or edit users' or channels' names with any of the following words (**case-insensitive**):
  
+  - admin;
  
+  - administrator;
  
+  - system;
  
+  - user.
+  ![create-channel](https://user-images.githubusercontent.com/36537004/110132223-b421ef80-7da9-11eb-82bc-f0d4e1df967f.png)
+  ![register-username](https://user-images.githubusercontent.com/36537004/110132234-b71ce000-7da9-11eb-904e-580233625951.png)
+  ![change-channel](https://user-images.githubusercontent.com/36537004/110143057-96f31e00-7db5-11eb-994a-39ae9e63392e.png)
   ![change-username](https://user-images.githubusercontent.com/36537004/110143065-98244b00-7db5-11eb-9d13-afc5dc9866de.png)
 
 - add permission check when adding a channel to a team ([#21689](https://github.com/RocketChat/Rocket.Chat/pull/21689) by [@g-thome](https://github.com/g-thome))
@@ -3308,8 +3275,7 @@
 
 - Resize custom emojis on upload instead of saving at max res ([#21593](https://github.com/RocketChat/Rocket.Chat/pull/21593))
 
-  - Create new MediaService (ideally, should be in charge of all media-related operations)
-
+  - Create new MediaService (ideally, should be in charge of all media-related operations)
  
   - Resize emojis to 128x128
 
 ### 🐛 Bug fixes
@@ -3329,25 +3295,25 @@
 
 - Allows more than 25 discussions/files to be loaded in the contextualbar ([#21511](https://github.com/RocketChat/Rocket.Chat/pull/21511) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  In some places, you could not load more than 25 threads/discussions/files on the screen when searching the lists in the contextualbar.
-  Threads & list are numbered for a better view of the solution
-
-
+  In some places, you could not load more than 25 threads/discussions/files on the screen when searching the lists in the contextualbar.
+  Threads & list are numbered for a better view of the solution
+
+
   https://user-images.githubusercontent.com/45966964/114222225-93335800-996e-11eb-833f-568e83129aae.mp4
 
 - Allows more than 25 threads to be loaded, fixes #21507 ([#21508](https://github.com/RocketChat/Rocket.Chat/pull/21508) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
 - Allows to display more than 25 users maximum in the users list ([#21518](https://github.com/RocketChat/Rocket.Chat/pull/21518) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  Now when you scroll to the bottom of the users list, it shows more users. Before the fix, the limit for the query for loadMore was calculated so that no additional users could be loaded.
-
-  Before
-
-  https://user-images.githubusercontent.com/45966964/114249739-baece500-999b-11eb-9bb0-3a5bcee18ad8.mp4
-
-  After
-
-
+  Now when you scroll to the bottom of the users list, it shows more users. Before the fix, the limit for the query for loadMore was calculated so that no additional users could be loaded.
+
+  Before
+
+  https://user-images.githubusercontent.com/45966964/114249739-baece500-999b-11eb-9bb0-3a5bcee18ad8.mp4
+
+  After
+
+
   https://user-images.githubusercontent.com/45966964/114249895-364e9680-999c-11eb-985c-47aedc763488.mp4
 
 - App installation from marketplace not correctly displaying the permissions ([#21470](https://github.com/RocketChat/Rocket.Chat/pull/21470))
@@ -3414,19 +3380,19 @@
 
 - Margins on contextual bar information ([#21457](https://github.com/RocketChat/Rocket.Chat/pull/21457))
 
-  ### Room
-  **Before**
-  ![image](https://user-images.githubusercontent.com/27704687/115080812-ba8fa500-9ed9-11eb-9078-3625603bf92b.png)
-
-  **After**
-  ![image](https://user-images.githubusercontent.com/27704687/115080966-e9a61680-9ed9-11eb-929f-6516c1563e99.png)
-
-  ### Livechat
+  ### Room
+  **Before**
+  ![image](https://user-images.githubusercontent.com/27704687/115080812-ba8fa500-9ed9-11eb-9078-3625603bf92b.png)
+
+  **After**
+  ![image](https://user-images.githubusercontent.com/27704687/115080966-e9a61680-9ed9-11eb-929f-6516c1563e99.png)
+
+  ### Livechat
   ![image](https://user-images.githubusercontent.com/27704687/113640101-1859fc80-9651-11eb-88f8-09a899953988.png)
 
 - Message Block ordering  ([#21464](https://github.com/RocketChat/Rocket.Chat/pull/21464))
 
-  Reactions should come before reply button.
+  Reactions should come before reply button.
   ![image](https://user-images.githubusercontent.com/40830821/113748926-6f0e1780-96df-11eb-93a5-ddcfa891413e.png)
 
 - Message link null corrupts message rendering ([#21579](https://github.com/RocketChat/Rocket.Chat/pull/21579) by [@g-thome](https://github.com/g-thome))
@@ -3479,19 +3445,15 @@
 
 - Typos/missing elements in the French translation ([#21525](https://github.com/RocketChat/Rocket.Chat/pull/21525) by [@Jeanstaquet](https://github.com/Jeanstaquet))
 
-  - I have corrected some typos in the translation
-
-  - I added a translation for missing words
-
-  - I took the opportunity to correct a mistranslated word
-
-  - Test_Desktop_Notifications was missing in the EN and FR file
+  - I have corrected some typos in the translation
  
+  - I added a translation for missing words
  
+  - I took the opportunity to correct a mistranslated word
  
+  - Test_Desktop_Notifications was missing in the EN and FR file
   ![image](https://user-images.githubusercontent.com/45966964/114290186-e7792d80-9a7d-11eb-8164-3b5e72e93703.png)
 
 - Updating a message causing URLs to be parsed even within markdown code ([#21489](https://github.com/RocketChat/Rocket.Chat/pull/21489))
 
-  - Fix `updateMessage` to avoid parsing URLs inside markdown
-
+  - Fix `updateMessage` to avoid parsing URLs inside markdown
  
   - Honor `parseUrls` property when updating messages
 
 - Use async await in TeamChannels delete channel action ([#21534](https://github.com/RocketChat/Rocket.Chat/pull/21534))
@@ -3504,8 +3466,8 @@
 
 - Wrong user in user info ([#21451](https://github.com/RocketChat/Rocket.Chat/pull/21451))
 
-  Fixed some race conditions in admin.
-
+  Fixed some race conditions in admin.
+
   Self DMs used to be created with the userId duplicated. Sometimes rooms can have 2 equal uids, but it's a self DM. Fixed a getter so this isn't a problem anymore.
 
 <details>
@@ -3514,30 +3476,22 @@
 
 -  Doc: Corrected links to documentation of rocket.chat README.md  ([#20478](https://github.com/RocketChat/Rocket.Chat/pull/20478) by [@joshi008](https://github.com/joshi008))
 
-  The link for documentation in the readme was previously https://rocket.chat/docs/ while that was not working and according to the website it was https://docs.rocket.chat/
-  The link for deployment methods in readme was corrected from https://rocket.chat/docs/installation/paas-deployments/ to https://docs.rocket.chat/installation/paas-deployments
+  The link for documentation in the readme was previously https://rocket.chat/docs/ while that was not working and according to the website it was https://docs.rocket.chat/
+  The link for deployment methods in readme was corrected from https://rocket.chat/docs/installation/paas-deployments/ to https://docs.rocket.chat/installation/paas-deployments
   Some more links to the documentations were giving 404 error which hence updated.
 
 - [Improve] Remove useless tabbar options from Omnichannel rooms ([#21561](https://github.com/RocketChat/Rocket.Chat/pull/21561) by [@rafaelblink](https://github.com/rafaelblink))
 
 - A React-based replacement for BlazeLayout ([#21527](https://github.com/RocketChat/Rocket.Chat/pull/21527))
 
-  - The Meteor package **`kadira:blaze-layout` was removed**;
-
-  - A **global subscription** for the current application layout (**`appLayout`**) replaces `BlazeLayout` entirely;
-
-  - The **`#react-root` element** is rendered on server-side instead of dynamically injected into the DOM tree;
-
-  - The **"page loading" throbber** is now rendered on the React tree;
-
-  - The **`renderRouteComponent` helper was removed**;
-
-  - Some code run without any criteria on **`main` template** module was moved into **client startup modules**;
-
-  - React portals used to embed Blaze templates have their own subscription (**`blazePortals`**);
-
-  - Some **route components were refactored** to remove a URL path trap originally disabled by `renderRouteComponent`;
-
+  - The Meteor package **`kadira:blaze-layout` was removed**;
  
+  - A **global subscription** for the current application layout (**`appLayout`**) replaces `BlazeLayout` entirely;
  
+  - The **`#react-root` element** is rendered on server-side instead of dynamically injected into the DOM tree;
  
+  - The **"page loading" throbber** is now rendered on the React tree;
  
+  - The **`renderRouteComponent` helper was removed**;
  
+  - Some code run without any criteria on **`main` template** module was moved into **client startup modules**;
  
+  - React portals used to embed Blaze templates have their own subscription (**`blazePortals`**);
  
+  - Some **route components were refactored** to remove a URL path trap originally disabled by `renderRouteComponent`;
  
   - A new component to embed the DOM nodes generated by **`RoomManager`** was created.
 
 - Add ')' after Date and Time in DB migration ([#21519](https://github.com/RocketChat/Rocket.Chat/pull/21519) by [@im-adithya](https://github.com/im-adithya))
@@ -3560,8 +3514,8 @@
 
 - Chore: Meteor update to 2.1.1 ([#21494](https://github.com/RocketChat/Rocket.Chat/pull/21494))
 
-  Basically Node update to version 12.22.1
-
+  Basically Node update to version 12.22.1
+
   Meteor change log https://github.com/meteor/meteor/blob/devel/History.md#v211-2021-04-06
 
 - Chore: Remove control character from room model operation ([#21493](https://github.com/RocketChat/Rocket.Chat/pull/21493))
@@ -3570,8 +3524,7 @@
 
 - Fix: Missing module `eventemitter3` for micro services ([#21611](https://github.com/RocketChat/Rocket.Chat/pull/21611))
 
-  - Fix error when running micro services after version 3.12
-
+  - Fix error when running micro services after version 3.12
  
   - Fix build of docker image version latest for micro services
 
 - Language update from LingoHub 🤖 on 2021-04-05Z ([#21446](https://github.com/RocketChat/Rocket.Chat/pull/21446))
@@ -3584,12 +3537,9 @@
 
 - QoL improvements to add channel to team flow ([#21778](https://github.com/RocketChat/Rocket.Chat/pull/21778))
 
-  - Fixed canAccessRoom validation
-
-  - Added e2e tests
-
-  - Removed channels that user cannot add to the team from autocomplete suggestions
-
+  - Fixed canAccessRoom validation
  
+  - Added e2e tests
  
+  - Removed channels that user cannot add to the team from autocomplete suggestions
  
   - Improved error messages
 
 - Regression: Bold, italic and strike render (Original markdown) ([#21747](https://github.com/RocketChat/Rocket.Chat/pull/21747))
@@ -3612,10 +3562,10 @@
 
 - Regression: Legacy Banner Position ([#21598](https://github.com/RocketChat/Rocket.Chat/pull/21598))
 
-  ### Before:
-  ![image](https://user-images.githubusercontent.com/27704687/114961773-dc3c4e00-9e3f-11eb-9a32-e882db3fbfbc.png)
-
-  ### After
+  ### Before:
+  ![image](https://user-images.githubusercontent.com/27704687/114961773-dc3c4e00-9e3f-11eb-9a32-e882db3fbfbc.png)
+
+  ### After
   ![image](https://user-images.githubusercontent.com/27704687/114961673-a6976500-9e3f-11eb-9238-a12870d7db8f.png)
 
 - regression: Markdown broken on safari ([#21780](https://github.com/RocketChat/Rocket.Chat/pull/21780))
@@ -3825,62 +3775,56 @@
 
 - **APPS:** New event interfaces for pre/post user leaving a room ([#20917](https://github.com/RocketChat/Rocket.Chat/pull/20917) by [@lucassartor](https://github.com/lucassartor))
 
-  Added events and errors that trigger when a user leaves a room.
+  Added events and errors that trigger when a user leaves a room. 
   That way it can communicate with the Apps-Engine by the `IPreRoomUserLeave` and `IPostRoomUserLeave` event interfaces.
 
 - **Enterprise:** Omnichannel On-Hold Queue ([#20945](https://github.com/RocketChat/Rocket.Chat/pull/20945))
 
-  ### About this feature
-  This feature has been introduced to deal with Inactive chats. A chat is considered Inactive if an Omnichannel End User (aka Visitor) has not replied back to an agent in some time. These types of inactive chats become very important when an organisation has a limit set for `Max Simultaneous Chats per agent` which is defined by the following setting :point_down:  , as more number of Inactive chats would directly affect an agent's productivity.
-  ![image](https://user-images.githubusercontent.com/34130764/111533003-4d7ad980-878c-11eb-8c1c-2796678a07db.png)
-
-  Before this feature, we only had one option to deal with such Inactive/Abandoned chats   - which was to auto close abandoned chats via this setting :point_down:
-  ![image](https://user-images.githubusercontent.com/34130764/111534353-e65e2480-878d-11eb-82a5-71368064ef45.png)
-
-  however closing a chat isn't a best option for some cases. Let me take an example to explain a scenario
-
-  > An agent is assisting a customer for installing a very huge software which is likely to take more than 20-30 minutes to download. In such scenarios closing a chat isn't the best approach since even after the lengthy download the customer might still need some assist from the agent.
-  > So basically this chat is going to block the agent's queue until the customer is able to finish his time-consuming download task in which he/she doesn't require any agent's assistance. Due to the `Max Simultaneous Chats per agent` limit, the agent is also not able to use this extra time to help other customer thus affecting his overall productivity.
-
-  **So how does the On-Hold feature solve this problem?**
-  With the On-Hold feature, an agent is now able to place a chat on-hold. On-Hold chats **don’t count towards the maximum number of concurrent chats** an agent can have. So in our above example, the agent can simply now place the customer on-hold for 20-30 minutes until the customer downloads the software and within this time, the agent can serve other customers   - hence increasing the productivity of an agent.
-
-  ----------------------------------------
-  ### Working of the new On-Hold feature
-
-  #### How can you place a chat on Hold ?
-
-  A chat can be placed on-hold via 2 means
-
-  1. Automatically place Abandoned chats On-hold
-      ![image](https://user-images.githubusercontent.com/34130764/111537074-06431780-8791-11eb-8d23-99f5d9f8ec45.png)
-    Via this :top: option you can define a timer which will get started when a customer sends a message. If we don't receive any message from the customer within this timer, the timer will get expired and the chat will be considered as Abandoned.
-      ![image](https://user-images.githubusercontent.com/34130764/111537346-53bf8480-8791-11eb-8dc7-260633b4e98f.png)
-    The via this :top:  setting you can choose to automatically place this abandoned chat On Hold
-
-  2.  Manually place a chat On Hold
-      As an admin, you can allow an agent to manually place a chat on-hold. To do so, you'll need to turn on this :point_down: setting
-      ![image](https://user-images.githubusercontent.com/34130764/111537545-97b28980-8791-11eb-86fd-db45b87e9cc1.png)
-      Now an agent will be able to see a new `On Hold` button within their `Visitor Info Panel` like this :point_down: , provided the agent has sent the last message
-      ![image](https://user-images.githubusercontent.com/34130764/111537853-f24be580-8791-11eb-9561-d77ba430c625.png)
-
-  #### How can you resume a On Hold chat ?
-  An On Hold chat can be resumed via 2 means
-
-
-  1. If the Customer sends a message
-     If the Customer / Omnichannel End User sends a message to the On Hold chat, the On Hold chat will get automatically resumed.
-
-  2. Manually by agent
-    An Agent can manually resume the On Hold chat via clicking the `Resume` button in the bottom of a chat room.
-   ![image](https://user-images.githubusercontent.com/34130764/111538666-f88e9180-8792-11eb-8d14-01453b8e3db0.png)
-
-  #### What would happen if the agent already reached maximum chats, and a On-Hold chat gets resumed ?
-  Based on how the chat was resumed, there are multiple cases are each case is dealt differently
-
-
-  - If an agent manually tries to resume the On Hold chat, he/she will get an error saying  `Maximum Simultaneous chat limit reached`
-
+  ### About this feature
+  This feature has been introduced to deal with Inactive chats. A chat is considered Inactive if an Omnichannel End User (aka Visitor) has not replied back to an agent in some time. These types of inactive chats become very important when an organisation has a limit set for `Max Simultaneous Chats per agent` which is defined by the following setting :point_down:  , as more number of Inactive chats would directly affect an agent's productivity.
+  ![image](https://user-images.githubusercontent.com/34130764/111533003-4d7ad980-878c-11eb-8c1c-2796678a07db.png)
+
+  Before this feature, we only had one option to deal with such Inactive/Abandoned chats   - which was to auto close abandoned chats via this setting :point_down: 
+  ![image](https://user-images.githubusercontent.com/34130764/111534353-e65e2480-878d-11eb-82a5-71368064ef45.png)
+
+  however closing a chat isn't a best option for some cases. Let me take an example to explain a scenario
+
+  > An agent is assisting a customer for installing a very huge software which is likely to take more than 20-30 minutes to download. In such scenarios closing a chat isn't the best approach since even after the lengthy download the customer might still need some assist from the agent.
+  > So basically this chat is going to block the agent's queue until the customer is able to finish his time-consuming download task in which he/she doesn't require any agent's assistance. Due to the `Max Simultaneous Chats per agent` limit, the agent is also not able to use this extra time to help other customer thus affecting his overall productivity.
+
+  **So how does the On-Hold feature solve this problem?**
+  With the On-Hold feature, an agent is now able to place a chat on-hold. On-Hold chats **don’t count towards the maximum number of concurrent chats** an agent can have. So in our above example, the agent can simply now place the customer on-hold for 20-30 minutes until the customer downloads the software and within this time, the agent can serve other customers   - hence increasing the productivity of an agent.
+
+  ----------------------------------------
+  ### Working of the new On-Hold feature
+
+  #### How can you place a chat on Hold ?
+
+  A chat can be placed on-hold via 2 means
  
+  1. Automatically place Abandoned chats On-hold
+      ![image](https://user-images.githubusercontent.com/34130764/111537074-06431780-8791-11eb-8d23-99f5d9f8ec45.png)
+    Via this :top: option you can define a timer which will get started when a customer sends a message. If we don't receive any message from the customer within this timer, the timer will get expired and the chat will be considered as Abandoned. 
+      ![image](https://user-images.githubusercontent.com/34130764/111537346-53bf8480-8791-11eb-8dc7-260633b4e98f.png)
+    The via this :top:  setting you can choose to automatically place this abandoned chat On Hold
  
+  2.  Manually place a chat On Hold 
+      As an admin, you can allow an agent to manually place a chat on-hold. To do so, you'll need to turn on this :point_down: setting
+      ![image](https://user-images.githubusercontent.com/34130764/111537545-97b28980-8791-11eb-86fd-db45b87e9cc1.png)
+      Now an agent will be able to see a new `On Hold` button within their `Visitor Info Panel` like this :point_down: , provided the agent has sent the last message
+      ![image](https://user-images.githubusercontent.com/34130764/111537853-f24be580-8791-11eb-9561-d77ba430c625.png)
+
+  #### How can you resume a On Hold chat ?
+  An On Hold chat can be resumed via 2 means
+
  
+  1. If the Customer sends a message
+     If the Customer / Omnichannel End User sends a message to the On Hold chat, the On Hold chat will get automatically resumed.
  
+  2. Manually by agent
+    An Agent can manually resume the On Hold chat via clicking the `Resume` button in the bottom of a chat room. 
+   ![image](https://user-images.githubusercontent.com/34130764/111538666-f88e9180-8792-11eb-8d14-01453b8e3db0.png)
+
+  #### What would happen if the agent already reached maximum chats, and a On-Hold chat gets resumed ?
+  Based on how the chat was resumed, there are multiple cases are each case is dealt differently
+
  
+  - If an agent manually tries to resume the On Hold chat, he/she will get an error saying  `Maximum Simultaneous chat limit reached`
  
   - If a customer replies back on an On Hold chat and the last serving agent has reached maximum capacity, then this customer will be placed on the queue again from where based on the Routing Algorithm selected, the chat will get transferred to any available agent
 
 - Ability to hide 'Room topic changed' system messages ([#21062](https://github.com/RocketChat/Rocket.Chat/pull/21062) by [@Tirieru](https://github.com/Tirieru))
@@ -3891,39 +3835,33 @@
 
 - Teams ([#20966](https://github.com/RocketChat/Rocket.Chat/pull/20966) by [@g-thome](https://github.com/g-thome))
 
-  ## Teams
-
-
-
-  You can easily group your users as Teams on Rocket.Chat. The feature takes the hassle out of managing multiple users one by one and allows you to handle them at the same time efficiently.
-
-
-
-  - Teams can be public or private and each team can have its own channels, which also can be public or private.
-
-  - It's possible to add existing channels to a Team or create new ones inside a Team.
-
-  - It's possible to invite people outside a Team to join Team's channels.
-
-  - It's possible to convert channels to Teams
-
-  - It's possible to add all team members to a channel at once
-
-  - Team members have roles
-
-
-  ![image](https://user-images.githubusercontent.com/70927132/113421955-4f56b680-93a2-11eb-80dc-9b70a3f09b3e.png)
-
-
-
-  **Quickly onboard new users with Autojoin channels**
-
-  Teams can have Auto-join channels –  channels to which the team members are automatically added, so you don’t need to go through the manual process of adding users repetitively
-
-  ![image](https://user-images.githubusercontent.com/70927132/113419284-81194e80-939d-11eb-9fff-aeb05cbc8089.png)
-
-  **Instantly mention multiple members at once** (available in EE)
-
+  ## Teams
+
+
+
+  You can easily group your users as Teams on Rocket.Chat. The feature takes the hassle out of managing multiple users one by one and allows you to handle them at the same time efficiently.
+
+
  
+  - Teams can be public or private and each team can have its own channels, which also can be public or private.
  
+  - It's possible to add existing channels to a Team or create new ones inside a Team.
  
+  - It's possible to invite people outside a Team to join Team's channels.
  
+  - It's possible to convert channels to Teams
  
+  - It's possible to add all team members to a channel at once
  
+  - Team members have roles
+
+
+  ![image](https://user-images.githubusercontent.com/70927132/113421955-4f56b680-93a2-11eb-80dc-9b70a3f09b3e.png)
+
+
+
+  **Quickly onboard new users with Autojoin channels**
+
+  Teams can have Auto-join channels –  channels to which the team members are automatically added, so you don’t need to go through the manual process of adding users repetitively
+
+  ![image](https://user-images.githubusercontent.com/70927132/113419284-81194e80-939d-11eb-9fff-aeb05cbc8089.png)
+
+  **Instantly mention multiple members at once** (available in EE)
+
   With Teams, you don’t need to remember everyone’s name to communicate with a team quickly. Just mention a Team — @engineers, for instance —  and all members will be instantly notified.
 
 ### 🚀 Improvements
@@ -3933,22 +3871,22 @@
 
 - Added modal-box for preview after recording audio. ([#20370](https://github.com/RocketChat/Rocket.Chat/pull/20370) by [@Darshilp326](https://github.com/Darshilp326))
 
-  A modal box will be displayed so that users can change the filename and add description.
-
-  **Before**
-
-  https://user-images.githubusercontent.com/55157259/105687301-4e2a8880-5f1e-11eb-873d-dc8a880a2fc8.mp4
-
-  **After**
-
+  A modal box will be displayed so that users can change the filename and add description.
+
+  **Before**
+
+  https://user-images.githubusercontent.com/55157259/105687301-4e2a8880-5f1e-11eb-873d-dc8a880a2fc8.mp4
+
+  **After**
+
   https://user-images.githubusercontent.com/55157259/105687342-597db400-5f1e-11eb-8b61-8f9d9ebad0c4.mp4
 
 - Adds toast after follow/unfollow messages and following icon for followed messages without threads. ([#20025](https://github.com/RocketChat/Rocket.Chat/pull/20025) by [@RonLek](https://github.com/RonLek))
 
-  There was no alert on following/unfollowing a message previously. Also, it was impossible to make out a followed message with no threads from an unfollowed one.
-
-  This PR would show an alert on following/unfollowing a message and also display a small bell icon (similar to the ones for starred and pinned messages) when a message with no thread is followed.
-
+  There was no alert on following/unfollowing a message previously. Also, it was impossible to make out a followed message with no threads from an unfollowed one. 
+
+  This PR would show an alert on following/unfollowing a message and also display a small bell icon (similar to the ones for starred and pinned messages) when a message with no thread is followed.
+
   https://user-images.githubusercontent.com/28918901/103813540-43e73e00-5086-11eb-8592-2877eb650f3e.mp4
 
 - Back to threads list button on threads contextual bar ([#20882](https://github.com/RocketChat/Rocket.Chat/pull/20882))
@@ -3961,12 +3899,12 @@
 
 - Improve Apps permission modal ([#21193](https://github.com/RocketChat/Rocket.Chat/pull/21193) by [@lucassartor](https://github.com/lucassartor))
 
-  Improve the UI of the Apps permission modal when installing an App that requires permissions.
-
-  **New UI:**
-  ![after](https://user-images.githubusercontent.com/49413772/111685622-e817fe80-8806-11eb-998d-b56623560e74.PNG)
-
-  **Old UI:**
+  Improve the UI of the Apps permission modal when installing an App that requires permissions.
+
+  **New UI:**
+  ![after](https://user-images.githubusercontent.com/49413772/111685622-e817fe80-8806-11eb-998d-b56623560e74.PNG)
+
+  **Old UI:**
   ![before](https://user-images.githubusercontent.com/49413772/111685897-375e2f00-8807-11eb-814e-cb8060dc1830.PNG)
 
 - Make debug logs of Apps configurable via Log_Level setting in the Admin panel ([#21000](https://github.com/RocketChat/Rocket.Chat/pull/21000) by [@cuonghuunguyen](https://github.com/cuonghuunguyen))
@@ -3977,15 +3915,15 @@
 
 - Sort Users List In Case Insensitive Manner ([#20790](https://github.com/RocketChat/Rocket.Chat/pull/20790) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  The users listed in the admin panel were sorted in a case-sensitive manner , where the capitals came first and then the small letters (like   - *A B C a b c*). This Change fixes this by sorting the names in a caseinsensitive manner (now   - *A a B b C c*).
-
-  ### Before
-
-  ![before](https://user-images.githubusercontent.com/55396651/108189880-3fa74980-7137-11eb-99da-6498707b4bf8.png)
-
-
-  ### With This Change
-
+  The users listed in the admin panel were sorted in a case-sensitive manner , where the capitals came first and then the small letters (like   - *A B C a b c*). This Change fixes this by sorting the names in a caseinsensitive manner (now   - *A a B b C c*).
+
+  ### Before
+
+  ![before](https://user-images.githubusercontent.com/55396651/108189880-3fa74980-7137-11eb-99da-6498707b4bf8.png)
+
+
+  ### With This Change
+
   ![after](https://user-images.githubusercontent.com/55396651/108190177-9dd42c80-7137-11eb-8b4e-b7cef4ba512f.png)
 
 ### 🐛 Bug fixes
@@ -3999,12 +3937,12 @@
 
 - **APPS:** Warn message while installing app in air-gapped environment ([#20992](https://github.com/RocketChat/Rocket.Chat/pull/20992) by [@lucassartor](https://github.com/lucassartor))
 
-  Change **error** message to a **warn** message when uploading a  `.zip` file app into a air-gapped environment.
-
-  The **error** message was giving the impression for the user that the app wasn't properly being installed , which it wasn't the case:
-  ![error](https://user-images.githubusercontent.com/49413772/109855273-d3e4d680-7c36-11eb-824b-ad455d24710c.PNG)
-
-  A more detailed **warn** message can fix that impression for the user:
+  Change **error** message to a **warn** message when uploading a  `.zip` file app into a air-gapped environment.
+
+  The **error** message was giving the impression for the user that the app wasn't properly being installed , which it wasn't the case:
+  ![error](https://user-images.githubusercontent.com/49413772/109855273-d3e4d680-7c36-11eb-824b-ad455d24710c.PNG)
+
+  A more detailed **warn** message can fix that impression for the user:
   ![warn](https://user-images.githubusercontent.com/49413772/109855383-f2e36880-7c36-11eb-8d61-c442980bd8fd.PNG)
 
 - Add missing `unreads` field to `users.info` REST endpoint ([#20905](https://github.com/RocketChat/Rocket.Chat/pull/20905))
@@ -4019,10 +3957,10 @@
 
 - Correct direction for admin mapview text ([#20897](https://github.com/RocketChat/Rocket.Chat/pull/20897) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  ![Screenshot from 2021-02-25 02-49-21](https://user-images.githubusercontent.com/38764067/109068512-f8602080-7715-11eb-8e22-d610f9d046d8.png)
-  ![Screenshot from 2021-02-25 02-49-46](https://user-images.githubusercontent.com/38764067/109068516-fa29e400-7715-11eb-9119-1c79abce278f.png)
-  ![Screenshot from 2021-02-25 02-49-57](https://user-images.githubusercontent.com/38764067/109068519-fbf3a780-7715-11eb-8b3d-0dc32f898725.png)
-
+  ![Screenshot from 2021-02-25 02-49-21](https://user-images.githubusercontent.com/38764067/109068512-f8602080-7715-11eb-8e22-d610f9d046d8.png)
+  ![Screenshot from 2021-02-25 02-49-46](https://user-images.githubusercontent.com/38764067/109068516-fa29e400-7715-11eb-9119-1c79abce278f.png)
+  ![Screenshot from 2021-02-25 02-49-57](https://user-images.githubusercontent.com/38764067/109068519-fbf3a780-7715-11eb-8b3d-0dc32f898725.png)
+
   The text says the share button will be on the left of the messagebox once enabled. However, it actually is on the right.
 
 - Correct ignored message CSS ([#20928](https://github.com/RocketChat/Rocket.Chat/pull/20928) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
@@ -4039,13 +3977,13 @@
 
 - Custom emojis to override default ([#20359](https://github.com/RocketChat/Rocket.Chat/pull/20359) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  Due to the sequence of the imports and how the emojiRenderer prioritizes lists, the custom emojis could not override the emojione emojis. Making two small changes fixed the issue.
-
-  With the custom emoji for `:facepalm:` added, you can check out the result below:
-  ### Before
-  ![Screenshot from 2021-01-25 02-20-04](https://user-images.githubusercontent.com/38764067/105643088-dfb0e080-5eb3-11eb-8a00-582c53fbe9a4.png)
-
-  ### After
+  Due to the sequence of the imports and how the emojiRenderer prioritizes lists, the custom emojis could not override the emojione emojis. Making two small changes fixed the issue.
+
+  With the custom emoji for `:facepalm:` added, you can check out the result below:
+  ### Before
+  ![Screenshot from 2021-01-25 02-20-04](https://user-images.githubusercontent.com/38764067/105643088-dfb0e080-5eb3-11eb-8a00-582c53fbe9a4.png)
+
+  ### After
   ![Screenshot from 2021-01-25 02-18-58](https://user-images.githubusercontent.com/38764067/105643076-cdcf3d80-5eb3-11eb-84b8-5dbc4f1135df.png)
 
 - Empty URL in user avatar doesn't show error and enables save ([#20440](https://github.com/RocketChat/Rocket.Chat/pull/20440) by [@im-adithya](https://github.com/im-adithya))
@@ -4058,12 +3996,12 @@
 
 - Fix the search list showing the last channel ([#21160](https://github.com/RocketChat/Rocket.Chat/pull/21160) by [@shrinish123](https://github.com/shrinish123))
 
-  The search list now also properly shows the last channel
-  Before  :
-
-  ![searchlist](https://user-images.githubusercontent.com/56491104/111471487-f3a7ee80-874e-11eb-9c6e-19bbf0731d60.png)
-
-  After :
+  The search list now also properly shows the last channel 
+  Before  :
+
+  ![searchlist](https://user-images.githubusercontent.com/56491104/111471487-f3a7ee80-874e-11eb-9c6e-19bbf0731d60.png)
+
+  After : 
   ![search_final](https://user-images.githubusercontent.com/56491104/111471521-fe628380-874e-11eb-8fa3-d1edb57587e1.png)
 
 - Follow thread action on threads list  ([#20881](https://github.com/RocketChat/Rocket.Chat/pull/20881))
@@ -4088,13 +4026,13 @@
 
 - Multi Select isn't working in Export Messages ([#21236](https://github.com/RocketChat/Rocket.Chat/pull/21236) by [@PriyaBihani](https://github.com/PriyaBihani))
 
-  While exporting messages, we were not able to select multiple Users like this:
-
-  https://user-images.githubusercontent.com/69837339/111953057-169a2000-8b0c-11eb-94a4-0e1657683f96.mp4
-
-  Now we can select multiple users:
-
-
+  While exporting messages, we were not able to select multiple Users like this: 
+
+  https://user-images.githubusercontent.com/69837339/111953057-169a2000-8b0c-11eb-94a4-0e1657683f96.mp4
+
+  Now we can select multiple users: 
+
+
   https://user-images.githubusercontent.com/69837339/111953097-274a9600-8b0c-11eb-9177-bec388b042bd.mp4
 
 - New Channel popover not closing ([#21080](https://github.com/RocketChat/Rocket.Chat/pull/21080))
@@ -4103,31 +4041,31 @@
 
 - OEmbedURLWidget - Show Full Embedded Text Description ([#20569](https://github.com/RocketChat/Rocket.Chat/pull/20569) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  Embeds were cutoff when either _urls had a long description_.
-  This was handled by removing `overflow:hidden;text-overflow:ellipsis;` from the inline styles in [`oembedUrlWidget.html`](https://github.com/RocketChat/Rocket.Chat/blob/develop/app/oembed/client/oembedUrlWidget.html#L28).
-
-  ### Earlier
-
-  ![earlier](https://user-images.githubusercontent.com/55396651/107110825-00dcde00-6871-11eb-866e-13cabc5b0d05.png)
-
-  ### Now
-
+  Embeds were cutoff when either _urls had a long description_.
+  This was handled by removing `overflow:hidden;text-overflow:ellipsis;` from the inline styles in [`oembedUrlWidget.html`](https://github.com/RocketChat/Rocket.Chat/blob/develop/app/oembed/client/oembedUrlWidget.html#L28).
+
+  ### Earlier
+
+  ![earlier](https://user-images.githubusercontent.com/55396651/107110825-00dcde00-6871-11eb-866e-13cabc5b0d05.png)
+
+  ### Now
+
   ![now](https://user-images.githubusercontent.com/55396651/107110794-ca06c800-6870-11eb-9b3b-168679936612.png)
 
 - Reactions list showing users in reactions option of message action. ([#20753](https://github.com/RocketChat/Rocket.Chat/pull/20753) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Reactions list shows emojis with respected users who have reacted with that emoji.
-
+  Reactions list shows emojis with respected users who have reacted with that emoji.
+
   https://user-images.githubusercontent.com/55157259/107857609-5870e000-6e55-11eb-8137-494a9f71b171.mp4
 
 - Removing truncation from profile ([#20352](https://github.com/RocketChat/Rocket.Chat/pull/20352) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  Truncating text in profile view was making some information completely inaccessible. Removed it from the user status and the custom fields where if the information is longer, the user would actually want to see all of it.
-
-  ### Before
-  ![Screenshot from 2021-01-24 20-54-44](https://user-images.githubusercontent.com/38764067/105634935-7e264d00-5e86-11eb-8a6c-9f2a363e0f6c.png)
-
-  ### After
+  Truncating text in profile view was making some information completely inaccessible. Removed it from the user status and the custom fields where if the information is longer, the user would actually want to see all of it.
+
+  ### Before
+  ![Screenshot from 2021-01-24 20-54-44](https://user-images.githubusercontent.com/38764067/105634935-7e264d00-5e86-11eb-8a6c-9f2a363e0f6c.png)
+
+  ### After
   ![Screenshot from 2021-01-24 20-54-06](https://user-images.githubusercontent.com/38764067/105634940-82eb0100-5e86-11eb-8b90-e97a43c5e938.png)
 
 - Replace wrong field description on Room Information panel ([#21395](https://github.com/RocketChat/Rocket.Chat/pull/21395) by [@rafaelblink](https://github.com/rafaelblink))
@@ -4138,8 +4076,8 @@
 
 - Set establishing to false if OTR timeouts ([#21183](https://github.com/RocketChat/Rocket.Chat/pull/21183) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Set establishing false if OTR timeouts.
-
+  Set establishing false if OTR timeouts.
+
   https://user-images.githubusercontent.com/55157259/111617086-b30cab80-8808-11eb-8740-3b4ffacfc322.mp4
 
 - Sidebar scroll missing full height ([#21071](https://github.com/RocketChat/Rocket.Chat/pull/21071))
@@ -4178,33 +4116,20 @@
 
 - Chore: Add tests for Meteor methods ([#20901](https://github.com/RocketChat/Rocket.Chat/pull/20901))
 
-  Add end-to-end tests for the following meteor methods
-
-
-  - [x] public-settings:get
-
-  - [x] rooms:get
-
-  - [x] subscriptions:get
-
-  - [x] permissions:get
-
-  - [x] loadMissedMessages
-
-  - [x] loadHistory
-
-  - [x] listCustomUserStatus
-
-  - [x] getUserRoles
-
-  - [x] getRoomRoles  (called by the API, already covered)
-
-  - [x] getMessages
-
-  - [x] getUsersOfRoom
-
-  - [x] loadNextMessages
-
+  Add end-to-end tests for the following meteor methods
+
  
+  - [x] public-settings:get
  
+  - [x] rooms:get
  
+  - [x] subscriptions:get
  
+  - [x] permissions:get
  
+  - [x] loadMissedMessages
  
+  - [x] loadHistory
  
+  - [x] listCustomUserStatus
  
+  - [x] getUserRoles
  
+  - [x] getRoomRoles  (called by the API, already covered)
  
+  - [x] getMessages
  
+  - [x] getUsersOfRoom
  
+  - [x] loadNextMessages
  
   - [x] getThreadMessages
 
 - Chore: Meteor update 2.1 ([#21061](https://github.com/RocketChat/Rocket.Chat/pull/21061))
@@ -4217,10 +4142,8 @@
 
 - Improve: Increase testing coverage ([#21015](https://github.com/RocketChat/Rocket.Chat/pull/21015))
 
-  Add test for
-
-  - settings/raw
-
+  Add test for
  
+  - settings/raw
  
   - minimongo/comparisons
 
 - Improve: NPS survey fetch ([#21263](https://github.com/RocketChat/Rocket.Chat/pull/21263))
@@ -4239,19 +4162,17 @@
 
 - Regression: Add scope to permission checks in Team's endpoints ([#21369](https://github.com/RocketChat/Rocket.Chat/pull/21369))
 
-  - Include scope (team's main room ID) in the permission checks;
+  - Include scope (team's main room ID) in the permission checks;
    - Remove the `teamName` parameter from the `members`, `addMembers`, `updateMember` and `removeMembers` methods (since `teamId` will always be defined).
 
 - Regression: Add support to filter on `teams.listRooms` endpoint ([#21327](https://github.com/RocketChat/Rocket.Chat/pull/21327))
 
-  - Add support for queries (within the `query` parameter);
-
+  - Add support for queries (within the `query` parameter);
  
   - Add support to pagination (`offset` and `count`) when an user doesn't have the permission to get all rooms.
 
 - Regression: Add teams support to directory ([#21351](https://github.com/RocketChat/Rocket.Chat/pull/21351))
 
-  - Change `directory.js` to reduce function complexity
-
+  - Change `directory.js` to reduce function complexity
  
   - Add `teams` type of item. Directory will return all public teams & private teams the user is part of.
 
 - Regression: add view room action on Teams Channels ([#21295](https://github.com/RocketChat/Rocket.Chat/pull/21295))
@@ -4304,19 +4225,18 @@
 
 - Regression: Quick action button missing for Omnichannel On-Hold queue ([#21285](https://github.com/RocketChat/Rocket.Chat/pull/21285))
 
-  - Move the Manual On Hold button to the new Omnichannel Header
-  ![image](https://user-images.githubusercontent.com/34130764/112291749-6ae10380-8cb6-11eb-94cd-e05efc14b1bf.png)
-  ![image](https://user-images.githubusercontent.com/34130764/112304146-27d95d00-8cc3-11eb-85db-dde04a110dd1.png)
-
-
+  - Move the Manual On Hold button to the new Omnichannel Header
+  ![image](https://user-images.githubusercontent.com/34130764/112291749-6ae10380-8cb6-11eb-94cd-e05efc14b1bf.png)
+  ![image](https://user-images.githubusercontent.com/34130764/112304146-27d95d00-8cc3-11eb-85db-dde04a110dd1.png)
+
  
   - Minor fixes
 
 - regression: Remove Breadcrumbs and update Tag component ([#21399](https://github.com/RocketChat/Rocket.Chat/pull/21399))
 
 - Regression: Remove channel action on add channel's modal don't work ([#21356](https://github.com/RocketChat/Rocket.Chat/pull/21356))
 
-  ![removechannel-on-add-existing-modal](https://user-images.githubusercontent.com/27704687/112911017-eda8fa80-90ca-11eb-9c24-47a70be0c314.gif)
-
+  ![removechannel-on-add-existing-modal](https://user-images.githubusercontent.com/27704687/112911017-eda8fa80-90ca-11eb-9c24-47a70be0c314.gif)
+
   ![image](https://user-images.githubusercontent.com/27704687/112911052-02858e00-90cb-11eb-85a2-0ef1f5f9ffd9.png)
 
 - Regression: Remove primary color from button in TeamChannels component ([#21293](https://github.com/RocketChat/Rocket.Chat/pull/21293))
@@ -4345,10 +4265,10 @@
 
 - Regression: Unify Contact information displayed on the Room header and Room Info ([#21312](https://github.com/RocketChat/Rocket.Chat/pull/21312) by [@rafaelblink](https://github.com/rafaelblink))
 
-  ![image](https://user-images.githubusercontent.com/34130764/112586659-35592900-8e22-11eb-94be-32bdff7ca883.png)
-
-  ![image](https://user-images.githubusercontent.com/2493803/112913130-788bf400-90cf-11eb-84c6-782b203e100a.png)
-
+  ![image](https://user-images.githubusercontent.com/34130764/112586659-35592900-8e22-11eb-94be-32bdff7ca883.png)
+
+  ![image](https://user-images.githubusercontent.com/2493803/112913130-788bf400-90cf-11eb-84c6-782b203e100a.png)
+
   ![image](https://user-images.githubusercontent.com/2493803/112913146-817cc580-90cf-11eb-87ad-ef79766be2b3.png)
 
 - Regression: Unify team actions to add a room to a team ([#21386](https://github.com/RocketChat/Rocket.Chat/pull/21386))
@@ -4357,10 +4277,8 @@
 
 - Regression: Update .invite endpoints to support multiple users at once ([#21328](https://github.com/RocketChat/Rocket.Chat/pull/21328))
 
-  - channels.invite now supports passing an array as a param (either with usernames or userIds) via `usernames` or `userIds` properties.
-
-  - You can still use the endpoint to invite only one user via the old params `userId`, `username` or `user`.
-
+  - channels.invite now supports passing an array as a param (either with usernames or userIds) via `usernames` or `userIds` properties.
  
+  - You can still use the endpoint to invite only one user via the old params `userId`, `username` or `user`.
  
   - Same changes apply to groups.invite
 
 - Regression: user actions in admin ([#21307](https://github.com/RocketChat/Rocket.Chat/pull/21307))
@@ -4495,7 +4413,7 @@
 
 - Close Call contextual bar after starting jitsi call. ([#21004](https://github.com/RocketChat/Rocket.Chat/pull/21004) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  After jitsi call is started, if the call is started in a new window then we should close contextual tab bar.
+  After jitsi call is started, if the call is started in a new window then we should close contextual tab bar.
   So, when 'YES' is pressed on modal, we call handleClose function if openNewWindow is true, as call doesn't starts on tab bar, it starts on new window.
 
 ### 🐛 Bug fixes
@@ -4505,7 +4423,7 @@
 
 - Stopping Jitsi reload ([#20973](https://github.com/RocketChat/Rocket.Chat/pull/20973) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  The Function where Jitsi call is started gets called many times due to `room.usernames` dep of useMemo, this dep triggers reloading of this function many times.
+  The Function where Jitsi call is started gets called many times due to `room.usernames` dep of useMemo, this dep triggers reloading of this function many times.
   So removing this dep from useMemo dependencies
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -4533,10 +4451,10 @@
 
 - Cloud Workspace bridge ([#20838](https://github.com/RocketChat/Rocket.Chat/pull/20838))
 
-  Adds the new CloudWorkspace functionality.
-
-  It allows apps to request the access token for the workspace it's installed on, so it can perform actions with other Rocket.Chat services, such as the Omni Gateway.
-
+  Adds the new CloudWorkspace functionality.
+
+  It allows apps to request the access token for the workspace it's installed on, so it can perform actions with other Rocket.Chat services, such as the Omni Gateway.
+
   https://github.com/RocketChat/Rocket.Chat.Apps-engine/pull/382
 
 - Header with Breadcrumbs ([#20609](https://github.com/RocketChat/Rocket.Chat/pull/20609))
@@ -4554,10 +4472,10 @@
 
 - Add symbol to indicate apps' required settings in the UI ([#20447](https://github.com/RocketChat/Rocket.Chat/pull/20447))
 
-  - Apps are able to define **required** settings. These settings should not be left blank by the user and an error will be thrown and shown in the interface if an user attempts to save changes in the app details page leaving any required fields blank;
-  ![prt_screen_required_app_settings_warning](https://user-images.githubusercontent.com/36537004/106032964-e73cd900-60af-11eb-8eab-c11fd651b593.png)
-
-   - A sign (*) is added to the label of app settings' fields that are required so as to highlight the fields which must not be left blank.
+  - Apps are able to define **required** settings. These settings should not be left blank by the user and an error will be thrown and shown in the interface if an user attempts to save changes in the app details page leaving any required fields blank;
+  ![prt_screen_required_app_settings_warning](https://user-images.githubusercontent.com/36537004/106032964-e73cd900-60af-11eb-8eab-c11fd651b593.png)
+
+   - A sign (*) is added to the label of app settings' fields that are required so as to highlight the fields which must not be left blank.
   ![prt_screen_required_app_settings](https://user-images.githubusercontent.com/36537004/106014879-ae473900-609c-11eb-9b9e-95de7bbf20a5.png)
 
 - Add visual validation on users admin forms ([#20308](https://github.com/RocketChat/Rocket.Chat/pull/20308))
@@ -4578,20 +4496,20 @@
 
 - Adds tooltip for sidebar header icons ([#19934](https://github.com/RocketChat/Rocket.Chat/pull/19934) by [@RonLek](https://github.com/RonLek))
 
-  Previously the header icons in the sidebar didn't show a tooltip when hovered over. This PR fixes that.
-
+  Previously the header icons in the sidebar didn't show a tooltip when hovered over. This PR fixes that.
+
   ![Screenshot from 2020-12-22 15-17-41](https://user-images.githubusercontent.com/28918901/102874804-f2756700-4468-11eb-8324-b7f3194e62fe.png)
 
 - Better Presentation of Blockquotes ([#20750](https://github.com/RocketChat/Rocket.Chat/pull/20750) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  Changed the values of `margin-top` and `margin-bottom` for *first* and *last* childs in blockquotes to increase readability.
-
-  ### Before
-
-  ![before](https://user-images.githubusercontent.com/55396651/107858662-3e3a0080-6e5b-11eb-8274-9bd956807235.png)
-
-  ### Now
-
+  Changed the values of `margin-top` and `margin-bottom` for *first* and *last* childs in blockquotes to increase readability.
+
+  ### Before
+
+  ![before](https://user-images.githubusercontent.com/55396651/107858662-3e3a0080-6e5b-11eb-8274-9bd956807235.png)
+
+  ### Now
+
   ![now](https://user-images.githubusercontent.com/55396651/107858471-480f3400-6e5a-11eb-9ccb-3f1be2fed0a4.png)
 
 - Change header based on room type ([#20612](https://github.com/RocketChat/Rocket.Chat/pull/20612))
@@ -4612,18 +4530,13 @@
 
 - Replace react-window for react-virtuoso package ([#20392](https://github.com/RocketChat/Rocket.Chat/pull/20392))
 
-  Remove:
-
-  - react-window
-
-  - react-window-infinite-loader
-
-  - simplebar-react
-
-  Include:
-
-  - react-virtuoso
-
+  Remove:
  
+  - react-window
  
+  - react-window-infinite-loader
  
+  - simplebar-react
+
+  Include:
  
+  - react-virtuoso
  
   - rc-scrollbars
 
 - Rewrite Call as React component  ([#19778](https://github.com/RocketChat/Rocket.Chat/pull/19778))
@@ -4639,13 +4552,13 @@
 
 - Add debouncing to add users search field. ([#20297](https://github.com/RocketChat/Rocket.Chat/pull/20297) by [@Darshilp326](https://github.com/Darshilp326))
 
-  BEFORE
-
-  https://user-images.githubusercontent.com/55157259/105350722-98a3c080-5c11-11eb-82f3-d9a62a4fa50b.mp4
-
-
-  AFTER
-
+  BEFORE
+
+  https://user-images.githubusercontent.com/55157259/105350722-98a3c080-5c11-11eb-82f3-d9a62a4fa50b.mp4
+
+
+  AFTER
+
   https://user-images.githubusercontent.com/55157259/105350757-a2c5bf00-5c11-11eb-91db-25c0b9e01a28.mp4
 
 - Add tooltips to Thread header buttons ([#20456](https://github.com/RocketChat/Rocket.Chat/pull/20456) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
@@ -4658,8 +4571,8 @@
 
 - Added check for view admin permission page ([#20403](https://github.com/RocketChat/Rocket.Chat/pull/20403) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  Admin Permission page was visible to all, if you add admin/permissions after the base url. This should not be visible to all user, only people with certain permissions should be able to see this page.
-  I am also able to see permissions page for open workspace of Rocket chat.
+  Admin Permission page was visible to all, if you add admin/permissions after the base url. This should not be visible to all user, only people with certain permissions should be able to see this page.
+  I am also able to see permissions page for open workspace of Rocket chat.
   ![image](https://user-images.githubusercontent.com/58601732/105829728-bfd00880-5fea-11eb-9121-6c53a752f140.png)
 
 - Adding the accidentally deleted tag template, used by other templates ([#20772](https://github.com/RocketChat/Rocket.Chat/pull/20772) by [@yash-rajpal](https://github.com/yash-rajpal))
@@ -4668,8 +4581,8 @@
 
 - Admin cannot clear user details like bio or nickname ([#20785](https://github.com/RocketChat/Rocket.Chat/pull/20785) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  When the API users.update is called to update user data, it passes data to saveUser function. Here before saving data like bio or nickname we are checking if they are available or not. If data is available then we are saving it, but we are not doing anything when data isn't available.
-
+  When the API users.update is called to update user data, it passes data to saveUser function. Here before saving data like bio or nickname we are checking if they are available or not. If data is available then we are saving it, but we are not doing anything when data isn't available.
+
   So unsetting data if data isn't available to save. Will also fix bio and other fields. :)
 
 - Admin Panel pages not visible in Safari ([#20912](https://github.com/RocketChat/Rocket.Chat/pull/20912))
@@ -4686,24 +4599,24 @@
 
 - Blank Personal Access Token Bug ([#20193](https://github.com/RocketChat/Rocket.Chat/pull/20193) by [@RonLek](https://github.com/RonLek))
 
-  Adds error when personal access token is blank thereby disallowing the creation of one.
-
+  Adds error when personal access token is blank thereby disallowing the creation of one.
+
   https://user-images.githubusercontent.com/28918901/104483631-5adde100-55ee-11eb-9938-64146bce127e.mp4
 
 - CAS login failing due to TOTP requirement ([#20840](https://github.com/RocketChat/Rocket.Chat/pull/20840))
 
 - Changed password input field for password access in edit room info. ([#20356](https://github.com/RocketChat/Rocket.Chat/pull/20356) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Password field would be secured with asterisks in edit room info
-
-  https://user-images.githubusercontent.com/55157259/105641758-cad04f00-5eab-11eb-90de-0c91263edd55.mp4
-
+  Password field would be secured with asterisks in edit room info
+
+  https://user-images.githubusercontent.com/55157259/105641758-cad04f00-5eab-11eb-90de-0c91263edd55.mp4
+
   .
 
 - Channel mentions showing user subscribed channels twice ([#20484](https://github.com/RocketChat/Rocket.Chat/pull/20484) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Channel mention shows user subscribed channels twice.
-
+  Channel mention shows user subscribed channels twice.
+
   https://user-images.githubusercontent.com/55157259/106183033-b353d780-61c5-11eb-8aab-1dbb62b02ff8.mp4
 
 - CORS config not accepting multiple origins ([#20696](https://github.com/RocketChat/Rocket.Chat/pull/20696) by [@g-thome](https://github.com/g-thome))
@@ -4714,26 +4627,26 @@
 
 - Default Attachments - Remove Extra Margin in Field Attachments ([#20618](https://github.com/RocketChat/Rocket.Chat/pull/20618) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  A large amount of unnecessary margin which existed in the **Field Attachments inside the `DefaultAttachments`** has been fixed.
-
-  ### Earlier
-
-  ![earlier](https://user-images.githubusercontent.com/55396651/107056792-ba4b9d00-67f8-11eb-9153-05281416cddb.png)
-
-  ### Now
-
+  A large amount of unnecessary margin which existed in the **Field Attachments inside the `DefaultAttachments`** has been fixed.
+
+  ### Earlier
+
+  ![earlier](https://user-images.githubusercontent.com/55396651/107056792-ba4b9d00-67f8-11eb-9153-05281416cddb.png)
+
+  ### Now
+
   ![now](https://user-images.githubusercontent.com/55396651/107057196-3219c780-67f9-11eb-84db-e4a0addfc168.png)
 
 - Default Attachments - Show Full Attachment.Text with Markdown ([#20606](https://github.com/RocketChat/Rocket.Chat/pull/20606) by [@aditya-mitra](https://github.com/aditya-mitra))
 
-  Removed truncating of text in `Attachment.Text`.
-  Added `Attachment.Text` to be parsed to markdown by default.
-
-  ### Earlier
-  ![earlier](https://user-images.githubusercontent.com/55396651/106910781-92d8cf80-6727-11eb-82ec-818df7544ff0.png)
-
-  ### Now
-
+  Removed truncating of text in `Attachment.Text`. 
+  Added `Attachment.Text` to be parsed to markdown by default.
+
+  ### Earlier
+  ![earlier](https://user-images.githubusercontent.com/55396651/106910781-92d8cf80-6727-11eb-82ec-818df7544ff0.png)
+
+  ### Now
+
   ![now](https://user-images.githubusercontent.com/55396651/106910840-a126eb80-6727-11eb-8bd6-d86383dd9181.png)
 
 - Don't ask again not rendering ([#20745](https://github.com/RocketChat/Rocket.Chat/pull/20745))
@@ -4754,21 +4667,21 @@
 
 - Feedback on bulk invite ([#20339](https://github.com/RocketChat/Rocket.Chat/pull/20339) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  Resolved structure where no response was being received. Changed from callback to async/await.
-  Added error in case of empty submission, or if no valid emails were found.
-
+  Resolved structure where no response was being received. Changed from callback to async/await.
+  Added error in case of empty submission, or if no valid emails were found.
+
   https://user-images.githubusercontent.com/38764067/105613964-dfe5a900-5deb-11eb-80f2-21fc8dee57c0.mp4
 
 - Filters are not being applied correctly in Omnichannel Current Chats list ([#20320](https://github.com/RocketChat/Rocket.Chat/pull/20320) by [@rafaelblink](https://github.com/rafaelblink))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/2493803/105537672-082cb500-5cd1-11eb-8f1b-1726ba60420a.png)
-
-  ### After
-  ![image](https://user-images.githubusercontent.com/2493803/105537773-2d212800-5cd1-11eb-8746-048deb9502d9.png)
-
-  ![image](https://user-images.githubusercontent.com/2493803/106494728-88090b00-6499-11eb-922e-5386107e2389.png)
-
+  ### Before
+  ![image](https://user-images.githubusercontent.com/2493803/105537672-082cb500-5cd1-11eb-8f1b-1726ba60420a.png)
+
+  ### After
+  ![image](https://user-images.githubusercontent.com/2493803/105537773-2d212800-5cd1-11eb-8746-048deb9502d9.png)
+
+  ![image](https://user-images.githubusercontent.com/2493803/106494728-88090b00-6499-11eb-922e-5386107e2389.png)
+
   ![image](https://user-images.githubusercontent.com/2493803/106494751-90f9dc80-6499-11eb-901b-5e4dbdc678ba.png)
 
 - Fix Empty highlighted words field ([#20329](https://github.com/RocketChat/Rocket.Chat/pull/20329) by [@yash-rajpal](https://github.com/yash-rajpal))
@@ -4797,11 +4710,11 @@
 
 - List of Omnichannel triggers is not listing data ([#20624](https://github.com/RocketChat/Rocket.Chat/pull/20624) by [@rafaelblink](https://github.com/rafaelblink))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/2493803/107095379-7308e080-67e7-11eb-8251-7e7ff891087a.png)
-
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/2493803/107095379-7308e080-67e7-11eb-8251-7e7ff891087a.png)
+
+
+  ### After
   ![image](https://user-images.githubusercontent.com/2493803/107095261-3b019d80-67e7-11eb-8425-8612b03ac50a.png)
 
 - Livechat bridge permission checkers ([#20653](https://github.com/RocketChat/Rocket.Chat/pull/20653) by [@lolimay](https://github.com/lolimay))
@@ -4824,8 +4737,7 @@
 
 - Missing setting to control when to send the ReplyTo field in email notifications ([#20744](https://github.com/RocketChat/Rocket.Chat/pull/20744))
 
-  - Add a new setting ("Add Reply-To header") in the Email settings' page to control when the Reply-To header is used in e-mail notifications;
-
+  - Add a new setting ("Add Reply-To header") in the Email settings' page to control when the Reply-To header is used in e-mail notifications;
  
   - The new setting is turned off (`false` value) by default.
 
 - New Integration page was not being displayed ([#20670](https://github.com/RocketChat/Rocket.Chat/pull/20670) by [@yash-rajpal](https://github.com/yash-rajpal))
@@ -4858,15 +4770,15 @@
 
 - Remove duplicate getCommonRoomEvents() event binding for starredMessages ([#20185](https://github.com/RocketChat/Rocket.Chat/pull/20185) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  The getCommonRoomEvents() returned functions were bound to the starredMessages template twice. This was causing some bugs, as detailed in the Issue mentioned below.
+  The getCommonRoomEvents() returned functions were bound to the starredMessages template twice. This was causing some bugs, as detailed in the Issue mentioned below.
   I removed the top events call that only bound the getCommonRoomEvents(). Therefore, only one call for the same is left, which is at the end of the file. Having the events bound just once removes the bugs mentioned.
 
 - Remove warning problems from console ([#20800](https://github.com/RocketChat/Rocket.Chat/pull/20800))
 
 - Removed tooltip in kebab menu options. ([#20498](https://github.com/RocketChat/Rocket.Chat/pull/20498) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Removed tooltip as it was not needed.
-
+  Removed tooltip as it was not needed.
+
   https://user-images.githubusercontent.com/55157259/106246146-a53ca000-6233-11eb-9874-cbd1b4331bc0.mp4
 
 - Retry icon comes out of the div ([#20390](https://github.com/RocketChat/Rocket.Chat/pull/20390) by [@im-adithya](https://github.com/im-adithya))
@@ -4881,8 +4793,8 @@
 
 - Room's last message's update date format on IE ([#20680](https://github.com/RocketChat/Rocket.Chat/pull/20680))
 
-  The proposed change fixes a bug when updates the cached records on Internet Explorer and it breaks the sidebar as shown on the screenshot below:
-
+  The proposed change fixes a bug when updates the cached records on Internet Explorer and it breaks the sidebar as shown on the screenshot below:
+
   ![image](https://user-images.githubusercontent.com/27704687/107578007-f2285b00-6bd1-11eb-9250-1e76ae67f9c9.png)
 
 - Save user password and email from My Account ([#20737](https://github.com/RocketChat/Rocket.Chat/pull/20737))
@@ -4891,8 +4803,8 @@
 
 - Selected hide system messages would now be viewed in vertical bar. ([#20358](https://github.com/RocketChat/Rocket.Chat/pull/20358) by [@Darshilp326](https://github.com/Darshilp326))
 
-  All selected hide system messages are now in vertical Bar.
-
+  All selected hide system messages are now in vertical Bar.
+
   https://user-images.githubusercontent.com/55157259/105642624-d5411780-5eb0-11eb-8848-93e4b02629cb.mp4
 
 - Selected messages don't get unselected ([#20408](https://github.com/RocketChat/Rocket.Chat/pull/20408) by [@im-adithya](https://github.com/im-adithya))
@@ -4907,22 +4819,14 @@
 
 - Several Slack Importer issues ([#20216](https://github.com/RocketChat/Rocket.Chat/pull/20216))
 
-  - Fix: Slack Importer crashes when importing a large users.json file
-
-  - Fix: Slack importer crashes when messages have invalid mentions
-
-  - Skip listing all users on the preparation screen when the user count is too large.
-
-  - Split avatar download into a separate process.
-
-  - Update room's last message when the import is complete.
-
-  - Prevent invalid or duplicated channel names
-
-  - Improve message error handling.
-
-  - Reduce max allowed BSON size to avoid possible issues in some servers.
-
+  - Fix: Slack Importer crashes when importing a large users.json file
  
+  - Fix: Slack importer crashes when messages have invalid mentions
  
+  - Skip listing all users on the preparation screen when the user count is too large.
  
+  - Split avatar download into a separate process.
  
+  - Update room's last message when the import is complete.
  
+  - Prevent invalid or duplicated channel names
  
+  - Improve message error handling.
  
+  - Reduce max allowed BSON size to avoid possible issues in some servers.
  
   - Improve handling of very large channel files.
 
 - star icon was visible after unstarring a message ([#19645](https://github.com/RocketChat/Rocket.Chat/pull/19645) by [@bhavayAnand9](https://github.com/bhavayAnand9))
@@ -4941,15 +4845,15 @@
 
 - User statuses in admin user info panel ([#20341](https://github.com/RocketChat/Rocket.Chat/pull/20341) by [@RonLek](https://github.com/RonLek))
 
-  Modifies user statuses in admin info panel based on their actual status instead of their `statusConnection`. This enables correct and consistent change in user statuses.
-  Also, bot users having status as online were classified as offline, with this change they are now correctly classified based on their corresponding statuses.
-
+  Modifies user statuses in admin info panel based on their actual status instead of their `statusConnection`. This enables correct and consistent change in user statuses. 
+  Also, bot users having status as online were classified as offline, with this change they are now correctly classified based on their corresponding statuses.
+
   https://user-images.githubusercontent.com/28918901/105624438-b8bcc500-5e47-11eb-8d1e-3a4180da1304.mp4
 
 - Users autocomplete showing duplicated results ([#20481](https://github.com/RocketChat/Rocket.Chat/pull/20481) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Added new query for outside room users so that room members are not shown twice.
-
+  Added new query for outside room users so that room members are not shown twice.
+
   https://user-images.githubusercontent.com/55157259/106174582-33c10b00-61bb-11eb-9716-377ef7bba34e.mp4
 
 <details>
@@ -4970,7 +4874,7 @@
 
 - Chore: Disable Sessions Aggregates tests locally ([#20607](https://github.com/RocketChat/Rocket.Chat/pull/20607))
 
-  Disable Session aggregates tests in local environments
+  Disable Session aggregates tests in local environments
   For context, refer to: #20161
 
 - Chore: Improve performance of messages’ watcher ([#20519](https://github.com/RocketChat/Rocket.Chat/pull/20519))
@@ -5179,20 +5083,18 @@
 
 - **ENTERPRISE:** Omnichannel Contact Manager as preferred agent for routing ([#20244](https://github.com/RocketChat/Rocket.Chat/pull/20244))
 
-  If the `Contact-Manager` is assigned to a Visitor, the chat will automatically get transferred to the respective Contact-Manager, provided the Contact-Manager is online. In-case the Contact-Manager is offline, the chat will be transferred to any other online agent.
-  We have provided a setting to control this auto-assignment feature
-  ![image](https://user-images.githubusercontent.com/34130764/104880961-8104d780-5986-11eb-9d87-82b99814b028.png)
-
-  Behavior based-on Routing method
-
-
-  1. Auto-selection, Load-Balancing, or External Service (`autoAssignAgent = true`)
-    This is straightforward,
-        - if the Contact-manager is online, the chat will be transferred to the Contact-Manger only
-        - if the Contact-manager is offline, the chat will be transferred to any other online-agent based on the Routing system
-
-  2. Manual-selection (`autoAssignAgent = false`)
-        - If the Contact-Manager is online, the chat will appear in the Queue of Contact-Manager **ONLY**
+  If the `Contact-Manager` is assigned to a Visitor, the chat will automatically get transferred to the respective Contact-Manager, provided the Contact-Manager is online. In-case the Contact-Manager is offline, the chat will be transferred to any other online agent.
+  We have provided a setting to control this auto-assignment feature
+  ![image](https://user-images.githubusercontent.com/34130764/104880961-8104d780-5986-11eb-9d87-82b99814b028.png)
+
+  Behavior based-on Routing method
+
  
+  1. Auto-selection, Load-Balancing, or External Service (`autoAssignAgent = true`)
+    This is straightforward, 
+        - if the Contact-manager is online, the chat will be transferred to the Contact-Manger only
+        - if the Contact-manager is offline, the chat will be transferred to any other online-agent based on the Routing system
  
+  2. Manual-selection (`autoAssignAgent = false`)
+        - If the Contact-Manager is online, the chat will appear in the Queue of Contact-Manager **ONLY**
         - If the Contact-Manager is offline, the chat will appear in the Queue of all related Agents/Manager ( like it's done right now )
 
 - Banner system and NPS ([#20221](https://github.com/RocketChat/Rocket.Chat/pull/20221))
@@ -5201,34 +5103,34 @@
 
 - Email Inboxes for Omnichannel ([#20101](https://github.com/RocketChat/Rocket.Chat/pull/20101) by [@rafaelblink](https://github.com/rafaelblink))
 
-  With this new feature, email accounts will receive email messages(threads) which will be transformed into Omnichannel chats. It'll be possible to set up multiple email accounts, test the connection with email server(email provider) and define the behaviour of each account.
-
-  https://user-images.githubusercontent.com/2493803/105430398-242d4980-5c32-11eb-835a-450c94837d23.mp4
-
-  ### New item on admin menu
-
-  ![image](https://user-images.githubusercontent.com/2493803/105428723-bc293400-5c2e-11eb-8c02-e8d36ea82726.png)
-
-
-  ### Send test email tooltip
-
-  ![image](https://user-images.githubusercontent.com/2493803/104366986-eaa16380-54f8-11eb-9ba7-831cfde2319c.png)
-
-
-  ### Inbox Info
-
-  ![image](https://user-images.githubusercontent.com/2493803/104366796-ab731280-54f8-11eb-9941-a3cc8eb610e1.png)
-
-  ### SMTP Info
-
-  ![image](https://user-images.githubusercontent.com/2493803/104366868-c47bc380-54f8-11eb-969e-ccc29070957c.png)
-
-  ### IMAP Info
-
-  ![image](https://user-images.githubusercontent.com/2493803/104366897-cd6c9500-54f8-11eb-80c4-97d5b0c002d5.png)
-
-  ### Messages
-
+  With this new feature, email accounts will receive email messages(threads) which will be transformed into Omnichannel chats. It'll be possible to set up multiple email accounts, test the connection with email server(email provider) and define the behaviour of each account.
+
+  https://user-images.githubusercontent.com/2493803/105430398-242d4980-5c32-11eb-835a-450c94837d23.mp4
+
+  ### New item on admin menu
+
+  ![image](https://user-images.githubusercontent.com/2493803/105428723-bc293400-5c2e-11eb-8c02-e8d36ea82726.png)
+
+
+  ### Send test email tooltip
+
+  ![image](https://user-images.githubusercontent.com/2493803/104366986-eaa16380-54f8-11eb-9ba7-831cfde2319c.png)
+
+
+  ### Inbox Info
+
+  ![image](https://user-images.githubusercontent.com/2493803/104366796-ab731280-54f8-11eb-9941-a3cc8eb610e1.png)
+
+  ### SMTP Info
+
+  ![image](https://user-images.githubusercontent.com/2493803/104366868-c47bc380-54f8-11eb-969e-ccc29070957c.png)
+
+  ### IMAP Info
+
+  ![image](https://user-images.githubusercontent.com/2493803/104366897-cd6c9500-54f8-11eb-80c4-97d5b0c002d5.png)
+
+  ### Messages
+
   ![image](https://user-images.githubusercontent.com/2493803/105428971-45d90180-5c2f-11eb-992a-022a3df94471.png)
 
 - Encrypted Discussions and new Encryption Permissions ([#20201](https://github.com/RocketChat/Rocket.Chat/pull/20201))
@@ -5240,7 +5142,7 @@
 
 - Add extra SAML settings to update room subs and add private room subs. ([#19489](https://github.com/RocketChat/Rocket.Chat/pull/19489) by [@tlskinneriv](https://github.com/tlskinneriv))
 
-  Added a SAML setting to support updating room subscriptions each time a user logs in via SAML.
+  Added a SAML setting to support updating room subscriptions each time a user logs in via SAML.
   Added a SAML setting to support including private rooms in SAML updated subscriptions (whether initial or on each logon).
 
 - Autofocus on directory ([#20509](https://github.com/RocketChat/Rocket.Chat/pull/20509))
@@ -5267,7 +5169,7 @@
 
 - Tooltip added for Kebab menu on chat header ([#20116](https://github.com/RocketChat/Rocket.Chat/pull/20116) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  Added the missing Tooltip for kebab menu on chat header.
+  Added the missing Tooltip for kebab menu on chat header.
   ![tooltip after](https://user-images.githubusercontent.com/58601732/104031406-b07f4b80-51f2-11eb-87a4-1e8da78a254f.gif)
 
 ### 🐛 Bug fixes
@@ -5289,7 +5191,7 @@
 
 - Added context check for closing active tabbar for member-list ([#20228](https://github.com/RocketChat/Rocket.Chat/pull/20228) by [@yash-rajpal](https://github.com/yash-rajpal))
 
-  When we click on a username and then click on see user's full profile, a tab gets active and shows us the user's profile, the problem occurs when the tab is still active and we try to see another user's profile. In this case, tabbar gets closed.
+  When we click on a username and then click on see user's full profile, a tab gets active and shows us the user's profile, the problem occurs when the tab is still active and we try to see another user's profile. In this case, tabbar gets closed.
   To resolve this, added context check for closing action of active tabbar.
 
 - Added Margin between status bullet and status label ([#20199](https://github.com/RocketChat/Rocket.Chat/pull/20199) by [@yash-rajpal](https://github.com/yash-rajpal))
@@ -5298,8 +5200,8 @@
 
 - Added success message on saving notification preference. ([#20220](https://github.com/RocketChat/Rocket.Chat/pull/20220) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Added success message after saving notification preferences.
-
+  Added success message after saving notification preferences.
+
   https://user-images.githubusercontent.com/55157259/104774617-03ca3e80-579d-11eb-8fa4-990b108dd8d9.mp4
 
 - Admin User Info email verified status ([#20110](https://github.com/RocketChat/Rocket.Chat/pull/20110) by [@bdelwood](https://github.com/bdelwood))
@@ -5308,10 +5210,10 @@
 
 - Change header's favorite icon to filled star ([#20174](https://github.com/RocketChat/Rocket.Chat/pull/20174))
 
-  ### Before:
-  ![image](https://user-images.githubusercontent.com/27704687/104351819-a60bcd00-54e4-11eb-8b43-7d281a6e5dcb.png)
-
-  ### After:
+  ### Before: 
+  ![image](https://user-images.githubusercontent.com/27704687/104351819-a60bcd00-54e4-11eb-8b43-7d281a6e5dcb.png)
+
+  ### After:
   ![image](https://user-images.githubusercontent.com/27704687/104351632-67761280-54e4-11eb-87ba-25b940494bb5.png)
 
 - Changed success message for adding custom sound. ([#20272](https://github.com/RocketChat/Rocket.Chat/pull/20272) by [@Darshilp326](https://github.com/Darshilp326))
@@ -5320,24 +5222,24 @@
 
 - Changed success message for ignoring member. ([#19996](https://github.com/RocketChat/Rocket.Chat/pull/19996) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Different messages for ignoring/unignoring will be displayed.
-
+  Different messages for ignoring/unignoring will be displayed.
+
   https://user-images.githubusercontent.com/55157259/103310307-4241c880-4a3d-11eb-8c6c-4c9b99d023db.mp4
 
 - Creation of Omnichannel rooms not working correctly through the Apps when the agent parameter is set ([#19997](https://github.com/RocketChat/Rocket.Chat/pull/19997))
 
 - Engagement dashboard graphs labels superposing each other ([#20267](https://github.com/RocketChat/Rocket.Chat/pull/20267))
 
-  Now after a certain breakpoint, the graphs should stack vertically, and overlapping text rotated.
-
+  Now after a certain breakpoint, the graphs should stack vertically, and overlapping text rotated.
+
   ![image](https://user-images.githubusercontent.com/40830821/105098926-93b40500-5a89-11eb-9a56-2fc3b1552914.png)
 
 - Fields overflowing page ([#20287](https://github.com/RocketChat/Rocket.Chat/pull/20287))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/40830821/105246952-c1b14c00-5b52-11eb-8671-cff88edf242d.png)
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/40830821/105246952-c1b14c00-5b52-11eb-8671-cff88edf242d.png)
+
+  ### After
   ![image](https://user-images.githubusercontent.com/40830821/105247125-0a690500-5b53-11eb-9f3c-d6a68108e336.png)
 
 - Fix error that occurs on changing archive status of room ([#20098](https://github.com/RocketChat/Rocket.Chat/pull/20098) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
@@ -5354,7 +5256,7 @@
 
 - Livechat.RegisterGuest method removing unset fields ([#20124](https://github.com/RocketChat/Rocket.Chat/pull/20124) by [@rafaelblink](https://github.com/rafaelblink))
 
-  After changes made on https://github.com/RocketChat/Rocket.Chat/pull/19931, the `Livechat.RegisterGuest` method started removing properties from the visitor inappropriately. The properties that did not receive value were removed from the object.
+  After changes made on https://github.com/RocketChat/Rocket.Chat/pull/19931, the `Livechat.RegisterGuest` method started removing properties from the visitor inappropriately. The properties that did not receive value were removed from the object.
   Those changes were made to support the new Contact Form, but now the form has its own method to deal with Contact data so those changes are no longer necessary.
 
 - Markdown added for Header Room topic ([#20021](https://github.com/RocketChat/Rocket.Chat/pull/20021) by [@yash-rajpal](https://github.com/yash-rajpal))
@@ -5375,18 +5277,18 @@
 
 - Omnichannel - Contact Center form is not validating custom fields properly ([#20196](https://github.com/RocketChat/Rocket.Chat/pull/20196) by [@rafaelblink](https://github.com/rafaelblink))
 
-  The contact form is accepting undefined values in required custom fields when creating or editing contacts, and, the errror message isn't following Rocket.chat design system.
-
-  ### Before
-  ![image](https://user-images.githubusercontent.com/2493803/104522668-31688980-55dd-11eb-92c5-83f96073edc4.png)
-
-  ### After
-
-  #### New
-  ![image](https://user-images.githubusercontent.com/2493803/104770494-68f74300-574f-11eb-94a3-c8fd73365308.png)
-
-
-  #### Edit
+  The contact form is accepting undefined values in required custom fields when creating or editing contacts, and, the errror message isn't following Rocket.chat design system.
+
+  ### Before
+  ![image](https://user-images.githubusercontent.com/2493803/104522668-31688980-55dd-11eb-92c5-83f96073edc4.png)
+
+  ### After
+
+  #### New
+  ![image](https://user-images.githubusercontent.com/2493803/104770494-68f74300-574f-11eb-94a3-c8fd73365308.png)
+
+
+  #### Edit
   ![image](https://user-images.githubusercontent.com/2493803/104770538-7b717c80-574f-11eb-829f-1ae304103369.png)
 
 - Omnichannel Agents unable to take new chats in the queue ([#20022](https://github.com/RocketChat/Rocket.Chat/pull/20022) by [@rafaelblink](https://github.com/rafaelblink))
@@ -5407,15 +5309,15 @@
 
 - Room special name in prompts ([#20277](https://github.com/RocketChat/Rocket.Chat/pull/20277) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  The "Hide room" and "Leave Room" confirmation prompts use the "name" key from the room info. When the setting "
-  Allow Special Characters in Room Names" is enabled, the prompts show the normalized names instead of those that contain the special characters.
-
-  Changed the value being used from name to fname, which always has the user-set name.
-
-  Previous:
-  ![Screenshot from 2021-01-20 15-52-29](https://user-images.githubusercontent.com/38764067/105161642-9b31e780-5b37-11eb-8b0c-ec4b1414c948.png)
-
-  Updated:
+  The "Hide room" and "Leave Room" confirmation prompts use the "name" key from the room info. When the setting "
+  Allow Special Characters in Room Names" is enabled, the prompts show the normalized names instead of those that contain the special characters.
+
+  Changed the value being used from name to fname, which always has the user-set name.
+
+  Previous:
+  ![Screenshot from 2021-01-20 15-52-29](https://user-images.githubusercontent.com/38764067/105161642-9b31e780-5b37-11eb-8b0c-ec4b1414c948.png)
+
+  Updated:
   ![Screenshot from 2021-01-20 15-50-19](https://user-images.githubusercontent.com/38764067/105161627-966d3380-5b37-11eb-9812-3dd9352b4f95.png)
 
 - Room's list showing all rooms with same name ([#20176](https://github.com/RocketChat/Rocket.Chat/pull/20176))
@@ -5426,9 +5328,9 @@
 
 - Saving with blank email in edit user ([#20259](https://github.com/RocketChat/Rocket.Chat/pull/20259) by [@RonLek](https://github.com/RonLek))
 
-  Disallows showing a success popup when email field is made blank in Edit User and instead shows the relevant error popup.
-
-
+  Disallows showing a success popup when email field is made blank in Edit User and instead shows the relevant error popup.
+
+
   https://user-images.githubusercontent.com/28918901/104960749-dbd81680-59fa-11eb-9c7b-2b257936f894.mp4
 
 - Search list filter ([#19937](https://github.com/RocketChat/Rocket.Chat/pull/19937))
@@ -5475,7 +5377,7 @@
 
 - Add translation of Edit Status in all languages ([#19916](https://github.com/RocketChat/Rocket.Chat/pull/19916) by [@sushant52](https://github.com/sushant52))
 
-  Closes [#19915](https://github.com/RocketChat/Rocket.Chat/issues/19915)
+  Closes [#19915](https://github.com/RocketChat/Rocket.Chat/issues/19915)
   The profile options menu is well translated in many languages. However, Edit Status is the only button which is not well translated. With this change, the whole profile options will be properly translated in a lot of languages.
 
 - Bump axios from 0.18.0 to 0.18.1 ([#20055](https://github.com/RocketChat/Rocket.Chat/pull/20055) by [@dependabot[bot]](https://github.com/dependabot[bot]))
@@ -5510,10 +5412,10 @@
 
 - Regression: Announcement bar not showing properly Markdown content ([#20290](https://github.com/RocketChat/Rocket.Chat/pull/20290))
 
-  **Before**:
-  ![image](https://user-images.githubusercontent.com/27704687/105273746-a4907380-5b7a-11eb-8121-aff665251c44.png)
-
-  **After**:
+  **Before**:
+  ![image](https://user-images.githubusercontent.com/27704687/105273746-a4907380-5b7a-11eb-8121-aff665251c44.png)
+
+  **After**:
   ![image](https://user-images.githubusercontent.com/27704687/105274050-2e404100-5b7b-11eb-93b2-b6282a7bed95.png)
 
 - regression: Announcement link open in new tab ([#20435](https://github.com/RocketChat/Rocket.Chat/pull/20435))
@@ -5528,23 +5430,23 @@
 
 - Regression: Change sort icon ([#20177](https://github.com/RocketChat/Rocket.Chat/pull/20177))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/40830821/104366414-1bcd6400-54f8-11eb-9fc7-c6f13f07a61e.png)
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/40830821/104366414-1bcd6400-54f8-11eb-9fc7-c6f13f07a61e.png)
+
+  ### After
   ![image](https://user-images.githubusercontent.com/40830821/104366542-4cad9900-54f8-11eb-83ca-acb99899515a.png)
 
 - Regression: Custom field labels are not displayed properly on Omnichannel Contact Profile form ([#20393](https://github.com/RocketChat/Rocket.Chat/pull/20393) by [@rafaelblink](https://github.com/rafaelblink))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/2493803/105780399-20116c80-5f4f-11eb-9620-0901472e453b.png)
-
-  ![image](https://user-images.githubusercontent.com/2493803/105780420-2e5f8880-5f4f-11eb-8e93-8115ebc685be.png)
-
-  ### After
-
-  ![image](https://user-images.githubusercontent.com/2493803/105780832-1ccab080-5f50-11eb-8042-188dd0c41904.png)
-
+  ### Before
+  ![image](https://user-images.githubusercontent.com/2493803/105780399-20116c80-5f4f-11eb-9620-0901472e453b.png)
+
+  ![image](https://user-images.githubusercontent.com/2493803/105780420-2e5f8880-5f4f-11eb-8e93-8115ebc685be.png)
+
+  ### After
+
+  ![image](https://user-images.githubusercontent.com/2493803/105780832-1ccab080-5f50-11eb-8042-188dd0c41904.png)
+
   ![image](https://user-images.githubusercontent.com/2493803/105780911-500d3f80-5f50-11eb-96e0-7df3f179dbd5.png)
 
 - Regression: ESLint Warning - explicit-function-return-type ([#20434](https://github.com/RocketChat/Rocket.Chat/pull/20434) by [@aditya-mitra](https://github.com/aditya-mitra))
@@ -5561,8 +5463,8 @@
 
 - Regression: Fixed update room avatar issue. ([#20433](https://github.com/RocketChat/Rocket.Chat/pull/20433) by [@Darshilp326](https://github.com/Darshilp326))
 
-  Users can now update their room avatar without any error.
-
+  Users can now update their room avatar without any error.
+
   https://user-images.githubusercontent.com/55157259/105951602-560d3880-6096-11eb-97a5-b5eb9a28b58d.mp4
 
 - Regression: Info Page Icon style and usage graph breaking ([#20180](https://github.com/RocketChat/Rocket.Chat/pull/20180))
@@ -5579,11 +5481,11 @@
 
 - Regression: Unread superposing announcement. ([#20306](https://github.com/RocketChat/Rocket.Chat/pull/20306))
 
-  ### Before
-  ![image](https://user-images.githubusercontent.com/40830821/105412619-c2f67d80-5c13-11eb-8204-5932ea880c8a.png)
-
-
-  ### After
+  ### Before
+  ![image](https://user-images.githubusercontent.com/40830821/105412619-c2f67d80-5c13-11eb-8204-5932ea880c8a.png)
+
+
+  ### After
   ![image](https://user-images.githubusercontent.com/40830821/105411176-d1439a00-5c11-11eb-8d1b-ea27c8485214.png)
 
 - Regression: User Dropdown margin ([#20222](https://github.com/RocketChat/Rocket.Chat/pull/20222))
@@ -5871,8 +5773,8 @@
 
 - Hightlights validation on Account Preferences page ([#19902](https://github.com/RocketChat/Rocket.Chat/pull/19902) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
 
-  This PR fixes two issues in the account settings "preferences" panel.
-  Once set, the "Highlighted Words" setting cannot be reset to an empty string. This was fixed by changing the string validation from checking the length to checking the type of variable.
+  This PR fixes two issues in the account settings "preferences" panel.
+  Once set, the "Highlighted Words" setting cannot be reset to an empty string. This was fixed by changing the string validation from checking the length to checking the type of variable.
   Secondly, it tracks the changes to correctly identify if changes after the last "save changes" action have been made, using an "updates" state variable, instead of just comparing against the initialValue that does not change on clicking "save changes".
 
 - Image preview for image URLs on messages ([#19734](https://github.com/RocketChat/Rocket.Chat/pull/19734) by [@g-thome](https://github.com/g-thome))
@@ -5931,14 +5833,10 @@
 
 - Chore: Update Pull Request template ([#19768](https://github.com/RocketChat/Rocket.Chat/pull/19768))
 
-  Improve the template of Pull Requests in order to make it clear reducing duplicated information and removing the visible checklists that were generating noise and misunderstanding with the PR progress.
-
-  - Moved the checklists to inside comments
-
-  - Merge the changelog and proposed changes sections to have a single source of description that goes to the changelog
-
-  - Remove the screenshot section, they can be added inside the description
-
+  Improve the template of Pull Requests in order to make it clear reducing duplicated information and removing the visible checklists that were generating noise and misunderstanding with the PR progress.
  
+  - Moved the checklists to inside comments
  
+  - Merge the changelog and proposed changes sections to have a single source of description that goes to the changelog
  
+  - Remove the screenshot section, they can be added inside the description
  
   - Changed the proposed changes title to incentivizing the usage of images and videos
 
 - Frontend folder structure ([#19631](https://github.com/RocketChat/Rocket.Chat/pull/19631))
@@ -5973,11 +5871,11 @@
 
 - Regression: Double Scrollbars on tables ([#19980](https://github.com/RocketChat/Rocket.Chat/pull/19980))
 
-  Before:
-  ![image](https://user-images.githubusercontent.com/40830821/103242719-0ec84680-4936-11eb-87a7-68b6eea8de7b.png)
-
-
-  After:
+  Before:
+  ![image](https://user-images.githubusercontent.com/40830821/103242719-0ec84680-4936-11eb-87a7-68b6eea8de7b.png)
+
+
+  After:
   ![image](https://user-images.githubusercontent.com/40830821/103242680-ee988780-4935-11eb-99e2-a95de99f78f1.png)
 
 - Regression: Failed autolinker and markdown rendering ([#19831](https://github.com/RocketChat/Rocket.Chat/pull/19831))
@@ -5996,7 +5894,7 @@
 
 - Regression: Omnichannel Custom Fields Form no longer working after refactoring ([#19948](https://github.com/RocketChat/Rocket.Chat/pull/19948))
 
-  The Omnichannel `Custom Fields` form is not working anymore after some refactorings on client-side.
+  The Omnichannel `Custom Fields` form is not working anymore after some refactorings on client-side.
   When the user clicks on `Custom Field` in the Omnichannel menu, a blank page appears.
 
 - Regression: polishing licenses endpoints  ([#19981](https://github.com/RocketChat/Rocket.Chat/pull/19981) by [@g-thome](https://github.com/g-thome))
@@ -6195,8 +6093,8 @@
 
 - Bundle Size Client ([#19533](https://github.com/RocketChat/Rocket.Chat/pull/19533))
 
-  temporarily removes some codeblock languages
-  Moved some libraries to dynamic imports
+  temporarily removes some codeblock languages
+  Moved some libraries to dynamic imports
   Removed some shared code not used on the client side
 
 - Forward Omnichannel room to agent in another department ([#19576](https://github.com/RocketChat/Rocket.Chat/pull/19576) by [@mrfigueiredo](https://github.com/mrfigueiredo))
@@ -6503,7 +6401,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 3.8.0
-`2020-11-14  ·  14 🎉  ·  4 🚀  ·  40 🐛  ·  54 🔍  ·  30 👩‍💻👨‍💻`
+`2020-11-13  ·  14 🎉  ·  4 🚀  ·  40 🐛  ·  54 🔍  ·  30 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `12.18.4`
@@ -7277,10 +7175,8 @@
 
 - **2FA:** Password enforcement setting and 2FA protection when saving settings or resetting E2E encryption ([#18640](https://github.com/RocketChat/Rocket.Chat/pull/18640))
 
-  - Increase the 2FA remembering time from 5min to 30min
-
-  - Add new setting to enforce 2FA password fallback (enabled only for new installations)
-
+  - Increase the 2FA remembering time from 5min to 30min
  
+  - Add new setting to enforce 2FA password fallback (enabled only for new installations)
  
   - Require 2FA to save settings and reset E2E Encryption keys
 
 - **Omnichannel:** Allow set other agent status via method `livechat:changeLivechatStatus ` ([#18571](https://github.com/RocketChat/Rocket.Chat/pull/18571))
@@ -7298,7 +7194,7 @@
 
 - 2FA by Email setting showing for the user even when disabled by the admin ([#18473](https://github.com/RocketChat/Rocket.Chat/pull/18473))
 
-  The option to disable/enable the **Two-factor authentication via Email** at `Account > Security > Two Factor Authentication
+  The option to disable/enable the **Two-factor authentication via Email** at `Account > Security > Two Factor Authentication
   ` was visible even when the setting **Enable Two Factor Authentication via Email** at `Admin > Accounts > Two Factor Authentication` was disabled leading to misbehavior since the functionality was disabled.
 
 - Agents enabledDepartment attribute not set on collection ([#18614](https://github.com/RocketChat/Rocket.Chat/pull/18614) by [@paulobernardoaf](https://github.com/paulobernardoaf))
@@ -7648,16 +7544,13 @@
 
 - Mention autocomplete UI and performance improvements  ([#18309](https://github.com/RocketChat/Rocket.Chat/pull/18309))
 
-  * New setting to configure the number of suggestions `Admin > Layout > User Interface > Number of users' autocomplete suggestions` (default 5)
-
-  * The UI shows whenever the user is not a member of the room
-
-  * The UI shows when the suggestion came from the last messages for quick selection/reply
-
-  * The suggestions follow this order:
-    * The user with the exact username and member of the room
-    * The user with the exact username but not a member of the room (if allowed to list non-members)
-    * The users containing the text in username, name or nickname and member of the room
+  * New setting to configure the number of suggestions `Admin > Layout > User Interface > Number of users' autocomplete suggestions` (default 5)
  
+  * The UI shows whenever the user is not a member of the room
  
+  * The UI shows when the suggestion came from the last messages for quick selection/reply
  
+  * The suggestions follow this order:
+    * The user with the exact username and member of the room
+    * The user with the exact username but not a member of the room (if allowed to list non-members)
+    * The users containing the text in username, name or nickname and member of the room
     * The users containing the text in username, name or nickname and not a member of the room (if allowed to list non-members)
 
 - Message action styles ([#18190](https://github.com/RocketChat/Rocket.Chat/pull/18190))
@@ -7999,10 +7892,10 @@
 
 - Split NOTIFICATIONS_SCHEDULE_DELAY into three separate variables ([#17669](https://github.com/RocketChat/Rocket.Chat/pull/17669) by [@jazztickets](https://github.com/jazztickets))
 
-  Email notification delay can now be customized with the following environment variables:
-  NOTIFICATIONS_SCHEDULE_DELAY_ONLINE
-  NOTIFICATIONS_SCHEDULE_DELAY_AWAY
-  NOTIFICATIONS_SCHEDULE_DELAY_OFFLINE
+  Email notification delay can now be customized with the following environment variables:
+  NOTIFICATIONS_SCHEDULE_DELAY_ONLINE
+  NOTIFICATIONS_SCHEDULE_DELAY_AWAY
+  NOTIFICATIONS_SCHEDULE_DELAY_OFFLINE
   Setting the value to -1 disable notifications for that type.
 
 - Threads ([#17416](https://github.com/RocketChat/Rocket.Chat/pull/17416))
@@ -8402,11 +8295,11 @@
 
 - **ENTERPRISE:** Omnichannel Last-Chatted Agent Preferred option ([#17666](https://github.com/RocketChat/Rocket.Chat/pull/17666))
 
-  If activated, this feature will store the last agent that assisted each Omnichannel visitor when a conversation is taken. So, when a visitor returns(it works with any entry point, Livechat, Facebook, REST API, and so on) and starts a new chat, the routing system checks:
-
-  1   - The visitor object for any stored agent that the visitor has previously talked to;
-  2   - If a previous agent is not found, the system will try to find a previous conversation of the same visitor. If a room is found, the system will get the previous agent from the room;
-
+  If activated, this feature will store the last agent that assisted each Omnichannel visitor when a conversation is taken. So, when a visitor returns(it works with any entry point, Livechat, Facebook, REST API, and so on) and starts a new chat, the routing system checks:
+
+  1   - The visitor object for any stored agent that the visitor has previously talked to;
+  2   - If a previous agent is not found, the system will try to find a previous conversation of the same visitor. If a room is found, the system will get the previous agent from the room;
+
   After this process, if an agent has been found, the system will check the agent's availability to assist the new chat. If it's not available, then the routing system will get the next available agent in the queue.
 
 - **ENTERPRISE:** Support for custom Livechat registration form fields ([#17581](https://github.com/RocketChat/Rocket.Chat/pull/17581))
@@ -8511,12 +8404,9 @@
 
 - Notification sounds ([#17616](https://github.com/RocketChat/Rocket.Chat/pull/17616))
 
-  * Global CDN config was ignored when loading the sound files
-
-  * Upload of custom sounds wasn't getting the file extension correctly
-
-  * Some translations were missing
-
+  * Global CDN config was ignored when loading the sound files
  
+  * Upload of custom sounds wasn't getting the file extension correctly
  
+  * Some translations were missing
  
   * Edit and delete of custom sounds were not working correctly
 
 - Omnichannel departments are not saved when the offline channel name is not defined ([#17553](https://github.com/RocketChat/Rocket.Chat/pull/17553))
@@ -8804,19 +8694,14 @@
 
 - Better Push and Email Notification logic ([#17357](https://github.com/RocketChat/Rocket.Chat/pull/17357))
 
-  We are still using the same logic to define which notifications every new message will generate, it takes some servers' settings, users's preferences and subscriptions' settings in consideration to determine who will receive each notification type (desktop, audio, email and mobile push), but now it doesn't check the user's status (online, away, offline) for email and mobile push notifications but send those notifications to a new queue with the following rules:
-
-
-  - When the user is online the notification is scheduled to be sent in 120 seconds
-
-  - When the user is away the notification is scheduled to be sent in 120 seconds minus the amount of time he is away
-
-  - When the user is offline the notification is scheduled to be sent right away
-
-  - When the user reads a channel all the notifications for that user are removed (clear queue)
-
-  - When a notification is processed to be sent to a user and there are other scheduled notifications:
-    - All the scheduled notifications for that user are rescheduled to now
+  We are still using the same logic to define which notifications every new message will generate, it takes some servers' settings, users's preferences and subscriptions' settings in consideration to determine who will receive each notification type (desktop, audio, email and mobile push), but now it doesn't check the user's status (online, away, offline) for email and mobile push notifications but send those notifications to a new queue with the following rules:
+
  
+  - When the user is online the notification is scheduled to be sent in 120 seconds
  
+  - When the user is away the notification is scheduled to be sent in 120 seconds minus the amount of time he is away
  
+  - When the user is offline the notification is scheduled to be sent right away
  
+  - When the user reads a channel all the notifications for that user are removed (clear queue)
  
+  - When a notification is processed to be sent to a user and there are other scheduled notifications:
+    - All the scheduled notifications for that user are rescheduled to now
     - The current notification goes back to the queue to be processed ordered by creation date
 
 - Buttons to check/uncheck all users and channels on import ([#17207](https://github.com/RocketChat/Rocket.Chat/pull/17207))
@@ -9179,7 +9064,7 @@
 
 - Translation via MS translate ([#16363](https://github.com/RocketChat/Rocket.Chat/pull/16363) by [@mrsimpson](https://github.com/mrsimpson))
 
-  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
+  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
   In addition to implementing the interface (similar to google and DeepL), a small change has been done in order to display the translation provider on the UI.
 
 - Two Factor authentication via email ([#15949](https://github.com/RocketChat/Rocket.Chat/pull/15949))
@@ -20718,4 +20603,4 @@
 - [@graywolf336](https://github.com/graywolf336)
 - [@marceloschmidt](https://github.com/marceloschmidt)
 - [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@sampaiodiego](https://github.com/sampaiodiego)
\ No newline at end of file
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index e0d8e5906fd7..d767f4275484 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "4.1.1"
+	"version": "4.1.2"
 }
diff --git a/package-lock.json b/package-lock.json
index 01bb93f30fec..e83cf8126066 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Rocket.Chat",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d0240cf5e594..ac32ba44327e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "4.1.1",
+	"version": "4.1.2",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 0eba26876e85871211a18ec3adb5ac0073782763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Felchar?=
 <11652381+cauefcr@users.noreply.github.com>
Date: Tue, 9 Nov 2021 17:29:10 -0300
Subject: [PATCH 12/14] [NEW] Permissions for interacting with Omnichannel
 Contact Center (#23389)

* added new permissions and backend api checks for said permission

* client-side validation of the permission for showing the contact center button

* logo update

* Added permissions to the correct place, as well as english description for the permission

* Update packages/rocketchat-i18n/i18n/en.i18n.json

Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>

* changed name of the permission and it's description

* Made the permission work with the new settings code

* Removing uneeded migration

* Added back migrations to create permission

* fixing translations

* Update packages/rocketchat-i18n/i18n/en.i18n.json

Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>

Co-authored-by: Caue Felchar <caue.felchar@rocket.chat>
Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>
---
 app/authorization/server/functions/upsertPermissions.js  | 1 +
 client/sidebar/sections/Omnichannel.js                   | 5 ++++-
 .../omnichannel/directory/OmnichannelDirectoryPage.js    | 7 +++++++
 packages/rocketchat-i18n/i18n/en.i18n.json               | 2 ++
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json            | 2 ++
 server/startup/migrations/index.ts                       | 1 +
 server/startup/migrations/v244.ts                        | 9 +++++++++
 7 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 server/startup/migrations/v244.ts

diff --git a/app/authorization/server/functions/upsertPermissions.js b/app/authorization/server/functions/upsertPermissions.js
index 76e97fcef480..a2e78302ad40 100644
--- a/app/authorization/server/functions/upsertPermissions.js
+++ b/app/authorization/server/functions/upsertPermissions.js
@@ -94,6 +94,7 @@ export const upsertPermissions = () => {
 		{ _id: 'create-invite-links',                roles: ['admin', 'owner', 'moderator'] },
 		{ _id: 'view-l-room',                        roles: ['livechat-manager', 'livechat-monitor', 'livechat-agent', 'admin'] },
 		{ _id: 'view-livechat-manager',              roles: ['livechat-manager', 'livechat-monitor', 'admin'] },
+		{ _id: 'view-omnichannel-contact-center',    roles: ['livechat-manager', 'livechat-agent', 'livechat-monitor', 'admin'] },
 		{ _id: 'edit-omnichannel-contact',           roles: ['livechat-manager', 'livechat-agent', 'admin'] },
 		{ _id: 'view-livechat-rooms',                roles: ['livechat-manager', 'livechat-monitor', 'admin'] },
 		{ _id: 'close-livechat-room',                roles: ['livechat-manager', 'livechat-monitor', 'livechat-agent', 'admin'] },
diff --git a/client/sidebar/sections/Omnichannel.js b/client/sidebar/sections/Omnichannel.js
index 3a18ac5b6347..c829b44c1169 100644
--- a/client/sidebar/sections/Omnichannel.js
+++ b/client/sidebar/sections/Omnichannel.js
@@ -2,6 +2,7 @@ import { Sidebar } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import React, { memo } from 'react';
 
+import { hasPermission } from '../../../app/authorization/client';
 import {
 	useOmnichannelShowQueueLink,
 	useOmnichannelAgentAvailable,
@@ -49,7 +50,9 @@ const OmnichannelSection = (props) => {
 					<Sidebar.TopBar.Action icon='queue' title={t('Queue')} is='a' href={queueLink} />
 				)}
 				<Sidebar.TopBar.Action {...icon} onClick={handleStatusChange} />
-				<Sidebar.TopBar.Action {...directoryIcon} href={directoryLink} is='a' />
+				{hasPermission(['view-omnichannel-contact-center']) && (
+					<Sidebar.TopBar.Action {...directoryIcon} href={directoryLink} is='a' />
+				)}
 			</Sidebar.TopBar.Actions>
 		</Sidebar.TopBar.ToolBox>
 	);
diff --git a/client/views/omnichannel/directory/OmnichannelDirectoryPage.js b/client/views/omnichannel/directory/OmnichannelDirectoryPage.js
index 4f19bbf53901..3a0cec01e44a 100644
--- a/client/views/omnichannel/directory/OmnichannelDirectoryPage.js
+++ b/client/views/omnichannel/directory/OmnichannelDirectoryPage.js
@@ -1,7 +1,9 @@
 import { Tabs } from '@rocket.chat/fuselage';
 import React, { useEffect, useCallback, useState } from 'react';
 
+import NotAuthorizedPage from '../../../components/NotAuthorizedPage';
 import Page from '../../../components/Page';
+import { usePermission } from '../../../contexts/AuthorizationContext';
 import { useCurrentRoute, useRoute, useRouteParameter } from '../../../contexts/RouterContext';
 import { useTranslation } from '../../../contexts/TranslationContext';
 import ContextualBar from './ContextualBar';
@@ -14,6 +16,7 @@ const OmnichannelDirectoryPage = () => {
 	const [routeName] = useCurrentRoute();
 	const tab = useRouteParameter('page');
 	const directoryRoute = useRoute('omnichannel-directory');
+	const canViewDirectory = usePermission('view-omnichannel-contact-center');
 
 	useEffect(() => {
 		if (routeName !== 'omnichannel-directory') {
@@ -32,6 +35,10 @@ const OmnichannelDirectoryPage = () => {
 
 	const t = useTranslation();
 
+	if (!canViewDirectory) {
+		return <NotAuthorizedPage />;
+	}
+
 	return (
 		<Page flexDirection='row'>
 			<Page>
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 3e16b0be3cb6..91a0a2142153 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -4531,6 +4531,8 @@
   "Videos": "Videos",
   "View_All": "View All Members",
   "View_channels": "View Channels",
+  "view-omnichannel-contact-center": "View Omnichannel Contact Center",
+  "view-omnichannel-contact-center_description": "Permission to view and interact with the Omnichannel Contact Center",
   "View_Logs": "View Logs",
   "View_mode": "View Mode",
   "View_original": "View Original",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 69e66f6ea937..f34ce0b737cd 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -4525,6 +4525,8 @@
   "Videos": "Vídeos",
   "View_All": "Ver Todos Membros",
   "View_channels": "Ver Canais",
+  "view-omnichannel-contact-center": "Ver o Centro de Contatos do Omnichannel",
+  "view-omnichannel-contact-center_description": "Permissão para ver e interagir com o Centro de Contatos do Omnichannel",
   "View_Logs": "Ver Logs",
   "View_mode": "Modo de visualização",
   "View_original": "Visualizar original",
diff --git a/server/startup/migrations/index.ts b/server/startup/migrations/index.ts
index 37f25773c4e2..dfeec238d17a 100644
--- a/server/startup/migrations/index.ts
+++ b/server/startup/migrations/index.ts
@@ -67,4 +67,5 @@ import './v240';
 import './v241';
 import './v242';
 import './v243';
+import './v244';
 import './xrun';
diff --git a/server/startup/migrations/v244.ts b/server/startup/migrations/v244.ts
new file mode 100644
index 000000000000..8ec31f2485e1
--- /dev/null
+++ b/server/startup/migrations/v244.ts
@@ -0,0 +1,9 @@
+import { addMigration } from '../../lib/migrations';
+import { Permissions } from '../../../app/models/server';
+
+addMigration({
+	version: 244,
+	up() {
+		Permissions.create('view-omnichannel-contact-center', ['livechat-manager', 'livechat-agent', 'livechat-monitor', 'admin']);
+	},
+});

From f50609df0b5a57375c019d1e19c7b0c345847f62 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 10 Nov 2021 18:28:39 -0300
Subject: [PATCH 13/14] Chore: Convert Fiber models to async Step 1 (#23633)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .../lib/{integrations.js => integrations.ts}  |  14 +-
 app/api/server/lib/webdav.js                  |  14 -
 app/api/server/lib/webdav.ts                  |  16 +
 app/api/server/v1/channels.js                 |  22 +-
 app/api/server/v1/email-inbox.js              |   6 +-
 app/api/server/v1/emoji-custom.js             |  10 +-
 app/api/server/v1/groups.js                   |  22 +-
 app/api/server/v1/im.js                       |   9 +-
 app/api/server/v1/instances.ts                |   4 +-
 app/api/server/v1/integrations.js             |  45 +-
 app/api/server/v1/invites.js                  |  10 +-
 .../v1/{permissions.js => permissions.ts}     |  24 +-
 app/api/server/v1/{roles.js => roles.ts}      |  48 +-
 .../server/v1/{settings.js => settings.ts}    |  97 ++++-
 app/apps/server/bridges/internal.ts           |   5 +-
 app/apps/server/bridges/settings.ts           |  11 +-
 app/apps/server/communication/rest.js         |  19 +-
 app/apps/server/converters/settings.js        |   6 +-
 app/apps/server/converters/uploads.js         |   4 +-
 app/apps/server/cron.js                       |  17 +-
 .../server/lib/restrictLoginAttempts.ts       |  17 +-
 app/authentication/server/startup/index.js    |   7 +-
 app/authorization/client/hasPermission.ts     |  16 +-
 .../{addUserRoles.js => addUserRoles.ts}      |  16 +-
 .../server/functions/getRoles.js              |   3 -
 .../server/functions/getRoles.ts              |   4 +
 .../server/functions/getUsersInRole.js        |   3 -
 .../server/functions/getUsersInRole.ts        |  14 +
 .../server/functions/removeUserFromRoles.js   |   5 +-
 ...ertPermissions.js => upsertPermissions.ts} |  61 +--
 ...issionToRole.js => addPermissionToRole.ts} |  14 +-
 .../{addUserToRole.js => addUserToRole.ts}    |   9 +-
 .../methods/{deleteRole.js => deleteRole.ts}  |  14 +-
 ...mission.js => removeRoleFromPermission.ts} |  11 +-
 .../server/methods/removeUserFromRole.js      |   8 +-
 .../methods/{saveRole.js => saveRole.ts}      |   6 +-
 .../server/streamer/permissions/index.js      |  25 --
 .../server/streamer/permissions/index.ts      |  28 ++
 app/autotranslate/server/permissions.js       |  11 -
 app/autotranslate/server/permissions.ts       |   9 +
 app/cas/server/cas_server.js                  |  12 +-
 .../server/functions/saveRoomName.js          |   9 +-
 .../server/methods/saveRoomSettings.js        |  14 +-
 .../server/functions/buildRegistrationData.js |   7 +-
 .../functions/startRegisterWorkspace.js       |   7 +-
 app/cloud/server/functions/syncWorkspace.js   |  14 +-
 app/cloud/server/methods.js                   |   8 +-
 app/crowd/server/crowd.js                     |   2 +-
 .../server/methods/deleteCustomSound.js       |   8 +-
 .../server/methods/insertOrUpdateSound.js     |  12 +-
 .../server/methods/listCustomSounds.js        |   6 +-
 .../server/{permissions.js => permissions.ts} |   3 +-
 .../server/methods/deleteEmojiCustom.js       |   8 +-
 .../server/methods/insertOrUpdateEmoji.js     |  26 +-
 .../server/methods/listEmojiCustom.js         |   6 +-
 app/federation/server/endpoints/dispatch.js   |  19 +-
 .../server/endpoints/requestFromLatest.js     |   6 +-
 app/federation/server/endpoints/uploads.js    |   4 +-
 app/federation/server/functions/addUser.js    |   9 +-
 app/federation/server/functions/dashboard.js  |  15 +-
 app/federation/server/functions/helpers.js    |  69 ---
 app/federation/server/functions/helpers.ts    |  77 ++++
 app/federation/server/handler/index.js        |  26 +-
 .../server/hooks/afterCreateDirectRoom.js     |   2 +-
 .../server/hooks/afterCreateRoom.js           |   2 +-
 app/federation/server/lib/crypt.js            |  16 +-
 app/federation/server/lib/dns.js              |   8 +-
 app/federation/server/lib/http.js             |   8 +-
 app/federation/server/startup/generateKeys.js |  10 +-
 app/federation/server/startup/settings.ts     |  30 +-
 app/file-upload/server/lib/FileUpload.js      |  32 +-
 app/file-upload/server/lib/requests.js        |   6 +-
 .../server/methods/getS3FileUrl.js            |   6 +-
 .../server/methods/sendFileMessage.ts         |   5 +-
 app/integrations/server/api/api.js            |  12 +-
 app/integrations/server/lib/triggerHandler.js |   9 +-
 ...nHistory.js => clearIntegrationHistory.ts} |  15 +-
 .../incoming/addIncomingIntegration.js        |  13 +-
 ...ration.js => deleteIncomingIntegration.ts} |  15 +-
 .../incoming/updateIncomingIntegration.js     |  21 +-
 .../outgoing/addOutgoingIntegration.js        |  11 +-
 ...ration.js => deleteOutgoingIntegration.ts} |  17 +-
 ...ration.js => replayOutgoingIntegration.ts} |  15 +-
 .../outgoing/updateOutgoingIntegration.js     |  19 +-
 .../server/functions/findOrCreateInvite.js    |   9 +-
 app/invites/server/functions/listInvites.js   |   8 +-
 app/invites/server/functions/removeInvite.js  |   8 +-
 .../server/functions/useInviteToken.js        |   9 +-
 .../server/functions/validateInviteToken.js   |   7 +-
 app/lib/server/functions/deleteMessage.ts     |  11 +-
 app/lib/server/functions/deleteUser.js        |  13 +-
 .../functions/relinquishRoomOwnerships.js     |  14 +-
 app/lib/server/functions/setRoomAvatar.js     |   7 +-
 .../server/functions/setUserActiveStatus.js   |   2 +-
 app/lib/server/functions/setUsername.js       |   5 +-
 app/lib/server/lib/getRoomRoles.js            |   5 +-
 app/lib/server/methods/deleteMessage.js       |   2 +-
 .../server/methods/deleteUserOwnAccount.js    |   4 +-
 .../methods/{leaveRoom.js => leaveRoom.ts}    |  12 +-
 ...OAuthService.js => refreshOAuthService.ts} |   8 +-
 app/lib/server/methods/removeOAuthService.js  |  51 ---
 app/lib/server/methods/removeOAuthService.ts  |  54 +++
 app/lib/server/methods/saveSetting.js         |   8 +-
 app/lib/server/methods/saveSettings.js        |  18 +-
 app/livechat/server/api/lib/livechat.js       |   7 +-
 app/livechat/server/api/v1/config.js          |   2 +-
 app/livechat/server/api/v1/message.js         |   8 +-
 app/livechat/server/api/v1/room.js            |   2 +-
 app/livechat/server/api/v1/videoCall.js       |   2 +-
 .../server/hooks/saveAnalyticsData.js         |   2 +-
 app/livechat/server/hooks/sendToCRM.js        |   2 +-
 app/livechat/server/hooks/sendToFacebook.js   |   2 +-
 app/livechat/server/lib/Livechat.js           |   4 +-
 app/livechat/server/sendMessageBySMS.js       |   2 +-
 .../LivechatAgentActivityMonitor.js           |  10 +-
 app/meteor-accounts-saml/server/lib/SAML.ts   |  19 +-
 .../server/loginHandler.ts                    |   2 +-
 app/metrics/server/lib/collectMetrics.js      |   4 +-
 app/models/server/index.js                    |  49 ---
 app/models/server/models/Analytics.js         |  11 -
 app/models/server/models/Avatars.js           |  92 ----
 app/models/server/models/CredentialTokens.js  |  32 --
 app/models/server/models/CustomSounds.js      |  56 ---
 app/models/server/models/CustomUserStatus.js  |  71 ---
 app/models/server/models/EmailInbox.js        |  27 --
 app/models/server/models/EmojiCustom.js       |  91 ----
 app/models/server/models/ExportOperations.js  | 108 -----
 .../server/models/FederationDNSCache.js       |  13 -
 app/models/server/models/FederationKeys.js    |  58 ---
 app/models/server/models/FederationServers.js |  26 --
 app/models/server/models/InstanceStatus.js    |   7 -
 .../server/models/IntegrationHistory.js       |  43 --
 app/models/server/models/Integrations.js      |  31 --
 app/models/server/models/Invites.js           |  51 ---
 app/models/server/models/NotificationQueue.js |  14 -
 app/models/server/models/OAuthApps.js         |   9 -
 app/models/server/models/OEmbedCache.js       |  39 --
 app/models/server/models/Permissions.js       |  49 ---
 app/models/server/models/ReadReceipts.js      |  25 --
 app/models/server/models/Reports.js           |  23 -
 app/models/server/models/Roles.js             | 134 ------
 app/models/server/models/Rooms.js             |   2 +-
 app/models/server/models/ServerEvents.ts      |  11 -
 app/models/server/models/Sessions.mocks.js    |  16 -
 app/models/server/models/SmarshHistory.js     |   9 -
 app/models/server/models/Statistics.js        |  28 --
 app/models/server/models/Uploads.js           | 146 -------
 app/models/server/models/UserDataFiles.js     |  44 --
 app/models/server/models/UsersSessions.js     |   7 -
 app/models/server/models/WebdavAccounts.js    |  27 --
 app/models/server/models/_BaseDb.js           | 190 ++++----
 app/models/server/raw/Analytics.js            | 151 -------
 app/models/server/raw/Analytics.ts            | 146 +++++++
 app/models/server/raw/Avatars.ts              |  73 ++++
 app/models/server/raw/BaseRaw.ts              | 108 ++++-
 app/models/server/raw/CredentialTokens.ts     |  29 ++
 app/models/server/raw/CustomSounds.js         |   5 -
 app/models/server/raw/CustomSounds.ts         |  44 ++
 app/models/server/raw/CustomUserStatus.js     |   5 -
 app/models/server/raw/CustomUserStatus.ts     |  59 +++
 app/models/server/raw/EmailInbox.ts           |   6 +-
 app/models/server/raw/EmailMessageHistory.ts  |  15 +-
 app/models/server/raw/EmojiCustom.js          |   5 -
 app/models/server/raw/EmojiCustom.ts          |  79 ++++
 app/models/server/raw/ExportOperations.ts     |  68 +++
 app/models/server/raw/FederationKeys.ts       |  65 +++
 app/models/server/raw/FederationServers.ts    |  29 ++
 app/models/server/raw/IntegrationHistory.ts   |  10 +-
 app/models/server/raw/Integrations.js         |  14 -
 app/models/server/raw/Integrations.ts         |  36 ++
 app/models/server/raw/Invites.ts              |  27 ++
 app/models/server/raw/NotificationQueue.ts    |  41 +-
 app/models/server/raw/OAuthApps.js            |  14 -
 app/models/server/raw/OAuthApps.ts            |  11 +
 app/models/server/raw/OEmbedCache.ts          |  31 ++
 app/models/server/raw/Permissions.ts          |  31 ++
 app/models/server/raw/ReadReceipts.ts         |  15 +
 app/models/server/raw/Reports.ts              |  15 +
 app/models/server/raw/Roles.js                |  31 --
 app/models/server/raw/Roles.ts                | 200 +++++++++
 app/models/server/raw/ServerEvents.ts         |  32 +-
 app/models/server/raw/Sessions.js             | 285 ------------
 .../server/{models => raw}/Sessions.tests.js  |   2 -
 .../{models/Sessions.js => raw/Sessions.ts}   | 411 +++++++++++++++---
 app/models/server/raw/Settings.ts             | 117 ++++-
 app/models/server/raw/SmarshHistory.ts        |   8 +
 app/models/server/raw/Statistics.js           |  14 -
 app/models/server/raw/Statistics.ts           |  21 +
 app/models/server/raw/Subscriptions.ts        |  87 +++-
 app/models/server/raw/Uploads.ts              | 116 +++++
 app/models/server/raw/UserDataFiles.ts        |  29 ++
 app/models/server/raw/Users.js                |  45 ++
 app/models/server/raw/UsersSessions.ts        |  14 +-
 app/models/server/raw/WebdavAccounts.js       |   8 -
 app/models/server/raw/WebdavAccounts.ts       |  46 ++
 app/models/server/raw/_Users.d.ts             |  14 +
 app/models/server/raw/index.ts                | 190 ++++----
 .../server/admin/methods/addOAuthApp.js       |   7 +-
 .../server/admin/methods/deleteOAuthApp.js    |   8 +-
 .../server/admin/methods/updateOAuthApp.js    |  11 +-
 .../server/oauth/default-services.js          |  17 -
 .../server/oauth/default-services.ts          |  20 +
 .../server/oauth/oauth2-server.js             |   7 +-
 app/oembed/server/server.js                   |  23 +-
 app/reactions/server/setReaction.js           |   5 +-
 .../server/functions/generateEml.js           |   7 +-
 .../server/functions/sendEmail.js             |  12 +-
 app/statistics/server/lib/SAUMonitor.js       |  90 ++--
 app/statistics/server/lib/statistics.js       |  39 +-
 .../server/cronProcessDownloads.js            |  27 +-
 .../server/exportDownload.js                  |   6 +-
 .../server/methods/deleteCustomUserStatus.js  |   8 +-
 .../methods/insertOrUpdateUserStatus.js       |  14 +-
 .../server/methods/listCustomUserStatus.js    |   6 +-
 .../functions/normalizeMessageFileUpload.js   |   6 +-
 .../server/functions/checkVersionUpdate.js    |   8 +-
 app/webdav/client/actionButton.js             |   2 +-
 app/webdav/client/selectWebdavAccount.js      |   2 +-
 .../client/startup/messageBoxActions.js       |   2 +-
 app/webdav/server/methods/addWebdavAccount.js |  12 +-
 .../server/methods/getFileFromWebdav.js       |   4 +-
 .../server/methods/getWebdavFileList.js       |   4 +-
 .../server/methods/getWebdavFilePreview.js    |   4 +-
 .../server/methods/removeWebdavAccount.js     |   6 +-
 .../server/methods/uploadFileToWebdav.ts      |   4 +-
 definition/Federation.ts                      |   5 +
 definition/IAnalytic.ts                       |  33 ++
 definition/IAvatar.ts                         |  13 +
 definition/ICredentialToken.ts                |  10 +
 definition/ICustomSound.ts                    |   6 +
 definition/ICustomUserStatus.ts               |   6 +
 definition/IEmojiCustom.ts                    |   7 +
 definition/IExportOperation.ts                |  16 +
 definition/IIntegration.ts                    |   8 +-
 definition/IIntegrationHistory.ts             |  20 +-
 definition/IInvite.ts                         |  11 +
 definition/ILivechatBusinessHour.ts           |   1 +
 definition/IOAuthApps.ts                      |  14 +
 definition/IOEmbedCache.ts                    |   6 +
 definition/IReport.ts                         |   9 +
 definition/IRoom.ts                           |   4 +
 definition/IServerEvent.ts                    |   2 +-
 definition/ISession.ts                        |  29 ++
 definition/ISetting.ts                        |  11 +-
 definition/ISmarshHistory.ts                  |   6 +
 definition/IStatistic.ts                      |  24 +
 definition/IUpload.ts                         |  12 +
 definition/IUser.ts                           |   9 +-
 definition/IUserDataFile.ts                   |  13 +
 definition/IWebdavAccount.ts                  |   9 +
 definition/externals/meteor/meteor.d.ts       |   1 +
 ee/app/auditing/server/{index.js => index.ts} |   8 +-
 .../server/resetEnterprisePermissions.js      |   6 -
 .../server/resetEnterprisePermissions.ts      |   7 +
 .../server/{permissions.js => permissions.ts} |   2 +-
 .../server/lib/messages.js                    |  30 +-
 .../engagement-dashboard/server/lib/users.js  |  19 +-
 .../livechat-enterprise/server/permissions.js |  22 -
 .../livechat-enterprise/server/permissions.ts |  21 +
 ee/server/lib/ldap/Manager.ts                 |  10 +-
 ee/server/lib/oauth/Manager.ts                |   5 +-
 .../services/ddp-streamer/streams/index.ts    |   5 +-
 ee/server/services/stream-hub/StreamHub.ts    |   6 +-
 .../server/api/methods/getReadReceipts.js     |   2 +-
 .../server/lib/ReadReceipt.js                 |  21 +-
 package-lock.json                             |   9 +
 package.json                                  |   1 +
 server/cron/statistics.js                     |   4 +-
 server/database/readSecondaryPreferred.ts     |   4 +-
 server/features/EmailInbox/EmailInbox.ts      |   2 +-
 .../EmailInbox/EmailInbox_Outgoing.ts         |   9 +-
 server/lib/channelExport.ts                   |   6 +-
 server/lib/migrations.ts                      |   2 +-
 server/lib/{pushConfig.js => pushConfig.ts}   |  32 +-
 server/lib/sendMessagesToAdmins.js            |  42 +-
 server/methods/OEmbedCacheCleanup.js          |   6 +-
 server/methods/afterVerifyEmail.js            |  29 --
 server/methods/afterVerifyEmail.ts            |  39 ++
 server/methods/browseChannels.js              |   6 +-
 server/methods/createDirectMessage.js         |   2 +-
 server/methods/deleteFileMessage.js           |   2 +-
 server/methods/deleteUser.js                  |   4 +-
 server/methods/registerUser.js                |   4 +-
 ...{removeRoomOwner.js => removeRoomOwner.ts} |  14 +-
 ...eUserFromRoom.js => removeUserFromRoom.ts} |  12 +-
 server/methods/reportMessage.js               |   9 +-
 server/methods/requestDataDownload.js         |  16 +-
 server/modules/watchers/watchers.module.ts    |   4 +-
 .../settings/{index.js => index.ts}           |  29 +-
 server/routes/avatar/room.js                  |  11 +-
 server/routes/avatar/user.js                  |   7 +-
 server/sdk/types/ITeamService.ts              |   2 +
 server/services/analytics/service.ts          |   7 +-
 server/services/authorization/service.ts      |  13 +-
 server/services/nps/notification.ts           |   4 +-
 server/services/team/service.ts               |   6 +-
 server/startup/initialData.js                 |  26 +-
 server/startup/instance.js                    |   4 -
 .../startup/migrations/{v174.js => v174.ts}   |   6 +-
 server/startup/migrations/v175.js             |  17 +-
 server/startup/migrations/v176.js             |  12 -
 server/startup/migrations/v176.ts             |   9 +
 .../startup/migrations/{v177.js => v177.ts}   |   6 +-
 server/startup/migrations/v178.js             |  12 -
 server/startup/migrations/v178.ts             |   9 +
 server/startup/migrations/v182.js             |   4 +-
 server/startup/migrations/v183.js             |  15 +-
 .../startup/migrations/{v184.js => v184.ts}   |   6 +-
 server/startup/migrations/v185.js             |  19 -
 server/startup/migrations/v185.ts             |  18 +
 server/startup/migrations/v187.js             |  15 +-
 .../startup/migrations/{v188.js => v188.ts}   |   5 +-
 server/startup/migrations/v189.js             |  11 -
 server/startup/migrations/v189.ts             |  11 +
 server/startup/migrations/v190.js             |   2 +-
 server/startup/migrations/v191.js             |   9 -
 server/startup/migrations/v191.ts             |   9 +
 server/startup/migrations/v194.js             |  20 +-
 .../startup/migrations/{v195.js => v195.ts}   |  39 +-
 .../startup/migrations/{v198.js => v198.ts}   |  24 +-
 server/startup/migrations/v201.js             |  16 +-
 server/startup/migrations/v202.js             |   8 +-
 server/startup/migrations/v203.js             |  10 -
 server/startup/migrations/v203.ts             |  10 +
 server/startup/migrations/v205.js             |   6 +-
 server/startup/migrations/v207.js             |   9 -
 server/startup/migrations/v207.ts             |  10 +
 server/startup/migrations/v208.js             |  16 +-
 server/startup/migrations/v214.js             |  11 -
 server/startup/migrations/v214.ts             |  12 +
 .../startup/migrations/{v215.js => v215.ts}   |  10 +-
 server/startup/migrations/v216.js             |  65 +--
 server/startup/migrations/v217.js             |  12 -
 server/startup/migrations/v217.ts             |  13 +
 server/startup/migrations/v218.js             |   9 -
 server/startup/migrations/v218.ts             |  10 +
 .../startup/migrations/{v219.js => v219.ts}   |  11 +-
 .../startup/migrations/{v220.js => v220.ts}   |  10 +-
 server/startup/migrations/v223.js             |  11 -
 server/startup/migrations/v223.ts             |  11 +
 server/startup/migrations/v224.js             |  11 -
 server/startup/migrations/v224.ts             |   9 +
 .../startup/migrations/{v225.js => v225.ts}   |  23 +-
 server/startup/migrations/v226.js             |   9 -
 server/startup/migrations/v226.ts             |   9 +
 server/startup/migrations/v228.js             |  11 -
 server/startup/migrations/v228.ts             |   9 +
 .../startup/migrations/{v229.js => v229.ts}   |  17 +-
 server/startup/migrations/v230.ts             |  10 +-
 server/startup/migrations/v231.ts             |   6 +-
 server/startup/migrations/v233.ts             |   4 +-
 server/startup/migrations/v234.ts             |   4 +-
 server/startup/migrations/v235.ts             |   7 +-
 server/startup/migrations/v236.ts             |  13 +-
 server/startup/migrations/v237.ts             |  24 +-
 server/startup/migrations/v240.ts             |   4 +-
 server/startup/migrations/v242.ts             |  13 +-
 server/startup/migrations/v243.ts             |  13 +-
 server/startup/migrations/v244.ts             |   4 +-
 server/startup/presence.js                    |  17 +-
 server/stream/streamBroadcast.js              |  20 +-
 361 files changed, 4201 insertions(+), 3748 deletions(-)
 rename app/api/server/lib/{integrations.js => integrations.ts} (65%)
 delete mode 100644 app/api/server/lib/webdav.js
 create mode 100644 app/api/server/lib/webdav.ts
 rename app/api/server/v1/{permissions.js => permissions.ts} (74%)
 rename app/api/server/v1/{roles.js => roles.ts} (76%)
 rename app/api/server/v1/{settings.js => settings.ts} (54%)
 rename app/authorization/server/functions/{addUserRoles.js => addUserRoles.ts} (54%)
 delete mode 100644 app/authorization/server/functions/getRoles.js
 create mode 100644 app/authorization/server/functions/getRoles.ts
 delete mode 100644 app/authorization/server/functions/getUsersInRole.js
 create mode 100644 app/authorization/server/functions/getUsersInRole.ts
 rename app/authorization/server/functions/{upsertPermissions.js => upsertPermissions.ts} (88%)
 rename app/authorization/server/methods/{addPermissionToRole.js => addPermissionToRole.ts} (72%)
 rename app/authorization/server/methods/{addUserToRole.js => addUserToRole.ts} (84%)
 rename app/authorization/server/methods/{deleteRole.js => deleteRole.ts} (67%)
 rename app/authorization/server/methods/{removeRoleFromPermission.js => removeRoleFromPermission.ts} (70%)
 rename app/authorization/server/methods/{saveRole.js => saveRole.ts} (80%)
 delete mode 100644 app/authorization/server/streamer/permissions/index.js
 create mode 100644 app/authorization/server/streamer/permissions/index.ts
 delete mode 100644 app/autotranslate/server/permissions.js
 create mode 100644 app/autotranslate/server/permissions.ts
 rename app/discussion/server/{permissions.js => permissions.ts} (87%)
 delete mode 100644 app/federation/server/functions/helpers.js
 create mode 100644 app/federation/server/functions/helpers.ts
 rename app/integrations/server/methods/{clearIntegrationHistory.js => clearIntegrationHistory.ts} (70%)
 rename app/integrations/server/methods/incoming/{deleteIncomingIntegration.js => deleteIncomingIntegration.ts} (56%)
 rename app/integrations/server/methods/outgoing/{deleteOutgoingIntegration.js => deleteOutgoingIntegration.ts} (63%)
 rename app/integrations/server/methods/outgoing/{replayOutgoingIntegration.js => replayOutgoingIntegration.ts} (69%)
 rename app/lib/server/methods/{leaveRoom.js => leaveRoom.ts} (76%)
 rename app/lib/server/methods/{refreshOAuthService.js => refreshOAuthService.ts} (66%)
 delete mode 100644 app/lib/server/methods/removeOAuthService.js
 create mode 100644 app/lib/server/methods/removeOAuthService.ts
 delete mode 100644 app/models/server/models/Analytics.js
 delete mode 100644 app/models/server/models/Avatars.js
 delete mode 100644 app/models/server/models/CredentialTokens.js
 delete mode 100644 app/models/server/models/CustomSounds.js
 delete mode 100644 app/models/server/models/CustomUserStatus.js
 delete mode 100644 app/models/server/models/EmailInbox.js
 delete mode 100644 app/models/server/models/EmojiCustom.js
 delete mode 100644 app/models/server/models/ExportOperations.js
 delete mode 100644 app/models/server/models/FederationDNSCache.js
 delete mode 100644 app/models/server/models/FederationKeys.js
 delete mode 100644 app/models/server/models/FederationServers.js
 delete mode 100644 app/models/server/models/InstanceStatus.js
 delete mode 100644 app/models/server/models/IntegrationHistory.js
 delete mode 100644 app/models/server/models/Integrations.js
 delete mode 100644 app/models/server/models/Invites.js
 delete mode 100644 app/models/server/models/NotificationQueue.js
 delete mode 100644 app/models/server/models/OAuthApps.js
 delete mode 100644 app/models/server/models/OEmbedCache.js
 delete mode 100644 app/models/server/models/Permissions.js
 delete mode 100644 app/models/server/models/ReadReceipts.js
 delete mode 100644 app/models/server/models/Reports.js
 delete mode 100644 app/models/server/models/Roles.js
 delete mode 100644 app/models/server/models/ServerEvents.ts
 delete mode 100644 app/models/server/models/Sessions.mocks.js
 delete mode 100644 app/models/server/models/SmarshHistory.js
 delete mode 100644 app/models/server/models/Statistics.js
 delete mode 100644 app/models/server/models/Uploads.js
 delete mode 100644 app/models/server/models/UserDataFiles.js
 delete mode 100644 app/models/server/models/UsersSessions.js
 delete mode 100644 app/models/server/models/WebdavAccounts.js
 delete mode 100644 app/models/server/raw/Analytics.js
 create mode 100644 app/models/server/raw/Analytics.ts
 create mode 100644 app/models/server/raw/Avatars.ts
 create mode 100644 app/models/server/raw/CredentialTokens.ts
 delete mode 100644 app/models/server/raw/CustomSounds.js
 create mode 100644 app/models/server/raw/CustomSounds.ts
 delete mode 100644 app/models/server/raw/CustomUserStatus.js
 create mode 100644 app/models/server/raw/CustomUserStatus.ts
 delete mode 100644 app/models/server/raw/EmojiCustom.js
 create mode 100644 app/models/server/raw/EmojiCustom.ts
 create mode 100644 app/models/server/raw/ExportOperations.ts
 create mode 100644 app/models/server/raw/FederationKeys.ts
 create mode 100644 app/models/server/raw/FederationServers.ts
 delete mode 100644 app/models/server/raw/Integrations.js
 create mode 100644 app/models/server/raw/Integrations.ts
 create mode 100644 app/models/server/raw/Invites.ts
 delete mode 100644 app/models/server/raw/OAuthApps.js
 create mode 100644 app/models/server/raw/OAuthApps.ts
 create mode 100644 app/models/server/raw/OEmbedCache.ts
 create mode 100644 app/models/server/raw/ReadReceipts.ts
 create mode 100644 app/models/server/raw/Reports.ts
 delete mode 100644 app/models/server/raw/Roles.js
 create mode 100644 app/models/server/raw/Roles.ts
 delete mode 100644 app/models/server/raw/Sessions.js
 rename app/models/server/{models => raw}/Sessions.tests.js (99%)
 rename app/models/server/{models/Sessions.js => raw/Sessions.ts} (50%)
 create mode 100644 app/models/server/raw/SmarshHistory.ts
 delete mode 100644 app/models/server/raw/Statistics.js
 create mode 100644 app/models/server/raw/Statistics.ts
 create mode 100644 app/models/server/raw/Uploads.ts
 create mode 100644 app/models/server/raw/UserDataFiles.ts
 delete mode 100644 app/models/server/raw/WebdavAccounts.js
 create mode 100644 app/models/server/raw/WebdavAccounts.ts
 create mode 100644 app/models/server/raw/_Users.d.ts
 delete mode 100644 app/oauth2-server-config/server/oauth/default-services.js
 create mode 100644 app/oauth2-server-config/server/oauth/default-services.ts
 create mode 100644 definition/Federation.ts
 create mode 100644 definition/IAnalytic.ts
 create mode 100644 definition/IAvatar.ts
 create mode 100644 definition/ICredentialToken.ts
 create mode 100644 definition/ICustomSound.ts
 create mode 100644 definition/ICustomUserStatus.ts
 create mode 100644 definition/IEmojiCustom.ts
 create mode 100644 definition/IExportOperation.ts
 create mode 100644 definition/IInvite.ts
 create mode 100644 definition/IOAuthApps.ts
 create mode 100644 definition/IOEmbedCache.ts
 create mode 100644 definition/IReport.ts
 create mode 100644 definition/ISession.ts
 create mode 100644 definition/ISmarshHistory.ts
 create mode 100644 definition/IStatistic.ts
 create mode 100644 definition/IUpload.ts
 create mode 100644 definition/IUserDataFile.ts
 create mode 100644 definition/IWebdavAccount.ts
 rename ee/app/auditing/server/{index.js => index.ts} (79%)
 delete mode 100644 ee/app/authorization/server/resetEnterprisePermissions.js
 create mode 100644 ee/app/authorization/server/resetEnterprisePermissions.ts
 rename ee/app/canned-responses/server/{permissions.js => permissions.ts} (90%)
 delete mode 100644 ee/app/livechat-enterprise/server/permissions.js
 create mode 100644 ee/app/livechat-enterprise/server/permissions.ts
 rename server/lib/{pushConfig.js => pushConfig.ts} (83%)
 delete mode 100644 server/methods/afterVerifyEmail.js
 create mode 100644 server/methods/afterVerifyEmail.ts
 rename server/methods/{removeRoomOwner.js => removeRoomOwner.ts} (86%)
 rename server/methods/{removeUserFromRoom.js => removeUserFromRoom.ts} (89%)
 rename server/publications/settings/{index.js => index.ts} (55%)
 rename server/startup/migrations/{v174.js => v174.ts} (53%)
 delete mode 100644 server/startup/migrations/v176.js
 create mode 100644 server/startup/migrations/v176.ts
 rename server/startup/migrations/{v177.js => v177.ts} (72%)
 delete mode 100644 server/startup/migrations/v178.js
 create mode 100644 server/startup/migrations/v178.ts
 rename server/startup/migrations/{v184.js => v184.ts} (71%)
 delete mode 100644 server/startup/migrations/v185.js
 create mode 100644 server/startup/migrations/v185.ts
 rename server/startup/migrations/{v188.js => v188.ts} (51%)
 delete mode 100644 server/startup/migrations/v189.js
 create mode 100644 server/startup/migrations/v189.ts
 delete mode 100644 server/startup/migrations/v191.js
 create mode 100644 server/startup/migrations/v191.ts
 rename server/startup/migrations/{v195.js => v195.ts} (61%)
 rename server/startup/migrations/{v198.js => v198.ts} (54%)
 delete mode 100644 server/startup/migrations/v203.js
 create mode 100644 server/startup/migrations/v203.ts
 delete mode 100644 server/startup/migrations/v207.js
 create mode 100644 server/startup/migrations/v207.ts
 delete mode 100644 server/startup/migrations/v214.js
 create mode 100644 server/startup/migrations/v214.ts
 rename server/startup/migrations/{v215.js => v215.ts} (52%)
 delete mode 100644 server/startup/migrations/v217.js
 create mode 100644 server/startup/migrations/v217.ts
 delete mode 100644 server/startup/migrations/v218.js
 create mode 100644 server/startup/migrations/v218.ts
 rename server/startup/migrations/{v219.js => v219.ts} (70%)
 rename server/startup/migrations/{v220.js => v220.ts} (99%)
 delete mode 100644 server/startup/migrations/v223.js
 create mode 100644 server/startup/migrations/v223.ts
 delete mode 100644 server/startup/migrations/v224.js
 create mode 100644 server/startup/migrations/v224.ts
 rename server/startup/migrations/{v225.js => v225.ts} (70%)
 delete mode 100644 server/startup/migrations/v226.js
 create mode 100644 server/startup/migrations/v226.ts
 delete mode 100644 server/startup/migrations/v228.js
 create mode 100644 server/startup/migrations/v228.ts
 rename server/startup/migrations/{v229.js => v229.ts} (62%)

diff --git a/app/api/server/lib/integrations.js b/app/api/server/lib/integrations.ts
similarity index 65%
rename from app/api/server/lib/integrations.js
rename to app/api/server/lib/integrations.ts
index 55db33a636a5..ef5cab57ed94 100644
--- a/app/api/server/lib/integrations.js
+++ b/app/api/server/lib/integrations.ts
@@ -1,7 +1,9 @@
 import { Integrations } from '../../../models/server/raw';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { IIntegration } from '../../../../definition/IIntegration';
+import { IUser } from '../../../../definition/IUser';
 
-const hasIntegrationsPermission = async (userId, integration) => {
+const hasIntegrationsPermission = async (userId: string, integration: IIntegration): Promise<boolean> => {
 	const type = integration.type === 'webhook-incoming' ? 'incoming' : 'outgoing';
 
 	if (await hasPermissionAsync(userId, `manage-${ type }-integrations`)) {
@@ -15,7 +17,15 @@ const hasIntegrationsPermission = async (userId, integration) => {
 	return false;
 };
 
-export const findOneIntegration = async ({ userId, integrationId, createdBy }) => {
+export const findOneIntegration = async ({
+	userId,
+	integrationId,
+	createdBy,
+}: {
+	userId: string;
+	integrationId: string;
+	createdBy: IUser;
+}): Promise<IIntegration> => {
 	const integration = await Integrations.findOneByIdAndCreatedByIfExists({ _id: integrationId, createdBy });
 	if (!integration) {
 		throw new Error('The integration does not exists.');
diff --git a/app/api/server/lib/webdav.js b/app/api/server/lib/webdav.js
deleted file mode 100644
index cf5a3c8ea8f1..000000000000
--- a/app/api/server/lib/webdav.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { WebdavAccounts } from '../../../models/server/raw';
-
-export async function findWebdavAccountsByUserId({ uid }) {
-	return {
-		accounts: await WebdavAccounts.findWithUserId(uid, {
-			fields: {
-				_id: 1,
-				username: 1,
-				server_url: 1,
-				name: 1,
-			},
-		}).toArray(),
-	};
-}
diff --git a/app/api/server/lib/webdav.ts b/app/api/server/lib/webdav.ts
new file mode 100644
index 000000000000..fe2f17185bb6
--- /dev/null
+++ b/app/api/server/lib/webdav.ts
@@ -0,0 +1,16 @@
+import { WebdavAccounts } from '../../../models/server/raw';
+import { IWebdavAccount } from '../../../../definition/IWebdavAccount';
+
+export async function findWebdavAccountsByUserId({ uid }: { uid: string }): Promise<{ accounts: IWebdavAccount[] }> {
+	return {
+		accounts: await WebdavAccounts.findWithUserId(uid, {
+			projection: {
+				_id: 1,
+				username: 1,
+				// eslint-disable-next-line @typescript-eslint/camelcase
+				server_url: 1,
+				name: 1,
+			},
+		}).toArray(),
+	};
+}
diff --git a/app/api/server/v1/channels.js b/app/api/server/v1/channels.js
index 832aca11ad53..3e0139ec80b0 100644
--- a/app/api/server/v1/channels.js
+++ b/app/api/server/v1/channels.js
@@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import _ from 'underscore';
 
-import { Rooms, Subscriptions, Messages, Uploads, Integrations, Users } from '../../../models/server';
+import { Rooms, Subscriptions, Messages, Users } from '../../../models/server';
+import { Integrations, Uploads } from '../../../models/server/raw';
 import { canAccessRoom, hasPermission, hasAtLeastOnePermission, hasAllPermission } from '../../../authorization/server';
 import { mountIntegrationQueryBasedOnPermissions } from '../../../integrations/server/lib/mountQueriesBasedOnPermission';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
@@ -294,19 +295,19 @@ API.v1.addRoute('channels.files', { authRequired: true }, {
 
 		const ourQuery = Object.assign({}, query, { rid: findResult._id });
 
-		const files = Uploads.find(ourQuery, {
+		const files = Promise.await(Uploads.find(ourQuery, {
 			sort: sort || { name: 1 },
 			skip: offset,
 			limit: count,
 			fields,
-		}).fetch();
+		}).toArray());
 
 		return API.v1.success({
 			files: files.map(addUserObjectToEveryObject),
 			count:
 			files.length,
 			offset,
-			total: Uploads.find(ourQuery).count(),
+			total: Promise.await(Uploads.find(ourQuery).count()),
 		});
 	},
 });
@@ -340,21 +341,24 @@ API.v1.addRoute('channels.getIntegrations', { authRequired: true }, {
 		}
 
 		const { offset, count } = this.getPaginationItems();
-		const { sort, fields, query } = this.parseJsonQuery();
+		const { sort, fields: projection, query } = this.parseJsonQuery();
 
 		ourQuery = Object.assign(mountIntegrationQueryBasedOnPermissions(this.userId), query, ourQuery);
-		const integrations = Integrations.find(ourQuery, {
+		const cursor = Integrations.find(ourQuery, {
 			sort: sort || { _createdAt: 1 },
 			skip: offset,
 			limit: count,
-			fields,
-		}).fetch();
+			projection,
+		});
+
+		const integrations = Promise.await(cursor.toArray());
+		const total = Promise.await(cursor.count());
 
 		return API.v1.success({
 			integrations,
 			count: integrations.length,
 			offset,
-			total: Integrations.find(ourQuery).count(),
+			total,
 		});
 	},
 });
diff --git a/app/api/server/v1/email-inbox.js b/app/api/server/v1/email-inbox.js
index e7452fc5ffe1..61368a2d0a8a 100644
--- a/app/api/server/v1/email-inbox.js
+++ b/app/api/server/v1/email-inbox.js
@@ -3,7 +3,7 @@ import { check, Match } from 'meteor/check';
 import { API } from '../api';
 import { findEmailInboxes, findOneEmailInbox, insertOneOrUpdateEmailInbox } from '../lib/emailInbox';
 import { hasPermission } from '../../../authorization/server/functions/hasPermission';
-import { EmailInbox } from '../../../models';
+import { EmailInbox } from '../../../models/server/raw';
 import Users from '../../../models/server/models/Users';
 import { sendTestEmailToInbox } from '../../../../server/features/EmailInbox/EmailInbox_Outgoing';
 
@@ -79,12 +79,12 @@ API.v1.addRoute('email-inbox/:_id', { authRequired: true }, {
 		const { _id } = this.urlParams;
 		if (!_id) { throw new Error('error-invalid-param'); }
 
-		const emailInboxes = EmailInbox.findOneById(_id);
+		const emailInboxes = Promise.await(EmailInbox.findOneById(_id));
 
 		if (!emailInboxes) {
 			return API.v1.notFound();
 		}
-		EmailInbox.removeById(_id);
+		Promise.await(EmailInbox.removeById(_id));
 		return API.v1.success({ _id });
 	},
 });
diff --git a/app/api/server/v1/emoji-custom.js b/app/api/server/v1/emoji-custom.js
index 403cca1d189c..092e41c1de97 100644
--- a/app/api/server/v1/emoji-custom.js
+++ b/app/api/server/v1/emoji-custom.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { EmojiCustom } from '../../../models/server';
+import { EmojiCustom } from '../../../models/server/raw';
 import { API } from '../api';
 import { getUploadFormData } from '../lib/getUploadFormData';
 import { findEmojisCustom } from '../lib/emoji-custom';
@@ -19,15 +19,15 @@ API.v1.addRoute('emoji-custom.list', { authRequired: true }, {
 			}
 			return API.v1.success({
 				emojis: {
-					update: EmojiCustom.find({ ...query, _updatedAt: { $gt: updatedSinceDate } }).fetch(),
-					remove: EmojiCustom.trashFindDeletedAfter(updatedSinceDate).fetch(),
+					update: Promise.await(EmojiCustom.find({ ...query, _updatedAt: { $gt: updatedSinceDate } }).toArray()),
+					remove: Promise.await(EmojiCustom.trashFindDeletedAfter(updatedSinceDate).toArray()),
 				},
 			});
 		}
 
 		return API.v1.success({
 			emojis: {
-				update: EmojiCustom.find(query).fetch(),
+				update: Promise.await(EmojiCustom.find(query).toArray()),
 				remove: [],
 			},
 		});
@@ -88,7 +88,7 @@ API.v1.addRoute('emoji-custom.update', { authRequired: true }, {
 			throw new Meteor.Error('The required "_id" query param is missing.');
 		}
 
-		const emojiToUpdate = EmojiCustom.findOneById(fields._id);
+		const emojiToUpdate = Promise.await(EmojiCustom.findOneById(fields._id));
 		if (!emojiToUpdate) {
 			throw new Meteor.Error('Emoji not found.');
 		}
diff --git a/app/api/server/v1/groups.js b/app/api/server/v1/groups.js
index 4cf5d029ad6b..141bb94d49d6 100644
--- a/app/api/server/v1/groups.js
+++ b/app/api/server/v1/groups.js
@@ -3,7 +3,8 @@ import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
 import { mountIntegrationQueryBasedOnPermissions } from '../../../integrations/server/lib/mountQueriesBasedOnPermission';
-import { Subscriptions, Rooms, Messages, Uploads, Integrations, Users } from '../../../models/server';
+import { Subscriptions, Rooms, Messages, Users } from '../../../models/server';
+import { Integrations, Uploads } from '../../../models/server/raw';
 import { hasPermission, hasAtLeastOnePermission, canAccessRoom, hasAllPermission } from '../../../authorization/server';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { API } from '../api';
@@ -272,18 +273,18 @@ API.v1.addRoute('groups.files', { authRequired: true }, {
 
 		const ourQuery = Object.assign({}, query, { rid: findResult.rid });
 
-		const files = Uploads.find(ourQuery, {
+		const files = Promise.await(Uploads.find(ourQuery, {
 			sort: sort || { name: 1 },
 			skip: offset,
 			limit: count,
 			fields,
-		}).fetch();
+		}).toArray());
 
 		return API.v1.success({
 			files: files.map(addUserObjectToEveryObject),
 			count: files.length,
 			offset,
-			total: Uploads.find(ourQuery).count(),
+			total: Promise.await(Uploads.find(ourQuery).count()),
 		});
 	},
 });
@@ -312,21 +313,24 @@ API.v1.addRoute('groups.getIntegrations', { authRequired: true }, {
 		}
 
 		const { offset, count } = this.getPaginationItems();
-		const { sort, fields, query } = this.parseJsonQuery();
+		const { sort, fields: projection, query } = this.parseJsonQuery();
 
 		const ourQuery = Object.assign(mountIntegrationQueryBasedOnPermissions(this.userId), query, { channel: { $in: channelsToSearch } });
-		const integrations = Integrations.find(ourQuery, {
+		const cursor = Integrations.find(ourQuery, {
 			sort: sort || { _createdAt: 1 },
 			skip: offset,
 			limit: count,
-			fields,
-		}).fetch();
+			projection,
+		});
+
+		const integrations = Promise.await(cursor.toArray());
+		const total = Promise.await(cursor.count());
 
 		return API.v1.success({
 			integrations,
 			count: integrations.length,
 			offset,
-			total: Integrations.find(ourQuery).count(),
+			total,
 		});
 	},
 });
diff --git a/app/api/server/v1/im.js b/app/api/server/v1/im.js
index a0325298f3f2..41d3d5dfb273 100644
--- a/app/api/server/v1/im.js
+++ b/app/api/server/v1/im.js
@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
-import { Subscriptions, Uploads, Users, Messages, Rooms } from '../../../models/server';
+import { Subscriptions, Users, Messages, Rooms } from '../../../models/server';
+import { Uploads } from '../../../models/server/raw';
 import { canAccessRoom, hasPermission } from '../../../authorization/server';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { settings } from '../../../settings/server';
@@ -148,18 +149,18 @@ API.v1.addRoute(['dm.files', 'im.files'], { authRequired: true }, {
 
 		const ourQuery = Object.assign({}, query, { rid: findResult.room._id });
 
-		const files = Uploads.find(ourQuery, {
+		const files = Promise.await(Uploads.find(ourQuery, {
 			sort: sort || { name: 1 },
 			skip: offset,
 			limit: count,
 			fields,
-		}).fetch();
+		}).toArray());
 
 		return API.v1.success({
 			files: files.map(addUserObjectToEveryObject),
 			count: files.length,
 			offset,
-			total: Uploads.find(ourQuery).count(),
+			total: Promise.await(Uploads.find(ourQuery).count()),
 		});
 	},
 });
diff --git a/app/api/server/v1/instances.ts b/app/api/server/v1/instances.ts
index e6586a7c12a7..d3db3489537a 100644
--- a/app/api/server/v1/instances.ts
+++ b/app/api/server/v1/instances.ts
@@ -1,7 +1,7 @@
 import { getInstanceConnection } from '../../../../server/stream/streamBroadcast';
 import { hasPermission } from '../../../authorization/server';
 import { API } from '../api';
-import InstanceStatus from '../../../models/server/models/InstanceStatus';
+import { InstanceStatus } from '../../../models/server/raw';
 import { IInstanceStatus } from '../../../../definition/IInstanceStatus';
 
 API.v1.addRoute('instances.get', { authRequired: true }, {
@@ -10,7 +10,7 @@ API.v1.addRoute('instances.get', { authRequired: true }, {
 			return API.v1.unauthorized();
 		}
 
-		const instances = InstanceStatus.find().fetch();
+		const instances = Promise.await(InstanceStatus.find().toArray());
 
 		return API.v1.success({
 			instances: instances.map((instance: IInstanceStatus) => {
diff --git a/app/api/server/v1/integrations.js b/app/api/server/v1/integrations.js
index 480c3e8743eb..c05544eb4b82 100644
--- a/app/api/server/v1/integrations.js
+++ b/app/api/server/v1/integrations.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
 import { hasAtLeastOnePermission } from '../../../authorization/server';
-import { IntegrationHistory, Integrations } from '../../../models';
+import { Integrations, IntegrationHistory } from '../../../models/server/raw';
 import { API } from '../api';
 import { mountIntegrationHistoryQueryBasedOnPermissions, mountIntegrationQueryBasedOnPermissions } from '../../../integrations/server/lib/mountQueriesBasedOnPermission';
 import { findOneIntegration } from '../lib/integrations';
@@ -63,21 +63,24 @@ API.v1.addRoute('integrations.history', { authRequired: true }, {
 
 		const { id } = this.queryParams;
 		const { offset, count } = this.getPaginationItems();
-		const { sort, fields, query } = this.parseJsonQuery();
+		const { sort, fields: projection, query } = this.parseJsonQuery();
 		const ourQuery = Object.assign(mountIntegrationHistoryQueryBasedOnPermissions(this.userId, id), query);
 
-		const history = IntegrationHistory.find(ourQuery, {
+		const cursor = IntegrationHistory.find(ourQuery, {
 			sort: sort || { _updatedAt: -1 },
 			skip: offset,
 			limit: count,
-			fields,
-		}).fetch();
+			projection,
+		});
+
+		const history = Promise.await(cursor.toArray());
+		const total = Promise.await(cursor.count());
 
 		return API.v1.success({
 			history,
 			offset,
 			items: history.length,
-			total: IntegrationHistory.find(ourQuery).count(),
+			total,
 		});
 	},
 });
@@ -94,21 +97,25 @@ API.v1.addRoute('integrations.list', { authRequired: true }, {
 		}
 
 		const { offset, count } = this.getPaginationItems();
-		const { sort, fields, query } = this.parseJsonQuery();
+		const { sort, fields: projection, query } = this.parseJsonQuery();
 
 		const ourQuery = Object.assign(mountIntegrationQueryBasedOnPermissions(this.userId), query);
-		const integrations = Integrations.find(ourQuery, {
+		const cursor = Integrations.find(ourQuery, {
 			sort: sort || { ts: -1 },
 			skip: offset,
 			limit: count,
-			fields,
-		}).fetch();
+			projection,
+		});
+
+		const total = Promise.await(cursor.count());
+
+		const integrations = Promise.await(cursor.toArray());
 
 		return API.v1.success({
 			integrations,
 			offset,
 			items: integrations.length,
-			total: Integrations.find(ourQuery).count(),
+			total,
 		});
 	},
 });
@@ -138,9 +145,9 @@ API.v1.addRoute('integrations.remove', { authRequired: true }, {
 		switch (this.bodyParams.type) {
 			case 'webhook-outgoing':
 				if (this.bodyParams.target_url) {
-					integration = Integrations.findOne({ urls: this.bodyParams.target_url });
+					integration = Promise.await(Integrations.findOne({ urls: this.bodyParams.target_url }));
 				} else if (this.bodyParams.integrationId) {
-					integration = Integrations.findOne({ _id: this.bodyParams.integrationId });
+					integration = Promise.await(Integrations.findOne({ _id: this.bodyParams.integrationId }));
 				}
 
 				if (!integration) {
@@ -155,7 +162,7 @@ API.v1.addRoute('integrations.remove', { authRequired: true }, {
 					integration,
 				});
 			case 'webhook-incoming':
-				integration = Integrations.findOne({ _id: this.bodyParams.integrationId });
+				integration = Promise.await(Integrations.findOne({ _id: this.bodyParams.integrationId }));
 
 				if (!integration) {
 					return API.v1.failure('No integration found.');
@@ -217,9 +224,9 @@ API.v1.addRoute('integrations.update', { authRequired: true }, {
 		switch (this.bodyParams.type) {
 			case 'webhook-outgoing':
 				if (this.bodyParams.target_url) {
-					integration = Integrations.findOne({ urls: this.bodyParams.target_url });
+					integration = Promise.await(Integrations.findOne({ urls: this.bodyParams.target_url }));
 				} else if (this.bodyParams.integrationId) {
-					integration = Integrations.findOne({ _id: this.bodyParams.integrationId });
+					integration = Promise.await(Integrations.findOne({ _id: this.bodyParams.integrationId }));
 				}
 
 				if (!integration) {
@@ -229,10 +236,10 @@ API.v1.addRoute('integrations.update', { authRequired: true }, {
 				Meteor.call('updateOutgoingIntegration', integration._id, this.bodyParams);
 
 				return API.v1.success({
-					integration: Integrations.findOne({ _id: integration._id }),
+					integration: Promise.await(Integrations.findOne({ _id: integration._id })),
 				});
 			case 'webhook-incoming':
-				integration = Integrations.findOne({ _id: this.bodyParams.integrationId });
+				integration = Promise.await(Integrations.findOne({ _id: this.bodyParams.integrationId }));
 
 				if (!integration) {
 					return API.v1.failure('No integration found.');
@@ -241,7 +248,7 @@ API.v1.addRoute('integrations.update', { authRequired: true }, {
 				Meteor.call('updateIncomingIntegration', integration._id, this.bodyParams);
 
 				return API.v1.success({
-					integration: Integrations.findOne({ _id: integration._id }),
+					integration: Promise.await(Integrations.findOne({ _id: integration._id })),
 				});
 			default:
 				return API.v1.failure('Invalid integration type.');
diff --git a/app/api/server/v1/invites.js b/app/api/server/v1/invites.js
index fd17ec366190..f901247547db 100644
--- a/app/api/server/v1/invites.js
+++ b/app/api/server/v1/invites.js
@@ -7,7 +7,7 @@ import { validateInviteToken } from '../../../invites/server/functions/validateI
 
 API.v1.addRoute('listInvites', { authRequired: true }, {
 	get() {
-		const result = listInvites(this.userId);
+		const result = Promise.await(listInvites(this.userId));
 		return API.v1.success(result);
 	},
 });
@@ -15,7 +15,7 @@ API.v1.addRoute('listInvites', { authRequired: true }, {
 API.v1.addRoute('findOrCreateInvite', { authRequired: true }, {
 	post() {
 		const { rid, days, maxUses } = this.bodyParams;
-		const result = findOrCreateInvite(this.userId, { rid, days, maxUses });
+		const result = Promise.await(findOrCreateInvite(this.userId, { rid, days, maxUses }));
 
 		return API.v1.success(result);
 	},
@@ -24,7 +24,7 @@ API.v1.addRoute('findOrCreateInvite', { authRequired: true }, {
 API.v1.addRoute('removeInvite/:_id', { authRequired: true }, {
 	delete() {
 		const { _id } = this.urlParams;
-		const result = removeInvite(this.userId, { _id });
+		const result = Promise.await(removeInvite(this.userId, { _id }));
 
 		return API.v1.success(result);
 	},
@@ -34,7 +34,7 @@ API.v1.addRoute('useInviteToken', { authRequired: true }, {
 	post() {
 		const { token } = this.bodyParams;
 		// eslint-disable-next-line react-hooks/rules-of-hooks
-		const result = useInviteToken(this.userId, token);
+		const result = Promise.await(useInviteToken(this.userId, token));
 
 		return API.v1.success(result);
 	},
@@ -46,7 +46,7 @@ API.v1.addRoute('validateInviteToken', { authRequired: false }, {
 
 		let valid = true;
 		try {
-			validateInviteToken(token);
+			Promise.await(validateInviteToken(token));
 		} catch (e) {
 			valid = false;
 		}
diff --git a/app/api/server/v1/permissions.js b/app/api/server/v1/permissions.ts
similarity index 74%
rename from app/api/server/v1/permissions.js
rename to app/api/server/v1/permissions.ts
index 4ac1661f0786..c2aab9afda54 100644
--- a/app/api/server/v1/permissions.js
+++ b/app/api/server/v1/permissions.ts
@@ -1,31 +1,29 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
-import { hasPermission } from '../../../authorization';
-import { Permissions, Roles } from '../../../models/server';
+import { hasPermission } from '../../../authorization/server';
 import { API } from '../api';
+import { Permissions, Roles } from '../../../models/server/raw';
 
 API.v1.addRoute('permissions.listAll', { authRequired: true }, {
 	get() {
 		const { updatedSince } = this.queryParams;
 
-		let updatedSinceDate;
+		let updatedSinceDate: Date | undefined;
 		if (updatedSince) {
 			if (isNaN(Date.parse(updatedSince))) {
 				throw new Meteor.Error('error-roomId-param-invalid', 'The "updatedSince" query parameter must be a valid date.');
-			} else {
-				updatedSinceDate = new Date(updatedSince);
 			}
+			updatedSinceDate = new Date(updatedSince);
 		}
 
-		let result;
-		Meteor.runAsUser(this.userId, () => { result = Meteor.call('permissions/get', updatedSinceDate); });
+		const result = Promise.await(Meteor.call('permissions/get', updatedSinceDate));
 
 		if (Array.isArray(result)) {
-			result = {
+			return API.v1.success({
 				update: result,
 				remove: [],
-			};
+			});
 		}
 
 		return API.v1.success(result);
@@ -52,14 +50,14 @@ API.v1.addRoute('permissions.update', { authRequired: true }, {
 		Object.keys(this.bodyParams.permissions).forEach((key) => {
 			const element = this.bodyParams.permissions[key];
 
-			if (!Permissions.findOneById(element._id)) {
+			if (!Promise.await(Permissions.findOneById(element._id))) {
 				permissionNotFound = true;
 			}
 
 			Object.keys(element.roles).forEach((key) => {
-				const subelement = element.roles[key];
+				const subElement = element.roles[key];
 
-				if (!Roles.findOneById(subelement)) {
+				if (!Promise.await(Roles.findOneById(subElement))) {
 					roleNotFound = true;
 				}
 			});
@@ -77,7 +75,7 @@ API.v1.addRoute('permissions.update', { authRequired: true }, {
 			Permissions.createOrUpdate(element._id, element.roles);
 		});
 
-		const result = Meteor.runAsUser(this.userId, () => Meteor.call('permissions/get'));
+		const result = Promise.await(Meteor.call('permissions/get'));
 
 		return API.v1.success({
 			permissions: result,
diff --git a/app/api/server/v1/roles.js b/app/api/server/v1/roles.ts
similarity index 76%
rename from app/api/server/v1/roles.js
rename to app/api/server/v1/roles.ts
index 39d89164e4ab..8d87ac7f25c7 100644
--- a/app/api/server/v1/roles.js
+++ b/app/api/server/v1/roles.ts
@@ -1,15 +1,16 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
-import { Roles, Users } from '../../../models';
+import { Users } from '../../../models/server';
 import { API } from '../api';
 import { getUsersInRole, hasPermission, hasRole } from '../../../authorization/server';
 import { settings } from '../../../settings/server/index';
 import { api } from '../../../../server/sdk/api';
+import { Roles } from '../../../models/server/raw';
 
 API.v1.addRoute('roles.list', { authRequired: true }, {
 	get() {
-		const roles = Roles.find({}, { fields: { _updatedAt: 0 } }).fetch();
+		const roles = Promise.await(Roles.find({}, { fields: { _updatedAt: 0 } }).toArray());
 
 		return API.v1.success({ roles });
 	},
@@ -25,8 +26,8 @@ API.v1.addRoute('roles.sync', { authRequired: true }, {
 
 		return API.v1.success({
 			roles: {
-				update: Roles.findByUpdatedDate(new Date(updatedSince), { fields: API.v1.defaultFieldsToExclude }).fetch(),
-				remove: Roles.trashFindDeletedAfter(new Date(updatedSince)).fetch(),
+				update: Promise.await(Roles.findByUpdatedDate(new Date(updatedSince), { fields: API.v1.defaultFieldsToExclude }).toArray()),
+				remove: Promise.await(Roles.trashFindDeletedAfter(new Date(updatedSince)).toArray()),
 			},
 		});
 	},
@@ -52,15 +53,15 @@ API.v1.addRoute('roles.create', { authRequired: true }, {
 			throw new Meteor.Error('error-action-not-allowed', 'Accessing permissions is not allowed');
 		}
 
-		if (Roles.findOneByIdOrName(roleData.name)) {
+		if (Promise.await(Roles.findOneByIdOrName(roleData.name))) {
 			throw new Meteor.Error('error-duplicate-role-names-not-allowed', 'Role name already exists');
 		}
 
 		if (['Users', 'Subscriptions'].includes(roleData.scope) === false) {
 			roleData.scope = 'Users';
 		}
-
-		const roleId = Roles.createWithRandomId(roleData.name, roleData.scope, roleData.description, false, roleData.mandatory2fa);
+		const a = Roles.createWithRandomId(roleData.name, roleData.scope, roleData.description, false, roleData.mandatory2fa);
+		const roleId = Promise.await(a).insertedId;
 
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
@@ -70,7 +71,7 @@ API.v1.addRoute('roles.create', { authRequired: true }, {
 		}
 
 		return API.v1.success({
-			role: Roles.findOneByIdOrName(roleId, { fields: API.v1.defaultFieldsToExclude }),
+			role: Promise.await(Roles.findOneByIdOrName(roleId, { fields: API.v1.defaultFieldsToExclude })),
 		});
 	},
 });
@@ -95,7 +96,7 @@ API.v1.addRoute('roles.addUserToRole', { authRequired: true }, {
 		});
 
 		return API.v1.success({
-			role: Roles.findOneByIdOrName(this.bodyParams.roleName, { fields: API.v1.defaultFieldsToExclude }),
+			role: Promise.await(Roles.findOneByIdOrName(this.bodyParams.roleName, { fields: API.v1.defaultFieldsToExclude })),
 		});
 	},
 });
@@ -121,13 +122,14 @@ API.v1.addRoute('roles.getUsersInRole', { authRequired: true }, {
 		if (roomId && !hasPermission(this.userId, 'view-other-user-channels')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed');
 		}
-		const users = getUsersInRole(role, roomId, {
+		const users = Promise.await(getUsersInRole(role, roomId, {
 			limit: count,
 			sort: { username: 1 },
 			skip: offset,
 			fields,
-		});
-		return API.v1.success({ users: users.fetch(), total: users.count() });
+		}));
+
+		return API.v1.success({ users: Promise.await(users.toArray()), total: Promise.await(users.count()) });
 	},
 });
 
@@ -149,7 +151,7 @@ API.v1.addRoute('roles.update', { authRequired: true }, {
 			mandatory2fa: this.bodyParams.mandatory2fa,
 		};
 
-		const role = Roles.findOneByIdOrName(roleData.roleId);
+		const role = Promise.await(Roles.findOneByIdOrName(roleData.roleId));
 
 		if (!role) {
 			throw new Meteor.Error('error-invalid-roleId', 'This role does not exist');
@@ -160,7 +162,7 @@ API.v1.addRoute('roles.update', { authRequired: true }, {
 		}
 
 		if (roleData.name) {
-			const otherRole = Roles.findOneByIdOrName(roleData.name);
+			const otherRole = Promise.await(Roles.findOneByIdOrName(roleData.name));
 			if (otherRole && otherRole._id !== role._id) {
 				throw new Meteor.Error('error-duplicate-role-names-not-allowed', 'Role name already exists');
 			}
@@ -172,7 +174,7 @@ API.v1.addRoute('roles.update', { authRequired: true }, {
 			}
 		}
 
-		Roles.updateById(roleData.roleId, roleData.name, roleData.scope, roleData.description, roleData.mandatory2fa);
+		Promise.await(Roles.updateById(roleData.roleId, roleData.name, roleData.scope, roleData.description, roleData.mandatory2fa));
 
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
@@ -182,7 +184,7 @@ API.v1.addRoute('roles.update', { authRequired: true }, {
 		}
 
 		return API.v1.success({
-			role: Roles.findOneByIdOrName(roleData.roleId, { fields: API.v1.defaultFieldsToExclude }),
+			role: Promise.await(Roles.findOneByIdOrName(roleData.roleId, { fields: API.v1.defaultFieldsToExclude })),
 		});
 	},
 });
@@ -197,7 +199,7 @@ API.v1.addRoute('roles.delete', { authRequired: true }, {
 			throw new Meteor.Error('error-action-not-allowed', 'Accessing permissions is not allowed');
 		}
 
-		const role = Roles.findOneByIdOrName(this.bodyParams.roleId);
+		const role = Promise.await(Roles.findOneByIdOrName(this.bodyParams.roleId));
 
 		if (!role) {
 			throw new Meteor.Error('error-invalid-roleId', 'This role does not exist');
@@ -207,13 +209,13 @@ API.v1.addRoute('roles.delete', { authRequired: true }, {
 			throw new Meteor.Error('error-role-protected', 'Cannot delete a protected role');
 		}
 
-		const existingUsers = Roles.findUsersInRole(role.name, role.scope);
+		const existingUsers = Promise.await(Roles.findUsersInRole(role.name, role.scope));
 
-		if (existingUsers && existingUsers.count() > 0) {
+		if (existingUsers && Promise.await(existingUsers.count()) > 0) {
 			throw new Meteor.Error('error-role-in-use', 'Cannot delete role because it\'s in use');
 		}
 
-		Roles.remove(role._id);
+		Promise.await(Roles.removeById(role._id));
 
 		return API.v1.success();
 	},
@@ -243,7 +245,7 @@ API.v1.addRoute('roles.removeUserFromRole', { authRequired: true }, {
 			throw new Meteor.Error('error-invalid-user', 'There is no user with this username');
 		}
 
-		const role = Roles.findOneByIdOrName(data.roleName);
+		const role = Promise.await(Roles.findOneByIdOrName(data.roleName));
 
 		if (!role) {
 			throw new Meteor.Error('error-invalid-roleId', 'This role does not exist');
@@ -254,13 +256,13 @@ API.v1.addRoute('roles.removeUserFromRole', { authRequired: true }, {
 		}
 
 		if (role._id === 'admin') {
-			const adminCount = Roles.findUsersInRole('admin').count();
+			const adminCount = Promise.await(Promise.await(Roles.findUsersInRole('admin')).count());
 			if (adminCount === 1) {
 				throw new Meteor.Error('error-admin-required', 'You need to have at least one admin');
 			}
 		}
 
-		Roles.removeUserRoles(user._id, role.name, data.scope);
+		Promise.await(Roles.removeUserRoles(user._id, [role.name], data.scope));
 
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
diff --git a/app/api/server/v1/settings.js b/app/api/server/v1/settings.ts
similarity index 54%
rename from app/api/server/v1/settings.js
rename to app/api/server/v1/settings.ts
index b9c720f3522a..1f60f2ea2c58 100644
--- a/app/api/server/v1/settings.js
+++ b/app/api/server/v1/settings.ts
@@ -3,24 +3,65 @@ import { Match, check } from 'meteor/check';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 import _ from 'underscore';
 
-import { Settings } from '../../../models/server';
-import { hasPermission } from '../../../authorization';
+import { Settings } from '../../../models/server/raw';
+import { hasPermission } from '../../../authorization/server';
 import { API } from '../api';
 import { SettingsEvents, settings } from '../../../settings/server';
 import { setValue } from '../../../settings/server/raw';
+import { ISetting, ISettingColor, isSettingAction, isSettingColor } from '../../../../definition/ISetting';
 
-const fetchSettings = (query, sort, offset, count, fields) => {
-	const settings = Settings.find(query, {
+
+const fetchSettings = async (query: Parameters<typeof Settings.find>[0], sort: Parameters<typeof Settings.find>[1]['sort'], offset: Parameters<typeof Settings.find>[1]['skip'], count: Parameters<typeof Settings.find>[1]['limit'], fields: Parameters<typeof Settings.find>[1]['projection']): Promise<ISetting[]> => {
+	const settings = await Settings.find(query, {
 		sort: sort || { _id: 1 },
 		skip: offset,
 		limit: count,
-		fields: Object.assign({ _id: 1, value: 1, enterprise: 1, invalidValue: 1, modules: 1 }, fields),
-	}).fetch();
+		projection: { _id: 1, value: 1, enterprise: 1, invalidValue: 1, modules: 1, ...fields },
+	}).toArray() as unknown as ISetting[];
+
 
 	SettingsEvents.emit('fetch-settings', settings);
 	return settings;
 };
 
+type OauthCustomConfiguration = {
+	_id: string;
+	clientId?: string;
+	custom: unknown;
+	service?: string;
+	serverURL: unknown;
+	tokenPath: unknown;
+	identityPath: unknown;
+	authorizePath: unknown;
+	scope: unknown;
+	loginStyle: unknown;
+	tokenSentVia: unknown;
+	identityTokenSentVia: unknown;
+	keyField: unknown;
+	usernameField: unknown;
+	emailField: unknown;
+	nameField: unknown;
+	avatarField: unknown;
+	rolesClaim: unknown;
+	groupsClaim: unknown;
+	mapChannels: unknown;
+	channelsMap: unknown;
+	channelsAdmin: unknown;
+	mergeUsers: unknown;
+	mergeRoles: unknown;
+	accessTokenParam: unknown;
+	showButton: unknown;
+
+	appId: unknown;
+	consumerKey: unknown;
+
+	clientConfig: unknown;
+	buttonLabelText: unknown;
+	buttonLabelColor: unknown;
+	buttonColor: unknown;
+}
+const isOauthCustomConfiguration = (config: any): config is OauthCustomConfiguration => Boolean(config);
+
 // settings endpoints
 API.v1.addRoute('settings.public', { authRequired: false }, {
 	get() {
@@ -34,7 +75,7 @@ API.v1.addRoute('settings.public', { authRequired: false }, {
 
 		ourQuery = Object.assign({}, query, ourQuery);
 
-		const settings = fetchSettings(ourQuery, sort, offset, count, fields);
+		const settings = Promise.await(fetchSettings(ourQuery, sort, offset, count, fields));
 
 		return API.v1.success({
 			settings,
@@ -47,11 +88,15 @@ API.v1.addRoute('settings.public', { authRequired: false }, {
 
 API.v1.addRoute('settings.oauth', { authRequired: false }, {
 	get() {
-		const mountOAuthServices = () => {
+		const mountOAuthServices = (): object => {
 			const oAuthServicesEnabled = ServiceConfiguration.configurations.find({}, { fields: { secret: 0 } }).fetch();
 
 			return oAuthServicesEnabled.map((service) => {
-				if (service.custom || ['saml', 'cas', 'wordpress'].includes(service.service)) {
+				if (!isOauthCustomConfiguration(service)) {
+					return service;
+				}
+
+				if (service.custom || (service.service && ['saml', 'cas', 'wordpress'].includes(service.service))) {
 					return { ...service };
 				}
 
@@ -93,7 +138,7 @@ API.v1.addRoute('settings', { authRequired: true }, {
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
 
-		let ourQuery = {
+		let ourQuery: Parameters<typeof Settings.find>[0] = {
 			hidden: { $ne: true },
 		};
 
@@ -103,7 +148,7 @@ API.v1.addRoute('settings', { authRequired: true }, {
 
 		ourQuery = Object.assign({}, query, ourQuery);
 
-		const settings = fetchSettings(ourQuery, sort, offset, count, fields);
+		const settings = Promise.await(fetchSettings(ourQuery, sort, offset, count, fields));
 
 		return API.v1.success({
 			settings,
@@ -119,26 +164,34 @@ API.v1.addRoute('settings/:_id', { authRequired: true }, {
 		if (!hasPermission(this.userId, 'view-privileged-setting')) {
 			return API.v1.unauthorized();
 		}
-
-		return API.v1.success(_.pick(Settings.findOneNotHiddenById(this.urlParams._id), '_id', 'value'));
+		const setting = Promise.await(Settings.findOneNotHiddenById(this.urlParams._id));
+		if (!setting) {
+			return API.v1.failure();
+		}
+		return API.v1.success(_.pick(setting, '_id', 'value'));
 	},
 	post: {
 		twoFactorRequired: true,
-		action() {
+		action(this: any): void {
 			if (!hasPermission(this.userId, 'edit-privileged-setting')) {
 				return API.v1.unauthorized();
 			}
 
 			// allow special handling of particular setting types
-			const setting = Settings.findOneNotHiddenById(this.urlParams._id);
-			if (setting.type === 'action' && this.bodyParams && this.bodyParams.execute) {
+			const setting = Promise.await(Settings.findOneNotHiddenById(this.urlParams._id));
+
+			if (!setting) {
+				return API.v1.failure();
+			}
+
+			if (isSettingAction(setting) && this.bodyParams && this.bodyParams.execute) {
 				// execute the configured method
 				Meteor.call(setting.value);
 				return API.v1.success();
 			}
 
-			if (setting.type === 'color' && this.bodyParams && this.bodyParams.editor && this.bodyParams.value) {
-				Settings.updateOptionsById(this.urlParams._id, { editor: this.bodyParams.editor });
+			if (isSettingColor(setting) && this.bodyParams && this.bodyParams.editor && this.bodyParams.value) {
+				Settings.updateOptionsById<ISettingColor>(this.urlParams._id, { editor: this.bodyParams.editor });
 				Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value);
 				return API.v1.success();
 			}
@@ -146,8 +199,12 @@ API.v1.addRoute('settings/:_id', { authRequired: true }, {
 			check(this.bodyParams, {
 				value: Match.Any,
 			});
-			if (Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value)) {
-				settings.set(Settings.findOneNotHiddenById(this.urlParams._id));
+			if (Promise.await(Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value))) {
+				const s = Promise.await(Settings.findOneNotHiddenById(this.urlParams._id));
+				if (!s) {
+					return API.v1.failure();
+				}
+				settings.set(s);
 				setValue(this.urlParams._id, this.bodyParams.value);
 				return API.v1.success();
 			}
diff --git a/app/apps/server/bridges/internal.ts b/app/apps/server/bridges/internal.ts
index 0d09646f3893..154adbdeb104 100644
--- a/app/apps/server/bridges/internal.ts
+++ b/app/apps/server/bridges/internal.ts
@@ -2,8 +2,9 @@ import { InternalBridge } from '@rocket.chat/apps-engine/server/bridges/Internal
 import { ISetting } from '@rocket.chat/apps-engine/definition/settings';
 
 import { AppServerOrchestrator } from '../orchestrator';
-import { Subscriptions, Settings } from '../../../models/server';
+import { Subscriptions } from '../../../models/server';
 import { ISubscription } from '../../../../definition/ISubscription';
+import { Settings } from '../../../models/server/raw';
 
 export class AppInternalBridge extends InternalBridge {
 	// eslint-disable-next-line no-empty-function
@@ -30,7 +31,7 @@ export class AppInternalBridge extends InternalBridge {
 	}
 
 	protected async getWorkspacePublicKey(): Promise<ISetting> {
-		const publicKeySetting = Settings.findById('Cloud_Workspace_PublicKey').fetch()[0];
+		const publicKeySetting = await Settings.findOneById('Cloud_Workspace_PublicKey');
 
 		return this.orch.getConverters()?.get('settings').convertToApp(publicKeySetting);
 	}
diff --git a/app/apps/server/bridges/settings.ts b/app/apps/server/bridges/settings.ts
index ad1c234b0af2..ba0626434ff9 100644
--- a/app/apps/server/bridges/settings.ts
+++ b/app/apps/server/bridges/settings.ts
@@ -1,7 +1,7 @@
 import { ISetting } from '@rocket.chat/apps-engine/definition/settings';
 import { ServerSettingBridge } from '@rocket.chat/apps-engine/server/bridges/ServerSettingBridge';
 
-import { Settings } from '../../../models/server';
+import { Settings } from '../../../models/server/raw';
 import { AppServerOrchestrator } from '../orchestrator';
 
 export class AppSettingBridge extends ServerSettingBridge {
@@ -13,9 +13,8 @@ export class AppSettingBridge extends ServerSettingBridge {
 	protected async getAll(appId: string): Promise<Array<ISetting>> {
 		this.orch.debugLog(`The App ${ appId } is getting all the settings.`);
 
-		return Settings.find({ secret: false })
-			.fetch()
-			.map((s: ISetting) => this.orch.getConverters()?.get('settings').convertToApp(s));
+		const settings = await Settings.find({ secret: false }).toArray();
+		return settings.map((s) => this.orch.getConverters()?.get('settings').convertToApp(s));
 	}
 
 	protected async getOneById(id: string, appId: string): Promise<ISetting> {
@@ -46,8 +45,8 @@ export class AppSettingBridge extends ServerSettingBridge {
 
 	protected async isReadableById(id: string, appId: string): Promise<boolean> {
 		this.orch.debugLog(`The App ${ appId } is checking if they can read the setting ${ id }.`);
-
-		return !Settings.findOneById(id).secret;
+		const setting = await Settings.findOneById(id);
+		return Boolean(setting && !setting.secret);
 	}
 
 	protected async updateOne(setting: ISetting & { id: string }, appId: string): Promise<void> {
diff --git a/app/apps/server/communication/rest.js b/app/apps/server/communication/rest.js
index 6d84f3797b95..1386ba39cfa8 100644
--- a/app/apps/server/communication/rest.js
+++ b/app/apps/server/communication/rest.js
@@ -6,9 +6,10 @@ import { getUploadFormData } from '../../../api/server/lib/getUploadFormData';
 import { getWorkspaceAccessToken, getUserCloudAccessToken } from '../../../cloud/server';
 import { settings } from '../../../settings/server';
 import { Info } from '../../../utils';
-import { Settings, Users } from '../../../models/server';
+import { Users } from '../../../models/server';
 import { Apps } from '../orchestrator';
 import { formatAppInstanceForRest } from '../../lib/misc/formatAppInstanceForRest';
+import { Settings } from '../../../models/server/raw';
 
 const appsEngineVersionForMarketplace = Info.marketplaceApiVersion.replace(/-.*/g, '');
 const getDefaultHeaders = () => ({
@@ -67,7 +68,7 @@ export class AppsRestApi {
 				// Gets the Apps from the marketplace
 				if (this.queryParams.marketplace) {
 					const headers = getDefaultHeaders();
-					const token = getWorkspaceAccessToken();
+					const token = Promise.await(getWorkspaceAccessToken());
 					if (token) {
 						headers.Authorization = `Bearer ${ token }`;
 					}
@@ -91,7 +92,7 @@ export class AppsRestApi {
 
 				if (this.queryParams.categories) {
 					const headers = getDefaultHeaders();
-					const token = getWorkspaceAccessToken();
+					const token = Promise.await(getWorkspaceAccessToken());
 					if (token) {
 						headers.Authorization = `Bearer ${ token }`;
 					}
@@ -187,7 +188,7 @@ export class AppsRestApi {
 					});
 
 					const marketplacePromise = new Promise((resolve, reject) => {
-						const token = getWorkspaceAccessToken();
+						const token = Promise.await(getWorkspaceAccessToken());
 
 						HTTP.get(`${ baseUrl }/v1/apps/${ this.bodyParams.appId }?appVersion=${ this.bodyParams.version }`, {
 							headers: {
@@ -307,7 +308,7 @@ export class AppsRestApi {
 				const baseUrl = orchestrator.getMarketplaceUrl();
 
 				const headers = {};
-				const token = getWorkspaceAccessToken();
+				const token = Promise.await(getWorkspaceAccessToken());
 				if (token) {
 					headers.Authorization = `Bearer ${ token }`;
 				}
@@ -337,7 +338,7 @@ export class AppsRestApi {
 					const baseUrl = orchestrator.getMarketplaceUrl();
 
 					const headers = {}; // DO NOT ATTACH THE FRAMEWORK/ENGINE VERSION HERE.
-					const token = getWorkspaceAccessToken();
+					const token = Promise.await(getWorkspaceAccessToken());
 					if (token) {
 						headers.Authorization = `Bearer ${ token }`;
 					}
@@ -363,7 +364,7 @@ export class AppsRestApi {
 					const baseUrl = orchestrator.getMarketplaceUrl();
 
 					const headers = getDefaultHeaders();
-					const token = getWorkspaceAccessToken();
+					const token = Promise.await(getWorkspaceAccessToken());
 					if (token) {
 						headers.Authorization = `Bearer ${ token }`;
 					}
@@ -507,12 +508,12 @@ export class AppsRestApi {
 				const baseUrl = orchestrator.getMarketplaceUrl();
 
 				const headers = getDefaultHeaders();
-				const token = getWorkspaceAccessToken();
+				const token = Promise.await(getWorkspaceAccessToken());
 				if (token) {
 					headers.Authorization = `Bearer ${ token }`;
 				}
 
-				const [workspaceIdSetting] = Settings.findById('Cloud_Workspace_Id').fetch();
+				const workspaceIdSetting = Promise.await(Settings.findOneById('Cloud_Workspace_Id'));
 
 				let result;
 				try {
diff --git a/app/apps/server/converters/settings.js b/app/apps/server/converters/settings.js
index 82ffcd2b2f0f..bc5949bc7ccd 100644
--- a/app/apps/server/converters/settings.js
+++ b/app/apps/server/converters/settings.js
@@ -1,14 +1,14 @@
 import { SettingType } from '@rocket.chat/apps-engine/definition/settings';
 
-import { Settings } from '../../../models';
+import { Settings } from '../../../models/server/raw';
 
 export class AppSettingsConverter {
 	constructor(orch) {
 		this.orch = orch;
 	}
 
-	convertById(settingId) {
-		const setting = Settings.findOneNotHiddenById(settingId);
+	async convertById(settingId) {
+		const setting = await Settings.findOneNotHiddenById(settingId);
 
 		return this.convertToApp(setting);
 	}
diff --git a/app/apps/server/converters/uploads.js b/app/apps/server/converters/uploads.js
index d95f5d10067f..efbda7ae5fd1 100644
--- a/app/apps/server/converters/uploads.js
+++ b/app/apps/server/converters/uploads.js
@@ -1,5 +1,5 @@
 import { transformMappedData } from '../../lib/misc/transformMappedData';
-import Uploads from '../../../models/server/models/Uploads';
+import { Uploads } from '../../../models/server/raw';
 
 export class AppUploadsConverter {
 	constructor(orch) {
@@ -7,7 +7,7 @@ export class AppUploadsConverter {
 	}
 
 	convertById(id) {
-		const upload = Uploads.findOneById(id);
+		const upload = Promise.await(Uploads.findOneById(id));
 
 		return this.convertToApp(upload);
 	}
diff --git a/app/apps/server/cron.js b/app/apps/server/cron.js
index 3201612ea6b6..d38eebe060b2 100644
--- a/app/apps/server/cron.js
+++ b/app/apps/server/cron.js
@@ -6,8 +6,9 @@ import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
 
 import { Apps } from './orchestrator';
 import { getWorkspaceAccessToken } from '../../cloud/server';
-import { Settings, Users } from '../../models/server';
+import { Users } from '../../models/server';
 import { sendMessagesToAdmins } from '../../../server/lib/sendMessagesToAdmins';
+import { Settings } from '../../models/server/raw';
 
 
 const notifyAdminsAboutInvalidApps = Meteor.bindEnvironment(function _notifyAdminsAboutInvalidApps(apps) {
@@ -27,7 +28,7 @@ const notifyAdminsAboutInvalidApps = Meteor.bindEnvironment(function _notifyAdmi
 	const rocketCatMessage = 'There is one or more apps in an invalid state. Go to Administration > Apps to review.';
 	const link = '/admin/apps';
 
-	sendMessagesToAdmins({
+	Promise.await(sendMessagesToAdmins({
 		msgs: ({ adminUser }) => ({ msg: `*${ TAPi18n.__(title, adminUser.language) }*\n${ TAPi18n.__(rocketCatMessage, adminUser.language) }` }),
 		banners: ({ adminUser }) => {
 			Users.removeBannerById(adminUser._id, { id });
@@ -41,7 +42,7 @@ const notifyAdminsAboutInvalidApps = Meteor.bindEnvironment(function _notifyAdmi
 				link,
 			}];
 		},
-	});
+	}));
 
 	return apps;
 });
@@ -59,19 +60,19 @@ const notifyAdminsAboutRenewedApps = Meteor.bindEnvironment(function _notifyAdmi
 
 	const rocketCatMessage = 'There is one or more disabled apps with valid licenses. Go to Administration > Apps to review.';
 
-	sendMessagesToAdmins({
+	Promise.await(sendMessagesToAdmins({
 		msgs: ({ adminUser }) => ({ msg: `${ TAPi18n.__(rocketCatMessage, adminUser.language) }` }),
-	});
+	}));
 });
 
 export const appsUpdateMarketplaceInfo = Meteor.bindEnvironment(function _appsUpdateMarketplaceInfo() {
-	const token = getWorkspaceAccessToken();
+	const token = Promise.await(getWorkspaceAccessToken());
 	const baseUrl = Apps.getMarketplaceUrl();
-	const [workspaceIdSetting] = Settings.findById('Cloud_Workspace_Id').fetch();
+	const workspaceIdSetting = Promise.await(Settings.getValueById('Cloud_Workspace_Id'));
 
 	const currentSeats = Users.getActiveLocalUserCount();
 
-	const fullUrl = `${ baseUrl }/v1/workspaces/${ workspaceIdSetting.value }/apps?seats=${ currentSeats }`;
+	const fullUrl = `${ baseUrl }/v1/workspaces/${ workspaceIdSetting }/apps?seats=${ currentSeats }`;
 	const options = {
 		headers: {
 			Authorization: `Bearer ${ token }`,
diff --git a/app/authentication/server/lib/restrictLoginAttempts.ts b/app/authentication/server/lib/restrictLoginAttempts.ts
index d3ca8f78e5ca..6561f3d3f12c 100644
--- a/app/authentication/server/lib/restrictLoginAttempts.ts
+++ b/app/authentication/server/lib/restrictLoginAttempts.ts
@@ -1,12 +1,10 @@
 import moment from 'moment';
 
 import { ILoginAttempt } from '../ILoginAttempt';
-import { ServerEvents, Users, Rooms } from '../../../models/server/raw';
-import { IServerEventType } from '../../../../definition/IServerEvent';
-import { IUser } from '../../../../definition/IUser';
+import { ServerEvents, Users, Rooms, Sessions } from '../../../models/server/raw';
+import { IServerEventType, IServerEvent } from '../../../../definition/IServerEvent';
 import { settings } from '../../../settings/server';
 import { addMinutesToADate } from '../../../../lib/utils/addMinutesToADate';
-import Sessions from '../../../models/server/raw/Sessions';
 import { getClientAddress } from '../../../../server/lib/getClientAddress';
 import { sendMessage } from '../../../lib/server/functions';
 import { Logger } from '../../../logger/server';
@@ -52,7 +50,7 @@ export const isValidLoginAttemptByIp = async (ip: string): Promise<boolean> => {
 		return true;
 	}
 
-	const lastLogin = await Sessions.findLastLoginByIp(ip) as {loginAt?: Date} | undefined;
+	const lastLogin = await Sessions.findLastLoginByIp(ip);
 	let failedAttemptsSinceLastLogin;
 
 	if (!lastLogin || !lastLogin.loginAt) {
@@ -128,7 +126,7 @@ export const isValidAttemptByUser = async (login: ILoginAttempt): Promise<boolea
 };
 
 export const saveFailedLoginAttempts = async (login: ILoginAttempt): Promise<void> => {
-	const user: Partial<IUser> = {
+	const user: IServerEvent['u'] = {
 		_id: login.user?._id,
 		username: login.user?.username || login.methodArguments[0].user?.username,
 	};
@@ -142,10 +140,15 @@ export const saveFailedLoginAttempts = async (login: ILoginAttempt): Promise<voi
 };
 
 export const saveSuccessfulLogin = async (login: ILoginAttempt): Promise<void> => {
+	const user: IServerEvent['u'] = {
+		_id: login.user?._id,
+		username: login.user?.username || login.methodArguments[0].user?.username,
+	};
+
 	await ServerEvents.insertOne({
 		ip: getClientAddress(login.connection),
 		t: IServerEventType.LOGIN,
 		ts: new Date(),
-		u: login.user,
+		u: user,
 	});
 };
diff --git a/app/authentication/server/startup/index.js b/app/authentication/server/startup/index.js
index ff9e6b02f431..ed98b62aaf28 100644
--- a/app/authentication/server/startup/index.js
+++ b/app/authentication/server/startup/index.js
@@ -8,8 +8,8 @@ import { escapeRegExp, escapeHTML } from '@rocket.chat/string-helpers';
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';
 import { callbacks } from '../../../callbacks/server';
-import { Roles, Users, Settings } from '../../../models/server';
-import { Users as UsersRaw } from '../../../models/server/raw';
+import { Users, Settings } from '../../../models/server';
+import { Roles, Users as UsersRaw } from '../../../models/server/raw';
 import { addUserRoles } from '../../../authorization/server';
 import { getAvatarSuggestionForUser } from '../../../lib/server/functions';
 import {
@@ -186,8 +186,7 @@ Accounts.onCreateUser(function(options, user = {}) {
 
 	if (!user.active) {
 		const destinations = [];
-
-		Roles.findUsersInRole('admin').forEach((adminUser) => {
+		Promise.await(Roles.findUsersInRole('admin').toArray()).forEach((adminUser) => {
 			if (Array.isArray(adminUser.emails)) {
 				adminUser.emails.forEach((email) => {
 					destinations.push(`${ adminUser.name }<${ email.address }>`);
diff --git a/app/authorization/client/hasPermission.ts b/app/authorization/client/hasPermission.ts
index 744903bc5062..23a0aeeca8a6 100644
--- a/app/authorization/client/hasPermission.ts
+++ b/app/authorization/client/hasPermission.ts
@@ -7,11 +7,11 @@ import { IUser } from '../../../definition/IUser';
 import { IRole } from '../../../definition/IRole';
 import { IPermission } from '../../../definition/IPermission';
 
-const isValidScope = (scope: IRole['scope']): scope is keyof typeof Models =>
+const isValidScope = (scope: IRole['scope']): boolean =>
 	typeof scope === 'string' && scope in Models;
 
 const createPermissionValidator = (quantifier: (predicate: (permissionId: IPermission['_id']) => boolean) => boolean) =>
-	(permissionIds: IPermission['_id'][], scope: IRole['scope'], userId: IUser['_id']): boolean => {
+	(permissionIds: IPermission['_id'][], scope: string | undefined, userId: IUser['_id']): boolean => {
 		const user: IUser | null = Models.Users.findOneById(userId, { fields: { roles: 1 } });
 
 		const checkEachPermission = quantifier.bind(permissionIds);
@@ -34,7 +34,7 @@ const createPermissionValidator = (quantifier: (predicate: (permissionId: IPermi
 					return false;
 				}
 
-				const model = Models[roleScope];
+				const model = Models[roleScope as keyof typeof Models];
 				return model.isUserInRole && model.isUserInRole(userId, roleName, scope);
 			});
 		});
@@ -46,8 +46,8 @@ const all = createPermissionValidator(Array.prototype.every);
 
 const validatePermissions = (
 	permissions: IPermission['_id'] | IPermission['_id'][],
-	scope: IRole['scope'],
-	predicate: (permissionIds: IPermission['_id'][], scope: IRole['scope'], userId: IUser['_id']) => boolean,
+	scope: string | undefined,
+	predicate: (permissionIds: IPermission['_id'][], scope: string | undefined, userId: IUser['_id']) => boolean,
 	userId?: IUser['_id'] | null,
 ): boolean => {
 	userId = userId ?? Meteor.userId();
@@ -65,17 +65,17 @@ const validatePermissions = (
 
 export const hasAllPermission = (
 	permissions: IPermission['_id'] | IPermission['_id'][],
-	scope?: IRole['scope'],
+	scope?: string,
 ): boolean => validatePermissions(permissions, scope, all);
 
 export const hasAtLeastOnePermission = (
 	permissions: IPermission['_id'] | IPermission['_id'][],
-	scope?: IRole['scope'],
+	scope?: string,
 ): boolean => validatePermissions(permissions, scope, atLeastOne);
 
 export const userHasAllPermission = (
 	permissions: IPermission['_id'] | IPermission['_id'][],
-	scope?: IRole['scope'],
+	scope?: string,
 	userId?: IUser['_id'] | null,
 ): boolean => validatePermissions(permissions, scope, all, userId);
 
diff --git a/app/authorization/server/functions/addUserRoles.js b/app/authorization/server/functions/addUserRoles.ts
similarity index 54%
rename from app/authorization/server/functions/addUserRoles.js
rename to app/authorization/server/functions/addUserRoles.ts
index 46302e81eb8d..dda983ff6a3c 100644
--- a/app/authorization/server/functions/addUserRoles.js
+++ b/app/authorization/server/functions/addUserRoles.ts
@@ -2,9 +2,11 @@ import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
 import { getRoles } from './getRoles';
-import { Users, Roles } from '../../../models';
+import { Users } from '../../../models/server';
+import { IRole, IUser } from '../../../../definition/IUser';
+import { Roles } from '../../../models/server/raw';
 
-export const addUserRoles = (userId, roleNames, scope) => {
+export const addUserRoles = (userId: IUser['_id'], roleNames: IRole['name'][], scope?: string): boolean => {
 	if (!userId || !roleNames) {
 		return false;
 	}
@@ -16,17 +18,19 @@ export const addUserRoles = (userId, roleNames, scope) => {
 		});
 	}
 
-	roleNames = [].concat(roleNames);
+	if (!Array.isArray(roleNames)) { // TODO: remove this check
+		roleNames = [roleNames];
+	}
+
 	const existingRoleNames = _.pluck(getRoles(), '_id');
 	const invalidRoleNames = _.difference(roleNames, existingRoleNames);
 
 	if (!_.isEmpty(invalidRoleNames)) {
 		for (const role of invalidRoleNames) {
-			Roles.createOrUpdate(role);
+			Promise.await(Roles.createOrUpdate(role));
 		}
 	}
 
-	Roles.addUserRoles(userId, roleNames, scope);
-
+	Promise.await(Roles.addUserRoles(userId, roleNames, scope));
 	return true;
 };
diff --git a/app/authorization/server/functions/getRoles.js b/app/authorization/server/functions/getRoles.js
deleted file mode 100644
index 9d20c72d29a9..000000000000
--- a/app/authorization/server/functions/getRoles.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Roles } from '../../../models';
-
-export const getRoles = () => Roles.find().fetch();
diff --git a/app/authorization/server/functions/getRoles.ts b/app/authorization/server/functions/getRoles.ts
new file mode 100644
index 000000000000..27de1000bb0a
--- /dev/null
+++ b/app/authorization/server/functions/getRoles.ts
@@ -0,0 +1,4 @@
+import { IRole } from '../../../../definition/IUser';
+import { Roles } from '../../../models/server/raw';
+
+export const getRoles = (): IRole[] => Promise.await(Roles.find().toArray());
diff --git a/app/authorization/server/functions/getUsersInRole.js b/app/authorization/server/functions/getUsersInRole.js
deleted file mode 100644
index 27c369acf9ff..000000000000
--- a/app/authorization/server/functions/getUsersInRole.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Roles } from '../../../models';
-
-export const getUsersInRole = (roleName, scope, options) => Roles.findUsersInRole(roleName, scope, options);
diff --git a/app/authorization/server/functions/getUsersInRole.ts b/app/authorization/server/functions/getUsersInRole.ts
new file mode 100644
index 000000000000..8a8bcadf3dba
--- /dev/null
+++ b/app/authorization/server/functions/getUsersInRole.ts
@@ -0,0 +1,14 @@
+
+
+import { Cursor, FindOneOptions, WithoutProjection } from 'mongodb';
+
+import { IRole, IUser } from '../../../../definition/IUser';
+import { Roles } from '../../../models/server/raw';
+
+export function getUsersInRole(name: IRole['name'], scope?: string): Promise<Cursor<IUser>>;
+
+export function getUsersInRole(name: IRole['name'], scope: string | undefined, options: WithoutProjection<FindOneOptions<IUser>>): Promise<Cursor<IUser>>;
+
+export function getUsersInRole<P>(name: IRole['name'], scope: string | undefined, options: FindOneOptions<P extends IUser ? IUser : P>): Promise<Cursor<P>>;
+
+export function getUsersInRole<P>(name: IRole['name'], scope: string | undefined, options?: any | undefined): Promise<Cursor<IUser | P>> { return Roles.findUsersInRole(name, scope, options); }
diff --git a/app/authorization/server/functions/removeUserFromRoles.js b/app/authorization/server/functions/removeUserFromRoles.js
index b08c2778addb..a55d722bb891 100644
--- a/app/authorization/server/functions/removeUserFromRoles.js
+++ b/app/authorization/server/functions/removeUserFromRoles.js
@@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
 import { getRoles } from './getRoles';
-import { Users, Roles } from '../../../models';
+import { Users } from '../../../models/server';
+import { Roles } from '../../../models/server/raw';
 
 export const removeUserFromRoles = (userId, roleNames, scope) => {
 	if (!userId || !roleNames) {
@@ -27,7 +28,7 @@ export const removeUserFromRoles = (userId, roleNames, scope) => {
 		});
 	}
 
-	Roles.removeUserRoles(userId, roleNames, scope);
+	Promise.await(Roles.removeUserRoles(userId, roleNames, scope));
 
 	return true;
 };
diff --git a/app/authorization/server/functions/upsertPermissions.js b/app/authorization/server/functions/upsertPermissions.ts
similarity index 88%
rename from app/authorization/server/functions/upsertPermissions.js
rename to app/authorization/server/functions/upsertPermissions.ts
index a2e78302ad40..ad4c06c22471 100644
--- a/app/authorization/server/functions/upsertPermissions.js
+++ b/app/authorization/server/functions/upsertPermissions.ts
@@ -1,11 +1,11 @@
 /* eslint no-multi-spaces: 0 */
-import Roles from '../../../models/server/models/Roles';
-import Permissions from '../../../models/server/models/Permissions';
-import Settings from '../../../models/server/models/Settings';
 import { settings } from '../../../settings/server';
 import { getSettingPermissionId, CONSTANTS } from '../../lib';
+import { Permissions, Roles, Settings } from '../../../models/server/raw';
+import { IPermission } from '../../../../definition/IPermission';
+import { ISetting } from '../../../../definition/ISetting';
 
-export const upsertPermissions = () => {
+export const upsertPermissions = async (): Promise<void> => {
 	// Note:
 	// 1.if we need to create a role that can only edit channel message, but not edit group message
 	// then we can define edit-<type>-message instead of edit-message
@@ -153,8 +153,8 @@ export const upsertPermissions = () => {
 	];
 
 
-	for (const permission of permissions) {
-		Permissions.create(permission._id, permission.roles);
+	for await (const permission of permissions) {
+		await Permissions.create(permission._id, permission.roles);
 	}
 
 	const defaultRoles = [
@@ -171,29 +171,30 @@ export const upsertPermissions = () => {
 		{ name: 'livechat-manager', scope: 'Users',         description: 'Livechat Manager' },
 	];
 
-	for (const role of defaultRoles) {
-		Roles.createOrUpdate(role.name, role.scope, role.description, true, false);
+	for await (const role of defaultRoles) {
+		await Roles.createOrUpdate(role.name, role.scope as 'Users' | 'Subscriptions', role.description, true, false);
 	}
 
-	const getPreviousPermissions = function(settingId) {
-		const previousSettingPermissions = {};
+	const getPreviousPermissions = async function(settingId?: string): Promise<Record<string, IPermission>> {
+		const previousSettingPermissions: {
+			[key: string]: IPermission;
+		} = {};
 
-		const selector = { level: CONSTANTS.SETTINGS_LEVEL };
-		if (settingId) {
-			selector.settingId = settingId;
-		}
+		const selector = { level: 'settings' as const, ...settingId && { settingId } };
 
-		Permissions.find(selector).forEach(
-			function(permission) {
+		await Permissions.find(selector).forEach(
+			function(permission: IPermission) {
 				previousSettingPermissions[permission._id] = permission;
 			});
 		return previousSettingPermissions;
 	};
 
-	const createSettingPermission = function(setting, previousSettingPermissions) {
+	const createSettingPermission = async function(setting: ISetting, previousSettingPermissions: {
+		[key: string]: IPermission;
+	}): Promise<void> {
 		const permissionId = getSettingPermissionId(setting._id);
-		const permission = {
-			level: CONSTANTS.SETTINGS_LEVEL,
+		const permission: Omit<IPermission, '_id'> = {
+			level: CONSTANTS.SETTINGS_LEVEL as 'settings' | undefined,
 			// copy those setting-properties which are needed to properly publish the setting-based permissions
 			settingId: setting._id,
 			group: setting.group,
@@ -212,19 +213,19 @@ export const upsertPermissions = () => {
 			permission.sectionPermissionId = getSettingPermissionId(setting.section);
 		}
 
-		const existent = Permissions.findOne({
+		const existent = await Permissions.findOne({
 			_id: permissionId,
 			...permission,
 		}, { fields: { _id: 1 } });
 
 		if (!existent) {
 			try {
-				Permissions.upsert({ _id: permissionId }, { $set: permission });
+				await Permissions.update({ _id: permissionId }, { $set: permission }, { upsert: true });
 			} catch (e) {
 				if (!e.message.includes('E11000')) {
 					// E11000 refers to a MongoDB error that can occur when using unique indexes for upserts
 					// https://docs.mongodb.com/manual/reference/method/db.collection.update/#use-unique-indexes
-					Permissions.upsert({ _id: permissionId }, { $set: permission });
+					await Permissions.update({ _id: permissionId }, { $set: permission }, { upsert: true });
 				}
 			}
 		}
@@ -232,17 +233,17 @@ export const upsertPermissions = () => {
 		delete previousSettingPermissions[permissionId];
 	};
 
-	const createPermissionsForExistingSettings = function() {
-		const previousSettingPermissions = getPreviousPermissions();
+	const createPermissionsForExistingSettings = async function(): Promise<void> {
+		const previousSettingPermissions = await getPreviousPermissions();
 
-		Settings.findNotHidden().fetch().forEach((setting) => {
+		(await Settings.findNotHidden().toArray()).forEach((setting) => {
 			createSettingPermission(setting, previousSettingPermissions);
 		});
 
 		// remove permissions for non-existent settings
-		for (const obsoletePermission in previousSettingPermissions) {
+		for await (const obsoletePermission of Object.keys(previousSettingPermissions)) {
 			if (previousSettingPermissions.hasOwnProperty(obsoletePermission)) {
-				Permissions.remove({ _id: obsoletePermission });
+				await Permissions.deleteOne({ _id: obsoletePermission });
 			}
 		}
 	};
@@ -251,9 +252,9 @@ export const upsertPermissions = () => {
 	createPermissionsForExistingSettings();
 
 	// register a callback for settings for be create in higher-level-packages
-	settings.on('*', function([settingId]) {
-		const previousSettingPermissions = getPreviousPermissions(settingId);
-		const setting = Settings.findOneById(settingId);
+	settings.on('*', async function([settingId]) {
+		const previousSettingPermissions = await getPreviousPermissions(settingId);
+		const setting = await Settings.findOneById(settingId);
 		if (setting) {
 			if (!setting.hidden) {
 				createSettingPermission(setting, previousSettingPermissions);
diff --git a/app/authorization/server/methods/addPermissionToRole.js b/app/authorization/server/methods/addPermissionToRole.ts
similarity index 72%
rename from app/authorization/server/methods/addPermissionToRole.js
rename to app/authorization/server/methods/addPermissionToRole.ts
index 5ca74ed3dbc9..42990b114437 100644
--- a/app/authorization/server/methods/addPermissionToRole.js
+++ b/app/authorization/server/methods/addPermissionToRole.ts
@@ -1,11 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Permissions } from '../../../models/server';
+
 import { hasPermission } from '../functions/hasPermission';
 import { CONSTANTS, AuthorizationUtils } from '../../lib';
+import { Permissions } from '../../../models/server/raw';
 
 Meteor.methods({
-	'authorization:addPermissionToRole'(permissionId, role) {
+	async 'authorization:addPermissionToRole'(permissionId, role) {
 		if (AuthorizationUtils.isPermissionRestrictedForRole(permissionId, role)) {
 			throw new Meteor.Error('error-action-not-allowed', 'Permission is restricted', {
 				method: 'authorization:addPermissionToRole',
@@ -14,7 +15,14 @@ Meteor.methods({
 		}
 
 		const uid = Meteor.userId();
-		const permission = Permissions.findOneById(permissionId);
+		const permission = await Permissions.findOneById(permissionId);
+
+		if (!permission) {
+			throw new Meteor.Error('error-invalid-permission', 'Permission does not exist', {
+				method: 'authorization:addPermissionToRole',
+				action: 'Adding_permission',
+			});
+		}
 
 		if (!uid || !hasPermission(uid, 'access-permissions') || (permission.level === CONSTANTS.SETTINGS_LEVEL && !hasPermission(uid, 'access-setting-permissions'))) {
 			throw new Meteor.Error('error-action-not-allowed', 'Adding permission is not allowed', {
diff --git a/app/authorization/server/methods/addUserToRole.js b/app/authorization/server/methods/addUserToRole.ts
similarity index 84%
rename from app/authorization/server/methods/addUserToRole.js
rename to app/authorization/server/methods/addUserToRole.ts
index a7fdd21ec24d..3182d327ff47 100644
--- a/app/authorization/server/methods/addUserToRole.js
+++ b/app/authorization/server/methods/addUserToRole.ts
@@ -1,13 +1,14 @@
 import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
-import { Users, Roles } from '../../../models/server';
+import { Users } from '../../../models/server';
 import { settings } from '../../../settings/server';
 import { hasPermission } from '../functions/hasPermission';
 import { api } from '../../../../server/sdk/api';
+import { Roles } from '../../../models/server/raw';
 
 Meteor.methods({
-	'authorization:addUserToRole'(roleName, username, scope) {
+	async 'authorization:addUserToRole'(roleName, username, scope) {
 		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'access-permissions')) {
 			throw new Meteor.Error('error-action-not-allowed', 'Accessing permissions is not allowed', {
 				method: 'authorization:addUserToRole',
@@ -41,13 +42,13 @@ Meteor.methods({
 		}
 
 		// verify if user can be added to given scope
-		if (scope && !Roles.canAddUserToRole(user._id, roleName, scope)) {
+		if (scope && !await Roles.canAddUserToRole(user._id, roleName, scope)) {
 			throw new Meteor.Error('error-invalid-user', 'User is not part of given room', {
 				method: 'authorization:addUserToRole',
 			});
 		}
 
-		const add = Roles.addUserRoles(user._id, roleName, scope);
+		const add = await Roles.addUserRoles(user._id, [roleName], scope);
 
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
diff --git a/app/authorization/server/methods/deleteRole.js b/app/authorization/server/methods/deleteRole.ts
similarity index 67%
rename from app/authorization/server/methods/deleteRole.js
rename to app/authorization/server/methods/deleteRole.ts
index 8613e1761b0a..8925942b23f3 100644
--- a/app/authorization/server/methods/deleteRole.js
+++ b/app/authorization/server/methods/deleteRole.ts
@@ -1,10 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 
-import * as Models from '../../../models/server';
+import { Roles } from '../../../models/server/raw';
 import { hasPermission } from '../functions/hasPermission';
 
 Meteor.methods({
-	'authorization:deleteRole'(roleName) {
+	async 'authorization:deleteRole'(roleName) {
 		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'access-permissions')) {
 			throw new Meteor.Error('error-action-not-allowed', 'Accessing permissions is not allowed', {
 				method: 'authorization:deleteRole',
@@ -12,7 +12,7 @@ Meteor.methods({
 			});
 		}
 
-		const role = Models.Roles.findOne(roleName);
+		const role = await Roles.findOne(roleName);
 		if (!role) {
 			throw new Meteor.Error('error-invalid-role', 'Invalid role', {
 				method: 'authorization:deleteRole',
@@ -25,16 +25,14 @@ Meteor.methods({
 			});
 		}
 
-		const roleScope = role.scope || 'Users';
-		const model = Models[roleScope];
-		const existingUsers = model && model.findUsersInRoles && model.findUsersInRoles(roleName);
+		const users = await(await Roles.findUsersInRole(roleName)).count();
 
-		if (existingUsers && existingUsers.count() > 0) {
+		if (users > 0) {
 			throw new Meteor.Error('error-role-in-use', 'Cannot delete role because it\'s in use', {
 				method: 'authorization:deleteRole',
 			});
 		}
 
-		return Models.Roles.remove(role.name);
+		return Roles.removeById(role.name);
 	},
 });
diff --git a/app/authorization/server/methods/removeRoleFromPermission.js b/app/authorization/server/methods/removeRoleFromPermission.ts
similarity index 70%
rename from app/authorization/server/methods/removeRoleFromPermission.js
rename to app/authorization/server/methods/removeRoleFromPermission.ts
index e0aa20ed34db..c31592a0ceca 100644
--- a/app/authorization/server/methods/removeRoleFromPermission.js
+++ b/app/authorization/server/methods/removeRoleFromPermission.ts
@@ -1,13 +1,18 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Permissions } from '../../../models/server';
 import { hasPermission } from '../functions/hasPermission';
 import { CONSTANTS } from '../../lib';
+import { Permissions } from '../../../models/server/raw';
 
 Meteor.methods({
-	'authorization:removeRoleFromPermission'(permissionId, role) {
+	async 'authorization:removeRoleFromPermission'(permissionId, role) {
 		const uid = Meteor.userId();
-		const permission = Permissions.findOneById(permissionId);
+		const permission = await Permissions.findOneById(permissionId);
+
+
+		if (!permission) {
+			throw new Meteor.Error('error-permission-not-found', 'Permission not found', { method: 'authorization:removeRoleFromPermission' });
+		}
 
 		if (!uid || !hasPermission(uid, 'access-permissions') || (permission.level === CONSTANTS.SETTINGS_LEVEL && !hasPermission(uid, 'access-setting-permissions'))) {
 			throw new Meteor.Error('error-action-not-allowed', 'Removing permission is not allowed', {
diff --git a/app/authorization/server/methods/removeUserFromRole.js b/app/authorization/server/methods/removeUserFromRole.js
index 9a36a8895870..d98ff825af9b 100644
--- a/app/authorization/server/methods/removeUserFromRole.js
+++ b/app/authorization/server/methods/removeUserFromRole.js
@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
-import { Roles } from '../../../models/server';
 import { settings } from '../../../settings/server';
 import { hasPermission } from '../functions/hasPermission';
 import { api } from '../../../../server/sdk/api';
+import { Roles } from '../../../models/server/raw';
 
 Meteor.methods({
-	'authorization:removeUserFromRole'(roleName, username, scope) {
+	async 'authorization:removeUserFromRole'(roleName, username, scope) {
 		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'access-permissions')) {
 			throw new Meteor.Error('error-action-not-allowed', 'Access permissions is not allowed', {
 				method: 'authorization:removeUserFromRole',
@@ -44,7 +44,7 @@ Meteor.methods({
 				},
 			}).count();
 
-			const userIsAdmin = user.roles.indexOf('admin') > -1;
+			const userIsAdmin = user.roles?.indexOf('admin') > -1;
 			if (adminCount === 1 && userIsAdmin) {
 				throw new Meteor.Error('error-action-not-allowed', 'Leaving the app without admins is not allowed', {
 					method: 'removeUserFromRole',
@@ -53,7 +53,7 @@ Meteor.methods({
 			}
 		}
 
-		const remove = Roles.removeUserRoles(user._id, roleName, scope);
+		const remove = await Roles.removeUserRoles(user._id, [roleName], scope);
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
 				type: 'removed',
diff --git a/app/authorization/server/methods/saveRole.js b/app/authorization/server/methods/saveRole.ts
similarity index 80%
rename from app/authorization/server/methods/saveRole.js
rename to app/authorization/server/methods/saveRole.ts
index 5e09f211240d..04f431ba9906 100644
--- a/app/authorization/server/methods/saveRole.js
+++ b/app/authorization/server/methods/saveRole.ts
@@ -1,12 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Roles } from '../../../models/server';
 import { settings } from '../../../settings/server';
 import { hasPermission } from '../functions/hasPermission';
 import { api } from '../../../../server/sdk/api';
+import { Roles } from '../../../models/server/raw';
 
 Meteor.methods({
-	'authorization:saveRole'(roleData) {
+	async 'authorization:saveRole'(roleData) {
 		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'access-permissions')) {
 			throw new Meteor.Error('error-action-not-allowed', 'Accessing permissions is not allowed', {
 				method: 'authorization:saveRole',
@@ -24,7 +24,7 @@ Meteor.methods({
 			roleData.scope = 'Users';
 		}
 
-		const update = Roles.createOrUpdate(roleData.name, roleData.scope, roleData.description, false, roleData.mandatory2fa);
+		const update = await Roles.createOrUpdate(roleData.name, roleData.scope, roleData.description, false, roleData.mandatory2fa);
 		if (settings.get('UI_DisplayRoles')) {
 			api.broadcast('user.roleUpdate', {
 				type: 'changed',
diff --git a/app/authorization/server/streamer/permissions/index.js b/app/authorization/server/streamer/permissions/index.js
deleted file mode 100644
index edffbdfe3e73..000000000000
--- a/app/authorization/server/streamer/permissions/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import Permissions from '../../../../models/server/models/Permissions';
-
-Meteor.methods({
-	'permissions/get'(updatedAt) {
-		// TODO: should we return this for non logged users?
-		// TODO: we could cache this collection
-
-		const records = Permissions.find().fetch();
-
-		if (updatedAt instanceof Date) {
-			return {
-				update: records.filter((record) => record._updatedAt > updatedAt),
-				remove: Permissions.trashFindDeletedAfter(
-					updatedAt,
-					{},
-					{ fields: { _id: 1, _deletedAt: 1 } },
-				).fetch(),
-			};
-		}
-
-		return records;
-	},
-});
diff --git a/app/authorization/server/streamer/permissions/index.ts b/app/authorization/server/streamer/permissions/index.ts
new file mode 100644
index 000000000000..5494f8f1f78e
--- /dev/null
+++ b/app/authorization/server/streamer/permissions/index.ts
@@ -0,0 +1,28 @@
+import { Meteor } from 'meteor/meteor';
+import { check, Match } from 'meteor/check';
+
+import { Permissions } from '../../../../models/server/raw';
+
+Meteor.methods({
+	async 'permissions/get'(updatedAt: Date) {
+		check(updatedAt, Match.Maybe(Date));
+
+		// TODO: should we return this for non logged users?
+		// TODO: we could cache this collection
+
+		const records = await Permissions.find(updatedAt && { _updatedAt: { $gt: updatedAt } }).toArray();
+
+		if (updatedAt instanceof Date) {
+			return {
+				update: records,
+				remove: await Permissions.trashFindDeletedAfter(
+					updatedAt,
+					{},
+					{ fields: { _id: 1, _deletedAt: 1 } },
+				).toArray(),
+			};
+		}
+
+		return records;
+	},
+});
diff --git a/app/autotranslate/server/permissions.js b/app/autotranslate/server/permissions.js
deleted file mode 100644
index 64ce0028fa87..000000000000
--- a/app/autotranslate/server/permissions.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import { Permissions } from '../../models';
-
-Meteor.startup(() => {
-	if (Permissions) {
-		if (!Permissions.findOne({ _id: 'auto-translate' })) {
-			Permissions.insert({ _id: 'auto-translate', roles: ['admin'] });
-		}
-	}
-});
diff --git a/app/autotranslate/server/permissions.ts b/app/autotranslate/server/permissions.ts
new file mode 100644
index 000000000000..5ce05e8f1ef7
--- /dev/null
+++ b/app/autotranslate/server/permissions.ts
@@ -0,0 +1,9 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Permissions } from '../../models/server/raw';
+
+Meteor.startup(async () => {
+	if (!await Permissions.findOne({ _id: 'auto-translate' })) {
+		Permissions.create('auto-translate', ['admin']);
+	}
+});
diff --git a/app/cas/server/cas_server.js b/app/cas/server/cas_server.js
index 646e87a8f053..cc569eeab441 100644
--- a/app/cas/server/cas_server.js
+++ b/app/cas/server/cas_server.js
@@ -10,7 +10,8 @@ import CAS from 'cas';
 
 import { logger } from './cas_rocketchat';
 import { settings } from '../../settings';
-import { Rooms, CredentialTokens } from '../../models/server';
+import { Rooms } from '../../models/server';
+import { CredentialTokens } from '../../models/server/raw';
 import { _setRealName } from '../../lib';
 import { createRoom } from '../../lib/server/functions/createRoom';
 
@@ -43,7 +44,7 @@ const casTicket = function(req, token, callback) {
 		service: `${ appUrl }/_cas/${ token }`,
 	});
 
-	cas.validate(ticketId, Meteor.bindEnvironment(function(err, status, username, details) {
+	cas.validate(ticketId, Meteor.bindEnvironment(async function(err, status, username, details) {
 		if (err) {
 			logger.error(`error when trying to validate: ${ err.message }`);
 		} else if (status) {
@@ -54,11 +55,11 @@ const casTicket = function(req, token, callback) {
 			if (details && details.attributes) {
 				_.extend(user_info, { attributes: details.attributes });
 			}
-			CredentialTokens.create(token, user_info);
+			await CredentialTokens.create(token, user_info);
 		} else {
 			logger.error(`Unable to validate ticket: ${ ticketId }`);
 		}
-		// logger.debug("Receveied response: " + JSON.stringify(details, null , 4));
+		// logger.debug("Received response: " + JSON.stringify(details, null , 4));
 
 		callback();
 	}));
@@ -114,7 +115,8 @@ Accounts.registerLoginHandler(function(options) {
 		return undefined;
 	}
 
-	const credentials = CredentialTokens.findOneById(options.cas.credentialToken);
+	// TODO: Sync wrapper due to the chain conversion to async models
+	const credentials = Promise.await(CredentialTokens.findOneNotExpiredById(options.cas.credentialToken));
 	if (credentials === undefined) {
 		throw new Meteor.Error(Accounts.LoginCancelledError.numericError,
 			'no matching login attempt found');
diff --git a/app/channel-settings/server/functions/saveRoomName.js b/app/channel-settings/server/functions/saveRoomName.js
index 5d3197d133b3..0cc31cfa77b4 100644
--- a/app/channel-settings/server/functions/saveRoomName.js
+++ b/app/channel-settings/server/functions/saveRoomName.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Rooms, Messages, Subscriptions, Integrations } from '../../../models/server';
+import { Rooms, Messages, Subscriptions } from '../../../models/server';
+import { Integrations } from '../../../models/server/raw';
 import { roomTypes, getValidRoomName } from '../../../utils/server';
 import { callbacks } from '../../../callbacks/server';
 import { checkUsernameAvailability } from '../../../lib/server/functions';
@@ -19,7 +20,7 @@ const updateRoomName = (rid, displayName, isDiscussion) => {
 	return Rooms.setNameById(rid, slugifiedRoomName, displayName) && Subscriptions.updateNameAndAlertByRoomId(rid, slugifiedRoomName, displayName);
 };
 
-export const saveRoomName = function(rid, displayName, user, sendMessage = true) {
+export async function saveRoomName(rid, displayName, user, sendMessage = true) {
 	const room = Rooms.findOneById(rid);
 	if (roomTypes.getConfig(room.t).preventRenaming()) {
 		throw new Meteor.Error('error-not-allowed', 'Not allowed', {
@@ -35,10 +36,10 @@ export const saveRoomName = function(rid, displayName, user, sendMessage = true)
 		return;
 	}
 
-	Integrations.updateRoomName(room.name, displayName);
+	await Integrations.updateRoomName(room.name, displayName);
 	if (sendMessage) {
 		Messages.createRoomRenamedWithRoomIdRoomNameAndUser(rid, displayName, user);
 	}
 	callbacks.run('afterRoomNameChange', { rid, name: displayName, oldName: room.name });
 	return displayName;
-};
+}
diff --git a/app/channel-settings/server/methods/saveRoomSettings.js b/app/channel-settings/server/methods/saveRoomSettings.js
index 811c492fb70d..59c0bb239f79 100644
--- a/app/channel-settings/server/methods/saveRoomSettings.js
+++ b/app/channel-settings/server/methods/saveRoomSettings.js
@@ -128,7 +128,7 @@ const validators = {
 
 const settingSavers = {
 	roomName({ value, rid, user, room }) {
-		if (!saveRoomName(rid, value, user)) {
+		if (!Promise.await(saveRoomName(rid, value, user))) {
 			return;
 		}
 
@@ -231,13 +231,13 @@ const settingSavers = {
 	favorite({ value, rid }) {
 		Rooms.saveFavoriteById(rid, value.favorite, value.defaultValue);
 	},
-	roomAvatar({ value, rid, user }) {
-		setRoomAvatar(rid, value, user);
+	async roomAvatar({ value, rid, user }) {
+		await setRoomAvatar(rid, value, user);
 	},
 };
 
 Meteor.methods({
-	saveRoomSettings(rid, settings, value) {
+	async saveRoomSettings(rid, settings, value) {
 		const userId = Meteor.userId();
 
 		if (!userId) {
@@ -313,10 +313,10 @@ Meteor.methods({
 		});
 
 		// saving data
-		Object.keys(settings).forEach((setting) => {
+		for await (const setting of Object.keys(settings)) {
 			const value = settings[setting];
 
-			const saver = settingSavers[setting];
+			const saver = await settingSavers[setting];
 			if (saver) {
 				saver({
 					value,
@@ -325,7 +325,7 @@ Meteor.methods({
 					user,
 				});
 			}
-		});
+		}
 
 		Meteor.defer(function() {
 			const room = Rooms.findOneById(rid);
diff --git a/app/cloud/server/functions/buildRegistrationData.js b/app/cloud/server/functions/buildRegistrationData.js
index d8ecff67687f..5346558e23ab 100644
--- a/app/cloud/server/functions/buildRegistrationData.js
+++ b/app/cloud/server/functions/buildRegistrationData.js
@@ -1,10 +1,11 @@
 import { settings } from '../../../settings/server';
-import { Users, Statistics } from '../../../models/server';
+import { Users } from '../../../models/server';
+import { Statistics } from '../../../models/server/raw';
 import { statistics } from '../../../statistics';
 import { LICENSE_VERSION } from '../license';
 
-export function buildWorkspaceRegistrationData() {
-	const stats = Statistics.findLast() || statistics.get();
+export async function buildWorkspaceRegistrationData() {
+	const stats = await Statistics.findLast() || statistics.get();
 
 	const address = settings.get('Site_Url');
 	const siteName = settings.get('Site_Name');
diff --git a/app/cloud/server/functions/startRegisterWorkspace.js b/app/cloud/server/functions/startRegisterWorkspace.js
index bb533c79c580..2f9e4f90b789 100644
--- a/app/cloud/server/functions/startRegisterWorkspace.js
+++ b/app/cloud/server/functions/startRegisterWorkspace.js
@@ -7,18 +7,17 @@ import { Settings } from '../../../models';
 import { buildWorkspaceRegistrationData } from './buildRegistrationData';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 
-
-export function startRegisterWorkspace(resend = false) {
+export async function startRegisterWorkspace(resend = false) {
 	const { workspaceRegistered, connectToCloud } = retrieveRegistrationStatus();
 	if ((workspaceRegistered && connectToCloud) || process.env.TEST_MODE) {
-		syncWorkspace(true);
+		await syncWorkspace(true);
 
 		return true;
 	}
 
 	Settings.updateValueById('Register_Server', true);
 
-	const regInfo = buildWorkspaceRegistrationData();
+	const regInfo = await buildWorkspaceRegistrationData();
 
 	const cloudUrl = settings.get('Cloud_Url');
 
diff --git a/app/cloud/server/functions/syncWorkspace.js b/app/cloud/server/functions/syncWorkspace.js
index 03f67acf4a4b..1b1021402e25 100644
--- a/app/cloud/server/functions/syncWorkspace.js
+++ b/app/cloud/server/functions/syncWorkspace.js
@@ -10,13 +10,13 @@ import { getAndCreateNpsSurvey } from '../../../../server/services/nps/getAndCre
 import { NPS, Banner } from '../../../../server/sdk';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 
-export function syncWorkspace(reconnectCheck = false) {
+export async function syncWorkspace(reconnectCheck = false) {
 	const { workspaceRegistered, connectToCloud } = retrieveRegistrationStatus();
 	if (!workspaceRegistered || (!connectToCloud && !reconnectCheck)) {
 		return false;
 	}
 
-	const info = buildWorkspaceRegistrationData();
+	const info = await buildWorkspaceRegistrationData();
 
 	const workspaceUrl = settings.get('Cloud_Workspace_Registration_Client_Uri');
 
@@ -64,11 +64,11 @@ export function syncWorkspace(reconnectCheck = false) {
 
 		const startAt = new Date(data.nps.startAt);
 
-		Promise.await(NPS.create({
+		await NPS.create({
 			npsId,
 			startAt,
 			expireAt: new Date(expireAt),
-		}));
+		});
 
 		const now = new Date();
 
@@ -79,19 +79,19 @@ export function syncWorkspace(reconnectCheck = false) {
 
 	// add banners
 	if (data.banners) {
-		for (const banner of data.banners) {
+		for await (const banner of data.banners) {
 			const {
 				createdAt,
 				expireAt,
 				startAt,
 			} = banner;
 
-			Promise.await(Banner.create({
+			await Banner.create({
 				...banner,
 				createdAt: new Date(createdAt),
 				expireAt: new Date(expireAt),
 				startAt: new Date(startAt),
-			}));
+			});
 		}
 	}
 
diff --git a/app/cloud/server/methods.js b/app/cloud/server/methods.js
index 7723566601f5..83847711a603 100644
--- a/app/cloud/server/methods.js
+++ b/app/cloud/server/methods.js
@@ -26,7 +26,7 @@ Meteor.methods({
 
 		return retrieveRegistrationStatus();
 	},
-	'cloud:getWorkspaceRegisterData'() {
+	async 'cloud:getWorkspaceRegisterData'() {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'cloud:getWorkspaceRegisterData' });
 		}
@@ -35,9 +35,9 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'cloud:getWorkspaceRegisterData' });
 		}
 
-		return Buffer.from(JSON.stringify(buildWorkspaceRegistrationData())).toString('base64');
+		return Buffer.from(JSON.stringify(await buildWorkspaceRegistrationData())).toString('base64');
 	},
-	'cloud:registerWorkspace'() {
+	async 'cloud:registerWorkspace'() {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'cloud:startRegister' });
 		}
@@ -48,7 +48,7 @@ Meteor.methods({
 
 		return startRegisterWorkspace();
 	},
-	'cloud:syncWorkspace'() {
+	async 'cloud:syncWorkspace'() {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'cloud:syncWorkspace' });
 		}
diff --git a/app/crowd/server/crowd.js b/app/crowd/server/crowd.js
index d5b4b5b97ef3..dba130ef489e 100644
--- a/app/crowd/server/crowd.js
+++ b/app/crowd/server/crowd.js
@@ -208,7 +208,7 @@ export class CROWD {
 					if (settings.get('CROWD_Remove_Orphaned_Users') === true) {
 						logger.info('Removing user:', crowd_username);
 						Meteor.defer(function() {
-							deleteUser(user._id);
+							Promise.await(deleteUser(user._id));
 							logger.info('User removed:', crowd_username);
 						});
 					}
diff --git a/app/custom-sounds/server/methods/deleteCustomSound.js b/app/custom-sounds/server/methods/deleteCustomSound.js
index b72c852bacfc..d168fac12d1d 100644
--- a/app/custom-sounds/server/methods/deleteCustomSound.js
+++ b/app/custom-sounds/server/methods/deleteCustomSound.js
@@ -1,16 +1,16 @@
 import { Meteor } from 'meteor/meteor';
 
-import { CustomSounds } from '../../../models';
+import { CustomSounds } from '../../../models/server/raw';
 import { hasPermission } from '../../../authorization';
 import { Notifications } from '../../../notifications';
 import { RocketChatFileCustomSoundsInstance } from '../startup/custom-sounds';
 
 Meteor.methods({
-	deleteCustomSound(_id) {
+	async deleteCustomSound(_id) {
 		let sound = null;
 
 		if (hasPermission(this.userId, 'manage-sounds')) {
-			sound = CustomSounds.findOneById(_id);
+			sound = await CustomSounds.findOneById(_id);
 		} else {
 			throw new Meteor.Error('not_authorized');
 		}
@@ -20,7 +20,7 @@ Meteor.methods({
 		}
 
 		RocketChatFileCustomSoundsInstance.deleteFile(`${ sound._id }.${ sound.extension }`);
-		CustomSounds.removeById(_id);
+		await CustomSounds.removeById(_id);
 		Notifications.notifyAll('deleteCustomSound', { soundData: sound });
 
 		return true;
diff --git a/app/custom-sounds/server/methods/insertOrUpdateSound.js b/app/custom-sounds/server/methods/insertOrUpdateSound.js
index d3fe25e0173b..b1fa7c749747 100644
--- a/app/custom-sounds/server/methods/insertOrUpdateSound.js
+++ b/app/custom-sounds/server/methods/insertOrUpdateSound.js
@@ -3,12 +3,12 @@ import s from 'underscore.string';
 import { check } from 'meteor/check';
 
 import { hasPermission } from '../../../authorization';
-import { CustomSounds } from '../../../models';
+import { CustomSounds } from '../../../models/server/raw';
 import { Notifications } from '../../../notifications';
 import { RocketChatFileCustomSoundsInstance } from '../startup/custom-sounds';
 
 Meteor.methods({
-	insertOrUpdateSound(soundData) {
+	async insertOrUpdateSound(soundData) {
 		if (!hasPermission(this.userId, 'manage-sounds')) {
 			throw new Meteor.Error('not_authorized');
 		}
@@ -34,9 +34,9 @@ Meteor.methods({
 
 		if (soundData._id) {
 			check(soundData._id, String);
-			matchingResults = CustomSounds.findByNameExceptId(soundData.name, soundData._id).fetch();
+			matchingResults = await CustomSounds.findByNameExceptId(soundData.name, soundData._id).toArray();
 		} else {
-			matchingResults = CustomSounds.findByName(soundData.name).fetch();
+			matchingResults = await CustomSounds.findByName(soundData.name).toArray();
 		}
 
 		if (matchingResults.length > 0) {
@@ -50,7 +50,7 @@ Meteor.methods({
 				extension: soundData.extension,
 			};
 
-			const _id = CustomSounds.create(createSound);
+			const _id = await (await CustomSounds.create(createSound)).insertedId;
 			createSound._id = _id;
 
 			return _id;
@@ -61,7 +61,7 @@ Meteor.methods({
 		}
 
 		if (soundData.name !== soundData.previousName) {
-			CustomSounds.setName(soundData._id, soundData.name);
+			await CustomSounds.setName(soundData._id, soundData.name);
 			Notifications.notifyAll('updateCustomSound', { soundData });
 		}
 
diff --git a/app/custom-sounds/server/methods/listCustomSounds.js b/app/custom-sounds/server/methods/listCustomSounds.js
index 90bf6db20435..475da52286be 100644
--- a/app/custom-sounds/server/methods/listCustomSounds.js
+++ b/app/custom-sounds/server/methods/listCustomSounds.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 
-import { CustomSounds } from '../../../models';
+import { CustomSounds } from '../../../models/server/raw';
 
 Meteor.methods({
-	listCustomSounds() {
-		return CustomSounds.find({}).fetch();
+	async listCustomSounds() {
+		return CustomSounds.find({}).toArray();
 	},
 });
diff --git a/app/discussion/server/permissions.js b/app/discussion/server/permissions.ts
similarity index 87%
rename from app/discussion/server/permissions.js
rename to app/discussion/server/permissions.ts
index 3d54e4c66b16..da3ac2ee2290 100644
--- a/app/discussion/server/permissions.js
+++ b/app/discussion/server/permissions.ts
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Permissions } from '../../models';
+import { Permissions } from '../../models/server/raw';
+
 
 Meteor.startup(() => {
 	// Add permissions for discussion
diff --git a/app/emoji-custom/server/methods/deleteEmojiCustom.js b/app/emoji-custom/server/methods/deleteEmojiCustom.js
index 7393f245b459..2964c5ff6cd6 100644
--- a/app/emoji-custom/server/methods/deleteEmojiCustom.js
+++ b/app/emoji-custom/server/methods/deleteEmojiCustom.js
@@ -2,22 +2,22 @@ import { Meteor } from 'meteor/meteor';
 
 import { api } from '../../../../server/sdk/api';
 import { hasPermission } from '../../../authorization';
-import { EmojiCustom } from '../../../models';
+import { EmojiCustom } from '../../../models/server/raw';
 import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom';
 
 Meteor.methods({
-	deleteEmojiCustom(emojiID) {
+	async deleteEmojiCustom(emojiID) {
 		if (!hasPermission(this.userId, 'manage-emoji')) {
 			throw new Meteor.Error('not_authorized');
 		}
 
-		const emoji = EmojiCustom.findOneById(emojiID);
+		const emoji = await EmojiCustom.findOneById(emojiID);
 		if (emoji == null) {
 			throw new Meteor.Error('Custom_Emoji_Error_Invalid_Emoji', 'Invalid emoji', { method: 'deleteEmojiCustom' });
 		}
 
 		RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${ emoji.name }.${ emoji.extension }`));
-		EmojiCustom.removeById(emojiID);
+		await EmojiCustom.removeById(emojiID);
 		api.broadcast('emoji.deleteCustom', emoji);
 
 		return true;
diff --git a/app/emoji-custom/server/methods/insertOrUpdateEmoji.js b/app/emoji-custom/server/methods/insertOrUpdateEmoji.js
index b96b40b2fbd0..23843c81cec9 100644
--- a/app/emoji-custom/server/methods/insertOrUpdateEmoji.js
+++ b/app/emoji-custom/server/methods/insertOrUpdateEmoji.js
@@ -4,12 +4,12 @@ import s from 'underscore.string';
 import limax from 'limax';
 
 import { hasPermission } from '../../../authorization';
-import { EmojiCustom } from '../../../models';
+import { EmojiCustom } from '../../../models/server/raw';
 import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom';
 import { api } from '../../../../server/sdk/api';
 
 Meteor.methods({
-	insertOrUpdateEmoji(emojiData) {
+	async insertOrUpdateEmoji(emojiData) {
 		if (!hasPermission(this.userId, 'manage-emoji')) {
 			throw new Meteor.Error('not_authorized');
 		}
@@ -50,14 +50,14 @@ Meteor.methods({
 		let matchingResults = [];
 
 		if (emojiData._id) {
-			matchingResults = EmojiCustom.findByNameOrAliasExceptID(emojiData.name, emojiData._id).fetch();
-			for (const alias of emojiData.aliases) {
-				matchingResults = matchingResults.concat(EmojiCustom.findByNameOrAliasExceptID(alias, emojiData._id).fetch());
+			matchingResults = await EmojiCustom.findByNameOrAliasExceptID(emojiData.name, emojiData._id).toArray();
+			for await (const alias of emojiData.aliases) {
+				matchingResults = matchingResults.concat(await EmojiCustom.findByNameOrAliasExceptID(alias, emojiData._id).toArray());
 			}
 		} else {
-			matchingResults = EmojiCustom.findByNameOrAlias(emojiData.name).fetch();
-			for (const alias of emojiData.aliases) {
-				matchingResults = matchingResults.concat(EmojiCustom.findByNameOrAlias(alias).fetch());
+			matchingResults = await EmojiCustom.findByNameOrAlias(emojiData.name).toArray();
+			for await (const alias of emojiData.aliases) {
+				matchingResults = matchingResults.concat(await EmojiCustom.findByNameOrAlias(alias).toArray());
 			}
 		}
 
@@ -77,7 +77,7 @@ Meteor.methods({
 				extension: emojiData.extension,
 			};
 
-			const _id = EmojiCustom.create(createEmoji);
+			const _id = (await EmojiCustom.create(createEmoji)).insertedId;
 
 			api.broadcast('emoji.updateCustom', createEmoji);
 
@@ -90,7 +90,7 @@ Meteor.methods({
 			RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${ emojiData.previousName }.${ emojiData.extension }`));
 			RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${ emojiData.previousName }.${ emojiData.previousExtension }`));
 
-			EmojiCustom.setExtension(emojiData._id, emojiData.extension);
+			await EmojiCustom.setExtension(emojiData._id, emojiData.extension);
 		} else if (emojiData.name !== emojiData.previousName) {
 			const rs = RocketChatFileEmojiCustomInstance.getFileWithReadStream(encodeURIComponent(`${ emojiData.previousName }.${ emojiData.previousExtension }`));
 			if (rs !== null) {
@@ -104,13 +104,13 @@ Meteor.methods({
 		}
 
 		if (emojiData.name !== emojiData.previousName) {
-			EmojiCustom.setName(emojiData._id, emojiData.name);
+			await EmojiCustom.setName(emojiData._id, emojiData.name);
 		}
 
 		if (emojiData.aliases) {
-			EmojiCustom.setAliases(emojiData._id, emojiData.aliases);
+			await EmojiCustom.setAliases(emojiData._id, emojiData.aliases);
 		} else {
-			EmojiCustom.setAliases(emojiData._id, []);
+			await EmojiCustom.setAliases(emojiData._id, []);
 		}
 
 		api.broadcast('emoji.updateCustom', emojiData);
diff --git a/app/emoji-custom/server/methods/listEmojiCustom.js b/app/emoji-custom/server/methods/listEmojiCustom.js
index d06b382af85e..d66aeee1a6ad 100644
--- a/app/emoji-custom/server/methods/listEmojiCustom.js
+++ b/app/emoji-custom/server/methods/listEmojiCustom.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 
-import { EmojiCustom } from '../../../models';
+import { EmojiCustom } from '../../../models/server/raw';
 
 Meteor.methods({
-	listEmojiCustom(options = {}) {
-		return EmojiCustom.find(options).fetch();
+	async listEmojiCustom(options = {}) {
+		return EmojiCustom.find(options).toArray();
 	},
 });
diff --git a/app/federation/server/endpoints/dispatch.js b/app/federation/server/endpoints/dispatch.js
index ae392ac8aac8..333a30bbeebf 100644
--- a/app/federation/server/endpoints/dispatch.js
+++ b/app/federation/server/endpoints/dispatch.js
@@ -4,12 +4,13 @@ import { API } from '../../../api/server';
 import { serverLogger } from '../lib/logger';
 import { contextDefinitions, eventTypes } from '../../../models/server/models/FederationEvents';
 import {
-	FederationRoomEvents, FederationServers,
+	FederationRoomEvents,
 	Messages,
 	Rooms,
 	Subscriptions,
 	Users,
 } from '../../../models/server';
+import { FederationServers } from '../../../models/server/raw';
 import { normalizers } from '../normalizers';
 import { deleteRoom } from '../../../lib/server/functions';
 import { Notifications } from '../../../notifications/server';
@@ -139,7 +140,7 @@ const eventHandlers = {
 
 			// Refresh the servers list
 			if (federationAltered) {
-				FederationServers.refreshServers();
+				await FederationServers.refreshServers();
 
 				// Update the room's federation property
 				Rooms.update({ _id: roomId }, { $set: { 'federation.domains': domainsAfterAdd } });
@@ -163,7 +164,7 @@ const eventHandlers = {
 			Subscriptions.removeByRoomIdAndUserId(roomId, user._id);
 
 			// Refresh the servers list
-			FederationServers.refreshServers();
+			await FederationServers.refreshServers();
 
 			// Update the room's federation property
 			Rooms.update({ _id: roomId }, { $set: { 'federation.domains': domainsAfterRemoval } });
@@ -186,7 +187,7 @@ const eventHandlers = {
 			Subscriptions.removeByRoomIdAndUserId(roomId, user._id);
 
 			// Refresh the servers list
-			FederationServers.refreshServers();
+			await FederationServers.refreshServers();
 
 			// Update the room's federation property
 			Rooms.update({ _id: roomId }, { $set: { 'federation.domains': domainsAfterRemoval } });
@@ -226,7 +227,7 @@ const eventHandlers = {
 
 					const { federation: { origin } } = denormalizedMessage;
 
-					const { upload, buffer } = getUpload(origin, denormalizedMessage.file._id);
+					const { upload, buffer } = await getUpload(origin, denormalizedMessage.file._id);
 
 					const oldUploadId = upload._id;
 
@@ -444,7 +445,7 @@ const eventHandlers = {
 };
 
 API.v1.addRoute('federation.events.dispatch', { authRequired: false, rateLimiterOptions: { numRequestsAllowed: 30, intervalTimeInMS: 1000 } }, {
-	async post() {
+	post() {
 		if (!isFederationEnabled()) {
 			return API.v1.failure('Federation not enabled');
 		}
@@ -454,7 +455,7 @@ API.v1.addRoute('federation.events.dispatch', { authRequired: false, rateLimiter
 		let payload;
 
 		try {
-			payload = decryptIfNeeded(this.request, this.bodyParams);
+			payload = Promise.await(decryptIfNeeded(this.request, this.bodyParams));
 		} catch (err) {
 			return API.v1.failure('Could not decrypt payload');
 		}
@@ -472,7 +473,7 @@ API.v1.addRoute('federation.events.dispatch', { authRequired: false, rateLimiter
 			let eventResult;
 
 			if (eventHandlers[event.type]) {
-				eventResult = await eventHandlers[event.type](event);
+				eventResult = Promise.await(eventHandlers[event.type](event));
 			}
 
 			// If there was an error handling the event, take action
@@ -480,7 +481,7 @@ API.v1.addRoute('federation.events.dispatch', { authRequired: false, rateLimiter
 				try {
 					serverLogger.debug({ msg: 'federation.events.dispatch => Event has missing parents', event });
 
-					requestEventsFromLatest(event.origin, getFederationDomain(), contextDefinitions.defineType(event), event.context, eventResult.latestEventIds);
+					Promise.await(requestEventsFromLatest(event.origin, getFederationDomain(), contextDefinitions.defineType(event), event.context, eventResult.latestEventIds));
 
 					// And stop handling the events
 					break;
diff --git a/app/federation/server/endpoints/requestFromLatest.js b/app/federation/server/endpoints/requestFromLatest.js
index cac0168c8c12..84fd69f88d3a 100644
--- a/app/federation/server/endpoints/requestFromLatest.js
+++ b/app/federation/server/endpoints/requestFromLatest.js
@@ -8,7 +8,7 @@ import { isFederationEnabled } from '../lib/isFederationEnabled';
 import { dispatchEvents } from '../handler';
 
 API.v1.addRoute('federation.events.requestFromLatest', { authRequired: false }, {
-	async post() {
+	post() {
 		if (!isFederationEnabled()) {
 			return API.v1.failure('Federation not enabled');
 		}
@@ -18,7 +18,7 @@ API.v1.addRoute('federation.events.requestFromLatest', { authRequired: false },
 		let payload;
 
 		try {
-			payload = decryptIfNeeded(this.request, this.bodyParams);
+			payload = Promise.await(decryptIfNeeded(this.request, this.bodyParams));
 		} catch (err) {
 			return API.v1.failure('Could not decrypt payload');
 		}
@@ -54,7 +54,7 @@ API.v1.addRoute('federation.events.requestFromLatest', { authRequired: false },
 		}
 
 		// Dispatch all the events, on the same request
-		dispatchEvents([fromDomain], missingEvents);
+		Promise.await(dispatchEvents([fromDomain], missingEvents));
 
 		return API.v1.success();
 	},
diff --git a/app/federation/server/endpoints/uploads.js b/app/federation/server/endpoints/uploads.js
index 7735a630f15e..a997b2aff307 100644
--- a/app/federation/server/endpoints/uploads.js
+++ b/app/federation/server/endpoints/uploads.js
@@ -1,5 +1,5 @@
 import { API } from '../../../api/server';
-import { Uploads } from '../../../models/server';
+import { Uploads } from '../../../models/server/raw';
 import { FileUpload } from '../../../file-upload/server';
 import { isFederationEnabled } from '../lib/isFederationEnabled';
 
@@ -11,7 +11,7 @@ API.v1.addRoute('federation.uploads', { authRequired: false }, {
 
 		const { upload_id } = this.requestParams();
 
-		const upload = Uploads.findOneById(upload_id);
+		const upload = Promise.await(Uploads.findOneById(upload_id));
 
 		if (!upload) {
 			return API.v1.failure('There is no such file in this server');
diff --git a/app/federation/server/functions/addUser.js b/app/federation/server/functions/addUser.js
index eebd1656260b..314b7893fbc1 100644
--- a/app/federation/server/functions/addUser.js
+++ b/app/federation/server/functions/addUser.js
@@ -1,15 +1,16 @@
 import { Meteor } from 'meteor/meteor';
 
 import * as federationErrors from './errors';
-import { FederationServers, Users } from '../../../models/server';
+import { Users } from '../../../models/server';
+import { FederationServers } from '../../../models/server/raw';
 import { getUserByUsername } from '../handler';
 
-export function addUser(query) {
+export async function addUser(query) {
 	if (!Meteor.userId()) {
 		throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'addUser' });
 	}
 
-	const user = getUserByUsername(query);
+	const user = await getUserByUsername(query);
 
 	if (!user) {
 		throw federationErrors.userNotFound(query);
@@ -22,7 +23,7 @@ export function addUser(query) {
 		userId = Users.create(user);
 
 		// Refresh the servers list
-		FederationServers.refreshServers();
+		await FederationServers.refreshServers();
 	} catch (err) {
 		// This might get called twice by the createDirectMessage method
 		// so we need to handle the situation accordingly
diff --git a/app/federation/server/functions/dashboard.js b/app/federation/server/functions/dashboard.js
index 137ef802c5dc..3f256bf3d88a 100644
--- a/app/federation/server/functions/dashboard.js
+++ b/app/federation/server/functions/dashboard.js
@@ -1,21 +1,22 @@
 import { Meteor } from 'meteor/meteor';
 
-import { FederationServers, FederationRoomEvents, Users } from '../../../models/server';
+import { FederationRoomEvents, Users } from '../../../models/server';
+import { FederationServers } from '../../../models/server/raw';
 
-export function getStatistics() {
+export async function getStatistics() {
 	const numberOfEvents = FederationRoomEvents.find().count();
 	const numberOfFederatedUsers = Users.findRemote().count();
-	const numberOfServers = FederationServers.find().count();
+	const numberOfServers = await FederationServers.find().count();
 
 	return { numberOfEvents, numberOfFederatedUsers, numberOfServers };
 }
 
-export function federationGetOverviewData() {
+export async function federationGetOverviewData() {
 	if (!Meteor.userId()) {
 		throw new Meteor.Error('not-authorized');
 	}
 
-	const { numberOfEvents, numberOfFederatedUsers, numberOfServers } = getStatistics();
+	const { numberOfEvents, numberOfFederatedUsers, numberOfServers } = await getStatistics();
 
 	return {
 		data: [{
@@ -31,12 +32,12 @@ export function federationGetOverviewData() {
 	};
 }
 
-export function federationGetServers() {
+export async function federationGetServers() {
 	if (!Meteor.userId()) {
 		throw new Meteor.Error('not-authorized');
 	}
 
-	const servers = FederationServers.find().fetch();
+	const servers = await FederationServers.find().toArray();
 
 	return {
 		data: servers,
diff --git a/app/federation/server/functions/helpers.js b/app/federation/server/functions/helpers.js
deleted file mode 100644
index 4113b6014edd..000000000000
--- a/app/federation/server/functions/helpers.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Settings, Subscriptions, Users } from '../../../models/server';
-import { STATUS_ENABLED, STATUS_REGISTERING } from '../constants';
-
-export const getNameAndDomain = (fullyQualifiedName) => fullyQualifiedName.split('@');
-export const isFullyQualified = (name) => name.indexOf('@') !== -1;
-
-export function isRegisteringOrEnabled() {
-	const status = Settings.findOneById('FEDERATION_Status');
-	return [STATUS_ENABLED, STATUS_REGISTERING].includes(status && status.value);
-}
-
-export function updateStatus(status) {
-	Settings.updateValueById('FEDERATION_Status', status);
-}
-
-export function updateEnabled(enabled) {
-	Settings.updateValueById('FEDERATION_Enabled', enabled);
-}
-
-export const checkRoomType = (room) => room.t === 'p' || room.t === 'd';
-export const checkRoomDomainsLength = (domains) => domains.length <= (process.env.FEDERATED_DOMAINS_LENGTH || 10);
-
-export const hasExternalDomain = ({ federation }) => {
-	// same test as isFederated(room)
-	if (!federation) {
-		return false;
-	}
-
-	return federation.domains
-		.some((domain) => domain !== federation.origin);
-};
-
-export const isLocalUser = ({ federation }, localDomain) =>
-	!federation || federation.origin === localDomain;
-
-export const getFederatedRoomData = (room) => {
-	let hasFederatedUser = false;
-
-	let users = null;
-	let subscriptions = null;
-
-	if (room.t === 'd') {
-		// Check if there is a federated user on this room
-		hasFederatedUser = room.usernames.some(isFullyQualified);
-	} else {
-		// Find all subscriptions of this room
-		subscriptions = Subscriptions.findByRoomIdWhenUsernameExists(room._id).fetch();
-		subscriptions = subscriptions.reduce((acc, s) => {
-			acc[s.u._id] = s;
-
-			return acc;
-		}, {});
-
-		// Get all user ids
-		const userIds = Object.keys(subscriptions);
-
-		// Load all the users
-		users = Users.findUsersWithUsernameByIds(userIds).fetch();
-
-		// Check if there is a federated user on this room
-		hasFederatedUser = users.some((u) => isFullyQualified(u.username));
-	}
-
-	return {
-		hasFederatedUser,
-		users,
-		subscriptions,
-	};
-};
diff --git a/app/federation/server/functions/helpers.ts b/app/federation/server/functions/helpers.ts
new file mode 100644
index 000000000000..e8cb5b3e5170
--- /dev/null
+++ b/app/federation/server/functions/helpers.ts
@@ -0,0 +1,77 @@
+import { IRoom, isDirectMessageRoom } from '../../../../definition/IRoom';
+import { ISubscription } from '../../../../definition/ISubscription';
+import { IRegisterUser, IUser } from '../../../../definition/IUser';
+import { Subscriptions, Users } from '../../../models/server';
+import { Settings } from '../../../models/server/raw';
+import { STATUS_ENABLED, STATUS_REGISTERING } from '../constants';
+
+export const getNameAndDomain = (fullyQualifiedName: string): string [] => fullyQualifiedName.split('@');
+
+export const isFullyQualified = (name: string): boolean => name.indexOf('@') !== -1;
+
+export async function isRegisteringOrEnabled(): Promise<boolean> {
+	const value = await Settings.getValueById('FEDERATION_Status');
+	return typeof value === 'string' && [STATUS_ENABLED, STATUS_REGISTERING].includes(value);
+}
+
+export async function updateStatus(status: string): Promise<void> {
+	await Settings.updateValueById('FEDERATION_Status', status);
+}
+
+export async function updateEnabled(enabled: boolean): Promise<void> {
+	await Settings.updateValueById('FEDERATION_Enabled', enabled);
+}
+
+export const checkRoomType = (room: IRoom): boolean => room.t === 'p' || room.t === 'd';
+export const checkRoomDomainsLength = (domains: unknown[]): boolean => domains.length <= (process.env.FEDERATED_DOMAINS_LENGTH || 10);
+
+export const hasExternalDomain = ({ federation }: { federation: { origin: string; domains: string[] } }): boolean => {
+	// same test as isFederated(room)
+	if (!federation) {
+		return false;
+	}
+
+	return federation.domains
+		.some((domain) => domain !== federation.origin);
+};
+
+export const isLocalUser = ({ federation }: { federation: { origin: string } }, localDomain: string): boolean =>
+	!federation || federation.origin === localDomain;
+
+export const getFederatedRoomData = (room: IRoom): {
+	hasFederatedUser: boolean;
+	users: IUser[];
+	subscriptions: { [k: string]: ISubscription } | undefined;
+} => {
+	if (isDirectMessageRoom(room)) {
+		// Check if there is a federated user on this room
+
+		return {
+			users: [],
+			hasFederatedUser: room.usernames.some(isFullyQualified),
+			subscriptions: undefined,
+		};
+	}
+
+	// Find all subscriptions of this room
+	const s = Subscriptions.findByRoomIdWhenUsernameExists(room._id).fetch() as ISubscription[];
+	const subscriptions = s.reduce((acc, s) => {
+		acc[s.u._id] = s;
+		return acc;
+	}, {} as { [k: string]: ISubscription });
+
+	// Get all user ids
+	const userIds = Object.keys(subscriptions);
+
+	// Load all the users
+	const users: IRegisterUser[] = Users.findUsersWithUsernameByIds(userIds).fetch();
+
+	// Check if there is a federated user on this room
+	const hasFederatedUser = users.some((u) => isFullyQualified(u.username));
+
+	return {
+		hasFederatedUser,
+		users,
+		subscriptions,
+	};
+};
diff --git a/app/federation/server/handler/index.js b/app/federation/server/handler/index.js
index 7827ddf063a7..46aec0b7dcea 100644
--- a/app/federation/server/handler/index.js
+++ b/app/federation/server/handler/index.js
@@ -5,7 +5,7 @@ import { clientLogger } from '../lib/logger';
 import { isFederationEnabled } from '../lib/isFederationEnabled';
 import { federationRequestToPeer } from '../lib/http';
 
-export function federationSearchUsers(query) {
+export async function federationSearchUsers(query) {
 	if (!isFederationEnabled()) {
 		throw disabled('client.searchUsers');
 	}
@@ -16,12 +16,12 @@ export function federationSearchUsers(query) {
 
 	const uri = `/api/v1/federation.users.search?${ qs.stringify({ username, domain: peerDomain }) }`;
 
-	const { data: { users } } = federationRequestToPeer('GET', peerDomain, uri);
+	const { data: { users } } = await federationRequestToPeer('GET', peerDomain, uri);
 
 	return users;
 }
 
-export function getUserByUsername(query) {
+export async function getUserByUsername(query) {
 	if (!isFederationEnabled()) {
 		throw disabled('client.searchUsers');
 	}
@@ -32,12 +32,12 @@ export function getUserByUsername(query) {
 
 	const uri = `/api/v1/federation.users.getByUsername?${ qs.stringify({ username }) }`;
 
-	const { data: { user } } = federationRequestToPeer('GET', peerDomain, uri);
+	const { data: { user } } = await federationRequestToPeer('GET', peerDomain, uri);
 
 	return user;
 }
 
-export function requestEventsFromLatest(domain, fromDomain, contextType, contextQuery, latestEventIds) {
+export async function requestEventsFromLatest(domain, fromDomain, contextType, contextQuery, latestEventIds) {
 	if (!isFederationEnabled()) {
 		throw disabled('client.requestEventsFromLatest');
 	}
@@ -46,11 +46,11 @@ export function requestEventsFromLatest(domain, fromDomain, contextType, context
 
 	const uri = '/api/v1/federation.events.requestFromLatest';
 
-	federationRequestToPeer('POST', domain, uri, { fromDomain, contextType, contextQuery, latestEventIds });
+	await federationRequestToPeer('POST', domain, uri, { fromDomain, contextType, contextQuery, latestEventIds });
 }
 
 
-export function dispatchEvents(domains, events) {
+export async function dispatchEvents(domains, events) {
 	if (!isFederationEnabled()) {
 		throw disabled('client.dispatchEvents');
 	}
@@ -61,17 +61,17 @@ export function dispatchEvents(domains, events) {
 
 	const uri = '/api/v1/federation.events.dispatch';
 
-	for (const domain of domains) {
-		federationRequestToPeer('POST', domain, uri, { events }, { ignoreErrors: true });
+	for await (const domain of domains) {
+		await federationRequestToPeer('POST', domain, uri, { events }, { ignoreErrors: true });
 	}
 }
 
-export function dispatchEvent(domains, event) {
-	dispatchEvents([...new Set(domains)], [event]);
+export async function dispatchEvent(domains, event) {
+	await dispatchEvents([...new Set(domains)], [event]);
 }
 
-export function getUpload(domain, fileId) {
-	const { data: { upload, buffer } } = federationRequestToPeer('GET', domain, `/api/v1/federation.uploads?${ qs.stringify({ upload_id: fileId }) }`);
+export async function getUpload(domain, fileId) {
+	const { data: { upload, buffer } } = await federationRequestToPeer('GET', domain, `/api/v1/federation.uploads?${ qs.stringify({ upload_id: fileId }) }`);
 
 	return { upload, buffer: Buffer.from(buffer) };
 }
diff --git a/app/federation/server/hooks/afterCreateDirectRoom.js b/app/federation/server/hooks/afterCreateDirectRoom.js
index ac05794e1c2e..79e6fc992836 100644
--- a/app/federation/server/hooks/afterCreateDirectRoom.js
+++ b/app/federation/server/hooks/afterCreateDirectRoom.js
@@ -41,7 +41,7 @@ async function afterCreateDirectRoom(room, extras) {
 		}));
 
 		// Dispatch the events
-		dispatchEvents(normalizedRoom.federation.domains, [genesisEvent, ...events]);
+		await dispatchEvents(normalizedRoom.federation.domains, [genesisEvent, ...events]);
 	} catch (err) {
 		await deleteRoom(room._id);
 
diff --git a/app/federation/server/hooks/afterCreateRoom.js b/app/federation/server/hooks/afterCreateRoom.js
index 75dfeeac6575..905e108740cf 100644
--- a/app/federation/server/hooks/afterCreateRoom.js
+++ b/app/federation/server/hooks/afterCreateRoom.js
@@ -47,7 +47,7 @@ export async function doAfterCreateRoom(room, users, subscriptions) {
 	const genesisEvent = await FederationRoomEvents.createGenesisEvent(getFederationDomain(), normalizedRoom);
 
 	// Dispatch the events
-	dispatchEvents(normalizedRoom.federation.domains, [genesisEvent, ...addUserEvents]);
+	await dispatchEvents(normalizedRoom.federation.domains, [genesisEvent, ...addUserEvents]);
 }
 
 async function afterCreateRoom(roomOwner, room) {
diff --git a/app/federation/server/lib/crypt.js b/app/federation/server/lib/crypt.js
index 7a231a13fb91..5a7685a2e9e0 100644
--- a/app/federation/server/lib/crypt.js
+++ b/app/federation/server/lib/crypt.js
@@ -1,19 +1,19 @@
-import { FederationKeys } from '../../../models/server';
+import { FederationKeys } from '../../../models/server/raw';
 import { getFederationDomain } from './getFederationDomain';
 import { search } from './dns';
 import { cryptLogger } from './logger';
 
-export function decrypt(data, peerKey) {
+export async function decrypt(data, peerKey) {
 	//
 	// Decrypt the payload
 	const payloadBuffer = Buffer.from(data);
 
 	// Decrypt with the peer's public key
 	try {
-		data = FederationKeys.loadKey(peerKey, 'public').decryptPublic(payloadBuffer);
+		data = (await FederationKeys.loadKey(peerKey, 'public')).decryptPublic(payloadBuffer);
 
 		// Decrypt with the local private key
-		data = FederationKeys.getPrivateKey().decrypt(data);
+		data = (await FederationKeys.getPrivateKey()).decrypt(data);
 	} catch (err) {
 		cryptLogger.error(err);
 
@@ -23,7 +23,7 @@ export function decrypt(data, peerKey) {
 	return JSON.parse(data.toString());
 }
 
-export function decryptIfNeeded(request, bodyParams) {
+export async function decryptIfNeeded(request, bodyParams) {
 	//
 	// Look for the domain that sent this event
 	const remotePeerDomain = request.headers['x-federation-domain'];
@@ -48,17 +48,17 @@ export function decryptIfNeeded(request, bodyParams) {
 	return decrypt(bodyParams, peerKey);
 }
 
-export function encrypt(data, peerKey) {
+export async function encrypt(data, peerKey) {
 	if (!data) {
 		return data;
 	}
 
 	try {
 		// Encrypt with the peer's public key
-		data = FederationKeys.loadKey(peerKey, 'public').encrypt(data);
+		data = (await FederationKeys.loadKey(peerKey, 'public')).encrypt(data);
 
 		// Encrypt with the local private key
-		return FederationKeys.getPrivateKey().encryptPrivate(data);
+		return (await FederationKeys.getPrivateKey()).encryptPrivate(data);
 	} catch (err) {
 		cryptLogger.error(err);
 
diff --git a/app/federation/server/lib/dns.js b/app/federation/server/lib/dns.js
index 0c4e2f348e1b..0080ddae625b 100644
--- a/app/federation/server/lib/dns.js
+++ b/app/federation/server/lib/dns.js
@@ -17,12 +17,12 @@ const memoizedDnsResolveTXT = mem(dnsResolveTXT, { maxAge: cacheMaxAge });
 
 const hubUrl = process.env.NODE_ENV === 'development' ? 'http://localhost:8080' : 'https://hub.rocket.chat';
 
-export function registerWithHub(peerDomain, url, publicKey) {
+export async function registerWithHub(peerDomain, url, publicKey) {
 	const body = { domain: peerDomain, url, public_key: publicKey };
 
 	try {
 		// If there is no DNS entry for that, get from the Hub
-		federationRequest('POST', `${ hubUrl }/api/v1/peers`, body);
+		await federationRequest('POST', `${ hubUrl }/api/v1/peers`, body);
 
 		return true;
 	} catch (err) {
@@ -32,12 +32,12 @@ export function registerWithHub(peerDomain, url, publicKey) {
 	}
 }
 
-export function searchHub(peerDomain) {
+export async function searchHub(peerDomain) {
 	try {
 		dnsLogger.debug(`searchHub: peerDomain=${ peerDomain }`);
 
 		// If there is no DNS entry for that, get from the Hub
-		const { data: { peer } } = federationRequest('GET', `${ hubUrl }/api/v1/peers?search=${ peerDomain }`);
+		const { data: { peer } } = await federationRequest('GET', `${ hubUrl }/api/v1/peers?search=${ peerDomain }`);
 
 		if (!peer) {
 			dnsLogger.debug(`searchHub: could not find peerDomain=${ peerDomain }`);
diff --git a/app/federation/server/lib/http.js b/app/federation/server/lib/http.js
index 542a2d32ef9e..e18d09b8e86d 100644
--- a/app/federation/server/lib/http.js
+++ b/app/federation/server/lib/http.js
@@ -6,14 +6,14 @@ import { getFederationDomain } from './getFederationDomain';
 import { search } from './dns';
 import { encrypt } from './crypt';
 
-export function federationRequest(method, url, body, headers, peerKey = null) {
+export async function federationRequest(method, url, body, headers, peerKey = null) {
 	let data = null;
 
 	if ((method === 'POST' || method === 'PUT') && body) {
 		data = EJSON.toJSONValue(body);
 
 		if (peerKey) {
-			data = encrypt(data, peerKey);
+			data = await encrypt(data, peerKey);
 		}
 	}
 
@@ -22,7 +22,7 @@ export function federationRequest(method, url, body, headers, peerKey = null) {
 	return MeteorHTTP.call(method, url, { data, timeout: 2000, headers: { ...headers, 'x-federation-domain': getFederationDomain() } });
 }
 
-export function federationRequestToPeer(method, peerDomain, uri, body, options = {}) {
+export async function federationRequestToPeer(method, peerDomain, uri, body, options = {}) {
 	const ignoreErrors = peerDomain === getFederationDomain() ? false : options.ignoreErrors;
 
 	const { url: baseUrl, publicKey } = search(peerDomain);
@@ -39,7 +39,7 @@ export function federationRequestToPeer(method, peerDomain, uri, body, options =
 	try {
 		httpLogger.debug({ msg: 'federationRequestToPeer', url: `${ baseUrl }${ uri }` });
 
-		result = federationRequest(method, `${ baseUrl }${ uri }`, body, options.headers || {}, peerKey);
+		result = await federationRequest(method, `${ baseUrl }${ uri }`, body, options.headers || {}, peerKey);
 	} catch (err) {
 		httpLogger.error({ msg: `${ ignoreErrors ? '[IGNORED] ' : '' }Error`, err });
 
diff --git a/app/federation/server/startup/generateKeys.js b/app/federation/server/startup/generateKeys.js
index 012cdd0b48f4..32eaacc30418 100644
--- a/app/federation/server/startup/generateKeys.js
+++ b/app/federation/server/startup/generateKeys.js
@@ -1,6 +1,8 @@
-import { FederationKeys } from '../../../models/server';
+import { FederationKeys } from '../../../models/server/raw';
 
 // Create key pair if needed
-if (!FederationKeys.getPublicKey()) {
-	FederationKeys.generateKeys();
-}
+(async () => {
+	if (!await FederationKeys.getPublicKey()) {
+		await FederationKeys.generateKeys();
+	}
+})();
diff --git a/app/federation/server/startup/settings.ts b/app/federation/server/startup/settings.ts
index cfa7fda19e6a..36ade9e70eeb 100644
--- a/app/federation/server/startup/settings.ts
+++ b/app/federation/server/startup/settings.ts
@@ -7,11 +7,11 @@ import { getFederationDiscoveryMethod } from '../lib/getFederationDiscoveryMetho
 import { registerWithHub } from '../lib/dns';
 import { enableCallbacks, disableCallbacks } from '../lib/callbacks';
 import { setupLogger } from '../lib/logger';
-import { FederationKeys } from '../../../models/server';
+import { FederationKeys } from '../../../models/server/raw';
 import { STATUS_ENABLED, STATUS_REGISTERING, STATUS_ERROR_REGISTERING, STATUS_DISABLED } from '../constants';
 
-Meteor.startup(function() {
-	const federationPublicKey = FederationKeys.getPublicKeyString();
+Meteor.startup(async function() {
+	const federationPublicKey = await FederationKeys.getPublicKeyString();
 
 	settingsRegistry.addGroup('Federation', function() {
 		this.add('FEDERATION_Enabled', false, {
@@ -36,7 +36,7 @@ Meteor.startup(function() {
 			// disableReset: true,
 		});
 
-		this.add('FEDERATION_Public_Key', federationPublicKey, {
+		this.add('FEDERATION_Public_Key', federationPublicKey || '', {
 			readonly: true,
 			type: 'string',
 			multiline: true,
@@ -65,26 +65,26 @@ Meteor.startup(function() {
 	});
 });
 
-const updateSettings = function(): void {
+const updateSettings = async function(): Promise<void> {
 	// Get the key pair
 
-	if (getFederationDiscoveryMethod() === 'hub' && !isRegisteringOrEnabled()) {
+	if (getFederationDiscoveryMethod() === 'hub' && !Promise.await(isRegisteringOrEnabled())) {
 		// Register with hub
 		try {
-			updateStatus(STATUS_REGISTERING);
+			await updateStatus(STATUS_REGISTERING);
 
-			registerWithHub(getFederationDomain(), settings.get('Site_Url'), FederationKeys.getPublicKeyString());
+			await registerWithHub(getFederationDomain(), settings.get('Site_Url'), await FederationKeys.getPublicKeyString());
 
-			updateStatus(STATUS_ENABLED);
+			await updateStatus(STATUS_ENABLED);
 		} catch (err) {
 			// Disable federation
-			updateEnabled(false);
+			await updateEnabled(false);
 
-			updateStatus(STATUS_ERROR_REGISTERING);
+			await updateStatus(STATUS_ERROR_REGISTERING);
 		}
-	} else {
-		updateStatus(STATUS_ENABLED);
+		return;
 	}
+	await updateStatus(STATUS_ENABLED);
 };
 
 // Add settings listeners
@@ -92,11 +92,11 @@ settings.watch('FEDERATION_Enabled', function enableOrDisable(value) {
 	setupLogger.info(`Federation is ${ value ? 'enabled' : 'disabled' }`);
 
 	if (value) {
-		updateSettings();
+		Promise.await(updateSettings());
 
 		enableCallbacks();
 	} else {
-		updateStatus(STATUS_DISABLED);
+		Promise.await(updateStatus(STATUS_DISABLED));
 
 		disableCallbacks();
 	}
diff --git a/app/file-upload/server/lib/FileUpload.js b/app/file-upload/server/lib/FileUpload.js
index aa8d49ab408e..d361ed3e2294 100644
--- a/app/file-upload/server/lib/FileUpload.js
+++ b/app/file-upload/server/lib/FileUpload.js
@@ -2,6 +2,7 @@ import fs from 'fs';
 import stream from 'stream';
 
 import { Meteor } from 'meteor/meteor';
+import { Mongo } from 'meteor/mongo';
 import streamBuffers from 'stream-buffers';
 import Future from 'fibers/future';
 import sharp from 'sharp';
@@ -13,9 +14,7 @@ import filesize from 'filesize';
 import { AppsEngineException } from '@rocket.chat/apps-engine/definition/exceptions';
 
 import { settings } from '../../../settings/server';
-import Uploads from '../../../models/server/models/Uploads';
-import UserDataFiles from '../../../models/server/models/UserDataFiles';
-import Avatars from '../../../models/server/models/Avatars';
+import { Avatars, UserDataFiles, Uploads } from '../../../models/server/raw';
 import Users from '../../../models/server/models/Users';
 import Rooms from '../../../models/server/models/Rooms';
 import Settings from '../../../models/server/models/Settings';
@@ -41,6 +40,9 @@ settings.watch('FileUpload_MaxFileSize', function(value) {
 	}
 });
 
+const AvatarModel = new Mongo.Collection(Avatars.col.collectionName);
+const UserDataFilesModel = new Mongo.Collection(UserDataFiles.col.collectionName);
+const UploadsModel = new Mongo.Collection(Uploads.col.collectionName);
 
 export const FileUpload = {
 	handlers: {},
@@ -139,7 +141,7 @@ export const FileUpload = {
 
 	defaultUploads() {
 		return {
-			collection: Uploads.model,
+			collection: UploadsModel,
 			filter: new UploadFS.Filter({
 				onCheck: FileUpload.validateFileUpload,
 			}),
@@ -161,7 +163,7 @@ export const FileUpload = {
 
 	defaultAvatars() {
 		return {
-			collection: Avatars.model,
+			collection: AvatarModel,
 			filter: new UploadFS.Filter({
 				onCheck: FileUpload.validateAvatarUpload,
 			}),
@@ -176,7 +178,7 @@ export const FileUpload = {
 
 	defaultUserDataFiles() {
 		return {
-			collection: UserDataFiles.model,
+			collection: UserDataFilesModel,
 			getPath(file) {
 				return `${ settings.get('uniqueID') }/uploads/userData/${ file.userId }`;
 			},
@@ -254,7 +256,7 @@ export const FileUpload = {
 	},
 
 	resizeImagePreview(file) {
-		file = Uploads.findOneById(file._id);
+		file = Promise.await(Uploads.findOneById(file._id));
 		file = FileUpload.addExtensionTo(file);
 		const image = FileUpload.getStore('Uploads')._store.getReadStream(file._id, file);
 
@@ -279,7 +281,7 @@ export const FileUpload = {
 			return;
 		}
 
-		file = Uploads.findOneById(file._id);
+		file = Promise.await(Uploads.findOneById(file._id));
 		file = FileUpload.addExtensionTo(file);
 		const store = FileUpload.getStore('Uploads');
 		const image = store._store.getReadStream(file._id, file);
@@ -378,11 +380,11 @@ export const FileUpload = {
 		}
 		// update file record to match user's username
 		const user = Users.findOneById(file.userId);
-		const oldAvatar = Avatars.findOneByName(user.username);
+		const oldAvatar = Promise.await(Avatars.findOneByName(user.username));
 		if (oldAvatar) {
-			Avatars.deleteFile(oldAvatar._id);
+			Promise.await(Avatars.deleteFile(oldAvatar._id));
 		}
-		Avatars.updateFileNameById(file._id, user.username);
+		Promise.await(Avatars.updateFileNameById(file._id, user.username));
 		// console.log('upload finished ->', file);
 	},
 
@@ -571,11 +573,11 @@ export class FileUploadClass {
 			this.store.delete(fileId);
 		}
 
-		return this.model.deleteFile(fileId);
+		return Promise.await(this.model.deleteFile(fileId));
 	}
 
 	deleteById(fileId) {
-		const file = this.model.findOneById(fileId);
+		const file = Promise.await(this.model.findOneById(fileId));
 
 		if (!file) {
 			return;
@@ -587,7 +589,7 @@ export class FileUploadClass {
 	}
 
 	deleteByName(fileName) {
-		const file = this.model.findOneByName(fileName);
+		const file = Promise.await(this.model.findOneByName(fileName));
 
 		if (!file) {
 			return;
@@ -600,7 +602,7 @@ export class FileUploadClass {
 
 
 	deleteByRoomId(rid) {
-		const file = this.model.findOneByRoomId(rid);
+		const file = Promise.await(this.model.findOneByRoomId(rid));
 
 		if (!file) {
 			return;
diff --git a/app/file-upload/server/lib/requests.js b/app/file-upload/server/lib/requests.js
index 80a3b4213b38..3b2e8dad19d7 100644
--- a/app/file-upload/server/lib/requests.js
+++ b/app/file-upload/server/lib/requests.js
@@ -1,13 +1,13 @@
 import { WebApp } from 'meteor/webapp';
 
 import { FileUpload } from './FileUpload';
-import { Uploads } from '../../../models';
+import { Uploads } from '../../../models/server/raw';
 
-WebApp.connectHandlers.use(FileUpload.getPath(), function(req, res, next) {
+WebApp.connectHandlers.use(FileUpload.getPath(), async function(req, res, next) {
 	const match = /^\/([^\/]+)\/(.*)/.exec(req.url);
 
 	if (match && match[1]) {
-		const file = Uploads.findOneById(match[1]);
+		const file = await Uploads.findOneById(match[1]);
 
 		if (file) {
 			if (!FileUpload.requestCanAccessFiles(req)) {
diff --git a/app/file-upload/server/methods/getS3FileUrl.js b/app/file-upload/server/methods/getS3FileUrl.js
index f68f720d171b..cfffdfcc032a 100644
--- a/app/file-upload/server/methods/getS3FileUrl.js
+++ b/app/file-upload/server/methods/getS3FileUrl.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { UploadFS } from 'meteor/jalik:ufs';
 
 import { settings } from '../../../settings/server';
-import { Uploads } from '../../../models';
+import { Uploads } from '../../../models/server/raw';
 
 let protectedFiles;
 
@@ -11,11 +11,11 @@ settings.watch('FileUpload_ProtectFiles', function(value) {
 });
 
 Meteor.methods({
-	getS3FileUrl(fileId) {
+	async getS3FileUrl(fileId) {
 		if (protectedFiles && !Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'sendFileMessage' });
 		}
-		const file = Uploads.findOneById(fileId);
+		const file = await Uploads.findOneById(fileId);
 
 		return UploadFS.getStore('AmazonS3:Uploads').getRedirectURL(file);
 	},
diff --git a/app/file-upload/server/methods/sendFileMessage.ts b/app/file-upload/server/methods/sendFileMessage.ts
index 80dec7bca683..886f9167e07e 100644
--- a/app/file-upload/server/methods/sendFileMessage.ts
+++ b/app/file-upload/server/methods/sendFileMessage.ts
@@ -3,8 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import _ from 'underscore';
 
-import { Uploads } from '../../../models/server';
-import { Rooms } from '../../../models/server/raw';
+import { Rooms, Uploads } from '../../../models/server/raw';
 import { callbacks } from '../../../callbacks/server';
 import { FileUpload } from '../lib/FileUpload';
 import { canAccessRoom } from '../../../authorization/server/functions/canAccessRoom';
@@ -35,7 +34,7 @@ Meteor.methods({
 			tmid: Match.Optional(String),
 		});
 
-		Uploads.updateFileComplete(file._id, user._id, _.omit(file, '_id'));
+		await Uploads.updateFileComplete(file._id, user._id, _.omit(file, '_id'));
 
 		const fileUrl = FileUpload.getPath(`${ file._id }/${ encodeURI(file.name) }`);
 
diff --git a/app/integrations/server/api/api.js b/app/integrations/server/api/api.js
index 17a04b6c3582..eb223c67c9ad 100644
--- a/app/integrations/server/api/api.js
+++ b/app/integrations/server/api/api.js
@@ -14,6 +14,7 @@ import { incomingLogger } from '../logger';
 import { processWebhookMessage } from '../../../lib/server';
 import { API, APIClass, defaultRateLimiterOptions } from '../../../api/server';
 import * as Models from '../../../models/server';
+import { Integrations } from '../../../models/server/raw';
 import { settings } from '../../../settings/server';
 
 const compiledScripts = {};
@@ -129,9 +130,10 @@ function removeIntegration(options, user) {
 	incomingLogger.info('Remove integration');
 	incomingLogger.debug(options);
 
-	const integrationToRemove = Models.Integrations.findOne({
-		urls: options.target_url,
-	});
+	const integrationToRemove = Promise.await(Integrations.findOneByUrl(options.target_url));
+	if (!integrationToRemove) {
+		return API.v1.failure('integration-not-found');
+	}
 
 	Meteor.runAsUser(user._id, () => Meteor.call('deleteOutgoingIntegration', integrationToRemove._id));
 
@@ -373,10 +375,10 @@ const Api = new WebHookAPI({
 				}
 			}
 
-			this.integration = Models.Integrations.findOne({
+			this.integration = Promise.await(Integrations.findOne({
 				_id: this.request.params.integrationId,
 				token: decodeURIComponent(this.request.params.token),
-			});
+			}));
 
 			if (!this.integration) {
 				incomingLogger.info(`Invalid integration id ${ this.request.params.integrationId } or token ${ this.request.params.token }`);
diff --git a/app/integrations/server/lib/triggerHandler.js b/app/integrations/server/lib/triggerHandler.js
index 33cc33ddb24d..27f71a4e5729 100644
--- a/app/integrations/server/lib/triggerHandler.js
+++ b/app/integrations/server/lib/triggerHandler.js
@@ -10,6 +10,7 @@ import Fiber from 'fibers';
 import Future from 'fibers/future';
 
 import * as Models from '../../../models/server';
+import { Integrations, IntegrationHistory } from '../../../models/server/raw';
 import { settings } from '../../../settings/server';
 import { getRoomByNameOrIdWithOptionToJoin, processWebhookMessage } from '../../../lib/server';
 import { outgoingLogger } from '../logger';
@@ -22,7 +23,7 @@ export class RocketChatIntegrationHandler {
 		this.compiledScripts = {};
 		this.triggers = {};
 
-		Models.Integrations.find({ type: 'webhook-outgoing' }).fetch().forEach((data) => this.addIntegration(data));
+		Promise.await(Integrations.find({ type: 'webhook-outgoing' }).forEach((data) => this.addIntegration(data)));
 	}
 
 	addIntegration(record) {
@@ -142,11 +143,11 @@ export class RocketChatIntegrationHandler {
 		}
 
 		if (historyId) {
-			Models.IntegrationHistory.update({ _id: historyId }, { $set: history });
+			Promise.await(IntegrationHistory.updateOne({ _id: historyId }, { $set: history }));
 			return historyId;
 		}
 		history._createdAt = new Date();
-		return Models.IntegrationHistory.insert(Object.assign({ _id: Random.id() }, history));
+		return Promise.await(IntegrationHistory.insertOne({ _id: Random.id(), ...history }));
 	}
 
 	// Trigger is the trigger, nameOrId is a string which is used to try and find a room, room is a room, message is a message, and data contains "user_name" if trigger.impersonateUser is truthful.
@@ -715,7 +716,7 @@ export class RocketChatIntegrationHandler {
 					if (result.statusCode === 410) {
 						this.updateHistory({ historyId, step: 'after-process-http-status-410', error: true });
 						outgoingLogger.error(`Disabling the Integration "${ trigger.name }" because the status code was 401 (Gone).`);
-						Models.Integrations.update({ _id: trigger._id }, { $set: { enabled: false } });
+						Promise.await(Integrations.updateOne({ _id: trigger._id }, { $set: { enabled: false } }));
 						return;
 					}
 
diff --git a/app/integrations/server/methods/clearIntegrationHistory.js b/app/integrations/server/methods/clearIntegrationHistory.ts
similarity index 70%
rename from app/integrations/server/methods/clearIntegrationHistory.js
rename to app/integrations/server/methods/clearIntegrationHistory.ts
index 87eec581e37a..f4ef3e974b96 100644
--- a/app/integrations/server/methods/clearIntegrationHistory.js
+++ b/app/integrations/server/methods/clearIntegrationHistory.ts
@@ -1,17 +1,20 @@
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermission } from '../../../authorization';
-import { IntegrationHistory, Integrations } from '../../../models';
+import { hasPermission } from '../../../authorization/server';
+import { IntegrationHistory, Integrations } from '../../../models/server/raw';
 import notifications from '../../../notifications/server/lib/Notifications';
 
 Meteor.methods({
-	clearIntegrationHistory(integrationId) {
+	async clearIntegrationHistory(integrationId) {
 		let integration;
 
 		if (hasPermission(this.userId, 'manage-outgoing-integrations') || hasPermission(this.userId, 'manage-outgoing-integrations', 'bot')) {
-			integration = Integrations.findOne(integrationId);
+			integration = await Integrations.findOneById(integrationId);
 		} else if (hasPermission(this.userId, 'manage-own-outgoing-integrations') || hasPermission(this.userId, 'manage-own-outgoing-integrations', 'bot')) {
-			integration = Integrations.findOne(integrationId, { fields: { '_createdBy._id': this.userId } });
+			integration = await Integrations.findOne({
+				_id: integrationId,
+				'_createdBy._id': this.userId,
+			});
 		} else {
 			throw new Meteor.Error('not_authorized', 'Unauthorized', { method: 'clearIntegrationHistory' });
 		}
@@ -20,7 +23,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-integration', 'Invalid integration', { method: 'clearIntegrationHistory' });
 		}
 
-		IntegrationHistory.removeByIntegrationId(integrationId);
+		await IntegrationHistory.removeByIntegrationId(integrationId);
 
 		notifications.streamIntegrationHistory.emit(integrationId, { type: 'removed' });
 
diff --git a/app/integrations/server/methods/incoming/addIncomingIntegration.js b/app/integrations/server/methods/incoming/addIncomingIntegration.js
index 6e86dacd5700..23b339ed48fb 100644
--- a/app/integrations/server/methods/incoming/addIncomingIntegration.js
+++ b/app/integrations/server/methods/incoming/addIncomingIntegration.js
@@ -4,13 +4,14 @@ import { Babel } from 'meteor/babel-compiler';
 import _ from 'underscore';
 import s from 'underscore.string';
 
-import { hasPermission, hasAllPermission } from '../../../../authorization';
-import { Users, Rooms, Integrations, Roles, Subscriptions } from '../../../../models';
+import { hasPermission, hasAllPermission } from '../../../../authorization/server';
+import { Users, Rooms, Subscriptions } from '../../../../models/server';
+import { Integrations, Roles } from '../../../../models/server/raw';
 
 const validChannelChars = ['@', '#'];
 
 Meteor.methods({
-	addIncomingIntegration(integration) {
+	async addIncomingIntegration(integration) {
 		if (!hasPermission(this.userId, 'manage-incoming-integrations') && !hasPermission(this.userId, 'manage-own-incoming-integrations')) {
 			throw new Meteor.Error('not_authorized', 'Unauthorized', { method: 'addIncomingIntegration' });
 		}
@@ -95,9 +96,11 @@ Meteor.methods({
 		integration._createdAt = new Date();
 		integration._createdBy = Users.findOne(this.userId, { fields: { username: 1 } });
 
-		Roles.addUserRoles(user._id, 'bot');
+		await Roles.addUserRoles(user._id, 'bot');
 
-		integration._id = Integrations.insert(integration);
+		const result = await Integrations.insertOne(integration);
+
+		integration._id = result.insertedId;
 
 		return integration;
 	},
diff --git a/app/integrations/server/methods/incoming/deleteIncomingIntegration.js b/app/integrations/server/methods/incoming/deleteIncomingIntegration.ts
similarity index 56%
rename from app/integrations/server/methods/incoming/deleteIncomingIntegration.js
rename to app/integrations/server/methods/incoming/deleteIncomingIntegration.ts
index 96c25116a10d..bbd158f20ae0 100644
--- a/app/integrations/server/methods/incoming/deleteIncomingIntegration.js
+++ b/app/integrations/server/methods/incoming/deleteIncomingIntegration.ts
@@ -1,16 +1,19 @@
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermission } from '../../../../authorization';
-import { Integrations } from '../../../../models';
+import { hasPermission } from '../../../../authorization/server';
+import { Integrations } from '../../../../models/server/raw';
 
 Meteor.methods({
-	deleteIncomingIntegration(integrationId) {
+	async deleteIncomingIntegration(integrationId) {
 		let integration;
 
 		if (hasPermission(this.userId, 'manage-incoming-integrations')) {
-			integration = Integrations.findOne(integrationId);
+			integration = Integrations.findOneById(integrationId);
 		} else if (hasPermission(this.userId, 'manage-own-incoming-integrations')) {
-			integration = Integrations.findOne(integrationId, { fields: { '_createdBy._id': this.userId } });
+			integration = Integrations.findOne({
+				_id: integrationId,
+				'_createdBy._id': this.userId,
+			});
 		} else {
 			throw new Meteor.Error('not_authorized', 'Unauthorized', { method: 'deleteIncomingIntegration' });
 		}
@@ -19,7 +22,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-integration', 'Invalid integration', { method: 'deleteIncomingIntegration' });
 		}
 
-		Integrations.remove({ _id: integrationId });
+		await Integrations.removeById(integrationId);
 
 		return true;
 	},
diff --git a/app/integrations/server/methods/incoming/updateIncomingIntegration.js b/app/integrations/server/methods/incoming/updateIncomingIntegration.js
index 5e7b3517ba0e..fc5a6d384b95 100644
--- a/app/integrations/server/methods/incoming/updateIncomingIntegration.js
+++ b/app/integrations/server/methods/incoming/updateIncomingIntegration.js
@@ -3,13 +3,14 @@ import { Babel } from 'meteor/babel-compiler';
 import _ from 'underscore';
 import s from 'underscore.string';
 
-import { Integrations, Rooms, Users, Roles, Subscriptions } from '../../../../models';
-import { hasAllPermission, hasPermission } from '../../../../authorization';
+import { Rooms, Users, Subscriptions } from '../../../../models/server';
+import { Integrations, Roles } from '../../../../models/server/raw';
+import { hasAllPermission, hasPermission } from '../../../../authorization/server';
 
 const validChannelChars = ['@', '#'];
 
 Meteor.methods({
-	updateIncomingIntegration(integrationId, integration) {
+	async updateIncomingIntegration(integrationId, integration) {
 		if (!_.isString(integration.channel) || integration.channel.trim() === '') {
 			throw new Meteor.Error('error-invalid-channel', 'Invalid channel', { method: 'updateIncomingIntegration' });
 		}
@@ -25,9 +26,9 @@ Meteor.methods({
 		let currentIntegration;
 
 		if (hasPermission(this.userId, 'manage-incoming-integrations')) {
-			currentIntegration = Integrations.findOne(integrationId);
+			currentIntegration = await Integrations.findOneById(integrationId);
 		} else if (hasPermission(this.userId, 'manage-own-incoming-integrations')) {
-			currentIntegration = Integrations.findOne({ _id: integrationId, '_createdBy._id': this.userId });
+			currentIntegration = await Integrations.findOne({ _id: integrationId, '_createdBy._id': this.userId });
 		} else {
 			throw new Meteor.Error('not_authorized', 'Unauthorized', { method: 'updateIncomingIntegration' });
 		}
@@ -43,14 +44,14 @@ Meteor.methods({
 
 				integration.scriptCompiled = Babel.compile(integration.script, babelOptions).code;
 				integration.scriptError = undefined;
-				Integrations.update(integrationId, {
+				await Integrations.updateOne({ _id: integrationId }, {
 					$set: { scriptCompiled: integration.scriptCompiled },
 					$unset: { scriptError: 1 },
 				});
 			} catch (e) {
 				integration.scriptCompiled = undefined;
 				integration.scriptError = _.pick(e, 'name', 'message', 'stack');
-				Integrations.update(integrationId, {
+				await Integrations.updateOne({ _id: integrationId }, {
 					$set: {
 						scriptError: integration.scriptError,
 					},
@@ -100,9 +101,9 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-post-as-user', 'Invalid Post As User', { method: 'updateIncomingIntegration' });
 		}
 
-		Roles.addUserRoles(user._id, 'bot');
+		await Roles.addUserRoles(user._id, 'bot');
 
-		Integrations.update(integrationId, {
+		await Integrations.updateOne({ _id: integrationId }, {
 			$set: {
 				enabled: integration.enabled,
 				name: integration.name,
@@ -117,6 +118,6 @@ Meteor.methods({
 			},
 		});
 
-		return Integrations.findOne(integrationId);
+		return Integrations.findOneById(integrationId);
 	},
 });
diff --git a/app/integrations/server/methods/outgoing/addOutgoingIntegration.js b/app/integrations/server/methods/outgoing/addOutgoingIntegration.js
index 5baf6e88cda4..ae6f1aa6933d 100644
--- a/app/integrations/server/methods/outgoing/addOutgoingIntegration.js
+++ b/app/integrations/server/methods/outgoing/addOutgoingIntegration.js
@@ -1,11 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermission } from '../../../../authorization';
-import { Users, Integrations } from '../../../../models';
+import { hasPermission } from '../../../../authorization/server';
+import { Users } from '../../../../models/server';
+import { Integrations } from '../../../../models/server/raw';
 import { integrations } from '../../../lib/rocketchat';
 
 Meteor.methods({
-	addOutgoingIntegration(integration) {
+	async addOutgoingIntegration(integration) {
 		if (!hasPermission(this.userId, 'manage-outgoing-integrations')
 			&& !hasPermission(this.userId, 'manage-own-outgoing-integrations')
 			&& !hasPermission(this.userId, 'manage-outgoing-integrations', 'bot')
@@ -17,7 +18,9 @@ Meteor.methods({
 
 		integration._createdAt = new Date();
 		integration._createdBy = Users.findOne(this.userId, { fields: { username: 1 } });
-		integration._id = Integrations.insert(integration);
+
+		const result = await Integrations.insertOne(integration);
+		integration._id = result.insertedId;
 
 		return integration;
 	},
diff --git a/app/integrations/server/methods/outgoing/deleteOutgoingIntegration.js b/app/integrations/server/methods/outgoing/deleteOutgoingIntegration.ts
similarity index 63%
rename from app/integrations/server/methods/outgoing/deleteOutgoingIntegration.js
rename to app/integrations/server/methods/outgoing/deleteOutgoingIntegration.ts
index 07823b22bb2c..a63e845eaa77 100644
--- a/app/integrations/server/methods/outgoing/deleteOutgoingIntegration.js
+++ b/app/integrations/server/methods/outgoing/deleteOutgoingIntegration.ts
@@ -1,16 +1,19 @@
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermission } from '../../../../authorization';
-import { IntegrationHistory, Integrations } from '../../../../models';
+import { hasPermission } from '../../../../authorization/server';
+import { IntegrationHistory, Integrations } from '../../../../models/server/raw';
 
 Meteor.methods({
-	deleteOutgoingIntegration(integrationId) {
+	async deleteOutgoingIntegration(integrationId) {
 		let integration;
 
 		if (hasPermission(this.userId, 'manage-outgoing-integrations') || hasPermission(this.userId, 'manage-outgoing-integrations', 'bot')) {
-			integration = Integrations.findOne(integrationId);
+			integration = Integrations.findOneById(integrationId);
 		} else if (hasPermission(this.userId, 'manage-own-outgoing-integrations') || hasPermission(this.userId, 'manage-own-outgoing-integrations', 'bot')) {
-			integration = Integrations.findOne(integrationId, { fields: { '_createdBy._id': this.userId } });
+			integration = Integrations.findOne({
+				_id: integrationId,
+				'_createdBy._id': this.userId,
+			});
 		} else {
 			throw new Meteor.Error('not_authorized', 'Unauthorized', { method: 'deleteOutgoingIntegration' });
 		}
@@ -19,8 +22,8 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-integration', 'Invalid integration', { method: 'deleteOutgoingIntegration' });
 		}
 
-		Integrations.remove({ _id: integrationId });
-		IntegrationHistory.removeByIntegrationId(integrationId);
+		await Integrations.removeById(integrationId);
+		await IntegrationHistory.removeByIntegrationId(integrationId);
 
 		return true;
 	},
diff --git a/app/integrations/server/methods/outgoing/replayOutgoingIntegration.js b/app/integrations/server/methods/outgoing/replayOutgoingIntegration.ts
similarity index 69%
rename from app/integrations/server/methods/outgoing/replayOutgoingIntegration.js
rename to app/integrations/server/methods/outgoing/replayOutgoingIntegration.ts
index 8d88cde3ea28..bf3136525bc9 100644
--- a/app/integrations/server/methods/outgoing/replayOutgoingIntegration.js
+++ b/app/integrations/server/methods/outgoing/replayOutgoingIntegration.ts
@@ -1,17 +1,20 @@
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermission } from '../../../../authorization';
-import { Integrations, IntegrationHistory } from '../../../../models';
+import { hasPermission } from '../../../../authorization/server';
+import { Integrations, IntegrationHistory } from '../../../../models/server/raw';
 import { triggerHandler } from '../../lib/triggerHandler';
 
 Meteor.methods({
-	replayOutgoingIntegration({ integrationId, historyId }) {
+	async replayOutgoingIntegration({ integrationId, historyId }) {
 		let integration;
 
 		if (hasPermission(this.userId, 'manage-outgoing-integrations') || hasPermission(this.userId, 'manage-outgoing-integrations', 'bot')) {
-			integration = Integrations.findOne(integrationId);
+			integration = await Integrations.findOneById(integrationId);
 		} else if (hasPermission(this.userId, 'manage-own-outgoing-integrations') || hasPermission(this.userId, 'manage-own-outgoing-integrations', 'bot')) {
-			integration = Integrations.findOne(integrationId, { fields: { '_createdBy._id': this.userId } });
+			integration = await Integrations.findOne({
+				_id: integrationId,
+				'_createdBy._id': this.userId,
+			});
 		} else {
 			throw new Meteor.Error('not_authorized', 'Unauthorized', { method: 'replayOutgoingIntegration' });
 		}
@@ -20,7 +23,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-integration', 'Invalid integration', { method: 'replayOutgoingIntegration' });
 		}
 
-		const history = IntegrationHistory.findOneByIntegrationIdAndHistoryId(integration._id, historyId);
+		const history = await IntegrationHistory.findOneByIntegrationIdAndHistoryId(integration._id, historyId);
 
 		if (!history) {
 			throw new Meteor.Error('error-invalid-integration-history', 'Invalid Integration History', { method: 'replayOutgoingIntegration' });
diff --git a/app/integrations/server/methods/outgoing/updateOutgoingIntegration.js b/app/integrations/server/methods/outgoing/updateOutgoingIntegration.js
index 981a7890bc29..e9e4bc1ba968 100644
--- a/app/integrations/server/methods/outgoing/updateOutgoingIntegration.js
+++ b/app/integrations/server/methods/outgoing/updateOutgoingIntegration.js
@@ -1,11 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermission } from '../../../../authorization';
-import { Integrations, Users } from '../../../../models';
+import { hasPermission } from '../../../../authorization/server';
+import { Users } from '../../../../models/server';
+import { Integrations } from '../../../../models/server/raw';
 import { integrations } from '../../../lib/rocketchat';
 
 Meteor.methods({
-	updateOutgoingIntegration(integrationId, integration) {
+	async updateOutgoingIntegration(integrationId, integration) {
 		integration = integrations.validateOutgoing(integration, this.userId);
 
 		if (!integration.token || integration.token.trim() === '') {
@@ -15,9 +16,9 @@ Meteor.methods({
 		let currentIntegration;
 
 		if (hasPermission(this.userId, 'manage-outgoing-integrations')) {
-			currentIntegration = Integrations.findOne(integrationId);
+			currentIntegration = await Integrations.findOneById(integrationId);
 		} else if (hasPermission(this.userId, 'manage-own-outgoing-integrations')) {
-			currentIntegration = Integrations.findOne({ _id: integrationId, '_createdBy._id': this.userId });
+			currentIntegration = await Integrations.findOne({ _id: integrationId, '_createdBy._id': this.userId });
 		} else {
 			throw new Meteor.Error('not_authorized', 'Unauthorized', { method: 'updateOutgoingIntegration' });
 		}
@@ -26,18 +27,18 @@ Meteor.methods({
 			throw new Meteor.Error('invalid_integration', '[methods] updateOutgoingIntegration -> integration not found');
 		}
 		if (integration.scriptCompiled) {
-			Integrations.update(integrationId, {
+			await Integrations.updateOne({ _id: integrationId }, {
 				$set: { scriptCompiled: integration.scriptCompiled },
 				$unset: { scriptError: 1 },
 			});
 		} else {
-			Integrations.update(integrationId, {
+			await Integrations.updateOne({ _id: integrationId }, {
 				$set: { scriptError: integration.scriptError },
 				$unset: { scriptCompiled: 1 },
 			});
 		}
 
-		Integrations.update(integrationId, {
+		await Integrations.updateOne({ _id: integrationId }, {
 			$set: {
 				event: integration.event,
 				enabled: integration.enabled,
@@ -65,6 +66,6 @@ Meteor.methods({
 			},
 		});
 
-		return Integrations.findOne(integrationId);
+		return Integrations.findOneById(integrationId);
 	},
 });
diff --git a/app/invites/server/functions/findOrCreateInvite.js b/app/invites/server/functions/findOrCreateInvite.js
index c875a53906d0..3b608e7121e0 100644
--- a/app/invites/server/functions/findOrCreateInvite.js
+++ b/app/invites/server/functions/findOrCreateInvite.js
@@ -3,7 +3,8 @@ import { Random } from 'meteor/random';
 
 import { hasPermission } from '../../../authorization';
 import { Notifications } from '../../../notifications';
-import { Invites, Subscriptions, Rooms } from '../../../models/server';
+import { Subscriptions, Rooms } from '../../../models/server';
+import { Invites } from '../../../models/server/raw';
 import { settings } from '../../../settings';
 import { getURL } from '../../../utils/lib/getURL';
 import { roomTypes, RoomMemberActions } from '../../../utils/server';
@@ -23,7 +24,7 @@ function getInviteUrl(invite) {
 const possibleDays = [0, 1, 7, 15, 30];
 const possibleUses = [0, 1, 5, 10, 25, 50, 100];
 
-export const findOrCreateInvite = (userId, invite) => {
+export const findOrCreateInvite = async (userId, invite) => {
 	if (!userId || !invite) {
 		return false;
 	}
@@ -57,7 +58,7 @@ export const findOrCreateInvite = (userId, invite) => {
 	}
 
 	// Before anything, let's check if there's an existing invite with the same settings for the same channel and user and that has not yet expired.
-	const existing = Invites.findOneByUserRoomMaxUsesAndExpiration(userId, invite.rid, maxUses, days);
+	const existing = await Invites.findOneByUserRoomMaxUsesAndExpiration(userId, invite.rid, maxUses, days);
 
 	// If an existing invite was found, return it's _id instead of creating a new one.
 	if (existing) {
@@ -86,7 +87,7 @@ export const findOrCreateInvite = (userId, invite) => {
 		uses: 0,
 	};
 
-	Invites.create(createInvite);
+	await Invites.insertOne(createInvite);
 	Notifications.notifyUser(userId, 'updateInvites', { invite: createInvite });
 
 	createInvite.url = getInviteUrl(createInvite);
diff --git a/app/invites/server/functions/listInvites.js b/app/invites/server/functions/listInvites.js
index 476a5f729e09..10d67435237d 100644
--- a/app/invites/server/functions/listInvites.js
+++ b/app/invites/server/functions/listInvites.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermission } from '../../../authorization';
-import { Invites } from '../../../models';
+import { hasPermission } from '../../../authorization/server';
+import { Invites } from '../../../models/server/raw';
 
-export const listInvites = (userId) => {
+export const listInvites = async (userId) => {
 	if (!userId) {
 		throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'listInvites' });
 	}
@@ -12,5 +12,5 @@ export const listInvites = (userId) => {
 		throw new Meteor.Error('not_authorized');
 	}
 
-	return Invites.find({}).fetch();
+	return Invites.find({}).toArray();
 };
diff --git a/app/invites/server/functions/removeInvite.js b/app/invites/server/functions/removeInvite.js
index eadbe67966b3..0ea066a8e287 100644
--- a/app/invites/server/functions/removeInvite.js
+++ b/app/invites/server/functions/removeInvite.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../authorization';
-import Invites from '../../../models/server/models/Invites';
+import { Invites } from '../../../models/server/raw';
 
-export const removeInvite = (userId, invite) => {
+export const removeInvite = async (userId, invite) => {
 	if (!userId || !invite) {
 		return false;
 	}
@@ -17,13 +17,13 @@ export const removeInvite = (userId, invite) => {
 	}
 
 	// Before anything, let's check if there's an existing invite
-	const existing = Invites.findOneById(invite._id);
+	const existing = await Invites.findOneById(invite._id);
 
 	if (!existing) {
 		throw new Meteor.Error('invalid-invitation-id', 'Invalid Invitation _id', { method: 'removeInvite' });
 	}
 
-	Invites.removeById(invite._id);
+	await Invites.removeById(invite._id);
 
 	return true;
 };
diff --git a/app/invites/server/functions/useInviteToken.js b/app/invites/server/functions/useInviteToken.js
index 3cf638fd3e94..6fcef0a40788 100644
--- a/app/invites/server/functions/useInviteToken.js
+++ b/app/invites/server/functions/useInviteToken.js
@@ -1,11 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Invites, Users, Subscriptions } from '../../../models/server';
+import { Users, Subscriptions } from '../../../models/server';
+import { Invites } from '../../../models/server/raw';
 import { validateInviteToken } from './validateInviteToken';
 import { addUserToRoom } from '../../../lib/server/functions/addUserToRoom';
 import { roomTypes, RoomMemberActions } from '../../../utils/server';
 
-export const useInviteToken = (userId, token) => {
+export const useInviteToken = async (userId, token) => {
 	if (!userId) {
 		throw new Meteor.Error('error-invalid-user', 'The user is invalid', { method: 'useInviteToken', field: 'userId' });
 	}
@@ -14,7 +15,7 @@ export const useInviteToken = (userId, token) => {
 		throw new Meteor.Error('error-invalid-token', 'The invite token is invalid.', { method: 'useInviteToken', field: 'token' });
 	}
 
-	const { inviteData, room } = validateInviteToken(token);
+	const { inviteData, room } = await validateInviteToken(token);
 
 	if (!roomTypes.getConfig(room.t).allowMemberAction(room, RoomMemberActions.INVITE)) {
 		throw new Meteor.Error('error-room-type-not-allowed', 'Can\'t join room of this type via invite', { method: 'useInviteToken', field: 'token' });
@@ -25,7 +26,7 @@ export const useInviteToken = (userId, token) => {
 
 	const subscription = Subscriptions.findOneByRoomIdAndUserId(room._id, user._id, { fields: { _id: 1 } });
 	if (!subscription) {
-		Invites.increaseUsageById(inviteData._id);
+		await Invites.increaseUsageById(inviteData._id);
 	}
 
 	// If the user already has an username, then join the invite room,
diff --git a/app/invites/server/functions/validateInviteToken.js b/app/invites/server/functions/validateInviteToken.js
index dda8add8b612..81febb439442 100644
--- a/app/invites/server/functions/validateInviteToken.js
+++ b/app/invites/server/functions/validateInviteToken.js
@@ -1,13 +1,14 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Invites, Rooms } from '../../../models';
+import { Rooms } from '../../../models';
+import { Invites } from '../../../models/server/raw';
 
-export const validateInviteToken = (token) => {
+export const validateInviteToken = async (token) => {
 	if (!token || typeof token !== 'string') {
 		throw new Meteor.Error('error-invalid-token', 'The invite token is invalid.', { method: 'validateInviteToken', field: 'token' });
 	}
 
-	const inviteData = Invites.findOneById(token);
+	const inviteData = await Invites.findOneById(token);
 	if (!inviteData) {
 		throw new Meteor.Error('error-invalid-token', 'The invite token is invalid.', { method: 'validateInviteToken', field: 'token' });
 	}
diff --git a/app/lib/server/functions/deleteMessage.ts b/app/lib/server/functions/deleteMessage.ts
index 8f698842e205..96e563b1a464 100644
--- a/app/lib/server/functions/deleteMessage.ts
+++ b/app/lib/server/functions/deleteMessage.ts
@@ -2,14 +2,15 @@ import { Meteor } from 'meteor/meteor';
 
 import { FileUpload } from '../../../file-upload/server';
 import { settings } from '../../../settings/server';
-import { Messages, Uploads, Rooms } from '../../../models/server';
+import { Messages, Rooms } from '../../../models/server';
+import { Uploads } from '../../../models/server/raw';
 import { Notifications } from '../../../notifications/server';
 import { callbacks } from '../../../callbacks/server';
 import { Apps } from '../../../apps/server';
 import { IMessage } from '../../../../definition/IMessage';
 import { IUser } from '../../../../definition/IUser';
 
-export const deleteMessage = function(message: IMessage, user: IUser): void {
+export const deleteMessage = async function(message: IMessage, user: IUser): Promise<void> {
 	const deletedMsg = Messages.findOneById(message._id);
 	const isThread = deletedMsg.tcount > 0;
 	const keepHistory = settings.get('Message_KeepHistory') || isThread;
@@ -36,9 +37,9 @@ export const deleteMessage = function(message: IMessage, user: IUser): void {
 			Messages.setHiddenById(message._id, true);
 		}
 
-		files.forEach((file) => {
-			file?._id && Uploads.update(file._id, { $set: { _hidden: true } });
-		});
+		for await (const file of files) {
+			file?._id && await Uploads.update({ _id: file._id }, { $set: { _hidden: true } });
+		}
 	} else {
 		if (!showDeletedStatus) {
 			Messages.removeById(message._id);
diff --git a/app/lib/server/functions/deleteUser.js b/app/lib/server/functions/deleteUser.js
index 680517db5405..4193774e1136 100644
--- a/app/lib/server/functions/deleteUser.js
+++ b/app/lib/server/functions/deleteUser.js
@@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { FileUpload } from '../../../file-upload/server';
-import { Users, Subscriptions, Messages, Rooms, Integrations, FederationServers } from '../../../models/server';
+import { Users, Subscriptions, Messages, Rooms } from '../../../models/server';
+import { FederationServers, Integrations } from '../../../models/server/raw';
 import { settings } from '../../../settings/server';
 import { updateGroupDMsName } from './updateGroupDMsName';
 import { relinquishRoomOwnerships } from './relinquishRoomOwnerships';
@@ -10,7 +11,7 @@ import { getSubscribedRoomsForUserWithDetails, shouldRemoveOrChangeOwner } from
 import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms';
 import { api } from '../../../../server/sdk/api';
 
-export const deleteUser = function(userId, confirmRelinquish = false) {
+export async function deleteUser(userId, confirmRelinquish = false) {
 	const user = Users.findOneById(userId, {
 		fields: { username: 1, avatarOrigin: 1, federation: 1 },
 	});
@@ -36,7 +37,7 @@ export const deleteUser = function(userId, confirmRelinquish = false) {
 
 	// Users without username can't do anything, so there is nothing to remove
 	if (user.username != null) {
-		relinquishRoomOwnerships(userId, subscribedRooms);
+		await relinquishRoomOwnerships(userId, subscribedRooms);
 
 		const messageErasureType = settings.get('Message_ErasureType');
 		switch (messageErasureType) {
@@ -64,7 +65,7 @@ export const deleteUser = function(userId, confirmRelinquish = false) {
 			FileUpload.getStore('Avatars').deleteByName(user.username);
 		}
 
-		Integrations.disableByUserId(userId); // Disables all the integrations which rely on the user being deleted.
+		await Integrations.disableByUserId(userId); // Disables all the integrations which rely on the user being deleted.
 		api.broadcast('user.deleted', user);
 	}
 
@@ -75,5 +76,5 @@ export const deleteUser = function(userId, confirmRelinquish = false) {
 	updateGroupDMsName(user);
 
 	// Refresh the servers list
-	FederationServers.refreshServers();
-};
+	await FederationServers.refreshServers();
+}
diff --git a/app/lib/server/functions/relinquishRoomOwnerships.js b/app/lib/server/functions/relinquishRoomOwnerships.js
index 7c56e3bc05a5..f5c403f1b2b1 100644
--- a/app/lib/server/functions/relinquishRoomOwnerships.js
+++ b/app/lib/server/functions/relinquishRoomOwnerships.js
@@ -1,5 +1,6 @@
 import { FileUpload } from '../../../file-upload/server';
-import { Subscriptions, Messages, Rooms, Roles } from '../../../models/server';
+import { Subscriptions, Messages, Rooms } from '../../../models/server';
+import { Roles } from '../../../models/server/raw';
 
 const bulkRoomCleanUp = (rids) => {
 	// no bulk deletion for files
@@ -12,11 +13,14 @@ const bulkRoomCleanUp = (rids) => {
 	]));
 };
 
-export const relinquishRoomOwnerships = function(userId, subscribedRooms, removeDirectMessages = true) {
+export const relinquishRoomOwnerships = async function(userId, subscribedRooms, removeDirectMessages = true) {
 	// change owners
-	subscribedRooms
-		.filter(({ shouldChangeOwner }) => shouldChangeOwner)
-		.forEach(({ newOwner, rid }) => Roles.addUserRoles(newOwner, ['owner'], rid));
+	const changeOwner = subscribedRooms
+		.filter(({ shouldChangeOwner }) => shouldChangeOwner);
+
+	for await (const { newOwner, rid } of changeOwner) {
+		await Roles.addUserRoles(newOwner, ['owner'], rid);
+	}
 
 	const roomIdsToRemove = subscribedRooms.filter(({ shouldBeRemoved }) => shouldBeRemoved).map(({ rid }) => rid);
 
diff --git a/app/lib/server/functions/setRoomAvatar.js b/app/lib/server/functions/setRoomAvatar.js
index 9b0ea487c758..540de2799201 100644
--- a/app/lib/server/functions/setRoomAvatar.js
+++ b/app/lib/server/functions/setRoomAvatar.js
@@ -2,13 +2,14 @@ import { Meteor } from 'meteor/meteor';
 
 import { RocketChatFile } from '../../../file';
 import { FileUpload } from '../../../file-upload';
-import { Rooms, Avatars, Messages } from '../../../models/server';
+import { Rooms, Messages } from '../../../models/server';
+import { Avatars } from '../../../models/server/raw';
 import { api } from '../../../../server/sdk/api';
 
-export const setRoomAvatar = function(rid, dataURI, user) {
+export const setRoomAvatar = async function(rid, dataURI, user) {
 	const fileStore = FileUpload.getStore('Avatars');
 
-	const current = Avatars.findOneByRoomId(rid);
+	const current = await Avatars.findOneByRoomId(rid);
 
 	if (!dataURI) {
 		fileStore.deleteByRoomId(rid);
diff --git a/app/lib/server/functions/setUserActiveStatus.js b/app/lib/server/functions/setUserActiveStatus.js
index 8089fbf7d1cf..77a137695fdd 100644
--- a/app/lib/server/functions/setUserActiveStatus.js
+++ b/app/lib/server/functions/setUserActiveStatus.js
@@ -63,7 +63,7 @@ export function setUserActiveStatus(userId, active, confirmRelinquish = false) {
 		}
 
 		closeOmnichannelConversations(user, livechatSubscribedRooms);
-		relinquishRoomOwnerships(user, chatSubscribedRooms, false);
+		Promise.await(relinquishRoomOwnerships(user, chatSubscribedRooms, false));
 	}
 
 	if (active && !user.active) {
diff --git a/app/lib/server/functions/setUsername.js b/app/lib/server/functions/setUsername.js
index 8795fb6b01fc..97a05291f5d1 100644
--- a/app/lib/server/functions/setUsername.js
+++ b/app/lib/server/functions/setUsername.js
@@ -3,7 +3,8 @@ import s from 'underscore.string';
 import { Accounts } from 'meteor/accounts-base';
 
 import { settings } from '../../../settings';
-import { Users, Invites } from '../../../models/server';
+import { Users } from '../../../models/server';
+import { Invites } from '../../../models/server/raw';
 import { hasPermission } from '../../../authorization';
 import { RateLimiter } from '../lib';
 import { addUserToRoom } from './addUserToRoom';
@@ -70,7 +71,7 @@ export const _setUsername = function(userId, u, fullUser) {
 
 	// If it's the first username and the user has an invite Token, then join the invite room
 	if (!previousUsername && user.inviteToken) {
-		const inviteData = Invites.findOneById(user.inviteToken);
+		const inviteData = Promise.await(Invites.findOneById(user.inviteToken));
 		if (inviteData && inviteData.rid) {
 			addUserToRoom(inviteData.rid, user);
 		}
diff --git a/app/lib/server/lib/getRoomRoles.js b/app/lib/server/lib/getRoomRoles.js
index 9c3718628782..6ed6527c5368 100644
--- a/app/lib/server/lib/getRoomRoles.js
+++ b/app/lib/server/lib/getRoomRoles.js
@@ -1,7 +1,8 @@
 import _ from 'underscore';
 
 import { settings } from '../../../settings';
-import { Subscriptions, Users, Roles } from '../../../models';
+import { Subscriptions, Users } from '../../../models';
+import { Roles } from '../../../models/server/raw';
 
 export function getRoomRoles(rid) {
 	const options = {
@@ -17,7 +18,7 @@ export function getRoomRoles(rid) {
 
 	const UI_Use_Real_Name = settings.get('UI_Use_Real_Name') === true;
 
-	const roles = Roles.find({ scope: 'Subscriptions', description: { $exists: 1, $ne: '' } }).fetch();
+	const roles = Promise.await(Roles.find({ scope: 'Subscriptions', description: { $exists: 1, $ne: '' } }).toArray());
 	const subscriptions = Subscriptions.findByRoomIdAndRoles(rid, _.pluck(roles, '_id'), options).fetch();
 
 	if (!UI_Use_Real_Name) {
diff --git a/app/lib/server/methods/deleteMessage.js b/app/lib/server/methods/deleteMessage.js
index 086b9caee7f9..8be7da4e5e45 100644
--- a/app/lib/server/methods/deleteMessage.js
+++ b/app/lib/server/methods/deleteMessage.js
@@ -6,7 +6,7 @@ import { Messages } from '../../../models';
 import { deleteMessage } from '../functions';
 
 Meteor.methods({
-	deleteMessage(message) {
+	async deleteMessage(message) {
 		check(message, Match.ObjectIncluding({
 			_id: String,
 		}));
diff --git a/app/lib/server/methods/deleteUserOwnAccount.js b/app/lib/server/methods/deleteUserOwnAccount.js
index 1ff7494a8751..2d7f269b08f7 100644
--- a/app/lib/server/methods/deleteUserOwnAccount.js
+++ b/app/lib/server/methods/deleteUserOwnAccount.js
@@ -9,7 +9,7 @@ import { Users } from '../../../models';
 import { deleteUser } from '../functions';
 
 Meteor.methods({
-	deleteUserOwnAccount(password, confirmRelinquish) {
+	async deleteUserOwnAccount(password, confirmRelinquish) {
 		check(password, String);
 
 		if (!Meteor.userId()) {
@@ -39,7 +39,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-username', 'Invalid username', { method: 'deleteUserOwnAccount' });
 		}
 
-		deleteUser(userId, confirmRelinquish);
+		await deleteUser(userId, confirmRelinquish);
 
 		return true;
 	},
diff --git a/app/lib/server/methods/leaveRoom.js b/app/lib/server/methods/leaveRoom.ts
similarity index 76%
rename from app/lib/server/methods/leaveRoom.js
rename to app/lib/server/methods/leaveRoom.ts
index 561d7bdb548a..cce12a25b8f8 100644
--- a/app/lib/server/methods/leaveRoom.js
+++ b/app/lib/server/methods/leaveRoom.ts
@@ -1,13 +1,14 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { hasPermission, hasRole, getUsersInRole } from '../../../authorization';
-import { Subscriptions, Rooms } from '../../../models';
+import { hasPermission, hasRole } from '../../../authorization/server';
+import { Subscriptions, Rooms } from '../../../models/server';
 import { removeUserFromRoom } from '../functions';
 import { roomTypes, RoomMemberActions } from '../../../utils/server';
+import { Roles } from '../../../models/server/raw';
 
 Meteor.methods({
-	leaveRoom(rid) {
+	async leaveRoom(rid) {
 		check(rid, String);
 
 		if (!Meteor.userId()) {
@@ -17,7 +18,7 @@ Meteor.methods({
 		const room = Rooms.findOneById(rid);
 		const user = Meteor.user();
 
-		if (!roomTypes.getConfig(room.t).allowMemberAction(room, RoomMemberActions.LEAVE)) {
+		if (!user || !roomTypes.getConfig(room.t).allowMemberAction(room, RoomMemberActions.LEAVE)) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'leaveRoom' });
 		}
 
@@ -32,7 +33,8 @@ Meteor.methods({
 
 		// If user is room owner, check if there are other owners. If there isn't anyone else, warn user to set a new owner.
 		if (hasRole(user._id, 'owner', room._id)) {
-			const numOwners = getUsersInRole('owner', room._id).count();
+			const cursor = await Roles.findUsersInRole('owner', room._id);
+			const numOwners = Promise.await(cursor.count());
 			if (numOwners === 1) {
 				throw new Meteor.Error('error-you-are-last-owner', 'You are the last owner. Please set new owner before leaving the room.', { method: 'leaveRoom' });
 			}
diff --git a/app/lib/server/methods/refreshOAuthService.js b/app/lib/server/methods/refreshOAuthService.ts
similarity index 66%
rename from app/lib/server/methods/refreshOAuthService.js
rename to app/lib/server/methods/refreshOAuthService.ts
index e0ef565cb45e..14dbeaa1fcd6 100644
--- a/app/lib/server/methods/refreshOAuthService.js
+++ b/app/lib/server/methods/refreshOAuthService.ts
@@ -1,11 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 
-import { hasPermission } from '../../../authorization';
-import { Settings } from '../../../models';
+import { hasPermission } from '../../../authorization/server';
+import { Settings } from '../../../models/server/raw';
 
 Meteor.methods({
-	refreshOAuthService() {
+	async refreshOAuthService() {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'refreshOAuthService' });
 		}
@@ -16,6 +16,6 @@ Meteor.methods({
 
 		ServiceConfiguration.configurations.remove({});
 
-		Settings.update({ _id: /^(Accounts_OAuth_|SAML_|CAS_|Blockstack_).+/ }, { $set: { _updatedAt: new Date() } }, { multi: true });
+		await Settings.update({ _id: /^(Accounts_OAuth_|SAML_|CAS_|Blockstack_).+/ }, { $set: { _updatedAt: new Date() } }, { multi: true });
 	},
 });
diff --git a/app/lib/server/methods/removeOAuthService.js b/app/lib/server/methods/removeOAuthService.js
deleted file mode 100644
index 5c271f3e75f0..000000000000
--- a/app/lib/server/methods/removeOAuthService.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { capitalize } from '@rocket.chat/string-helpers';
-import { Meteor } from 'meteor/meteor';
-import { check } from 'meteor/check';
-
-import { hasPermission } from '../../../authorization';
-import { Settings } from '../../../models/server';
-
-Meteor.methods({
-	removeOAuthService(name) {
-		check(name, String);
-
-		if (!Meteor.userId()) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'removeOAuthService' });
-		}
-
-		if (hasPermission(Meteor.userId(), 'add-oauth-service') !== true) {
-			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'removeOAuthService' });
-		}
-
-		name = name.toLowerCase().replace(/[^a-z0-9_]/g, '');
-		name = capitalize(name);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-url`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-token_path`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-identity_path`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-authorize_path`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-scope`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-access_token_param`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-token_sent_via`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-identity_token_sent_via`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-id`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-secret`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-button_label_text`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-button_label_color`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-button_color`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-login_style`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-key_field`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-username_field`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-email_field`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-name_field`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-avatar_field`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-roles_claim`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-merge_roles`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-merge_users`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-show_button`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-groups_claim`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-channels_admin`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-map_channels`);
-		Settings.removeById(`Accounts_OAuth_Custom-${ name }-groups_channel_map`);
-	},
-});
diff --git a/app/lib/server/methods/removeOAuthService.ts b/app/lib/server/methods/removeOAuthService.ts
new file mode 100644
index 000000000000..6b3f1ff535ae
--- /dev/null
+++ b/app/lib/server/methods/removeOAuthService.ts
@@ -0,0 +1,54 @@
+import { capitalize } from '@rocket.chat/string-helpers';
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+
+import { hasPermission } from '../../../authorization/server';
+import { Settings } from '../../../models/server/raw';
+
+
+Meteor.methods({
+	async removeOAuthService(name) {
+		check(name, String);
+
+		if (!Meteor.userId()) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'removeOAuthService' });
+		}
+
+		if (hasPermission(Meteor.userId(), 'add-oauth-service') !== true) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'removeOAuthService' });
+		}
+
+		name = name.toLowerCase().replace(/[^a-z0-9_]/g, '');
+		name = capitalize(name);
+		await Promise.all([
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-url`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-token_path`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-identity_path`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-authorize_path`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-scope`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-access_token_param`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-token_sent_via`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-identity_token_sent_via`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-id`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-secret`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-button_label_text`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-button_label_color`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-button_color`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-login_style`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-key_field`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-username_field`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-email_field`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-name_field`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-avatar_field`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-roles_claim`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-merge_roles`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-merge_users`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-show_button`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-groups_claim`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-channels_admin`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-map_channels`),
+			Settings.removeById(`Accounts_OAuth_Custom-${ name }-groups_channel_map`),
+		]);
+	},
+});
diff --git a/app/lib/server/methods/saveSetting.js b/app/lib/server/methods/saveSetting.js
index b375b1ad5952..993915db53f6 100644
--- a/app/lib/server/methods/saveSetting.js
+++ b/app/lib/server/methods/saveSetting.js
@@ -3,11 +3,11 @@ import { Match, check } from 'meteor/check';
 
 import { hasPermission, hasAllPermission } from '../../../authorization/server';
 import { getSettingPermissionId } from '../../../authorization/lib';
-import { Settings } from '../../../models';
 import { twoFactorRequired } from '../../../2fa/server/twoFactorRequired';
+import { Settings } from '../../../models/server/raw';
 
 Meteor.methods({
-	saveSetting: twoFactorRequired(function(_id, value, editor) {
+	saveSetting: twoFactorRequired(async function(_id, value, editor) {
 		const uid = Meteor.userId();
 		if (!uid) {
 			throw new Meteor.Error('error-action-not-allowed', 'Editing settings is not allowed', {
@@ -26,7 +26,7 @@ Meteor.methods({
 		// Verify the _id passed in is a string.
 		check(_id, String);
 
-		const setting = Settings.db.findOneById(_id);
+		const setting = await Settings.findOneById(_id);
 
 		// Verify the value is what it should be
 		switch (setting.type) {
@@ -44,7 +44,7 @@ Meteor.methods({
 				break;
 		}
 
-		Settings.updateValueAndEditorById(_id, value, editor);
+		await Settings.updateValueAndEditorById(_id, value, editor);
 		return true;
 	}),
 });
diff --git a/app/lib/server/methods/saveSettings.js b/app/lib/server/methods/saveSettings.js
index 6b99b3c7665c..6da862bd9aa5 100644
--- a/app/lib/server/methods/saveSettings.js
+++ b/app/lib/server/methods/saveSettings.js
@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
-import { hasPermission } from '../../../authorization';
-import { Settings } from '../../../models';
+import { hasPermission } from '../../../authorization/server';
 import { getSettingPermissionId } from '../../../authorization/lib';
 import { twoFactorRequired } from '../../../2fa/server/twoFactorRequired';
+import { Settings } from '../../../models/server/raw';
 
 Meteor.methods({
-	saveSettings: twoFactorRequired(function(params = []) {
+	saveSettings: twoFactorRequired(async function(params = []) {
 		const uid = Meteor.userId();
 		const settingsNotAllowed = [];
 		if (uid === null) {
@@ -18,16 +18,16 @@ Meteor.methods({
 		const editPrivilegedSetting = hasPermission(uid, 'edit-privileged-setting');
 		const manageSelectedSettings = hasPermission(uid, 'manage-selected-settings');
 
-		params.forEach(({ _id, value }) => {
+		await Promise.all(params.map(async ({ _id, value }) => {
 			// Verify the _id passed in is a string.
 			check(_id, String);
 			if (!editPrivilegedSetting && !(manageSelectedSettings && hasPermission(uid, getSettingPermissionId(_id)))) {
 				return settingsNotAllowed.push(_id);
 			}
 
-			const setting = Settings.db.findOneById(_id);
+			const setting = await Settings.findOneById(_id);
 			// Verify the value is what it should be
-			switch (setting.type) {
+			switch (setting?.type) {
 				case 'roomPick':
 					check(value, Match.OneOf([Object], ''));
 					break;
@@ -44,7 +44,7 @@ Meteor.methods({
 					check(value, String);
 					break;
 			}
-		});
+		}));
 
 		if (settingsNotAllowed.length) {
 			throw new Meteor.Error('error-action-not-allowed', 'Editing settings is not allowed', {
@@ -53,8 +53,8 @@ Meteor.methods({
 			});
 		}
 
-		params.forEach(({ _id, value, editor }) => Settings.updateValueById(_id, value, editor));
+		await Promise.all(params.map(({ _id, value, editor }) => Settings.updateValueById(_id, value, editor)));
 
 		return true;
-	}),
+	}, {}),
 });
diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js
index a7a29598250f..5720112b5463 100644
--- a/app/livechat/server/api/lib/livechat.js
+++ b/app/livechat/server/api/lib/livechat.js
@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 
-import { LivechatRooms, LivechatVisitors, LivechatDepartment, LivechatTrigger, EmojiCustom } from '../../../../models/server';
+import { LivechatRooms, LivechatVisitors, LivechatDepartment, LivechatTrigger } from '../../../../models/server';
+import { EmojiCustom } from '../../../../models/server/raw';
 import { Livechat } from '../../lib/Livechat';
 import { callbacks } from '../../../../callbacks/server';
 import { normalizeAgent } from '../../lib/Helper';
@@ -86,12 +87,12 @@ export function normalizeHttpHeaderData(headers = {}) {
 	const httpHeaders = Object.assign({}, headers);
 	return { httpHeaders };
 }
-export function settings() {
+export async function settings() {
 	const initSettings = Livechat.getInitSettings();
 	const triggers = findTriggers();
 	const departments = findDepartments();
 	const sound = `${ Meteor.absoluteUrl() }sounds/chime.mp3`;
-	const emojis = EmojiCustom.find().fetch();
+	const emojis = await EmojiCustom.find().toArray();
 	return {
 		enabled: initSettings.Livechat_enabled,
 		settings: {
diff --git a/app/livechat/server/api/v1/config.js b/app/livechat/server/api/v1/config.js
index e43509d4ba3c..f1a49c1ed395 100644
--- a/app/livechat/server/api/v1/config.js
+++ b/app/livechat/server/api/v1/config.js
@@ -17,7 +17,7 @@ API.v1.addRoute('livechat/config', {
 				return API.v1.success({ config: { enabled: false } });
 			}
 
-			const config = settings();
+			const config = Promise.await(settings());
 
 			const { token, department } = this.queryParams;
 			const status = Livechat.online(department);
diff --git a/app/livechat/server/api/v1/message.js b/app/livechat/server/api/v1/message.js
index 178f571da490..0fd39bc5d086 100644
--- a/app/livechat/server/api/v1/message.js
+++ b/app/livechat/server/api/v1/message.js
@@ -108,7 +108,7 @@ API.v1.addRoute('livechat/message/:_id', {
 			}
 
 			if (message.file) {
-				message = normalizeMessageFileUpload(message);
+				message = Promise.await(normalizeMessageFileUpload(message));
 			}
 
 			return API.v1.success({ message });
@@ -151,7 +151,7 @@ API.v1.addRoute('livechat/message/:_id', {
 			if (result) {
 				let message = Messages.findOneById(_id);
 				if (message.file) {
-					message = normalizeMessageFileUpload(message);
+					message = Promise.await(normalizeMessageFileUpload(message));
 				}
 
 				return API.v1.success({ message });
@@ -191,7 +191,7 @@ API.v1.addRoute('livechat/message/:_id', {
 				throw new Meteor.Error('invalid-message');
 			}
 
-			const result = Livechat.deleteMessage({ guest, message });
+			const result = Promise.await(Livechat.deleteMessage({ guest, message }));
 			if (result) {
 				return API.v1.success({
 					message: {
@@ -251,7 +251,7 @@ API.v1.addRoute('livechat/messages.history/:rid', {
 
 			const messages = loadMessageHistory({ userId: guest._id, rid, end, limit, ls, sort, offset, text })
 				.messages
-				.map(normalizeMessageFileUpload);
+				.map((...args) => Promise.await(normalizeMessageFileUpload(...args)));
 			return API.v1.success({ messages });
 		} catch (e) {
 			return API.v1.failure(e);
diff --git a/app/livechat/server/api/v1/room.js b/app/livechat/server/api/v1/room.js
index 5dcbf8cf1dd0..88c9e4717110 100644
--- a/app/livechat/server/api/v1/room.js
+++ b/app/livechat/server/api/v1/room.js
@@ -166,7 +166,7 @@ API.v1.addRoute('livechat/room.survey', {
 				throw new Meteor.Error('invalid-room');
 			}
 
-			const config = settings();
+			const config = Promise.await(settings());
 			if (!config.survey || !config.survey.items || !config.survey.values) {
 				throw new Meteor.Error('invalid-livechat-config');
 			}
diff --git a/app/livechat/server/api/v1/videoCall.js b/app/livechat/server/api/v1/videoCall.js
index 38b9c2d66491..7e30b10eadd7 100644
--- a/app/livechat/server/api/v1/videoCall.js
+++ b/app/livechat/server/api/v1/videoCall.js
@@ -35,7 +35,7 @@ API.v1.addRoute('livechat/video.call/:token', {
 				},
 			};
 			const { room } = getRoom({ guest, rid, roomInfo });
-			const config = settings();
+			const config = Promise.await(settings());
 			if (!config.theme || !config.theme.actionLinks) {
 				throw new Meteor.Error('invalid-livechat-config');
 			}
diff --git a/app/livechat/server/hooks/saveAnalyticsData.js b/app/livechat/server/hooks/saveAnalyticsData.js
index 4ca8832c153d..96d336c228ca 100644
--- a/app/livechat/server/hooks/saveAnalyticsData.js
+++ b/app/livechat/server/hooks/saveAnalyticsData.js
@@ -14,7 +14,7 @@ callbacks.add('afterSaveMessage', function(message, room) {
 	}
 
 	if (message.file) {
-		message = normalizeMessageFileUpload(message);
+		message = Promise.await(normalizeMessageFileUpload(message));
 	}
 
 	const now = new Date();
diff --git a/app/livechat/server/hooks/sendToCRM.js b/app/livechat/server/hooks/sendToCRM.js
index ac1ec663904b..94e4cfcd22eb 100644
--- a/app/livechat/server/hooks/sendToCRM.js
+++ b/app/livechat/server/hooks/sendToCRM.js
@@ -84,7 +84,7 @@ function sendToCRM(type, room, includeMessages = true) {
 			}
 
 			const { u } = message;
-			postData.messages.push(normalizeMessageFileUpload({ u, ...msg }));
+			postData.messages.push(Promise.await(normalizeMessageFileUpload({ u, ...msg })));
 		});
 	}
 
diff --git a/app/livechat/server/hooks/sendToFacebook.js b/app/livechat/server/hooks/sendToFacebook.js
index 1af4767e3656..7c1b00f31211 100644
--- a/app/livechat/server/hooks/sendToFacebook.js
+++ b/app/livechat/server/hooks/sendToFacebook.js
@@ -29,7 +29,7 @@ callbacks.add('afterSaveMessage', function(message, room) {
 	}
 
 	if (message.file) {
-		message = normalizeMessageFileUpload(message);
+		message = Promise.await(normalizeMessageFileUpload(message));
 	}
 
 	OmniChannel.reply({
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index aa2f93eb698d..aa399564bfa5 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -222,7 +222,7 @@ export const Livechat = {
 		return true;
 	},
 
-	deleteMessage({ guest, message }) {
+	async deleteMessage({ guest, message }) {
 		Livechat.logger.debug(`Attempting to delete a message by visitor ${ guest._id }`);
 		check(message, Match.ObjectIncluding({ _id: String }));
 
@@ -239,7 +239,7 @@ export const Livechat = {
 			throw new Meteor.Error('error-action-not-allowed', 'Message deleting not allowed', { method: 'livechatDeleteMessage' });
 		}
 
-		deleteMessage(message, guest);
+		await deleteMessage(message, guest);
 
 		return true;
 	},
diff --git a/app/livechat/server/sendMessageBySMS.js b/app/livechat/server/sendMessageBySMS.js
index 6094d1dc62a3..5e3bd1f13342 100644
--- a/app/livechat/server/sendMessageBySMS.js
+++ b/app/livechat/server/sendMessageBySMS.js
@@ -31,7 +31,7 @@ callbacks.add('afterSaveMessage', function(message, room) {
 
 	let extraData;
 	if (message.file) {
-		message = normalizeMessageFileUpload(message);
+		message = Promise.await(normalizeMessageFileUpload(message));
 		const { fileUpload, rid, u: { _id: userId } = {} } = message;
 		extraData = Object.assign({}, { rid, userId, fileUpload });
 	}
diff --git a/app/livechat/server/statistics/LivechatAgentActivityMonitor.js b/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
index 1066e112f027..2c894afe4f1f 100644
--- a/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
+++ b/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
@@ -3,7 +3,8 @@ import { Meteor } from 'meteor/meteor';
 import { SyncedCron } from 'meteor/littledata:synced-cron';
 
 import { callbacks } from '../../../callbacks/server';
-import { LivechatAgentActivity, Sessions, Users } from '../../../models/server';
+import { LivechatAgentActivity, Users } from '../../../models/server';
+import { Sessions } from '../../../models/server/raw';
 
 const formatDate = (dateTime = new Date()) => ({
 	date: parseInt(moment(dateTime).format('YYYYMMDD')),
@@ -12,7 +13,6 @@ const formatDate = (dateTime = new Date()) => ({
 export class LivechatAgentActivityMonitor {
 	constructor() {
 		this._started = false;
-		this._handleMeteorConnection = this._handleMeteorConnection.bind(this);
 		this._handleAgentStatusChanged = this._handleAgentStatusChanged.bind(this);
 		this._handleUserStatusLivechatChanged = this._handleUserStatusLivechatChanged.bind(this);
 		this._name = 'Livechat Agent Activity Monitor';
@@ -41,7 +41,7 @@ export class LivechatAgentActivityMonitor {
 			return;
 		}
 		this._startMonitoring();
-		Meteor.onConnection(this._handleMeteorConnection);
+		Meteor.onConnection((connection) => this._handleMeteorConnection(connection));
 		callbacks.add('livechat.agentStatusChanged', this._handleAgentStatusChanged);
 		callbacks.add('livechat.setUserStatusLivechat', this._handleUserStatusLivechatChanged);
 		this._started = true;
@@ -75,12 +75,12 @@ export class LivechatAgentActivityMonitor {
 		}
 	}
 
-	_handleMeteorConnection(connection) {
+	async _handleMeteorConnection(connection) {
 		if (!this.isRunning()) {
 			return;
 		}
 
-		const session = Sessions.findOne({ sessionId: connection.id });
+		const session = await Sessions.findOne({ sessionId: connection.id });
 		if (!session) {
 			return;
 		}
diff --git a/app/meteor-accounts-saml/server/lib/SAML.ts b/app/meteor-accounts-saml/server/lib/SAML.ts
index 5de64393352a..a0c60ff1d3a5 100644
--- a/app/meteor-accounts-saml/server/lib/SAML.ts
+++ b/app/meteor-accounts-saml/server/lib/SAML.ts
@@ -8,7 +8,8 @@ import fiber from 'fibers';
 import { escapeRegExp, escapeHTML } from '@rocket.chat/string-helpers';
 
 import { settings } from '../../../settings/server';
-import { Users, Rooms, CredentialTokens } from '../../../models/server';
+import { Users, Rooms } from '../../../models/server';
+import { CredentialTokens } from '../../../models/server/raw';
 import { IUser } from '../../../../definition/IUser';
 import { IIncomingMessage } from '../../../../definition/IIncomingMessage';
 import { saveUserIdentity, createRoom, generateUsernameSuggestion, addUserToRoom } from '../../../lib/server/functions';
@@ -55,20 +56,20 @@ export class SAML {
 		}
 	}
 
-	public static hasCredential(credentialToken: string): boolean {
-		return CredentialTokens.findOneById(credentialToken) != null;
+	public static async hasCredential(credentialToken: string): Promise<boolean> {
+		return await CredentialTokens.findOneNotExpiredById(credentialToken) != null;
 	}
 
-	public static retrieveCredential(credentialToken: string): Record<string, any> | undefined {
+	public static async retrieveCredential(credentialToken: string): Promise<Record<string, any> | undefined> {
 		// The credentialToken in all these functions corresponds to SAMLs inResponseTo field and is mandatory to check.
-		const data = CredentialTokens.findOneById(credentialToken);
+		const data = await CredentialTokens.findOneNotExpiredById(credentialToken);
 		if (data) {
 			return data.userInfo;
 		}
 	}
 
-	public static storeCredential(credentialToken: string, loginResult: object): void {
-		CredentialTokens.create(credentialToken, loginResult);
+	public static async storeCredential(credentialToken: string, loginResult: {profile: Record<string, any>}): Promise<void> {
+		await CredentialTokens.create(credentialToken, loginResult);
 	}
 
 	public static insertOrUpdateSAMLUser(userObject: ISAMLUser): {userId: string; token: string} {
@@ -380,7 +381,7 @@ export class SAML {
 	private static processValidateAction(req: IIncomingMessage, res: ServerResponse, service: IServiceProviderOptions, _samlObject: ISAMLAction): void {
 		const serviceProvider = new SAMLServiceProvider(service);
 		SAMLUtils.relayState = req.body.RelayState;
-		serviceProvider.validateResponse(req.body.SAMLResponse, (err, profile/* , loggedOut*/) => {
+		serviceProvider.validateResponse(req.body.SAMLResponse, async (err, profile/* , loggedOut*/) => {
 			try {
 				if (err) {
 					SAMLUtils.error(err);
@@ -400,7 +401,7 @@ export class SAML {
 					profile,
 				};
 
-				this.storeCredential(credentialToken, loginResult);
+				await this.storeCredential(credentialToken, loginResult);
 				const url = `${ Meteor.absoluteUrl('home') }?saml_idp_credentialToken=${ credentialToken }`;
 				res.writeHead(302, {
 					Location: url,
diff --git a/app/meteor-accounts-saml/server/loginHandler.ts b/app/meteor-accounts-saml/server/loginHandler.ts
index 6b73c7f386ec..edb58716d974 100644
--- a/app/meteor-accounts-saml/server/loginHandler.ts
+++ b/app/meteor-accounts-saml/server/loginHandler.ts
@@ -17,7 +17,7 @@ Accounts.registerLoginHandler('saml', function(loginRequest) {
 		return undefined;
 	}
 
-	const loginResult = SAML.retrieveCredential(loginRequest.credentialToken);
+	const loginResult = Promise.await(SAML.retrieveCredential(loginRequest.credentialToken));
 	SAMLUtils.log({ msg: 'RESULT', loginResult });
 
 	if (!loginResult) {
diff --git a/app/metrics/server/lib/collectMetrics.js b/app/metrics/server/lib/collectMetrics.js
index 98267f9ca855..f72437df2f04 100644
--- a/app/metrics/server/lib/collectMetrics.js
+++ b/app/metrics/server/lib/collectMetrics.js
@@ -10,7 +10,7 @@ import { Facts } from 'meteor/facts-base';
 import { Info, getOplogInfo } from '../../../utils/server';
 import { getControl } from '../../../../server/lib/migrations';
 import { settings } from '../../../settings/server';
-import { Statistics } from '../../../models/server';
+import { Statistics } from '../../../models/server/raw';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { metrics } from './metrics';
 import { getAppsStatistics } from '../../../statistics/server/lib/getAppsStatistics';
@@ -42,7 +42,7 @@ const setPrometheusData = async () => {
 	const oplogQueue = getOplogInfo().mongo._oplogHandle?._entryQueue?.length || 0;
 	metrics.oplogQueue.set(oplogQueue);
 
-	const statistics = Statistics.findLast();
+	const statistics = await Statistics.findLast();
 	if (!statistics) {
 		return;
 	}
diff --git a/app/models/server/index.js b/app/models/server/index.js
index 8c9094d654ef..5507cf53f0aa 100644
--- a/app/models/server/index.js
+++ b/app/models/server/index.js
@@ -1,31 +1,11 @@
 import { Base } from './models/_Base';
 import { BaseDb } from './models/_BaseDb';
-import Avatars from './models/Avatars';
-import ExportOperations from './models/ExportOperations';
 import Messages from './models/Messages';
-import Reports from './models/Reports';
 import Rooms from './models/Rooms';
 import Settings from './models/Settings';
 import Subscriptions from './models/Subscriptions';
-import Uploads from './models/Uploads';
-import UserDataFiles from './models/UserDataFiles';
 import Users from './models/Users';
-import Sessions from './models/Sessions';
-import Statistics from './models/Statistics';
-import Permissions from './models/Permissions';
-import Roles from './models/Roles';
-import CustomSounds from './models/CustomSounds';
-import CustomUserStatus from './models/CustomUserStatus';
 import Imports from './models/Imports';
-import Integrations from './models/Integrations';
-import IntegrationHistory from './models/IntegrationHistory';
-import Invites from './models/Invites';
-import CredentialTokens from './models/CredentialTokens';
-import EmojiCustom from './models/EmojiCustom';
-import OAuthApps from './models/OAuthApps';
-import OEmbedCache from './models/OEmbedCache';
-import SmarshHistory from './models/SmarshHistory';
-import WebdavAccounts from './models/WebdavAccounts';
 import LivechatCustomField from './models/LivechatCustomField';
 import LivechatDepartment from './models/LivechatDepartment';
 import LivechatDepartmentAgents from './models/LivechatDepartmentAgents';
@@ -35,50 +15,24 @@ import LivechatTrigger from './models/LivechatTrigger';
 import LivechatVisitors from './models/LivechatVisitors';
 import LivechatAgentActivity from './models/LivechatAgentActivity';
 import LivechatInquiry from './models/LivechatInquiry';
-import ReadReceipts from './models/ReadReceipts';
 import LivechatExternalMessage from './models/LivechatExternalMessages';
 import OmnichannelQueue from './models/OmnichannelQueue';
-import Analytics from './models/Analytics';
-import EmailInbox from './models/EmailInbox';
 import ImportData from './models/ImportData';
 
 export { AppsLogsModel } from './models/apps-logs-model';
 export { AppsPersistenceModel } from './models/apps-persistence-model';
 export { AppsModel } from './models/apps-model';
-export { FederationDNSCache } from './models/FederationDNSCache';
 export { FederationRoomEvents } from './models/FederationRoomEvents';
-export { FederationKeys } from './models/FederationKeys';
-export { FederationServers } from './models/FederationServers';
 
 export {
 	Base,
 	BaseDb,
-	Avatars,
-	ExportOperations,
 	Messages,
-	Reports,
 	Rooms,
 	Settings,
 	Subscriptions,
-	Uploads,
-	UserDataFiles,
 	Users,
-	Sessions,
-	Statistics,
-	Permissions,
-	Roles,
-	CustomSounds,
-	CustomUserStatus,
 	Imports,
-	Integrations,
-	IntegrationHistory,
-	Invites,
-	CredentialTokens,
-	EmojiCustom,
-	OAuthApps,
-	OEmbedCache,
-	SmarshHistory,
-	WebdavAccounts,
 	LivechatCustomField,
 	LivechatDepartment,
 	LivechatDepartmentAgents,
@@ -87,11 +41,8 @@ export {
 	LivechatTrigger,
 	LivechatVisitors,
 	LivechatAgentActivity,
-	ReadReceipts,
 	LivechatExternalMessage,
 	LivechatInquiry,
-	Analytics,
 	OmnichannelQueue,
-	EmailInbox,
 	ImportData,
 };
diff --git a/app/models/server/models/Analytics.js b/app/models/server/models/Analytics.js
deleted file mode 100644
index c521fda8923e..000000000000
--- a/app/models/server/models/Analytics.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Base } from './_Base';
-
-export class Analytics extends Base {
-	constructor() {
-		super('analytics');
-		this.tryEnsureIndex({ date: 1 });
-		this.tryEnsureIndex({ 'room._id': 1, date: 1 }, { unique: true });
-	}
-}
-
-export default new Analytics();
diff --git a/app/models/server/models/Avatars.js b/app/models/server/models/Avatars.js
deleted file mode 100644
index b0e7e8cb5da1..000000000000
--- a/app/models/server/models/Avatars.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import _ from 'underscore';
-import s from 'underscore.string';
-import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
-
-import { Base } from './_Base';
-
-export class Avatars extends Base {
-	constructor() {
-		super('avatars');
-
-		this.model.before.insert((userId, doc) => {
-			doc.instanceId = InstanceStatus.id();
-		});
-
-		this.tryEnsureIndex({ name: 1 }, { sparse: true });
-		this.tryEnsureIndex({ rid: 1 }, { sparse: true });
-	}
-
-	insertAvatarFileInit(name, userId, store, file, extra) {
-		const fileData = {
-			_id: name,
-			name,
-			userId,
-			store,
-			complete: false,
-			uploading: true,
-			progress: 0,
-			extension: s.strRightBack(file.name, '.'),
-			uploadedAt: new Date(),
-		};
-
-		_.extend(fileData, file, extra);
-
-		return this.insertOrUpsert(fileData);
-	}
-
-	updateFileComplete(fileId, userId, file) {
-		if (!fileId) {
-			return;
-		}
-
-		const filter = {
-			_id: fileId,
-			userId,
-		};
-
-		const update = {
-			$set: {
-				complete: true,
-				uploading: false,
-				progress: 1,
-			},
-		};
-
-		update.$set = _.extend(file, update.$set);
-
-		if (this.model.direct && this.model.direct.update) {
-			return this.model.direct.update(filter, update);
-		}
-		return this.update(filter, update);
-	}
-
-	findOneByName(name) {
-		return this.findOne({ name });
-	}
-
-	findOneByRoomId(rid) {
-		return this.findOne({ rid });
-	}
-
-	updateFileNameById(fileId, name) {
-		const filter = { _id: fileId };
-		const update = {
-			$set: {
-				name,
-			},
-		};
-		if (this.model.direct && this.model.direct.update) {
-			return this.model.direct.update(filter, update);
-		}
-		return this.update(filter, update);
-	}
-
-	deleteFile(fileId) {
-		if (this.model.direct && this.model.direct.remove) {
-			return this.model.direct.remove({ _id: fileId });
-		}
-		return this.remove({ _id: fileId });
-	}
-}
-
-export default new Avatars();
diff --git a/app/models/server/models/CredentialTokens.js b/app/models/server/models/CredentialTokens.js
deleted file mode 100644
index 7659538e032e..000000000000
--- a/app/models/server/models/CredentialTokens.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Base } from './_Base';
-
-export class CredentialTokens extends Base {
-	constructor() {
-		super('credential_tokens');
-
-		this.tryEnsureIndex({ expireAt: 1 }, { sparse: 1, expireAfterSeconds: 0 });
-	}
-
-	create(_id, userInfo) {
-		const validForMilliseconds = 60000;		// Valid for 60 seconds
-		const token = {
-			_id,
-			userInfo,
-			expireAt: new Date(Date.now() + validForMilliseconds),
-		};
-
-		this.insert(token);
-		return token;
-	}
-
-	findOneById(_id) {
-		const query = {
-			_id,
-			expireAt: { $gt: new Date() },
-		};
-
-		return this.findOne(query);
-	}
-}
-
-export default new CredentialTokens();
diff --git a/app/models/server/models/CustomSounds.js b/app/models/server/models/CustomSounds.js
deleted file mode 100644
index b9971b954229..000000000000
--- a/app/models/server/models/CustomSounds.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Base } from './_Base';
-
-class CustomSounds extends Base {
-	constructor() {
-		super('custom_sounds');
-
-		this.tryEnsureIndex({ name: 1 });
-	}
-
-	// find one
-	findOneById(_id, options) {
-		return this.findOne(_id, options);
-	}
-
-	// find
-	findByName(name, options) {
-		const query = {
-			name,
-		};
-
-		return this.find(query, options);
-	}
-
-	findByNameExceptId(name, except, options) {
-		const query = {
-			_id: { $nin: [except] },
-			name,
-		};
-
-		return this.find(query, options);
-	}
-
-	// update
-	setName(_id, name) {
-		const update = {
-			$set: {
-				name,
-			},
-		};
-
-		return this.update({ _id }, update);
-	}
-
-	// INSERT
-	create(data) {
-		return this.insert(data);
-	}
-
-
-	// REMOVE
-	removeById(_id) {
-		return this.remove(_id);
-	}
-}
-
-export default new CustomSounds();
diff --git a/app/models/server/models/CustomUserStatus.js b/app/models/server/models/CustomUserStatus.js
deleted file mode 100644
index eb3a586da6ba..000000000000
--- a/app/models/server/models/CustomUserStatus.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Base } from './_Base';
-
-class CustomUserStatus extends Base {
-	constructor() {
-		super('custom_user_status');
-
-		this.tryEnsureIndex({ name: 1 });
-	}
-
-	// find one
-	findOneById(_id, options) {
-		return this.findOne(_id, options);
-	}
-
-	// find one by name
-	findOneByName(name, options) {
-		return this.findOne({ name }, options);
-	}
-
-	// find
-	findByName(name, options) {
-		const query = {
-			name,
-		};
-
-		return this.find(query, options);
-	}
-
-	findByNameExceptId(name, except, options) {
-		const query = {
-			_id: { $nin: [except] },
-			name,
-		};
-
-		return this.find(query, options);
-	}
-
-	// update
-	setName(_id, name) {
-		const update = {
-			$set: {
-				name,
-			},
-		};
-
-		return this.update({ _id }, update);
-	}
-
-	setStatusType(_id, statusType) {
-		const update = {
-			$set: {
-				statusType,
-			},
-		};
-
-		return this.update({ _id }, update);
-	}
-
-	// INSERT
-	create(data) {
-		return this.insert(data);
-	}
-
-
-	// REMOVE
-	removeById(_id) {
-		return this.remove(_id);
-	}
-}
-
-export default new CustomUserStatus();
diff --git a/app/models/server/models/EmailInbox.js b/app/models/server/models/EmailInbox.js
deleted file mode 100644
index 490628be3383..000000000000
--- a/app/models/server/models/EmailInbox.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Base } from './_Base';
-
-export class EmailInbox extends Base {
-	constructor() {
-		super('email_inbox');
-
-		this.tryEnsureIndex({ email: 1 }, { unique: true });
-	}
-
-	findOneById(_id, options) {
-		return this.findOne(_id, options);
-	}
-
-	create(data) {
-		return this.insert(data);
-	}
-
-	updateById(_id, data) {
-		return this.update({ _id }, data);
-	}
-
-	removeById(_id) {
-		return this.remove(_id);
-	}
-}
-
-export default new EmailInbox();
diff --git a/app/models/server/models/EmojiCustom.js b/app/models/server/models/EmojiCustom.js
deleted file mode 100644
index d0cd7d7bc4cb..000000000000
--- a/app/models/server/models/EmojiCustom.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import { Base } from './_Base';
-
-class EmojiCustom extends Base {
-	constructor() {
-		super('custom_emoji');
-
-		this.tryEnsureIndex({ name: 1 });
-		this.tryEnsureIndex({ aliases: 1 });
-		this.tryEnsureIndex({ extension: 1 });
-	}
-
-	// find one
-	findOneById(_id, options) {
-		return this.findOne(_id, options);
-	}
-
-	// find
-	findByNameOrAlias(emojiName, options) {
-		let name = emojiName;
-
-		if (typeof emojiName === 'string') {
-			name = emojiName.replace(/:/g, '');
-		}
-
-		const query = {
-			$or: [
-				{ name },
-				{ aliases: name },
-			],
-		};
-
-		return this.find(query, options);
-	}
-
-	findByNameOrAliasExceptID(name, except, options) {
-		const query = {
-			_id: { $nin: [except] },
-			$or: [
-				{ name },
-				{ aliases: name },
-			],
-		};
-
-		return this.find(query, options);
-	}
-
-
-	// update
-	setName(_id, name) {
-		const update = {
-			$set: {
-				name,
-			},
-		};
-
-		return this.update({ _id }, update);
-	}
-
-	setAliases(_id, aliases) {
-		const update = {
-			$set: {
-				aliases,
-			},
-		};
-
-		return this.update({ _id }, update);
-	}
-
-	setExtension(_id, extension) {
-		const update = {
-			$set: {
-				extension,
-			},
-		};
-
-		return this.update({ _id }, update);
-	}
-
-	// INSERT
-	create(data) {
-		return this.insert(data);
-	}
-
-
-	// REMOVE
-	removeById(_id) {
-		return this.remove(_id);
-	}
-}
-
-export default new EmojiCustom();
diff --git a/app/models/server/models/ExportOperations.js b/app/models/server/models/ExportOperations.js
deleted file mode 100644
index fb70d38925ca..000000000000
--- a/app/models/server/models/ExportOperations.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import _ from 'underscore';
-
-import { Base } from './_Base';
-
-export class ExportOperations extends Base {
-	constructor() {
-		super('export_operations');
-
-		this.tryEnsureIndex({ userId: 1 });
-		this.tryEnsureIndex({ status: 1 });
-	}
-
-	// FIND
-	findById(id) {
-		const query = { _id: id };
-
-		return this.find(query);
-	}
-
-	findLastOperationByUser(userId, fullExport = false, options = {}) {
-		const query = {
-			userId,
-			fullExport,
-		};
-
-		options.sort = { createdAt: -1 };
-		return this.findOne(query, options);
-	}
-
-	findPendingByUser(userId, options) {
-		const query = {
-			userId,
-			status: {
-				$nin: ['completed', 'skipped'],
-			},
-		};
-
-		return this.find(query, options);
-	}
-
-	findAllPending(options) {
-		const query = {
-			status: { $nin: ['completed', 'skipped'] },
-		};
-
-		return this.find(query, options);
-	}
-
-	findOnePending(options) {
-		const query = {
-			status: { $nin: ['completed', 'skipped'] },
-		};
-
-		return this.findOne(query, options);
-	}
-
-	findAllPendingBeforeMyRequest(requestDay, options) {
-		const query = {
-			status: { $nin: ['completed', 'skipped'] },
-			createdAt: { $lt: requestDay },
-		};
-
-		return this.find(query, options);
-	}
-
-	// UPDATE
-	updateOperation(data) {
-		const update = {
-			$set: {
-				roomList: data.roomList,
-				status: data.status,
-				fileList: data.fileList,
-				generatedFile: data.generatedFile,
-				fileId: data.fileId,
-				userNameTable: data.userNameTable,
-				userData: data.userData,
-				generatedUserFile: data.generatedUserFile,
-				generatedAvatar: data.generatedAvatar,
-				exportPath: data.exportPath,
-				assetsPath: data.assetsPath,
-			},
-		};
-
-		return this.update(data._id, update);
-	}
-
-
-	// INSERT
-	create(data) {
-		const exportOperation = {
-			createdAt: new Date(),
-		};
-
-		_.extend(exportOperation, data);
-
-		this.insert(exportOperation);
-
-		return exportOperation._id;
-	}
-
-
-	// REMOVE
-	removeById(_id) {
-		return this.remove(_id);
-	}
-}
-
-export default new ExportOperations();
diff --git a/app/models/server/models/FederationDNSCache.js b/app/models/server/models/FederationDNSCache.js
deleted file mode 100644
index 155deed53b95..000000000000
--- a/app/models/server/models/FederationDNSCache.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Base } from './_Base';
-
-class FederationDNSCacheModel extends Base {
-	constructor() {
-		super('federation_dns_cache');
-	}
-
-	findOneByDomain(domain) {
-		return this.findOne({ domain });
-	}
-}
-
-export const FederationDNSCache = new FederationDNSCacheModel();
diff --git a/app/models/server/models/FederationKeys.js b/app/models/server/models/FederationKeys.js
deleted file mode 100644
index 188f7cdc434e..000000000000
--- a/app/models/server/models/FederationKeys.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import NodeRSA from 'node-rsa';
-
-import { Base } from './_Base';
-
-class FederationKeysModel extends Base {
-	constructor() {
-		super('federation_keys');
-	}
-
-	getKey(type) {
-		const keyResource = this.findOne({ type });
-
-		if (!keyResource) { return null; }
-
-		return keyResource.key;
-	}
-
-	loadKey(keyData, type) {
-		return new NodeRSA(keyData, `pkcs8-${ type }-pem`);
-	}
-
-	generateKeys() {
-		const key = new NodeRSA({ b: 512 });
-
-		key.generateKeyPair();
-
-		this.update({ type: 'private' }, { type: 'private', key: key.exportKey('pkcs8-private-pem').replace(/\n|\r/g, '') }, { upsert: true });
-
-		this.update({ type: 'public' }, { type: 'public', key: key.exportKey('pkcs8-public-pem').replace(/\n|\r/g, '') }, { upsert: true });
-
-		return {
-			privateKey: this.getPrivateKey(),
-			publicKey: this.getPublicKey(),
-		};
-	}
-
-	getPrivateKey() {
-		const keyData = this.getKey('private');
-
-		return keyData && this.loadKey(keyData, 'private');
-	}
-
-	getPrivateKeyString() {
-		return this.getKey('private');
-	}
-
-	getPublicKey() {
-		const keyData = this.getKey('public');
-
-		return keyData && this.loadKey(keyData, 'public');
-	}
-
-	getPublicKeyString() {
-		return this.getKey('public');
-	}
-}
-
-export const FederationKeys = new FederationKeysModel();
diff --git a/app/models/server/models/FederationServers.js b/app/models/server/models/FederationServers.js
deleted file mode 100644
index 9daf20d5a128..000000000000
--- a/app/models/server/models/FederationServers.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Base } from './_Base';
-import { Users } from '../raw';
-
-class FederationServersModel extends Base {
-	constructor() {
-		super('federation_servers');
-
-		this.tryEnsureIndex({ domain: 1 });
-	}
-
-	async refreshServers() {
-		const domains = await Users.getDistinctFederationDomains();
-
-		domains.forEach((domain) => {
-			this.update({ domain }, {
-				$setOnInsert: {
-					domain,
-				},
-			}, { upsert: true });
-		});
-
-		this.remove({ domain: { $nin: domains } });
-	}
-}
-
-export const FederationServers = new FederationServersModel();
diff --git a/app/models/server/models/InstanceStatus.js b/app/models/server/models/InstanceStatus.js
deleted file mode 100644
index 344381e44266..000000000000
--- a/app/models/server/models/InstanceStatus.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
-
-import { Base } from './_Base';
-
-export class InstanceStatusModel extends Base {}
-
-export default new InstanceStatusModel(InstanceStatus.getCollection(), { preventSetUpdatedAt: true });
diff --git a/app/models/server/models/IntegrationHistory.js b/app/models/server/models/IntegrationHistory.js
deleted file mode 100644
index 817deae0d789..000000000000
--- a/app/models/server/models/IntegrationHistory.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import { Base } from './_Base';
-
-export class IntegrationHistory extends Base {
-	constructor() {
-		super('integration_history');
-	}
-
-	findByType(type, options) {
-		if (type !== 'outgoing-webhook' || type !== 'incoming-webhook') {
-			throw new Meteor.Error('invalid-integration-type');
-		}
-
-		return this.find({ type }, options);
-	}
-
-	findByIntegrationId(id, options) {
-		return this.find({ 'integration._id': id }, options);
-	}
-
-	findByIntegrationIdAndCreatedBy(id, creatorId, options) {
-		return this.find({ 'integration._id': id, 'integration._createdBy._id': creatorId }, options);
-	}
-
-	findOneByIntegrationIdAndHistoryId(integrationId, historyId) {
-		return this.findOne({ 'integration._id': integrationId, _id: historyId });
-	}
-
-	findByEventName(event, options) {
-		return this.find({ event }, options);
-	}
-
-	findFailed(options) {
-		return this.find({ error: true }, options);
-	}
-
-	removeByIntegrationId(integrationId) {
-		return this.remove({ 'integration._id': integrationId });
-	}
-}
-
-export default new IntegrationHistory();
diff --git a/app/models/server/models/Integrations.js b/app/models/server/models/Integrations.js
deleted file mode 100644
index ffbf40c1dcce..000000000000
--- a/app/models/server/models/Integrations.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import { Base } from './_Base';
-
-export class Integrations extends Base {
-	constructor() {
-		super('integrations');
-
-		this.tryEnsureIndex({ type: 1 });
-	}
-
-	findByType(type, options) {
-		if (type !== 'webhook-incoming' && type !== 'webhook-outgoing') {
-			throw new Meteor.Error('invalid-type-to-find');
-		}
-
-		return this.find({ type }, options);
-	}
-
-	disableByUserId(userId) {
-		return this.update({ userId }, { $set: { enabled: false } }, { multi: true });
-	}
-
-	updateRoomName(oldRoomName, newRoomName) {
-		const hashedOldRoomName = `#${ oldRoomName }`;
-		const hashedNewRoomName = `#${ newRoomName }`;
-		return this.update({ channel: hashedOldRoomName }, { $set: { 'channel.$': hashedNewRoomName } }, { multi: true });
-	}
-}
-
-export default new Integrations();
diff --git a/app/models/server/models/Invites.js b/app/models/server/models/Invites.js
deleted file mode 100644
index 517c1780f0ba..000000000000
--- a/app/models/server/models/Invites.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Base } from './_Base';
-
-class Invites extends Base {
-	constructor() {
-		super('invites');
-	}
-
-	findOneByUserRoomMaxUsesAndExpiration(userId, rid, maxUses, daysToExpire) {
-		const query = {
-			rid,
-			userId,
-			days: daysToExpire,
-			maxUses,
-		};
-
-		if (daysToExpire > 0) {
-			query.expires = {
-				$gt: new Date(),
-			};
-		}
-
-		if (maxUses > 0) {
-			query.uses = {
-				$lt: maxUses,
-			};
-		}
-
-		return this.findOne(query);
-	}
-
-	// INSERT
-	create(data) {
-		return this.insert(data);
-	}
-
-	// REMOVE
-	removeById(_id) {
-		return this.remove({ _id });
-	}
-
-	// UPDATE
-	increaseUsageById(_id, uses = 1) {
-		return this.update({ _id }, {
-			$inc: {
-				uses,
-			},
-		});
-	}
-}
-
-export default new Invites();
diff --git a/app/models/server/models/NotificationQueue.js b/app/models/server/models/NotificationQueue.js
deleted file mode 100644
index 32eb7524c2c2..000000000000
--- a/app/models/server/models/NotificationQueue.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Base } from './_Base';
-
-export class NotificationQueue extends Base {
-	constructor() {
-		super('notification_queue');
-		this.tryEnsureIndex({ uid: 1 });
-		this.tryEnsureIndex({ ts: 1 }, { expireAfterSeconds: 2 * 60 * 60 });
-		this.tryEnsureIndex({ schedule: 1 }, { sparse: true });
-		this.tryEnsureIndex({ sending: 1 }, { sparse: true });
-		this.tryEnsureIndex({ error: 1 }, { sparse: true });
-	}
-}
-
-export default new NotificationQueue();
diff --git a/app/models/server/models/OAuthApps.js b/app/models/server/models/OAuthApps.js
deleted file mode 100644
index 6aedffb63ae0..000000000000
--- a/app/models/server/models/OAuthApps.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Base } from './_Base';
-
-export class OAuthApps extends Base {
-	constructor() {
-		super('oauth_apps');
-	}
-}
-
-export default new OAuthApps();
diff --git a/app/models/server/models/OEmbedCache.js b/app/models/server/models/OEmbedCache.js
deleted file mode 100644
index db4383b9cd34..000000000000
--- a/app/models/server/models/OEmbedCache.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Base } from './_Base';
-
-export class OEmbedCache extends Base {
-	constructor() {
-		super('oembed_cache');
-		this.tryEnsureIndex({ updatedAt: 1 });
-	}
-
-	// FIND ONE
-	findOneById(_id, options) {
-		const query = {
-			_id,
-		};
-		return this.findOne(query, options);
-	}
-
-	// INSERT
-	createWithIdAndData(_id, data) {
-		const record = {
-			_id,
-			data,
-			updatedAt: new Date(),
-		};
-		record._id = this.insert(record);
-		return record;
-	}
-
-	// REMOVE
-	removeAfterDate(date) {
-		const query = {
-			updatedAt: {
-				$lte: date,
-			},
-		};
-		return this.remove(query);
-	}
-}
-
-export default new OEmbedCache();
diff --git a/app/models/server/models/Permissions.js b/app/models/server/models/Permissions.js
deleted file mode 100644
index 009f29d37f9d..000000000000
--- a/app/models/server/models/Permissions.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Base } from './_Base';
-
-export class Permissions extends Base {
-	// FIND
-	findByRole(role, options) {
-		const query = {
-			roles: role,
-		};
-
-		return this.find(query, options);
-	}
-
-	findOneById(_id) {
-		return this.findOne({ _id });
-	}
-
-	createOrUpdate(name, roles) {
-		const exists = this.findOne({
-			_id: name,
-			roles,
-		}, { fields: { _id: 1 } });
-
-		if (exists) {
-			return exists._id;
-		}
-
-		this.upsert({ _id: name }, { $set: { roles } });
-	}
-
-	create(name, roles) {
-		const exists = this.findOneById(name, { fields: { _id: 1 } });
-
-		if (exists) {
-			return exists._id;
-		}
-
-		this.upsert({ _id: name }, { $set: { roles } });
-	}
-
-	addRole(permission, role) {
-		this.update({ _id: permission, roles: { $ne: role } }, { $addToSet: { roles: role } });
-	}
-
-	removeRole(permission, role) {
-		this.update({ _id: permission, roles: role }, { $pull: { roles: role } });
-	}
-}
-
-export default new Permissions('permissions');
diff --git a/app/models/server/models/ReadReceipts.js b/app/models/server/models/ReadReceipts.js
deleted file mode 100644
index d830f400669f..000000000000
--- a/app/models/server/models/ReadReceipts.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Base } from './_Base';
-
-export class ReadReceipts extends Base {
-	constructor(...args) {
-		super(...args);
-
-		this.tryEnsureIndex({
-			roomId: 1,
-			userId: 1,
-			messageId: 1,
-		}, {
-			unique: 1,
-		});
-
-		this.tryEnsureIndex({
-			messageId: 1,
-		});
-	}
-
-	findByMessageId(messageId) {
-		return this.find({ messageId });
-	}
-}
-
-export default new ReadReceipts('message_read_receipt');
diff --git a/app/models/server/models/Reports.js b/app/models/server/models/Reports.js
deleted file mode 100644
index 4d2ab019f19b..000000000000
--- a/app/models/server/models/Reports.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import _ from 'underscore';
-
-import { Base } from './_Base';
-
-export class Reports extends Base {
-	constructor() {
-		super('reports');
-	}
-
-	createWithMessageDescriptionAndUserId(message, description, userId, extraData) {
-		const record = {
-			message,
-			description,
-			ts: new Date(),
-			userId,
-		};
-		_.extend(record, extraData);
-		record._id = this.insert(record);
-		return record;
-	}
-}
-
-export default new Reports();
diff --git a/app/models/server/models/Roles.js b/app/models/server/models/Roles.js
deleted file mode 100644
index e7576191d070..000000000000
--- a/app/models/server/models/Roles.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import { Base } from './_Base';
-import * as Models from '..';
-
-
-export class Roles extends Base {
-	constructor(...args) {
-		super(...args);
-		this.tryEnsureIndex({ name: 1 });
-		this.tryEnsureIndex({ scope: 1 });
-	}
-
-	findUsersInRole(name, scope, options) {
-		const role = this.findOneByName(name);
-		const roleScope = (role && role.scope) || 'Users';
-		const model = Models[roleScope];
-
-		return model && model.findUsersInRoles && model.findUsersInRoles(name, scope, options);
-	}
-
-	isUserInRoles(userId, roles, scope) {
-		roles = [].concat(roles);
-		return roles.some((roleName) => {
-			const role = this.findOneByName(roleName);
-			const roleScope = (role && role.scope) || 'Users';
-			const model = Models[roleScope];
-
-			return model && model.isUserInRole && model.isUserInRole(userId, roleName, scope);
-		});
-	}
-
-	updateById(_id, name, scope, description, mandatory2fa) {
-		const queryData = {
-			name,
-			scope,
-			description,
-			mandatory2fa,
-		};
-
-		this.upsert({ _id }, { $set: queryData });
-	}
-
-	createWithRandomId(name, scope = 'Users', description = '', protectedRole = true, mandatory2fa = false) {
-		const role = {
-			name,
-			scope,
-			description,
-			protected: protectedRole,
-			mandatory2fa,
-		};
-
-		return this.insert(role);
-	}
-
-	createOrUpdate(name, scope = 'Users', description = '', protectedRole = true, mandatory2fa = false) {
-		const queryData = {
-			name,
-			scope,
-			description,
-			protected: protectedRole,
-			mandatory2fa,
-		};
-
-		this.upsert({ _id: name }, { $set: queryData });
-	}
-
-	addUserRoles(userId, roles, scope) {
-		roles = [].concat(roles);
-		for (const roleName of roles) {
-			const role = this.findOneByName(roleName);
-			const roleScope = (role && role.scope) || 'Users';
-			const model = Models[roleScope];
-
-			model && model.addRolesByUserId && model.addRolesByUserId(userId, roleName, scope);
-		}
-		return true;
-	}
-
-	removeUserRoles(userId, roles, scope) {
-		roles = [].concat(roles);
-		for (const roleName of roles) {
-			const role = this.findOneByName(roleName);
-			const roleScope = (role && role.scope) || 'Users';
-			const model = Models[roleScope];
-
-			model && model.removeRolesByUserId && model.removeRolesByUserId(userId, roleName, scope);
-		}
-		return true;
-	}
-
-	findOneByIdOrName(_idOrName, options) {
-		const query = {
-			$or: [{
-				_id: _idOrName,
-			}, {
-				name: _idOrName,
-			}],
-		};
-
-		return this.findOne(query, options);
-	}
-
-	findOneByName(name, options) {
-		const query = {
-			name,
-		};
-
-		return this.findOne(query, options);
-	}
-
-	findByUpdatedDate(updatedAfterDate, options) {
-		const query = {
-			_updatedAt: { $gte: new Date(updatedAfterDate) },
-		};
-
-		return this.find(query, options);
-	}
-
-	canAddUserToRole(uid, roleName, scope) {
-		const role = this.findOne({ name: roleName }, { fields: { scope: 1 } });
-		if (!role) {
-			return false;
-		}
-
-		const model = Models[role.scope];
-		if (!model) {
-			return;
-		}
-
-		const user = model.isUserInRoleScope(uid, scope);
-		return !!user;
-	}
-}
-
-export default new Roles('roles');
diff --git a/app/models/server/models/Rooms.js b/app/models/server/models/Rooms.js
index d884208317fc..460bed352f07 100644
--- a/app/models/server/models/Rooms.js
+++ b/app/models/server/models/Rooms.js
@@ -5,7 +5,6 @@ import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Base } from './_Base';
 import Messages from './Messages';
 import Subscriptions from './Subscriptions';
-import { getValidRoomName } from '../../../utils';
 
 export class Rooms extends Base {
 	constructor(...args) {
@@ -335,6 +334,7 @@ export class Rooms extends Base {
 		let channelName = s.trim(name);
 		try {
 			// TODO evaluate if this function call should be here
+			const { getValidRoomName } = import('../../../utils/lib/getValidRoomName');
 			channelName = getValidRoomName(channelName, null, { allowDuplicates: true });
 		} catch (e) {
 			console.error(e);
diff --git a/app/models/server/models/ServerEvents.ts b/app/models/server/models/ServerEvents.ts
deleted file mode 100644
index 09b17ac51067..000000000000
--- a/app/models/server/models/ServerEvents.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Base } from './_Base';
-
-export class ServerEvents extends Base {
-	constructor() {
-		super('server_events');
-		this.tryEnsureIndex({ t: 1, ip: 1, ts: -1 });
-		this.tryEnsureIndex({ t: 1, 'u.username': 1, ts: -1 });
-	}
-}
-
-export default new ServerEvents();
diff --git a/app/models/server/models/Sessions.mocks.js b/app/models/server/models/Sessions.mocks.js
deleted file mode 100644
index ac4b22bf7780..000000000000
--- a/app/models/server/models/Sessions.mocks.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import mock from 'mock-require';
-
-mock('./_Base', {
-	Base: class Base {
-		model = {
-			rawDatabase() {
-				return {
-					collection() {},
-					options: {},
-				};
-			},
-		}
-
-		tryEnsureIndex() {}
-	},
-});
diff --git a/app/models/server/models/SmarshHistory.js b/app/models/server/models/SmarshHistory.js
deleted file mode 100644
index 9b2b7abc5043..000000000000
--- a/app/models/server/models/SmarshHistory.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Base } from './_Base';
-
-export class SmarshHistory extends Base {
-	constructor() {
-		super('smarsh_history');
-	}
-}
-
-export default new SmarshHistory();
diff --git a/app/models/server/models/Statistics.js b/app/models/server/models/Statistics.js
deleted file mode 100644
index 014f8c8180d2..000000000000
--- a/app/models/server/models/Statistics.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Base } from './_Base';
-
-export class Statistics extends Base {
-	constructor() {
-		super('statistics');
-
-		this.tryEnsureIndex({ createdAt: -1 });
-	}
-
-	// FIND ONE
-	findOneById(_id, options) {
-		const query = { _id };
-		return this.findOne(query, options);
-	}
-
-	findLast() {
-		const options = {
-			sort: {
-				createdAt: -1,
-			},
-			limit: 1,
-		};
-		const records = this.find({}, options).fetch();
-		return records && records[0];
-	}
-}
-
-export default new Statistics();
diff --git a/app/models/server/models/Uploads.js b/app/models/server/models/Uploads.js
deleted file mode 100644
index ce56ea6d0c0f..000000000000
--- a/app/models/server/models/Uploads.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import _ from 'underscore';
-import s from 'underscore.string';
-import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
-import { escapeRegExp } from '@rocket.chat/string-helpers';
-
-import { Base } from './_Base';
-
-const fillTypeGroup = (fileData) => {
-	if (!fileData.type) {
-		return;
-	}
-
-	fileData.typeGroup = fileData.type.split('/').shift();
-};
-
-export class Uploads extends Base {
-	constructor() {
-		super('uploads');
-
-		this.model.before.insert((userId, doc) => {
-			doc.instanceId = InstanceStatus.id();
-		});
-
-		this.tryEnsureIndex({ rid: 1 });
-		this.tryEnsureIndex({ uploadedAt: 1 });
-		this.tryEnsureIndex({ typeGroup: 1 });
-	}
-
-	findNotHiddenFilesOfRoom(roomId, searchText, fileType, limit) {
-		const fileQuery = {
-			rid: roomId,
-			complete: true,
-			uploading: false,
-			_hidden: {
-				$ne: true,
-			},
-		};
-
-		if (searchText) {
-			fileQuery.name = { $regex: new RegExp(escapeRegExp(searchText), 'i') };
-		}
-
-		if (fileType && fileType !== 'all') {
-			fileQuery.typeGroup = fileType;
-		}
-
-		const fileOptions = {
-			limit,
-			sort: {
-				uploadedAt: -1,
-			},
-			fields: {
-				_id: 1,
-				userId: 1,
-				rid: 1,
-				name: 1,
-				description: 1,
-				type: 1,
-				url: 1,
-				uploadedAt: 1,
-				typeGroup: 1,
-			},
-		};
-
-		return this.find(fileQuery, fileOptions);
-	}
-
-	insert(fileData, ...args) {
-		fillTypeGroup(fileData);
-		return super.insert(fileData, ...args);
-	}
-
-	update(filter, update, ...args) {
-		if (update.$set) {
-			fillTypeGroup(update.$set);
-		} else if (update.type) {
-			fillTypeGroup(update);
-		}
-
-		return super.update(filter, update, ...args);
-	}
-
-	insertFileInit(userId, store, file, extra) {
-		const fileData = {
-			userId,
-			store,
-			complete: false,
-			uploading: true,
-			progress: 0,
-			extension: s.strRightBack(file.name, '.'),
-			uploadedAt: new Date(),
-		};
-
-		_.extend(fileData, file, extra);
-
-		if (this.model.direct && this.model.direct.insert != null) {
-			fillTypeGroup(fileData);
-			file = this.model.direct.insert(fileData);
-		} else {
-			file = this.insert(fileData);
-		}
-
-		return file;
-	}
-
-	updateFileComplete(fileId, userId, file) {
-		let result;
-		if (!fileId) {
-			return;
-		}
-
-		const filter = {
-			_id: fileId,
-			userId,
-		};
-
-		const update = {
-			$set: {
-				complete: true,
-				uploading: false,
-				progress: 1,
-			},
-		};
-
-		update.$set = _.extend(file, update.$set);
-
-		if (this.model.direct && this.model.direct.update != null) {
-			fillTypeGroup(update.$set);
-
-			result = this.model.direct.update(filter, update);
-		} else {
-			result = this.update(filter, update);
-		}
-
-		return result;
-	}
-
-	deleteFile(fileId) {
-		if (this.model.direct && this.model.direct.remove != null) {
-			return this.model.direct.remove({ _id: fileId });
-		}
-		return this.remove({ _id: fileId });
-	}
-}
-
-export default new Uploads();
diff --git a/app/models/server/models/UserDataFiles.js b/app/models/server/models/UserDataFiles.js
deleted file mode 100644
index a877188ff03b..000000000000
--- a/app/models/server/models/UserDataFiles.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import _ from 'underscore';
-
-import { Base } from './_Base';
-
-export class UserDataFiles extends Base {
-	constructor() {
-		super('user_data_files');
-
-		this.tryEnsureIndex({ userId: 1 });
-	}
-
-	// FIND
-	findById(id) {
-		const query = { _id: id };
-		return this.find(query);
-	}
-
-	findLastFileByUser(userId, options = {}) {
-		const query = {
-			userId,
-		};
-
-		options.sort = { _updatedAt: -1 };
-		return this.findOne(query, options);
-	}
-
-	// INSERT
-	create(data) {
-		const userDataFile = {
-			createdAt: new Date(),
-		};
-
-		_.extend(userDataFile, data);
-
-		return this.insert(userDataFile);
-	}
-
-	// REMOVE
-	removeById(_id) {
-		return this.remove(_id);
-	}
-}
-
-export default new UserDataFiles();
diff --git a/app/models/server/models/UsersSessions.js b/app/models/server/models/UsersSessions.js
deleted file mode 100644
index 43aec902d343..000000000000
--- a/app/models/server/models/UsersSessions.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { UsersSessions } from 'meteor/konecty:user-presence';
-
-import { Base } from './_Base';
-
-export class UsersSessionsModel extends Base {}
-
-export default new UsersSessionsModel(UsersSessions, { preventSetUpdatedAt: true });
diff --git a/app/models/server/models/WebdavAccounts.js b/app/models/server/models/WebdavAccounts.js
deleted file mode 100644
index 09df0b64a3a6..000000000000
--- a/app/models/server/models/WebdavAccounts.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Webdav Accounts model
- */
-import { Base } from './_Base';
-
-export class WebdavAccounts extends Base {
-	constructor() {
-		super('webdav_accounts');
-
-		this.tryEnsureIndex({ user_id: 1 });
-	}
-
-	findWithUserId(user_id, options) {
-		const query = { user_id };
-		return this.find(query, options);
-	}
-
-	removeByUserAndId(_id, user_id) {
-		return this.remove({ _id, user_id });
-	}
-
-	removeById(_id) {
-		return this.remove({ _id });
-	}
-}
-
-export default new WebdavAccounts();
diff --git a/app/models/server/models/_BaseDb.js b/app/models/server/models/_BaseDb.js
index 6c9473c81fb8..f72bb6c84557 100644
--- a/app/models/server/models/_BaseDb.js
+++ b/app/models/server/models/_BaseDb.js
@@ -30,31 +30,14 @@ const actions = {
 	d: 'remove',
 };
 
-export class BaseDb extends EventEmitter {
-	constructor(model, baseModel, options = {}) {
+export class BaseDbWatch extends EventEmitter {
+	constructor(collectionName) {
 		super();
-
-		if (Match.test(model, String)) {
-			this.name = model;
-			this.collectionName = this.baseName + this.name;
-			this.model = new Mongo.Collection(this.collectionName);
-		} else {
-			this.name = model._name;
-			this.collectionName = this.name;
-			this.model = model;
-		}
-
-		this.baseModel = baseModel;
-
-		this.preventSetUpdatedAt = !!options.preventSetUpdatedAt;
-
-		this.wrapModel();
+		this.collectionName = collectionName;
 
 		if (!process.env.DISABLE_DB_WATCH) {
 			this.initDbWatch();
 		}
-
-		this.tryEnsureIndex({ _updatedAt: 1 }, options._updatedAtIndexOptions);
 	}
 
 	initDbWatch() {
@@ -97,6 +80,104 @@ export class BaseDb extends EventEmitter {
 		}
 	}
 
+	processOplogRecord({ id, op }) {
+		const action = actions[op.op];
+		metrics.oplog.inc({
+			collection: this.collectionName,
+			op: action,
+		});
+
+		if (action === 'insert') {
+			this.emit('change', {
+				action,
+				clientAction: 'inserted',
+				id: op.o._id,
+				data: op.o,
+				oplog: true,
+			});
+			return;
+		}
+
+		if (action === 'update') {
+			if (!op.o.$set && !op.o.$unset) {
+				this.emit('change', {
+					action,
+					clientAction: 'updated',
+					id,
+					data: op.o,
+					oplog: true,
+				});
+				return;
+			}
+
+			const diff = {};
+			if (op.o.$set) {
+				for (const key in op.o.$set) {
+					if (op.o.$set.hasOwnProperty(key)) {
+						diff[key] = op.o.$set[key];
+					}
+				}
+			}
+			const unset = {};
+			if (op.o.$unset) {
+				for (const key in op.o.$unset) {
+					if (op.o.$unset.hasOwnProperty(key)) {
+						diff[key] = undefined;
+						unset[key] = 1;
+					}
+				}
+			}
+
+			this.emit('change', {
+				action,
+				clientAction: 'updated',
+				id,
+				diff,
+				unset,
+				oplog: true,
+			});
+			return;
+		}
+
+		if (action === 'remove') {
+			this.emit('change', {
+				action,
+				clientAction: 'removed',
+				id,
+				oplog: true,
+			});
+		}
+	}
+}
+
+
+export class BaseDb extends BaseDbWatch {
+	constructor(model, baseModel, options = {}) {
+		const collectionName = Match.test(model, String) ? baseName + model : model._name;
+
+		super(collectionName);
+
+		this.collectionName = collectionName;
+
+		if (Match.test(model, String)) {
+			this.name = model;
+			this.collectionName = this.baseName + this.name;
+			this.model = new Mongo.Collection(this.collectionName);
+		} else {
+			this.name = model._name;
+			this.collectionName = this.name;
+			this.model = model;
+		}
+
+		this.baseModel = baseModel;
+
+		this.preventSetUpdatedAt = !!options.preventSetUpdatedAt;
+
+		this.wrapModel();
+
+		this.tryEnsureIndex({ _updatedAt: 1 }, options._updatedAtIndexOptions);
+	}
+
 	get baseName() {
 		return baseName;
 	}
@@ -204,75 +285,6 @@ export class BaseDb extends EventEmitter {
 		);
 	}
 
-	processOplogRecord({ id, op }) {
-		const action = actions[op.op];
-		metrics.oplog.inc({
-			collection: this.collectionName,
-			op: action,
-		});
-
-		if (action === 'insert') {
-			this.emit('change', {
-				action,
-				clientAction: 'inserted',
-				id: op.o._id,
-				data: op.o,
-				oplog: true,
-			});
-			return;
-		}
-
-		if (action === 'update') {
-			if (!op.o.$set && !op.o.$unset) {
-				this.emit('change', {
-					action,
-					clientAction: 'updated',
-					id,
-					data: op.o,
-					oplog: true,
-				});
-				return;
-			}
-
-			const diff = {};
-			if (op.o.$set) {
-				for (const key in op.o.$set) {
-					if (op.o.$set.hasOwnProperty(key)) {
-						diff[key] = op.o.$set[key];
-					}
-				}
-			}
-			const unset = {};
-			if (op.o.$unset) {
-				for (const key in op.o.$unset) {
-					if (op.o.$unset.hasOwnProperty(key)) {
-						diff[key] = undefined;
-						unset[key] = 1;
-					}
-				}
-			}
-
-			this.emit('change', {
-				action,
-				clientAction: 'updated',
-				id,
-				diff,
-				unset,
-				oplog: true,
-			});
-			return;
-		}
-
-		if (action === 'remove') {
-			this.emit('change', {
-				action,
-				clientAction: 'removed',
-				id,
-				oplog: true,
-			});
-		}
-	}
-
 	insert(record, ...args) {
 		this.setUpdatedAt(record);
 
diff --git a/app/models/server/raw/Analytics.js b/app/models/server/raw/Analytics.js
deleted file mode 100644
index 81e0ad335c26..000000000000
--- a/app/models/server/raw/Analytics.js
+++ /dev/null
@@ -1,151 +0,0 @@
-import { Random } from 'meteor/random';
-
-import { BaseRaw } from './BaseRaw';
-import Analytics from '../models/Analytics';
-import { readSecondaryPreferred } from '../../../../server/database/readSecondaryPreferred';
-
-export class AnalyticsRaw extends BaseRaw {
-	saveMessageSent({ room, date }) {
-		return this.update({ date, 'room._id': room._id, type: 'messages' }, {
-			$set: {
-				room: { _id: room._id, name: room.fname || room.name, t: room.t, usernames: room.usernames || [] },
-			},
-			$setOnInsert: {
-				_id: Random.id(),
-				date,
-				type: 'messages',
-			},
-			$inc: { messages: 1 },
-		}, { upsert: true });
-	}
-
-	saveUserData({ date }) {
-		return this.update({ date, type: 'users' }, {
-			$setOnInsert: {
-				_id: Random.id(),
-				date,
-				type: 'users',
-			},
-			$inc: { users: 1 },
-		}, { upsert: true });
-	}
-
-	saveMessageDeleted({ room, date }) {
-		return this.update({ date, 'room._id': room._id }, {
-			$inc: { messages: -1 },
-		});
-	}
-
-	getMessagesSentTotalByDate({ start, end, options = {} }) {
-		const params = [
-			{
-				$match: {
-					type: 'messages',
-					date: { $gte: start, $lte: end },
-				},
-			},
-			{
-				$group: {
-					_id: '$date',
-					messages: { $sum: '$messages' },
-				},
-			},
-		];
-		if (options.sort) {
-			params.push({ $sort: options.sort });
-		}
-		if (options.count) {
-			params.push({ $limit: options.count });
-		}
-		return this.col.aggregate(params).toArray();
-	}
-
-	getMessagesOrigin({ start, end }) {
-		const params = [
-			{
-				$match: {
-					type: 'messages',
-					date: { $gte: start, $lte: end },
-				},
-			},
-			{
-				$group: {
-					_id: { t: '$room.t' },
-					messages: { $sum: '$messages' },
-				},
-			},
-			{
-				$project: {
-					_id: 0,
-					t: '$_id.t',
-					messages: 1,
-				},
-			},
-		];
-		return this.col.aggregate(params).toArray();
-	}
-
-	getMostPopularChannelsByMessagesSentQuantity({ start, end, options = {} }) {
-		const params = [
-			{
-				$match: {
-					type: 'messages',
-					date: { $gte: start, $lte: end },
-				},
-			},
-			{
-				$group: {
-					_id: { t: '$room.t', name: '$room.name', usernames: '$room.usernames' },
-					messages: { $sum: '$messages' },
-				},
-			},
-			{
-				$project: {
-					_id: 0,
-					t: '$_id.t',
-					name: '$_id.name',
-					usernames: '$_id.usernames',
-					messages: 1,
-				},
-			},
-		];
-		if (options.sort) {
-			params.push({ $sort: options.sort });
-		}
-		if (options.count) {
-			params.push({ $limit: options.count });
-		}
-		return this.col.aggregate(params).toArray();
-	}
-
-	getTotalOfRegisteredUsersByDate({ start, end, options = {} }) {
-		const params = [
-			{
-				$match: {
-					type: 'users',
-					date: { $gte: start, $lte: end },
-				},
-			},
-			{
-				$group: {
-					_id: '$date',
-					users: { $sum: '$users' },
-				},
-			},
-		];
-		if (options.sort) {
-			params.push({ $sort: options.sort });
-		}
-		if (options.count) {
-			params.push({ $limit: options.count });
-		}
-		return this.col.aggregate(params).toArray();
-	}
-
-	findByTypeBeforeDate({ type, date }) {
-		return this.find({ type, date: { $lte: date } });
-	}
-}
-
-const db = Analytics.model.rawDatabase();
-export default new AnalyticsRaw(db.collection(Analytics.model._name, { readPreference: readSecondaryPreferred(db) }));
diff --git a/app/models/server/raw/Analytics.ts b/app/models/server/raw/Analytics.ts
new file mode 100644
index 000000000000..943274853746
--- /dev/null
+++ b/app/models/server/raw/Analytics.ts
@@ -0,0 +1,146 @@
+import { Random } from 'meteor/random';
+import { AggregationCursor, Cursor, SortOptionObject, UpdateWriteOpResult } from 'mongodb';
+
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { IAnalytic } from '../../../../definition/IAnalytic';
+import { IRoom } from '../../../../definition/IRoom';
+
+type T = IAnalytic;
+
+export class AnalyticsRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { date: 1 } },
+		{ key: { 'room._id': 1, date: 1 }, unique: true },
+	];
+
+	saveMessageSent({ room, date }: { room: IRoom; date: IAnalytic['date'] }): Promise<UpdateWriteOpResult> {
+		return this.updateMany({ date, 'room._id': room._id, type: 'messages' }, {
+			$set: {
+				room: {
+					_id: room._id,
+					name: room.fname || room.name,
+					t: room.t,
+					usernames: room.usernames || [],
+				},
+			},
+			$setOnInsert: {
+				_id: Random.id(),
+				date,
+				type: 'messages',
+			},
+			$inc: { messages: 1 },
+		}, { upsert: true });
+	}
+
+	saveUserData({ date }: { date: IAnalytic['date'] }): Promise<UpdateWriteOpResult> {
+		return this.updateMany({ date, type: 'users' }, {
+			$setOnInsert: {
+				_id: Random.id(),
+				date,
+				type: 'users',
+			},
+			$inc: { users: 1 },
+		}, { upsert: true });
+	}
+
+	saveMessageDeleted({ room, date }: { room: { _id: string }; date: IAnalytic['date'] }): Promise<UpdateWriteOpResult> {
+		return this.updateMany({ date, 'room._id': room._id }, {
+			$inc: { messages: -1 },
+		});
+	}
+
+	getMessagesSentTotalByDate({ start, end, options = {} }: { start: IAnalytic['date']; end: IAnalytic['date']; options?: { sort?: SortOptionObject<T>; count?: number } }): AggregationCursor<T> {
+		return this.col.aggregate([
+			{
+				$match: {
+					type: 'messages',
+					date: { $gte: start, $lte: end },
+				},
+			},
+			{
+				$group: {
+					_id: '$date',
+					messages: { $sum: '$messages' },
+				},
+			},
+			...options.sort ? [{ $sort: options.sort }] : [],
+			...options.count ? [{ $limit: options.count }] : [],
+		]);
+	}
+
+	getMessagesOrigin({ start, end }: { start: IAnalytic['date']; end: IAnalytic['date'] }): AggregationCursor<T> {
+		const params = [
+			{
+				$match: {
+					type: 'messages',
+					date: { $gte: start, $lte: end },
+				},
+			},
+			{
+				$group: {
+					_id: { t: '$room.t' },
+					messages: { $sum: '$messages' },
+				},
+			},
+			{
+				$project: {
+					_id: 0,
+					t: '$_id.t',
+					messages: 1,
+				},
+			},
+		];
+		return this.col.aggregate(params);
+	}
+
+	getMostPopularChannelsByMessagesSentQuantity({ start, end, options = {} }: { start: IAnalytic['date']; end: IAnalytic['date']; options?: { sort?: SortOptionObject<T>; count?: number } }): AggregationCursor<T> {
+		return this.col.aggregate([
+			{
+				$match: {
+					type: 'messages',
+					date: { $gte: start, $lte: end },
+				},
+			},
+			{
+				$group: {
+					_id: { t: '$room.t', name: '$room.name', usernames: '$room.usernames' },
+					messages: { $sum: '$messages' },
+				},
+			},
+			{
+				$project: {
+					_id: 0,
+					t: '$_id.t',
+					name: '$_id.name',
+					usernames: '$_id.usernames',
+					messages: 1,
+				},
+			},
+			...options.sort ? [{ $sort: options.sort }] : [],
+			...options.count ? [{ $limit: options.count }] : [],
+		]);
+	}
+
+	getTotalOfRegisteredUsersByDate({ start, end, options = {} }: { start: IAnalytic['date']; end: IAnalytic['date']; options?: { sort?: SortOptionObject<T>; count?: number } }): AggregationCursor<T> {
+		return this.col.aggregate([
+			{
+				$match: {
+					type: 'users',
+					date: { $gte: start, $lte: end },
+				},
+			},
+			{
+				$group: {
+					_id: '$date',
+					users: { $sum: '$users' },
+				},
+			},
+			...options.sort ? [{ $sort: options.sort }] : [],
+			...options.count ? [{ $limit: options.count }] : [],
+		]);
+	}
+
+	findByTypeBeforeDate({ type, date }: { type: T['type']; date: T['date'] }): Cursor<T> {
+		return this.find({ type, date: { $lte: date } });
+	}
+}
diff --git a/app/models/server/raw/Avatars.ts b/app/models/server/raw/Avatars.ts
new file mode 100644
index 000000000000..cc9c5939f3b3
--- /dev/null
+++ b/app/models/server/raw/Avatars.ts
@@ -0,0 +1,73 @@
+import { DeleteWriteOpResultObject, UpdateWriteOpResult } from 'mongodb';
+
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { IAvatar as T } from '../../../../definition/IAvatar';
+
+export class AvatarsRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { name: 1 }, sparse: true },
+		{ key: { rid: 1 }, sparse: true },
+	];
+
+	insertAvatarFileInit(name: string, userId: string, store: string, file: {name: string}, extra: object): Promise<UpdateWriteOpResult> {
+		const fileData = {
+			name,
+			userId,
+			store,
+			complete: false,
+			uploading: true,
+			progress: 0,
+			extension: file.name.split('.').pop(),
+			uploadedAt: new Date(),
+		};
+
+		Object.assign(fileData, file, extra);
+
+		return this.updateOne({ _id: name }, fileData, { upsert: true });
+	}
+
+	updateFileComplete(fileId: string, userId: string, file: object): Promise<UpdateWriteOpResult> | undefined {
+		if (!fileId) {
+			return;
+		}
+
+		const filter = {
+			_id: fileId,
+			userId,
+		};
+
+		const update = {
+			$set: {
+				complete: true,
+				uploading: false,
+				progress: 1,
+			},
+		};
+
+		update.$set = Object.assign(file, update.$set);
+
+		return this.updateOne(filter, update);
+	}
+
+	async findOneByName(name: string): Promise<T | null> {
+		return this.findOne({ name });
+	}
+
+	async findOneByRoomId(rid: string): Promise<T | null> {
+		return this.findOne({ rid });
+	}
+
+	async updateFileNameById(fileId: string, name: string): Promise<UpdateWriteOpResult> {
+		const filter = { _id: fileId };
+		const update = {
+			$set: {
+				name,
+			},
+		};
+		return this.updateOne(filter, update);
+	}
+
+	async deleteFile(fileId: string): Promise<DeleteWriteOpResultObject> {
+		return this.deleteOne({ _id: fileId });
+	}
+}
diff --git a/app/models/server/raw/BaseRaw.ts b/app/models/server/raw/BaseRaw.ts
index 602d8a62542a..500fe55d6e1a 100644
--- a/app/models/server/raw/BaseRaw.ts
+++ b/app/models/server/raw/BaseRaw.ts
@@ -1,10 +1,14 @@
 import {
 	Collection,
 	CollectionInsertOneOptions,
+	CommonOptions,
 	Cursor,
 	DeleteWriteOpResultObject,
 	FilterQuery,
+	FindAndModifyWriteOpResultObject,
+	FindOneAndUpdateOption,
 	FindOneOptions,
+	IndexSpecification,
 	InsertOneWriteOpResult,
 	InsertWriteOpResult,
 	ObjectID,
@@ -21,6 +25,10 @@ import {
 
 import { setUpdatedAt } from '../lib/setUpdatedAt';
 
+export {
+	IndexSpecification,
+} from 'mongodb';
+
 // [extracted from @types/mongo] TypeScript Omit (Exclude to be specific) does not work for objects with an "any" indexed type, and breaks discriminated unions
 type EnhancedOmit<T, K> = string | number extends keyof T
 	? T // T has indexed type e.g. { _id: string; [k: string]: any; } or it is "any"
@@ -37,7 +45,7 @@ type ExtractIdType<TSchema> = TSchema extends { _id: infer U } // user has defin
 			: U
 	: ObjectId;
 
-type ModelOptionalId<T> = EnhancedOmit<T, '_id'> & { _id?: ExtractIdType<T> };
+export type ModelOptionalId<T> = EnhancedOmit<T, '_id'> & { _id?: ExtractIdType<T> };
 // InsertionModel forces both _id and _updatedAt to be optional, regardless of how they are declared in T
 export type InsertionModel<T> = EnhancedOmit<ModelOptionalId<T>, '_updatedAt'> & { _updatedAt?: Date };
 
@@ -58,13 +66,43 @@ const warnFields = process.env.NODE_ENV !== 'production'
 export class BaseRaw<T, C extends DefaultFields<T> = undefined> implements IBaseRaw<T> {
 	public readonly defaultFields: C;
 
+	protected indexes?: IndexSpecification[];
+
 	protected name: string;
 
+	private preventSetUpdatedAt: boolean;
+
 	constructor(
 		public readonly col: Collection<T>,
 		public readonly trash?: Collection<T>,
+		options?: { preventSetUpdatedAt?: boolean },
 	) {
 		this.name = this.col.collectionName.replace(baseName, '');
+
+		if (this.indexes?.length) {
+			this.col.createIndexes(this.indexes);
+		}
+
+		this.preventSetUpdatedAt = options?.preventSetUpdatedAt ?? false;
+	}
+
+	private doNotMixInclusionAndExclusionFields(options: FindOneOptions<T> = {}): FindOneOptions<T> {
+		const optionsDef = this.ensureDefaultFields(options);
+		if (optionsDef?.projection === undefined) {
+			return optionsDef;
+		}
+
+		const projection: Record<string, any> = optionsDef?.projection;
+		const keys = Object.keys(projection);
+		const removeKeys = keys.filter((key) => projection[key] === 0);
+		if (keys.length > removeKeys.length) {
+			removeKeys.forEach((key) => delete projection[key]);
+		}
+
+		return {
+			...optionsDef,
+			projection,
+		};
 	}
 
 	private ensureDefaultFields(options?: undefined): C extends void ? undefined : WithoutProjection<FindOneOptions<T>>;
@@ -78,26 +116,32 @@ export class BaseRaw<T, C extends DefaultFields<T> = undefined> implements IBase
 			return options;
 		}
 
-		const { fields, ...rest } = options || {};
+		const { fields: deprecatedFields, projection, ...rest } = options || {};
 
-		if (fields) {
+		if (deprecatedFields) {
 			warnFields('Using \'fields\' in models is deprecated.', options);
 		}
 
+		const fields = { ...deprecatedFields, ...projection };
+
 		return {
 			projection: this.defaultFields,
-			...fields && { projection: fields },
+			...fields && Object.values(fields).length && { projection: fields },
 			...rest,
 		};
 	}
 
+	public findOneAndUpdate(query: FilterQuery<T>, update: UpdateQuery<T> | T, options?: FindOneAndUpdateOption<T>): Promise<FindAndModifyWriteOpResultObject<T>> {
+		return this.col.findOneAndUpdate(query, update, options);
+	}
+
 	async findOneById(_id: string, options?: WithoutProjection<FindOneOptions<T>> | undefined): Promise<T | null>;
 
 	async findOneById<P>(_id: string, options: FindOneOptions<P extends T ? T : P>): Promise<P | null>;
 
 	async findOneById<P>(_id: string, options?: any): Promise<T | P | null> {
 		const query = { _id } as FilterQuery<T>;
-		const optionsDef = this.ensureDefaultFields(options);
+		const optionsDef = this.doNotMixInclusionAndExclusionFields(options);
 		return this.col.findOne(query, optionsDef);
 	}
 
@@ -110,13 +154,13 @@ export class BaseRaw<T, C extends DefaultFields<T> = undefined> implements IBase
 	async findOne<P>(query: FilterQuery<T> | string = {}, options?: any): Promise<T | P | null> {
 		const q = typeof query === 'string' ? { _id: query } as FilterQuery<T> : query;
 
-		const optionsDef = this.ensureDefaultFields(options);
+		const optionsDef = this.doNotMixInclusionAndExclusionFields(options);
 		return this.col.findOne(q, optionsDef);
 	}
 
-	findUsersInRoles(): void {
-		throw new Error('[overwrite-function] You must overwrite this function in the extended classes');
-	}
+	// findUsersInRoles(): void {
+	// 	throw new Error('[overwrite-function] You must overwrite this function in the extended classes');
+	// }
 
 	find(query?: FilterQuery<T>): Cursor<ResultFields<T, C>>;
 
@@ -125,22 +169,22 @@ export class BaseRaw<T, C extends DefaultFields<T> = undefined> implements IBase
 	find<P>(query: FilterQuery<T>, options: FindOneOptions<P extends T ? T : P>): Cursor<P>;
 
 	find<P>(query: FilterQuery<T> | undefined = {}, options?: any): Cursor<P> | Cursor<T> {
-		const optionsDef = this.ensureDefaultFields(options);
+		const optionsDef = this.doNotMixInclusionAndExclusionFields(options);
 		return this.col.find(query, optionsDef);
 	}
 
 	update(filter: FilterQuery<T>, update: UpdateQuery<T> | Partial<T>, options?: UpdateOneOptions & { multi?: boolean }): Promise<WriteOpResult> {
-		setUpdatedAt(update);
+		this.setUpdatedAt(update);
 		return this.col.update(filter, update, options);
 	}
 
 	updateOne(filter: FilterQuery<T>, update: UpdateQuery<T> | Partial<T>, options?: UpdateOneOptions & { multi?: boolean }): Promise<UpdateWriteOpResult> {
-		setUpdatedAt(update);
+		this.setUpdatedAt(update);
 		return this.col.updateOne(filter, update, options);
 	}
 
 	updateMany(filter: FilterQuery<T>, update: UpdateQuery<T> | Partial<T>, options?: UpdateManyOptions): Promise<UpdateWriteOpResult> {
-		setUpdatedAt(update);
+		this.setUpdatedAt(update);
 		return this.col.updateMany(filter, update, options);
 	}
 
@@ -150,7 +194,7 @@ export class BaseRaw<T, C extends DefaultFields<T> = undefined> implements IBase
 				const oid = new ObjectID();
 				return { _id: oid.toHexString(), ...doc };
 			}
-			setUpdatedAt(doc);
+			this.setUpdatedAt(doc);
 			return doc;
 		});
 
@@ -164,7 +208,7 @@ export class BaseRaw<T, C extends DefaultFields<T> = undefined> implements IBase
 			doc = { _id: oid.toHexString(), ...doc };
 		}
 
-		setUpdatedAt(doc);
+		this.setUpdatedAt(doc);
 
 		// TODO reavaluate following type casting
 		return this.col.insertOne(doc as unknown as OptionalId<T>, options);
@@ -175,6 +219,15 @@ export class BaseRaw<T, C extends DefaultFields<T> = undefined> implements IBase
 		return this.col.deleteOne(query);
 	}
 
+	deleteOne(filter: FilterQuery<T>, options?: CommonOptions & { bypassDocumentValidation?: boolean }): Promise<DeleteWriteOpResultObject> {
+		return this.col.deleteOne(filter, options);
+	}
+
+	deleteMany(filter: FilterQuery<T>, options?: CommonOptions): Promise<DeleteWriteOpResultObject> {
+		return this.col.deleteMany(filter, options);
+	}
+
+
 	// Trash
 	trashFind<P>(query: FilterQuery<T>, options: FindOneOptions<P extends T ? T : P>): Cursor<P> | undefined {
 		if (!this.trash) {
@@ -214,4 +267,29 @@ export class BaseRaw<T, C extends DefaultFields<T> = undefined> implements IBase
 		}
 		return trash.findOne(query, options);
 	}
+
+	private setUpdatedAt(record: UpdateQuery<T> | InsertionModel<T>): void {
+		if (this.preventSetUpdatedAt) {
+			return;
+		}
+		setUpdatedAt(record);
+	}
+
+	trashFindDeletedAfter<P extends T>(deletedAt: Date, query: FilterQuery<T> = {}, options?: any): Cursor <T | P> {
+		const q = {
+			__collection__: this.name,
+			_deletedAt: {
+				$gt: deletedAt,
+			},
+			...query,
+		} as FilterQuery<T>;
+
+		const { trash } = this;
+
+		if (!trash) {
+			throw new Error('Trash is not enabled for this collection');
+		}
+
+		return trash.find(q, options);
+	}
 }
diff --git a/app/models/server/raw/CredentialTokens.ts b/app/models/server/raw/CredentialTokens.ts
new file mode 100644
index 000000000000..eb6db2786682
--- /dev/null
+++ b/app/models/server/raw/CredentialTokens.ts
@@ -0,0 +1,29 @@
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { ICredentialToken as T } from '../../../../definition/ICredentialToken';
+
+export class CredentialTokensRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { expireAt: 1 }, sparse: true, expireAfterSeconds: 0 },
+	]
+
+	async create(_id: string, userInfo: T['userInfo']): Promise<T> {
+		const validForMilliseconds = 60000; // Valid for 60 seconds
+		const token = {
+			_id,
+			userInfo,
+			expireAt: new Date(Date.now() + validForMilliseconds),
+		};
+
+		await this.insertOne(token);
+		return token;
+	}
+
+	findOneNotExpiredById(_id: string): Promise<T | null> {
+		const query = {
+			_id,
+			expireAt: { $gt: new Date() },
+		};
+
+		return this.findOne(query);
+	}
+}
diff --git a/app/models/server/raw/CustomSounds.js b/app/models/server/raw/CustomSounds.js
deleted file mode 100644
index 54e96f064512..000000000000
--- a/app/models/server/raw/CustomSounds.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { BaseRaw } from './BaseRaw';
-
-export class CustomSoundsRaw extends BaseRaw {
-
-}
diff --git a/app/models/server/raw/CustomSounds.ts b/app/models/server/raw/CustomSounds.ts
new file mode 100644
index 000000000000..c46b7f4b4141
--- /dev/null
+++ b/app/models/server/raw/CustomSounds.ts
@@ -0,0 +1,44 @@
+import { Cursor, FindOneOptions, InsertOneWriteOpResult, UpdateWriteOpResult, WithId, WithoutProjection } from 'mongodb';
+
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { ICustomSound as T } from '../../../../definition/ICustomSound';
+
+export class CustomSoundsRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { name: 1 } },
+	]
+
+	// find
+	findByName(name: string, options: WithoutProjection<FindOneOptions<T>>): Cursor<T> {
+		const query = {
+			name,
+		};
+
+		return this.find(query, options);
+	}
+
+	findByNameExceptId(name: string, except: string, options: WithoutProjection<FindOneOptions<T>>): Cursor<T> {
+		const query = {
+			_id: { $nin: [except] },
+			name,
+		};
+
+		return this.find(query, options);
+	}
+
+	// update
+	setName(_id: string, name: string): Promise<UpdateWriteOpResult> {
+		const update = {
+			$set: {
+				name,
+			},
+		};
+
+		return this.updateOne({ _id }, update);
+	}
+
+	// INSERT
+	create(data: T): Promise<InsertOneWriteOpResult<WithId<T>>> {
+		return this.insertOne(data);
+	}
+}
diff --git a/app/models/server/raw/CustomUserStatus.js b/app/models/server/raw/CustomUserStatus.js
deleted file mode 100644
index 0ffc78d4b396..000000000000
--- a/app/models/server/raw/CustomUserStatus.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { BaseRaw } from './BaseRaw';
-
-export class CustomUserStatusRaw extends BaseRaw {
-
-}
diff --git a/app/models/server/raw/CustomUserStatus.ts b/app/models/server/raw/CustomUserStatus.ts
new file mode 100644
index 000000000000..ad1d3df1ea10
--- /dev/null
+++ b/app/models/server/raw/CustomUserStatus.ts
@@ -0,0 +1,59 @@
+import { Cursor, FindOneOptions, InsertOneWriteOpResult, UpdateWriteOpResult, WithId, WithoutProjection } from 'mongodb';
+
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { ICustomUserStatus as T } from '../../../../definition/ICustomUserStatus';
+
+export class CustomUserStatusRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { name: 1 } },
+	]
+
+	// find one by name
+	async findOneByName(name: string, options: WithoutProjection<FindOneOptions<T>>): Promise<T | null> {
+		return this.findOne({ name }, options);
+	}
+
+	// find
+	findByName(name: string, options: WithoutProjection<FindOneOptions<T>>): Cursor<T> {
+		const query = {
+			name,
+		};
+
+		return this.find(query, options);
+	}
+
+	findByNameExceptId(name: string, except: string, options: WithoutProjection<FindOneOptions<T>>): Cursor<T> {
+		const query = {
+			_id: { $nin: [except] },
+			name,
+		};
+
+		return this.find(query, options);
+	}
+
+	// update
+	setName(_id: string, name: string): Promise<UpdateWriteOpResult> {
+		const update = {
+			$set: {
+				name,
+			},
+		};
+
+		return this.updateOne({ _id }, update);
+	}
+
+	setStatusType(_id: string, statusType: string): Promise<UpdateWriteOpResult> {
+		const update = {
+			$set: {
+				statusType,
+			},
+		};
+
+		return this.updateOne({ _id }, update);
+	}
+
+	// INSERT
+	create(data: T): Promise<InsertOneWriteOpResult<WithId<T>>>	{
+		return this.insertOne(data);
+	}
+}
diff --git a/app/models/server/raw/EmailInbox.ts b/app/models/server/raw/EmailInbox.ts
index 1d8d008242fa..53b88792392f 100644
--- a/app/models/server/raw/EmailInbox.ts
+++ b/app/models/server/raw/EmailInbox.ts
@@ -1,6 +1,8 @@
-import { BaseRaw } from './BaseRaw';
+import { BaseRaw, IndexSpecification } from './BaseRaw';
 import { IEmailInbox } from '../../../../definition/IEmailInbox';
 
 export class EmailInboxRaw extends BaseRaw<IEmailInbox> {
-	//
+	protected indexes: IndexSpecification[] = [
+		{ key: { email: 1 }, unique: true },
+	]
 }
diff --git a/app/models/server/raw/EmailMessageHistory.ts b/app/models/server/raw/EmailMessageHistory.ts
index 9201d1b3a344..89c54e079ec0 100644
--- a/app/models/server/raw/EmailMessageHistory.ts
+++ b/app/models/server/raw/EmailMessageHistory.ts
@@ -1,10 +1,15 @@
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { IndexSpecification, InsertOneWriteOpResult, WithId } from 'mongodb';
+
 import { BaseRaw } from './BaseRaw';
-import { IEmailMessageHistory } from '../../../../definition/IEmailMessageHistory';
+import { IEmailMessageHistory as T } from '../../../../definition/IEmailMessageHistory';
+
+export class EmailMessageHistoryRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { createdAt: 1 }, expireAfterSeconds: 60 * 60 * 24 },
+	]
 
-export class EmailMessageHistoryRaw extends BaseRaw<IEmailMessageHistory> {
-	insertOne({ _id, email }: IEmailMessageHistory) {
-		return this.col.insertOne({
+	async create({ _id, email }: T): Promise<InsertOneWriteOpResult<WithId<T>>> {
+		return this.insertOne({
 			_id,
 			email,
 			createdAt: new Date(),
diff --git a/app/models/server/raw/EmojiCustom.js b/app/models/server/raw/EmojiCustom.js
deleted file mode 100644
index 80b81d41958b..000000000000
--- a/app/models/server/raw/EmojiCustom.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { BaseRaw } from './BaseRaw';
-
-export class EmojiCustomRaw extends BaseRaw {
-
-}
diff --git a/app/models/server/raw/EmojiCustom.ts b/app/models/server/raw/EmojiCustom.ts
new file mode 100644
index 000000000000..82f5f22fc97e
--- /dev/null
+++ b/app/models/server/raw/EmojiCustom.ts
@@ -0,0 +1,79 @@
+import { Cursor, FindOneOptions, InsertOneWriteOpResult, UpdateWriteOpResult, WithId, WithoutProjection } from 'mongodb';
+
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { IEmojiCustom as T } from '../../../../definition/IEmojiCustom';
+
+export class EmojiCustomRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { name: 1 } },
+		{ key: { aliases: 1 } },
+		{ key: { extension: 1 } },
+	]
+
+	// find
+	findByNameOrAlias(emojiName: string, options: WithoutProjection<FindOneOptions<T>>): Cursor<T> {
+		let name = emojiName;
+
+		if (typeof emojiName === 'string') {
+			name = emojiName.replace(/:/g, '');
+		}
+
+		const query = {
+			$or: [
+				{ name },
+				{ aliases: name },
+			],
+		};
+
+		return this.find(query, options);
+	}
+
+	findByNameOrAliasExceptID(name: string, except: string, options: WithoutProjection<FindOneOptions<T>>): Cursor<T> {
+		const query = {
+			_id: { $nin: [except] },
+			$or: [
+				{ name },
+				{ aliases: name },
+			],
+		};
+
+		return this.find(query, options);
+	}
+
+
+	// update
+	setName(_id: string, name: string): Promise<UpdateWriteOpResult> {
+		const update = {
+			$set: {
+				name,
+			},
+		};
+
+		return this.updateOne({ _id }, update);
+	}
+
+	setAliases(_id: string, aliases: string): Promise<UpdateWriteOpResult> {
+		const update = {
+			$set: {
+				aliases,
+			},
+		};
+
+		return this.updateOne({ _id }, update);
+	}
+
+	setExtension(_id: string, extension: string): Promise<UpdateWriteOpResult> {
+		const update = {
+			$set: {
+				extension,
+			},
+		};
+
+		return this.updateOne({ _id }, update);
+	}
+
+	// INSERT
+	create(data: T): Promise<InsertOneWriteOpResult<WithId<T>>> {
+		return this.insertOne(data);
+	}
+}
diff --git a/app/models/server/raw/ExportOperations.ts b/app/models/server/raw/ExportOperations.ts
new file mode 100644
index 000000000000..d470722d2800
--- /dev/null
+++ b/app/models/server/raw/ExportOperations.ts
@@ -0,0 +1,68 @@
+import { Cursor, UpdateWriteOpResult } from 'mongodb';
+
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { IExportOperation } from '../../../../definition/IExportOperation';
+
+type T = IExportOperation;
+
+export class ExportOperationsRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { userId: 1 } },
+		{ key: { status: 1 } },
+	]
+
+	findOnePending(): Promise<T | null> {
+		const query = {
+			status: { $nin: ['completed', 'skipped'] },
+		};
+
+		return this.findOne(query);
+	}
+
+	async create(data: T): Promise<string> {
+		const result = await this.insertOne({
+			...data,
+			createdAt: new Date(),
+		});
+
+		return result.insertedId;
+	}
+
+	findLastOperationByUser(userId: string, fullExport = false): Promise<T | null> {
+		const query = {
+			userId,
+			fullExport,
+		};
+
+		return this.findOne(query, { sort: { createdAt: -1 } });
+	}
+
+	findAllPendingBeforeMyRequest(requestDay: Date): Cursor<T> {
+		const query = {
+			status: { $nin: ['completed', 'skipped'] },
+			createdAt: { $lt: requestDay },
+		};
+
+		return this.find(query);
+	}
+
+	updateOperation(data: T): Promise<UpdateWriteOpResult> {
+		const update = {
+			$set: {
+				roomList: data.roomList,
+				status: data.status,
+				fileList: data.fileList,
+				generatedFile: data.generatedFile,
+				fileId: data.fileId,
+				userNameTable: data.userNameTable,
+				userData: data.userData,
+				generatedUserFile: data.generatedUserFile,
+				generatedAvatar: data.generatedAvatar,
+				exportPath: data.exportPath,
+				assetsPath: data.assetsPath,
+			},
+		};
+
+		return this.updateOne({ _id: data._id }, update);
+	}
+}
diff --git a/app/models/server/raw/FederationKeys.ts b/app/models/server/raw/FederationKeys.ts
new file mode 100644
index 000000000000..7ac06051e4fa
--- /dev/null
+++ b/app/models/server/raw/FederationKeys.ts
@@ -0,0 +1,65 @@
+import NodeRSA from 'node-rsa';
+
+import { BaseRaw } from './BaseRaw';
+
+type T = {
+	type: 'private' | 'public';
+	key: string;
+};
+
+export class FederationKeysRaw extends BaseRaw<T> {
+	async getKey(type: T['type']): Promise<string | null> {
+		const keyResource = await this.findOne({ type });
+
+		if (!keyResource) { return null; }
+
+		return keyResource.key;
+	}
+
+	loadKey(keyData: NodeRSA.Key, type: T['type']): NodeRSA {
+		return new NodeRSA(keyData, `pkcs8-${ type }-pem`);
+	}
+
+	async generateKeys(): Promise<{ privateKey: '' | NodeRSA | null; publicKey: '' | NodeRSA | null }> {
+		const key = new NodeRSA({ b: 512 });
+
+		key.generateKeyPair();
+
+		await this.deleteMany({});
+
+		await this.insertOne({
+			type: 'private',
+			key: key.exportKey('pkcs8-private-pem').replace(/\n|\r/g, ''),
+		});
+
+		await this.insertOne({
+			type: 'public',
+			key: key.exportKey('pkcs8-public-pem').replace(/\n|\r/g, ''),
+		});
+
+		return {
+			privateKey: await this.getPrivateKey(),
+			publicKey: await this.getPublicKey(),
+		};
+	}
+
+	async getPrivateKey(): Promise<'' | NodeRSA | null> {
+		const keyData = await this.getKey('private');
+
+		return keyData && this.loadKey(keyData, 'private');
+	}
+
+	getPrivateKeyString(): Promise<string | null> {
+		return this.getKey('private');
+	}
+
+	async getPublicKey(): Promise<'' | NodeRSA | null> {
+		const keyData = await this.getKey('public');
+
+		return keyData && this.loadKey(keyData, 'public');
+	}
+
+	getPublicKeyString(): Promise<string | null> {
+		return this.getKey('public');
+	}
+}
diff --git a/app/models/server/raw/FederationServers.ts b/app/models/server/raw/FederationServers.ts
new file mode 100644
index 000000000000..c559b6413770
--- /dev/null
+++ b/app/models/server/raw/FederationServers.ts
@@ -0,0 +1,29 @@
+import { UpdateWriteOpResult } from 'mongodb';
+
+import { Users } from './index';
+import { IFederationServer } from '../../../../definition/Federation';
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+
+export class FederationServersRaw extends BaseRaw<IFederationServer> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { domain: 1 } },
+	]
+
+	saveDomain(domain: string): Promise<UpdateWriteOpResult> {
+		return this.updateOne({ domain }, {
+			$setOnInsert: {
+				domain,
+			},
+		}, { upsert: true });
+	}
+
+	async refreshServers(): Promise<void> {
+		const domains = await Users.getDistinctFederationDomains();
+
+		for await (const domain of domains) {
+			await this.saveDomain(domain);
+		}
+
+		await this.deleteMany({ domain: { $nin: domains } });
+	}
+}
diff --git a/app/models/server/raw/IntegrationHistory.ts b/app/models/server/raw/IntegrationHistory.ts
index 53f7167db796..923c11c6257e 100644
--- a/app/models/server/raw/IntegrationHistory.ts
+++ b/app/models/server/raw/IntegrationHistory.ts
@@ -1,4 +1,12 @@
 import { BaseRaw } from './BaseRaw';
 import { IIntegrationHistory } from '../../../../definition/IIntegrationHistory';
 
-export class IntegrationHistoryRaw extends BaseRaw<IIntegrationHistory> {}
+export class IntegrationHistoryRaw extends BaseRaw<IIntegrationHistory> {
+	removeByIntegrationId(integrationId: string): ReturnType<BaseRaw<IIntegrationHistory>['deleteMany']> {
+		return this.deleteMany({ 'integration._id': integrationId });
+	}
+
+	findOneByIntegrationIdAndHistoryId(integrationId: string, historyId: string): Promise<IIntegrationHistory | null> {
+		return this.findOne({ 'integration._id': integrationId, _id: historyId });
+	}
+}
diff --git a/app/models/server/raw/Integrations.js b/app/models/server/raw/Integrations.js
deleted file mode 100644
index ab8e01a5ebae..000000000000
--- a/app/models/server/raw/Integrations.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { BaseRaw } from './BaseRaw';
-
-export class IntegrationsRaw extends BaseRaw {
-	findOneByIdAndCreatedByIfExists({ _id, createdBy }) {
-		const query = {
-			_id,
-		};
-		if (createdBy) {
-			query['_createdBy._id'] = createdBy;
-		}
-
-		return this.findOne(query);
-	}
-}
diff --git a/app/models/server/raw/Integrations.ts b/app/models/server/raw/Integrations.ts
new file mode 100644
index 000000000000..521507d3bfec
--- /dev/null
+++ b/app/models/server/raw/Integrations.ts
@@ -0,0 +1,36 @@
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { IIntegration } from '../../../../definition/IIntegration';
+
+export class IntegrationsRaw extends BaseRaw<IIntegration> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { type: 1 } },
+	]
+
+	findOneByUrl(url: string): Promise<IIntegration | null> {
+		return this.findOne({ url });
+	}
+
+	updateRoomName(oldRoomName: string, newRoomName: string): ReturnType<BaseRaw<IIntegration>['updateMany']> {
+		const hashedOldRoomName = `#${ oldRoomName }`;
+		const hashedNewRoomName = `#${ newRoomName }`;
+
+		return this.updateMany({
+			channel: hashedOldRoomName,
+		}, {
+			$set: {
+				'channel.$': hashedNewRoomName,
+			},
+		});
+	}
+
+	findOneByIdAndCreatedByIfExists({ _id, createdBy }: { _id: IIntegration['_id']; createdBy: IIntegration['_createdBy'] }): Promise<IIntegration | null> {
+		return this.findOne({
+			_id,
+			...createdBy && { '_createdBy._id': createdBy },
+		});
+	}
+
+	disableByUserId(userId: string): ReturnType<BaseRaw<IIntegration>['updateMany']> {
+		return this.updateMany({ userId }, { $set: { enabled: false } });
+	}
+}
diff --git a/app/models/server/raw/Invites.ts b/app/models/server/raw/Invites.ts
new file mode 100644
index 000000000000..84d21e4e3e81
--- /dev/null
+++ b/app/models/server/raw/Invites.ts
@@ -0,0 +1,27 @@
+import type { UpdateWriteOpResult } from 'mongodb';
+
+import { BaseRaw } from './BaseRaw';
+import { IInvite } from '../../../../definition/IInvite';
+
+type T = IInvite;
+
+export class InvitesRaw extends BaseRaw<T> {
+	findOneByUserRoomMaxUsesAndExpiration(userId: string, rid: string, maxUses: number, daysToExpire: number): Promise<T | null> {
+		return this.findOne({
+			rid,
+			userId,
+			days: daysToExpire,
+			maxUses,
+			...daysToExpire > 0 ? { expires: { $gt: new Date() } } : {},
+			...maxUses > 0 ? { uses: { $lt: maxUses } } : {},
+		});
+	}
+
+	increaseUsageById(_id: string, uses = 1): Promise<UpdateWriteOpResult> {
+		return this.updateOne({ _id }, {
+			$inc: {
+				uses,
+			},
+		});
+	}
+}
diff --git a/app/models/server/raw/NotificationQueue.ts b/app/models/server/raw/NotificationQueue.ts
index 9aedb9680902..cf80da0b747d 100644
--- a/app/models/server/raw/NotificationQueue.ts
+++ b/app/models/server/raw/NotificationQueue.ts
@@ -1,25 +1,27 @@
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import {
-	Collection,
-	ObjectId,
-} from 'mongodb';
+import { UpdateWriteOpResult } from 'mongodb';
 
-import { BaseRaw } from './BaseRaw';
+import { BaseRaw, IndexSpecification } from './BaseRaw';
 import { INotification } from '../../../../definition/INotification';
 
 export class NotificationQueueRaw extends BaseRaw<INotification> {
-	public readonly col!: Collection<INotification>;
+	protected indexes: IndexSpecification[] = [
+		{ key: { uid: 1 } },
+		{ key: { ts: 1 }, expireAfterSeconds: 2 * 60 * 60 },
+		{ key: { schedule: 1 }, sparse: true },
+		{ key: { sending: 1 }, sparse: true },
+		{ key: { error: 1 }, sparse: true },
+	];
 
-	unsetSendingById(_id: string) {
-		return this.col.updateOne({ _id }, {
+	unsetSendingById(_id: string): Promise<UpdateWriteOpResult> {
+		return this.updateOne({ _id }, {
 			$unset: {
 				sending: 1,
 			},
 		});
 	}
 
-	setErrorById(_id: string, error: any) {
-		return this.col.updateOne({
+	setErrorById(_id: string, error: any): Promise<UpdateWriteOpResult> {
+		return this.updateOne({
 			_id,
 		}, {
 			$set: {
@@ -31,12 +33,8 @@ export class NotificationQueueRaw extends BaseRaw<INotification> {
 		});
 	}
 
-	removeById(_id: string) {
-		return this.col.deleteOne({ _id });
-	}
-
-	clearScheduleByUserId(uid: string) {
-		return this.col.updateMany({
+	clearScheduleByUserId(uid: string): Promise<UpdateWriteOpResult> {
+		return this.updateMany({
 			uid,
 			schedule: { $exists: true },
 		}, {
@@ -47,7 +45,7 @@ export class NotificationQueueRaw extends BaseRaw<INotification> {
 	}
 
 	async clearQueueByUserId(uid: string): Promise<number | undefined> {
-		const op = await this.col.deleteMany({
+		const op = await this.deleteMany({
 			uid,
 		});
 
@@ -83,11 +81,4 @@ export class NotificationQueueRaw extends BaseRaw<INotification> {
 
 		return result.value;
 	}
-
-	insertOne(data: Omit<INotification, '_id'>) {
-		return this.col.insertOne({
-			_id: new ObjectId().toHexString(),
-			...data,
-		});
-	}
 }
diff --git a/app/models/server/raw/OAuthApps.js b/app/models/server/raw/OAuthApps.js
deleted file mode 100644
index 68c77a772cdd..000000000000
--- a/app/models/server/raw/OAuthApps.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { BaseRaw } from './BaseRaw';
-
-export class OAuthAppsRaw extends BaseRaw {
-	findOneAuthAppByIdOrClientId({ clientId, appId }) {
-		const query = {};
-		if (clientId) {
-			query.clientId = clientId;
-		}
-		if (appId) {
-			query._id = appId;
-		}
-		return this.findOne(query);
-	}
-}
diff --git a/app/models/server/raw/OAuthApps.ts b/app/models/server/raw/OAuthApps.ts
new file mode 100644
index 000000000000..f70d88616b34
--- /dev/null
+++ b/app/models/server/raw/OAuthApps.ts
@@ -0,0 +1,11 @@
+import { IOAuthApps as T } from '../../../../definition/IOAuthApps';
+import { BaseRaw } from './BaseRaw';
+
+export class OAuthAppsRaw extends BaseRaw<T> {
+	findOneAuthAppByIdOrClientId({ clientId, appId }: {clientId: string; appId: string}): ReturnType<BaseRaw<T>['findOne']> {
+		return this.findOne({
+			...appId && { _id: appId },
+			...clientId && { clientId },
+		});
+	}
+}
diff --git a/app/models/server/raw/OEmbedCache.ts b/app/models/server/raw/OEmbedCache.ts
new file mode 100644
index 000000000000..586fb1d7040c
--- /dev/null
+++ b/app/models/server/raw/OEmbedCache.ts
@@ -0,0 +1,31 @@
+import { DeleteWriteOpResultObject } from 'mongodb';
+
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { IOEmbedCache } from '../../../../definition/IOEmbedCache';
+
+type T = IOEmbedCache;
+
+export class OEmbedCacheRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { updatedAt: 1 } },
+	]
+
+	async createWithIdAndData(_id: string, data: any): Promise<T> {
+		const record = {
+			_id,
+			data,
+			updatedAt: new Date(),
+		};
+		record._id = (await this.insertOne(record)).insertedId;
+		return record;
+	}
+
+	removeAfterDate(date: Date): Promise<DeleteWriteOpResultObject> {
+		const query = {
+			updatedAt: {
+				$lte: date,
+			},
+		};
+		return this.deleteMany(query);
+	}
+}
diff --git a/app/models/server/raw/Permissions.ts b/app/models/server/raw/Permissions.ts
index d5321c82c80b..0c5ae1f8533e 100644
--- a/app/models/server/raw/Permissions.ts
+++ b/app/models/server/raw/Permissions.ts
@@ -2,4 +2,35 @@ import { BaseRaw } from './BaseRaw';
 import { IPermission } from '../../../../definition/IPermission';
 
 export class PermissionsRaw extends BaseRaw<IPermission> {
+	async createOrUpdate(name: string, roles: string[]): Promise<IPermission['_id']> {
+		const exists = await this.findOne<Pick<IPermission, '_id'>>({
+			_id: name,
+			roles,
+		}, { fields: { _id: 1 } });
+
+		if (exists) {
+			return exists._id;
+		}
+
+		return this.update({ _id: name }, { $set: { roles } }, { upsert: true }).then((result) => result.result._id);
+	}
+
+	async create(id: string, roles: string[]): Promise<IPermission['_id']> {
+		const exists = await this.findOneById<Pick<IPermission, '_id'>>(id, { fields: { _id: 1 } });
+
+		if (exists) {
+			return exists._id;
+		}
+
+		return this.update({ _id: id }, { $set: { roles } }, { upsert: true }).then((result) => result.result._id);
+	}
+
+
+	async addRole(permission: string, role: string): Promise<void> {
+		await this.update({ _id: permission, roles: { $ne: role } }, { $addToSet: { roles: role } });
+	}
+
+	async removeRole(permission: string, role: string): Promise<void> {
+		await this.update({ _id: permission, roles: role }, { $pull: { roles: role } });
+	}
 }
diff --git a/app/models/server/raw/ReadReceipts.ts b/app/models/server/raw/ReadReceipts.ts
new file mode 100644
index 000000000000..12763332ca3e
--- /dev/null
+++ b/app/models/server/raw/ReadReceipts.ts
@@ -0,0 +1,15 @@
+import { Cursor } from 'mongodb';
+
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { ReadReceipt } from '../../../../definition/ReadReceipt';
+
+export class ReadReceiptsRaw extends BaseRaw<ReadReceipt> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { roomId: 1, userId: 1, messageId: 1 }, unique: true },
+		{ key: { messageId: 1 } },
+	];
+
+	findByMessageId(messageId: string): Cursor<ReadReceipt> {
+		return this.find({ messageId });
+	}
+}
diff --git a/app/models/server/raw/Reports.ts b/app/models/server/raw/Reports.ts
new file mode 100644
index 000000000000..9b47fdb8fe9f
--- /dev/null
+++ b/app/models/server/raw/Reports.ts
@@ -0,0 +1,15 @@
+import { BaseRaw } from './BaseRaw';
+import { IReport } from '../../../../definition/IReport';
+import { IMessage } from '../../../../definition/IMessage';
+
+export class ReportsRaw extends BaseRaw<IReport> {
+	createWithMessageDescriptionAndUserId(message: IMessage, description: string, userId: string): ReturnType<BaseRaw<IReport>['insertOne']> {
+		const record: Pick<IReport, 'message' | 'description' | 'ts' | 'userId'> = {
+			message,
+			description,
+			ts: new Date(),
+			userId,
+		};
+		return this.insertOne(record);
+	}
+}
diff --git a/app/models/server/raw/Roles.js b/app/models/server/raw/Roles.js
deleted file mode 100644
index 7e06551fde56..000000000000
--- a/app/models/server/raw/Roles.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { BaseRaw } from './BaseRaw';
-
-export class RolesRaw extends BaseRaw {
-	constructor(col, trash, models) {
-		super(col, trash);
-
-		this.models = models;
-	}
-
-	async isUserInRoles(userId, roles, scope) {
-		if (!Array.isArray(roles)) {
-			roles = [roles];
-		}
-
-		for (let i = 0, total = roles.length; i < total; i++) {
-			const roleName = roles[i];
-
-			// eslint-disable-next-line no-await-in-loop
-			const role = await this.findOne({ name: roleName }, { scope: 1 });
-			const roleScope = (role && role.scope) || 'Users';
-			const model = this.models[roleScope];
-
-			// eslint-disable-next-line no-await-in-loop
-			const permitted = await (model && model.isUserInRole && model.isUserInRole(userId, roleName, scope));
-			if (permitted) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/app/models/server/raw/Roles.ts b/app/models/server/raw/Roles.ts
new file mode 100644
index 000000000000..db7913eb7e2a
--- /dev/null
+++ b/app/models/server/raw/Roles.ts
@@ -0,0 +1,200 @@
+import type { Collection, Cursor, FilterQuery, FindOneOptions, InsertOneWriteOpResult, UpdateWriteOpResult, WithId, WithoutProjection } from 'mongodb';
+
+import { IRole, IUser } from '../../../../definition/IUser';
+import { BaseRaw } from './BaseRaw';
+import { SubscriptionsRaw } from './Subscriptions';
+import { UsersRaw } from './Users';
+
+type ScopedModelRoles = {
+	Subscriptions: SubscriptionsRaw;
+	Users: UsersRaw;
+}
+
+export class RolesRaw extends BaseRaw<IRole> {
+	constructor(public readonly col: Collection<IRole>,
+		private readonly models: ScopedModelRoles, public readonly trash?: Collection<IRole>) {
+		super(col, trash);
+	}
+
+
+	findByUpdatedDate<P>(updatedAfterDate: Date, options: FindOneOptions<P extends IRole ? IRole : P>): Cursor<P> | Cursor<IRole> {
+		const query = {
+			_updatedAt: { $gte: new Date(updatedAfterDate) },
+		};
+
+		return this.find(query, options);
+	}
+
+
+	createOrUpdate(name: IRole['name'], scope: 'Users' | 'Subscriptions' = 'Users', description = '', protectedRole = true, mandatory2fa = false): Promise<UpdateWriteOpResult> {
+		const queryData = {
+			name,
+			scope,
+			description,
+			protected: protectedRole,
+			mandatory2fa,
+		};
+
+		return this.updateOne({ _id: name }, { $set: queryData }, { upsert: true });
+	}
+
+	async addUserRoles(userId: IUser['_id'], roles: IRole['_id'][], scope?: string): Promise<boolean> {
+		if (!Array.isArray(roles)) {
+			roles = [roles];
+			process.env.NODE_ENV === 'development' && console.warn('[WARN] RolesRaw.addUserRoles: roles should be an array');
+		}
+
+		for await (const name of roles) {
+			const role = await this.findOne({ name }, { scope: 1 } as FindOneOptions<IRole>);
+
+			if (!role) {
+				process.env.NODE_ENV === 'development' && console.warn(`[WARN] RolesRaw.addUserRoles: role: ${ name } not found`);
+				continue;
+			}
+			switch (role.scope) {
+				case 'Subscriptions':
+					await this.models.Subscriptions.addRolesByUserId(userId, [name], scope);
+					break;
+				case 'Users':
+				default:
+					await this.models.Users.addRolesByUserId(userId, [name]);
+			}
+		}
+		return true;
+	}
+
+
+	async isUserInRoles(userId: IUser['_id'], roles: IRole['_id'][], scope?: string): Promise<boolean> {
+		if (!Array.isArray(roles)) { // TODO: remove this check
+			roles = [roles];
+			process.env.NODE_ENV === 'development' && console.warn('[WARN] RolesRaw.isUserInRoles: roles should be an array');
+		}
+
+		for await (const roleName of roles) {
+			const role = await this.findOne({ name: roleName }, { scope: 1 } as FindOneOptions<IRole>);
+
+			if (!role) {
+				continue;
+			}
+
+			switch (role.scope) {
+				case 'Subscriptions':
+					if (await this.models.Subscriptions.isUserInRole(userId, roleName, scope)) {
+						return true;
+					}
+					break;
+				case 'Users':
+				default:
+					if (await this.models.Users.isUserInRole(userId, roleName)) {
+						return true;
+					}
+			}
+		}
+		return false;
+	}
+
+	async removeUserRoles(userId: IUser['_id'], roles: IRole['_id'][], scope?: string): Promise<boolean> {
+		if (!Array.isArray(roles)) { // TODO: remove this check
+			roles = [roles];
+			process.env.NODE_ENV === 'development' && console.warn('[WARN] RolesRaw.removeUserRoles: roles should be an array');
+		}
+		for await (const roleName of roles) {
+			const role = await this.findOne({ name: roleName }, { scope: 1 } as FindOneOptions<IRole>);
+
+			if (!role) {
+				continue;
+			}
+
+			switch (role.scope) {
+				case 'Subscriptions':
+					scope && await this.models.Subscriptions.removeRolesByUserId(userId, [roleName], scope);
+					break;
+				case 'Users':
+				default:
+					await this.models.Users.removeRolesByUserId(userId, [roleName]);
+			}
+		}
+		return true;
+	}
+
+	async findOneByIdOrName(_idOrName: IRole['_id'] | IRole['name'], options?: undefined): Promise<IRole | null>;
+
+	async findOneByIdOrName(_idOrName: IRole['_id'] | IRole['name'], options: WithoutProjection<FindOneOptions<IRole>>): Promise<IRole | null>;
+
+	async findOneByIdOrName<P>(_idOrName: IRole['_id'] | IRole['name'], options: FindOneOptions<P extends IRole ? IRole : P>): Promise<P | null>;
+
+	findOneByIdOrName<P>(_idOrName: IRole['_id'] | IRole['name'], options?: any): Promise<IRole |P | null> {
+		const query: FilterQuery<IRole> = {
+			$or: [{
+				_id: _idOrName,
+			}, {
+				name: _idOrName,
+			}],
+		};
+
+		return this.findOne(query, options);
+	}
+
+	updateById(_id: IRole['_id'], name: IRole['name'], scope: IRole['scope'], description: IRole['description'], mandatory2fa: IRole['mandatory2fa']): Promise<UpdateWriteOpResult> {
+		const queryData = {
+			name,
+			scope,
+			description,
+			mandatory2fa,
+		};
+
+		return this.updateOne({ _id }, { $set: queryData }, { upsert: true });
+	}
+
+
+	findUsersInRole(name: IRole['name'], scope?: string): Promise<Cursor<IUser>>;
+
+	findUsersInRole(name: IRole['name'], scope: string | undefined, options: WithoutProjection<FindOneOptions<IUser>>): Promise<Cursor<IUser>>;
+
+	findUsersInRole<P>(name: IRole['name'], scope: string | undefined, options: FindOneOptions<P extends IUser ? IUser : P>): Promise<Cursor<P>>;
+
+	async findUsersInRole<P>(name: IRole['name'], scope: string | undefined, options?: any | undefined): Promise<Cursor<IUser> | Cursor<P>> {
+		const role = await this.findOne({ name }, { scope: 1 } as FindOneOptions<IRole>);
+
+		if (!role) {
+			throw new Error('RolesRaw.findUsersInRole: role not found');
+		}
+
+		switch (role.scope) {
+			case 'Subscriptions':
+				return this.models.Subscriptions.findUsersInRoles([name], scope, options);
+			case 'Users':
+			default:
+				return this.models.Users.findUsersInRoles([name], options);
+		}
+	}
+
+
+	createWithRandomId(name: IRole['name'], scope: 'Users' | 'Subscriptions' = 'Users', description = '', protectedRole = true, mandatory2fa = false): Promise<InsertOneWriteOpResult<WithId<IRole>>> {
+		const role = {
+			name,
+			scope,
+			description,
+			protected: protectedRole,
+			mandatory2fa,
+		};
+
+		return this.insertOne(role);
+	}
+
+
+	async canAddUserToRole(uid: IUser['_id'], name: IRole['name'], scope?: string): Promise<boolean> {
+		const role = await this.findOne({ name }, { fields: { scope: 1 } } as FindOneOptions<IRole>);
+		if (!role) {
+			return false;
+		}
+
+		switch (role.scope) {
+			case 'Subscriptions':
+				return this.models.Subscriptions.isUserInRoleScope(uid, scope);
+			case 'Users':
+			default:
+				return this.models.Users.isUserInRoleScope(uid);
+		}
+	}
+}
diff --git a/app/models/server/raw/ServerEvents.ts b/app/models/server/raw/ServerEvents.ts
index f36b44983e19..1bb1342ed885 100644
--- a/app/models/server/raw/ServerEvents.ts
+++ b/app/models/server/raw/ServerEvents.ts
@@ -1,38 +1,28 @@
-import { Collection, ObjectId } from 'mongodb';
-
-import { BaseRaw } from './BaseRaw';
+import { BaseRaw, IndexSpecification } from './BaseRaw';
 import { IServerEvent, IServerEventType } from '../../../../definition/IServerEvent';
-import { IUser } from '../../../../definition/IUser';
 
 export class ServerEventsRaw extends BaseRaw<IServerEvent> {
-	public readonly col!: Collection<IServerEvent>;
-
-	async insertOne(data: Omit<IServerEvent, '_id'>): Promise<any> {
-		if (data.u) {
-			data.u = { _id: data.u._id, username: data.u.username } as IUser;
-		}
-		return this.col.insertOne({
-			_id: new ObjectId().toHexString(),
-			...data,
-		});
-	}
+	protected indexes: IndexSpecification[] = [
+		{ key: { t: 1, ip: 1, ts: -1 } },
+		{ key: { t: 1, 'u.username': 1, ts: -1 } },
+	]
 
 	async findLastFailedAttemptByIp(ip: string): Promise<IServerEvent | null> {
-		return this.col.findOne<IServerEvent>({
+		return this.findOne<IServerEvent>({
 			ip,
 			t: IServerEventType.FAILED_LOGIN_ATTEMPT,
 		}, { sort: { ts: -1 } });
 	}
 
 	async findLastFailedAttemptByUsername(username: string): Promise<IServerEvent | null> {
-		return this.col.findOne<IServerEvent>({
+		return this.findOne<IServerEvent>({
 			'u.username': username,
 			t: IServerEventType.FAILED_LOGIN_ATTEMPT,
 		}, { sort: { ts: -1 } });
 	}
 
 	async countFailedAttemptsByUsernameSince(username: string, since: Date): Promise<number> {
-		return this.col.find({
+		return this.find({
 			'u.username': username,
 			t: IServerEventType.FAILED_LOGIN_ATTEMPT,
 			ts: {
@@ -42,7 +32,7 @@ export class ServerEventsRaw extends BaseRaw<IServerEvent> {
 	}
 
 	countFailedAttemptsByIpSince(ip: string, since: Date): Promise<number> {
-		return this.col.find({
+		return this.find({
 			ip,
 			t: IServerEventType.FAILED_LOGIN_ATTEMPT,
 			ts: {
@@ -52,14 +42,14 @@ export class ServerEventsRaw extends BaseRaw<IServerEvent> {
 	}
 
 	countFailedAttemptsByIp(ip: string): Promise<number> {
-		return this.col.find({
+		return this.find({
 			ip,
 			t: IServerEventType.FAILED_LOGIN_ATTEMPT,
 		}).count();
 	}
 
 	countFailedAttemptsByUsername(username: string): Promise<number> {
-		return this.col.find({
+		return this.find({
 			'u.username': username,
 			t: IServerEventType.FAILED_LOGIN_ATTEMPT,
 		}).count();
diff --git a/app/models/server/raw/Sessions.js b/app/models/server/raw/Sessions.js
deleted file mode 100644
index 965604fcd0b5..000000000000
--- a/app/models/server/raw/Sessions.js
+++ /dev/null
@@ -1,285 +0,0 @@
-import { BaseRaw } from './BaseRaw';
-import Sessions from '../models/Sessions';
-
-const matchBasedOnDate = (start, end) => {
-	if (start.year === end.year && start.month === end.month) {
-		return {
-			year: start.year,
-			month: start.month,
-			day: { $gte: start.day, $lte: end.day },
-		};
-	}
-
-	if (start.year === end.year) {
-		return {
-			year: start.year,
-			$and: [{
-				$or: [{
-					month: { $gt: start.month },
-				}, {
-					month: start.month,
-					day: { $gte: start.day },
-				}],
-			}, {
-				$or: [{
-					month: { $lt: end.month },
-				}, {
-					month: end.month,
-					day: { $lte: end.day },
-				}],
-			}],
-		};
-	}
-
-	return {
-		$and: [{
-			$or: [{
-				year: { $gt: start.year },
-			}, {
-				year: start.year,
-				month: { $gt: start.month },
-			}, {
-				year: start.year,
-				month: start.month,
-				day: { $gte: start.day },
-			}],
-		}, {
-			$or: [{
-				year: { $lt: end.year },
-			}, {
-				year: end.year,
-				month: { $lt: end.month },
-			}, {
-				year: end.year,
-				month: end.month,
-				day: { $lte: end.day },
-			}],
-		}],
-	};
-};
-
-const getGroupSessionsByHour = (_id) => {
-	const isOpenSession = { $not: ['$session.closedAt'] };
-	const isAfterLoginAt = { $gte: ['$range', { $hour: '$session.loginAt' }] };
-	const isBeforeClosedAt = { $lte: ['$range', { $hour: '$session.closedAt' }] };
-
-	const listGroup = {
-		$group: {
-			_id,
-			usersList: {
-				$addToSet: {
-					$cond: [
-						{
-							$or: [
-								{ $and: [isOpenSession, isAfterLoginAt] },
-								{ $and: [isAfterLoginAt, isBeforeClosedAt] },
-							],
-						},
-						'$session.userId',
-						'$$REMOVE',
-					],
-				},
-			},
-		},
-	};
-
-	const countGroup = {
-		$addFields: {
-			users: { $size: '$usersList' },
-		},
-	};
-
-	return { listGroup, countGroup };
-};
-
-const getSortByFullDate = () => ({
-	year: -1,
-	month: -1,
-	day: -1,
-});
-
-const getProjectionByFullDate = () => ({
-	day: '$_id.day',
-	month: '$_id.month',
-	year: '$_id.year',
-});
-
-export class SessionsRaw extends BaseRaw {
-	getActiveUsersBetweenDates({ start, end }) {
-		return this.col.aggregate([
-			{
-				$match: {
-					...matchBasedOnDate(start, end),
-					type: 'user_daily',
-				},
-			},
-			{
-				$group: {
-					_id: '$userId',
-				},
-			},
-		]).toArray();
-	}
-
-	async findLastLoginByIp(ip) {
-		return (await this.col.find({
-			ip,
-		}, {
-			sort: { loginAt: -1 },
-			limit: 1,
-		}).toArray())[0];
-	}
-
-	getActiveUsersOfPeriodByDayBetweenDates({ start, end }) {
-		return this.col.aggregate([
-			{
-				$match: {
-					...matchBasedOnDate(start, end),
-					type: 'user_daily',
-					mostImportantRole: { $ne: 'anonymous' },
-				},
-			},
-			{
-				$group: {
-					_id: {
-						day: '$day',
-						month: '$month',
-						year: '$year',
-						userId: '$userId',
-					},
-				},
-			},
-			{
-				$group: {
-					_id: {
-						day: '$_id.day',
-						month: '$_id.month',
-						year: '$_id.year',
-					},
-					usersList: {
-						$addToSet: '$_id.userId',
-					},
-					users: { $sum: 1 },
-				},
-			},
-			{
-				$project: {
-					_id: 0,
-					...getProjectionByFullDate(),
-					usersList: 1,
-					users: 1,
-				},
-			},
-			{
-				$sort: {
-					...getSortByFullDate(),
-				},
-			},
-		]).toArray();
-	}
-
-	getBusiestTimeWithinHoursPeriod({ start, end, groupSize }) {
-		const match = {
-			$match: {
-				type: 'computed-session',
-				loginAt: { $gte: start, $lte: end },
-			},
-		};
-		const rangeProject = {
-			$project: {
-				range: {
-					$range: [0, 24, groupSize],
-				},
-				session: '$$ROOT',
-			},
-		};
-		const unwind = {
-			$unwind: '$range',
-		};
-		const groups = getGroupSessionsByHour('$range');
-		const presentationProject = {
-			$project: {
-				_id: 0,
-				hour: '$_id',
-				users: 1,
-			},
-		};
-		const sort = {
-			$sort: {
-				hour: -1,
-			},
-		};
-		return this.col.aggregate([match, rangeProject, unwind, groups.listGroup, groups.countGroup, presentationProject, sort]).toArray();
-	}
-
-	getTotalOfSessionsByDayBetweenDates({ start, end }) {
-		return this.col.aggregate([
-			{
-				$match: {
-					...matchBasedOnDate(start, end),
-					type: 'user_daily',
-					mostImportantRole: { $ne: 'anonymous' },
-				},
-			},
-			{
-				$group: {
-					_id: { year: '$year', month: '$month', day: '$day' },
-					users: { $sum: 1 },
-				},
-			},
-			{
-				$project: {
-					_id: 0,
-					...getProjectionByFullDate(),
-					users: 1,
-				},
-			},
-			{
-				$sort: {
-					...getSortByFullDate(),
-				},
-			},
-		]).toArray();
-	}
-
-	getTotalOfSessionByHourAndDayBetweenDates({ start, end }) {
-		const match = {
-			$match: {
-				type: 'computed-session',
-				loginAt: { $gte: start, $lte: end },
-			},
-		};
-		const rangeProject = {
-			$project: {
-				range: {
-					$range: [
-						{ $hour: '$loginAt' },
-						{ $sum: [{ $ifNull: [{ $hour: '$closedAt' }, 23] }, 1] }],
-				},
-				session: '$$ROOT',
-			},
-
-		};
-		const unwind = {
-			$unwind: '$range',
-		};
-		const groups = getGroupSessionsByHour({ range: '$range', day: '$session.day', month: '$session.month', year: '$session.year' });
-		const presentationProject = {
-			$project: {
-				_id: 0,
-				hour: '$_id.range',
-				...getProjectionByFullDate(),
-				users: 1,
-			},
-		};
-		const sort = {
-			$sort: {
-				...getSortByFullDate(),
-				hour: -1,
-			},
-		};
-		return this.col.aggregate([match, rangeProject, unwind, groups.listGroup, groups.countGroup, presentationProject, sort]).toArray();
-	}
-}
-
-export default new SessionsRaw(Sessions.model.rawCollection());
diff --git a/app/models/server/models/Sessions.tests.js b/app/models/server/raw/Sessions.tests.js
similarity index 99%
rename from app/models/server/models/Sessions.tests.js
rename to app/models/server/raw/Sessions.tests.js
index ba0b94c60892..7dd157e9e681 100644
--- a/app/models/server/models/Sessions.tests.js
+++ b/app/models/server/raw/Sessions.tests.js
@@ -4,8 +4,6 @@ import assert from 'assert';
 
 import { MongoMemoryServer } from 'mongodb-memory-server';
 
-import './Sessions.mocks.js';
-
 const { MongoClient } = require('mongodb');
 
 const { aggregates } = require('./Sessions');
diff --git a/app/models/server/models/Sessions.js b/app/models/server/raw/Sessions.ts
similarity index 50%
rename from app/models/server/models/Sessions.js
rename to app/models/server/raw/Sessions.ts
index ffb43d6566a5..86e97ebe76a7 100644
--- a/app/models/server/models/Sessions.js
+++ b/app/models/server/raw/Sessions.ts
@@ -1,8 +1,118 @@
-import { Base } from './_Base';
-import { readSecondaryPreferred } from '../../../../server/database/readSecondaryPreferred';
+import { AggregationCursor, BulkWriteOperation, BulkWriteOpResultObject, Collection, IndexSpecification, UpdateWriteOpResult, FilterQuery } from 'mongodb';
+
+import { ISession as T } from '../../../../definition/ISession';
+import { BaseRaw, ModelOptionalId } from './BaseRaw';
+
+type DestructuredDate = {year: number; month: number; day: number};
+type DestructuredDateWithType = {year: number; month: number; day: number; type?: 'month' | 'week'};
+type DestructuredRange = {start: DestructuredDate; end: DestructuredDate};
+type FullReturn = { year: number; month: number; day: number; data: T[] };
+
+const matchBasedOnDate = (start: DestructuredDate, end: DestructuredDate): FilterQuery<T> => {
+	if (start.year === end.year && start.month === end.month) {
+		return {
+			year: start.year,
+			month: start.month,
+			day: { $gte: start.day, $lte: end.day },
+		};
+	}
+
+	if (start.year === end.year) {
+		return {
+			year: start.year,
+			$and: [{
+				$or: [{
+					month: { $gt: start.month },
+				}, {
+					month: start.month,
+					day: { $gte: start.day },
+				}],
+			}, {
+				$or: [{
+					month: { $lt: end.month },
+				}, {
+					month: end.month,
+					day: { $lte: end.day },
+				}],
+			}],
+		};
+	}
+
+	return {
+		$and: [{
+			$or: [{
+				year: { $gt: start.year },
+			}, {
+				year: start.year,
+				month: { $gt: start.month },
+			}, {
+				year: start.year,
+				month: start.month,
+				day: { $gte: start.day },
+			}],
+		}, {
+			$or: [{
+				year: { $lt: end.year },
+			}, {
+				year: end.year,
+				month: { $lt: end.month },
+			}, {
+				year: end.year,
+				month: end.month,
+				day: { $lte: end.day },
+			}],
+		}],
+	};
+};
+
+const getGroupSessionsByHour = (_id: { range: string; day: string; month: string; year: string } | string): {listGroup: object; countGroup: object} => {
+	const isOpenSession = { $not: ['$session.closedAt'] };
+	const isAfterLoginAt = { $gte: ['$range', { $hour: '$session.loginAt' }] };
+	const isBeforeClosedAt = { $lte: ['$range', { $hour: '$session.closedAt' }] };
+
+	const listGroup = {
+		$group: {
+			_id,
+			usersList: {
+				$addToSet: {
+					$cond: [
+						{
+							$or: [
+								{ $and: [isOpenSession, isAfterLoginAt] },
+								{ $and: [isAfterLoginAt, isBeforeClosedAt] },
+							],
+						},
+						'$session.userId',
+						'$$REMOVE',
+					],
+				},
+			},
+		},
+	};
+
+	const countGroup = {
+		$addFields: {
+			users: { $size: '$usersList' },
+		},
+	};
+
+	return { listGroup, countGroup };
+};
+
+const getSortByFullDate = (): { year: number; month: number; day: number } => ({
+	year: -1,
+	month: -1,
+	day: -1,
+});
+
+const getProjectionByFullDate = (): { day: string; month: string; year: string } => ({
+	day: '$_id.day',
+	month: '$_id.month',
+	year: '$_id.year',
+});
 
 export const aggregates = {
-	dailySessionsOfYesterday(collection, { year, month, day }) {
+	dailySessionsOfYesterday(collection: Collection<T>, { year, month, day }: DestructuredDate): AggregationCursor<T> {
 		return collection.aggregate([{
 			$match: {
 				userId: { $exists: true },
@@ -91,7 +201,7 @@ export const aggregates = {
 		}], { allowDiskUse: true });
 	},
 
-	getUniqueUsersOfYesterday(collection, { year, month, day }) {
+	async getUniqueUsersOfYesterday(collection: Collection<T>, { year, month, day }: DestructuredDate): Promise<T[]> {
 		return collection.aggregate([{
 			$match: {
 				year,
@@ -153,7 +263,7 @@ export const aggregates = {
 		}]).toArray();
 	},
 
-	getUniqueUsersOfLastMonthOrWeek(collection, { year, month, day, type = 'month' }) {
+	async getUniqueUsersOfLastMonthOrWeek(collection: Collection<T>, { year, month, day, type = 'month' }: DestructuredDateWithType): Promise<T[]> {
 		return collection.aggregate([{
 			$match: {
 				type: 'user_daily',
@@ -223,7 +333,7 @@ export const aggregates = {
 		}], { allowDiskUse: true }).toArray();
 	},
 
-	getMatchOfLastMonthOrWeek({ year, month, day, type = 'month' }) {
+	getMatchOfLastMonthOrWeek({ year, month, day, type = 'month' }: DestructuredDateWithType): FilterQuery<T> {
 		let startOfPeriod;
 
 		if (type === 'month') {
@@ -298,7 +408,7 @@ export const aggregates = {
 		};
 	},
 
-	getUniqueDevicesOfLastMonthOrWeek(collection, { year, month, day, type = 'month' }) {
+	async getUniqueDevicesOfLastMonthOrWeek(collection: Collection<T>, { year, month, day, type = 'month' }: DestructuredDateWithType): Promise<T[]> {
 		return collection.aggregate([{
 			$match: {
 				type: 'user_daily',
@@ -336,7 +446,7 @@ export const aggregates = {
 		}], { allowDiskUse: true }).toArray();
 	},
 
-	getUniqueDevicesOfYesterday(collection, { year, month, day }) {
+	getUniqueDevicesOfYesterday(collection: Collection<T>, { year, month, day }: DestructuredDate): Promise<T[]> {
 		return collection.aggregate([{
 			$match: {
 				year,
@@ -376,7 +486,7 @@ export const aggregates = {
 		}]).toArray();
 	},
 
-	getUniqueOSOfLastMonthOrWeek(collection, { year, month, day, type = 'month' }) {
+	getUniqueOSOfLastMonthOrWeek(collection: Collection<T>, { year, month, day, type = 'month' }: DestructuredDateWithType): Promise<T[]> {
 		return collection.aggregate([{
 			$match: {
 				type: 'user_daily',
@@ -415,7 +525,7 @@ export const aggregates = {
 		}], { allowDiskUse: true }).toArray();
 	},
 
-	getUniqueOSOfYesterday(collection, { year, month, day }) {
+	getUniqueOSOfYesterday(collection: Collection<T>, { year, month, day }: DestructuredDate): Promise<T[]> {
 		return collection.aggregate([{
 			$match: {
 				year,
@@ -457,25 +567,208 @@ export const aggregates = {
 	},
 };
 
-export class Sessions extends Base {
-	constructor(...args) {
-		super(...args);
-
-		this.tryEnsureIndex({ instanceId: 1, sessionId: 1, year: 1, month: 1, day: 1 });
-		this.tryEnsureIndex({ instanceId: 1, sessionId: 1, userId: 1 });
-		this.tryEnsureIndex({ instanceId: 1, sessionId: 1 });
-		this.tryEnsureIndex({ sessionId: 1 });
-		this.tryEnsureIndex({ userId: 1 });
-		this.tryEnsureIndex({ year: 1, month: 1, day: 1, type: 1 });
-		this.tryEnsureIndex({ type: 1 });
-		this.tryEnsureIndex({ ip: 1, loginAt: 1 });
-		this.tryEnsureIndex({ _computedAt: 1 }, { expireAfterSeconds: 60 * 60 * 24 * 45 });
-
-		const db = this.model.rawDatabase();
-		this.secondaryCollection = db.collection(this.model._name, { readPreference: readSecondaryPreferred(db) });
+export class SessionsRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { instanceId: 1, sessionId: 1, year: 1, month: 1, day: 1 } },
+		{ key: { instanceId: 1, sessionId: 1, userId: 1 } },
+		{ key: { instanceId: 1, sessionId: 1 } },
+		{ key: { sessionId: 1 } },
+		{ key: { userId: 1 } },
+		{ key: { year: 1, month: 1, day: 1, type: 1 } },
+		{ key: { type: 1 } },
+		{ key: { ip: 1, loginAt: 1 } },
+		{ key: { _computedAt: 1 }, expireAfterSeconds: 60 * 60 * 24 * 45 },
+	]
+
+	private secondaryCollection: Collection<T>;
+
+	constructor(
+		public readonly col: Collection<T>,
+		public readonly colSecondary: Collection<T>,
+		public readonly trash?: Collection<T>,
+	) {
+		super(col, trash);
+
+		this.secondaryCollection = colSecondary;
+	}
+
+	async getActiveUsersBetweenDates({ start, end }: DestructuredRange): Promise<T[]> {
+		return this.col.aggregate([
+			{
+				$match: {
+					...matchBasedOnDate(start, end),
+					type: 'user_daily',
+				},
+			},
+			{
+				$group: {
+					_id: '$userId',
+				},
+			},
+		]).toArray();
+	}
+
+	async findLastLoginByIp(ip: string): Promise<T | null> {
+		return this.findOne({
+			ip,
+		}, {
+			sort: { loginAt: -1 },
+			limit: 1,
+		});
+	}
+
+	async getActiveUsersOfPeriodByDayBetweenDates({ start, end }: DestructuredRange): Promise<T[]> {
+		return this.col.aggregate([
+			{
+				$match: {
+					...matchBasedOnDate(start, end),
+					type: 'user_daily',
+					mostImportantRole: { $ne: 'anonymous' },
+				},
+			},
+			{
+				$group: {
+					_id: {
+						day: '$day',
+						month: '$month',
+						year: '$year',
+						userId: '$userId',
+					},
+				},
+			},
+			{
+				$group: {
+					_id: {
+						day: '$_id.day',
+						month: '$_id.month',
+						year: '$_id.year',
+					},
+					usersList: {
+						$addToSet: '$_id.userId',
+					},
+					users: { $sum: 1 },
+				},
+			},
+			{
+				$project: {
+					_id: 0,
+					...getProjectionByFullDate(),
+					usersList: 1,
+					users: 1,
+				},
+			},
+			{
+				$sort: {
+					...getSortByFullDate(),
+				},
+			},
+		]).toArray();
+	}
+
+	async getBusiestTimeWithinHoursPeriod({ start, end, groupSize }: DestructuredRange & {groupSize: number}): Promise<T[]> {
+		const match = {
+			$match: {
+				type: 'computed-session',
+				loginAt: { $gte: start, $lte: end },
+			},
+		};
+		const rangeProject = {
+			$project: {
+				range: {
+					$range: [0, 24, groupSize],
+				},
+				session: '$$ROOT',
+			},
+		};
+		const unwind = {
+			$unwind: '$range',
+		};
+		const groups = getGroupSessionsByHour('$range');
+		const presentationProject = {
+			$project: {
+				_id: 0,
+				hour: '$_id',
+				users: 1,
+			},
+		};
+		const sort = {
+			$sort: {
+				hour: -1,
+			},
+		};
+		return this.col.aggregate([match, rangeProject, unwind, groups.listGroup, groups.countGroup, presentationProject, sort]).toArray();
 	}
 
-	getUniqueUsersOfYesterday() {
+	async getTotalOfSessionsByDayBetweenDates({ start, end }: DestructuredRange): Promise<T[]> {
+		return this.col.aggregate([
+			{
+				$match: {
+					...matchBasedOnDate(start, end),
+					type: 'user_daily',
+					mostImportantRole: { $ne: 'anonymous' },
+				},
+			},
+			{
+				$group: {
+					_id: { year: '$year', month: '$month', day: '$day' },
+					users: { $sum: 1 },
+				},
+			},
+			{
+				$project: {
+					_id: 0,
+					...getProjectionByFullDate(),
+					users: 1,
+				},
+			},
+			{
+				$sort: {
+					...getSortByFullDate(),
+				},
+			},
+		]).toArray();
+	}
+
+	async getTotalOfSessionByHourAndDayBetweenDates({ start, end }: DestructuredRange): Promise<T[]> {
+		const match = {
+			$match: {
+				type: 'computed-session',
+				loginAt: { $gte: start, $lte: end },
+			},
+		};
+		const rangeProject = {
+			$project: {
+				range: {
+					$range: [
+						{ $hour: '$loginAt' },
+						{ $sum: [{ $ifNull: [{ $hour: '$closedAt' }, 23] }, 1] }],
+				},
+				session: '$$ROOT',
+			},
+
+		};
+		const unwind = {
+			$unwind: '$range',
+		};
+		const groups = getGroupSessionsByHour({ range: '$range', day: '$session.day', month: '$session.month', year: '$session.year' });
+		const presentationProject = {
+			$project: {
+				_id: 0,
+				hour: '$_id.range',
+				...getProjectionByFullDate(),
+				users: 1,
+			},
+		};
+		const sort = {
+			$sort: {
+				...getSortByFullDate(),
+				hour: -1,
+			},
+		};
+		return this.col.aggregate([match, rangeProject, unwind, groups.listGroup, groups.countGroup, presentationProject, sort]).toArray();
+	}
+
+	async getUniqueUsersOfYesterday(): Promise<FullReturn> {
 		const date = new Date();
 		date.setDate(date.getDate() - 1);
 
@@ -487,11 +780,11 @@ export class Sessions extends Base {
 			year,
 			month,
 			day,
-			data: Promise.await(aggregates.getUniqueUsersOfYesterday(this.secondaryCollection, { year, month, day })),
+			data: await aggregates.getUniqueUsersOfYesterday(this.secondaryCollection, { year, month, day }),
 		};
 	}
 
-	getUniqueUsersOfLastMonth() {
+	async getUniqueUsersOfLastMonth(): Promise<FullReturn> {
 		const date = new Date();
 		date.setDate(date.getDate() - 1);
 
@@ -503,11 +796,11 @@ export class Sessions extends Base {
 			year,
 			month,
 			day,
-			data: Promise.await(aggregates.getUniqueUsersOfLastMonthOrWeek(this.secondaryCollection, { year, month, day })),
+			data: await aggregates.getUniqueUsersOfLastMonthOrWeek(this.secondaryCollection, { year, month, day }),
 		};
 	}
 
-	getUniqueUsersOfLastWeek() {
+	async getUniqueUsersOfLastWeek(): Promise<FullReturn> {
 		const date = new Date();
 		date.setDate(date.getDate() - 1);
 
@@ -519,11 +812,11 @@ export class Sessions extends Base {
 			year,
 			month,
 			day,
-			data: Promise.await(aggregates.getUniqueUsersOfLastMonthOrWeek(this.secondaryCollection, { year, month, day, type: 'week' })),
+			data: await aggregates.getUniqueUsersOfLastMonthOrWeek(this.secondaryCollection, { year, month, day, type: 'week' }),
 		};
 	}
 
-	getUniqueDevicesOfYesterday() {
+	async getUniqueDevicesOfYesterday(): Promise<FullReturn> {
 		const date = new Date();
 		date.setDate(date.getDate() - 1);
 
@@ -535,11 +828,11 @@ export class Sessions extends Base {
 			year,
 			month,
 			day,
-			data: Promise.await(aggregates.getUniqueDevicesOfYesterday(this.secondaryCollection, { year, month, day })),
+			data: await aggregates.getUniqueDevicesOfYesterday(this.secondaryCollection, { year, month, day }),
 		};
 	}
 
-	getUniqueDevicesOfLastMonth() {
+	async getUniqueDevicesOfLastMonth(): Promise<FullReturn> {
 		const date = new Date();
 		date.setDate(date.getDate() - 1);
 
@@ -551,11 +844,11 @@ export class Sessions extends Base {
 			year,
 			month,
 			day,
-			data: Promise.await(aggregates.getUniqueDevicesOfLastMonthOrWeek(this.secondaryCollection, { year, month, day })),
+			data: await aggregates.getUniqueDevicesOfLastMonthOrWeek(this.secondaryCollection, { year, month, day }),
 		};
 	}
 
-	getUniqueDevicesOfLastWeek() {
+	async getUniqueDevicesOfLastWeek(): Promise<FullReturn> {
 		const date = new Date();
 		date.setDate(date.getDate() - 1);
 
@@ -567,11 +860,11 @@ export class Sessions extends Base {
 			year,
 			month,
 			day,
-			data: Promise.await(aggregates.getUniqueDevicesOfLastMonthOrWeek(this.secondaryCollection, { year, month, day, type: 'week' })),
+			data: await aggregates.getUniqueDevicesOfLastMonthOrWeek(this.secondaryCollection, { year, month, day, type: 'week' }),
 		};
 	}
 
-	getUniqueOSOfYesterday() {
+	async getUniqueOSOfYesterday(): Promise<FullReturn> {
 		const date = new Date();
 		date.setDate(date.getDate() - 1);
 
@@ -583,11 +876,11 @@ export class Sessions extends Base {
 			year,
 			month,
 			day,
-			data: Promise.await(aggregates.getUniqueOSOfYesterday(this.secondaryCollection, { year, month, day })),
+			data: await aggregates.getUniqueOSOfYesterday(this.secondaryCollection, { year, month, day }),
 		};
 	}
 
-	getUniqueOSOfLastMonth() {
+	async getUniqueOSOfLastMonth(): Promise<FullReturn> {
 		const date = new Date();
 		date.setDate(date.getDate() - 1);
 
@@ -599,11 +892,11 @@ export class Sessions extends Base {
 			year,
 			month,
 			day,
-			data: Promise.await(aggregates.getUniqueOSOfLastMonthOrWeek(this.secondaryCollection, { year, month, day })),
+			data: await aggregates.getUniqueOSOfLastMonthOrWeek(this.secondaryCollection, { year, month, day }),
 		};
 	}
 
-	getUniqueOSOfLastWeek() {
+	async getUniqueOSOfLastWeek(): Promise<FullReturn> {
 		const date = new Date();
 		date.setDate(date.getDate() - 1);
 
@@ -615,11 +908,11 @@ export class Sessions extends Base {
 			year,
 			month,
 			day,
-			data: Promise.await(aggregates.getUniqueOSOfLastMonthOrWeek(this.secondaryCollection, { year, month, day, type: 'week' })),
+			data: await aggregates.getUniqueOSOfLastMonthOrWeek(this.secondaryCollection, { year, month, day, type: 'week' }),
 		};
 	}
 
-	createOrUpdate(data = {}) {
+	async createOrUpdate(data: T): Promise<UpdateWriteOpResult | undefined> {
 		const { year, month, day, sessionId, instanceId } = data;
 
 		if (!year || !month || !day || !sessionId || !instanceId) {
@@ -628,19 +921,19 @@ export class Sessions extends Base {
 
 		const now = new Date();
 
-		return this.upsert({ instanceId, sessionId, year, month, day }, {
+		return this.updateOne({ instanceId, sessionId, year, month, day }, {
 			$set: data,
 			$setOnInsert: {
 				createdAt: now,
 			},
-		});
+		}, { upsert: true });
 	}
 
-	closeByInstanceIdAndSessionId(instanceId, sessionId) {
+	async closeByInstanceIdAndSessionId(instanceId: string, sessionId: string): Promise<UpdateWriteOpResult> {
 		const query = {
 			instanceId,
 			sessionId,
-			closedAt: { $exists: 0 },
+			closedAt: { $exists: false },
 		};
 
 		const closeTime = new Date();
@@ -651,27 +944,27 @@ export class Sessions extends Base {
 			},
 		};
 
-		return this.update(query, update);
+		return this.updateOne(query, update);
 	}
 
-	updateActiveSessionsByDateAndInstanceIdAndIds({ year, month, day } = {}, instanceId, sessions, data = {}) {
+	async updateActiveSessionsByDateAndInstanceIdAndIds({ year, month, day }: Partial<DestructuredDate> = {}, instanceId: string, sessions: string[], data = {}): Promise<UpdateWriteOpResult> {
 		const query = {
 			instanceId,
 			year,
 			month,
 			day,
 			sessionId: { $in: sessions },
-			closedAt: { $exists: 0 },
+			closedAt: { $exists: false },
 		};
 
 		const update = {
 			$set: data,
 		};
 
-		return this.update(query, update, { multi: true });
+		return this.updateMany(query, update);
 	}
 
-	logoutByInstanceIdAndSessionIdAndUserId(instanceId, sessionId, userId) {
+	async logoutByInstanceIdAndSessionIdAndUserId(instanceId: string, sessionId: string, userId: string): Promise<UpdateWriteOpResult> {
 		const query = {
 			instanceId,
 			sessionId,
@@ -686,15 +979,15 @@ export class Sessions extends Base {
 			},
 		};
 
-		return this.update(query, update, { multi: true });
+		return this.updateMany(query, update);
 	}
 
-	createBatch(sessions) {
+	async createBatch(sessions: ModelOptionalId<T>[]): Promise<BulkWriteOpResultObject | undefined> {
 		if (!sessions || sessions.length === 0) {
 			return;
 		}
 
-		const ops = [];
+		const ops: BulkWriteOperation<T>[] = [];
 		sessions.forEach((doc) => {
 			const { year, month, day, sessionId, instanceId } = doc;
 			delete doc._id;
@@ -710,8 +1003,6 @@ export class Sessions extends Base {
 			});
 		});
 
-		return this.model.rawCollection().bulkWrite(ops, { ordered: false });
+		return this.col.bulkWrite(ops, { ordered: false });
 	}
 }
-
-export default new Sessions('sessions');
diff --git a/app/models/server/raw/Settings.ts b/app/models/server/raw/Settings.ts
index dd475ed9a131..2d3a11b2ccea 100644
--- a/app/models/server/raw/Settings.ts
+++ b/app/models/server/raw/Settings.ts
@@ -1,18 +1,29 @@
-import { Cursor, WriteOpResult } from 'mongodb';
+import { Cursor, FilterQuery, UpdateQuery, WriteOpResult } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
-import { ISetting } from '../../../../definition/ISetting';
+import { ISetting, ISettingColor, ISettingSelectOption } from '../../../../definition/ISetting';
 
-type T = ISetting;
 
-export class SettingsRaw extends BaseRaw<T> {
+export class SettingsRaw extends BaseRaw<ISetting> {
 	async getValueById(_id: string): Promise<ISetting['value'] | undefined> {
 		const setting = await this.findOne<Pick<ISetting, 'value'>>({ _id }, { projection: { value: 1 } });
 
 		return setting?.value;
 	}
 
-	findOneNotHiddenById(_id: string): Promise<T | null> {
+	findNotHidden({ updatedAfter }: { updatedAfter?: Date } = {}): Cursor<ISetting> {
+		const query: FilterQuery<ISetting> = {
+			hidden: { $ne: true },
+		};
+
+		if (updatedAfter) {
+			query._updatedAt = { $gt: updatedAfter };
+		}
+
+		return this.find(query);
+	}
+
+	findOneNotHiddenById(_id: string): Promise<ISetting | null> {
 		const query = {
 			_id,
 			hidden: { $ne: true },
@@ -21,7 +32,7 @@ export class SettingsRaw extends BaseRaw<T> {
 		return this.findOne(query);
 	}
 
-	findByIds(_id: string[] | string = []): Cursor<T> {
+	findByIds(_id: string[] | string = []): Cursor<ISetting> {
 		if (typeof _id === 'string') {
 			_id = [_id];
 		}
@@ -35,7 +46,50 @@ export class SettingsRaw extends BaseRaw<T> {
 		return this.find(query);
 	}
 
-	updateValueById(_id: string, value: any): Promise<WriteOpResult> {
+	updateValueById<T extends ISetting['value'] = ISetting['value']>(_id: string, value: T): Promise<WriteOpResult> {
+		const query = {
+			blocked: { $ne: true },
+			value: { $ne: value },
+			_id,
+		};
+
+		const update = {
+			$set: {
+				value,
+			},
+		};
+
+		return this.update(query, update);
+	}
+
+	updateOptionsById<T extends ISetting = ISetting>(_id: ISetting['_id'], options: UpdateQuery<T>['$set']): Promise<WriteOpResult> {
+		const query = {
+			blocked: { $ne: true },
+			_id,
+		};
+
+		const update = { $set: options };
+
+		return this.update(query, update);
+	}
+
+	updateValueNotHiddenById<T extends ISetting['value'] = ISetting['value']>(_id: ISetting['_id'], value: T): Promise<WriteOpResult> {
+		const query = {
+			_id,
+			hidden: { $ne: true },
+			blocked: { $ne: true },
+		};
+
+		const update = {
+			$set: {
+				value,
+			},
+		};
+
+		return this.update(query, update);
+	}
+
+	updateValueAndEditorById<T extends ISetting['value'] = ISetting['value']>(_id: ISetting['_id'], value: T, editor: ISettingColor['editor']): Promise<WriteOpResult> {
 		const query = {
 			blocked: { $ne: true },
 			value: { $ne: value },
@@ -45,9 +99,58 @@ export class SettingsRaw extends BaseRaw<T> {
 		const update = {
 			$set: {
 				value,
+				editor,
 			},
 		};
 
 		return this.update(query, update);
 	}
+
+	findNotHiddenPublic<T extends ISetting = ISetting>(ids: ISetting['_id'][] = []): Cursor< T extends ISettingColor ? Pick<T, '_id' | 'value' | 'editor' | 'enterprise' | 'invalidValue' | 'modules' | 'requiredOnWizard'> : Pick<T, '_id' | 'value' | 'enterprise' | 'invalidValue' | 'modules' | 'requiredOnWizard'>> {
+		const filter: FilterQuery<ISetting> = {
+			hidden: { $ne: true },
+			public: true,
+		};
+
+		if (ids.length > 0) {
+			filter._id = { $in: ids };
+		}
+
+		return this.find(filter, { fields: { _id: 1, value: 1, editor: 1, enterprise: 1, invalidValue: 1, modules: 1, requiredOnWizard: 1 } }) as any;
+	}
+
+	findSetupWizardSettings(): Cursor<ISetting> {
+		return this.find({ wizard: { $exists: true } });
+	}
+
+	addOptionValueById(_id: ISetting['_id'], option: ISettingSelectOption): Promise<WriteOpResult> {
+		const query = {
+			blocked: { $ne: true },
+			_id,
+		};
+
+		const { key, i18nLabel } = option;
+		const update = {
+			$addToSet: {
+				values: {
+					key,
+					i18nLabel,
+				},
+			},
+		};
+
+		return this.update(query, update);
+	}
+
+	findNotHiddenPublicUpdatedAfter(updatedAt: Date): Cursor<ISetting> {
+		const filter = {
+			hidden: { $ne: true },
+			public: true,
+			_updatedAt: {
+				$gt: updatedAt,
+			},
+		};
+
+		return this.find(filter, { projection: { _id: 1, value: 1, editor: 1, enterprise: 1, invalidValue: 1, modules: 1, requiredOnWizard: 1 } });
+	}
 }
diff --git a/app/models/server/raw/SmarshHistory.ts b/app/models/server/raw/SmarshHistory.ts
new file mode 100644
index 000000000000..70c2e3df482d
--- /dev/null
+++ b/app/models/server/raw/SmarshHistory.ts
@@ -0,0 +1,8 @@
+import { BaseRaw } from './BaseRaw';
+import { ISmarshHistory } from '../../../../definition/ISmarshHistory';
+
+type T = ISmarshHistory;
+
+export class SmarshHistoryRaw extends BaseRaw<T> {
+
+}
diff --git a/app/models/server/raw/Statistics.js b/app/models/server/raw/Statistics.js
deleted file mode 100644
index 15b3cf39404a..000000000000
--- a/app/models/server/raw/Statistics.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { BaseRaw } from './BaseRaw';
-
-export class StatisticsRaw extends BaseRaw {
-	async findLast() {
-		const options = {
-			sort: {
-				createdAt: -1,
-			},
-			limit: 1,
-		};
-		const records = await this.find({}, options).toArray();
-		return records && records[0];
-	}
-}
diff --git a/app/models/server/raw/Statistics.ts b/app/models/server/raw/Statistics.ts
new file mode 100644
index 000000000000..b3b915a9ebce
--- /dev/null
+++ b/app/models/server/raw/Statistics.ts
@@ -0,0 +1,21 @@
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { IStatistic } from '../../../../definition/IStatistic';
+
+type T = IStatistic;
+
+export class StatisticsRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { createdAt: -1 } },
+	]
+
+	async findLast(): Promise<T> {
+		const options = {
+			sort: {
+				createdAt: -1,
+			},
+			limit: 1,
+		};
+		const records = await this.find({}, options).toArray();
+		return records && records[0];
+	}
+}
diff --git a/app/models/server/raw/Subscriptions.ts b/app/models/server/raw/Subscriptions.ts
index 544af563af91..4a02f6185769 100644
--- a/app/models/server/raw/Subscriptions.ts
+++ b/app/models/server/raw/Subscriptions.ts
@@ -1,10 +1,20 @@
-import { FindOneOptions, Cursor, UpdateQuery, FilterQuery } from 'mongodb';
+import { FindOneOptions, Cursor, UpdateQuery, FilterQuery, UpdateWriteOpResult, Collection, WithoutProjection } from 'mongodb';
+import { compact } from 'lodash';
 
 import { BaseRaw } from './BaseRaw';
 import { ISubscription } from '../../../../definition/ISubscription';
+import { IRole, IUser } from '../../../../definition/IUser';
+import { IRoom } from '../../../../definition/IRoom';
+import { UsersRaw } from './Users';
 
 type T = ISubscription;
 export class SubscriptionsRaw extends BaseRaw<T> {
+	constructor(public readonly col: Collection<T>,
+		private readonly models: { Users: UsersRaw },
+		public readonly trash?: Collection<T>) {
+		super(col, trash);
+	}
+
 	findOneByRoomIdAndUserId(rid: string, uid: string, options: FindOneOptions<T> = {}): Promise<T | null> {
 		const query = {
 			rid,
@@ -47,7 +57,7 @@ export class SubscriptionsRaw extends BaseRaw<T> {
 		return cursor.count();
 	}
 
-	async isUserInRole(uid: string, roleName: string, rid: string): Promise<T | null> {
+	async isUserInRole(uid: IUser['_id'], roleName: IRole['name'], rid?: IRoom['_id']): Promise<T | null> {
 		if (rid == null) {
 			return null;
 		}
@@ -80,4 +90,77 @@ export class SubscriptionsRaw extends BaseRaw<T> {
 
 		return this.update(query, update, options);
 	}
+
+	removeRolesByUserId(uid: IUser['_id'], roles: IRole['name'][], rid: IRoom['_id']): Promise<UpdateWriteOpResult> {
+		const query = {
+			'u._id': uid,
+			rid,
+		};
+
+		const update = {
+			$pullAll: {
+				roles,
+			},
+		};
+
+		return this.updateOne(query, update);
+	}
+
+
+	findUsersInRoles(name: IRole['name'][], rid: string | undefined): Promise<Cursor<IUser>>;
+
+	findUsersInRoles(name: IRole['name'][], rid: string | undefined, options: WithoutProjection<FindOneOptions<IUser>>): Promise<Cursor<IUser>>;
+
+	findUsersInRoles<P = IUser>(name: IRole['name'][], rid: string | undefined, options: FindOneOptions<P extends IUser ? IUser : P>): Promise<Cursor<P>>;
+
+	async findUsersInRoles<P = IUser>(roles: IRole['name'][], rid: IRoom['_id'] | undefined, options?: FindOneOptions<P extends IUser ? IUser : P>): Promise<Cursor<P>> {
+		const query = {
+			roles: { $in: roles },
+			...rid && { rid },
+		};
+
+		const subscriptions = await this.find(query).toArray();
+
+		const users = compact(subscriptions.map((subscription) => subscription.u?._id).filter(Boolean));
+
+		return !options ? this.models.Users.find({ _id: { $in: users } }) : this.models.Users.find({ _id: { $in: users } } as FilterQuery<IUser>, options);
+	}
+
+
+	addRolesByUserId(uid: IUser['_id'], roles: IRole['name'][], rid?: IRoom['_id']): Promise<UpdateWriteOpResult> {
+		if (!Array.isArray(roles)) {
+			roles = [roles];
+			process.env.NODE_ENV === 'development' && console.warn('[WARN] Subscriptions.addRolesByUserId: roles should be an array');
+		}
+
+		const query = {
+			'u._id': uid,
+			rid,
+		};
+
+		const update = {
+			$addToSet: {
+				roles: { $each: roles },
+			},
+		};
+
+		return this.updateOne(query, update);
+	}
+
+	async isUserInRoleScope(uid: IUser['_id'], rid?: IRoom['_id']): Promise<boolean> {
+		const query = {
+			'u._id': uid,
+			rid,
+		};
+
+		if (!rid) {
+			return false;
+		}
+		const options = {
+			fields: { _id: 1 },
+		};
+
+		const found = await this.findOne(query, options);
+		return !!found;
+	}
 }
diff --git a/app/models/server/raw/Uploads.ts b/app/models/server/raw/Uploads.ts
new file mode 100644
index 000000000000..ad2fd67247c9
--- /dev/null
+++ b/app/models/server/raw/Uploads.ts
@@ -0,0 +1,116 @@
+// TODO: Lib imports should not exists inside the raw models
+import { escapeRegExp } from '@rocket.chat/string-helpers';
+import { CollectionInsertOneOptions, Cursor, DeleteWriteOpResultObject, FilterQuery, InsertOneWriteOpResult, UpdateOneOptions, UpdateQuery, UpdateWriteOpResult, WithId, WriteOpResult } from 'mongodb';
+
+import { BaseRaw, IndexSpecification, InsertionModel } from './BaseRaw';
+import { IUpload as T } from '../../../../definition/IUpload';
+
+const fillTypeGroup = (fileData: Partial<T>): void => {
+	if (!fileData.type) {
+		return;
+	}
+
+	fileData.typeGroup = fileData.type.split('/').shift();
+};
+
+export class UploadsRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { rid: 1 } },
+		{ key: { uploadedAt: 1 } },
+		{ key: { typeGroup: 1 } },
+	]
+
+	findNotHiddenFilesOfRoom(roomId: string, searchText: string, fileType: string, limit: number): Cursor<T> {
+		const fileQuery = {
+			rid: roomId,
+			complete: true,
+			uploading: false,
+			_hidden: {
+				$ne: true,
+			},
+
+			...searchText && { name: { $regex: new RegExp(escapeRegExp(searchText), 'i') } },
+			...fileType && fileType !== 'all' && { typeGroup: fileType },
+		};
+
+		const fileOptions = {
+			limit,
+			sort: {
+				uploadedAt: -1,
+			},
+			projection: {
+				_id: 1,
+				userId: 1,
+				rid: 1,
+				name: 1,
+				description: 1,
+				type: 1,
+				url: 1,
+				uploadedAt: 1,
+				typeGroup: 1,
+			},
+		};
+
+		return this.find(fileQuery, fileOptions);
+	}
+
+	insert(fileData: InsertionModel<T>, options?: CollectionInsertOneOptions): Promise<InsertOneWriteOpResult<WithId<T>>> {
+		fillTypeGroup(fileData);
+		return super.insertOne(fileData, options);
+	}
+
+	update(filter: FilterQuery<T>, update: UpdateQuery<T> | Partial<T>, options?: UpdateOneOptions & { multi?: boolean }): Promise<WriteOpResult> {
+		if ('$set' in update && update.$set) {
+			fillTypeGroup(update.$set);
+		} else if ('type' in update && update.type) {
+			fillTypeGroup(update);
+		}
+
+		return super.update(filter, update, options);
+	}
+
+	async insertFileInit(userId: string, store: string, file: {name: string}, extra: object): Promise<InsertOneWriteOpResult<WithId<T>>> {
+		const fileData = {
+			userId,
+			store,
+			complete: false,
+			uploading: true,
+			progress: 0,
+			extension: file.name.split('.').pop(),
+			uploadedAt: new Date(),
+			...file,
+			...extra,
+		};
+
+		fillTypeGroup(fileData);
+		return this.insert(fileData);
+	}
+
+	async updateFileComplete(fileId: string, userId: string, file: object): Promise<UpdateWriteOpResult | undefined> {
+		if (!fileId) {
+			return;
+		}
+
+		const filter = {
+			_id: fileId,
+			userId,
+		};
+
+		const update = {
+			$set: {
+				complete: true,
+				uploading: false,
+				progress: 1,
+			},
+		};
+
+		update.$set = Object.assign(file, update.$set);
+
+		fillTypeGroup(update.$set);
+		return this.updateOne(filter, update);
+	}
+
+	async deleteFile(fileId: string): Promise<DeleteWriteOpResultObject> {
+		return this.deleteOne({ _id: fileId });
+	}
+}
diff --git a/app/models/server/raw/UserDataFiles.ts b/app/models/server/raw/UserDataFiles.ts
new file mode 100644
index 000000000000..684135c9d57a
--- /dev/null
+++ b/app/models/server/raw/UserDataFiles.ts
@@ -0,0 +1,29 @@
+import { FindOneOptions, InsertOneWriteOpResult, WithId, WithoutProjection } from 'mongodb';
+
+import { BaseRaw, IndexSpecification } from './BaseRaw';
+import { IUserDataFile as T } from '../../../../definition/IUserDataFile';
+
+export class UserDataFilesRaw extends BaseRaw<T> {
+	protected indexes: IndexSpecification[] = [
+		{ key: { userId: 1 } },
+	]
+
+	findLastFileByUser(userId: string, options: WithoutProjection<FindOneOptions<T>> = {}): Promise<T | null> {
+		const query = {
+			userId,
+		};
+
+		options.sort = { _updatedAt: -1 };
+		return this.findOne(query, options);
+	}
+
+	// INSERT
+	create(data: T): Promise<InsertOneWriteOpResult<WithId<T>>> {
+		const userDataFile = {
+			createdAt: new Date(),
+			...data,
+		};
+
+		return this.insertOne(userDataFile);
+	}
+}
diff --git a/app/models/server/raw/Users.js b/app/models/server/raw/Users.js
index 6de2fb2f7e56..0d6ce77ed78c 100644
--- a/app/models/server/raw/Users.js
+++ b/app/models/server/raw/Users.js
@@ -11,6 +11,24 @@ export class UsersRaw extends BaseRaw {
 		};
 	}
 
+	addRolesByUserId(uid, roles) {
+		if (!Array.isArray(roles)) {
+			roles = [roles];
+			process.env.NODE_ENV === 'development' && console.warn('[WARN] Users.addRolesByUserId: roles should be an array');
+		}
+
+		const query = {
+			_id: uid,
+		};
+
+		const update = {
+			$addToSet: {
+				roles: { $each: roles },
+			},
+		};
+		return this.updateOne(query, update);
+	}
+
 	findUsersInRoles(roles, scope, options) {
 		roles = [].concat(roles);
 
@@ -706,4 +724,31 @@ export class UsersRaw extends BaseRaw {
 			$pullAll: { __rooms: rids },
 		}, { multi: true });
 	}
+
+	removeRolesByUserId(uid, roles) {
+		const query = {
+			_id: uid,
+		};
+
+		const update = {
+			$pullAll: {
+				roles,
+			},
+		};
+
+		return this.updateOne(query, update);
+	}
+
+	async isUserInRoleScope(uid) {
+		const query = {
+			_id: uid,
+		};
+
+		const options = {
+			fields: { _id: 1 },
+		};
+
+		const found = await this.findOne(query, options);
+		return !!found;
+	}
 }
diff --git a/app/models/server/raw/UsersSessions.ts b/app/models/server/raw/UsersSessions.ts
index b89feaa9deb3..3560f1e175d1 100644
--- a/app/models/server/raw/UsersSessions.ts
+++ b/app/models/server/raw/UsersSessions.ts
@@ -1,4 +1,16 @@
 import { BaseRaw } from './BaseRaw';
 import { IUserSession } from '../../../../definition/IUserSession';
 
-export class UsersSessionsRaw extends BaseRaw<IUserSession> {}
+export class UsersSessionsRaw extends BaseRaw<IUserSession> {
+	clearConnectionsFromInstanceId(instanceId: string[]): ReturnType<BaseRaw<IUserSession>['updateMany']> {
+		return this.col.updateMany({}, {
+			$pull: {
+				connections: {
+					instanceId: {
+						$nin: instanceId,
+					},
+				},
+			},
+		});
+	}
+}
diff --git a/app/models/server/raw/WebdavAccounts.js b/app/models/server/raw/WebdavAccounts.js
deleted file mode 100644
index bcd87761c267..000000000000
--- a/app/models/server/raw/WebdavAccounts.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { BaseRaw } from './BaseRaw';
-
-export class WebdavAccountsRaw extends BaseRaw {
-	findWithUserId(user_id, options) {
-		const query = { user_id };
-		return this.find(query, options);
-	}
-}
diff --git a/app/models/server/raw/WebdavAccounts.ts b/app/models/server/raw/WebdavAccounts.ts
new file mode 100644
index 000000000000..c189cb7e3799
--- /dev/null
+++ b/app/models/server/raw/WebdavAccounts.ts
@@ -0,0 +1,46 @@
+/* eslint-disable @typescript-eslint/camelcase */
+/**
+ * Webdav Accounts model
+ */
+import type { Collection, FindOneOptions, Cursor, DeleteWriteOpResultObject } from 'mongodb';
+
+import { BaseRaw } from './BaseRaw';
+import { IWebdavAccount } from '../../../../definition/IWebdavAccount';
+
+type T = IWebdavAccount;
+
+export class WebdavAccountsRaw extends BaseRaw<T> {
+	constructor(
+		public readonly col: Collection<T>,
+		public readonly trash?: Collection<T>,
+	) {
+		super(col, trash);
+
+		this.col.createIndex({ user_id: 1 });
+	}
+
+	findOneByIdAndUserId(_id: string, user_id: string, options: FindOneOptions<T>): Promise<T | null> {
+		return this.findOne({ _id, user_id }, options);
+	}
+
+	findOneByUserIdServerUrlAndUsername({
+		user_id,
+		server_url,
+		username,
+	}: {
+		user_id: string;
+		server_url: string;
+		username: string;
+	}, options: FindOneOptions<T>): Promise<T | null> {
+		return this.findOne({ user_id, server_url, username }, options);
+	}
+
+	findWithUserId(user_id: string, options: FindOneOptions<T>): Cursor<T> {
+		const query = { user_id };
+		return this.find(query, options);
+	}
+
+	removeByUserAndId(_id: string, user_id: string): Promise<DeleteWriteOpResultObject> {
+		return this.deleteOne({ _id, user_id });
+	}
+}
diff --git a/app/models/server/raw/_Users.d.ts b/app/models/server/raw/_Users.d.ts
new file mode 100644
index 000000000000..891392ee3f7e
--- /dev/null
+++ b/app/models/server/raw/_Users.d.ts
@@ -0,0 +1,14 @@
+import { UpdateWriteOpResult } from 'mongodb';
+
+import { IRole, IUser } from '../../../../definition/IUser';
+import { BaseRaw } from './BaseRaw';
+
+export interface IUserRaw extends BaseRaw<IUser> {
+	isUserInRole(uid: IUser['_id'], name: IRole['name']): Promise<boolean>;
+	removeRolesByUserId(uid: IUser['_id'], roles: IRole['name'][]): Promise<UpdateWriteOpResult>;
+	findUsersInRoles(roles: IRole['name'][]): Promise<IUser[]>;
+	addRolesByUserId(uid: IUser['_id'], roles: IRole['name'][]): Promise<UpdateWriteOpResult>;
+	isUserInRoleScope(uid: IUser['_id']): Promise<boolean>;
+	new(...args: any): IUser;
+}
+export const UsersRaw: IUserRaw;
diff --git a/app/models/server/raw/index.ts b/app/models/server/raw/index.ts
index 605218c636be..34789c62ce2f 100644
--- a/app/models/server/raw/index.ts
+++ b/app/models/server/raw/index.ts
@@ -1,83 +1,81 @@
-import PermissionsModel from '../models/Permissions';
+import { MongoInternals } from 'meteor/mongo';
+
+import { AvatarsRaw } from './Avatars';
+import { AnalyticsRaw } from './Analytics';
+import { api } from '../../../../server/sdk/api';
+import { BaseDbWatch, trash } from '../models/_BaseDb';
+import { CredentialTokensRaw } from './CredentialTokens';
+import { CustomSoundsRaw } from './CustomSounds';
+import { CustomUserStatusRaw } from './CustomUserStatus';
+import { EmailInboxRaw } from './EmailInbox';
+import { EmailMessageHistoryRaw } from './EmailMessageHistory';
+import { EmojiCustomRaw } from './EmojiCustom';
+import { ExportOperationsRaw } from './ExportOperations';
+import { FederationKeysRaw } from './FederationKeys';
+import { FederationServersRaw } from './FederationServers';
+import { ImportDataRaw } from './ImportData';
+import { initWatchers } from '../../../../server/modules/watchers/watchers.module';
+import { InstanceStatusRaw } from './InstanceStatus';
+import { IntegrationHistoryRaw } from './IntegrationHistory';
+import { IntegrationsRaw } from './Integrations';
+import { InvitesRaw } from './Invites';
+import { LivechatAgentActivityRaw } from './LivechatAgentActivity';
+import { LivechatBusinessHoursRaw } from './LivechatBusinessHours';
+import { LivechatCustomFieldRaw } from './LivechatCustomField';
+import { LivechatDepartmentAgentsRaw } from './LivechatDepartmentAgents';
+import { LivechatDepartmentRaw } from './LivechatDepartment';
+import { LivechatExternalMessageRaw } from './LivechatExternalMessages';
+import { LivechatInquiryRaw } from './LivechatInquiry';
+import { LivechatRoomsRaw } from './LivechatRooms';
+import { LivechatTriggerRaw } from './LivechatTrigger';
+import { LivechatVisitorsRaw } from './LivechatVisitors';
+import { LoginServiceConfigurationRaw } from './LoginServiceConfiguration';
+import { MessagesRaw } from './Messages';
+import { NotificationQueueRaw } from './NotificationQueue';
+import { OAuthAppsRaw } from './OAuthApps';
+import { OEmbedCacheRaw } from './OEmbedCache';
+import { OmnichannelQueueRaw } from './OmnichannelQueue';
 import { PermissionsRaw } from './Permissions';
-import RolesModel from '../models/Roles';
+import { readSecondaryPreferred } from '../../../../server/database/readSecondaryPreferred';
+import { ReadReceiptsRaw } from './ReadReceipts';
+import { ReportsRaw } from './Reports';
 import { RolesRaw } from './Roles';
-import SubscriptionsModel from '../models/Subscriptions';
-import { SubscriptionsRaw } from './Subscriptions';
-import SettingsModel from '../models/Settings';
+import { RoomsRaw } from './Rooms';
+import { ServerEventsRaw } from './ServerEvents';
+import { SessionsRaw } from './Sessions';
 import { SettingsRaw } from './Settings';
-import UsersModel from '../models/Users';
+import { SmarshHistoryRaw } from './SmarshHistory';
+import { StatisticsRaw } from './Statistics';
+import { SubscriptionsRaw } from './Subscriptions';
 import { UsersRaw } from './Users';
-import SessionsModel from '../models/Sessions';
-import { SessionsRaw } from './Sessions';
-import RoomsModel from '../models/Rooms';
-import { RoomsRaw } from './Rooms';
+import { UsersSessionsRaw } from './UsersSessions';
+import { UserDataFilesRaw } from './UserDataFiles';
+import { UploadsRaw } from './Uploads';
+import { WebdavAccountsRaw } from './WebdavAccounts';
+import ImportDataModel from '../models/ImportData';
+import LivechatAgentActivityModel from '../models/LivechatAgentActivity';
+import LivechatBusinessHoursModel from '../models/LivechatBusinessHours';
 import LivechatCustomFieldModel from '../models/LivechatCustomField';
-import { LivechatCustomFieldRaw } from './LivechatCustomField';
-import LivechatTriggerModel from '../models/LivechatTrigger';
-import { LivechatTriggerRaw } from './LivechatTrigger';
-import LivechatDepartmentModel from '../models/LivechatDepartment';
-import { LivechatDepartmentRaw } from './LivechatDepartment';
 import LivechatDepartmentAgentsModel from '../models/LivechatDepartmentAgents';
-import { LivechatDepartmentAgentsRaw } from './LivechatDepartmentAgents';
-import LivechatRoomsModel from '../models/LivechatRooms';
-import { LivechatRoomsRaw } from './LivechatRooms';
-import MessagesModel from '../models/Messages';
-import { MessagesRaw } from './Messages';
+import LivechatDepartmentModel from '../models/LivechatDepartment';
 import LivechatExternalMessagesModel from '../models/LivechatExternalMessages';
-import { LivechatExternalMessageRaw } from './LivechatExternalMessages';
-import LivechatVisitorsModel from '../models/LivechatVisitors';
-import { LivechatVisitorsRaw } from './LivechatVisitors';
 import LivechatInquiryModel from '../models/LivechatInquiry';
-import { LivechatInquiryRaw } from './LivechatInquiry';
-import IntegrationsModel from '../models/Integrations';
-import { IntegrationsRaw } from './Integrations';
-import EmojiCustomModel from '../models/EmojiCustom';
-import { EmojiCustomRaw } from './EmojiCustom';
-import WebdavAccountsModel from '../models/WebdavAccounts';
-import { WebdavAccountsRaw } from './WebdavAccounts';
-import OAuthAppsModel from '../models/OAuthApps';
-import { OAuthAppsRaw } from './OAuthApps';
-import CustomSoundsModel from '../models/CustomSounds';
-import { CustomSoundsRaw } from './CustomSounds';
-import CustomUserStatusModel from '../models/CustomUserStatus';
-import { CustomUserStatusRaw } from './CustomUserStatus';
-import LivechatAgentActivityModel from '../models/LivechatAgentActivity';
-import { LivechatAgentActivityRaw } from './LivechatAgentActivity';
-import StatisticsModel from '../models/Statistics';
-import { StatisticsRaw } from './Statistics';
-import NotificationQueueModel from '../models/NotificationQueue';
-import { NotificationQueueRaw } from './NotificationQueue';
-import LivechatBusinessHoursModel from '../models/LivechatBusinessHours';
-import { LivechatBusinessHoursRaw } from './LivechatBusinessHours';
-import ServerEventModel from '../models/ServerEvents';
-import { UsersSessionsRaw } from './UsersSessions';
-import UsersSessionsModel from '../models/UsersSessions';
-import { ServerEventsRaw } from './ServerEvents';
-import { trash } from '../models/_BaseDb';
+import LivechatRoomsModel from '../models/LivechatRooms';
+import LivechatTriggerModel from '../models/LivechatTrigger';
+import LivechatVisitorsModel from '../models/LivechatVisitors';
 import LoginServiceConfigurationModel from '../models/LoginServiceConfiguration';
-import { LoginServiceConfigurationRaw } from './LoginServiceConfiguration';
-import { InstanceStatusRaw } from './InstanceStatus';
-import InstanceStatusModel from '../models/InstanceStatus';
-import { IntegrationHistoryRaw } from './IntegrationHistory';
-import IntegrationHistoryModel from '../models/IntegrationHistory';
+import MessagesModel from '../models/Messages';
 import OmnichannelQueueModel from '../models/OmnichannelQueue';
-import { OmnichannelQueueRaw } from './OmnichannelQueue';
-import EmailInboxModel from '../models/EmailInbox';
-import { EmailInboxRaw } from './EmailInbox';
-import EmailMessageHistoryModel from '../models/EmailMessageHistory';
-import { EmailMessageHistoryRaw } from './EmailMessageHistory';
-import { api } from '../../../../server/sdk/api';
-import { initWatchers } from '../../../../server/modules/watchers/watchers.module';
-import ImportDataModel from '../models/ImportData';
-import { ImportDataRaw } from './ImportData';
+import RoomsModel from '../models/Rooms';
+import SettingsModel from '../models/Settings';
+import SubscriptionsModel from '../models/Subscriptions';
+import UsersModel from '../models/Users';
 
 const trashCollection = trash.rawCollection();
 
-export const Permissions = new PermissionsRaw(PermissionsModel.model.rawCollection(), trashCollection);
-export const Subscriptions = new SubscriptionsRaw(SubscriptionsModel.model.rawCollection(), trashCollection);
-export const Settings = new SettingsRaw(SettingsModel.model.rawCollection(), trashCollection);
 export const Users = new UsersRaw(UsersModel.model.rawCollection(), trashCollection);
+export const Subscriptions = new SubscriptionsRaw(SubscriptionsModel.model.rawCollection(), { Users }, trashCollection);
+export const Settings = new SettingsRaw(SettingsModel.model.rawCollection(), trashCollection);
 export const Rooms = new RoomsRaw(RoomsModel.model.rawCollection(), trashCollection);
 export const LivechatCustomField = new LivechatCustomFieldRaw(LivechatCustomFieldModel.model.rawCollection(), trashCollection);
 export const LivechatTrigger = new LivechatTriggerRaw(LivechatTriggerModel.model.rawCollection(), trashCollection);
@@ -88,44 +86,56 @@ export const Messages = new MessagesRaw(MessagesModel.model.rawCollection(), tra
 export const LivechatExternalMessage = new LivechatExternalMessageRaw(LivechatExternalMessagesModel.model.rawCollection(), trashCollection);
 export const LivechatVisitors = new LivechatVisitorsRaw(LivechatVisitorsModel.model.rawCollection(), trashCollection);
 export const LivechatInquiry = new LivechatInquiryRaw(LivechatInquiryModel.model.rawCollection(), trashCollection);
-export const Integrations = new IntegrationsRaw(IntegrationsModel.model.rawCollection(), trashCollection);
-export const EmojiCustom = new EmojiCustomRaw(EmojiCustomModel.model.rawCollection(), trashCollection);
-export const WebdavAccounts = new WebdavAccountsRaw(WebdavAccountsModel.model.rawCollection(), trashCollection);
-export const OAuthApps = new OAuthAppsRaw(OAuthAppsModel.model.rawCollection(), trashCollection);
-export const CustomSounds = new CustomSoundsRaw(CustomSoundsModel.model.rawCollection(), trashCollection);
-export const CustomUserStatus = new CustomUserStatusRaw(CustomUserStatusModel.model.rawCollection(), trashCollection);
 export const LivechatAgentActivity = new LivechatAgentActivityRaw(LivechatAgentActivityModel.model.rawCollection(), trashCollection);
-export const Statistics = new StatisticsRaw(StatisticsModel.model.rawCollection(), trashCollection);
-export const NotificationQueue = new NotificationQueueRaw(NotificationQueueModel.model.rawCollection(), trashCollection);
 export const LivechatBusinessHours = new LivechatBusinessHoursRaw(LivechatBusinessHoursModel.model.rawCollection(), trashCollection);
-export const ServerEvents = new ServerEventsRaw(ServerEventModel.model.rawCollection(), trashCollection);
-export const Roles = new RolesRaw(RolesModel.model.rawCollection(), trashCollection, { Users, Subscriptions });
-export const UsersSessions = new UsersSessionsRaw(UsersSessionsModel.model.rawCollection(), trashCollection);
+// export const Roles = new RolesRaw(RolesModel.model.rawCollection(), { Users, Subscriptions }, trashCollection);
 export const LoginServiceConfiguration = new LoginServiceConfigurationRaw(LoginServiceConfigurationModel.model.rawCollection(), trashCollection);
-export const InstanceStatus = new InstanceStatusRaw(InstanceStatusModel.model.rawCollection(), trashCollection);
-export const IntegrationHistory = new IntegrationHistoryRaw(IntegrationHistoryModel.model.rawCollection(), trashCollection);
-export const Sessions = new SessionsRaw(SessionsModel.model.rawCollection(), trashCollection);
 export const OmnichannelQueue = new OmnichannelQueueRaw(OmnichannelQueueModel.model.rawCollection(), trashCollection);
-export const EmailInbox = new EmailInboxRaw(EmailInboxModel.model.rawCollection(), trashCollection);
-export const EmailMessageHistory = new EmailMessageHistoryRaw(EmailMessageHistoryModel.model.rawCollection(), trashCollection);
 export const ImportData = new ImportDataRaw(ImportDataModel.model.rawCollection(), trashCollection);
 
+const { db } = MongoInternals.defaultRemoteCollectionDriver().mongo;
+const prefix = 'rocketchat_';
+
+export const Avatars = new AvatarsRaw(db.collection(`${ prefix }avatars`), trashCollection);
+export const Analytics = new AnalyticsRaw(db.collection(`${ prefix }analytics`, { readPreference: readSecondaryPreferred(db) }), trashCollection);
+export const CustomSounds = new CustomSoundsRaw(db.collection(`${ prefix }custom_sounds`), trashCollection);
+export const CustomUserStatus = new CustomUserStatusRaw(db.collection(`${ prefix }custom_user_status`), trashCollection);
+export const CredentialTokens = new CredentialTokensRaw(db.collection(`${ prefix }credential_tokens`), trashCollection);
+export const EmailInbox = new EmailInboxRaw(db.collection(`${ prefix }email_inbox`), trashCollection);
+export const EmailMessageHistory = new EmailMessageHistoryRaw(db.collection(`${ prefix }email_message_history`), trashCollection);
+export const EmojiCustom = new EmojiCustomRaw(db.collection(`${ prefix }custom_emoji`), trashCollection);
+export const ExportOperations = new ExportOperationsRaw(db.collection(`${ prefix }export_operations`), trashCollection);
+export const FederationKeys = new FederationKeysRaw(db.collection(`${ prefix }federation_keys`), trashCollection);
+export const FederationServers = new FederationServersRaw(db.collection(`${ prefix }federation_servers`), trashCollection);
+export const InstanceStatus = new InstanceStatusRaw(db.collection('instances'), trashCollection, { preventSetUpdatedAt: true });
+export const Integrations = new IntegrationsRaw(db.collection(`${ prefix }integrations`), trashCollection);
+export const IntegrationHistory = new IntegrationHistoryRaw(db.collection(`${ prefix }integration_history`), trashCollection);
+export const Invites = new InvitesRaw(db.collection(`${ prefix }invites`), trashCollection);
+export const NotificationQueue = new NotificationQueueRaw(db.collection(`${ prefix }notification_queue`), trashCollection);
+export const OAuthApps = new OAuthAppsRaw(db.collection(`${ prefix }oauth_apps`), trashCollection);
+export const OEmbedCache = new OEmbedCacheRaw(db.collection(`${ prefix }oembed_cache`), trashCollection);
+export const Permissions = new PermissionsRaw(db.collection(`${ prefix }permissions`), trashCollection);
+export const ReadReceipts = new ReadReceiptsRaw(db.collection(`${ prefix }read_receipts`), trashCollection);
+export const Reports = new ReportsRaw(db.collection(`${ prefix }reports`), trashCollection);
+export const ServerEvents = new ServerEventsRaw(db.collection(`${ prefix }server_events`), trashCollection);
+export const Sessions = new SessionsRaw(db.collection(`${ prefix }sessions`), db.collection(`${ prefix }sessions`, { readPreference: readSecondaryPreferred(db) }), trashCollection);
+export const Roles = new RolesRaw(db.collection(`${ prefix }roles`), { Users, Subscriptions }, trashCollection);
+export const SmarshHistory = new SmarshHistoryRaw(db.collection(`${ prefix }smarsh_history`), trashCollection);
+export const Statistics = new StatisticsRaw(db.collection(`${ prefix }statistics`), trashCollection);
+export const UsersSessions = new UsersSessionsRaw(db.collection('usersSessions'), trashCollection, { preventSetUpdatedAt: true });
+export const UserDataFiles = new UserDataFilesRaw(db.collection(`${ prefix }user_data_files`), trashCollection);
+export const Uploads = new UploadsRaw(db.collection(`${ prefix }uploads`), trashCollection);
+export const WebdavAccounts = new WebdavAccountsRaw(db.collection(`${ prefix }webdav_accounts`), trashCollection);
+
 const map = {
 	[Messages.col.collectionName]: MessagesModel,
 	[Users.col.collectionName]: UsersModel,
 	[Subscriptions.col.collectionName]: SubscriptionsModel,
 	[Settings.col.collectionName]: SettingsModel,
-	[Roles.col.collectionName]: RolesModel,
-	[Permissions.col.collectionName]: PermissionsModel,
 	[LivechatInquiry.col.collectionName]: LivechatInquiryModel,
 	[LivechatDepartmentAgents.col.collectionName]: LivechatDepartmentAgentsModel,
-	[UsersSessions.col.collectionName]: UsersSessionsModel,
 	[Rooms.col.collectionName]: RoomsModel,
 	[LoginServiceConfiguration.col.collectionName]: LoginServiceConfigurationModel,
-	[InstanceStatus.col.collectionName]: InstanceStatusModel,
-	[IntegrationHistory.col.collectionName]: IntegrationHistoryModel,
-	[Integrations.col.collectionName]: IntegrationsModel,
-	[EmailInbox.col.collectionName]: EmailInboxModel,
 };
 
 if (!process.env.DISABLE_DB_WATCH) {
@@ -148,7 +158,7 @@ if (!process.env.DISABLE_DB_WATCH) {
 	};
 
 	initWatchers(models, api.broadcastLocal.bind(api), (model, fn) => {
-		const meteorModel = map[model.col.collectionName];
+		const meteorModel = map[model.col.collectionName] || new BaseDbWatch(model.col.collectionName);
 		if (!meteorModel) {
 			return;
 		}
diff --git a/app/oauth2-server-config/server/admin/methods/addOAuthApp.js b/app/oauth2-server-config/server/admin/methods/addOAuthApp.js
index cb4d73e19f27..688409e5ddf4 100644
--- a/app/oauth2-server-config/server/admin/methods/addOAuthApp.js
+++ b/app/oauth2-server-config/server/admin/methods/addOAuthApp.js
@@ -3,11 +3,12 @@ import { Random } from 'meteor/random';
 import _ from 'underscore';
 
 import { hasPermission } from '../../../../authorization';
-import { Users, OAuthApps } from '../../../../models';
+import { Users } from '../../../../models/server';
+import { OAuthApps } from '../../../../models/server/raw';
 import { parseUriList } from '../functions/parseUriList';
 
 Meteor.methods({
-	addOAuthApp(application) {
+	async addOAuthApp(application) {
 		if (!hasPermission(this.userId, 'manage-oauth-apps')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'addOAuthApp' });
 		}
@@ -31,7 +32,7 @@ Meteor.methods({
 		application.clientSecret = Random.secret();
 		application._createdAt = new Date();
 		application._createdBy = Users.findOne(this.userId, { fields: { username: 1 } });
-		application._id = OAuthApps.insert(application);
+		application._id = (await OAuthApps.insertOne(application)).insertedId;
 		return application;
 	},
 });
diff --git a/app/oauth2-server-config/server/admin/methods/deleteOAuthApp.js b/app/oauth2-server-config/server/admin/methods/deleteOAuthApp.js
index 6c0b1e665de6..d1df82d95704 100644
--- a/app/oauth2-server-config/server/admin/methods/deleteOAuthApp.js
+++ b/app/oauth2-server-config/server/admin/methods/deleteOAuthApp.js
@@ -1,18 +1,18 @@
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../../authorization';
-import { OAuthApps } from '../../../../models';
+import { OAuthApps } from '../../../../models/server/raw';
 
 Meteor.methods({
-	deleteOAuthApp(applicationId) {
+	async deleteOAuthApp(applicationId) {
 		if (!hasPermission(this.userId, 'manage-oauth-apps')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'deleteOAuthApp' });
 		}
-		const application = OAuthApps.findOne(applicationId);
+		const application = await OAuthApps.findOneById(applicationId);
 		if (application == null) {
 			throw new Meteor.Error('error-application-not-found', 'Application not found', { method: 'deleteOAuthApp' });
 		}
-		OAuthApps.remove({ _id: applicationId });
+		await OAuthApps.deleteOne({ _id: applicationId });
 		return true;
 	},
 });
diff --git a/app/oauth2-server-config/server/admin/methods/updateOAuthApp.js b/app/oauth2-server-config/server/admin/methods/updateOAuthApp.js
index 007f5be2e95c..3a7f88dda09e 100644
--- a/app/oauth2-server-config/server/admin/methods/updateOAuthApp.js
+++ b/app/oauth2-server-config/server/admin/methods/updateOAuthApp.js
@@ -2,11 +2,12 @@ import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
 import { hasPermission } from '../../../../authorization';
-import { OAuthApps, Users } from '../../../../models';
+import { OAuthApps } from '../../../../models/server/raw';
+import { Users } from '../../../../models/server';
 import { parseUriList } from '../functions/parseUriList';
 
 Meteor.methods({
-	updateOAuthApp(applicationId, application) {
+	async updateOAuthApp(applicationId, application) {
 		if (!hasPermission(this.userId, 'manage-oauth-apps')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'updateOAuthApp' });
 		}
@@ -19,7 +20,7 @@ Meteor.methods({
 		if (!_.isBoolean(application.active)) {
 			throw new Meteor.Error('error-invalid-arguments', 'Invalid arguments', { method: 'updateOAuthApp' });
 		}
-		const currentApplication = OAuthApps.findOne(applicationId);
+		const currentApplication = await OAuthApps.findOneById(applicationId);
 		if (currentApplication == null) {
 			throw new Meteor.Error('error-application-not-found', 'Application not found', { method: 'updateOAuthApp' });
 		}
@@ -30,7 +31,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-redirectUri', 'Invalid redirectUri', { method: 'updateOAuthApp' });
 		}
 
-		OAuthApps.update(applicationId, {
+		await OAuthApps.updateOne({ _id: applicationId }, {
 			$set: {
 				name: application.name,
 				active: application.active,
@@ -43,6 +44,6 @@ Meteor.methods({
 				}),
 			},
 		});
-		return OAuthApps.findOne(applicationId);
+		return OAuthApps.findOneById(applicationId);
 	},
 });
diff --git a/app/oauth2-server-config/server/oauth/default-services.js b/app/oauth2-server-config/server/oauth/default-services.js
deleted file mode 100644
index d39489c9ec85..000000000000
--- a/app/oauth2-server-config/server/oauth/default-services.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { OAuthApps } from '../../../models';
-
-if (!OAuthApps.findOne('zapier')) {
-	OAuthApps.insert({
-		_id: 'zapier',
-		name: 'Zapier',
-		active: true,
-		clientId: 'zapier',
-		clientSecret: 'RTK6TlndaCIolhQhZ7_KHIGOKj41RnlaOq_o-7JKwLr',
-		redirectUri: 'https://zapier.com/dashboard/auth/oauth/return/RocketChatDevAPI/',
-		_createdAt: new Date(),
-		_createdBy: {
-			_id: 'system',
-			username: 'system',
-		},
-	});
-}
diff --git a/app/oauth2-server-config/server/oauth/default-services.ts b/app/oauth2-server-config/server/oauth/default-services.ts
new file mode 100644
index 000000000000..05fd8f5c5d35
--- /dev/null
+++ b/app/oauth2-server-config/server/oauth/default-services.ts
@@ -0,0 +1,20 @@
+import { OAuthApps } from '../../../models/server/raw';
+
+async function run(): Promise<void> {
+	if (!await OAuthApps.findOneById('zapier')) {
+		await OAuthApps.insertOne({
+			_id: 'zapier',
+			name: 'Zapier',
+			active: true,
+			clientId: 'zapier',
+			clientSecret: 'RTK6TlndaCIolhQhZ7_KHIGOKj41RnlaOq_o-7JKwLr',
+			redirectUri: 'https://zapier.com/dashboard/auth/oauth/return/RocketChatDevAPI/',
+			_createdAt: new Date(),
+			_createdBy: {
+				_id: 'system',
+				username: 'system',
+			},
+		});
+	}
+}
+run();
diff --git a/app/oauth2-server-config/server/oauth/oauth2-server.js b/app/oauth2-server-config/server/oauth/oauth2-server.js
index 438aaaa2e0e6..c801074db4d5 100644
--- a/app/oauth2-server-config/server/oauth/oauth2-server.js
+++ b/app/oauth2-server-config/server/oauth/oauth2-server.js
@@ -1,15 +1,18 @@
 import { Meteor } from 'meteor/meteor';
+import { Mongo } from 'meteor/mongo';
 import { WebApp } from 'meteor/webapp';
 import { OAuth2Server } from 'meteor/rocketchat:oauth2-server';
 
-import { OAuthApps, Users } from '../../../models';
+import { Users } from '../../../models/server';
+import { OAuthApps } from '../../../models/server/raw';
 import { API } from '../../../api/server';
 
 const oauth2server = new OAuth2Server({
 	accessTokensCollectionName: 'rocketchat_oauth_access_tokens',
 	refreshTokensCollectionName: 'rocketchat_oauth_refresh_tokens',
 	authCodesCollectionName: 'rocketchat_oauth_auth_codes',
-	clientsCollection: OAuthApps.model,
+	// TODO: Remove workaround. Used to pass meteor collection reference to a package
+	clientsCollection: new Mongo.Collection(OAuthApps.col.collectionName),
 	debug: true,
 });
 
diff --git a/app/oembed/server/server.js b/app/oembed/server/server.js
index 05f95cfbc0dc..a3b32443fd1d 100644
--- a/app/oembed/server/server.js
+++ b/app/oembed/server/server.js
@@ -10,7 +10,8 @@ import ipRangeCheck from 'ip-range-check';
 import he from 'he';
 import jschardet from 'jschardet';
 
-import { OEmbedCache, Messages } from '../../models';
+import { Messages } from '../../models/server';
+import { OEmbedCache } from '../../models/server/raw';
 import { callbacks } from '../../callbacks';
 import { settings } from '../../settings';
 import { isURL } from '../../utils/lib/isURL';
@@ -214,8 +215,8 @@ OEmbed.getUrlMeta = function(url, withFragment) {
 	});
 };
 
-OEmbed.getUrlMetaWithCache = function(url, withFragment) {
-	const cache = OEmbedCache.findOneById(url);
+OEmbed.getUrlMetaWithCache = async function(url, withFragment) {
+	const cache = await OEmbedCache.findOneById(url);
 
 	if (cache != null) {
 		return cache.data;
@@ -223,7 +224,7 @@ OEmbed.getUrlMetaWithCache = function(url, withFragment) {
 	const data = OEmbed.getUrlMeta(url, withFragment);
 	if (data != null) {
 		try {
-			OEmbedCache.createWithIdAndData(url, data);
+			await OEmbedCache.createWithIdAndData(url, data);
 		} catch (_error) {
 			SystemLogger.error('OEmbed duplicated record', url);
 		}
@@ -262,21 +263,21 @@ const getRelevantMetaTags = function(metaObj) {
 
 const insertMaxWidthInOembedHtml = (oembedHtml) => oembedHtml?.replace('iframe', 'iframe style=\"max-width: 100%;width:400px;height:225px\"');
 
-OEmbed.rocketUrlParser = function(message) {
+OEmbed.rocketUrlParser = async function(message) {
 	if (Array.isArray(message.urls)) {
-		let attachments = [];
+		const attachments = [];
 		let changed = false;
-		message.urls.forEach(function(item) {
+		for await (const item of message.urls) {
 			if (item.ignoreParse === true) {
 				return;
 			}
 			if (!isURL(item.url)) {
 				return;
 			}
-			const data = OEmbed.getUrlMetaWithCache(item.url);
+			const data = await OEmbed.getUrlMetaWithCache(item.url);
 			if (data != null) {
 				if (data.attachments) {
-					attachments = _.union(attachments, data.attachments);
+					attachments.push(...data.attachments);
 					return;
 				}
 				if (data.meta != null) {
@@ -291,7 +292,7 @@ OEmbed.rocketUrlParser = function(message) {
 				item.parsedUrl = data.parsedUrl;
 				changed = true;
 			}
-		});
+		}
 		if (attachments.length) {
 			Messages.setMessageAttachments(message._id, attachments);
 		}
@@ -304,7 +305,7 @@ OEmbed.rocketUrlParser = function(message) {
 
 settings.watch('API_Embed', function(value) {
 	if (value) {
-		return callbacks.add('afterSaveMessage', OEmbed.rocketUrlParser, callbacks.priority.LOW, 'API_Embed');
+		return callbacks.add('afterSaveMessage', (message) => Promise.await(OEmbed.rocketUrlParser(message)), callbacks.priority.LOW, 'API_Embed');
 	}
 	return callbacks.remove('afterSaveMessage', 'API_Embed');
 });
diff --git a/app/reactions/server/setReaction.js b/app/reactions/server/setReaction.js
index 279e4e813d88..e5f2a885b308 100644
--- a/app/reactions/server/setReaction.js
+++ b/app/reactions/server/setReaction.js
@@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import _ from 'underscore';
 
-import { Messages, EmojiCustom, Rooms } from '../../models/server';
+import { Messages, Rooms } from '../../models/server';
+import { EmojiCustom } from '../../models/server/raw';
 import { callbacks } from '../../callbacks/server';
 import { emoji } from '../../emoji/server';
 import { isTheLastMessage, msgStream } from '../../lib/server';
@@ -20,7 +21,7 @@ const removeUserReaction = (message, reaction, username) => {
 async function setReaction(room, user, message, reaction, shouldReact) {
 	reaction = `:${ reaction.replace(/:/g, '') }:`;
 
-	if (!emoji.list[reaction] && EmojiCustom.findByNameOrAlias(reaction).count() === 0) {
+	if (!emoji.list[reaction] && await EmojiCustom.findByNameOrAlias(reaction).count() === 0) {
 		throw new Meteor.Error('error-not-allowed', 'Invalid emoji provided.', { method: 'setReaction' });
 	}
 
diff --git a/app/smarsh-connector/server/functions/generateEml.js b/app/smarsh-connector/server/functions/generateEml.js
index 8633fd1ca0ca..f828ce310387 100644
--- a/app/smarsh-connector/server/functions/generateEml.js
+++ b/app/smarsh-connector/server/functions/generateEml.js
@@ -4,7 +4,8 @@ import _ from 'underscore';
 import moment from 'moment';
 
 import { settings } from '../../../settings';
-import { Rooms, Messages, Users, SmarshHistory } from '../../../models';
+import { Rooms, Messages, Users } from '../../../models/server';
+import { SmarshHistory } from '../../../models/server/raw';
 import { MessageTypes } from '../../../ui-utils';
 import { smarsh } from '../lib/rocketchat';
 import 'moment-timezone';
@@ -31,8 +32,8 @@ smarsh.generateEml = () => {
 		const smarshMissingEmail = settings.get('Smarsh_MissingEmail_Email');
 		const timeZone = settings.get('Smarsh_Timezone');
 
-		Rooms.find().forEach((room) => {
-			const smarshHistory = SmarshHistory.findOne({ _id: room._id });
+		Rooms.find().forEach(async (room) => {
+			const smarshHistory = await SmarshHistory.findOne({ _id: room._id });
 			const query = { rid: room._id };
 
 			if (smarshHistory) {
diff --git a/app/smarsh-connector/server/functions/sendEmail.js b/app/smarsh-connector/server/functions/sendEmail.js
index 9b69b05b3ac1..67fcfde02e67 100644
--- a/app/smarsh-connector/server/functions/sendEmail.js
+++ b/app/smarsh-connector/server/functions/sendEmail.js
@@ -4,19 +4,18 @@
 // 	subject: 'Rocket.Chat, 17 Users, 24 Messages, 1 File, 799504 Minutes, in #random',
 //  files: ['i3nc9l3mn']
 // }
-import _ from 'underscore';
 import { UploadFS } from 'meteor/jalik:ufs';
 
 import * as Mailer from '../../../mailer';
-import { Uploads } from '../../../models';
+import { Uploads } from '../../../models/server/raw';
 import { settings } from '../../../settings';
 import { smarsh } from '../lib/rocketchat';
 
-smarsh.sendEmail = (data) => {
+smarsh.sendEmail = async (data) => {
 	const attachments = [];
 
-	_.each(data.files, (fileId) => {
-		const file = Uploads.findOneById(fileId);
+	for await (const fileId of data.files) {
+		const file = await Uploads.findOneById(fileId);
 		if (file.store === 'rocketchat_uploads' || file.store === 'fileSystem') {
 			const rs = UploadFS.getStore(file.store).getReadStream(fileId, file);
 			attachments.push({
@@ -24,8 +23,7 @@ smarsh.sendEmail = (data) => {
 				streamSource: rs,
 			});
 		}
-	});
-
+	}
 
 	Mailer.sendNoWrap({
 		to: settings.get('Smarsh_Email'),
diff --git a/app/statistics/server/lib/SAUMonitor.js b/app/statistics/server/lib/SAUMonitor.js
index 36b7036fb5a0..43d41cad7e33 100644
--- a/app/statistics/server/lib/SAUMonitor.js
+++ b/app/statistics/server/lib/SAUMonitor.js
@@ -4,9 +4,9 @@ import { SyncedCron } from 'meteor/littledata:synced-cron';
 import UAParser from 'ua-parser-js';
 
 import { UAParserMobile, UAParserDesktop } from './UAParserCustom';
-import { Sessions } from '../../../models/server';
+import { Sessions } from '../../../models/server/raw';
+import { aggregates } from '../../../models/server/raw/Sessions';
 import { Logger } from '../../../logger';
-import { aggregates } from '../../../models/server/models/Sessions';
 import { getMostImportantRole } from './getMostImportantRole';
 
 const getDateObj = (dateTime = new Date()) => ({
@@ -32,7 +32,7 @@ export class SAUMonitorClass {
 		this._jobName = 'aggregate-sessions';
 	}
 
-	start(instanceId) {
+	async start(instanceId) {
 		if (this.isRunning()) {
 			return;
 		}
@@ -44,7 +44,7 @@ export class SAUMonitorClass {
 			return;
 		}
 
-		this._startMonitoring(() => {
+		await this._startMonitoring(() => {
 			this._started = true;
 			logger.debug(`[start] - InstanceId: ${ this._instanceId }`);
 		});
@@ -70,12 +70,12 @@ export class SAUMonitorClass {
 		return this._started === true;
 	}
 
-	_startMonitoring(callback) {
+	async _startMonitoring(callback) {
 		try {
 			this._handleAccountEvents();
 			this._handleOnConnection();
 			this._startSessionControl();
-			this._initActiveServerSessions();
+			await this._initActiveServerSessions();
 			this._startAggregation();
 			if (callback) {
 				callback();
@@ -94,8 +94,8 @@ export class SAUMonitorClass {
 			return;
 		}
 
-		this._timer = Meteor.setInterval(() => {
-			this._updateActiveSessions();
+		this._timer = Meteor.setInterval(async () => {
+			await this._updateActiveSessions();
 		}, this._monitorTime);
 	}
 
@@ -110,8 +110,8 @@ export class SAUMonitorClass {
 			}
 			// this._handleSession(connection, getDateObj());
 
-			connection.onClose(() => {
-				Sessions.closeByInstanceIdAndSessionId(this._instanceId, connection.id);
+			connection.onClose(async () => {
+				await Sessions.closeByInstanceIdAndSessionId(this._instanceId, connection.id);
 			});
 		});
 	}
@@ -121,7 +121,7 @@ export class SAUMonitorClass {
 			return;
 		}
 
-		Accounts.onLogin((info) => {
+		Accounts.onLogin(async (info) => {
 			if (!this.isRunning()) {
 				return;
 			}
@@ -132,11 +132,11 @@ export class SAUMonitorClass {
 
 			const loginAt = new Date();
 			const params = { userId, roles, mostImportantRole, loginAt, ...getDateObj() };
-			this._handleSession(info.connection, params);
+			await this._handleSession(info.connection, params);
 			this._updateConnectionInfo(info.connection.id, { loginAt });
 		});
 
-		Accounts.onLogout((info) => {
+		Accounts.onLogout(async (info) => {
 			if (!this.isRunning()) {
 				return;
 			}
@@ -144,17 +144,17 @@ export class SAUMonitorClass {
 			const sessionId = info.connection.id;
 			if (info.user) {
 				const userId = info.user._id;
-				Sessions.logoutByInstanceIdAndSessionIdAndUserId(this._instanceId, sessionId, userId);
+				await Sessions.logoutByInstanceIdAndSessionIdAndUserId(this._instanceId, sessionId, userId);
 			}
 		});
 	}
 
-	_handleSession(connection, params) {
+	async _handleSession(connection, params) {
 		const data = this._getConnectionInfo(connection, params);
-		Sessions.createOrUpdate(data);
+		await Sessions.createOrUpdate(data);
 	}
 
-	_updateActiveSessions() {
+	async _updateActiveSessions() {
 		if (!this.isRunning()) {
 			return;
 		}
@@ -167,8 +167,8 @@ export class SAUMonitorClass {
 			const beforeDateTime = new Date(this._today.year, this._today.month - 1, this._today.day, 23, 59, 59, 999);
 			const nextDateTime = new Date(currentDay.year, currentDay.month - 1, currentDay.day);
 
-			const createSessions = (objects, ids) => {
-				Sessions.createBatch(objects);
+			const createSessions = async (objects, ids) => {
+				await Sessions.createBatch(objects);
 
 				Meteor.defer(() => {
 					Sessions.updateActiveSessionsByDateAndInstanceIdAndIds({ year, month, day }, this._instanceId, ids, { lastActivityAt: beforeDateTime });
@@ -180,8 +180,8 @@ export class SAUMonitorClass {
 		}
 
 		// Otherwise, just update the lastActivityAt field
-		this._applyAllServerSessionsIds((sessions) => {
-			Sessions.updateActiveSessionsByDateAndInstanceIdAndIds({ year, month, day }, this._instanceId, sessions, { lastActivityAt: currentDateTime });
+		await this._applyAllServerSessionsIds(async (sessions) => {
+			await Sessions.updateActiveSessionsByDateAndInstanceIdAndIds({ year, month, day }, this._instanceId, sessions, { lastActivityAt: currentDateTime });
 		});
 	}
 
@@ -266,32 +266,38 @@ export class SAUMonitorClass {
 		};
 	}
 
-	_initActiveServerSessions() {
-		this._applyAllServerSessions((connectionHandle) => {
-			this._handleSession(connectionHandle, getDateObj());
+	async _initActiveServerSessions() {
+		await this._applyAllServerSessions(async (connectionHandle) => {
+			await this._handleSession(connectionHandle, getDateObj());
 		});
 	}
 
-	_applyAllServerSessions(callback) {
+	async _applyAllServerSessions(callback) {
 		if (!callback || typeof callback !== 'function') {
 			return;
 		}
 
 		const sessions = Object.values(Meteor.server.sessions).filter((session) => session.userId);
-		sessions.forEach((session) => {
-			callback(session.connectionHandle);
-		});
+		for await (const session of sessions) {
+			await callback(session.connectionHandle);
+		}
 	}
 
-	_applyAllServerSessionsIds(callback) {
+	async recursive(callback, sessionIds) {
+		await callback(sessionIds.splice(0, 500));
+
+		if (sessionIds.length) {
+			await this.recursive(callback, sessionIds);
+		}
+	}
+
+	async _applyAllServerSessionsIds(callback) {
 		if (!callback || typeof callback !== 'function') {
 			return;
 		}
 
 		const sessionIds = Object.values(Meteor.server.sessions).filter((session) => session.userId).map((s) => s.id);
-		while (sessionIds.length) {
-			callback(sessionIds.splice(0, 500));
-		}
+		await this.recursive(callback, sessionIds);
 	}
 
 	_updateConnectionInfo(sessionId, data = {}) {
@@ -315,8 +321,8 @@ export class SAUMonitorClass {
 			return Promise.all(arr.splice(0, limit).map((item) => {
 				ids.push(item.id);
 				return this._getConnectionInfo(item.connectionHandle, params);
-			})).then((data) => {
-				callback(data, ids);
+			})).then(async (data) => {
+				await callback(data, ids);
 				return batch(arr, limit);
 			}).catch((e) => {
 				logger.debug(`Error: ${ e.message }`);
@@ -333,13 +339,13 @@ export class SAUMonitorClass {
 		SyncedCron.add({
 			name: this._jobName,
 			schedule: (parser) => parser.text('at 2:00 am'),
-			job: () => {
-				this.aggregate();
+			job: async () => {
+				await this.aggregate();
 			},
 		});
 	}
 
-	aggregate() {
+	async aggregate() {
 		if (!this.isRunning()) {
 			return;
 		}
@@ -357,16 +363,16 @@ export class SAUMonitorClass {
 			day: { $lte: yesterday.day },
 		};
 
-		aggregates.dailySessionsOfYesterday(Sessions.model.rawCollection(), yesterday).forEach(Meteor.bindEnvironment((record) => {
+		await aggregates.dailySessionsOfYesterday(Sessions.col, yesterday).forEach(async (record) => {
 			record._id = `${ record.userId }-${ record.year }-${ record.month }-${ record.day }`;
-			Sessions.upsert({ _id: record._id }, record);
-		}));
+			await Sessions.updateOne({ _id: record._id }, record, { upsert: true });
+		});
 
-		Sessions.update(match, {
+		await Sessions.updateMany(match, {
 			$set: {
 				type: 'computed-session',
 				_computedAt: new Date(),
 			},
-		}, { multi: true });
+		});
 	}
 }
diff --git a/app/statistics/server/lib/statistics.js b/app/statistics/server/lib/statistics.js
index b4ffb9f7dd25..c9d99c049dc5 100644
--- a/app/statistics/server/lib/statistics.js
+++ b/app/statistics/server/lib/statistics.js
@@ -3,24 +3,21 @@ import os from 'os';
 import _ from 'underscore';
 import { Meteor } from 'meteor/meteor';
 import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
+import { MongoInternals } from 'meteor/mongo';
 
 import {
-	Sessions,
 	Settings,
 	Users,
 	Rooms,
 	Subscriptions,
-	Uploads,
 	Messages,
 	LivechatVisitors,
-	Integrations,
-	Statistics,
 } from '../../../models/server';
 import { settings } from '../../../settings/server';
 import { Info, getMongoInfo } from '../../../utils/server';
 import { getControl } from '../../../../server/lib/migrations';
 import { getStatistics as federationGetStatistics } from '../../../federation/server/functions/dashboard';
-import { NotificationQueue, Users as UsersRaw } from '../../../models/server/raw';
+import { NotificationQueue, Users as UsersRaw, Statistics, Sessions, Integrations, Uploads } from '../../../models/server/raw';
 import { readSecondaryPreferred } from '../../../../server/database/readSecondaryPreferred';
 import { getAppsStatistics } from './getAppsStatistics';
 import { getServicesStatistics } from './getServicesStatistics';
@@ -55,9 +52,11 @@ const getUserLanguages = (totalUsers) => {
 	return languages;
 };
 
+const { db } = MongoInternals.defaultRemoteCollectionDriver().mongo;
+
 export const statistics = {
 	get: function _getStatistics() {
-		const readPreference = readSecondaryPreferred(Uploads.model.rawDatabase());
+		const readPreference = readSecondaryPreferred(db);
 
 		const statistics = {};
 
@@ -162,8 +161,8 @@ export const statistics = {
 
 		statistics.enterpriseReady = true;
 
-		statistics.uploadsTotal = Uploads.find().count();
-		const [result] = Promise.await(Uploads.model.rawCollection().aggregate([{
+		statistics.uploadsTotal = Promise.await(Uploads.find().count());
+		const [result] = Promise.await(Uploads.col.aggregate([{
 			$group: { _id: 'total', total: { $sum: '$size' } },
 		}], { readPreference }).toArray());
 		statistics.uploadsTotalSize = result ? result.total : 0;
@@ -176,20 +175,20 @@ export const statistics = {
 		statistics.mongoVersion = mongoVersion;
 		statistics.mongoStorageEngine = mongoStorageEngine;
 
-		statistics.uniqueUsersOfYesterday = Sessions.getUniqueUsersOfYesterday();
-		statistics.uniqueUsersOfLastWeek = Sessions.getUniqueUsersOfLastWeek();
-		statistics.uniqueUsersOfLastMonth = Sessions.getUniqueUsersOfLastMonth();
-		statistics.uniqueDevicesOfYesterday = Sessions.getUniqueDevicesOfYesterday();
-		statistics.uniqueDevicesOfLastWeek = Sessions.getUniqueDevicesOfLastWeek();
-		statistics.uniqueDevicesOfLastMonth = Sessions.getUniqueDevicesOfLastMonth();
-		statistics.uniqueOSOfYesterday = Sessions.getUniqueOSOfYesterday();
-		statistics.uniqueOSOfLastWeek = Sessions.getUniqueOSOfLastWeek();
-		statistics.uniqueOSOfLastMonth = Sessions.getUniqueOSOfLastMonth();
+		statistics.uniqueUsersOfYesterday = Promise.await(Sessions.getUniqueUsersOfYesterday());
+		statistics.uniqueUsersOfLastWeek = Promise.await(Sessions.getUniqueUsersOfLastWeek());
+		statistics.uniqueUsersOfLastMonth = Promise.await(Sessions.getUniqueUsersOfLastMonth());
+		statistics.uniqueDevicesOfYesterday = Promise.await(Sessions.getUniqueDevicesOfYesterday());
+		statistics.uniqueDevicesOfLastWeek = Promise.await(Sessions.getUniqueDevicesOfLastWeek());
+		statistics.uniqueDevicesOfLastMonth = Promise.await(Sessions.getUniqueDevicesOfLastMonth());
+		statistics.uniqueOSOfYesterday = Promise.await(Sessions.getUniqueOSOfYesterday());
+		statistics.uniqueOSOfLastWeek = Promise.await(Sessions.getUniqueOSOfLastWeek());
+		statistics.uniqueOSOfLastMonth = Promise.await(Sessions.getUniqueOSOfLastMonth());
 
 		statistics.apps = getAppsStatistics();
 		statistics.services = getServicesStatistics();
 
-		const integrations = Promise.await(Integrations.model.rawCollection().find({}, {
+		const integrations = Promise.await(Integrations.find({}, {
 			projection: {
 				_id: 0,
 				type: 1,
@@ -215,10 +214,10 @@ export const statistics = {
 
 		return statistics;
 	},
-	save() {
+	async save() {
 		const rcStatistics = statistics.get();
 		rcStatistics.createdAt = new Date();
-		Statistics.insert(rcStatistics);
+		await Statistics.insertOne(rcStatistics);
 		return rcStatistics;
 	},
 };
diff --git a/app/user-data-download/server/cronProcessDownloads.js b/app/user-data-download/server/cronProcessDownloads.js
index 8fb19b86b08c..35c8de44af20 100644
--- a/app/user-data-download/server/cronProcessDownloads.js
+++ b/app/user-data-download/server/cronProcessDownloads.js
@@ -10,7 +10,8 @@ import moment from 'moment';
 import { v4 as uuidv4 } from 'uuid';
 
 import { settings } from '../../settings/server';
-import { Subscriptions, Rooms, Users, Uploads, Messages, UserDataFiles, ExportOperations, Avatars } from '../../models/server';
+import { Subscriptions, Rooms, Users, Messages } from '../../models/server';
+import { Avatars, ExportOperations, UserDataFiles, Uploads } from '../../models/server/raw';
 import { FileUpload } from '../../file-upload/server';
 import { DataExport } from './DataExport';
 import * as Mailer from '../../mailer';
@@ -186,8 +187,8 @@ const getMessageData = function(msg, hideUsers, userData, usersMap) {
 	return messageObject;
 };
 
-export const copyFile = function(attachmentData, assetsPath) {
-	const file = Uploads.findOneById(attachmentData._id);
+export const copyFile = async function(attachmentData, assetsPath) {
+	const file = await Uploads.findOneById(attachmentData._id);
 	if (!file) {
 		return;
 	}
@@ -439,12 +440,12 @@ const generateUserFile = function(exportOperation, userData) {
 	}
 };
 
-const generateUserAvatarFile = function(exportOperation, userData) {
+const generateUserAvatarFile = async function(exportOperation, userData) {
 	if (!userData) {
 		return;
 	}
 
-	const file = Avatars.findOneByName(userData.username);
+	const file = await Avatars.findOneByName(userData.username);
 	if (!file) {
 		return;
 	}
@@ -478,7 +479,7 @@ const continueExportOperation = async function(exportOperation) {
 		}
 
 		if (!exportOperation.generatedAvatar) {
-			generateUserAvatarFile(exportOperation, exportOperation.userData);
+			await generateUserAvatarFile(exportOperation, exportOperation.userData);
 		}
 
 		if (exportOperation.status === 'exporting-rooms') {
@@ -511,9 +512,9 @@ const continueExportOperation = async function(exportOperation) {
 		const generatedFileName = uuidv4();
 
 		if (exportOperation.status === 'downloading') {
-			exportOperation.fileList.forEach((attachmentData) => {
-				copyFile(attachmentData, exportOperation.assetsPath);
-			});
+			for await (const attachmentData of exportOperation.fileList) {
+				await copyFile(attachmentData, exportOperation.assetsPath);
+			}
 
 			const targetFile = joinPath(zipFolder, `${ generatedFileName }.zip`);
 			if (await fsExists(targetFile)) {
@@ -539,17 +540,17 @@ const continueExportOperation = async function(exportOperation) {
 			exportOperation.fileId = fileId;
 
 			exportOperation.status = 'completed';
-			ExportOperations.updateOperation(exportOperation);
+			await ExportOperations.updateOperation(exportOperation);
 		}
 
-		ExportOperations.updateOperation(exportOperation);
+		await ExportOperations.updateOperation(exportOperation);
 	} catch (e) {
 		console.error(e);
 	}
 };
 
 async function processDataDownloads() {
-	const operation = ExportOperations.findOnePending();
+	const operation = await ExportOperations.findOnePending();
 	if (!operation) {
 		return;
 	}
@@ -571,7 +572,7 @@ async function processDataDownloads() {
 	await ExportOperations.updateOperation(operation);
 
 	if (operation.status === 'completed') {
-		const file = operation.fileId ? UserDataFiles.findOneById(operation.fileId) : UserDataFiles.findLastFileByUser(operation.userId);
+		const file = operation.fileId ? await UserDataFiles.findOneById(operation.fileId) : await UserDataFiles.findLastFileByUser(operation.userId);
 		if (!file) {
 			return;
 		}
diff --git a/app/user-data-download/server/exportDownload.js b/app/user-data-download/server/exportDownload.js
index d99eda5c88e6..6ea406de307c 100644
--- a/app/user-data-download/server/exportDownload.js
+++ b/app/user-data-download/server/exportDownload.js
@@ -1,12 +1,12 @@
 import { WebApp } from 'meteor/webapp';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
-import { UserDataFiles } from '../../models';
+import { UserDataFiles } from '../../models/server/raw';
 import { DataExport } from './DataExport';
 import { settings } from '../../settings/server';
 
 
-WebApp.connectHandlers.use(DataExport.getPath(), function(req, res, next) {
+WebApp.connectHandlers.use(DataExport.getPath(), async function(req, res, next) {
 	const match = /^\/([^\/]+)/.exec(req.url);
 
 	if (!settings.get('UserData_EnableDownload')) {
@@ -16,7 +16,7 @@ WebApp.connectHandlers.use(DataExport.getPath(), function(req, res, next) {
 	}
 
 	if (match && match[1]) {
-		const file = UserDataFiles.findOneById(match[1]);
+		const file = await UserDataFiles.findOneById(match[1]);
 		if (file) {
 			if (!DataExport.requestCanAccessFiles(req, file.userId)) {
 				res.setHeader('Content-Type', 'text/html; charset=UTF-8');
diff --git a/app/user-status/server/methods/deleteCustomUserStatus.js b/app/user-status/server/methods/deleteCustomUserStatus.js
index e81a8140d718..6935266a7475 100644
--- a/app/user-status/server/methods/deleteCustomUserStatus.js
+++ b/app/user-status/server/methods/deleteCustomUserStatus.js
@@ -1,21 +1,21 @@
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../authorization/server';
-import { CustomUserStatus } from '../../../models/server';
+import { CustomUserStatus } from '../../../models/server/raw';
 import { api } from '../../../../server/sdk/api';
 
 Meteor.methods({
-	deleteCustomUserStatus(userStatusID) {
+	async deleteCustomUserStatus(userStatusID) {
 		if (!hasPermission(this.userId, 'manage-user-status')) {
 			throw new Meteor.Error('not_authorized');
 		}
 
-		const userStatus = CustomUserStatus.findOneById(userStatusID);
+		const userStatus = await CustomUserStatus.findOneById(userStatusID);
 		if (userStatus == null) {
 			throw new Meteor.Error('Custom_User_Status_Error_Invalid_User_Status', 'Invalid user status', { method: 'deleteCustomUserStatus' });
 		}
 
-		CustomUserStatus.removeById(userStatusID);
+		await CustomUserStatus.removeById(userStatusID);
 		api.broadcast('user.deleteCustomStatus', userStatus);
 
 		return true;
diff --git a/app/user-status/server/methods/insertOrUpdateUserStatus.js b/app/user-status/server/methods/insertOrUpdateUserStatus.js
index a01cc751c525..ebc0e918acba 100644
--- a/app/user-status/server/methods/insertOrUpdateUserStatus.js
+++ b/app/user-status/server/methods/insertOrUpdateUserStatus.js
@@ -2,11 +2,11 @@ import { Meteor } from 'meteor/meteor';
 import s from 'underscore.string';
 
 import { hasPermission } from '../../../authorization';
-import { CustomUserStatus } from '../../../models';
+import { CustomUserStatus } from '../../../models/server/raw';
 import { api } from '../../../../server/sdk/api';
 
 Meteor.methods({
-	insertOrUpdateUserStatus(userStatusData) {
+	async insertOrUpdateUserStatus(userStatusData) {
 		if (!hasPermission(this.userId, 'manage-user-status')) {
 			throw new Meteor.Error('not_authorized');
 		}
@@ -26,9 +26,9 @@ Meteor.methods({
 		let matchingResults = [];
 
 		if (userStatusData._id) {
-			matchingResults = CustomUserStatus.findByNameExceptId(userStatusData.name, userStatusData._id).fetch();
+			matchingResults = await CustomUserStatus.findByNameExceptId(userStatusData.name, userStatusData._id).toArray();
 		} else {
-			matchingResults = CustomUserStatus.findByName(userStatusData.name).fetch();
+			matchingResults = await CustomUserStatus.findByName(userStatusData.name).toArray();
 		}
 
 		if (matchingResults.length > 0) {
@@ -47,7 +47,7 @@ Meteor.methods({
 				statusType: userStatusData.statusType || null,
 			};
 
-			const _id = CustomUserStatus.create(createUserStatus);
+			const _id = await (await CustomUserStatus.create(createUserStatus)).insertedId;
 
 			api.broadcast('user.updateCustomStatus', createUserStatus);
 
@@ -56,11 +56,11 @@ Meteor.methods({
 
 		// update User status
 		if (userStatusData.name !== userStatusData.previousName) {
-			CustomUserStatus.setName(userStatusData._id, userStatusData.name);
+			await CustomUserStatus.setName(userStatusData._id, userStatusData.name);
 		}
 
 		if (userStatusData.statusType !== userStatusData.previousStatusType) {
-			CustomUserStatus.setStatusType(userStatusData._id, userStatusData.statusType);
+			await CustomUserStatus.setStatusType(userStatusData._id, userStatusData.statusType);
 		}
 
 		api.broadcast('user.updateCustomStatus', userStatusData);
diff --git a/app/user-status/server/methods/listCustomUserStatus.js b/app/user-status/server/methods/listCustomUserStatus.js
index a47f1ff01bc2..b8ec637d99b6 100644
--- a/app/user-status/server/methods/listCustomUserStatus.js
+++ b/app/user-status/server/methods/listCustomUserStatus.js
@@ -1,14 +1,14 @@
 import { Meteor } from 'meteor/meteor';
 
-import { CustomUserStatus } from '../../../models';
+import { CustomUserStatus } from '../../../models/server/raw';
 
 Meteor.methods({
-	listCustomUserStatus() {
+	async listCustomUserStatus() {
 		const currentUserId = Meteor.userId();
 		if (!currentUserId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'listCustomUserStatus' });
 		}
 
-		return CustomUserStatus.find({}).fetch();
+		return CustomUserStatus.find({}).toArray();
 	},
 });
diff --git a/app/utils/server/functions/normalizeMessageFileUpload.js b/app/utils/server/functions/normalizeMessageFileUpload.js
index 450396b0b765..948dc047c252 100644
--- a/app/utils/server/functions/normalizeMessageFileUpload.js
+++ b/app/utils/server/functions/normalizeMessageFileUpload.js
@@ -1,11 +1,11 @@
 import { getURL } from '../../lib/getURL';
 import { FileUpload } from '../../../file-upload/server';
-import { Uploads } from '../../../models/server';
+import { Uploads } from '../../../models/server/raw';
 
-export const normalizeMessageFileUpload = (message) => {
+export const normalizeMessageFileUpload = async (message) => {
 	if (message.file && !message.fileUpload) {
 		const jwt = FileUpload.generateJWTToFileUrls({ rid: message.rid, userId: message.u._id, fileId: message.file._id });
-		const file = Uploads.findOne({ _id: message.file._id });
+		const file = await Uploads.findOne({ _id: message.file._id });
 		if (!file) {
 			return message;
 		}
diff --git a/app/version-check/server/functions/checkVersionUpdate.js b/app/version-check/server/functions/checkVersionUpdate.js
index 65cd246d663c..9933081a038c 100644
--- a/app/version-check/server/functions/checkVersionUpdate.js
+++ b/app/version-check/server/functions/checkVersionUpdate.js
@@ -42,7 +42,7 @@ export default () => {
 	if (update.exists) {
 		Settings.updateValueById('Update_LatestAvailableVersion', update.lastestVersion.version);
 
-		sendMessagesToAdmins({
+		Promise.await(sendMessagesToAdmins({
 			msgs: ({ adminUser }) => [{ msg: `*${ TAPi18n.__('Update_your_RocketChat', adminUser.language) }*\n${ TAPi18n.__('New_version_available_(s)', update.lastestVersion.version, adminUser.language) }\n${ update.lastestVersion.infoUrl }` }],
 			banners: [{
 				id: `versionUpdate-${ update.lastestVersion.version }`.replace(/\./g, '_'),
@@ -52,11 +52,11 @@ export default () => {
 				textArguments: [update.lastestVersion.version],
 				link: update.lastestVersion.infoUrl,
 			}],
-		});
+		}));
 	}
 
 	if (alerts && alerts.length) {
-		sendMessagesToAdmins({
+		Promise.await(sendMessagesToAdmins({
 			msgs: ({ adminUser }) => alerts
 				.filter((alert) => !Users.bannerExistsById(adminUser._id, `alert-${ alert.id }`))
 				.map((alert) => ({
@@ -71,6 +71,6 @@ export default () => {
 				modifiers: alert.modifiers,
 				link: alert.infoUrl,
 			})),
-		});
+		}));
 	}
 };
diff --git a/app/webdav/client/actionButton.js b/app/webdav/client/actionButton.js
index 6b72d8785711..cbfd32da1c3f 100644
--- a/app/webdav/client/actionButton.js
+++ b/app/webdav/client/actionButton.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
 import { t, getURL } from '../../utils';
-import { WebdavAccounts } from '../../models';
+import { WebdavAccounts } from '../../models/client';
 import { settings } from '../../settings';
 import { MessageAction, modal } from '../../ui-utils';
 import { messageArgs } from '../../ui-utils/client/lib/messageArgs';
diff --git a/app/webdav/client/selectWebdavAccount.js b/app/webdav/client/selectWebdavAccount.js
index 5acb7f43f9c4..14f771822cc4 100644
--- a/app/webdav/client/selectWebdavAccount.js
+++ b/app/webdav/client/selectWebdavAccount.js
@@ -3,7 +3,7 @@ import { Template } from 'meteor/templating';
 
 import { modal } from '../../ui-utils';
 import { t } from '../../utils';
-import { WebdavAccounts } from '../../models';
+import { WebdavAccounts } from '../../models/client';
 import { dispatchToastMessage } from '../../../client/lib/toast';
 
 Template.selectWebdavAccount.helpers({
diff --git a/app/webdav/client/startup/messageBoxActions.js b/app/webdav/client/startup/messageBoxActions.js
index a209259d4aaa..be63edecd599 100644
--- a/app/webdav/client/startup/messageBoxActions.js
+++ b/app/webdav/client/startup/messageBoxActions.js
@@ -4,7 +4,7 @@ import { Tracker } from 'meteor/tracker';
 import { t } from '../../../utils';
 import { settings } from '../../../settings';
 import { messageBox, modal } from '../../../ui-utils';
-import { WebdavAccounts } from '../../../models';
+import { WebdavAccounts } from '../../../models/client';
 
 messageBox.actions.add('WebDAV', 'Add Server', {
 	id: 'add-webdav',
diff --git a/app/webdav/server/methods/addWebdavAccount.js b/app/webdav/server/methods/addWebdavAccount.js
index 3bfc6aef3495..fdaf715903fa 100644
--- a/app/webdav/server/methods/addWebdavAccount.js
+++ b/app/webdav/server/methods/addWebdavAccount.js
@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
-import { settings } from '../../../settings';
-import { WebdavAccounts } from '../../../models';
+import { settings } from '../../../settings/server';
+import { WebdavAccounts } from '../../../models/server/raw';
 import { WebdavClientAdapter } from '../lib/webdavClientAdapter';
 import { Notifications } from '../../../notifications/server';
 
@@ -24,7 +24,7 @@ Meteor.methods({
 			pass: String,
 		}));
 
-		const duplicateAccount = WebdavAccounts.findOne({ user_id: userId, server_url: formData.serverURL, username: formData.username });
+		const duplicateAccount = await WebdavAccounts.findOneByUserIdServerUrlAndUsername({ user_id: userId, server_url: formData.serverURL, username: formData.username });
 		if (duplicateAccount !== undefined) {
 			throw new Meteor.Error('duplicated-account', {
 				method: 'addWebdavAccount',
@@ -49,7 +49,7 @@ Meteor.methods({
 			};
 
 			await client.stat('/');
-			WebdavAccounts.insert(accountData);
+			await WebdavAccounts.insertOne(accountData);
 			Notifications.notifyUser(userId, 'webdav', {
 				type: 'changed',
 				account: accountData,
@@ -89,12 +89,14 @@ Meteor.methods({
 			};
 
 			await client.stat('/');
-			WebdavAccounts.upsert({
+			await WebdavAccounts.updateOne({
 				user_id: userId,
 				server_url: data.serverURL,
 				name: data.name,
 			}, {
 				$set: accountData,
+			}, {
+				upsert: true,
 			});
 			Notifications.notifyUser(userId, 'webdav', {
 				type: 'changed',
diff --git a/app/webdav/server/methods/getFileFromWebdav.js b/app/webdav/server/methods/getFileFromWebdav.js
index aeeda2a2636e..a63d72c04723 100644
--- a/app/webdav/server/methods/getFileFromWebdav.js
+++ b/app/webdav/server/methods/getFileFromWebdav.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { settings } from '../../../settings';
 import { getWebdavCredentials } from './getWebdavCredentials';
-import { WebdavAccounts } from '../../../models';
+import { WebdavAccounts } from '../../../models/server/raw';
 import { WebdavClientAdapter } from '../lib/webdavClientAdapter';
 
 Meteor.methods({
@@ -14,7 +14,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-allowed', 'WebDAV Integration Not Allowed', { method: 'getFileFromWebdav' });
 		}
 
-		const account = WebdavAccounts.findOne({ _id: accountId, user_id: Meteor.userId() });
+		const account = await WebdavAccounts.findOneByIdAndUserId(accountId, Meteor.userId());
 		if (!account) {
 			throw new Meteor.Error('error-invalid-account', 'Invalid WebDAV Account', { method: 'getFileFromWebdav' });
 		}
diff --git a/app/webdav/server/methods/getWebdavFileList.js b/app/webdav/server/methods/getWebdavFileList.js
index 52e3c6e3904a..e9b5e3526d7c 100644
--- a/app/webdav/server/methods/getWebdavFileList.js
+++ b/app/webdav/server/methods/getWebdavFileList.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { settings } from '../../../settings';
 import { getWebdavCredentials } from './getWebdavCredentials';
-import { WebdavAccounts } from '../../../models';
+import { WebdavAccounts } from '../../../models/server/raw';
 import { WebdavClientAdapter } from '../lib/webdavClientAdapter';
 
 Meteor.methods({
@@ -15,7 +15,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-allowed', 'WebDAV Integration Not Allowed', { method: 'getWebdavFileList' });
 		}
 
-		const account = WebdavAccounts.findOne({ _id: accountId, user_id: Meteor.userId() });
+		const account = await WebdavAccounts.findOneByIdAndUserId(accountId, Meteor.userId());
 		if (!account) {
 			throw new Meteor.Error('error-invalid-account', 'Invalid WebDAV Account', { method: 'getWebdavFileList' });
 		}
diff --git a/app/webdav/server/methods/getWebdavFilePreview.js b/app/webdav/server/methods/getWebdavFilePreview.js
index 2de21cae6fef..5940d44601b4 100644
--- a/app/webdav/server/methods/getWebdavFilePreview.js
+++ b/app/webdav/server/methods/getWebdavFilePreview.js
@@ -3,7 +3,7 @@ import { createClient } from 'webdav';
 
 import { settings } from '../../../settings';
 import { getWebdavCredentials } from './getWebdavCredentials';
-import { WebdavAccounts } from '../../../models';
+import { WebdavAccounts } from '../../../models/server/raw';
 
 Meteor.methods({
 	async getWebdavFilePreview(accountId, path) {
@@ -15,7 +15,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-allowed', 'WebDAV Integration Not Allowed', { method: 'getWebdavFilePreview' });
 		}
 
-		const account = WebdavAccounts.findOne({ _id: accountId, user_id: Meteor.userId() });
+		const account = await WebdavAccounts.findOneByIdAndUserId(accountId, Meteor.userId());
 		if (!account) {
 			throw new Meteor.Error('error-invalid-account', 'Invalid WebDAV Account', { method: 'getWebdavFilePreview' });
 		}
diff --git a/app/webdav/server/methods/removeWebdavAccount.js b/app/webdav/server/methods/removeWebdavAccount.js
index 46f8c7b515f7..dc6ba032cfc7 100644
--- a/app/webdav/server/methods/removeWebdavAccount.js
+++ b/app/webdav/server/methods/removeWebdavAccount.js
@@ -1,18 +1,18 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { WebdavAccounts } from '../../../models';
+import { WebdavAccounts } from '../../../models/server/raw';
 import { Notifications } from '../../../notifications/server';
 
 Meteor.methods({
-	removeWebdavAccount(accountId) {
+	async removeWebdavAccount(accountId) {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid User', { method: 'removeWebdavAccount' });
 		}
 
 		check(accountId, String);
 
-		const removed = WebdavAccounts.removeByUserAndId(accountId, Meteor.userId());
+		const removed = await WebdavAccounts.removeByUserAndId(accountId, Meteor.userId());
 		if (removed) {
 			Notifications.notifyUser(Meteor.userId(), 'webdav', {
 				type: 'removed',
diff --git a/app/webdav/server/methods/uploadFileToWebdav.ts b/app/webdav/server/methods/uploadFileToWebdav.ts
index 345550285e7f..1f794ea0ad48 100644
--- a/app/webdav/server/methods/uploadFileToWebdav.ts
+++ b/app/webdav/server/methods/uploadFileToWebdav.ts
@@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { settings } from '../../../settings/server';
 import { Logger } from '../../../logger/server';
 import { getWebdavCredentials } from './getWebdavCredentials';
-import { WebdavAccounts } from '../../../models/server';
+import { WebdavAccounts } from '../../../models/server/raw';
 import { WebdavClientAdapter } from '../lib/webdavClientAdapter';
 
 const logger = new Logger('WebDAV_Upload');
@@ -18,7 +18,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-allowed', 'WebDAV Integration Not Allowed', { method: 'uploadFileToWebdav' });
 		}
 
-		const account = WebdavAccounts.findOne({ _id: accountId });
+		const account = await WebdavAccounts.findOneById(accountId);
 		if (!account) {
 			throw new Meteor.Error('error-invalid-account', 'Invalid WebDAV Account', { method: 'uploadFileToWebdav' });
 		}
diff --git a/definition/Federation.ts b/definition/Federation.ts
new file mode 100644
index 000000000000..d961d8226429
--- /dev/null
+++ b/definition/Federation.ts
@@ -0,0 +1,5 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface IFederationServer extends IRocketChatRecord {
+	domain: string;
+}
diff --git a/definition/IAnalytic.ts b/definition/IAnalytic.ts
new file mode 100644
index 000000000000..2a9b1e83c2e9
--- /dev/null
+++ b/definition/IAnalytic.ts
@@ -0,0 +1,33 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+interface IAnalyticsBase extends IRocketChatRecord {
+	type: 'messages' | 'users' | 'seat-request';
+	date: number;
+}
+
+export interface IAnalyticsMessages extends IAnalyticsBase {
+	type: 'messages';
+	room: {
+		_id: string;
+		name?: string;
+		t: string;
+		usernames: string[];
+	};
+}
+
+export interface IAnalyticsUsers extends IAnalyticsBase {
+	type: 'users';
+	room: {
+		_id: string;
+		name?: string;
+		t: string;
+		usernames: string[];
+	};
+}
+
+export interface IAnalyticsSeatRequest extends IAnalyticsBase {
+	type: 'seat-request';
+	count: number;
+}
+
+export type IAnalytic = IAnalyticsBase | IAnalyticsMessages | IAnalyticsUsers | IAnalyticsSeatRequest;
diff --git a/definition/IAvatar.ts b/definition/IAvatar.ts
new file mode 100644
index 000000000000..b8bd8b82bfbd
--- /dev/null
+++ b/definition/IAvatar.ts
@@ -0,0 +1,13 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface IAvatar extends IRocketChatRecord {
+	name: string;
+	rid: string;
+	userId: string;
+	store: string;
+	complete: boolean;
+	uploading: boolean;
+	progress: number;
+	extension: string;
+	uploadedAt: Date;
+}
diff --git a/definition/ICredentialToken.ts b/definition/ICredentialToken.ts
new file mode 100644
index 000000000000..ceaf44203cba
--- /dev/null
+++ b/definition/ICredentialToken.ts
@@ -0,0 +1,10 @@
+export interface ICredentialToken {
+	_id: string;
+
+	userInfo: {
+		username?: string;
+		attributes?: any;
+		profile?: Record<string, any>;
+	};
+	expireAt: Date;
+}
diff --git a/definition/ICustomSound.ts b/definition/ICustomSound.ts
new file mode 100644
index 000000000000..0fd8c09e0851
--- /dev/null
+++ b/definition/ICustomSound.ts
@@ -0,0 +1,6 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface ICustomSound extends IRocketChatRecord {
+	name: string;
+	statusType: string;
+}
diff --git a/definition/ICustomUserStatus.ts b/definition/ICustomUserStatus.ts
new file mode 100644
index 000000000000..56bb8874be3f
--- /dev/null
+++ b/definition/ICustomUserStatus.ts
@@ -0,0 +1,6 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface ICustomUserStatus extends IRocketChatRecord {
+	name: string;
+	statusType: string;
+}
diff --git a/definition/IEmojiCustom.ts b/definition/IEmojiCustom.ts
new file mode 100644
index 000000000000..a7d874f834ea
--- /dev/null
+++ b/definition/IEmojiCustom.ts
@@ -0,0 +1,7 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface IEmojiCustom extends IRocketChatRecord {
+	name: string;
+	aliases: string;
+	extension: string;
+}
diff --git a/definition/IExportOperation.ts b/definition/IExportOperation.ts
new file mode 100644
index 000000000000..9ccd591c4823
--- /dev/null
+++ b/definition/IExportOperation.ts
@@ -0,0 +1,16 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface IExportOperation extends IRocketChatRecord {
+	roomList?: string[];
+	status: string;
+	fileList: string[];
+	generatedFile?: string;
+	fileId: string;
+	userNameTable: string;
+	userData: string;
+	generatedUserFile: string;
+	generatedAvatar: string;
+	exportPath: string;
+	assetsPath: string;
+	createdAt: Date;
+}
diff --git a/definition/IIntegration.ts b/definition/IIntegration.ts
index 5ad55faab937..fa851e5a1208 100644
--- a/definition/IIntegration.ts
+++ b/definition/IIntegration.ts
@@ -1,5 +1,9 @@
-export interface IIntegration {
-	_id: string;
+import { IRocketChatRecord } from './IRocketChatRecord';
+import { IUser } from './IUser';
+
+export interface IIntegration extends IRocketChatRecord {
 	type: string;
 	enabled: boolean;
+	channel: string;
+	_createdBy: IUser;
 }
diff --git a/definition/IIntegrationHistory.ts b/definition/IIntegrationHistory.ts
index 2149aff521be..04e1df6cbb03 100644
--- a/definition/IIntegrationHistory.ts
+++ b/definition/IIntegrationHistory.ts
@@ -1,5 +1,6 @@
-export interface IIntegrationHistory {
-	_id: string;
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface IIntegrationHistory extends IRocketChatRecord {
 	type: string;
 	step: string;
 	integration: {
@@ -8,7 +9,20 @@ export interface IIntegrationHistory {
 	event: string;
 	_createdAt: Date;
 	_updatedAt: Date;
-	// "data" :
+	data?: {
+		user?: any;
+		room?: any;
+	};
 	ranPrepareScript: boolean;
 	finished: boolean;
+
+	triggerWord?: string;
+	prepareSentMessage?: string;
+	processSentMessage?: string;
+	url?: string;
+	httpCallData?: string;
+	httpError?: any;
+	httpResult?: string;
+	error?: any;
+	errorStack?: any;
 }
diff --git a/definition/IInvite.ts b/definition/IInvite.ts
new file mode 100644
index 000000000000..b02a02576257
--- /dev/null
+++ b/definition/IInvite.ts
@@ -0,0 +1,11 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface IInvite extends IRocketChatRecord {
+	days: number;
+	maxUses: number;
+	rid: string;
+	userId: string;
+	createdAt: Date;
+	expires: Date;
+	uses: number;
+}
diff --git a/definition/ILivechatBusinessHour.ts b/definition/ILivechatBusinessHour.ts
index cdb18c9fd4be..ab2ec4f70315 100644
--- a/definition/ILivechatBusinessHour.ts
+++ b/definition/ILivechatBusinessHour.ts
@@ -21,6 +21,7 @@ export interface IBusinessHourWorkHour {
 	start: IBusinessHourTime;
 	finish: IBusinessHourTime;
 	open: boolean;
+	code: unknown;
 }
 
 export interface IBusinessHourTimezone {
diff --git a/definition/IOAuthApps.ts b/definition/IOAuthApps.ts
new file mode 100644
index 000000000000..71e004a067bd
--- /dev/null
+++ b/definition/IOAuthApps.ts
@@ -0,0 +1,14 @@
+export interface IOAuthApps {
+	_id: string;
+
+	name: string;
+	active: boolean;
+	clientId: string;
+	clientSecret: string;
+	redirectUri: string;
+	_createdAt: Date;
+	_createdBy: {
+		_id: string;
+		username: string;
+	};
+}
diff --git a/definition/IOEmbedCache.ts b/definition/IOEmbedCache.ts
new file mode 100644
index 000000000000..b99341bddf63
--- /dev/null
+++ b/definition/IOEmbedCache.ts
@@ -0,0 +1,6 @@
+export interface IOEmbedCache {
+	_id: string;
+
+	data: any;
+	updatedAt: Date;
+}
diff --git a/definition/IReport.ts b/definition/IReport.ts
new file mode 100644
index 000000000000..61ee97bb9914
--- /dev/null
+++ b/definition/IReport.ts
@@ -0,0 +1,9 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+import type { IMessage } from './IMessage/IMessage';
+
+export interface IReport extends IRocketChatRecord {
+	message: IMessage;
+	description: string;
+	ts: Date;
+	userId: string;
+}
diff --git a/definition/IRoom.ts b/definition/IRoom.ts
index 62d68e97de2c..8597a9035e82 100644
--- a/definition/IRoom.ts
+++ b/definition/IRoom.ts
@@ -61,6 +61,8 @@ export interface IRoom extends IRocketChatRecord {
 
 	sysMes?: string[];
 	muted?: string[];
+
+	usernames?: string[];
 }
 
 export interface ICreatedRoom extends IRoom {
@@ -73,6 +75,8 @@ export interface IDirectMessageRoom extends Omit<IRoom, 'default' | 'featured' |
 	usernames: Array<Username>;
 }
 
+export const isDirectMessageRoom = (room: Partial<IRoom>): room is IDirectMessageRoom => room.t === 'd';
+
 export enum OmnichannelSourceType {
 	WIDGET = 'widget',
 	EMAIL = 'email',
diff --git a/definition/IServerEvent.ts b/definition/IServerEvent.ts
index edc831fb7c56..a0aab45e7a81 100644
--- a/definition/IServerEvent.ts
+++ b/definition/IServerEvent.ts
@@ -10,5 +10,5 @@ export interface IServerEvent {
 	t: IServerEventType;
 	ts: Date;
 	ip: string;
-	u?: Partial<IUser>;
+	u?: Partial<Pick<IUser, '_id' | 'username'>>;
 }
diff --git a/definition/ISession.ts b/definition/ISession.ts
new file mode 100644
index 000000000000..93981f655cf7
--- /dev/null
+++ b/definition/ISession.ts
@@ -0,0 +1,29 @@
+export interface ISession {
+	_id: string;
+
+	type: string;
+	mostImportantRole: string;
+	userId: string;
+	lastActivityAt: Date;
+	device: {
+		type: string;
+		name: string;
+		longVersion: string;
+		os: {
+			name: string;
+			version: string;
+		};
+		version: string;
+	};
+	year: number;
+	month: number;
+	day: number;
+	instanceId: string;
+	sessionId: string;
+	_updatedAt: Date;
+	createdAt: Date;
+	host: string;
+	ip: string;
+	loginAt: Date;
+	closedAt: Date;
+}
diff --git a/definition/ISetting.ts b/definition/ISetting.ts
index 096d25bcae85..635506db1c2e 100644
--- a/definition/ISetting.ts
+++ b/definition/ISetting.ts
@@ -57,7 +57,7 @@ export interface ISettingBase {
 	wizard?: {
 		step: number;
 		order: number;
-	};
+	} | null;
 	persistent?: boolean; // todo: remove
 	readonly?: boolean; // todo: remove
 	alert?: string; // todo: check if this is still used
@@ -97,6 +97,7 @@ export interface ISettingCode extends ISettingBase {
 
 export interface ISettingAction extends ISettingBase {
 	type: 'action';
+	value: string;
 	actionText?: string;
 }
 export interface ISettingAsset extends ISettingBase {
@@ -104,6 +105,14 @@ export interface ISettingAsset extends ISettingBase {
 	value: AssetValue;
 }
 
+export interface ISettingDate extends ISettingBase {
+	type: 'date';
+	value: Date;
+}
+
+export const isDateSetting = (setting: ISetting): setting is ISettingDate => setting.type === 'date';
+
+
 export const isSettingEnterprise = (setting: ISettingBase): setting is ISettingEnterprise => setting.enterprise === true;
 
 export const isSettingColor = (setting: ISettingBase): setting is ISettingColor => setting.type === 'color';
diff --git a/definition/ISmarshHistory.ts b/definition/ISmarshHistory.ts
new file mode 100644
index 000000000000..43ba0d8f91a8
--- /dev/null
+++ b/definition/ISmarshHistory.ts
@@ -0,0 +1,6 @@
+export interface ISmarshHistory {
+	_id: string;
+
+	lastRan: Date;
+	lastResult: string;
+}
diff --git a/definition/IStatistic.ts b/definition/IStatistic.ts
new file mode 100644
index 000000000000..c94e92e5da5f
--- /dev/null
+++ b/definition/IStatistic.ts
@@ -0,0 +1,24 @@
+export interface IStatistic {
+	_id: string;
+
+	version: string;
+	instanceCount: number;
+	oplogEnabled: boolean;
+	totalUsers: number;
+	activeUsers: number;
+	nonActiveUsers: number;
+	onlineUsers: number;
+	awayUsers: number;
+	offlineUsers: number;
+	totalRooms: number;
+	totalChannels: number;
+	totalPrivateGroups: number;
+	totalDirect: number;
+	totalLivechat: number;
+	totalMessages: number;
+	totalChannelMessages: number;
+	totalPrivateGroupMessages: number;
+	totalDirectMessages: number;
+	totalLivechatMessages: number;
+	pushQueue: number;
+}
diff --git a/definition/IUpload.ts b/definition/IUpload.ts
new file mode 100644
index 000000000000..1eba78e441da
--- /dev/null
+++ b/definition/IUpload.ts
@@ -0,0 +1,12 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface IUpload extends IRocketChatRecord {
+	typeGroup?: string;
+	type?: string;
+	name: string;
+	aliases?: string;
+	extension?: string;
+	complete?: boolean;
+	uploading?: boolean;
+	progress?: number;
+}
diff --git a/definition/IUser.ts b/definition/IUser.ts
index 732c684961ba..e40908cec83a 100644
--- a/definition/IUser.ts
+++ b/definition/IUser.ts
@@ -94,7 +94,8 @@ export interface IRole {
 	mandatory2fa?: boolean;
 	name: string;
 	protected: boolean;
-	scope?: string;
+	// scope?: string;
+	scope?: 'Users' | 'Subscriptions';
 	_id: string;
 }
 
@@ -143,6 +144,12 @@ export interface IUser extends IRocketChatRecord {
 	ldap?: boolean;
 }
 
+export interface IRegisterUser extends IUser {
+	username: string;
+	name: string;
+}
+export const isRegisterUser = (user: IUser): user is IRegisterUser => user.username !== undefined && user.name !== undefined;
+
 export type IUserDataEvent = {
 	id: unknown;
 }
diff --git a/definition/IUserDataFile.ts b/definition/IUserDataFile.ts
new file mode 100644
index 000000000000..8be01d1c88d2
--- /dev/null
+++ b/definition/IUserDataFile.ts
@@ -0,0 +1,13 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface IUserDataFile extends IRocketChatRecord {
+	name: string;
+	rid: string;
+	userId: string;
+	store: string;
+	complete: boolean;
+	uploading: boolean;
+	progress: number;
+	extension: string;
+	uploadedAt: Date;
+}
diff --git a/definition/IWebdavAccount.ts b/definition/IWebdavAccount.ts
new file mode 100644
index 000000000000..264df6f57546
--- /dev/null
+++ b/definition/IWebdavAccount.ts
@@ -0,0 +1,9 @@
+import { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface IWebdavAccount extends IRocketChatRecord {
+	user_id: string;
+	server_url: string;
+	username: string;
+	password: string;
+	name: string;
+}
diff --git a/definition/externals/meteor/meteor.d.ts b/definition/externals/meteor/meteor.d.ts
index f4e6c3a65c44..d2f9bc1c8300 100644
--- a/definition/externals/meteor/meteor.d.ts
+++ b/definition/externals/meteor/meteor.d.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/interface-name-prefix */
+import 'meteor/meteor';
 
 declare module 'meteor/meteor' {
 	namespace Meteor {
diff --git a/ee/app/auditing/server/index.js b/ee/app/auditing/server/index.ts
similarity index 79%
rename from ee/app/auditing/server/index.js
rename to ee/app/auditing/server/index.ts
index a816e3a1bc2c..57ac621de7dd 100644
--- a/ee/app/auditing/server/index.js
+++ b/ee/app/auditing/server/index.ts
@@ -2,7 +2,7 @@
 import { Meteor } from 'meteor/meteor';
 
 import { onLicense } from '../../license/server';
-import { Permissions, Roles } from '../../../../app/models/server';
+import { Permissions, Roles } from '../../../../app/models/server/raw';
 
 onLicense('auditing', () => {
 	require('./methods');
@@ -14,8 +14,8 @@ onLicense('auditing', () => {
 		];
 
 		const defaultRoles = [
-			{ name: 'auditor', scope: 'Users' },
-			{ name: 'auditor-log', scope: 'Users' },
+			{ name: 'auditor', scope: 'Users' as const },
+			{ name: 'auditor-log', scope: 'Users' as const },
 		];
 
 		permissions.forEach((permission) => {
@@ -23,7 +23,7 @@ onLicense('auditing', () => {
 		});
 
 		defaultRoles.forEach((role) =>
-			Roles.createOrUpdate(role.name, role.scope, role.description),
+			Roles.createOrUpdate(role.name, role.scope),
 		);
 	});
 });
diff --git a/ee/app/authorization/server/resetEnterprisePermissions.js b/ee/app/authorization/server/resetEnterprisePermissions.js
deleted file mode 100644
index cebc88ba83be..000000000000
--- a/ee/app/authorization/server/resetEnterprisePermissions.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Permissions } from '../../../../app/models/server';
-import { guestPermissions } from '../lib/guestPermissions';
-
-export const resetEnterprisePermissions = function() {
-	Permissions.update({ _id: { $nin: guestPermissions } }, { $pull: { roles: 'guest' } }, { multi: true });
-};
diff --git a/ee/app/authorization/server/resetEnterprisePermissions.ts b/ee/app/authorization/server/resetEnterprisePermissions.ts
new file mode 100644
index 000000000000..2c7cd9def87e
--- /dev/null
+++ b/ee/app/authorization/server/resetEnterprisePermissions.ts
@@ -0,0 +1,7 @@
+
+import { Permissions } from '../../../../app/models/server/raw';
+import { guestPermissions } from '../lib/guestPermissions';
+
+export const resetEnterprisePermissions = async function(): Promise<void> {
+	await Permissions.update({ _id: { $nin: guestPermissions } }, { $pull: { roles: 'guest' } }, { multi: true });
+};
diff --git a/ee/app/canned-responses/server/permissions.js b/ee/app/canned-responses/server/permissions.ts
similarity index 90%
rename from ee/app/canned-responses/server/permissions.js
rename to ee/app/canned-responses/server/permissions.ts
index 26e838540df1..f32650dd09b9 100644
--- a/ee/app/canned-responses/server/permissions.js
+++ b/ee/app/canned-responses/server/permissions.ts
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import Permissions from '../../../../app/models/server/models/Permissions';
+import { Permissions } from '../../../../app/models/server/raw';
 
 Meteor.startup(() => {
 	Permissions.create('view-canned-responses', ['livechat-agent', 'livechat-monitor', 'livechat-manager', 'admin']);
diff --git a/ee/app/engagement-dashboard/server/lib/messages.js b/ee/app/engagement-dashboard/server/lib/messages.js
index e49443dc5829..f4208928fcbb 100644
--- a/ee/app/engagement-dashboard/server/lib/messages.js
+++ b/ee/app/engagement-dashboard/server/lib/messages.js
@@ -1,9 +1,7 @@
 import moment from 'moment';
 
-import AnalyticsRaw from '../../../../../app/models/server/raw/Analytics';
 import { roomTypes } from '../../../../../app/utils';
-import { Messages } from '../../../../../app/models/server/raw';
-import { Analytics } from '../../../../../app/models/server';
+import { Messages, Analytics } from '../../../../../app/models/server/raw';
 import { convertDateToInt, diffBetweenDaysInclusive, convertIntToDate, getTotalOfWeekItems } from './date';
 
 export const handleMessagesSent = (message, room) => {
@@ -11,7 +9,7 @@ export const handleMessagesSent = (message, room) => {
 	if (!roomTypesToShow.includes(room.t)) {
 		return message;
 	}
-	Promise.await(AnalyticsRaw.saveMessageSent({
+	Promise.await(Analytics.saveMessageSent({
 		date: convertDateToInt(message.ts),
 		room,
 	}));
@@ -23,7 +21,7 @@ export const handleMessagesDeleted = (message, room) => {
 	if (!roomTypesToShow.includes(room.t)) {
 		return;
 	}
-	Promise.await(AnalyticsRaw.saveMessageDeleted({
+	Promise.await(Analytics.saveMessageDeleted({
 		date: convertDateToInt(message.ts),
 		room,
 	}));
@@ -31,7 +29,7 @@ export const handleMessagesDeleted = (message, room) => {
 };
 
 export const fillFirstDaysOfMessagesIfNeeded = async (date) => {
-	const messagesFromAnalytics = await AnalyticsRaw.findByTypeBeforeDate({
+	const messagesFromAnalytics = await Analytics.findByTypeBeforeDate({
 		type: 'messages',
 		date: convertDateToInt(date),
 	}).toArray();
@@ -41,10 +39,10 @@ export const fillFirstDaysOfMessagesIfNeeded = async (date) => {
 			start: startOfPeriod,
 			end: date,
 		});
-		messages.forEach((message) => Analytics.insert({
+		await Promise.all(messages.map((message) => Analytics.insertOne({
 			...message,
 			date: parseInt(message.date),
-		}));
+		})));
 	}
 };
 
@@ -54,16 +52,16 @@ export const findWeeklyMessagesSentData = async ({ start, end }) => {
 	const startOfLastWeek = moment(endOfLastWeek).clone().subtract(daysBetweenDates, 'days').toDate();
 	const today = convertDateToInt(end);
 	const yesterday = convertDateToInt(moment(end).clone().subtract(1, 'days').toDate());
-	const currentPeriodMessages = await AnalyticsRaw.getMessagesSentTotalByDate({
+	const currentPeriodMessages = await Analytics.getMessagesSentTotalByDate({
 		start: convertDateToInt(start),
 		end: convertDateToInt(end),
 		options: { count: daysBetweenDates, sort: { _id: -1 } },
-	});
-	const lastPeriodMessages = await AnalyticsRaw.getMessagesSentTotalByDate({
+	}).toArray();
+	const lastPeriodMessages = await Analytics.getMessagesSentTotalByDate({
 		start: convertDateToInt(startOfLastWeek),
 		end: convertDateToInt(endOfLastWeek),
 		options: { count: daysBetweenDates, sort: { _id: -1 } },
-	});
+	}).toArray();
 	const yesterdayMessages = (currentPeriodMessages.find((item) => item._id === yesterday) || {}).messages || 0;
 	const todayMessages = (currentPeriodMessages.find((item) => item._id === today) || {}).messages || 0;
 	const currentPeriodTotalOfMessages = getTotalOfWeekItems(currentPeriodMessages, 'messages');
@@ -82,10 +80,10 @@ export const findWeeklyMessagesSentData = async ({ start, end }) => {
 };
 
 export const findMessagesSentOrigin = async ({ start, end }) => {
-	const origins = await AnalyticsRaw.getMessagesOrigin({
+	const origins = await Analytics.getMessagesOrigin({
 		start: convertDateToInt(start),
 		end: convertDateToInt(end),
-	});
+	}).toArray();
 	const roomTypesToShow = roomTypes.getTypesToShowOnDashboard();
 	const responseTypes = origins.map((origin) => origin.t);
 	const missingTypes = roomTypesToShow.filter((type) => !responseTypes.includes(type));
@@ -96,10 +94,10 @@ export const findMessagesSentOrigin = async ({ start, end }) => {
 };
 
 export const findTopFivePopularChannelsByMessageSentQuantity = async ({ start, end }) => {
-	const channels = await AnalyticsRaw.getMostPopularChannelsByMessagesSentQuantity({
+	const channels = await Analytics.getMostPopularChannelsByMessagesSentQuantity({
 		start: convertDateToInt(start),
 		end: convertDateToInt(end),
 		options: { count: 5, sort: { messages: -1 } },
-	});
+	}).toArray();
 	return { channels };
 };
diff --git a/ee/app/engagement-dashboard/server/lib/users.js b/ee/app/engagement-dashboard/server/lib/users.js
index 69c72c007e06..b9d8738827c1 100644
--- a/ee/app/engagement-dashboard/server/lib/users.js
+++ b/ee/app/engagement-dashboard/server/lib/users.js
@@ -1,9 +1,6 @@
 import moment from 'moment';
 
-import AnalyticsRaw from '../../../../../app/models/server/raw/Analytics';
-import Sessions from '../../../../../app/models/server/raw/Sessions';
-import { Users } from '../../../../../app/models/server/raw';
-import { Analytics } from '../../../../../app/models/server';
+import { Users, Analytics, Sessions } from '../../../../../app/models/server/raw';
 import { convertDateToInt, diffBetweenDaysInclusive, getTotalOfWeekItems, convertIntToDate } from './date';
 
 export const handleUserCreated = (user) => {
@@ -11,7 +8,7 @@ export const handleUserCreated = (user) => {
 		return;
 	}
 
-	Promise.await(AnalyticsRaw.saveUserData({
+	Promise.await(Analytics.saveUserData({
 		date: convertDateToInt(user.ts),
 		user,
 	}));
@@ -19,7 +16,7 @@ export const handleUserCreated = (user) => {
 };
 
 export const fillFirstDaysOfUsersIfNeeded = async (date) => {
-	const usersFromAnalytics = await AnalyticsRaw.findByTypeBeforeDate({
+	const usersFromAnalytics = await Analytics.findByTypeBeforeDate({
 		type: 'users',
 		date: convertDateToInt(date),
 	}).toArray();
@@ -29,7 +26,7 @@ export const fillFirstDaysOfUsersIfNeeded = async (date) => {
 			start: startOfPeriod,
 			end: date,
 		});
-		users.forEach((user) => Analytics.insert({
+		users.forEach((user) => Analytics.insertOne({
 			...user,
 			date: parseInt(user.date),
 		}));
@@ -42,16 +39,16 @@ export const findWeeklyUsersRegisteredData = async ({ start, end }) => {
 	const startOfLastWeek = moment(endOfLastWeek).clone().subtract(daysBetweenDates, 'days').toDate();
 	const today = convertDateToInt(end);
 	const yesterday = convertDateToInt(moment(end).clone().subtract(1, 'days').toDate());
-	const currentPeriodUsers = await AnalyticsRaw.getTotalOfRegisteredUsersByDate({
+	const currentPeriodUsers = await Analytics.getTotalOfRegisteredUsersByDate({
 		start: convertDateToInt(start),
 		end: convertDateToInt(end),
 		options: { count: daysBetweenDates, sort: { _id: -1 } },
-	});
-	const lastPeriodUsers = await AnalyticsRaw.getTotalOfRegisteredUsersByDate({
+	}).toArray();
+	const lastPeriodUsers = await Analytics.getTotalOfRegisteredUsersByDate({
 		start: convertDateToInt(startOfLastWeek),
 		end: convertDateToInt(endOfLastWeek),
 		options: { count: daysBetweenDates, sort: { _id: -1 } },
-	});
+	}).toArray();
 	const yesterdayUsers = (currentPeriodUsers.find((item) => item._id === yesterday) || {}).users || 0;
 	const todayUsers = (currentPeriodUsers.find((item) => item._id === today) || {}).users || 0;
 	const currentPeriodTotalUsers = getTotalOfWeekItems(currentPeriodUsers, 'users');
diff --git a/ee/app/livechat-enterprise/server/permissions.js b/ee/app/livechat-enterprise/server/permissions.js
deleted file mode 100644
index ef2b44ffd0b7..000000000000
--- a/ee/app/livechat-enterprise/server/permissions.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Permissions, Roles } from '../../../../app/models/server';
-
-export const createPermissions = () => {
-	if (!Permissions) {
-		return;
-	}
-
-	const livechatMonitorRole = 'livechat-monitor';
-	const livechatManagerRole = 'livechat-manager';
-	const adminRole = 'admin';
-
-	const monitorRole = Roles.findOneById(livechatMonitorRole, { fields: { _id: 1 } });
-	if (!monitorRole) {
-		Roles.createOrUpdate(livechatMonitorRole);
-	}
-
-	Permissions.create('manage-livechat-units', [adminRole, livechatManagerRole]);
-	Permissions.create('manage-livechat-monitors', [adminRole, livechatManagerRole]);
-	Permissions.create('manage-livechat-tags', [adminRole, livechatManagerRole]);
-	Permissions.create('manage-livechat-priorities', [adminRole, livechatManagerRole]);
-	Permissions.create('manage-livechat-canned-responses', [adminRole, livechatManagerRole, livechatMonitorRole]);
-};
diff --git a/ee/app/livechat-enterprise/server/permissions.ts b/ee/app/livechat-enterprise/server/permissions.ts
new file mode 100644
index 000000000000..1b0ef93e0a68
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/permissions.ts
@@ -0,0 +1,21 @@
+
+import { Permissions, Roles } from '../../../../app/models/server/raw';
+
+export const createPermissions = async (): Promise<void> => {
+	const livechatMonitorRole = 'livechat-monitor';
+	const livechatManagerRole = 'livechat-manager';
+	const adminRole = 'admin';
+
+	const monitorRole = await Roles.findOneById(livechatMonitorRole, { fields: { _id: 1 } });
+	if (!monitorRole) {
+		await Roles.createOrUpdate(livechatMonitorRole);
+	}
+
+	await Promise.all([
+		Permissions.create('manage-livechat-units', [adminRole, livechatManagerRole]),
+		Permissions.create('manage-livechat-monitors', [adminRole, livechatManagerRole]),
+		Permissions.create('manage-livechat-tags', [adminRole, livechatManagerRole]),
+		Permissions.create('manage-livechat-priorities', [adminRole, livechatManagerRole]),
+		Permissions.create('manage-livechat-canned-responses', [adminRole, livechatManagerRole, livechatMonitorRole]),
+	]);
+};
diff --git a/ee/server/lib/ldap/Manager.ts b/ee/server/lib/ldap/Manager.ts
index 7230dbdb6c6d..6b1c46b34eed 100644
--- a/ee/server/lib/ldap/Manager.ts
+++ b/ee/server/lib/ldap/Manager.ts
@@ -8,10 +8,10 @@ import type { IRole } from '../../../../definition/IRole';
 import { IImportUser } from '../../../../definition/IImportUser';
 import { ImporterAfterImportCallback } from '../../../../app/importer/server/definitions/IConversionCallbacks';
 import { settings } from '../../../../app/settings/server';
-import { Roles, Rooms } from '../../../../app/models/server';
+import { Rooms } from '../../../../app/models/server';
 import {
 	Users as UsersRaw,
-	Roles as RolesRaw,
+	Roles,
 	Subscriptions as SubscriptionsRaw,
 } from '../../../../app/models/server/raw';
 import { LDAPDataConverter } from '../../../../server/lib/ldap/DataConverter';
@@ -191,7 +191,7 @@ export class LDAPEEManager extends LDAPManager {
 			return;
 		}
 
-		const roles = await RolesRaw.find({}, {
+		const roles = await Roles.find({}, {
 			fields: {
 				_updatedAt: 0,
 			},
@@ -224,7 +224,7 @@ export class LDAPEEManager extends LDAPManager {
 			logger.debug(`User role exists for mapping ${ ldapField } -> ${ roleName }`);
 
 			if (await this.isUserInGroup(ldap, syncUserRolesBaseDN, syncUserRolesFilter, { dn, username }, ldapField)) {
-				if (Roles.addUserRoles(user._id, roleName)) {
+				if (await Roles.addUserRoles(user._id, roleName)) {
 					this.broadcastRoleChange('added', roleName, user._id, username);
 				}
 				logger.debug(`Synced user group ${ roleName } from LDAP for ${ user.username }`);
@@ -235,7 +235,7 @@ export class LDAPEEManager extends LDAPManager {
 				continue;
 			}
 
-			if (Roles.removeUserRoles(user._id, roleName)) {
+			if (await Roles.removeUserRoles(user._id, roleName)) {
 				this.broadcastRoleChange('removed', roleName, user._id, username);
 			}
 		}
diff --git a/ee/server/lib/oauth/Manager.ts b/ee/server/lib/oauth/Manager.ts
index 9d8222c1ca68..bce7a3e34b7e 100644
--- a/ee/server/lib/oauth/Manager.ts
+++ b/ee/server/lib/oauth/Manager.ts
@@ -1,7 +1,8 @@
 import { addUserRoles, removeUserFromRoles } from '../../../../app/authorization/server';
-import { Roles, Rooms } from '../../../../app/models/server';
+import { Rooms } from '../../../../app/models/server';
 import { addUserToRoom, createRoom } from '../../../../app/lib/server/functions';
 import { Logger } from '../../../../app/logger/server';
+import { Roles } from '../../../../app/models/server/raw';
 
 export const logger = new Logger('OAuth');
 
@@ -64,7 +65,7 @@ export class OAuthEEManager {
 		if (identity && roleClaimName) {
 			// Adding roles
 			if (identity[roleClaimName] && Array.isArray(identity[roleClaimName])) {
-				roles = identity[roleClaimName].filter((val: string) => val !== 'offline_access' && val !== 'uma_authorization' && Roles.findOneByIdOrName(val));
+				roles = identity[roleClaimName].filter((val: string) => val !== 'offline_access' && val !== 'uma_authorization' && Promise.await(Roles.findOneByIdOrName(val)));
 			}
 		}
 
diff --git a/ee/server/services/ddp-streamer/streams/index.ts b/ee/server/services/ddp-streamer/streams/index.ts
index a34fd2757eec..8d058b1a87c2 100644
--- a/ee/server/services/ddp-streamer/streams/index.ts
+++ b/ee/server/services/ddp-streamer/streams/index.ts
@@ -14,10 +14,11 @@ const notifications = new NotificationsModule(Stream);
 
 getConnection()
 	.then((db) => {
+		const Users = new UsersRaw(db.collection<IUser>(Collections.User));
 		notifications.configure({
 			Rooms: new RoomsRaw(db.collection<IRoom>(Collections.Rooms)),
-			Subscriptions: new SubscriptionsRaw(db.collection<ISubscription>(Collections.Subscriptions)),
-			Users: new UsersRaw(db.collection<IUser>(Collections.User)),
+			Subscriptions: new SubscriptionsRaw(db.collection<ISubscription>(Collections.Subscriptions), { Users }),
+			Users,
 			Settings: new SettingsRaw(db.collection<ISetting>(Collections.Settings)),
 		});
 	});
diff --git a/ee/server/services/stream-hub/StreamHub.ts b/ee/server/services/stream-hub/StreamHub.ts
index b559e43a7f75..ebb4830ead12 100755
--- a/ee/server/services/stream-hub/StreamHub.ts
+++ b/ee/server/services/stream-hub/StreamHub.ts
@@ -31,13 +31,13 @@ export class StreamHub extends ServiceClass implements IServiceClass {
 		const Rooms = new RoomsRaw(db.collection('rocketchat_room'), Trash);
 		const Settings = new SettingsRaw(db.collection('rocketchat_settings'), Trash);
 		const Users = new UsersRaw(UsersCol, Trash);
-		const UsersSessions = new UsersSessionsRaw(db.collection('usersSessions'), Trash);
-		const Subscriptions = new SubscriptionsRaw(db.collection('rocketchat_subscription'), Trash);
+		const UsersSessions = new UsersSessionsRaw(db.collection('usersSessions'), Trash, { preventSetUpdatedAt: true });
+		const Subscriptions = new SubscriptionsRaw(db.collection('rocketchat_subscription'), { Users }, Trash);
 		const LivechatInquiry = new LivechatInquiryRaw(db.collection('rocketchat_livechat_inquiry'), Trash);
 		const LivechatDepartmentAgents = new LivechatDepartmentAgentsRaw(db.collection('rocketchat_livechat_department_agents'), Trash);
 		const Messages = new MessagesRaw(db.collection('rocketchat_message'), Trash);
 		const Permissions = new PermissionsRaw(db.collection('rocketchat_permissions'), Trash);
-		const Roles = new RolesRaw(db.collection('rocketchat_roles'), Trash, { Users, Subscriptions });
+		const Roles = new RolesRaw(db.collection('rocketchat_roles'), { Users, Subscriptions }, Trash);
 		const LoginServiceConfiguration = new LoginServiceConfigurationRaw(db.collection('meteor_accounts_loginServiceConfiguration'), Trash);
 		const InstanceStatus = new InstanceStatusRaw(db.collection('instances'), Trash);
 		const IntegrationHistory = new IntegrationHistoryRaw(db.collection('rocketchat_integration_history'), Trash);
diff --git a/imports/message-read-receipt/server/api/methods/getReadReceipts.js b/imports/message-read-receipt/server/api/methods/getReadReceipts.js
index e13647249217..810c7db70d65 100644
--- a/imports/message-read-receipt/server/api/methods/getReadReceipts.js
+++ b/imports/message-read-receipt/server/api/methods/getReadReceipts.js
@@ -5,7 +5,7 @@ import { canAccessRoom } from '../../../../../app/authorization/server';
 import { ReadReceipt } from '../../lib/ReadReceipt';
 
 Meteor.methods({
-	getReadReceipts({ messageId }) {
+	async getReadReceipts({ messageId }) {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'getReadReceipts' });
 		}
diff --git a/imports/message-read-receipt/server/lib/ReadReceipt.js b/imports/message-read-receipt/server/lib/ReadReceipt.js
index ab30a835763b..82310014d5e5 100644
--- a/imports/message-read-receipt/server/lib/ReadReceipt.js
+++ b/imports/message-read-receipt/server/lib/ReadReceipt.js
@@ -1,13 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 
-import { ReadReceipts, Subscriptions, Messages, Rooms, Users, LivechatVisitors } from '../../../../app/models';
-import { settings } from '../../../../app/settings';
-import { roomTypes } from '../../../../app/utils';
+import { Subscriptions, Messages, Rooms, Users, LivechatVisitors } from '../../../../app/models/server';
+import { ReadReceipts } from '../../../../app/models/server/raw';
+import { settings } from '../../../../app/settings/server';
+import { roomTypes } from '../../../../app/utils/server';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 
-const rawReadReceipts = ReadReceipts.model.rawCollection();
-
 // debounced function by roomId, so multiple calls within 2 seconds to same roomId runs only once
 const list = {};
 const debounceByRoomId = function(fn) {
@@ -85,17 +84,21 @@ export const ReadReceipt = {
 			}
 
 			try {
-				await rawReadReceipts.insertMany(receipts);
+				await ReadReceipts.insertMany(receipts);
 			} catch (e) {
 				SystemLogger.error('Error inserting read receipts per user');
 			}
 		}
 	},
 
-	getReceipts(message) {
-		return ReadReceipts.findByMessageId(message._id).map((receipt) => ({
+	async getReceipts(message) {
+		const receipts = await ReadReceipts.findByMessageId(message._id).toArray();
+
+		return receipts.map((receipt) => ({
 			...receipt,
-			user: receipt.token ? LivechatVisitors.getVisitorByToken(receipt.token, { fields: { username: 1, name: 1 } }) : Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),
+			user: receipt.token
+				? LivechatVisitors.getVisitorByToken(receipt.token, { fields: { username: 1, name: 1 } })
+				: Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),
 		}));
 	},
 };
diff --git a/package-lock.json b/package-lock.json
index c679ed74f1db..fb1db4f80cf9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9916,6 +9916,15 @@
         }
       }
     },
+    "@types/node-rsa": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/node-rsa/-/node-rsa-1.1.1.tgz",
+      "integrity": "sha512-itzxtaBgk4OMbrCawVCvas934waMZWjW17v7EYgFVlfYS/cl0/P7KZdojWCq9SDJMI5cnLQLUP8ayhVCTY8TEg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/nodemailer": {
       "version": "6.4.2",
       "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.2.tgz",
diff --git a/package.json b/package.json
index 77fd4943a19b..c5865032264d 100644
--- a/package.json
+++ b/package.json
@@ -90,6 +90,7 @@
 		"@types/moment-timezone": "^0.5.30",
 		"@types/mongodb": "^3.6.19",
 		"@types/node": "^12.20.10",
+		"@types/node-rsa": "^1.1.1",
 		"@types/nodemailer": "^6.4.2",
 		"@types/parseurl": "^1.3.1",
 		"@types/psl": "^1.1.0",
diff --git a/server/cron/statistics.js b/server/cron/statistics.js
index 7c51e51963cf..8f268bf0c1a5 100644
--- a/server/cron/statistics.js
+++ b/server/cron/statistics.js
@@ -5,8 +5,8 @@ import { getWorkspaceAccessToken } from '../../app/cloud/server';
 import { statistics } from '../../app/statistics';
 import { settings } from '../../app/settings/server';
 
-function generateStatistics(logger) {
-	const cronStatistics = statistics.save();
+async function generateStatistics(logger) {
+	const cronStatistics = await statistics.save();
 
 	cronStatistics.host = Meteor.absoluteUrl();
 
diff --git a/server/database/readSecondaryPreferred.ts b/server/database/readSecondaryPreferred.ts
index b23e538a319c..e29e90b4dc92 100644
--- a/server/database/readSecondaryPreferred.ts
+++ b/server/database/readSecondaryPreferred.ts
@@ -1,6 +1,6 @@
-import { ReadPreference, Db } from 'mongodb';
+import { ReadPreference, Db, ReadPreferenceOrMode } from 'mongodb';
 
-export function readSecondaryPreferred(db: Db, tags: any[] = []): ReadPreference | string {
+export function readSecondaryPreferred(db: Db, tags: any[] = []): ReadPreferenceOrMode {
 	const { readPreferenceTags, readPreference } = db.options;
 
 	if (tags.length) {
diff --git a/server/features/EmailInbox/EmailInbox.ts b/server/features/EmailInbox/EmailInbox.ts
index f483e546a4ab..4e8f4aac8607 100644
--- a/server/features/EmailInbox/EmailInbox.ts
+++ b/server/features/EmailInbox/EmailInbox.ts
@@ -55,7 +55,7 @@ export async function configureEmailInboxes(): Promise<void> {
 			}
 
 			try {
-				await EmailMessageHistory.insertOne({ _id: email.messageId, email: emailInboxRecord.email });
+				await EmailMessageHistory.create({ _id: email.messageId, email: emailInboxRecord.email });
 				onEmailReceived(email, emailInboxRecord.email, emailInboxRecord.department);
 			} catch (e: any) {
 				// In case the email message history has been received by other instance..
diff --git a/server/features/EmailInbox/EmailInbox_Outgoing.ts b/server/features/EmailInbox/EmailInbox_Outgoing.ts
index f9cf4e1d2140..271729d20a62 100644
--- a/server/features/EmailInbox/EmailInbox_Outgoing.ts
+++ b/server/features/EmailInbox/EmailInbox_Outgoing.ts
@@ -8,7 +8,8 @@ import { IEmailInbox } from '../../../definition/IEmailInbox';
 import { IUser } from '../../../definition/IUser';
 import { FileUpload } from '../../../app/file-upload/server';
 import { slashCommands } from '../../../app/utils/server';
-import { Messages, Rooms, Uploads, Users } from '../../../app/models/server';
+import { Messages, Rooms, Users } from '../../../app/models/server';
+import { Uploads } from '../../../app/models/server/raw';
 import { Inbox, inboxes } from './EmailInbox';
 import { sendMessage } from '../../../app/lib/server/functions/sendMessage';
 import { settings } from '../../../app/settings/server';
@@ -81,7 +82,11 @@ slashCommands.add('sendEmailAttachment', (command: any, params: string) => {
 		});
 	}
 
-	const file = Uploads.findOneById(message.file._id);
+	const file = Promise.await(Uploads.findOneById(message.file._id));
+
+	if (!file) {
+		return;
+	}
 
 	FileUpload.getBuffer(file, (_err?: Error, buffer?: Buffer) => {
 		!_err && buffer && sendEmail(inbox, {
diff --git a/server/lib/channelExport.ts b/server/lib/channelExport.ts
index 720304cc9247..d8a046522482 100644
--- a/server/lib/channelExport.ts
+++ b/server/lib/channelExport.ts
@@ -156,9 +156,9 @@ export const sendFile = async (data: ExportFile, user: IUser): Promise<void> =>
 
 	await exportMessages();
 
-	fullFileList.forEach((attachmentData: any) => {
-		copyFile(attachmentData, assetsPath);
-	});
+	for await (const attachmentData of fullFileList) {
+		await copyFile(attachmentData, assetsPath);
+	}
 
 	const exportFile = `${ baseDir }-export.zip`;
 	await makeZipFile(exportPath, exportFile);
diff --git a/server/lib/migrations.ts b/server/lib/migrations.ts
index f83db8d418dd..a7be121af9d8 100644
--- a/server/lib/migrations.ts
+++ b/server/lib/migrations.ts
@@ -135,7 +135,7 @@ function migrate(direction: 'up' | 'down', migration: IMigration): void {
 
 	log.startup(`Running ${ direction }() on version ${ migration.version }${ migration.name ? `(${ migration.name })` : '' }`);
 
-	migration[direction]?.(migration);
+	Promise.await(migration[direction]?.(migration));
 }
 
 
diff --git a/server/lib/pushConfig.js b/server/lib/pushConfig.ts
similarity index 83%
rename from server/lib/pushConfig.js
rename to server/lib/pushConfig.ts
index bb70e738c492..150617458b5f 100644
--- a/server/lib/pushConfig.js
+++ b/server/lib/pushConfig.ts
@@ -2,13 +2,13 @@ import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { getWorkspaceAccessToken } from '../../app/cloud/server';
-import { hasRole } from '../../app/authorization';
-import { settings } from '../../app/settings';
+import { hasRole } from '../../app/authorization/server';
+import { settings } from '../../app/settings/server';
 import { appTokensCollection, Push } from '../../app/push/server';
 
 
 Meteor.methods({
-	push_test() {
+	'push_test'() {
 		const user = Meteor.user();
 
 		if (!user) {
@@ -71,17 +71,25 @@ Meteor.methods({
 	},
 });
 
-function configurePush() {
-	if (!settings.get('Push_enable')) {
+settings.watch<boolean>('Push_enable', async function(enabled) {
+	if (!enabled) {
 		return;
 	}
-
 	const gateways = settings.get('Push_enable_gateway') && settings.get('Register_Server') && settings.get('Cloud_Service_Agree_PrivacyTerms')
-		? settings.get('Push_gateway').split('\n')
+		? settings.get<string>('Push_gateway').split('\n')
 		: undefined;
 
-	let apn;
-	let gcm;
+	let apn: {
+		apiKey?: string;
+		passphrase: string;
+		key: string;
+		cert: string;
+		gateway?: string;
+	} | undefined;
+	let gcm: {
+		apiKey: string;
+		projectNumber: string;
+	} | undefined;
 
 	if (!gateways) {
 		gcm = {
@@ -120,9 +128,7 @@ function configurePush() {
 		gateways,
 		uniqueId: settings.get('uniqueID'),
 		getAuthorization() {
-			return `Bearer ${ getWorkspaceAccessToken() }`;
+			return `Bearer ${ Promise.await(getWorkspaceAccessToken()) }`;
 		},
 	});
-}
-
-Meteor.startup(configurePush);
+});
diff --git a/server/lib/sendMessagesToAdmins.js b/server/lib/sendMessagesToAdmins.js
index 5eedbf14aeae..08af72647e96 100644
--- a/server/lib/sendMessagesToAdmins.js
+++ b/server/lib/sendMessagesToAdmins.js
@@ -1,47 +1,45 @@
+
 import { Meteor } from 'meteor/meteor';
 
 import { SystemLogger } from './logger/system';
-import { Roles, Users } from '../../app/models/server';
+import { Users } from '../../app/models/server';
+import { Roles } from '../../app/models/server/raw';
 
-export function sendMessagesToAdmins({
-	fromId = 'rocket.cat',
-	checkFrom = true,
-	msgs = [],
-	banners = [],
-}) {
-	const fromUser = checkFrom ? Users.findOneById(fromId, { fields: { _id: 1 } }) : true;
+export async function sendMessagesToAdmins(message) {
+	const fromUser = message.checkFrom ? Users.findOneById(message.fromId, { fields: { _id: 1 } }) : true;
+	const users = await Roles.findUsersInRole('admin');
 
-	Roles.findUsersInRole('admin').forEach((adminUser) => {
+	users.forEach((adminUser) => {
 		if (fromUser) {
 			try {
-				Meteor.runAsUser(fromId, () => Meteor.call('createDirectMessage', adminUser.username));
+				Meteor.runAsUser(message.fromId, () => Meteor.call('createDirectMessage', adminUser.username));
 
-				const rid = [adminUser._id, fromId].sort().join('');
+				const rid = [adminUser._id, message.fromId].sort().join('');
 
-				if (typeof msgs === 'function') {
-					msgs = msgs({ adminUser });
+				if (typeof message.msgs === 'function') {
+					message.msgs = message.msgs({ adminUser });
 				}
 
-				if (!Array.isArray(msgs)) {
-					msgs = [msgs];
+				if (!Array.isArray(message.msgs)) {
+					message.msgs = [message.msgs];
 				}
 
-				if (typeof banners === 'function') {
-					banners = banners({ adminUser });
+				if (typeof message.banners === 'function') {
+					message.banners = message.banners({ adminUser });
 				}
 
-				if (!Array.isArray(banners)) {
-					banners = Array.from(banners);
+				if (!Array.isArray(message.banners)) {
+					message.banners = [message.banners];
 				}
 
-				Meteor.runAsUser(fromId, () => {
-					msgs.forEach((msg) => Meteor.call('sendMessage', Object.assign({ rid }, msg)));
+				Meteor.runAsUser(message.fromId, () => {
+					message.msgs.forEach((msg) => Meteor.call('sendMessage', Object.assign({ rid }, msg)));
 				});
 			} catch (e) {
 				SystemLogger.error(e);
 			}
 		}
 
-		banners.forEach((banner) => Users.addBannerById(adminUser._id, banner));
+		message.banners.forEach((banner) => Users.addBannerById(adminUser._id, banner));
 	});
 }
diff --git a/server/methods/OEmbedCacheCleanup.js b/server/methods/OEmbedCacheCleanup.js
index 168cc4aba10b..d2a8d651467b 100644
--- a/server/methods/OEmbedCacheCleanup.js
+++ b/server/methods/OEmbedCacheCleanup.js
@@ -1,11 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 
-import { OEmbedCache } from '../../app/models';
+import { OEmbedCache } from '../../app/models/server/raw';
 import { settings } from '../../app/settings';
 import { hasRole } from '../../app/authorization';
 
 Meteor.methods({
-	OEmbedCacheCleanup() {
+	async OEmbedCacheCleanup() {
 		if (Meteor.userId() && !hasRole(Meteor.userId(), 'admin')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
 				method: 'OEmbedCacheCleanup',
@@ -15,7 +15,7 @@ Meteor.methods({
 		const date = new Date();
 		const expirationDays = settings.get('API_EmbedCacheExpirationDays');
 		date.setDate(date.getDate() - expirationDays);
-		OEmbedCache.removeAfterDate(date);
+		await OEmbedCache.removeAfterDate(date);
 		return {
 			message: 'cache_cleared',
 		};
diff --git a/server/methods/afterVerifyEmail.js b/server/methods/afterVerifyEmail.js
deleted file mode 100644
index 5e1d65004d5b..000000000000
--- a/server/methods/afterVerifyEmail.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import { Users, Roles } from '../../app/models';
-
-Meteor.methods({
-	afterVerifyEmail() {
-		const userId = Meteor.userId();
-
-		if (!userId) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
-				method: 'afterVerifyEmail',
-			});
-		}
-
-		const user = Users.findOneById(userId);
-		if (user && user.emails && Array.isArray(user.emails)) {
-			const verifiedEmail = user.emails.find((email) => email.verified);
-			const rolesToChangeTo = { anonymous: ['user'] };
-			const rolesThatNeedChanges = user.roles.filter((role) => rolesToChangeTo[role]);
-
-			if (rolesThatNeedChanges.length && verifiedEmail) {
-				rolesThatNeedChanges.forEach((role) => {
-					Roles.addUserRoles(user._id, rolesToChangeTo[role]);
-					Roles.removeUserRoles(user._id, role);
-				});
-			}
-		}
-	},
-});
diff --git a/server/methods/afterVerifyEmail.ts b/server/methods/afterVerifyEmail.ts
new file mode 100644
index 000000000000..6f6a621fc315
--- /dev/null
+++ b/server/methods/afterVerifyEmail.ts
@@ -0,0 +1,39 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Users } from '../../app/models/server';
+import { Roles } from '../../app/models/server/raw';
+import { IUser } from '../../definition/IUser';
+
+const rolesToChangeTo: Map<string, [string]> = new Map([
+	['anonymous', ['user']],
+]);
+
+Meteor.methods({
+	async afterVerifyEmail() {
+		const userId = Meteor.userId();
+
+		if (!userId) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+				method: 'afterVerifyEmail',
+			});
+		}
+
+		const user = Users.findOneById(userId) as IUser;
+		if (user && user.emails && Array.isArray(user.emails)) {
+			const verifiedEmail = user.emails.find((email) => email.verified);
+
+			const rolesThatNeedChanges = user.roles.filter((role) => rolesToChangeTo.has(role));
+
+
+			if (verifiedEmail) {
+				await Promise.all(rolesThatNeedChanges.map(async (role) => {
+					const rolesToAdd = rolesToChangeTo.get(role);
+					if (rolesToAdd) {
+						await Roles.addUserRoles(userId, rolesToAdd);
+					}
+					await Roles.removeUserRoles(user._id, [role]);
+				}));
+			}
+		}
+	},
+});
diff --git a/server/methods/browseChannels.js b/server/methods/browseChannels.js
index 03bb78922c7c..9fc942a1657b 100644
--- a/server/methods/browseChannels.js
+++ b/server/methods/browseChannels.js
@@ -145,7 +145,7 @@ const getTeams = (user, searchTerm, sort, pagination) => {
 	};
 };
 
-const getUsers = (user, text, workspace, sort, pagination) => {
+const getUsers = async (user, text, workspace, sort, pagination) => {
 	if (!user || !hasPermission(user._id, 'view-outside-room') || !hasPermission(user._id, 'view-d-room')) {
 		return;
 	}
@@ -183,7 +183,7 @@ const getUsers = (user, text, workspace, sort, pagination) => {
 
 	// Try to find federated users, when applicable
 	if (isFederationEnabled() && workspace === 'external' && text.indexOf('@') !== -1) {
-		const users = federationSearchUsers(text);
+		const users = await federationSearchUsers(text);
 
 		for (const user of users) {
 			if (results.find((e) => e._id === user._id)) { continue; }
@@ -208,7 +208,7 @@ const getUsers = (user, text, workspace, sort, pagination) => {
 };
 
 Meteor.methods({
-	browseChannels({ text = '', workspace = '', type = 'channels', sortBy = 'name', sortDirection = 'asc', page, offset, limit = 10 }) {
+	async browseChannels({ text = '', workspace = '', type = 'channels', sortBy = 'name', sortDirection = 'asc', page, offset, limit = 10 }) {
 		const searchTerm = s.trim(escapeRegExp(text));
 
 		if (!['channels', 'users', 'teams'].includes(type) || !['asc', 'desc'].includes(sortDirection) || ((!page && page !== 0) && (!offset && offset !== 0))) {
diff --git a/server/methods/createDirectMessage.js b/server/methods/createDirectMessage.js
index 151298a89c72..0a729ce72380 100644
--- a/server/methods/createDirectMessage.js
+++ b/server/methods/createDirectMessage.js
@@ -36,7 +36,7 @@ export function createDirectMessage(usernames, userId, excludeSelf = false) {
 
 		// If the username does have an `@`, but does not exist locally, we create it first
 		if (!to && username.indexOf('@') !== -1) {
-			to = addUser(username);
+			to = Promise.await(addUser(username));
 		}
 
 		if (!to) {
diff --git a/server/methods/deleteFileMessage.js b/server/methods/deleteFileMessage.js
index 18353d1a45c8..a35a407f9211 100644
--- a/server/methods/deleteFileMessage.js
+++ b/server/methods/deleteFileMessage.js
@@ -5,7 +5,7 @@ import { FileUpload } from '../../app/file-upload';
 import { Messages } from '../../app/models';
 
 Meteor.methods({
-	deleteFileMessage(fileID) {
+	async deleteFileMessage(fileID) {
 		check(fileID, String);
 
 		const msg = Messages.getMessageByFileId(fileID);
diff --git a/server/methods/deleteUser.js b/server/methods/deleteUser.js
index f47da58045e4..20ea77dd30b1 100644
--- a/server/methods/deleteUser.js
+++ b/server/methods/deleteUser.js
@@ -7,7 +7,7 @@ import { callbacks } from '../../app/callbacks/server';
 import { deleteUser } from '../../app/lib/server';
 
 Meteor.methods({
-	deleteUser(userId, confirmRelinquish = false) {
+	async deleteUser(userId, confirmRelinquish = false) {
 		check(userId, String);
 
 		if (!Meteor.userId()) {
@@ -46,7 +46,7 @@ Meteor.methods({
 			});
 		}
 
-		deleteUser(userId, confirmRelinquish);
+		await deleteUser(userId, confirmRelinquish);
 
 		callbacks.run('afterDeleteUser', user);
 
diff --git a/server/methods/registerUser.js b/server/methods/registerUser.js
index cef1d1b8398b..802f271efc40 100644
--- a/server/methods/registerUser.js
+++ b/server/methods/registerUser.js
@@ -9,7 +9,7 @@ import { validateEmailDomain, passwordPolicy } from '../../app/lib';
 import { validateInviteToken } from '../../app/invites/server/functions/validateInviteToken';
 
 Meteor.methods({
-	registerUser(formData) {
+	async registerUser(formData) {
 		const AllowAnonymousRead = settings.get('Accounts_AllowAnonymousRead');
 		const AllowAnonymousWrite = settings.get('Accounts_AllowAnonymousWrite');
 		const manuallyApproveNewUsers = settings.get('Accounts_ManuallyApproveNewUsers');
@@ -45,7 +45,7 @@ Meteor.methods({
 			}
 
 			try {
-				validateInviteToken(formData.secretURL);
+				await validateInviteToken(formData.secretURL);
 			} catch (e) {
 				throw new Meteor.Error('error-user-registration-secret', 'User registration is only allowed via Secret URL', { method: 'registerUser' });
 			}
diff --git a/server/methods/removeRoomOwner.js b/server/methods/removeRoomOwner.ts
similarity index 86%
rename from server/methods/removeRoomOwner.js
rename to server/methods/removeRoomOwner.ts
index 9ae598883c6b..adb33a7b29b5 100644
--- a/server/methods/removeRoomOwner.js
+++ b/server/methods/removeRoomOwner.ts
@@ -1,14 +1,14 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { hasPermission, getUsersInRole } from '../../app/authorization';
-import { Users, Subscriptions, Messages } from '../../app/models';
-import { settings } from '../../app/settings';
+import { hasPermission, getUsersInRole } from '../../app/authorization/server';
+import { Users, Subscriptions, Messages } from '../../app/models/server';
+import { settings } from '../../app/settings/server';
 import { api } from '../sdk/api';
 import { Team } from '../sdk';
 
 Meteor.methods({
-	removeRoomOwner(rid, userId) {
+	async removeRoomOwner(rid, userId) {
 		check(rid, String);
 		check(userId, String);
 
@@ -45,7 +45,7 @@ Meteor.methods({
 			});
 		}
 
-		const numOwners = getUsersInRole('owner', rid).count();
+		const numOwners = await (await getUsersInRole('owner', rid)).count();
 
 		if (numOwners === 1) {
 			throw new Meteor.Error('error-remove-last-owner', 'This is the last owner. Please set a new owner before removing this one.', {
@@ -65,9 +65,9 @@ Meteor.methods({
 			role: 'owner',
 		});
 
-		const team = Promise.await(Team.getOneByMainRoomId(rid));
+		const team = await Team.getOneByMainRoomId(rid);
 		if (team) {
-			Promise.await(Team.removeRolesFromMember(team._id, userId, ['owner']));
+			await Team.removeRolesFromMember(team._id, userId, ['owner']);
 		}
 
 		if (settings.get('UI_DisplayRoles')) {
diff --git a/server/methods/removeUserFromRoom.js b/server/methods/removeUserFromRoom.ts
similarity index 89%
rename from server/methods/removeUserFromRoom.js
rename to server/methods/removeUserFromRoom.ts
index 70576c73ced4..d4b8ac0f9a01 100644
--- a/server/methods/removeUserFromRoom.js
+++ b/server/methods/removeUserFromRoom.ts
@@ -1,14 +1,14 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
-import { hasPermission, hasRole, getUsersInRole, removeUserFromRoles } from '../../app/authorization';
-import { Users, Subscriptions, Rooms, Messages } from '../../app/models';
-import { callbacks } from '../../app/callbacks';
+import { hasPermission, hasRole, getUsersInRole, removeUserFromRoles } from '../../app/authorization/server';
+import { Users, Subscriptions, Rooms, Messages } from '../../app/models/server';
+import { callbacks } from '../../app/callbacks/server';
 import { roomTypes, RoomMemberActions } from '../../app/utils/server';
 import { Team } from '../sdk';
 
 Meteor.methods({
-	removeUserFromRoom(data) {
+	async removeUserFromRoom(data) {
 		check(data, Match.ObjectIncluding({
 			rid: String,
 			username: String,
@@ -48,7 +48,7 @@ Meteor.methods({
 		}
 
 		if (hasRole(removedUser._id, 'owner', room._id)) {
-			const numOwners = getUsersInRole('owner', room._id).fetch().length;
+			const numOwners = await (await getUsersInRole('owner', room._id)).count();
 
 			if (numOwners === 1) {
 				throw new Meteor.Error('error-you-are-last-owner', 'You are the last owner. Please set new owner before leaving the room.', {
@@ -74,7 +74,7 @@ Meteor.methods({
 
 		if (room.teamId && room.teamMain) {
 			// if a user is kicked from the main team room, delete the team membership
-			Promise.await(Team.removeMember(room.teamId, removedUser._id));
+			await Team.removeMember(room.teamId, removedUser._id);
 		}
 
 		Meteor.defer(function() {
diff --git a/server/methods/reportMessage.js b/server/methods/reportMessage.js
index 9ff33ef8426d..ea2f42daa1e5 100644
--- a/server/methods/reportMessage.js
+++ b/server/methods/reportMessage.js
@@ -1,10 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { Messages, Reports } from '../../app/models';
+import { Messages } from '../../app/models/server';
+import { Reports } from '../../app/models/server/raw';
 
 Meteor.methods({
-	reportMessage(messageId, description) {
+	async reportMessage(messageId, description) {
 		check(messageId, String);
 		check(description, String);
 
@@ -27,6 +28,8 @@ Meteor.methods({
 			});
 		}
 
-		return Reports.createWithMessageDescriptionAndUserId(message, description, Meteor.userId());
+		await Reports.createWithMessageDescriptionAndUserId(message, description, Meteor.userId());
+
+		return true;
 	},
 });
diff --git a/server/methods/requestDataDownload.js b/server/methods/requestDataDownload.js
index f388b4831bd0..a49654f4807a 100644
--- a/server/methods/requestDataDownload.js
+++ b/server/methods/requestDataDownload.js
@@ -4,8 +4,8 @@ import path from 'path';
 import mkdirp from 'mkdirp';
 import { Meteor } from 'meteor/meteor';
 
-import { ExportOperations, UserDataFiles } from '../../app/models';
-import { settings } from '../../app/settings';
+import { ExportOperations, UserDataFiles } from '../../app/models/server/raw';
+import { settings } from '../../app/settings/server';
 import { DataExport } from '../../app/user-data-download/server/DataExport';
 
 let tempFolder = '/tmp/userData';
@@ -16,13 +16,13 @@ if (settings.get('UserData_FileSystemPath') != null) {
 }
 
 Meteor.methods({
-	requestDataDownload({ fullExport = false }) {
+	async requestDataDownload({ fullExport = false }) {
 		const currentUserData = Meteor.user();
 		const userId = currentUserData._id;
 
-		const lastOperation = ExportOperations.findLastOperationByUser(userId, fullExport);
+		const lastOperation = await ExportOperations.findLastOperationByUser(userId, fullExport);
 		const requestDay = lastOperation ? lastOperation.createdAt : new Date();
-		const pendingOperationsBeforeMyRequestCount = ExportOperations.findAllPendingBeforeMyRequest(requestDay).count();
+		const pendingOperationsBeforeMyRequestCount = await ExportOperations.findAllPendingBeforeMyRequest(requestDay).count();
 
 		if (lastOperation) {
 			const yesterday = new Date();
@@ -30,7 +30,7 @@ Meteor.methods({
 
 			if (lastOperation.createdAt > yesterday) {
 				if (lastOperation.status === 'completed') {
-					const file = lastOperation.fileId ? UserDataFiles.findOneById(lastOperation.fileId) : UserDataFiles.findLastFileByUser(userId);
+					const file = lastOperation.fileId ? await UserDataFiles.findOneById(lastOperation.fileId) : await UserDataFiles.findLastFileByUser(userId);
 					if (file) {
 						return {
 							requested: false,
@@ -64,7 +64,7 @@ Meteor.methods({
 			userData: currentUserData,
 		};
 
-		const id = ExportOperations.create(exportOperation);
+		const id = await ExportOperations.create(exportOperation);
 		exportOperation._id = id;
 
 		const folderName = path.join(tempFolder, id);
@@ -81,7 +81,7 @@ Meteor.methods({
 		exportOperation.assetsPath = assetsFolder;
 		exportOperation.status = 'pending';
 
-		ExportOperations.updateOperation(exportOperation);
+		await ExportOperations.updateOperation(exportOperation);
 
 		return {
 			requested: true,
diff --git a/server/modules/watchers/watchers.module.ts b/server/modules/watchers/watchers.module.ts
index b95a6b535bad..9ba8b2ada991 100644
--- a/server/modules/watchers/watchers.module.ts
+++ b/server/modules/watchers/watchers.module.ts
@@ -364,13 +364,13 @@ export function initWatchers(models: IModelsParam, broadcast: BroadcastCallback,
 		}
 	});
 
-	watch<IIntegration>(Integrations, async ({ clientAction, id, data }) => {
+	watch<IIntegration>(Integrations, async ({ clientAction, id, data: eventData }) => {
 		if (clientAction === 'removed') {
 			broadcast('watch.integrations', { clientAction, id, data: { _id: id } });
 			return;
 		}
 
-		data = data ?? await Integrations.findOneById(id);
+		const data = eventData ?? await Integrations.findOneById(id);
 		if (!data) {
 			return;
 		}
diff --git a/server/publications/settings/index.js b/server/publications/settings/index.ts
similarity index 55%
rename from server/publications/settings/index.js
rename to server/publications/settings/index.ts
index 3e9db1beab85..2c54b6fc0eff 100644
--- a/server/publications/settings/index.js
+++ b/server/publications/settings/index.ts
@@ -1,19 +1,20 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Settings } from '../../../app/models/server';
 import { hasPermission, hasAtLeastOnePermission } from '../../../app/authorization/server';
 import { getSettingPermissionId } from '../../../app/authorization/lib';
 import { SettingsEvents } from '../../../app/settings/server';
+import { Settings } from '../../../app/models/server/raw';
+import { ISetting } from '../../../definition/ISetting';
 
 Meteor.methods({
-	'public-settings/get'(updatedAt) {
+	async 'public-settings/get'(updatedAt) {
 		if (updatedAt instanceof Date) {
-			const records = Settings.findNotHiddenPublicUpdatedAfter(updatedAt).fetch();
+			const records = await Settings.findNotHiddenPublicUpdatedAfter(updatedAt).toArray();
 			SettingsEvents.emit('fetch-settings', records);
 
 			return {
 				update: records,
-				remove: Settings.trashFindDeletedAfter(updatedAt, {
+				remove: await Settings.trashFindDeletedAfter(updatedAt, {
 					hidden: {
 						$ne: true,
 					},
@@ -23,16 +24,16 @@ Meteor.methods({
 						_id: 1,
 						_deletedAt: 1,
 					},
-				}).fetch(),
+				}).toArray(),
 			};
 		}
 
-		const publicSettings = Settings.findNotHiddenPublic().fetch();
+		const publicSettings = await Settings.findNotHiddenPublic().toArray() as ISetting[];
 		SettingsEvents.emit('fetch-settings', publicSettings);
 
 		return publicSettings;
 	},
-	'private-settings/get'(updatedAfter) {
+	async 'private-settings/get'(updatedAfter) {
 		const uid = Meteor.userId();
 
 		if (!uid) {
@@ -46,13 +47,13 @@ Meteor.methods({
 			return [];
 		}
 
-		const bypass = (settings) => settings;
+		const bypass = <T>(settings: T): T => settings;
 
-		const applyFilter = (fn, args) => fn(args);
+		const applyFilter = (fn: Function, args: any[]): any => fn(args);
 
-		const getAuthorizedSettingsFiltered = (settings) => settings.filter((record) => hasPermission(uid, getSettingPermissionId(record._id)));
+		const getAuthorizedSettingsFiltered = (settings: ISetting[]): ISetting[] => settings.filter((record) => hasPermission(uid, getSettingPermissionId(record._id)));
 
-		const getAuthorizedSettings = (updatedAfter, privilegedSetting) => applyFilter(privilegedSetting ? bypass : getAuthorizedSettingsFiltered, Settings.findNotHidden(updatedAfter && { updatedAfter }).fetch());
+		const getAuthorizedSettings = async (updatedAfter: Date, privilegedSetting: boolean): Promise<ISetting[]> => applyFilter(privilegedSetting ? bypass : getAuthorizedSettingsFiltered, await Settings.findNotHidden(updatedAfter && { updatedAfter }).toArray());
 
 		if (!(updatedAfter instanceof Date)) {
 			// this does not only imply an unfiltered setting range, it also identifies the caller's context:
@@ -62,8 +63,8 @@ Meteor.methods({
 		}
 
 		return {
-			update: getAuthorizedSettings(updatedAfter, privilegedSetting),
-			remove: Settings.trashFindDeletedAfter(updatedAfter, {
+			update: await getAuthorizedSettings(updatedAfter, privilegedSetting),
+			remove: await Settings.trashFindDeletedAfter(updatedAfter, {
 				hidden: {
 					$ne: true,
 				},
@@ -72,7 +73,7 @@ Meteor.methods({
 					_id: 1,
 					_deletedAt: 1,
 				},
-			}).fetch(),
+			}).toArray(),
 		};
 	},
 });
diff --git a/server/routes/avatar/room.js b/server/routes/avatar/room.js
index 7f359f31f79f..000395d74aa9 100644
--- a/server/routes/avatar/room.js
+++ b/server/routes/avatar/room.js
@@ -7,17 +7,18 @@ import {
 	setCacheAndDispositionHeaders,
 } from './utils';
 import { FileUpload } from '../../../app/file-upload';
-import { Rooms, Avatars } from '../../../app/models/server';
+import { Rooms } from '../../../app/models/server';
+import { Avatars } from '../../../app/models/server/raw';
 import { roomTypes } from '../../../app/utils';
 
 
-const getRoomAvatar = (roomId) => {
+const getRoomAvatar = async (roomId) => {
 	const room = Rooms.findOneById(roomId, { fields: { t: 1, prid: 1, name: 1, fname: 1 } });
 	if (!room) {
 		return {};
 	}
 
-	const file = Avatars.findOneByRoomId(room._id);
+	const file = await Avatars.findOneByRoomId(room._id);
 
 	// if it is a discussion that doesn't have it's own avatar, returns the parent's room avatar
 	if (room.prid && !file) {
@@ -27,10 +28,10 @@ const getRoomAvatar = (roomId) => {
 	return { room, file };
 };
 
-export const roomAvatar = Meteor.bindEnvironment(function(req, res/* , next*/) {
+export const roomAvatar = Meteor.bindEnvironment(async function(req, res/* , next*/) {
 	const roomId = decodeURIComponent(req.url.substr(1).replace(/\?.*$/, ''));
 
-	const { room, file } = getRoomAvatar(roomId);
+	const { room, file } = await getRoomAvatar(roomId);
 	if (!room) {
 		res.writeHead(404);
 		res.end();
diff --git a/server/routes/avatar/user.js b/server/routes/avatar/user.js
index ac93faca2563..2b93d20b4e7f 100644
--- a/server/routes/avatar/user.js
+++ b/server/routes/avatar/user.js
@@ -8,11 +8,12 @@ import {
 } from './utils';
 import { FileUpload } from '../../../app/file-upload';
 import { settings } from '../../../app/settings/server';
-import { Users, Avatars } from '../../../app/models/server';
+import { Users } from '../../../app/models/server';
+import { Avatars } from '../../../app/models/server/raw';
 
 
 // request /avatar/@name forces returning the svg
-export const userAvatar = Meteor.bindEnvironment(function(req, res) {
+export const userAvatar = Meteor.bindEnvironment(async function(req, res) {
 	const requestUsername = decodeURIComponent(req.url.substr(1).replace(/\?.*$/, ''));
 
 	if (!requestUsername) {
@@ -34,7 +35,7 @@ export const userAvatar = Meteor.bindEnvironment(function(req, res) {
 
 	const reqModifiedHeader = req.headers['if-modified-since'];
 
-	const file = Avatars.findOneByName(requestUsername);
+	const file = await Avatars.findOneByName(requestUsername);
 	if (file) {
 		res.setHeader('Content-Security-Policy', 'default-src \'none\'');
 
diff --git a/server/sdk/types/ITeamService.ts b/server/sdk/types/ITeamService.ts
index ad4a790ab6fe..50396cd20552 100644
--- a/server/sdk/types/ITeamService.ts
+++ b/server/sdk/types/ITeamService.ts
@@ -70,6 +70,7 @@ export interface ITeamService {
 	members(uid: string, teamId: string, canSeeAll: boolean, options?: IPaginationOptions, queryOptions?: FilterQuery<IUser>): Promise<IRecordsWithTotal<ITeamMemberInfo>>;
 	addMembers(uid: string, teamId: string, members: Array<ITeamMemberParams>): Promise<void>;
 	updateMember(teamId: string, members: ITeamMemberParams): Promise<void>;
+	removeMember(teamId: string, userId: string): Promise<void>;
 	removeMembers(uid: string, teamId: string, members: Array<ITeamMemberParams>): Promise<boolean>;
 	getInfoByName(teamName: string): Promise<Partial<ITeam> | null>;
 	getInfoById(teamId: string): Promise<Partial<ITeam> | null>;
@@ -90,4 +91,5 @@ export interface ITeamService {
 	insertMemberOnTeams(userId: string, teamIds: Array<string>): Promise<void>;
 	removeMemberFromTeams(userId: string, teamIds: Array<string>): Promise<void>;
 	removeAllMembersFromTeam(teamId: string): Promise<void>;
+	removeRolesFromMember(teamId: string, userId: string, roles: Array<string>): Promise<boolean>;
 }
diff --git a/server/services/analytics/service.ts b/server/services/analytics/service.ts
index b2d4b8dee9e0..ab69003a733e 100644
--- a/server/services/analytics/service.ts
+++ b/server/services/analytics/service.ts
@@ -1,8 +1,9 @@
-import { Db } from 'mongodb';
+import type { Db } from 'mongodb';
 
 import { ServiceClass } from '../../sdk/types/ServiceClass';
 import { IAnalyticsService } from '../../sdk/types/IAnalyticsService';
 import { AnalyticsRaw } from '../../../app/models/server/raw/Analytics';
+import { IAnalyticsSeatRequest } from '../../../definition/IAnalytic';
 
 export class AnalyticsService extends ServiceClass implements IAnalyticsService {
 	protected name = 'analytics';
@@ -19,8 +20,8 @@ export class AnalyticsService extends ServiceClass implements IAnalyticsService
 	}
 
 	async getSeatRequestCount(): Promise<number> {
-		const result = await this.Analytics.findOne({ type: 'seat-request' });
-		return result ? result.count : 0;
+		const result = await this.Analytics.findOne<IAnalyticsSeatRequest>({ type: 'seat-request' }, {});
+		return result?.count ? result.count : 0;
 	}
 
 	async resetSeatRequestCount(): Promise<void> {
diff --git a/server/services/authorization/service.ts b/server/services/authorization/service.ts
index f5c6b0a1fa43..728d5a49c591 100644
--- a/server/services/authorization/service.ts
+++ b/server/services/authorization/service.ts
@@ -45,9 +45,16 @@ export class Authorization extends ServiceClass implements IAuthorization {
 		this.Permissions = db.collection('rocketchat_permissions');
 
 		this.Users = new UsersRaw(db.collection('users'));
-		this.Roles = new RolesRaw(db.collection('rocketchat_roles'));
 
-		Subscriptions = new SubscriptionsRaw(db.collection('rocketchat_subscription'));
+		Subscriptions = new SubscriptionsRaw(db.collection('rocketchat_subscription'), {
+			Users: this.Users,
+		});
+
+		this.Roles = new RolesRaw(db.collection('rocketchat_roles'), {
+			Users: this.Users,
+			Subscriptions,
+		});
+
 		Settings = new SettingsRaw(db.collection('rocketchat_settings'));
 		Rooms = new RoomsRaw(db.collection('rocketchat_room'));
 		TeamMembers = new TeamMemberRaw(db.collection('rocketchat_team_member'));
@@ -98,7 +105,7 @@ export class Authorization extends ServiceClass implements IAuthorization {
 	}
 
 	private getPublicRoles = mem(async (): Promise<string[]> => {
-		const roles = await this.Roles.find<Pick<IRole, '_id'>>({ scope: 'Users', description: { $exists: 1, $ne: '' } }, { projection: { _id: 1 } }).toArray();
+		const roles = await this.Roles.find<Pick<IRole, '_id'>>({ scope: 'Users', description: { $exists: true, $ne: '' } }, { projection: { _id: 1 } }).toArray();
 
 		return roles.map(({ _id }) => _id);
 	}, { maxAge: 10000 });
diff --git a/server/services/nps/notification.ts b/server/services/nps/notification.ts
index 72dd87c80397..af4832781087 100644
--- a/server/services/nps/notification.ts
+++ b/server/services/nps/notification.ts
@@ -39,9 +39,9 @@ export const getBannerForAdmins = Meteor.bindEnvironment((expireAt: Date): Omit<
 });
 
 export const notifyAdmins = Meteor.bindEnvironment((expireAt: Date) => {
-	sendMessagesToAdmins({
+	Promise.await(sendMessagesToAdmins({
 		msgs: ({ adminUser }: { adminUser: any }): any => ({
 			msg: TAPi18n.__('NPS_survey_is_scheduled_to-run-at__date__for_all_users', { date: moment(expireAt).format('YYYY-MM-DD'), lng: adminUser.language }),
 		}),
-	});
+	}));
 });
diff --git a/server/services/team/service.ts b/server/services/team/service.ts
index 0bc5106439a7..d76e8bab32a9 100644
--- a/server/services/team/service.ts
+++ b/server/services/team/service.ts
@@ -59,10 +59,12 @@ export class TeamService extends ServiceClass implements ITeamService {
 		super();
 
 		this.RoomsModel = new RoomsRaw(db.collection('rocketchat_room'));
-		this.SubscriptionsModel = new SubscriptionsRaw(db.collection('rocketchat_subscription'));
+		this.Users = new UsersRaw(db.collection('users'));
+		this.SubscriptionsModel = new SubscriptionsRaw(db.collection('rocketchat_subscription'), {
+			Users: this.Users,
+		});
 		this.TeamModel = new TeamRaw(db.collection('rocketchat_team'));
 		this.TeamMembersModel = new TeamMemberRaw(db.collection('rocketchat_team_member'));
-		this.Users = new UsersRaw(db.collection('users'));
 		this.MessagesModel = new MessagesRaw(db.collection('rocketchat_message'));
 	}
 
diff --git a/server/startup/initialData.js b/server/startup/initialData.js
index 7db252c92b03..668426a7d3ca 100644
--- a/server/startup/initialData.js
+++ b/server/startup/initialData.js
@@ -1,15 +1,15 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
-import _ from 'underscore';
 
 import { RocketChatFile } from '../../app/file';
-import { FileUpload } from '../../app/file-upload';
-import { addUserRoles, getUsersInRole } from '../../app/authorization';
-import { Users, Settings, Rooms } from '../../app/models';
-import { settings } from '../../app/settings';
-import { checkUsernameAvailability, addUserToDefaultChannels } from '../../app/lib';
-
-Meteor.startup(function() {
+import { FileUpload } from '../../app/file-upload/server';
+import { addUserRoles, getUsersInRole } from '../../app/authorization/server';
+import { Users, Rooms } from '../../app/models/server';
+import { settings } from '../../app/settings/server';
+import { checkUsernameAvailability, addUserToDefaultChannels } from '../../app/lib/server';
+import { Settings } from '../../app/models/server/raw';
+
+Meteor.startup(async function() {
 	if (settings.get('Show_Setup_Wizard') === 'pending' && !Rooms.findOneById('GENERAL')) {
 		Rooms.createWithIdTypeAndName('GENERAL', 'c', 'general', {
 			default: true,
@@ -48,7 +48,7 @@ Meteor.startup(function() {
 	}
 
 	if (process.env.ADMIN_PASS) {
-		if (_.isEmpty(getUsersInRole('admin').fetch())) {
+		if (await (await getUsersInRole('admin')).count() === 0) {
 			console.log('Inserting admin user:'.green);
 			const adminUser = {
 				name: 'Administrator',
@@ -134,16 +134,16 @@ Meteor.startup(function() {
 		}
 	}
 
-	if (_.isEmpty(getUsersInRole('admin').fetch())) {
+	if (await (await getUsersInRole('admin')).count() === 0) {
 		const oldestUser = Users.getOldest({ _id: 1, username: 1, name: 1 });
 
 		if (oldestUser) {
-			addUserRoles(oldestUser._id, 'admin');
+			addUserRoles(oldestUser._id, ['admin']);
 			console.log(`No admins are found. Set ${ oldestUser.username || oldestUser.name } as admin for being the oldest user`);
 		}
 	}
 
-	if (!_.isEmpty(getUsersInRole('admin').fetch())) {
+	if (await (await getUsersInRole('admin')).count() !== 0) {
 		if (settings.get('Show_Setup_Wizard') === 'pending') {
 			console.log('Setting Setup Wizard to "in_progress" because, at least, one admin was found');
 			Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
@@ -189,7 +189,7 @@ Meteor.startup(function() {
 
 		Accounts.setPassword(adminUser._id, adminUser._id);
 
-		addUserRoles(adminUser._id, 'admin');
+		addUserRoles(adminUser._id, ['admin']);
 
 		if (settings.get('Show_Setup_Wizard') === 'pending') {
 			Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
diff --git a/server/startup/instance.js b/server/startup/instance.js
index 5dcebcb2be5b..c4aa1ebada0b 100644
--- a/server/startup/instance.js
+++ b/server/startup/instance.js
@@ -5,10 +5,6 @@ import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
 
 import { startStreamBroadcast } from '../stream/streamBroadcast';
 
-export function getInstances() {
-	InstanceStatus.find().fetch();
-}
-
 Meteor.startup(function() {
 	const instance = {
 		host: process.env.INSTANCE_IP ? String(process.env.INSTANCE_IP).trim() : 'localhost',
diff --git a/server/startup/migrations/v174.js b/server/startup/migrations/v174.ts
similarity index 53%
rename from server/startup/migrations/v174.js
rename to server/startup/migrations/v174.ts
index a03aeb430a15..f9b063903599 100644
--- a/server/startup/migrations/v174.js
+++ b/server/startup/migrations/v174.ts
@@ -1,5 +1,5 @@
+import { Permissions } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Permissions } from '../../../app/models/server';
 
 const appRolePermissions = [
 	'api-bypass-rate-limit',
@@ -18,9 +18,9 @@ const appRolePermissions = [
 addMigration({
 	version: 174,
 	up() {
-		Permissions.update({ _id: { $in: appRolePermissions } }, { $addToSet: { roles: 'app' } }, { multi: true });
+		return Permissions.update({ _id: { $in: appRolePermissions } }, { $addToSet: { roles: 'app' } }, { multi: true });
 	},
 	down() {
-		Permissions.update({ _id: { $in: appRolePermissions } }, { $pull: { roles: 'app' } }, { multi: true });
+		return Permissions.update({ _id: { $in: appRolePermissions } }, { $pull: { roles: 'app' } }, { multi: true });
 	},
 });
diff --git a/server/startup/migrations/v175.js b/server/startup/migrations/v175.js
index 0b12049c66d2..0d931a02e4c1 100644
--- a/server/startup/migrations/v175.js
+++ b/server/startup/migrations/v175.js
@@ -1,18 +1,17 @@
 import { addMigration } from '../../lib/migrations';
 import { theme } from '../../../app/theme/server/server';
-import { Settings } from '../../../app/models';
+import { Settings } from '../../../app/models/server/raw';
 
 addMigration({
 	version: 175,
 	up() {
-		Object.entries(theme.variables)
+		Promise.await(Promise.all(Object.entries(theme.variables)
 			.filter(([, value]) => value.type === 'color')
-			.forEach(([key, { editor }]) => {
-				Settings.update({ _id: `theme-color-${ key }` }, {
-					$set: {
-						packageEditor: editor,
-					},
-				});
-			});
+			.map(([key, { editor }]) => Settings.update({ _id: `theme-color-${ key }` }, {
+				$set: {
+					packageEditor: editor,
+				},
+			})),
+		));
 	},
 });
diff --git a/server/startup/migrations/v176.js b/server/startup/migrations/v176.js
deleted file mode 100644
index 4484febcb5a6..000000000000
--- a/server/startup/migrations/v176.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import {
-	Settings,
-} from '../../../app/models';
-
-
-addMigration({
-	version: 176,
-	up() {
-		Settings.remove({ _id: 'Livechat', type: 'group' });
-	},
-});
diff --git a/server/startup/migrations/v176.ts b/server/startup/migrations/v176.ts
new file mode 100644
index 000000000000..5dcbf7bc8980
--- /dev/null
+++ b/server/startup/migrations/v176.ts
@@ -0,0 +1,9 @@
+import { Settings } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 176,
+	up() {
+		return Settings.deleteOne({ _id: 'Livechat', type: 'group' });
+	},
+});
diff --git a/server/startup/migrations/v177.js b/server/startup/migrations/v177.ts
similarity index 72%
rename from server/startup/migrations/v177.js
rename to server/startup/migrations/v177.ts
index 3acca9065d7b..51b62d3c6bf2 100644
--- a/server/startup/migrations/v177.js
+++ b/server/startup/migrations/v177.ts
@@ -1,16 +1,18 @@
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
 
 addMigration({
 	version: 177,
 	up() {
 		// Disable auto opt in for existent installations
-		Settings.upsert({
+		Settings.update({
 			_id: 'Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In',
 		}, {
 			$set: {
 				value: false,
 			},
+		}, {
+			upsert: true,
 		});
 	},
 });
diff --git a/server/startup/migrations/v178.js b/server/startup/migrations/v178.js
deleted file mode 100644
index 2ee62cfd8166..000000000000
--- a/server/startup/migrations/v178.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import {
-	Settings,
-} from '../../../app/models';
-
-
-addMigration({
-	version: 178,
-	up() {
-		Settings.remove({ _id: 'Livechat_enable_inquiry_fetch_by_stream' });
-	},
-});
diff --git a/server/startup/migrations/v178.ts b/server/startup/migrations/v178.ts
new file mode 100644
index 000000000000..503c3d66d1cd
--- /dev/null
+++ b/server/startup/migrations/v178.ts
@@ -0,0 +1,9 @@
+import { Settings } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 178,
+	up() {
+		return Settings.removeById('Livechat_enable_inquiry_fetch_by_stream');
+	},
+});
diff --git a/server/startup/migrations/v182.js b/server/startup/migrations/v182.js
index fde3cc07062c..74a840c88a9a 100644
--- a/server/startup/migrations/v182.js
+++ b/server/startup/migrations/v182.js
@@ -1,9 +1,9 @@
 import { addMigration } from '../../lib/migrations';
-import { Analytics } from '../../../app/models/server';
+import { Analytics } from '../../../app/models/server/raw';
 
 addMigration({
 	version: 182,
 	up() {
-		Analytics.remove({});
+		Analytics.deleteMany({});
 	},
 });
diff --git a/server/startup/migrations/v183.js b/server/startup/migrations/v183.js
index e031f63f028c..525148b0f8a8 100644
--- a/server/startup/migrations/v183.js
+++ b/server/startup/migrations/v183.js
@@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 
 import { addMigration } from '../../lib/migrations';
-import { Rooms, Messages, Subscriptions, Uploads, Settings, Users } from '../../../app/models/server';
+import { Rooms, Messages, Subscriptions, Users } from '../../../app/models/server';
+import { Settings, Uploads } from '../../../app/models/server/raw';
 
 const unifyRooms = (room) => {
 	// verify if other DM already exists
@@ -59,8 +60,8 @@ const fixSelfDMs = () => {
 		}, { multi: true });
 
 		// Fix error of upload permission check using Meteor.userId()
-		Meteor.runAsUser(room.uids[0], () => {
-			Uploads.update({ rid: room._id }, {
+		Meteor.runAsUser(room.uids[0], async () => {
+			await Uploads.update({ rid: room._id }, {
 				$set: {
 					rid: correctId,
 				},
@@ -90,11 +91,11 @@ const fixDiscussions = () => {
 	});
 };
 
-const fixUserSearch = () => {
-	const setting = Settings.findOneById('Accounts_SearchFields', { fields: { value: 1 } });
+const fixUserSearch = async () => {
+	const setting = await Settings.findOneById('Accounts_SearchFields', { projection: { value: 1 } });
 	const value = setting?.value?.trim();
 	if (value === '' || value === 'username, name') {
-		Settings.updateValueById('Accounts_SearchFields', 'username, name, bio');
+		await Settings.updateValueById('Accounts_SearchFields', 'username, name, bio');
 	}
 
 	Users.tryDropIndex('name_text_username_text_bio_text');
@@ -105,6 +106,6 @@ addMigration({
 	up() {
 		fixDiscussions();
 		fixSelfDMs();
-		fixUserSearch();
+		return fixUserSearch();
 	},
 });
diff --git a/server/startup/migrations/v184.js b/server/startup/migrations/v184.ts
similarity index 71%
rename from server/startup/migrations/v184.js
rename to server/startup/migrations/v184.ts
index 84112ae971a9..4542313f029f 100644
--- a/server/startup/migrations/v184.js
+++ b/server/startup/migrations/v184.ts
@@ -1,16 +1,18 @@
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
 
 addMigration({
 	version: 184,
 	up() {
 		// Set SAML signature validation type to 'Either'
-		Settings.upsert({
+		Settings.update({
 			_id: 'SAML_Custom_Default_signature_validation_type',
 		}, {
 			$set: {
 				value: 'Either',
 			},
+		}, {
+			upsert: true,
 		});
 	},
 });
diff --git a/server/startup/migrations/v185.js b/server/startup/migrations/v185.js
deleted file mode 100644
index de080b1ebab4..000000000000
--- a/server/startup/migrations/v185.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import {
-	Settings,
-} from '../../../app/models/server';
-
-addMigration({
-	version: 185,
-	up() {
-		const setting = Settings.findOne({ _id: 'Message_SetNameToAliasEnabled' });
-		if (setting && setting.value) {
-			Settings.update({ _id: 'UI_Use_Real_Name' }, {
-				$set: {
-					value: true,
-				},
-			});
-		}
-		Settings.remove({ _id: 'Message_SetNameToAliasEnabled' });
-	},
-});
diff --git a/server/startup/migrations/v185.ts b/server/startup/migrations/v185.ts
new file mode 100644
index 000000000000..c9d79130aea8
--- /dev/null
+++ b/server/startup/migrations/v185.ts
@@ -0,0 +1,18 @@
+import { Settings } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+
+addMigration({
+	version: 185,
+	async up() {
+		const setting = await Settings.findOne({ _id: 'Message_SetNameToAliasEnabled' });
+		if (setting && setting.value) {
+			await Settings.update({ _id: 'UI_Use_Real_Name' }, {
+				$set: {
+					value: true,
+				},
+			});
+		}
+		return Settings.removeById('Message_SetNameToAliasEnabled');
+	},
+});
diff --git a/server/startup/migrations/v187.js b/server/startup/migrations/v187.js
index 349e4142dd54..f3f958a248dc 100644
--- a/server/startup/migrations/v187.js
+++ b/server/startup/migrations/v187.js
@@ -1,8 +1,7 @@
 import { Mongo } from 'meteor/mongo';
 
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
-import { NotificationQueue } from '../../../app/models/server/raw';
+import { NotificationQueue, Settings } from '../../../app/models/server/raw';
 
 function convertNotification(notification) {
 	try {
@@ -55,14 +54,14 @@ async function migrateNotifications() {
 
 addMigration({
 	version: 187,
-	up() {
-		Settings.remove({ _id: 'Push_send_interval' });
-		Settings.remove({ _id: 'Push_send_batch_size' });
-		Settings.remove({ _id: 'Push_debug' });
-		Settings.remove({ _id: 'Notifications_Always_Notify_Mobile' });
+	async up() {
+		await Settings.removeById('Push_send_interval');
+		await Settings.removeById('Push_send_batch_size');
+		await Settings.removeById('Push_debug');
+		await Settings.removeById('Notifications_Always_Notify_Mobile');
 
 		try {
-			Promise.await(migrateNotifications());
+			await migrateNotifications();
 		} catch (err) {
 			// Ignore if the collection does not exist
 			if (!err.code || err.code !== 26) {
diff --git a/server/startup/migrations/v188.js b/server/startup/migrations/v188.ts
similarity index 51%
rename from server/startup/migrations/v188.js
rename to server/startup/migrations/v188.ts
index b63ca803a96e..50bc75990d03 100644
--- a/server/startup/migrations/v188.js
+++ b/server/startup/migrations/v188.ts
@@ -1,5 +1,6 @@
+import { Permissions } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Permissions } from '../../../app/models/server';
+
 
 const newRolePermissions = [
 	'view-d-room',
@@ -11,6 +12,6 @@ const roleName = 'guest';
 addMigration({
 	version: 188,
 	up() {
-		Permissions.update({ _id: { $in: newRolePermissions } }, { $addToSet: { roles: roleName } }, { multi: true });
+		return Permissions.update({ _id: { $in: newRolePermissions } }, { $addToSet: { roles: roleName } }, { multi: true });
 	},
 });
diff --git a/server/startup/migrations/v189.js b/server/startup/migrations/v189.js
deleted file mode 100644
index 9e90f77531d2..000000000000
--- a/server/startup/migrations/v189.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
-
-addMigration({
-	version: 189,
-	up() {
-		Settings.remove({ _id: 'Livechat_Knowledge_Enabled' });
-		Settings.remove({ _id: 'Livechat_Knowledge_Apiai_Key' });
-		Settings.remove({ _id: 'Livechat_Knowledge_Apiai_Language' });
-	},
-});
diff --git a/server/startup/migrations/v189.ts b/server/startup/migrations/v189.ts
new file mode 100644
index 000000000000..310bad4bc224
--- /dev/null
+++ b/server/startup/migrations/v189.ts
@@ -0,0 +1,11 @@
+import { Settings } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 189,
+	async up() {
+		await Settings.removeById('Livechat_Knowledge_Enabled');
+		await Settings.removeById('Livechat_Knowledge_Apiai_Key');
+		await Settings.removeById('Livechat_Knowledge_Apiai_Language');
+	},
+});
diff --git a/server/startup/migrations/v190.js b/server/startup/migrations/v190.js
index a49a8e348283..52e07bc9ab62 100644
--- a/server/startup/migrations/v190.js
+++ b/server/startup/migrations/v190.js
@@ -5,7 +5,7 @@ addMigration({
 	version: 190,
 	up() {
 		// Remove unused settings
-		Promise.await(Settings.col.deleteOne({ _id: 'Accounts_Default_User_Preferences_desktopNotificationDuration' }));
+		Promise.await(Settings.removeById('Accounts_Default_User_Preferences_desktopNotificationDuration'));
 		Promise.await(Subscriptions.col.updateMany({
 			desktopNotificationDuration: {
 				$exists: true,
diff --git a/server/startup/migrations/v191.js b/server/startup/migrations/v191.js
deleted file mode 100644
index b2d7ed2b81df..000000000000
--- a/server/startup/migrations/v191.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
-
-addMigration({
-	version: 191,
-	up() {
-		Settings.remove({ _id: /theme-color-status/ }, { multi: true });
-	},
-});
diff --git a/server/startup/migrations/v191.ts b/server/startup/migrations/v191.ts
new file mode 100644
index 000000000000..f30c1699899f
--- /dev/null
+++ b/server/startup/migrations/v191.ts
@@ -0,0 +1,9 @@
+import { Settings } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 191,
+	async up() {
+		return Settings.deleteMany({ _id: /theme-color-status/ });
+	},
+});
diff --git a/server/startup/migrations/v194.js b/server/startup/migrations/v194.js
index 3129b37e5068..d7e20745beb8 100644
--- a/server/startup/migrations/v194.js
+++ b/server/startup/migrations/v194.js
@@ -1,12 +1,12 @@
 import {
-	Settings,
 	Users,
 } from '../../../app/models/server';
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
 
-function updateFieldMap() {
+async function updateFieldMap() {
 	const _id = 'SAML_Custom_Default_user_data_fieldmap';
-	const setting = Settings.findOne({ _id });
+	const setting = await Settings.findOne({ _id });
 	if (!setting || !setting.value) {
 		return;
 	}
@@ -19,7 +19,7 @@ function updateFieldMap() {
 	if (setting.value === '{"username":"username", "email":"email", "cn": "name"}') {
 		// include de eppn identifier if it was used
 		const value = `{"username":"username", "email":"email", "name": "cn"${ usedEppn ? ', "__identifier__": "eppn"' : '' }}`;
-		Settings.update({ _id }, {
+		await Settings.update({ _id }, {
 			$set: {
 				value,
 			},
@@ -90,7 +90,7 @@ function updateIdentifierLocation() {
 
 function setOldLogoutResponseTemplate() {
 	// For existing users, use a template compatible with the old SAML implementation instead of the default
-	Settings.upsert({
+	return Settings.update({
 		_id: 'SAML_Custom_Default_LogoutResponse_template',
 	}, {
 		$set: {
@@ -99,14 +99,16 @@ function setOldLogoutResponseTemplate() {
   <samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/>
 </samlp:LogoutResponse>`,
 		},
+	}, {
+		upsert: true,
 	});
 }
 
 addMigration({
 	version: 194,
-	up() {
-		updateFieldMap();
-		updateIdentifierLocation();
-		setOldLogoutResponseTemplate();
+	async up() {
+		await updateFieldMap();
+		await updateIdentifierLocation();
+		await setOldLogoutResponseTemplate();
 	},
 });
diff --git a/server/startup/migrations/v195.js b/server/startup/migrations/v195.ts
similarity index 61%
rename from server/startup/migrations/v195.js
rename to server/startup/migrations/v195.ts
index 5334f31bb2aa..89221f519bb4 100644
--- a/server/startup/migrations/v195.js
+++ b/server/startup/migrations/v195.ts
@@ -1,16 +1,14 @@
 import moment from 'moment-timezone';
-import { ObjectId } from 'mongodb';
 import { Mongo } from 'meteor/mongo';
 
 import { addMigration } from '../../lib/migrations';
-import { Permissions, Settings } from '../../../app/models/server';
-import { LivechatBusinessHours } from '../../../app/models/server/raw';
-import { LivechatBusinessHourTypes } from '../../../definition/ILivechatBusinessHour';
+import { LivechatBusinessHours, Permissions, Settings } from '../../../app/models/server/raw';
+import { ILivechatBusinessHour, IBusinessHourWorkHour, LivechatBusinessHourTypes } from '../../../definition/ILivechatBusinessHour';
 
-const migrateCollection = () => {
-	const LivechatOfficeHour = new Mongo.Collection('rocketchat_livechat_office_hour');
+const migrateCollection = async (): Promise<void> => {
+	const LivechatOfficeHour = new Mongo.Collection<IBusinessHourWorkHour>('rocketchat_livechat_office_hour');
 	const days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
-	const officeHours = [];
+	const officeHours: IBusinessHourWorkHour[] = [];
 	days.forEach((day) => {
 		const officeHour = LivechatOfficeHour.findOne({ day });
 		if (officeHour) {
@@ -22,15 +20,15 @@ const migrateCollection = () => {
 		return;
 	}
 
-	const businessHour = {
+	const businessHour: Omit<ILivechatBusinessHour, '_id'> = {
 		name: '',
 		active: true,
 		type: LivechatBusinessHourTypes.DEFAULT,
 		ts: new Date(),
-		workHours: officeHours.map((officeHour) => ({
+		workHours: officeHours.map((officeHour): IBusinessHourWorkHour => ({
 			day: officeHour.day,
 			start: {
-				time: officeHour.start,
+				time: officeHour.start as any,
 				utc: {
 					dayOfWeek: moment(`${ officeHour.day }:${ officeHour.start }`, 'dddd:HH:mm').utc().format('dddd'),
 					time: moment(`${ officeHour.day }:${ officeHour.start }`, 'dddd:HH:mm').utc().format('HH:mm'),
@@ -41,7 +39,7 @@ const migrateCollection = () => {
 				},
 			},
 			finish: {
-				time: officeHour.finish,
+				time: officeHour.finish as any,
 				utc: {
 					dayOfWeek: moment(`${ officeHour.day }:${ officeHour.finish }`, 'dddd:HH:mm').utc().format('dddd'),
 					time: moment(`${ officeHour.day }:${ officeHour.finish }`, 'dddd:HH:mm').utc().format('HH:mm'),
@@ -56,11 +54,10 @@ const migrateCollection = () => {
 		})),
 		timezone: {
 			name: moment.tz.guess(),
-			utc: moment().utcOffset() / 60,
+			utc: String(moment().utcOffset() / 60),
 		},
 	};
-	if (LivechatBusinessHours.find({ type: LivechatBusinessHourTypes.DEFAULT }).count() === 0) {
-		businessHour._id = new ObjectId().toHexString();
+	if (await LivechatBusinessHours.find({ type: LivechatBusinessHourTypes.DEFAULT }).count() === 0) {
 		LivechatBusinessHours.insertOne(businessHour);
 	} else {
 		LivechatBusinessHours.update({ type: LivechatBusinessHourTypes.DEFAULT }, { $set: { ...businessHour } });
@@ -77,14 +74,14 @@ const migrateCollection = () => {
 
 addMigration({
 	version: 195,
-	up() {
-		Settings.remove({ _id: 'Livechat_enable_office_hours' });
-		Settings.remove({ _id: 'Livechat_allow_online_agents_outside_office_hours' });
-		const permission = Permissions.findOneById('view-livechat-officeHours');
+	async up() {
+		await Settings.removeById('Livechat_enable_office_hours');
+		await Settings.removeById('Livechat_allow_online_agents_outside_office_hours');
+		const permission = await Permissions.findOneById('view-livechat-officeHours');
 		if (permission) {
-			Permissions.upsert({ _id: 'view-livechat-business-hours' }, { $set: { roles: permission.roles } });
-			Permissions.remove({ _id: 'view-livechat-officeHours' });
+			await Permissions.update({ _id: 'view-livechat-business-hours' }, { $set: { roles: permission.roles } }, { upsert: true });
+			await Permissions.deleteOne({ _id: 'view-livechat-officeHours' });
 		}
-		Promise.await(migrateCollection());
+		await migrateCollection();
 	},
 });
diff --git a/server/startup/migrations/v198.js b/server/startup/migrations/v198.ts
similarity index 54%
rename from server/startup/migrations/v198.js
rename to server/startup/migrations/v198.ts
index e2e2bf16fdb5..1a979fe3e948 100644
--- a/server/startup/migrations/v198.js
+++ b/server/startup/migrations/v198.ts
@@ -1,44 +1,50 @@
-import { Settings } from '../../../app/models/server';
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
 
 addMigration({
 	version: 198,
-	up: () => {
-		const discussion = Settings.findOneById('RetentionPolicy_DoNotExcludeDiscussion');
-		const thread = Settings.findOneById('RetentionPolicy_DoNotExcludeThreads');
-		const pinned = Settings.findOneById('RetentionPolicy_ExcludePinned');
+	up: async () => {
+		const discussion = await Settings.findOneById('RetentionPolicy_DoNotExcludeDiscussion');
+		const thread = await Settings.findOneById('RetentionPolicy_DoNotExcludeThreads');
+		const pinned = await Settings.findOneById('RetentionPolicy_ExcludePinned');
 
 		if (discussion) {
-			Settings.upsert({
+			await Settings.update({
 				_id: 'RetentionPolicy_DoNotPruneDiscussion',
 			}, {
 				$set: {
 					value: discussion.value,
 				},
+			}, {
+				upsert: true,
 			});
 		}
 
 		if (thread) {
-			Settings.upsert({
+			await Settings.update({
 				_id: 'RetentionPolicy_DoNotPruneThreads',
 			}, {
 				$set: {
 					value: thread.value,
 				},
+			}, {
+				upsert: true,
 			});
 		}
 
 		if (pinned) {
-			Settings.upsert({
+			await Settings.update({
 				_id: 'RetentionPolicy_DoNotPrunePinned',
 			}, {
 				$set: {
 					value: pinned.value,
 				},
+			}, {
+				upsert: true,
 			});
 		}
 
-		Settings.remove({
+		return Settings.deleteMany({
 			_id: { $in: ['RetentionPolicy_DoNotExcludeDiscussion', 'RetentionPolicy_DoNotExcludeThreads', 'RetentionPolicy_ExcludePinned'] },
 		});
 	},
diff --git a/server/startup/migrations/v201.js b/server/startup/migrations/v201.js
index 0fb5ae254412..0a74087cf773 100644
--- a/server/startup/migrations/v201.js
+++ b/server/startup/migrations/v201.js
@@ -1,17 +1,17 @@
 import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
-import { Settings } from '../../../app/models/server';
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
 import { sendMessagesToAdmins } from '../../lib/sendMessagesToAdmins';
 
 addMigration({
 	version: 201,
-	up: () => {
-		const pushEnabled = Settings.findOneById('Push_enable');
-		const pushGatewayEnabled = Settings.findOneById('Push_enable_gateway');
-		const registerServer = Settings.findOneById('Register_Server');
-		const cloudAgreement = Settings.findOneById('Cloud_Service_Agree_PrivacyTerms');
+	up: async () => {
+		const pushEnabled = await Settings.findOneById('Push_enable');
+		const pushGatewayEnabled = await Settings.findOneById('Push_enable_gateway');
+		const registerServer = await Settings.findOneById('Register_Server');
+		const cloudAgreement = await Settings.findOneById('Cloud_Service_Agree_PrivacyTerms');
 
 		if (!pushEnabled?.value) {
 			return;
@@ -24,12 +24,14 @@ addMigration({
 		}
 
 		// if push gateway is enabled but server is not registered or cloud terms not agreed, disable gateway and alert admin
-		Settings.upsert({
+		Settings.update({
 			_id: 'Push_enable_gateway',
 		}, {
 			$set: {
 				value: false,
 			},
+		}, {
+			update: true,
 		});
 
 		const id = 'push-gateway-disabled';
diff --git a/server/startup/migrations/v202.js b/server/startup/migrations/v202.js
index 02362a2d165e..7cb0e457f2cf 100644
--- a/server/startup/migrations/v202.js
+++ b/server/startup/migrations/v202.js
@@ -1,15 +1,15 @@
 import { addMigration } from '../../lib/migrations';
-import Uploads from '../../../app/models/server/models/Uploads';
+import { Uploads } from '../../../app/models/server/raw';
 
 addMigration({
 	version: 202,
-	up() {
-		Promise.await(Uploads.model.rawCollection().updateMany({
+	async up() {
+		await Uploads.updateMany({
 			type: 'audio/mp3',
 		}, {
 			$set: {
 				type: 'audio/mpeg',
 			},
-		}));
+		});
 	},
 });
diff --git a/server/startup/migrations/v203.js b/server/startup/migrations/v203.js
deleted file mode 100644
index ed70284f278d..000000000000
--- a/server/startup/migrations/v203.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Avatars } from '../../../app/models/server';
-
-addMigration({
-	version: 203,
-	up() {
-		Avatars.tryDropIndex({ name: 1 });
-		Avatars.tryEnsureIndex({ name: 1 }, { sparse: true });
-	},
-});
diff --git a/server/startup/migrations/v203.ts b/server/startup/migrations/v203.ts
new file mode 100644
index 000000000000..d5594ece72bb
--- /dev/null
+++ b/server/startup/migrations/v203.ts
@@ -0,0 +1,10 @@
+import { addMigration } from '../../lib/migrations';
+import { Avatars } from '../../../app/models/server/raw';
+
+addMigration({
+	version: 203,
+	async up() {
+		await Avatars.col.dropIndex('name_1');
+		await Avatars.col.createIndex({ name: 1 }, { sparse: true });
+	},
+});
diff --git a/server/startup/migrations/v205.js b/server/startup/migrations/v205.js
index 061075e17ece..2feed878dcbc 100644
--- a/server/startup/migrations/v205.js
+++ b/server/startup/migrations/v205.js
@@ -1,16 +1,18 @@
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
 
 addMigration({
 	version: 205,
 	up() {
 		// Disable this new enforcement setting for existent installations.
-		Settings.upsert({
+		Settings.update({
 			_id: 'Accounts_TwoFactorAuthentication_Enforce_Password_Fallback',
 		}, {
 			$set: {
 				value: false,
 			},
+		}, {
+			upsert: true,
 		});
 	},
 });
diff --git a/server/startup/migrations/v207.js b/server/startup/migrations/v207.js
deleted file mode 100644
index 556f66394632..000000000000
--- a/server/startup/migrations/v207.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models';
-
-addMigration({
-	version: 207,
-	up() {
-		Settings.removeById('theme-color-tertiary-background-color');
-	},
-});
diff --git a/server/startup/migrations/v207.ts b/server/startup/migrations/v207.ts
new file mode 100644
index 000000000000..cac3bd875c1c
--- /dev/null
+++ b/server/startup/migrations/v207.ts
@@ -0,0 +1,10 @@
+import { Settings } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+
+addMigration({
+	version: 207,
+	up() {
+		return Settings.removeById('theme-color-tertiary-background-color');
+	},
+});
diff --git a/server/startup/migrations/v208.js b/server/startup/migrations/v208.js
index 9a604c6e4a88..ced4c5f2d5b3 100644
--- a/server/startup/migrations/v208.js
+++ b/server/startup/migrations/v208.js
@@ -1,41 +1,31 @@
-import Future from 'fibers/future';
-
 import { addMigration } from '../../lib/migrations';
 import { Users, Sessions } from '../../../app/models/server/raw';
 
-async function migrateSessions(fut) {
+async function migrateSessions() {
 	const cursor = Users.find({ roles: 'anonymous' }, { projection: { _id: 1 } });
 	if (!cursor) {
 		return;
 	}
 
-
 	const users = await cursor.toArray();
 	if (users.length === 0) {
-		fut.return();
 		return;
 	}
 
 	const userIds = users.map(({ _id }) => _id);
 
-	Sessions.update({
+	await Sessions.updateMany({
 		userId: { $in: userIds },
 	}, {
 		$set: {
 			roles: ['anonymous'],
 		},
-	}, {
-		multi: true,
 	});
-
-	fut.return();
 }
 
 addMigration({
 	version: 208,
 	up() {
-		const fut = new Future();
-		migrateSessions(fut);
-		fut.wait();
+		Promise.await(migrateSessions());
 	},
 });
diff --git a/server/startup/migrations/v214.js b/server/startup/migrations/v214.js
deleted file mode 100644
index 787b8acbeb74..000000000000
--- a/server/startup/migrations/v214.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Permissions } from '../../../app/models/server';
-
-const roleName = 'admin';
-
-addMigration({
-	version: 214,
-	up() {
-		Permissions.update({ _id: 'toggle-room-e2e-encryption' }, { $addToSet: { roles: roleName } });
-	},
-});
diff --git a/server/startup/migrations/v214.ts b/server/startup/migrations/v214.ts
new file mode 100644
index 000000000000..ec0b5491e433
--- /dev/null
+++ b/server/startup/migrations/v214.ts
@@ -0,0 +1,12 @@
+import { Permissions } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+
+const roleName = 'admin';
+
+addMigration({
+	version: 214,
+	up() {
+		return Permissions.update({ _id: 'toggle-room-e2e-encryption' }, { $addToSet: { roles: roleName } });
+	},
+});
diff --git a/server/startup/migrations/v215.js b/server/startup/migrations/v215.ts
similarity index 52%
rename from server/startup/migrations/v215.js
rename to server/startup/migrations/v215.ts
index e3d71a070a72..bd6f08358254 100644
--- a/server/startup/migrations/v215.js
+++ b/server/startup/migrations/v215.ts
@@ -1,14 +1,14 @@
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
 
 const removed = ['advocacy', 'industry', 'publicRelations', 'healthcarePharmaceutical', 'helpCenter'];
 
 addMigration({
 	version: 215,
-	up() {
-		const current = Settings.findOneById('Industry');
-		if (removed.includes(current.value)) {
-			Settings.update({
+	async up() {
+		const current = await Settings.findOneById('Industry');
+		if (current && typeof current.value === 'string' && removed.includes(current.value)) {
+			await Settings.update({
 				_id: 'Industry',
 			}, {
 				$set: {
diff --git a/server/startup/migrations/v216.js b/server/startup/migrations/v216.js
index d004e5a32c7e..4a3225d6b251 100644
--- a/server/startup/migrations/v216.js
+++ b/server/startup/migrations/v216.js
@@ -1,42 +1,43 @@
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models';
 
 addMigration({
 	version: 216,
-	up() {
-		Settings.find({ _id: /Accounts_OAuth_Custom/, i18nLabel: 'Accounts_OAuth_Custom_Enable' }).forEach(function(customOauth) {
+	async up() {
+		return Promise.all((await Settings.find({ _id: /Accounts_OAuth_Custom/, i18nLabel: 'Accounts_OAuth_Custom_Enable' }).toArray()).map(async function(customOauth) {
 			const parts = customOauth._id.split('-');
 			const name = parts[1];
 			const id = `Accounts_OAuth_Custom-${ name }-key_field`;
-			if (!Settings.findOne({ _id: id })) {
-				Settings.insert({
-					_id: id,
-					type: 'select',
-					group: 'OAuth',
-					section: `Custom OAuth: ${ name }`,
-					i18nLabel: 'Accounts_OAuth_Custom_Key_Field',
-					persistent: true,
-					values: [
-						{
-							key: 'username',
-							i18nLabel: 'Username',
-						},
-						{
-							key: 'email',
-							i18nLabel: 'Email',
-						},
-					],
-					packageValue: 'username',
-					valueSource: 'packageValue',
-					ts: new Date(),
-					hidden: false,
-					blocked: false,
-					sorter: 103,
-					i18nDescription: `Accounts_OAuth_Custom-${ name }-key_field_Description`,
-					createdAt: new Date(),
-					value: 'username',
-				});
+			if (await Settings.findOne({ _id: id })) {
+				return;
 			}
-		});
+			return Settings.insert({
+				_id: id,
+				type: 'select',
+				group: 'OAuth',
+				section: `Custom OAuth: ${ name }`,
+				i18nLabel: 'Accounts_OAuth_Custom_Key_Field',
+				persistent: true,
+				values: [
+					{
+						key: 'username',
+						i18nLabel: 'Username',
+					},
+					{
+						key: 'email',
+						i18nLabel: 'Email',
+					},
+				],
+				packageValue: 'username',
+				valueSource: 'packageValue',
+				ts: new Date(),
+				hidden: false,
+				blocked: false,
+				sorter: 103,
+				i18nDescription: `Accounts_OAuth_Custom-${ name }-key_field_Description`,
+				createdAt: new Date(),
+				value: 'username',
+			});
+		}));
 	},
 });
diff --git a/server/startup/migrations/v217.js b/server/startup/migrations/v217.js
deleted file mode 100644
index 3c82aeb5931c..000000000000
--- a/server/startup/migrations/v217.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Permissions } from '../../../app/models';
-
-addMigration({
-	version: 217,
-	up() {
-		const oldPermission = Permissions.findOne('view-livechat-queue');
-		if (oldPermission) {
-			Permissions.update({ _id: 'view-livechat-queue' }, { $addToSet: { roles: 'livechat-agent' } });
-		}
-	},
-});
diff --git a/server/startup/migrations/v217.ts b/server/startup/migrations/v217.ts
new file mode 100644
index 000000000000..3ca79fccc2d5
--- /dev/null
+++ b/server/startup/migrations/v217.ts
@@ -0,0 +1,13 @@
+import { Permissions } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+
+addMigration({
+	version: 217,
+	async up() {
+		const oldPermission = await Permissions.findOne('view-livechat-queue');
+		if (oldPermission) {
+			return Permissions.update({ _id: 'view-livechat-queue' }, { $addToSet: { roles: 'livechat-agent' } });
+		}
+	},
+});
diff --git a/server/startup/migrations/v218.js b/server/startup/migrations/v218.js
deleted file mode 100644
index 01b2668a7cda..000000000000
--- a/server/startup/migrations/v218.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Statistics } from '../../../app/models/server';
-
-addMigration({
-	version: 218,
-	up() {
-		Statistics.tryDropIndex({ createdAt: 1 });
-	},
-});
diff --git a/server/startup/migrations/v218.ts b/server/startup/migrations/v218.ts
new file mode 100644
index 000000000000..c17991620cb2
--- /dev/null
+++ b/server/startup/migrations/v218.ts
@@ -0,0 +1,10 @@
+import { addMigration } from '../../lib/migrations';
+import { Statistics } from '../../../app/models/server/raw';
+
+addMigration({
+	version: 218,
+	up() {
+		// TODO test if dropIndex do not raise exceptions.
+		Statistics.col.dropIndex('createdAt_1');
+	},
+});
diff --git a/server/startup/migrations/v219.js b/server/startup/migrations/v219.ts
similarity index 70%
rename from server/startup/migrations/v219.js
rename to server/startup/migrations/v219.ts
index bd16d7c18b89..cd2d5eacc06f 100644
--- a/server/startup/migrations/v219.js
+++ b/server/startup/migrations/v219.ts
@@ -1,16 +1,17 @@
+
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
 
 addMigration({
 	version: 219,
-	up() {
+	async up() {
 		const SettingIds = {
 			old: 'Livechat_auto_close_abandoned_rooms',
 			new: 'Livechat_abandoned_rooms_action',
 		};
 
 
-		const oldSetting = Settings.findOne({ _id: SettingIds.old });
+		const oldSetting = await Settings.findOne({ _id: SettingIds.old });
 		if (!oldSetting) {
 			return;
 		}
@@ -27,8 +28,6 @@ addMigration({
 			},
 		});
 
-		Settings.remove({
-			_id: SettingIds.old,
-		});
+		return Settings.removeById(SettingIds.old);
 	},
 });
diff --git a/server/startup/migrations/v220.js b/server/startup/migrations/v220.ts
similarity index 99%
rename from server/startup/migrations/v220.js
rename to server/startup/migrations/v220.ts
index 59795ce4eff9..cdaa4e6c07e6 100644
--- a/server/startup/migrations/v220.js
+++ b/server/startup/migrations/v220.ts
@@ -1,10 +1,10 @@
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
 
 addMigration({
 	version: 220,
-	up() {
-		Settings.update({
+	async up() {
+		await Settings.update({
 			_id: 'Organization_Type',
 		}, {
 			$set: {
@@ -29,7 +29,7 @@ addMigration({
 			},
 		});
 
-		Settings.update({
+		await Settings.update({
 			_id: 'Industry',
 		}, {
 			$set: {
@@ -142,7 +142,7 @@ addMigration({
 			},
 		});
 
-		Settings.update({
+		await Settings.update({
 			_id: 'Country',
 		}, {
 			values: [
diff --git a/server/startup/migrations/v223.js b/server/startup/migrations/v223.js
deleted file mode 100644
index 60c60180ea70..000000000000
--- a/server/startup/migrations/v223.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Permissions } from '../../../app/models/server';
-
-const roleName = 'user';
-
-addMigration({
-	version: 223,
-	up() {
-		Permissions.update({ _id: 'message-impersonate' }, { $addToSet: { roles: roleName } });
-	},
-});
diff --git a/server/startup/migrations/v223.ts b/server/startup/migrations/v223.ts
new file mode 100644
index 000000000000..ef357c554277
--- /dev/null
+++ b/server/startup/migrations/v223.ts
@@ -0,0 +1,11 @@
+import { Permissions } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+const roleName = 'user';
+
+addMigration({
+	version: 223,
+	up() {
+		return Permissions.update({ _id: 'message-impersonate' }, { $addToSet: { roles: roleName } });
+	},
+});
diff --git a/server/startup/migrations/v224.js b/server/startup/migrations/v224.js
deleted file mode 100644
index 5e69367f5609..000000000000
--- a/server/startup/migrations/v224.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Permissions } from '../../../app/models/server';
-
-const roleName = 'app';
-
-addMigration({
-	version: 224,
-	up() {
-		Permissions.update({ _id: 'message-impersonate' }, { $addToSet: { roles: roleName } });
-	},
-});
diff --git a/server/startup/migrations/v224.ts b/server/startup/migrations/v224.ts
new file mode 100644
index 000000000000..be266c225bd0
--- /dev/null
+++ b/server/startup/migrations/v224.ts
@@ -0,0 +1,9 @@
+import { Permissions } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 224,
+	up() {
+		return Permissions.update({ _id: 'message-impersonate' }, { $addToSet: { roles: 'app' } });
+	},
+});
diff --git a/server/startup/migrations/v225.js b/server/startup/migrations/v225.ts
similarity index 70%
rename from server/startup/migrations/v225.js
rename to server/startup/migrations/v225.ts
index bee7349b8b64..62fabfcde620 100644
--- a/server/startup/migrations/v225.js
+++ b/server/startup/migrations/v225.ts
@@ -1,30 +1,35 @@
 import { addMigration } from '../../lib/migrations';
-import { Settings, Users } from '../../../app/models/server';
+import { Users } from '../../../app/models/server';
+import { Settings } from '../../../app/models/server/raw';
 
 addMigration({
 	version: 225,
-	up() {
-		const hideAvatarsSetting = Settings.findOneById('Accounts_Default_User_Preferences_hideAvatars');
-		const hideAvatarsSidebarSetting = Settings.findOneById('Accounts_Default_User_Preferences_sidebarHideAvatar');
+	async up() {
+		const hideAvatarsSetting = await Settings.findOneById('Accounts_Default_User_Preferences_hideAvatars');
+		const hideAvatarsSidebarSetting = await Settings.findOneById('Accounts_Default_User_Preferences_sidebarHideAvatar');
 
 		Settings.removeById('Accounts_Default_User_Preferences_sidebarShowDiscussion');
 
 		Settings.removeById('Accounts_Default_User_Preferences_sidebarHideAvatar');
-		Settings.upsert({
+		Settings.update({
 			_id: 'Accounts_Default_User_Preferences_sidebarDisplayAvatar',
 		}, {
 			$set: {
-				value: !hideAvatarsSidebarSetting.value,
+				value: !hideAvatarsSidebarSetting?.value,
 			},
+		}, {
+			upsert: true,
 		});
 
-		Settings.removeById('Accounts_Default_User_Preferences_hideAvatars');
-		Settings.upsert({
+		await Settings.removeById('Accounts_Default_User_Preferences_hideAvatars');
+		Settings.update({
 			_id: 'Accounts_Default_User_Preferences_displayAvatars',
 		}, {
 			$set: {
-				value: !hideAvatarsSetting.value,
+				value: !hideAvatarsSetting?.value,
 			},
+		}, {
+			upsert: true,
 		});
 
 		Users.update({ 'settings.preferences.hideAvatars': true }, {
diff --git a/server/startup/migrations/v226.js b/server/startup/migrations/v226.js
deleted file mode 100644
index da53274e5ec4..000000000000
--- a/server/startup/migrations/v226.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
-
-addMigration({
-	version: 226,
-	up() {
-		Settings.removeById('Apps_Game_Center_enabled');
-	},
-});
diff --git a/server/startup/migrations/v226.ts b/server/startup/migrations/v226.ts
new file mode 100644
index 000000000000..c94cc0b0d1e8
--- /dev/null
+++ b/server/startup/migrations/v226.ts
@@ -0,0 +1,9 @@
+import { Settings } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 226,
+	up() {
+		return Settings.removeById('Apps_Game_Center_enabled');
+	},
+});
diff --git a/server/startup/migrations/v228.js b/server/startup/migrations/v228.js
deleted file mode 100644
index 9ac69ef146cc..000000000000
--- a/server/startup/migrations/v228.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { addMigration } from '../../lib/migrations';
-import { Permissions } from '../../../app/models';
-
-addMigration({
-	version: 228,
-	up() {
-		if (Permissions) {
-			Permissions.update({ _id: 'manage-livechat-canned-responses' }, { $addToSet: { roles: 'livechat-monitor' } });
-		}
-	},
-});
diff --git a/server/startup/migrations/v228.ts b/server/startup/migrations/v228.ts
new file mode 100644
index 000000000000..4d49253980f3
--- /dev/null
+++ b/server/startup/migrations/v228.ts
@@ -0,0 +1,9 @@
+import { Permissions } from '../../../app/models/server/raw';
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 228,
+	up() {
+		return Permissions.update({ _id: 'manage-livechat-canned-responses' }, { $addToSet: { roles: 'livechat-monitor' } });
+	},
+});
diff --git a/server/startup/migrations/v229.js b/server/startup/migrations/v229.ts
similarity index 62%
rename from server/startup/migrations/v229.js
rename to server/startup/migrations/v229.ts
index 87c38d2a68f6..71c00c907909 100644
--- a/server/startup/migrations/v229.js
+++ b/server/startup/migrations/v229.ts
@@ -1,15 +1,15 @@
-import { Settings } from '../../../app/models/server';
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
 
 addMigration({
 	version: 229,
-	up() {
-		const oldNamesValidationSetting = Settings.findOneById(
+	async up() {
+		const oldNamesValidationSetting = await Settings.findOneById(
 			'UTF8_Names_Validation',
 		);
 		const oldNamesValidationSettingValue = oldNamesValidationSetting?.value || '[0-9a-zA-Z-_.]+';
 
-		Settings.upsert(
+		Settings.update(
 			{
 				_id: 'UTF8_User_Names_Validation',
 			},
@@ -18,9 +18,12 @@ addMigration({
 					value: oldNamesValidationSettingValue,
 				},
 			},
+			{
+				upsert: true,
+			},
 		);
 
-		Settings.upsert(
+		Settings.update(
 			{
 				_id: 'UTF8_Channel_Names_Validation',
 			},
@@ -28,9 +31,11 @@ addMigration({
 				$set: {
 					value: oldNamesValidationSettingValue,
 				},
+			}, {
+				upsert: true,
 			},
 		);
 
-		Settings.removeById('UTF8_Names_Validation');
+		return Settings.removeById('UTF8_Names_Validation');
 	},
 });
diff --git a/server/startup/migrations/v230.ts b/server/startup/migrations/v230.ts
index 22c48c7762ff..c3103291bd00 100644
--- a/server/startup/migrations/v230.ts
+++ b/server/startup/migrations/v230.ts
@@ -1,12 +1,12 @@
+import { Permissions } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Permissions } from '../../../app/models/server';
-
-const roleName = 'app';
 
 addMigration({
 	version: 230,
 	up() {
-		Permissions.update({ _id: 'start-discussion' }, { $addToSet: { roles: roleName } });
-		Permissions.update({ _id: 'start-discussion-other-user' }, { $addToSet: { roles: roleName } });
+		return Promise.all([
+			Permissions.addRole('start-discussion', 'app'),
+			Permissions.addRole('start-discussion-other-user', 'app'),
+		]);
 	},
 });
diff --git a/server/startup/migrations/v231.ts b/server/startup/migrations/v231.ts
index 67a897b6e3f4..70dbd39bd854 100644
--- a/server/startup/migrations/v231.ts
+++ b/server/startup/migrations/v231.ts
@@ -5,12 +5,12 @@ import { addMigration } from '../../lib/migrations';
 import { BannerPlatform } from '../../../definition/IBanner';
 import { Banner } from '../../sdk';
 import { settings } from '../../../app/settings/server';
-import { Settings } from '../../../app/models/server';
 import { isEnterprise } from '../../../ee/app/license/server';
+import { Settings } from '../../../app/models/server/raw';
 
 addMigration({
 	version: 231,
-	up() {
+	async up() {
 		const LDAPEnabled = settings.get('LDAP_Enable');
 		const SAMLEnabled = settings.get('SAML_Custom_Default');
 
@@ -18,7 +18,7 @@ addMigration({
 			_id: { $in: [/^Accounts_OAuth_(Custom-)?([^-_]+)$/, 'Accounts_OAuth_GitHub_Enterprise'] },
 			value: true,
 		};
-		const CustomOauthEnabled = !!Settings.findOne(query);
+		const CustomOauthEnabled = !! await Settings.findOne(query);
 
 		const isAuthServiceEnabled = LDAPEnabled || SAMLEnabled || CustomOauthEnabled;
 
diff --git a/server/startup/migrations/v233.ts b/server/startup/migrations/v233.ts
index 9d9068a588d8..bf51873d9e19 100644
--- a/server/startup/migrations/v233.ts
+++ b/server/startup/migrations/v233.ts
@@ -1,10 +1,10 @@
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
 
 addMigration({
 	version: 233,
 	up() {
-		Settings.remove({ _id: { $in: [
+		return Settings.deleteMany({ _id: { $in: [
 			'Log_Package',
 			'Log_File',
 		] } });
diff --git a/server/startup/migrations/v234.ts b/server/startup/migrations/v234.ts
index 4d8dbe2db412..8909a16e21c1 100644
--- a/server/startup/migrations/v234.ts
+++ b/server/startup/migrations/v234.ts
@@ -1,10 +1,10 @@
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
 
 addMigration({
 	version: 234,
 	up() {
-		Settings.remove({
+		return Settings.deleteMany({
 			_id: {
 				$in: [
 					'GoogleVision_Enable',
diff --git a/server/startup/migrations/v235.ts b/server/startup/migrations/v235.ts
index fe2308356e50..1b6fb0af8e1a 100644
--- a/server/startup/migrations/v235.ts
+++ b/server/startup/migrations/v235.ts
@@ -1,10 +1,11 @@
 import { addMigration } from '../../lib/migrations';
-import { Settings, Subscriptions, Users } from '../../../app/models/server';
+import { Subscriptions, Users } from '../../../app/models/server';
+import { Settings } from '../../../app/models/server/raw';
 
 addMigration({
 	version: 235,
-	up() {
-		Settings.removeById('Accounts_Default_User_Preferences_audioNotifications');
+	async up() {
+		await Settings.removeById('Accounts_Default_User_Preferences_audioNotifications');
 
 		// delete field from subscriptions
 		Subscriptions.update({
diff --git a/server/startup/migrations/v236.ts b/server/startup/migrations/v236.ts
index c1f839896400..2f0ea88c17f2 100644
--- a/server/startup/migrations/v236.ts
+++ b/server/startup/migrations/v236.ts
@@ -1,13 +1,13 @@
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
 
 addMigration({
 	version: 236,
-	up() {
-		Settings.removeById('Canned Responses');
-		Settings.removeById('Canned_Responses');
+	async up() {
+		await Settings.removeById('Canned Responses');
+		await Settings.removeById('Canned_Responses');
 
-		Settings.upsert(
+		await Settings.update(
 			{
 				_id: 'Canned_Responses_Enable',
 			},
@@ -16,6 +16,9 @@ addMigration({
 					group: 'Omnichannel',
 				},
 			},
+			{
+				upsert: true,
+			},
 		);
 	},
 });
diff --git a/server/startup/migrations/v237.ts b/server/startup/migrations/v237.ts
index f53d8d0eb195..155ae0b29a3e 100644
--- a/server/startup/migrations/v237.ts
+++ b/server/startup/migrations/v237.ts
@@ -1,7 +1,7 @@
 import { addMigration } from '../../lib/migrations';
 import { settings } from '../../../app/settings/server';
-import { Settings } from '../../../app/models/server';
 import { isEnterprise } from '../../../ee/app/license/server';
+import { Settings } from '../../../app/models/server/raw';
 
 function copySettingValue(newName: string, oldName: string): void {
 	const value = settings.get(oldName);
@@ -9,12 +9,12 @@ function copySettingValue(newName: string, oldName: string): void {
 		return;
 	}
 
-	Settings.upsert({ _id: newName }, { $set: { value } });
+	Settings.update({ _id: newName }, { $set: { value } }, { upsert: true });
 }
 
 addMigration({
 	version: 237,
-	up() {
+	async up() {
 		const isEE = isEnterprise();
 
 		// Override AD defaults with the previously configured values
@@ -23,7 +23,9 @@ addMigration({
 
 		// If we're sure the server is AD, then select it - otherwise keep it as generic ldap
 		const useAdDefaults = settings.get('LDAP_User_Search_Field') === 'sAMAccountName';
-		Settings.upsert({ _id: 'LDAP_Server_Type' }, { $set: { value: useAdDefaults ? 'ad' : '' } });
+		Settings.update({ _id: 'LDAP_Server_Type' }, { $set: { value: useAdDefaults ? 'ad' : '' } }, {
+			upsert: true,
+		});
 
 		// The setting to use the field map also determined if the user data was updated on login or not
 		copySettingValue('LDAP_Update_Data_On_Login', 'LDAP_Sync_User_Data');
@@ -44,14 +46,14 @@ addMigration({
 				}
 
 				if (fieldMap[key] === 'name') {
-					Settings.upsert({ _id: 'LDAP_Name_Field' }, { $set: { value: key } });
-					Settings.upsert({ _id: 'LDAP_AD_Name_Field' }, { $set: { value: key } });
+					Settings.update({ _id: 'LDAP_Name_Field' }, { $set: { value: key } }, { upsert: true });
+					Settings.update({ _id: 'LDAP_AD_Name_Field' }, { $set: { value: key } }, { upsert: true });
 					continue;
 				}
 
 				if (fieldMap[key] === 'email') {
-					Settings.upsert({ _id: 'LDAP_Email_Field' }, { $set: { value: key } });
-					Settings.upsert({ _id: 'LDAP_AD_Email_Field' }, { $set: { value: key } });
+					Settings.update({ _id: 'LDAP_Email_Field' }, { $set: { value: key } }, { upsert: true });
+					Settings.update({ _id: 'LDAP_AD_Email_Field' }, { $set: { value: key } }, { upsert: true });
 					continue;
 				}
 
@@ -60,10 +62,10 @@ addMigration({
 
 			if (isEE) {
 				const newJson = JSON.stringify(newObject);
-				Settings.upsert({ _id: 'LDAP_CustomFieldMap' }, { $set: { value: newJson } });
+				Settings.update({ _id: 'LDAP_CustomFieldMap' }, { $set: { value: newJson } }, { upsert: true });
 
 				const syncCustomFields = Object.keys(newObject).length > 0 && settings.get('LDAP_Sync_User_Data');
-				Settings.upsert({ _id: 'LDAP_Sync_Custom_Fields' }, { $set: { value: syncCustomFields } });
+				Settings.update({ _id: 'LDAP_Sync_Custom_Fields' }, { $set: { value: syncCustomFields } }, { upsert: true });
 			}
 		}
 
@@ -80,7 +82,7 @@ addMigration({
 		copySettingValue('LDAP_Sync_User_Data_Channels_Filter', 'LDAP_Sync_User_Data_Groups_Filter');
 		copySettingValue('LDAP_Sync_User_Data_Channels_BaseDN', 'LDAP_Sync_User_Data_Groups_BaseDN');
 
-		Settings.remove({
+		await Settings.deleteMany({
 			_id: {
 				$in: [
 					'LDAP_Sync_Now',
diff --git a/server/startup/migrations/v240.ts b/server/startup/migrations/v240.ts
index 4ce8f2c7d0ac..296040d649d7 100644
--- a/server/startup/migrations/v240.ts
+++ b/server/startup/migrations/v240.ts
@@ -1,9 +1,9 @@
+import { Settings } from '../../../app/models/server/raw';
 import { addMigration } from '../../lib/migrations';
-import { Settings } from '../../../app/models/server';
 
 addMigration({
 	version: 240,
 	up() {
-		Settings.removeById('Support_Cordova_App');
+		return Settings.removeById('Support_Cordova_App');
 	},
 });
diff --git a/server/startup/migrations/v242.ts b/server/startup/migrations/v242.ts
index 86419e276328..b94f3f6439d5 100644
--- a/server/startup/migrations/v242.ts
+++ b/server/startup/migrations/v242.ts
@@ -1,5 +1,6 @@
 import { addMigration } from '../../lib/migrations';
-import { LivechatInquiry, Settings } from '../../../app/models/server';
+import { LivechatInquiry } from '../../../app/models/server';
+import { Settings } from '../../../app/models/server/raw';
 
 function removeQueueTimeoutFromInquiries(): void {
 	LivechatInquiry.update({
@@ -8,23 +9,23 @@ function removeQueueTimeoutFromInquiries(): void {
 	}, { $unset: { estimatedInactivityCloseTimeAt: 1 } }, { multi: true });
 }
 
-function removeSetting(): void {
-	const oldSetting = Settings.findOneById('Livechat_max_queue_wait_time_action');
+async function removeSetting(): Promise<void> {
+	const oldSetting = await Settings.findOneById('Livechat_max_queue_wait_time_action');
 	if (!oldSetting) {
 		return;
 	}
 	const currentAction = oldSetting.value;
 
 	if (currentAction === 'Nothing') {
-		Settings.upsert({ _id: 'Livechat_max_queue_wait_time' }, { $set: { value: -1 } });
+		await Settings.update({ _id: 'Livechat_max_queue_wait_time' }, { $set: { value: -1 } }, { upsert: true });
 	}
-	Settings.removeById('Livechat_max_queue_wait_time_action');
+	await Settings.removeById('Livechat_max_queue_wait_time_action');
 }
 
 addMigration({
 	version: 242,
 	up() {
 		removeQueueTimeoutFromInquiries();
-		removeSetting();
+		return removeSetting();
 	},
 });
diff --git a/server/startup/migrations/v243.ts b/server/startup/migrations/v243.ts
index 89d3f9f03e70..71a2e7d97c75 100644
--- a/server/startup/migrations/v243.ts
+++ b/server/startup/migrations/v243.ts
@@ -1,19 +1,22 @@
 import { addMigration } from '../../lib/migrations';
-import { Settings, Users } from '../../../app/models/server';
+import { Users } from '../../../app/models/server';
+import { Settings } from '../../../app/models/server/raw';
 
 addMigration({
 	version: 243,
-	up() {
-		const mobileNotificationsSetting = Settings.findOneById('Accounts_Default_User_Preferences_mobileNotifications');
+	async up() {
+		const mobileNotificationsSetting = await Settings.findOneById('Accounts_Default_User_Preferences_mobileNotifications');
 
-		Settings.removeById('Accounts_Default_User_Preferences_mobileNotifications');
+		await Settings.removeById('Accounts_Default_User_Preferences_mobileNotifications');
 		if (mobileNotificationsSetting && mobileNotificationsSetting.value) {
-			Settings.upsert({
+			Settings.update({
 				_id: 'Accounts_Default_User_Preferences_pushNotifications',
 			}, {
 				$set: {
 					value: mobileNotificationsSetting.value,
 				},
+			}, {
+				upsert: true,
 			});
 		}
 
diff --git a/server/startup/migrations/v244.ts b/server/startup/migrations/v244.ts
index 8ec31f2485e1..d5c39dffc20c 100644
--- a/server/startup/migrations/v244.ts
+++ b/server/startup/migrations/v244.ts
@@ -1,9 +1,9 @@
+import { upsertPermissions } from '../../../app/authorization/server/functions/upsertPermissions';
 import { addMigration } from '../../lib/migrations';
-import { Permissions } from '../../../app/models/server';
 
 addMigration({
 	version: 244,
 	up() {
-		Permissions.create('view-omnichannel-contact-center', ['livechat-manager', 'livechat-agent', 'livechat-monitor', 'admin']);
+		return upsertPermissions();
 	},
 });
diff --git a/server/startup/presence.js b/server/startup/presence.js
index 73fc47b2725c..b476d431ed6b 100644
--- a/server/startup/presence.js
+++ b/server/startup/presence.js
@@ -1,8 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { UserPresence } from 'meteor/konecty:user-presence';
 
-import InstanceStatusModel from '../../app/models/server/models/InstanceStatus';
-import UsersSessionsModel from '../../app/models/server/models/UsersSessions';
+import { InstanceStatus, UsersSessions } from '../../app/models/server/raw';
 import { isPresenceMonitorEnabled } from '../lib/isPresenceMonitorEnabled';
 
 Meteor.startup(function() {
@@ -14,16 +13,8 @@ Meteor.startup(function() {
 	// UserPresenceMonitor.start();
 
 	// Remove lost connections
-	const ids = InstanceStatusModel.find({}, { fields: { _id: 1 } }).fetch().map((id) => id._id);
+	const ids = Promise.await(InstanceStatus.find({}, { projection: { _id: 1 } }).toArray())
+		.map((id) => id._id);
 
-	const update = {
-		$pull: {
-			connections: {
-				instanceId: {
-					$nin: ids,
-				},
-			},
-		},
-	};
-	UsersSessionsModel.update({}, update, { multi: true });
+	Promise.await(UsersSessions.clearConnectionsFromInstanceId(ids));
 });
diff --git a/server/stream/streamBroadcast.js b/server/stream/streamBroadcast.js
index 4c94ccc59ab4..c866885b101b 100644
--- a/server/stream/streamBroadcast.js
+++ b/server/stream/streamBroadcast.js
@@ -5,11 +5,11 @@ import { check } from 'meteor/check';
 import { DDP } from 'meteor/ddp';
 
 import { Logger } from '../lib/logger/Logger';
-import { hasPermission } from '../../app/authorization';
+import { hasPermission } from '../../app/authorization/server';
 import { settings } from '../../app/settings/server';
-import { isDocker, getURL } from '../../app/utils';
+import { isDocker, getURL } from '../../app/utils/server';
 import { Users } from '../../app/models/server';
-import InstanceStatusModel from '../../app/models/server/models/InstanceStatus';
+import { InstanceStatus as InstanceStatusRaw } from '../../app/models/server/raw';
 import { StreamerCentral } from '../modules/streamer/streamer.module';
 import { isPresenceMonitorEnabled } from '../lib/isPresenceMonitorEnabled';
 
@@ -61,7 +61,7 @@ function startMatrixBroadcast() {
 	}
 
 	matrixBroadCastActions = {
-		added(record) {
+		added: Meteor.bindEnvironment((record) => {
 			cache.set(record._id, record);
 
 			const subPath = getURL('', { cdn: false, full: false });
@@ -100,7 +100,7 @@ function startMatrixBroadcast() {
 			connections[instance].onReconnect = function() {
 				return authorizeConnection(instance);
 			};
-		},
+		}),
 
 		removed(id) {
 			const record = cache.get(id);
@@ -129,19 +129,15 @@ function startMatrixBroadcast() {
 		},
 	};
 
-	const query = {
+	InstanceStatusRaw.find({
 		'extraInformation.port': {
 			$exists: true,
 		},
-	};
-
-	const options = {
+	}, {
 		sort: {
 			_createdAt: -1,
 		},
-	};
-
-	InstanceStatusModel.find(query, options).fetch().forEach(matrixBroadCastActions.added);
+	}).forEach(matrixBroadCastActions.added);
 }
 
 

From 8650aa72e83af51d4aaf49ad07a9f5b10c891ac2 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Wed, 10 Nov 2021 18:32:48 -0300
Subject: [PATCH 14/14] [IMPROVE] Reduce complexity in some functions (#23387)

---
 app/utils/lib/getURL.tests.js                 | 113 ++++++------------
 .../omnichannel/departments/EditDepartment.js |  77 ++++++------
 .../EditDepartmentWithAllowedForwardData.js   |   1 -
 .../departments/EditDepartmentWithData.js     |   1 -
 4 files changed, 72 insertions(+), 120 deletions(-)

diff --git a/app/utils/lib/getURL.tests.js b/app/utils/lib/getURL.tests.js
index 73d6d0186550..5ef7af6a4888 100644
--- a/app/utils/lib/getURL.tests.js
+++ b/app/utils/lib/getURL.tests.js
@@ -1,4 +1,3 @@
-/* eslint-disable complexity */
 /* eslint-env mocha */
 import 'babel-polyfill';
 import assert from 'assert';
@@ -89,12 +88,6 @@ const testCases = (options) => {
 			}
 		}
 	} else if (options._cdn_prefix === '') {
-		if (options.full && !options.cdn && !options.cloud) {
-			it('should return with host if full: true', () => {
-				testPaths(options, (path) => _site_url + path);
-			});
-		}
-
 		if (!options.full && options.cdn) {
 			it('should return with cloud host if cdn: true', () => {
 				testPaths(options, (path) => getCloudUrl(_site_url, path));
@@ -106,88 +99,54 @@ const testCases = (options) => {
 				testPaths(options, (path) => getCloudUrl(_site_url, path));
 			});
 		}
-
-		if (options.full && options.cdn && !options.cloud) {
-			it('should return with host if full: true and cdn: true', () => {
-				testPaths(options, (path) => _site_url + path);
-			});
-		}
-	} else {
-		if (options.full && !options.cdn && !options.cloud) {
-			it('should return with host if full: true', () => {
-				testPaths(options, (path) => _site_url + path);
-			});
-		}
-
-		if (!options.full && options.cdn && !options.cloud) {
-			it('should return with cdn prefix if cdn: true', () => {
-				testPaths(options, (path) => options._cdn_prefix + path);
-			});
-		}
-
-		if (!options.full && !options.cdn) {
-			it('should return with cloud host if full: fase and cdn: false', () => {
-				testPaths(options, (path) => getCloudUrl(_site_url, path));
-			});
-		}
-
-		if (options.full && options.cdn && !options.cloud) {
-			it('should return with host if full: true and cdn: true', () => {
-				testPaths(options, (path) => options._cdn_prefix + path);
-			});
-		}
+	} else if (!options.full && !options.cdn) {
+		it('should return with cloud host if full: fase and cdn: false', () => {
+			testPaths(options, (path) => getCloudUrl(_site_url, path));
+		});
 	}
 };
 
-const testOptions = (options) => {
-	testCases({ ...options, cdn: false, full: false, cloud: false });
-	testCases({ ...options, cdn: true, full: false, cloud: false });
-	testCases({ ...options, cdn: false, full: true, cloud: false });
-	testCases({ ...options, cdn: false, full: false, cloud: true });
-	testCases({ ...options, cdn: true, full: true, cloud: false });
-	testCases({ ...options, cdn: false, full: true, cloud: true });
-	testCases({ ...options, cdn: true, full: false, cloud: true });
-	testCases({ ...options, cdn: true, full: true, cloud: true });
+const testCasesForOptions = (description, options) => {
+	describe(description, () => {
+		testCases({ ...options, cdn: false, full: false, cloud: false });
+		testCases({ ...options, cdn: true, full: false, cloud: false });
+		testCases({ ...options, cdn: false, full: true, cloud: false });
+		testCases({ ...options, cdn: false, full: false, cloud: true });
+		testCases({ ...options, cdn: true, full: true, cloud: false });
+		testCases({ ...options, cdn: false, full: true, cloud: true });
+		testCases({ ...options, cdn: true, full: false, cloud: true });
+		testCases({ ...options, cdn: true, full: true, cloud: true });
+	});
 };
 
-describe('getURL', () => {
-	describe('getURL with no CDN, no PREFIX for http://localhost:3000/', () => {
-		testOptions({
-			_cdn_prefix: '',
-			_root_url_path_prefix: '',
-			_site_url: 'http://localhost:3000/',
-		});
+describe.only('getURL', () => {
+	testCasesForOptions('getURL with no CDN, no PREFIX for http://localhost:3000/', {
+		_cdn_prefix: '',
+		_root_url_path_prefix: '',
+		_site_url: 'http://localhost:3000/',
 	});
 
-	describe('getURL with no CDN, no PREFIX for http://localhost:3000', () => {
-		testOptions({
-			_cdn_prefix: '',
-			_root_url_path_prefix: '',
-			_site_url: 'http://localhost:3000',
-		});
+	testCasesForOptions('getURL with no CDN, no PREFIX for http://localhost:3000', {
+		_cdn_prefix: '',
+		_root_url_path_prefix: '',
+		_site_url: 'http://localhost:3000',
 	});
 
-	describe('getURL with CDN, no PREFIX for http://localhost:3000/', () => {
-		testOptions({
-			_cdn_prefix: 'https://cdn.com',
-			_root_url_path_prefix: '',
-			_site_url: 'http://localhost:3000/',
-		});
+	testCasesForOptions('getURL with CDN, no PREFIX for http://localhost:3000/', {
+		_cdn_prefix: 'https://cdn.com',
+		_root_url_path_prefix: '',
+		_site_url: 'http://localhost:3000/',
 	});
 
-	describe('getURL with CDN, PREFIX for http://localhost:3000/', () => {
-		testOptions({
-			_cdn_prefix: 'https://cdn.com',
-			_root_url_path_prefix: 'sub',
-			_site_url: 'http://localhost:3000/',
-		});
+	testCasesForOptions('getURL with CDN, PREFIX for http://localhost:3000/', {
+		_cdn_prefix: 'https://cdn.com',
+		_root_url_path_prefix: 'sub',
+		_site_url: 'http://localhost:3000/',
 	});
 
-	describe('getURL with CDN, PREFIX for https://localhost:3000/', () => {
-		testOptions({
-			_cdn_prefix: 'https://cdn.com',
-			_root_url_path_prefix: 'sub',
-			_site_url: 'https://localhost:3000/',
-		});
+	testCasesForOptions('getURL with CDN, PREFIX for https://localhost:3000/', {
+		_cdn_prefix: 'https://cdn.com',
+		_root_url_path_prefix: 'sub',
+		_site_url: 'https://localhost:3000/',
 	});
 });
diff --git a/client/views/omnichannel/departments/EditDepartment.js b/client/views/omnichannel/departments/EditDepartment.js
index 24885d0f53a6..3fbb653e2569 100644
--- a/client/views/omnichannel/departments/EditDepartment.js
+++ b/client/views/omnichannel/departments/EditDepartment.js
@@ -1,4 +1,3 @@
-/* eslint-disable complexity */
 import {
 	FieldGroup,
 	Field,
@@ -33,11 +32,7 @@ import DepartmentsAgentsTable from './DepartmentsAgentsTable';
 
 function EditDepartment({ data, id, title, reload, allowedToForwardData }) {
 	const t = useTranslation();
-	const agentsRoute = useRoute('omnichannel-departments');
-	const eeForms = useSubscription(formsSubscription);
-	const initialAgents = useRef((data && data.agents) || []);
-
-	const router = useRoute('omnichannel-departments');
+	const departmentsRoute = useRoute('omnichannel-departments');
 
 	const {
 		useEeNumberInput = () => {},
@@ -45,7 +40,9 @@ function EditDepartment({ data, id, title, reload, allowedToForwardData }) {
 		useEeTextAreaInput = () => {},
 		useDepartmentForwarding = () => {},
 		useDepartmentBusinessHours = () => {},
-	} = eeForms;
+	} = useSubscription(formsSubscription);
+
+	const initialAgents = useRef((data && data.agents) || []);
 
 	const MaxChats = useEeNumberInput();
 	const VisitorInactivity = useEeNumberInput();
@@ -57,29 +54,23 @@ function EditDepartment({ data, id, title, reload, allowedToForwardData }) {
 
 	const { department } = data || { department: {} };
 
-	const [tags, setTags] = useState((department && department.chatClosingTags) || []);
-	const [tagsText, setTagsText] = useState();
+	const [[tags, tagsText], setTagsState] = useState(() => [department?.chatClosingTags ?? [], '']);
 
 	const { values, handlers, hasUnsavedChanges } = useForm({
-		name: (department && department.name) || '',
-		email: (department && department.email) || '',
-		description: (department && department.description) || '',
-		enabled: !!(department && department.enabled),
-		maxNumberSimultaneousChat: (department && department.maxNumberSimultaneousChat) || undefined,
-		showOnRegistration: !!(department && department.showOnRegistration),
-		showOnOfflineForm: !!(department && department.showOnOfflineForm),
-		abandonedRoomsCloseCustomMessage:
-			(department && department.abandonedRoomsCloseCustomMessage) || '',
-		requestTagBeforeClosingChat: (department && department.requestTagBeforeClosingChat) || false,
-		offlineMessageChannelName: (department && department.offlineMessageChannelName) || '',
-		visitorInactivityTimeoutInSeconds:
-			(department && department.visitorInactivityTimeoutInSeconds) || undefined,
-		waitingQueueMessage: (department && department.waitingQueueMessage) || '',
+		name: department?.name || '',
+		email: department?.email || '',
+		description: department?.description || '',
+		enabled: !!department?.enabled,
+		maxNumberSimultaneousChat: department?.maxNumberSimultaneousChat || undefined,
+		showOnRegistration: !!department?.showOnRegistration,
+		showOnOfflineForm: !!department?.showOnOfflineForm,
+		abandonedRoomsCloseCustomMessage: department?.abandonedRoomsCloseCustomMessage || '',
+		requestTagBeforeClosingChat: department?.requestTagBeforeClosingChat || false,
+		offlineMessageChannelName: department?.offlineMessageChannelName || '',
+		visitorInactivityTimeoutInSeconds: department?.visitorInactivityTimeoutInSeconds || undefined,
+		waitingQueueMessage: department?.waitingQueueMessage || '',
 		departmentsAllowedToForward:
-			(allowedToForwardData &&
-				allowedToForwardData.departments &&
-				allowedToForwardData.departments.map((dep) => ({ label: dep.name, value: dep._id }))) ||
-			[],
+			allowedToForwardData?.departments?.map((dep) => ({ label: dep.name, value: dep._id })) || [],
 	});
 	const {
 		handleName,
@@ -119,20 +110,25 @@ function EditDepartment({ data, id, title, reload, allowedToForwardData }) {
 	const { phase: roomsPhase, items: roomsItems, itemCount: roomsTotal } = useRecordList(RoomsList);
 
 	const handleTagChipClick = (tag) => () => {
-		setTags((tags) => tags.filter((_tag) => _tag !== tag));
+		setTagsState(([tags, tagsText]) => [tags.filter((_tag) => _tag !== tag), tagsText]);
 	};
 
 	const handleTagTextSubmit = useMutableCallback(() => {
-		if (!tags.includes(tagsText)) {
-			setTags([...tags, tagsText]);
-			setTagsText('');
-		}
-	});
+		setTagsState((state) => {
+			const [tags, tagsText] = state;
+
+			if (tags.includes(tagsText)) {
+				return state;
+			}
 
-	const handleTagTextChange = useMutableCallback((e) => {
-		setTagsText(e.target.value);
+			return [[...tags, tagsText], ''];
+		});
 	});
 
+	const handleTagTextChange = (e) => {
+		setTagsState(([tags]) => [tags, e.target.value]);
+	};
+
 	const saveDepartmentInfo = useMethod('livechat:saveDepartment');
 	const saveDepartmentAgentsInfoOnEdit = useEndpoint('POST', `livechat/department/${id}/agents`);
 
@@ -197,8 +193,7 @@ function EditDepartment({ data, id, title, reload, allowedToForwardData }) {
 			visitorInactivityTimeoutInSeconds,
 			abandonedRoomsCloseCustomMessage,
 			waitingQueueMessage,
-			departmentsAllowedToForward:
-				departmentsAllowedToForward && departmentsAllowedToForward.map((dep) => dep.value).join(),
+			departmentsAllowedToForward: departmentsAllowedToForward?.map((dep) => dep.value).join(),
 		};
 
 		const agentListPayload = {
@@ -227,14 +222,14 @@ function EditDepartment({ data, id, title, reload, allowedToForwardData }) {
 			}
 			dispatchToastMessage({ type: 'success', message: t('Saved') });
 			reload();
-			agentsRoute.push({});
+			departmentsRoute.push({});
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}
 	});
 
 	const handleReturn = useMutableCallback(() => {
-		router.push({});
+		departmentsRoute.push({});
 	});
 
 	const invalidForm =
@@ -438,7 +433,7 @@ function EditDepartment({ data, id, title, reload, allowedToForwardData }) {
 									</Button>
 								</Field.Row>
 								<Field.Hint>{t('Conversation_closing_tags_description')}</Field.Hint>
-								{tags && tags.length > 0 && (
+								{tags?.length > 0 && (
 									<Field.Row justifyContent='flex-start'>
 										{tags.map((tag, i) => (
 											<Chip key={i} onClick={handleTagChipClick(tag)} mie='x8'>
@@ -451,7 +446,7 @@ function EditDepartment({ data, id, title, reload, allowedToForwardData }) {
 						)}
 						{DepartmentBusinessHours && (
 							<Field>
-								<DepartmentBusinessHours bhId={department && department.businessHourId} />
+								<DepartmentBusinessHours bhId={department?.businessHourId} />
 							</Field>
 						)}
 						<Divider mb='x16' />
diff --git a/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.js b/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.js
index ff9c26f4ef57..a217c4ec8aaa 100644
--- a/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.js
+++ b/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.js
@@ -1,4 +1,3 @@
-/* eslint-disable complexity */
 import { Box } from '@rocket.chat/fuselage';
 import React, { useMemo } from 'react';
 
diff --git a/client/views/omnichannel/departments/EditDepartmentWithData.js b/client/views/omnichannel/departments/EditDepartmentWithData.js
index ccdc6ab6e589..d4bbc31c35ca 100644
--- a/client/views/omnichannel/departments/EditDepartmentWithData.js
+++ b/client/views/omnichannel/departments/EditDepartmentWithData.js
@@ -1,4 +1,3 @@
-/* eslint-disable complexity */
 import { Box } from '@rocket.chat/fuselage';
 import React from 'react';