diff --git a/.changeset/brave-brooms-invent.md b/.changeset/brave-brooms-invent.md
new file mode 100644
index 000000000000..35d32b485944
--- /dev/null
+++ b/.changeset/brave-brooms-invent.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes a problem that caused visitor creation to fail when GDPR setting was enabled and visitor was created via Apps Engine or the deprecated `livechat:registerGuest` method.
diff --git a/.changeset/bump-patch-1727212585363.md b/.changeset/bump-patch-1727212585363.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1727212585363.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/cyan-ladybugs-thank.md b/.changeset/cyan-ladybugs-thank.md
new file mode 100644
index 000000000000..377a014fcb72
--- /dev/null
+++ b/.changeset/cyan-ladybugs-thank.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed error during sendmessage client stub
diff --git a/.changeset/dirty-stingrays-beg.md b/.changeset/dirty-stingrays-beg.md
new file mode 100644
index 000000000000..cf5e3a4ca839
--- /dev/null
+++ b/.changeset/dirty-stingrays-beg.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/model-typings": minor
+"@rocket.chat/rest-typings": minor
+---
+
+Added support for specifying a unit on departments' creation and update
diff --git a/.changeset/five-coats-rhyme.md b/.changeset/five-coats-rhyme.md
new file mode 100644
index 000000000000..c5359e3c978a
--- /dev/null
+++ b/.changeset/five-coats-rhyme.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/fuselage-ui-kit': patch
+---
+
+Fixed an error that incorrectly showed conference calls as not answered after they ended
diff --git a/.changeset/great-humans-live.md b/.changeset/great-humans-live.md
new file mode 100644
index 000000000000..1d97d9da23ae
--- /dev/null
+++ b/.changeset/great-humans-live.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed a Federation callback not awaiting db call
diff --git a/.changeset/hot-balloons-travel.md b/.changeset/hot-balloons-travel.md
new file mode 100644
index 000000000000..d6154babc49d
--- /dev/null
+++ b/.changeset/hot-balloons-travel.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue where when you marked a room as unread and you were part of it, sometimes it would mark it as read right after
diff --git a/.changeset/kind-llamas-grin.md b/.changeset/kind-llamas-grin.md
new file mode 100644
index 000000000000..fd349e82d7f9
--- /dev/null
+++ b/.changeset/kind-llamas-grin.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Changed the contextualbar behavior based on chat size instead the viewport
diff --git a/.changeset/late-hats-carry.md b/.changeset/late-hats-carry.md
new file mode 100644
index 000000000000..ec24c7cd5376
--- /dev/null
+++ b/.changeset/late-hats-carry.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+---
+
+Improves the accessibility of the report user modal by adding an appropriate label, description, and ARIA attributes.
diff --git a/.changeset/late-planes-sniff.md b/.changeset/late-planes-sniff.md
new file mode 100644
index 000000000000..d702a938da78
--- /dev/null
+++ b/.changeset/late-planes-sniff.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-typings": patch
+"@rocket.chat/i18n": patch
+---
+
+Added a new setting to enable mentions in end to end encrypted channels
diff --git a/.changeset/little-bottles-peel.md b/.changeset/little-bottles-peel.md
new file mode 100644
index 000000000000..eacb88108a0f
--- /dev/null
+++ b/.changeset/little-bottles-peel.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 000000000000..7c415a6b0dde
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,103 @@
+{
+  "mode": "pre",
+  "tag": "rc",
+  "initialVersions": {
+    "@rocket.chat/meteor": "6.13.0-develop",
+    "rocketchat-services": "1.3.3",
+    "@rocket.chat/uikit-playground": "0.4.0",
+    "@rocket.chat/account-service": "0.4.6",
+    "@rocket.chat/authorization-service": "0.4.6",
+    "@rocket.chat/ddp-streamer": "0.3.6",
+    "@rocket.chat/omnichannel-transcript": "0.4.6",
+    "@rocket.chat/presence-service": "0.4.6",
+    "@rocket.chat/queue-worker": "0.4.6",
+    "@rocket.chat/stream-hub-service": "0.4.6",
+    "@rocket.chat/license": "0.2.6",
+    "@rocket.chat/omnichannel-services": "0.3.3",
+    "@rocket.chat/pdf-worker": "0.2.3",
+    "@rocket.chat/presence": "0.2.6",
+    "@rocket.chat/ui-theming": "0.2.1",
+    "@rocket.chat/account-utils": "0.0.2",
+    "@rocket.chat/agenda": "0.1.0",
+    "@rocket.chat/api-client": "0.2.6",
+    "@rocket.chat/apps": "0.1.6",
+    "@rocket.chat/base64": "1.0.13",
+    "@rocket.chat/cas-validate": "0.0.2",
+    "@rocket.chat/core-services": "0.6.0",
+    "@rocket.chat/core-typings": "6.13.0-develop",
+    "@rocket.chat/cron": "0.1.6",
+    "@rocket.chat/ddp-client": "0.3.6",
+    "@rocket.chat/eslint-config": "0.7.0",
+    "@rocket.chat/favicon": "0.0.2",
+    "@rocket.chat/fuselage-ui-kit": "10.0.0",
+    "@rocket.chat/gazzodown": "10.0.0",
+    "@rocket.chat/i18n": "0.7.0",
+    "@rocket.chat/instance-status": "0.1.6",
+    "@rocket.chat/jest-presets": "0.0.1",
+    "@rocket.chat/jwt": "0.1.1",
+    "@rocket.chat/livechat": "1.19.3",
+    "@rocket.chat/log-format": "0.0.2",
+    "@rocket.chat/logger": "0.0.2",
+    "@rocket.chat/message-parser": "0.31.29",
+    "@rocket.chat/mock-providers": "0.1.2",
+    "@rocket.chat/model-typings": "0.7.0",
+    "@rocket.chat/models": "0.2.3",
+    "@rocket.chat/poplib": "0.0.2",
+    "@rocket.chat/password-policies": "0.0.2",
+    "@rocket.chat/patch-injection": "0.0.1",
+    "@rocket.chat/peggy-loader": "0.31.25",
+    "@rocket.chat/random": "1.2.2",
+    "@rocket.chat/release-action": "2.2.3",
+    "@rocket.chat/release-changelog": "0.1.0",
+    "@rocket.chat/rest-typings": "6.13.0-develop",
+    "@rocket.chat/server-cloud-communication": "0.0.2",
+    "@rocket.chat/server-fetch": "0.0.3",
+    "@rocket.chat/sha256": "1.0.10",
+    "@rocket.chat/tools": "0.2.2",
+    "@rocket.chat/ui-avatar": "6.0.0",
+    "@rocket.chat/ui-client": "10.0.0",
+    "@rocket.chat/ui-composer": "0.2.1",
+    "@rocket.chat/ui-contexts": "10.0.0",
+    "@rocket.chat/ui-kit": "0.36.1",
+    "@rocket.chat/ui-video-conf": "10.0.0",
+    "@rocket.chat/web-ui-registration": "10.0.0"
+  },
+  "changesets": [
+    "brave-brooms-invent",
+    "brown-singers-appear",
+    "bump-patch-1727212585363",
+    "cyan-ladybugs-thank",
+    "dirty-stingrays-beg",
+    "five-coats-rhyme",
+    "four-cherries-kneel",
+    "great-humans-live",
+    "healthy-rivers-nail",
+    "heavy-snails-help",
+    "hot-balloons-travel",
+    "khaki-cameras-glow",
+    "kind-llamas-grin",
+    "late-planes-sniff",
+    "many-balloons-scream",
+    "many-rules-shout",
+    "mighty-drinks-hide",
+    "nasty-tools-enjoy",
+    "pink-swans-teach",
+    "quick-rings-wave",
+    "quiet-cherries-punch",
+    "rich-toes-bow",
+    "rotten-rabbits-brush",
+    "short-drinks-itch",
+    "sixty-spoons-own",
+    "small-crabs-travel",
+    "soft-mirrors-remember",
+    "spicy-rocks-burn",
+    "strong-grapes-brake",
+    "stupid-pigs-share",
+    "sweet-nails-grin",
+    "tame-mayflies-press",
+    "tiny-geckos-kiss",
+    "wet-hats-walk",
+    "wise-avocados-taste",
+    "witty-lemons-type"
+  ]
+}
diff --git a/.changeset/quick-rings-wave.md b/.changeset/quick-rings-wave.md
new file mode 100644
index 000000000000..0ea22897ff45
--- /dev/null
+++ b/.changeset/quick-rings-wave.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+"@rocket.chat/ui-client": minor
+---
+
+Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
diff --git a/.changeset/rotten-rabbits-brush.md b/.changeset/rotten-rabbits-brush.md
new file mode 100644
index 000000000000..916f4cc8034a
--- /dev/null
+++ b/.changeset/rotten-rabbits-brush.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Resolves the issue where outgoing integrations failed to trigger after the version 6.12.0 upgrade by correcting the parameter order from the `afterSaveMessage` callback to listener functions. This ensures the correct room information is passed, restoring the functionality of outgoing webhooks, IRC bridge, Autotranslate, and Engagement Dashboard.
diff --git a/.changeset/small-crabs-travel.md b/.changeset/small-crabs-travel.md
new file mode 100644
index 000000000000..201494a5b70f
--- /dev/null
+++ b/.changeset/small-crabs-travel.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed avatar blob image setting in setUserAvatar method by correcting service handling logic.
diff --git a/.changeset/soft-mirrors-remember.md b/.changeset/soft-mirrors-remember.md
new file mode 100644
index 000000000000..78b005ee6b6e
--- /dev/null
+++ b/.changeset/soft-mirrors-remember.md
@@ -0,0 +1,8 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-services": minor
+"@rocket.chat/model-typings": minor
+"@rocket.chat/rest-typings": minor
+---
+
+New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
diff --git a/.changeset/spicy-rocks-burn.md b/.changeset/spicy-rocks-burn.md
new file mode 100644
index 000000000000..6468dbbec241
--- /dev/null
+++ b/.changeset/spicy-rocks-burn.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed `LivechatSessionTaken` webhook event being called without the `agent` param, which represents the agent serving the room.
diff --git a/.changeset/strong-grapes-brake.md b/.changeset/strong-grapes-brake.md
new file mode 100644
index 000000000000..c867600a8cd2
--- /dev/null
+++ b/.changeset/strong-grapes-brake.md
@@ -0,0 +1,9 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed remaining direct references to external user avatar URLs
+
+Fixed local avatars having priority over external provider
+
+It mainly corrects the behavior of E2E encryption messages and desktop notifications.
diff --git a/.changeset/sweet-nails-grin.md b/.changeset/sweet-nails-grin.md
new file mode 100644
index 000000000000..de240bfc0e3f
--- /dev/null
+++ b/.changeset/sweet-nails-grin.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed inconsistency between the markdown parser from the composer and the rest of the application when using bold and italics in a text.
diff --git a/.changeset/witty-lemons-type.md b/.changeset/witty-lemons-type.md
new file mode 100644
index 000000000000..a007cbe6260e
--- /dev/null
+++ b/.changeset/witty-lemons-type.md
@@ -0,0 +1,10 @@
+---
+'@rocket.chat/core-services': minor
+'@rocket.chat/model-typings': minor
+'@rocket.chat/core-typings': minor
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/ui-client': minor
+'@rocket.chat/meteor': minor
+---
+
+Implemented new feature preview for Sidepanel
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
new file mode 100644
index 000000000000..4a1e67fca33a
--- /dev/null
+++ b/.github/workflows/release-candidate.yml
@@ -0,0 +1,35 @@
+name: Release candidate cut
+on:
+  schedule:
+    - cron: '28 0 20 * *' # run at minute 28 to avoid the chance of delay due to high load on GH
+jobs:
+  new-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref_name }}
+          fetch-depth: 0
+          token: ${{ secrets.CI_PAT }}
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-node
+        with:
+          node-version: 14.21.3
+          cache-modules: true
+          install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - uses: rharkor/caching-for-turbo@v1.5
+
+      - name: Build packages
+        run: yarn build
+
+      - name: 'Start release candidate'
+        uses: ./packages/release-action
+        with:
+          action: next
+          base-ref: ${{ github.ref_name }}
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.CI_PAT }}
diff --git a/_templates/service/new/package.json.ejs.t b/_templates/service/new/package.json.ejs.t
index 2c74278d1ced..0aa1bd69e995 100644
--- a/_templates/service/new/package.json.ejs.t
+++ b/_templates/service/new/package.json.ejs.t
@@ -20,6 +20,7 @@ to: ee/apps/<%= name %>/package.json
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/emitter": "next",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
diff --git a/_templates/service/new/service.ejs.t b/_templates/service/new/service.ejs.t
index 54080d94cf08..699539365259 100644
--- a/_templates/service/new/service.ejs.t
+++ b/_templates/service/new/service.ejs.t
@@ -1,12 +1,10 @@
 ---
 to: ee/apps/<%= name %>/src/service.ts
 ---
-import type { Document } from 'mongodb';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import polka from 'polka';
-import { api } from '@rocket.chat/core-services';
 
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 
 const PORT = process.env.PORT || <%= h.random() %>;
@@ -14,9 +12,7 @@ const PORT = process.env.PORT || <%= h.random() %>;
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 97a246abaca6..c31645ca4ea4 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,186 @@
 # @rocket.chat/meteor
 
+## 6.13.0-rc.1
+
+### Minor Changes
+
+- ([#33212](https://github.com/RocketChat/Rocket.Chat/pull/33212)) Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
+
+### Patch Changes
+
+- ([#33339](https://github.com/RocketChat/Rocket.Chat/pull/33339)) Fixes a problem that caused visitor creation to fail when GDPR setting was enabled and visitor was created via Apps Engine or the deprecated `livechat:registerGuest` method.
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies [2f9eea03d2]:</summary>
+
+  - @rocket.chat/i18n@0.8.0-rc.1
+  - @rocket.chat/ui-client@11.0.0-rc.1
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/web-ui-registration@11.0.0-rc.1
+  - @rocket.chat/gazzodown@11.0.0-rc.1
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.1
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.1
+  - @rocket.chat/ui-video-conf@11.0.0-rc.1
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/license@0.2.8-rc.1
+  - @rocket.chat/omnichannel-services@0.3.5-rc.1
+  - @rocket.chat/pdf-worker@0.2.5-rc.1
+  - @rocket.chat/presence@0.2.8-rc.1
+  - @rocket.chat/api-client@0.2.8-rc.1
+  - @rocket.chat/apps@0.1.8-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/cron@0.1.8-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.1
+  - @rocket.chat/instance-status@0.1.8-rc.1
+  </details>
+
+## 6.13.0-rc.0
+
+### Minor Changes
+
+- ([#33156](https://github.com/RocketChat/Rocket.Chat/pull/33156)) added `sidepanelNavigation` to feature preview list
+
+- ([#32682](https://github.com/RocketChat/Rocket.Chat/pull/32682)) Added support for specifying a unit on departments' creation and update
+
+- ([#33139](https://github.com/RocketChat/Rocket.Chat/pull/33139)) Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
+  However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
+- ([#32729](https://github.com/RocketChat/Rocket.Chat/pull/32729)) Implemented "omnichannel/contacts.update" endpoint to update contacts
+
+- ([#32510](https://github.com/RocketChat/Rocket.Chat/pull/32510)) Added a new setting to enable mentions in end to end encrypted channels
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+- ([#33011](https://github.com/RocketChat/Rocket.Chat/pull/33011)) Return `parent` and `team` information when calling `rooms.info` endpoint
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33114](https://github.com/RocketChat/Rocket.Chat/pull/33114)) Wraps some room settings in an accordion advanced settings section in room edit contextual bar to improve organization
+
+- ([#33160](https://github.com/RocketChat/Rocket.Chat/pull/33160)) Implemented sending email via apps
+
+- ([#32945](https://github.com/RocketChat/Rocket.Chat/pull/32945)) Added a new setting which allows workspace admins to disable email two factor authentication for SSO (OAuth) users. If enabled, SSO users won't be asked for email two factor authentication.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- ([#33317](https://github.com/RocketChat/Rocket.Chat/pull/33317)) Fixed error during sendmessage client stub
+
+- ([#33211](https://github.com/RocketChat/Rocket.Chat/pull/33211)) Allow to use the token from `room.v` when requesting transcript instead of visitor token. Visitors may change their tokens at any time, rendering old conversations impossible to access for them (or for APIs depending on token) as the visitor token won't match the `room.v` token.
+
+- ([#33298](https://github.com/RocketChat/Rocket.Chat/pull/33298)) Fixed a Federation callback not awaiting db call
+
+- ([#32939](https://github.com/RocketChat/Rocket.Chat/pull/32939)) Fixed issue where when you marked a room as unread and you were part of it, sometimes it would mark it as read right after
+
+- ([#33197](https://github.com/RocketChat/Rocket.Chat/pull/33197)) Fixes an issue where the retention policy warning keep displaying even if the retention is disabled inside the room
+
+- ([#33321](https://github.com/RocketChat/Rocket.Chat/pull/33321)) Changed the contextualbar behavior based on chat size instead the viewport
+
+- ([#33246](https://github.com/RocketChat/Rocket.Chat/pull/33246)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
+
+- ([#32999](https://github.com/RocketChat/Rocket.Chat/pull/32999)) Fixes multiple selection for MultiStaticSelectElement in UiKit
+
+- ([#33155](https://github.com/RocketChat/Rocket.Chat/pull/33155)) Fixed a code issue on NPS service. It was passing `startAt` as the expiration date when creating a banner.
+
+- ([#33237](https://github.com/RocketChat/Rocket.Chat/pull/33237)) fixed retention policy max age settings not being respected after upgrade
+
+- ([#33216](https://github.com/RocketChat/Rocket.Chat/pull/33216)) Prevented uiInteraction to subscribe multiple times
+
+- ([#33295](https://github.com/RocketChat/Rocket.Chat/pull/33295)) Resolves the issue where outgoing integrations failed to trigger after the version 6.12.0 upgrade by correcting the parameter order from the `afterSaveMessage` callback to listener functions. This ensures the correct room information is passed, restoring the functionality of outgoing webhooks, IRC bridge, Autotranslate, and Engagement Dashboard.
+
+- ([#33193](https://github.com/RocketChat/Rocket.Chat/pull/33193)) Fixed avatar blob image setting in setUserAvatar method by correcting service handling logic.
+
+- ([#33209](https://github.com/RocketChat/Rocket.Chat/pull/33209)) Fixed `LivechatSessionTaken` webhook event being called without the `agent` param, which represents the agent serving the room.
+
+- ([#33296](https://github.com/RocketChat/Rocket.Chat/pull/33296)) Fixed remaining direct references to external user avatar URLs
+
+  Fixed local avatars having priority over external provider
+
+  It mainly corrects the behavior of E2E encryption messages and desktop notifications.
+
+- ([#33157](https://github.com/RocketChat/Rocket.Chat/pull/33157) by [@csuadev](https://github.com/csuadev)) Fixed inconsistency between the markdown parser from the composer and the rest of the application when using bold and italics in a text.
+
+- ([#33181](https://github.com/RocketChat/Rocket.Chat/pull/33181)) Fixed issue that caused an infinite loading state when uploading a private app to Rocket.Chat
+
+- ([#33158](https://github.com/RocketChat/Rocket.Chat/pull/33158)) Fixes an issue where multi-step modals were closing unexpectedly
+
+- <details><summary>Updated dependencies [bb94c9c67a, 9a38c8e13f, 599762739a, 7c14fd1a80, 9eaefdc892, 274f4f5881, cd0d50016e, 78e6ba4820, 532f08819e, 79c16d315a, 927710d778, 3a161c4310, 0f21fa01a3, 12d6307998]:</summary>
+
+  - @rocket.chat/ui-client@11.0.0-rc.0
+  - @rocket.chat/i18n@0.8.0-rc.0
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-video-conf@11.0.0-rc.0
+  - @rocket.chat/ui-composer@0.3.0-rc.0
+  - @rocket.chat/gazzodown@11.0.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/web-ui-registration@11.0.0-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  - @rocket.chat/omnichannel-services@0.3.4-rc.0
+  - @rocket.chat/apps@0.1.7-rc.0
+  - @rocket.chat/presence@0.2.7-rc.0
+  - @rocket.chat/api-client@0.2.7-rc.0
+  - @rocket.chat/license@0.2.7-rc.0
+  - @rocket.chat/pdf-worker@0.2.4-rc.0
+  - @rocket.chat/cron@0.1.7-rc.0
+  - @rocket.chat/instance-status@0.1.7-rc.0
+  - @rocket.chat/server-cloud-communication@0.0.2
+  </details>
+
+## 6.12.1
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33242](https://github.com/RocketChat/Rocket.Chat/pull/33242) by [@dionisio-bot](https://github.com/dionisio-bot)) Allow to use the token from `room.v` when requesting transcript instead of visitor token. Visitors may change their tokens at any time, rendering old conversations impossible to access for them (or for APIs depending on token) as the visitor token won't match the `room.v` token.
+
+- ([#33268](https://github.com/RocketChat/Rocket.Chat/pull/33268) by [@dionisio-bot](https://github.com/dionisio-bot)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
+
+- ([#33265](https://github.com/RocketChat/Rocket.Chat/pull/33265) by [@dionisio-bot](https://github.com/dionisio-bot)) fixed retention policy max age settings not being respected after upgrade
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/gazzodown@10.0.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/omnichannel-services@0.3.4
+  - @rocket.chat/presence@0.2.7
+  - @rocket.chat/license@0.2.7
+  - @rocket.chat/pdf-worker@0.2.4
+  - @rocket.chat/api-client@0.2.7
+  - @rocket.chat/apps@0.1.7
+  - @rocket.chat/cron@0.1.7
+  - @rocket.chat/fuselage-ui-kit@10.0.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/ui-contexts@10.0.1
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.2.4
+  - @rocket.chat/ui-theming@0.2.1
+  - @rocket.chat/ui-avatar@6.0.1
+  - @rocket.chat/ui-client@10.0.1
+  - @rocket.chat/ui-video-conf@10.0.1
+  - @rocket.chat/web-ui-registration@10.0.1
+  - @rocket.chat/instance-status@0.1.7
+  </details>
+
 ## 6.12.0
 
 ### Minor Changes
diff --git a/apps/meteor/app/api/server/v1/chat.ts b/apps/meteor/app/api/server/v1/chat.ts
index 3ccc9caeafa0..d04d1a2418b5 100644
--- a/apps/meteor/app/api/server/v1/chat.ts
+++ b/apps/meteor/app/api/server/v1/chat.ts
@@ -376,7 +376,7 @@ API.v1.addRoute(
 				throw new Meteor.Error('error-emoji-param-not-provided', 'The required "emoji" param is missing.');
 			}
 
-			await executeSetReaction(this.userId, emoji, msg._id, this.bodyParams.shouldReact);
+			await executeSetReaction(this.userId, emoji, msg, this.bodyParams.shouldReact);
 
 			return API.v1.success();
 		},
diff --git a/apps/meteor/app/api/server/v1/rooms.ts b/apps/meteor/app/api/server/v1/rooms.ts
index 5da59d977fb1..117ae3851c43 100644
--- a/apps/meteor/app/api/server/v1/rooms.ts
+++ b/apps/meteor/app/api/server/v1/rooms.ts
@@ -40,7 +40,7 @@ import {
 	findRoomsAvailableForTeams,
 } from '../lib/rooms';
 
-async function findRoomByIdOrName({
+export async function findRoomByIdOrName({
 	params,
 	checkedArchived = true,
 }: {
@@ -365,7 +365,12 @@ API.v1.addRoute(
 	{ authRequired: true, validateParams: isRoomsCleanHistoryProps },
 	{
 		async post() {
-			const { _id } = await findRoomByIdOrName({ params: this.bodyParams });
+			const room = await findRoomByIdOrName({ params: this.bodyParams });
+			const { _id } = room;
+
+			if (!room || !(await canAccessRoomAsync(room, { _id: this.userId }))) {
+				return API.v1.failure('User does not have access to the room [error-not-allowed]', 'error-not-allowed');
+			}
 
 			const {
 				latest,
@@ -420,7 +425,7 @@ API.v1.addRoute(
 			const discussionParent =
 				room.prid &&
 				(await Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | 'prid' | 'u'>>(room.prid, {
-					projection: { name: 1, fname: 1, t: 1, prid: 1, u: 1 },
+					projection: { name: 1, fname: 1, t: 1, prid: 1, u: 1, sidepanel: 1 },
 				}));
 			const { team, parentRoom } = await Team.getRoomInfo(room);
 			const parent = discussionParent || parentRoom;
diff --git a/apps/meteor/app/api/server/v1/teams.ts b/apps/meteor/app/api/server/v1/teams.ts
index f64f8c820575..acb6cba2bac7 100644
--- a/apps/meteor/app/api/server/v1/teams.ts
+++ b/apps/meteor/app/api/server/v1/teams.ts
@@ -11,6 +11,7 @@ import {
 	isTeamsDeleteProps,
 	isTeamsLeaveProps,
 	isTeamsUpdateProps,
+	isTeamsListChildrenProps,
 } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Match, check } from 'meteor/check';
@@ -375,6 +376,44 @@ API.v1.addRoute(
 	},
 );
 
+const getTeamByIdOrNameOrParentRoom = async (
+	params: { teamId: string } | { teamName: string } | { roomId: string },
+): Promise<Pick<ITeam, 'type' | 'roomId' | '_id'> | null> => {
+	if ('teamId' in params && params.teamId) {
+		return Team.getOneById<ITeam>(params.teamId, { projection: { type: 1, roomId: 1 } });
+	}
+	if ('teamName' in params && params.teamName) {
+		return Team.getOneByName(params.teamName, { projection: { type: 1, roomId: 1 } });
+	}
+	if ('roomId' in params && params.roomId) {
+		return Team.getOneByRoomId(params.roomId, { projection: { type: 1, roomId: 1 } });
+	}
+	return null;
+};
+
+// This should accept a teamId, filter (search by name on rooms collection) and sort/pagination
+// should return a list of rooms/discussions from the team. the discussions will only be returned from the main room
+API.v1.addRoute(
+	'teams.listChildren',
+	{ authRequired: true, validateParams: isTeamsListChildrenProps },
+	{
+		async get() {
+			const { offset, count } = await getPaginationItems(this.queryParams);
+			const { sort } = await this.parseJsonQuery();
+			const { filter, type } = this.queryParams;
+
+			const team = await getTeamByIdOrNameOrParentRoom(this.queryParams);
+			if (!team) {
+				return API.v1.notFound();
+			}
+
+			const data = await Team.listChildren(this.userId, team, filter, type, sort, offset, count);
+
+			return API.v1.success({ ...data, offset, count });
+		},
+	},
+);
+
 API.v1.addRoute(
 	'teams.members',
 	{ authRequired: true },
diff --git a/apps/meteor/app/autotranslate/server/autotranslate.ts b/apps/meteor/app/autotranslate/server/autotranslate.ts
index f3c6d9e55fdb..23e1b189a792 100644
--- a/apps/meteor/app/autotranslate/server/autotranslate.ts
+++ b/apps/meteor/app/autotranslate/server/autotranslate.ts
@@ -113,7 +113,12 @@ export class TranslationProviderRegistry {
 			return;
 		}
 
-		callbacks.add('afterSaveMessage', provider.translateMessage.bind(provider), callbacks.priority.MEDIUM, 'autotranslate');
+		callbacks.add(
+			'afterSaveMessage',
+			(message, { room }) => provider.translateMessage(message, { room }),
+			callbacks.priority.MEDIUM,
+			'autotranslate',
+		);
 	}
 }
 
diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
index bbd6f208f35a..50224cb89dbb 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.ts
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
@@ -6,6 +6,7 @@ import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import EJSON from 'ejson';
 import _ from 'lodash';
+import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
@@ -308,8 +309,8 @@ class E2E extends Emitter {
 
 	getKeysFromLocalStorage(): KeyPair {
 		return {
-			public_key: Meteor._localStorage.getItem('public_key'),
-			private_key: Meteor._localStorage.getItem('private_key'),
+			public_key: Accounts.storageLocation.getItem('public_key'),
+			private_key: Accounts.storageLocation.getItem('private_key'),
 		};
 	}
 
@@ -332,7 +333,7 @@ class E2E extends Emitter {
 					imperativeModal.close();
 				},
 				onConfirm: () => {
-					Meteor._localStorage.removeItem('e2e.randomPassword');
+					Accounts.storageLocation.removeItem('e2e.randomPassword');
 					this.setState(E2EEState.READY);
 					dispatchToastMessage({ type: 'success', message: t('End_To_End_Encryption_Enabled') });
 					this.closeAlert();
@@ -394,7 +395,7 @@ class E2E extends Emitter {
 			await this.persistKeys(this.getKeysFromLocalStorage(), await this.createRandomPassword());
 		}
 
-		const randomPassword = Meteor._localStorage.getItem('e2e.randomPassword');
+		const randomPassword = Accounts.storageLocation.getItem('e2e.randomPassword');
 		if (randomPassword) {
 			this.setState(E2EEState.SAVE_PASSWORD);
 			this.openAlert({
@@ -412,8 +413,8 @@ class E2E extends Emitter {
 		this.log('-> Stop Client');
 		this.closeAlert();
 
-		Meteor._localStorage.removeItem('public_key');
-		Meteor._localStorage.removeItem('private_key');
+		Accounts.storageLocation.removeItem('public_key');
+		Accounts.storageLocation.removeItem('private_key');
 		this.instancesByRoomId = {};
 		this.privateKey = undefined;
 		this.started = false;
@@ -425,8 +426,8 @@ class E2E extends Emitter {
 	async changePassword(newPassword: string): Promise<void> {
 		await this.persistKeys(this.getKeysFromLocalStorage(), newPassword, { force: true });
 
-		if (Meteor._localStorage.getItem('e2e.randomPassword')) {
-			Meteor._localStorage.setItem('e2e.randomPassword', newPassword);
+		if (Accounts.storageLocation.getItem('e2e.randomPassword')) {
+			Accounts.storageLocation.setItem('e2e.randomPassword', newPassword);
 		}
 	}
 
@@ -447,12 +448,12 @@ class E2E extends Emitter {
 	}
 
 	async loadKeys({ public_key, private_key }: { public_key: string; private_key: string }): Promise<void> {
-		Meteor._localStorage.setItem('public_key', public_key);
+		Accounts.storageLocation.setItem('public_key', public_key);
 
 		try {
 			this.privateKey = await importRSAKey(EJSON.parse(private_key), ['decrypt']);
 
-			Meteor._localStorage.setItem('private_key', private_key);
+			Accounts.storageLocation.setItem('private_key', private_key);
 		} catch (error) {
 			this.setState(E2EEState.ERROR);
 			return this.error('Error importing private key: ', error);
@@ -474,7 +475,7 @@ class E2E extends Emitter {
 		try {
 			const publicKey = await exportJWKKey(key.publicKey);
 
-			Meteor._localStorage.setItem('public_key', JSON.stringify(publicKey));
+			Accounts.storageLocation.setItem('public_key', JSON.stringify(publicKey));
 		} catch (error) {
 			this.setState(E2EEState.ERROR);
 			return this.error('Error exporting public key: ', error);
@@ -483,7 +484,7 @@ class E2E extends Emitter {
 		try {
 			const privateKey = await exportJWKKey(key.privateKey);
 
-			Meteor._localStorage.setItem('private_key', JSON.stringify(privateKey));
+			Accounts.storageLocation.setItem('private_key', JSON.stringify(privateKey));
 		} catch (error) {
 			this.setState(E2EEState.ERROR);
 			return this.error('Error exporting private key: ', error);
@@ -498,7 +499,7 @@ class E2E extends Emitter {
 
 	async createRandomPassword(): Promise<string> {
 		const randomPassword = await generateMnemonicPhrase(5);
-		Meteor._localStorage.setItem('e2e.randomPassword', randomPassword);
+		Accounts.storageLocation.setItem('e2e.randomPassword', randomPassword);
 		return randomPassword;
 	}
 
diff --git a/apps/meteor/app/federation/server/hooks/afterUnsetReaction.js b/apps/meteor/app/federation/server/hooks/afterUnsetReaction.js
index 51181d88ab9e..995146b290bf 100644
--- a/apps/meteor/app/federation/server/hooks/afterUnsetReaction.js
+++ b/apps/meteor/app/federation/server/hooks/afterUnsetReaction.js
@@ -6,7 +6,7 @@ import { getFederationDomain } from '../lib/getFederationDomain';
 import { clientLogger } from '../lib/logger';
 
 async function afterUnsetReaction(message, { user, reaction }) {
-	const room = Rooms.findOneById(message.rid, { fields: { federation: 1 } });
+	const room = await Rooms.findOneById(message.rid, { projection: { federation: 1 } });
 
 	// If there are not federated users on this room, ignore it
 	if (!hasExternalDomain(room)) {
diff --git a/apps/meteor/app/integrations/server/triggers.ts b/apps/meteor/app/integrations/server/triggers.ts
index cdf8acda6a21..64b95827645f 100644
--- a/apps/meteor/app/integrations/server/triggers.ts
+++ b/apps/meteor/app/integrations/server/triggers.ts
@@ -8,7 +8,12 @@ const callbackHandler = function _callbackHandler(eventType: string) {
 	};
 };
 
-callbacks.add('afterSaveMessage', callbackHandler('sendMessage'), callbacks.priority.LOW, 'integrations-sendMessage');
+callbacks.add(
+	'afterSaveMessage',
+	(message, { room }) => callbackHandler('sendMessage')(message, room),
+	callbacks.priority.LOW,
+	'integrations-sendMessage',
+);
 callbacks.add('afterCreateChannel', callbackHandler('roomCreated'), callbacks.priority.LOW, 'integrations-roomCreated');
 callbacks.add('afterCreatePrivateGroup', callbackHandler('roomCreated'), callbacks.priority.LOW, 'integrations-roomCreated');
 callbacks.add('afterCreateUser', callbackHandler('userCreated'), callbacks.priority.LOW, 'integrations-userCreated');
diff --git a/apps/meteor/app/irc/server/irc-bridge/index.js b/apps/meteor/app/irc/server/irc-bridge/index.js
index 09b7a3568362..bc5b4f0bc33f 100644
--- a/apps/meteor/app/irc/server/irc-bridge/index.js
+++ b/apps/meteor/app/irc/server/irc-bridge/index.js
@@ -209,7 +209,7 @@ class Bridge {
 		// Chatting
 		callbacks.add(
 			'afterSaveMessage',
-			this.onMessageReceived.bind(this, 'local', 'onSaveMessage'),
+			(message, { room }) => this.onMessageReceived('local', 'onSaveMessage', message, room),
 			callbacks.priority.LOW,
 			'irc-on-save-message',
 		);
diff --git a/apps/meteor/app/lib/client/methods/sendMessage.ts b/apps/meteor/app/lib/client/methods/sendMessage.ts
index bdaca587493a..19220f901458 100644
--- a/apps/meteor/app/lib/client/methods/sendMessage.ts
+++ b/apps/meteor/app/lib/client/methods/sendMessage.ts
@@ -43,7 +43,7 @@ Meteor.methods<ServerMethods>({
 
 		await onClientMessageReceived(message as IMessage).then((message) => {
 			ChatMessage.insert(message);
-			return callbacks.run('afterSaveMessage', message, room);
+			return callbacks.run('afterSaveMessage', message, { room });
 		});
 	},
 });
diff --git a/apps/meteor/app/lib/server/functions/isTheLastMessage.ts b/apps/meteor/app/lib/server/functions/isTheLastMessage.ts
index f8e5be94002c..f1f1fb4c1497 100644
--- a/apps/meteor/app/lib/server/functions/isTheLastMessage.ts
+++ b/apps/meteor/app/lib/server/functions/isTheLastMessage.ts
@@ -1,7 +1,7 @@
-import type { IMessage, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, AtLeast } from '@rocket.chat/core-typings';
 
 import { settings } from '../../../settings/server';
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-export const isTheLastMessage = (room: IRoom, message: Pick<IMessage, '_id'>) =>
+export const isTheLastMessage = (room: AtLeast<IRoom, 'lastMessage'>, message: Pick<IMessage, '_id'>) =>
 	settings.get('Store_Last_Message') && (!room.lastMessage || room.lastMessage._id === message._id);
diff --git a/apps/meteor/app/lib/server/functions/setUsername.ts b/apps/meteor/app/lib/server/functions/setUsername.ts
index 5b2b1923da75..c4d2c47c6d9d 100644
--- a/apps/meteor/app/lib/server/functions/setUsername.ts
+++ b/apps/meteor/app/lib/server/functions/setUsername.ts
@@ -102,23 +102,22 @@ export const _setUsername = async function (userId: string, u: string, fullUser:
 	// Set new username*
 	await Users.setUsername(user._id, username);
 	user.username = username;
+
 	if (!previousUsername && settings.get('Accounts_SetDefaultAvatar') === true) {
-		// eslint-disable-next-line @typescript-eslint/ban-types
-		const avatarSuggestions = (await getAvatarSuggestionForUser(user)) as {};
-		let gravatar;
-		for await (const service of Object.keys(avatarSuggestions)) {
-			const avatarData = avatarSuggestions[+service as keyof typeof avatarSuggestions];
+		const avatarSuggestions = await getAvatarSuggestionForUser(user);
+		let avatarData;
+		let serviceName = 'gravatar';
+
+		for (const service of Object.keys(avatarSuggestions)) {
+			avatarData = avatarSuggestions[service];
 			if (service !== 'gravatar') {
-				// eslint-disable-next-line dot-notation
-				await setUserAvatar(user, avatarData['blob'], avatarData['contentType'], service);
-				gravatar = null;
+				serviceName = service;
 				break;
 			}
-			gravatar = avatarData;
 		}
-		if (gravatar != null) {
-			// eslint-disable-next-line dot-notation
-			await setUserAvatar(user, gravatar['blob'], gravatar['contentType'], 'gravatar');
+
+		if (avatarData) {
+			await setUserAvatar(user, avatarData.blob, avatarData.contentType, serviceName);
 		}
 	}
 
diff --git a/apps/meteor/app/lib/server/methods/cleanRoomHistory.ts b/apps/meteor/app/lib/server/methods/cleanRoomHistory.ts
index d6136eee9131..c804128d27bd 100644
--- a/apps/meteor/app/lib/server/methods/cleanRoomHistory.ts
+++ b/apps/meteor/app/lib/server/methods/cleanRoomHistory.ts
@@ -2,6 +2,8 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { findRoomByIdOrName } from '../../../api/server/v1/rooms';
+import { canAccessRoomAsync } from '../../../authorization/server';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { cleanRoomHistory } from '../functions/cleanRoomHistory';
 
@@ -56,6 +58,12 @@ Meteor.methods<ServerMethods>({
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'cleanRoomHistory' });
 		}
 
+		const room = await findRoomByIdOrName({ params: { roomId } });
+
+		if (!room || !(await canAccessRoomAsync(room, { _id: userId }))) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'cleanRoomHistory' });
+		}
+
 		return cleanRoomHistory({
 			rid: roomId,
 			latest,
diff --git a/apps/meteor/app/lib/server/methods/updateMessage.ts b/apps/meteor/app/lib/server/methods/updateMessage.ts
index 8cebe563cd23..c03208a438e9 100644
--- a/apps/meteor/app/lib/server/methods/updateMessage.ts
+++ b/apps/meteor/app/lib/server/methods/updateMessage.ts
@@ -10,7 +10,7 @@ import { hasPermissionAsync } from '../../../authorization/server/functions/hasP
 import { settings } from '../../../settings/server';
 import { updateMessage } from '../functions/updateMessage';
 
-const allowedEditedFields = ['tshow', 'alias', 'attachments', 'avatar', 'emoji', 'msg', 'customFields', 'content'];
+const allowedEditedFields = ['tshow', 'alias', 'attachments', 'avatar', 'emoji', 'msg', 'customFields', 'content', 'e2eMentions'];
 
 export async function executeUpdateMessage(
 	uid: IUser['_id'],
diff --git a/apps/meteor/app/livechat/imports/server/rest/departments.ts b/apps/meteor/app/livechat/imports/server/rest/departments.ts
index 252a83855700..e56feeac2fa3 100644
--- a/apps/meteor/app/livechat/imports/server/rest/departments.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/departments.ts
@@ -57,10 +57,18 @@ API.v1.addRoute(
 			check(this.bodyParams, {
 				department: Object,
 				agents: Match.Maybe(Array),
+				departmentUnit: Match.Maybe({ _id: Match.Optional(String) }),
 			});
 
 			const agents = this.bodyParams.agents ? { upsert: this.bodyParams.agents } : {};
-			const department = await LivechatTs.saveDepartment(null, this.bodyParams.department as ILivechatDepartment, agents);
+			const { departmentUnit } = this.bodyParams;
+			const department = await LivechatTs.saveDepartment(
+				this.userId,
+				null,
+				this.bodyParams.department as ILivechatDepartment,
+				agents,
+				departmentUnit || {},
+			);
 
 			if (department) {
 				return API.v1.success({
@@ -112,17 +120,18 @@ API.v1.addRoute(
 			check(this.bodyParams, {
 				department: Object,
 				agents: Match.Maybe(Array),
+				departmentUnit: Match.Maybe({ _id: Match.Optional(String) }),
 			});
 
 			const { _id } = this.urlParams;
-			const { department, agents } = this.bodyParams;
+			const { department, agents, departmentUnit } = this.bodyParams;
 
 			if (!permissionToSave) {
 				throw new Error('error-not-allowed');
 			}
 
 			const agentParam = permissionToAddAgents && agents ? { upsert: agents } : {};
-			await LivechatTs.saveDepartment(_id, department, agentParam);
+			await LivechatTs.saveDepartment(this.userId, _id, department, agentParam, departmentUnit || {});
 
 			return API.v1.success({
 				department: await LivechatDepartment.findOneById(_id),
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index 89d125033977..6c2d655f4c95 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -589,6 +589,10 @@ class LivechatClass {
 		}
 	}
 
+	isValidObject(obj: unknown): obj is Record<string, any> {
+		return typeof obj === 'object' && obj !== null;
+	}
+
 	async registerGuest({
 		id,
 		token,
@@ -654,10 +658,10 @@ class LivechatClass {
 			visitorDataToUpdate.status = status;
 			visitorDataToUpdate.ts = new Date();
 
-			if (settings.get('Livechat_Allow_collect_and_store_HTTP_header_informations')) {
+			if (settings.get('Livechat_Allow_collect_and_store_HTTP_header_informations') && Livechat.isValidObject(connectionData)) {
 				Livechat.logger.debug(`Saving connection data for visitor ${token}`);
 				const { httpHeaders, clientAddress } = connectionData;
-				if (httpHeaders) {
+				if (Livechat.isValidObject(httpHeaders)) {
 					visitorDataToUpdate.userAgent = httpHeaders['user-agent'];
 					visitorDataToUpdate.ip = httpHeaders['x-real-ip'] || httpHeaders['x-forwarded-for'] || clientAddress;
 					visitorDataToUpdate.host = httpHeaders?.host;
@@ -1789,18 +1793,37 @@ class LivechatClass {
 	 * @param {string|null} _id - The department id
 	 * @param {Partial<import('@rocket.chat/core-typings').ILivechatDepartment>} departmentData
 	 * @param {{upsert?: { agentId: string; count?: number; order?: number; }[], remove?: { agentId: string; count?: number; order?: number; }}} [departmentAgents] - The department agents
+	 * @param {{_id?: string}} [departmentUnit] - The department's unit id
 	 */
 	async saveDepartment(
+		userId: string,
 		_id: string | null,
 		departmentData: LivechatDepartmentDTO,
 		departmentAgents?: {
 			upsert?: { agentId: string; count?: number; order?: number }[];
 			remove?: { agentId: string; count?: number; order?: number };
 		},
+		departmentUnit?: { _id?: string },
 	) {
 		check(_id, Match.Maybe(String));
+		if (departmentUnit?._id !== undefined && typeof departmentUnit._id !== 'string') {
+			throw new Meteor.Error('error-invalid-department-unit', 'Invalid department unit id provided', {
+				method: 'livechat:saveDepartment',
+			});
+		}
+
+		const department = _id
+			? await LivechatDepartment.findOneById(_id, { projection: { _id: 1, archived: 1, enabled: 1, parentId: 1 } })
+			: null;
 
-		const department = _id ? await LivechatDepartment.findOneById(_id, { projection: { _id: 1, archived: 1, enabled: 1 } }) : null;
+		if (departmentUnit && !departmentUnit._id && department && department.parentId) {
+			const isLastDepartmentInUnit = (await LivechatDepartment.countDepartmentsInUnit(department.parentId)) === 1;
+			if (isLastDepartmentInUnit) {
+				throw new Meteor.Error('error-unit-cant-be-empty', "The last department in a unit can't be removed", {
+					method: 'livechat:saveDepartment',
+				});
+			}
+		}
 
 		if (!department && !(await isDepartmentCreationAvailable())) {
 			throw new Meteor.Error('error-max-departments-number-reached', 'Maximum number of departments reached', {
@@ -1887,6 +1910,10 @@ class LivechatClass {
 			await callbacks.run('livechat.afterDepartmentDisabled', departmentDB);
 		}
 
+		if (departmentUnit) {
+			await callbacks.run('livechat.manageDepartmentUnit', { userId, departmentId: departmentDB._id, unitId: departmentUnit._id });
+		}
+
 		return departmentDB;
 	}
 }
diff --git a/apps/meteor/app/livechat/server/lib/RoutingManager.ts b/apps/meteor/app/livechat/server/lib/RoutingManager.ts
index f4a2288305e5..28e5c72efc16 100644
--- a/apps/meteor/app/livechat/server/lib/RoutingManager.ts
+++ b/apps/meteor/app/livechat/server/lib/RoutingManager.ts
@@ -265,11 +265,20 @@ export const RoutingManager: Routing = {
 
 		logger.info(`Inquiry ${inquiry._id} taken by agent ${agent.agentId}`);
 
+		// assignAgent changes the room data to add the agent serving the conversation. afterTakeInquiry expects room object to be updated
+		const inq = await this.assignAgent(inquiry as InquiryWithAgentInfo, room, agent);
+		const roomAfterUpdate = await LivechatRooms.findOneById(rid);
+
+		if (!roomAfterUpdate) {
+			// This should never happen
+			throw new Error('error-room-not-found');
+		}
+
 		callbacks.runAsync(
 			'livechat.afterTakeInquiry',
 			{
-				inquiry: await this.assignAgent(inquiry as InquiryWithAgentInfo, room, agent),
-				room,
+				inquiry: inq,
+				room: roomAfterUpdate,
 			},
 			agent,
 		);
@@ -282,7 +291,7 @@ export const RoutingManager: Routing = {
 			queuedAt: undefined,
 		});
 
-		return LivechatRooms.findOneById(rid);
+		return roomAfterUpdate;
 	},
 
 	async transferRoom(room, guest, transferData) {
diff --git a/apps/meteor/app/livechat/server/methods/saveDepartment.ts b/apps/meteor/app/livechat/server/methods/saveDepartment.ts
index b4833523ab3f..659f85f49945 100644
--- a/apps/meteor/app/livechat/server/methods/saveDepartment.ts
+++ b/apps/meteor/app/livechat/server/methods/saveDepartment.ts
@@ -30,12 +30,13 @@ declare module '@rocket.chat/ddp-client' {
 						order?: number | undefined;
 				  }[]
 				| undefined,
+			departmentUnit?: { _id?: string },
 		) => ILivechatDepartment;
 	}
 }
 
 Meteor.methods<ServerMethods>({
-	async 'livechat:saveDepartment'(_id, departmentData, departmentAgents) {
+	async 'livechat:saveDepartment'(_id, departmentData, departmentAgents, departmentUnit) {
 		const uid = Meteor.userId();
 		if (!uid || !(await hasPermissionAsync(uid, 'manage-livechat-departments'))) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
@@ -43,6 +44,6 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		return Livechat.saveDepartment(_id, departmentData, { upsert: departmentAgents });
+		return Livechat.saveDepartment(uid, _id, departmentData, { upsert: departmentAgents }, departmentUnit);
 	},
 });
diff --git a/apps/meteor/app/mentions/server/Mentions.ts b/apps/meteor/app/mentions/server/Mentions.ts
index 9eda56fea21c..779af2087932 100644
--- a/apps/meteor/app/mentions/server/Mentions.ts
+++ b/apps/meteor/app/mentions/server/Mentions.ts
@@ -2,7 +2,7 @@
  * Mentions is a named function that will process Mentions
  * @param {Object} message - The message object
  */
-import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
+import { isE2EEMessage, type IMessage, type IRoom, type IUser } from '@rocket.chat/core-typings';
 
 import { type MentionsParserArgs, MentionsParser } from '../lib/MentionsParser';
 
@@ -43,8 +43,13 @@ export class MentionsServer extends MentionsParser {
 			});
 	}
 
-	async getUsersByMentions({ msg, rid, u: sender }: Pick<IMessage, 'msg' | 'rid' | 'u'>): Promise<IMessage['mentions']> {
-		const mentions = this.getUserMentions(msg);
+	async getUsersByMentions(message: IMessage): Promise<IMessage['mentions']> {
+		const { msg, rid, u: sender, e2eMentions }: Pick<IMessage, 'msg' | 'rid' | 'u' | 't' | 'e2eMentions'> = message;
+
+		const mentions =
+			isE2EEMessage(message) && e2eMentions?.e2eUserMentions && e2eMentions?.e2eUserMentions.length > 0
+				? e2eMentions?.e2eUserMentions
+				: this.getUserMentions(msg);
 		const mentionsAll: { _id: string; username: string }[] = [];
 		const userMentions = [];
 
@@ -67,8 +72,13 @@ export class MentionsServer extends MentionsParser {
 		return [...mentionsAll, ...(userMentions.length ? await this.getUsers(userMentions) : [])];
 	}
 
-	async getChannelbyMentions({ msg }: Pick<IMessage, 'msg'>) {
-		const channels = this.getChannelMentions(msg);
+	async getChannelbyMentions(message: IMessage) {
+		const { msg, e2eMentions }: Pick<IMessage, 'msg' | 't' | 'e2eMentions'> = message;
+
+		const channels =
+			isE2EEMessage(message) && e2eMentions?.e2eChannelMentions && e2eMentions?.e2eChannelMentions.length > 0
+				? e2eMentions?.e2eChannelMentions
+				: this.getChannelMentions(msg);
 		return this.getChannels(channels.map((c) => c.trim().substr(1)));
 	}
 
diff --git a/apps/meteor/app/message-mark-as-unread/client/actionButton.ts b/apps/meteor/app/message-mark-as-unread/client/actionButton.ts
index fc4a9d80c43c..e1e35d216029 100644
--- a/apps/meteor/app/message-mark-as-unread/client/actionButton.ts
+++ b/apps/meteor/app/message-mark-as-unread/client/actionButton.ts
@@ -19,7 +19,6 @@ Meteor.startup(() => {
 			const { message = messageArgs(this).msg } = props;
 
 			try {
-				await sdk.call('unreadMessages', message);
 				const subscription = ChatSubscription.findOne({
 					rid: message.rid,
 				});
@@ -27,8 +26,9 @@ Meteor.startup(() => {
 				if (subscription == null) {
 					return;
 				}
+				router.navigate('/home');
 				await LegacyRoomManager.close(subscription.t + subscription.name);
-				return router.navigate('/home');
+				await sdk.call('unreadMessages', message);
 			} catch (error) {
 				dispatchToastMessage({ type: 'error', message: error });
 			}
diff --git a/apps/meteor/app/reactions/client/methods/setReaction.ts b/apps/meteor/app/reactions/client/methods/setReaction.ts
index ed15cda9ab8e..1744d49c0ceb 100644
--- a/apps/meteor/app/reactions/client/methods/setReaction.ts
+++ b/apps/meteor/app/reactions/client/methods/setReaction.ts
@@ -3,7 +3,6 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
 import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
-import { callbacks } from '../../../../lib/callbacks';
 import { emoji } from '../../../emoji/client';
 import { Messages, ChatRoom, Subscriptions } from '../../../models/client';
 
@@ -55,10 +54,8 @@ Meteor.methods<ServerMethods>({
 			if (!message.reactions || typeof message.reactions !== 'object' || Object.keys(message.reactions).length === 0) {
 				delete message.reactions;
 				Messages.update({ _id: messageId }, { $unset: { reactions: 1 } });
-				await callbacks.run('unsetReaction', messageId, reaction);
 			} else {
 				Messages.update({ _id: messageId }, { $set: { reactions: message.reactions } });
-				await callbacks.run('setReaction', messageId, reaction);
 			}
 		} else {
 			if (!message.reactions) {
@@ -72,7 +69,6 @@ Meteor.methods<ServerMethods>({
 			message.reactions[reaction].usernames.push(user.username);
 
 			Messages.update({ _id: messageId }, { $set: { reactions: message.reactions } });
-			await callbacks.run('setReaction', messageId, reaction);
 		}
 	},
 });
diff --git a/apps/meteor/app/reactions/server/setReaction.ts b/apps/meteor/app/reactions/server/setReaction.ts
index d513c8dda6a5..be6e5aed4a54 100644
--- a/apps/meteor/app/reactions/server/setReaction.ts
+++ b/apps/meteor/app/reactions/server/setReaction.ts
@@ -4,7 +4,6 @@ import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Messages, EmojiCustom, Rooms, Users } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
-import _ from 'underscore';
 
 import { callbacks } from '../../../lib/callbacks';
 import { i18n } from '../../../server/lib/i18n';
@@ -12,26 +11,39 @@ import { canAccessRoomAsync } from '../../authorization/server';
 import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
 import { emoji } from '../../emoji/server';
 import { isTheLastMessage } from '../../lib/server/functions/isTheLastMessage';
-import { notifyOnRoomChangedById, notifyOnMessageChange } from '../../lib/server/lib/notifyListener';
+import { notifyOnMessageChange } from '../../lib/server/lib/notifyListener';
 
-const removeUserReaction = (message: IMessage, reaction: string, username: string) => {
+export const removeUserReaction = (message: IMessage, reaction: string, username: string) => {
 	if (!message.reactions) {
 		return message;
 	}
 
-	message.reactions[reaction].usernames.splice(message.reactions[reaction].usernames.indexOf(username), 1);
-	if (message.reactions[reaction].usernames.length === 0) {
+	const idx = message.reactions[reaction].usernames.indexOf(username);
+
+	// user not found in reaction array
+	if (idx === -1) {
+		return message;
+	}
+
+	message.reactions[reaction].usernames.splice(idx, 1);
+	if (!message.reactions[reaction].usernames.length) {
 		delete message.reactions[reaction];
 	}
 	return message;
 };
 
-async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction: string, shouldReact?: boolean) {
-	reaction = `:${reaction.replace(/:/g, '')}:`;
+export async function setReaction(
+	room: Pick<IRoom, '_id' | 'muted' | 'unmuted' | 'reactWhenReadOnly' | 'ro' | 'lastMessage' | 'federated'>,
+	user: IUser,
+	message: IMessage,
+	reaction: string,
+	userAlreadyReacted?: boolean,
+) {
+	await Message.beforeReacted(message, room);
 
-	if (!emoji.list[reaction] && (await EmojiCustom.findByNameOrAlias(reaction, {}).count()) === 0) {
-		throw new Meteor.Error('error-not-allowed', 'Invalid emoji provided.', {
-			method: 'setReaction',
+	if (Array.isArray(room.muted) && room.muted.includes(user.username as string)) {
+		throw new Meteor.Error('error-not-allowed', i18n.t('You_have_been_muted', { lng: user.language }), {
+			rid: room._id,
 		});
 	}
 
@@ -42,51 +54,23 @@ async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction
 		}
 	}
 
-	if (Array.isArray(room.muted) && room.muted.indexOf(user.username as string) !== -1) {
-		throw new Meteor.Error('error-not-allowed', i18n.t('You_have_been_muted', { lng: user.language }), {
-			rid: room._id,
-		});
-	}
-
-	// if (!('reactions' in message)) {
-	// 	return;
-	// }
-
-	await Message.beforeReacted(message, room);
-
-	const userAlreadyReacted =
-		message.reactions &&
-		Boolean(message.reactions[reaction]) &&
-		message.reactions[reaction].usernames.indexOf(user.username as string) !== -1;
-	// When shouldReact was not informed, toggle the reaction.
-	if (shouldReact === undefined) {
-		shouldReact = !userAlreadyReacted;
-	}
-
-	if (userAlreadyReacted === shouldReact) {
-		return;
-	}
-
 	let isReacted;
-
 	if (userAlreadyReacted) {
 		const oldMessage = JSON.parse(JSON.stringify(message));
 		removeUserReaction(message, reaction, user.username as string);
-		if (_.isEmpty(message.reactions)) {
+		if (Object.keys(message.reactions || {}).length === 0) {
 			delete message.reactions;
+			await Messages.unsetReactions(message._id);
 			if (isTheLastMessage(room, message)) {
 				await Rooms.unsetReactionsInLastMessage(room._id);
-				void notifyOnRoomChangedById(room._id);
 			}
-			await Messages.unsetReactions(message._id);
 		} else {
 			await Messages.setReactions(message._id, message.reactions);
 			if (isTheLastMessage(room, message)) {
 				await Rooms.setReactionsInLastMessage(room._id, message.reactions);
 			}
 		}
-		await callbacks.run('unsetReaction', message._id, reaction);
-		await callbacks.run('afterUnsetReaction', message, { user, reaction, shouldReact, oldMessage });
+		void callbacks.run('afterUnsetReaction', message, { user, reaction, shouldReact: false, oldMessage });
 
 		isReacted = false;
 	} else {
@@ -102,34 +86,61 @@ async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction
 		await Messages.setReactions(message._id, message.reactions);
 		if (isTheLastMessage(room, message)) {
 			await Rooms.setReactionsInLastMessage(room._id, message.reactions);
-			void notifyOnRoomChangedById(room._id);
 		}
-		await callbacks.run('setReaction', message._id, reaction);
-		await callbacks.run('afterSetReaction', message, { user, reaction, shouldReact });
+
+		void callbacks.run('afterSetReaction', message, { user, reaction, shouldReact: true });
 
 		isReacted = true;
 	}
 
-	await Apps.self?.triggerEvent(AppEvents.IPostMessageReacted, message, user, reaction, isReacted);
+	void Apps.self?.triggerEvent(AppEvents.IPostMessageReacted, message, user, reaction, isReacted);
 
 	void notifyOnMessageChange({
 		id: message._id,
 	});
 }
 
-export async function executeSetReaction(userId: string, reaction: string, messageId: IMessage['_id'], shouldReact?: boolean) {
-	const user = await Users.findOneById(userId);
+export async function executeSetReaction(
+	userId: string,
+	reaction: string,
+	messageParam: IMessage['_id'] | IMessage,
+	shouldReact?: boolean,
+) {
+	// Check if the emoji is valid before proceeding
+	const reactionWithoutColons = reaction.replace(/:/g, '');
+	reaction = `:${reactionWithoutColons}:`;
+
+	if (!emoji.list[reaction] && (await EmojiCustom.countByNameOrAlias(reactionWithoutColons)) === 0) {
+		throw new Meteor.Error('error-not-allowed', 'Invalid emoji provided.', {
+			method: 'setReaction',
+		});
+	}
 
+	const user = await Users.findOneById(userId);
 	if (!user) {
 		throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'setReaction' });
 	}
 
-	const message = await Messages.findOneById(messageId);
+	const message = typeof messageParam === 'string' ? await Messages.findOneById(messageParam) : messageParam;
 	if (!message) {
 		throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setReaction' });
 	}
 
-	const room = await Rooms.findOneById(message.rid);
+	const userAlreadyReacted =
+		message.reactions && Boolean(message.reactions[reaction]) && message.reactions[reaction].usernames.includes(user.username as string);
+
+	// When shouldReact was not informed, toggle the reaction.
+	if (shouldReact === undefined) {
+		shouldReact = !userAlreadyReacted;
+	}
+
+	if (userAlreadyReacted === shouldReact) {
+		return;
+	}
+
+	const room = await Rooms.findOneById<
+		Pick<IRoom, '_id' | 'ro' | 'muted' | 'reactWhenReadOnly' | 'lastMessage' | 't' | 'prid' | 'federated'>
+	>(message.rid, { projection: { _id: 1, ro: 1, muted: 1, reactWhenReadOnly: 1, lastMessage: 1, t: 1, prid: 1, federated: 1 } });
 	if (!room) {
 		throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setReaction' });
 	}
@@ -138,7 +149,7 @@ export async function executeSetReaction(userId: string, reaction: string, messa
 		throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'setReaction' });
 	}
 
-	return setReaction(room, user, message, reaction, shouldReact);
+	return setReaction(room, user, message, reaction, userAlreadyReacted);
 }
 
 declare module '@rocket.chat/ddp-client' {
diff --git a/apps/meteor/app/slackbridge/server/RocketAdapter.js b/apps/meteor/app/slackbridge/server/RocketAdapter.js
index f76c33fa1f81..8ba2a76dcbc2 100644
--- a/apps/meteor/app/slackbridge/server/RocketAdapter.js
+++ b/apps/meteor/app/slackbridge/server/RocketAdapter.js
@@ -45,16 +45,16 @@ export default class RocketAdapter {
 		rocketLogger.debug('Register for events');
 		callbacks.add('afterSaveMessage', this.onMessage.bind(this), callbacks.priority.LOW, 'SlackBridge_Out');
 		callbacks.add('afterDeleteMessage', this.onMessageDelete.bind(this), callbacks.priority.LOW, 'SlackBridge_Delete');
-		callbacks.add('setReaction', this.onSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_SetReaction');
-		callbacks.add('unsetReaction', this.onUnSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_UnSetReaction');
+		callbacks.add('afterSetReaction', this.onSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_SetReaction');
+		callbacks.add('afterUnsetReaction', this.onUnSetReaction.bind(this), callbacks.priority.LOW, 'SlackBridge_UnSetReaction');
 	}
 
 	unregisterForEvents() {
 		rocketLogger.debug('Unregister for events');
 		callbacks.remove('afterSaveMessage', 'SlackBridge_Out');
 		callbacks.remove('afterDeleteMessage', 'SlackBridge_Delete');
-		callbacks.remove('setReaction', 'SlackBridge_SetReaction');
-		callbacks.remove('unsetReaction', 'SlackBridge_UnSetReaction');
+		callbacks.remove('afterSetReaction', 'SlackBridge_SetReaction');
+		callbacks.remove('afterUnsetReaction', 'SlackBridge_UnSetReaction');
 	}
 
 	async onMessageDelete(rocketMessageDeleted) {
@@ -72,7 +72,7 @@ export default class RocketAdapter {
 		}
 	}
 
-	async onSetReaction(rocketMsgID, reaction) {
+	async onSetReaction(rocketMsg, { reaction }) {
 		try {
 			if (!this.slackBridge.isReactionsEnabled) {
 				return;
@@ -80,12 +80,11 @@ export default class RocketAdapter {
 
 			rocketLogger.debug('onRocketSetReaction');
 
-			if (rocketMsgID && reaction) {
-				if (this.slackBridge.reactionsMap.delete(`set${rocketMsgID}${reaction}`)) {
+			if (rocketMsg._id && reaction) {
+				if (this.slackBridge.reactionsMap.delete(`set${rocketMsg._id}${reaction}`)) {
 					// This was a Slack reaction, we don't need to tell Slack about it
 					return;
 				}
-				const rocketMsg = await Messages.findOneById(rocketMsgID);
 				if (rocketMsg) {
 					for await (const slack of this.slackAdapters) {
 						const slackChannel = slack.getSlackChannel(rocketMsg.rid);
@@ -101,7 +100,7 @@ export default class RocketAdapter {
 		}
 	}
 
-	async onUnSetReaction(rocketMsgID, reaction) {
+	async onUnSetReaction(rocketMsg, { reaction }) {
 		try {
 			if (!this.slackBridge.isReactionsEnabled) {
 				return;
@@ -109,13 +108,12 @@ export default class RocketAdapter {
 
 			rocketLogger.debug('onRocketUnSetReaction');
 
-			if (rocketMsgID && reaction) {
-				if (this.slackBridge.reactionsMap.delete(`unset${rocketMsgID}${reaction}`)) {
+			if (rocketMsg._id && reaction) {
+				if (this.slackBridge.reactionsMap.delete(`unset${rocketMsg._id}${reaction}`)) {
 					// This was a Slack unset reaction, we don't need to tell Slack about it
 					return;
 				}
 
-				const rocketMsg = await Messages.findOneById(rocketMsgID);
 				if (rocketMsg) {
 					for await (const slack of this.slackAdapters) {
 						const slackChannel = slack.getSlackChannel(rocketMsg.rid);
diff --git a/apps/meteor/app/ui-master/server/scripts.ts b/apps/meteor/app/ui-master/server/scripts.ts
index 9edadb021d32..3e84a6e39c90 100644
--- a/apps/meteor/app/ui-master/server/scripts.ts
+++ b/apps/meteor/app/ui-master/server/scripts.ts
@@ -45,6 +45,7 @@ window.addEventListener('load', function() {
 		});
 		window.localStorage.clear();
 		Meteor._localStorage = window.sessionStorage;
+		Accounts.config({ clientStorage: 'session'  });
 	}
 });
 `
diff --git a/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts b/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts
index a926f8540d27..741f7959fa90 100644
--- a/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts
+++ b/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts
@@ -1,6 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
-import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 import type { ComposerAPI } from '../../../../client/lib/chats/ChatAPI';
 import { withDebouncing } from '../../../../lib/utils/highOrderFunctions';
@@ -31,11 +31,11 @@ export const createComposerAPI = (input: HTMLTextAreaElement, storageID: string)
 
 	const persist = withDebouncing({ wait: 300 })(() => {
 		if (input.value) {
-			Meteor._localStorage.setItem(storageID, input.value);
+			Accounts.storageLocation.setItem(storageID, input.value);
 			return;
 		}
 
-		Meteor._localStorage.removeItem(storageID);
+		Accounts.storageLocation.removeItem(storageID);
 	});
 
 	const notifyQuotedMessagesUpdate = (): void => {
@@ -262,7 +262,7 @@ export const createComposerAPI = (input: HTMLTextAreaElement, storageID: string)
 
 	const insertNewLine = (): void => insertText('\n');
 
-	setText(Meteor._localStorage.getItem(storageID) ?? '', {
+	setText(Accounts.storageLocation.getItem(storageID) ?? '', {
 		skipFocus: true,
 	});
 
diff --git a/apps/meteor/app/ui-utils/server/Message.ts b/apps/meteor/app/ui-utils/server/Message.ts
index 06ae59238b42..21d8886c70bc 100644
--- a/apps/meteor/app/ui-utils/server/Message.ts
+++ b/apps/meteor/app/ui-utils/server/Message.ts
@@ -1,6 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { escapeHTML } from '@rocket.chat/string-helpers';
-import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 import { trim } from '../../../lib/utils/stringUtils';
 import { i18n } from '../../../server/lib/i18n';
@@ -17,7 +17,7 @@ export const Message = {
 			}
 			if (messageType.message) {
 				if (!language) {
-					language = Meteor._localStorage.getItem('userLanguage') || 'en';
+					language = Accounts.storageLocation.getItem('userLanguage') || 'en';
 				}
 				const data = (typeof messageType.data === 'function' && messageType.data(msg)) || {};
 				return i18n.t(messageType.message, { ...data, lng: language });
diff --git a/apps/meteor/app/utils/client/getUserAvatarURL.ts b/apps/meteor/app/utils/client/getUserAvatarURL.ts
index 1a825a44fc27..d5fdd2b2d427 100644
--- a/apps/meteor/app/utils/client/getUserAvatarURL.ts
+++ b/apps/meteor/app/utils/client/getUserAvatarURL.ts
@@ -1,11 +1,6 @@
-import { settings } from '../../settings/client';
 import { getAvatarURL } from './getAvatarURL';
 
 export const getUserAvatarURL = function (username: string, cache = ''): string | undefined {
-	const externalSource = (settings.get<string>('Accounts_AvatarExternalProviderUrl') || '').trim().replace(/\/$/, '');
-	if (externalSource !== '') {
-		return externalSource.replace('{username}', username);
-	}
 	if (username == null) {
 		return;
 	}
diff --git a/apps/meteor/app/utils/client/lib/RestApiClient.ts b/apps/meteor/app/utils/client/lib/RestApiClient.ts
index c5e12250b441..53c95ee3e4fa 100644
--- a/apps/meteor/app/utils/client/lib/RestApiClient.ts
+++ b/apps/meteor/app/utils/client/lib/RestApiClient.ts
@@ -1,6 +1,5 @@
 import { RestClient } from '@rocket.chat/api-client';
 import { Accounts } from 'meteor/accounts-base';
-import { Meteor } from 'meteor/meteor';
 
 import { invokeTwoFactorModal } from '../../../../client/lib/2fa/process2faReturn';
 import { baseURI } from '../../../../client/lib/baseURI';
@@ -12,7 +11,10 @@ class RestApiClient extends RestClient {
 				'X-Auth-Token': string;
 		  }
 		| undefined {
-		const [uid, token] = [Meteor._localStorage.getItem(Accounts.USER_ID_KEY), Meteor._localStorage.getItem(Accounts.LOGIN_TOKEN_KEY)];
+		const [uid, token] = [
+			Accounts.storageLocation.getItem(Accounts.USER_ID_KEY),
+			Accounts.storageLocation.getItem(Accounts.LOGIN_TOKEN_KEY),
+		];
 
 		if (!uid || !token) {
 			return;
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index cb3ad01b882a..de3eb50fa5d1 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.13.0-develop"
+	"version": "6.14.0-develop"
 }
diff --git a/apps/meteor/app/utils/server/getUserAvatarURL.ts b/apps/meteor/app/utils/server/getUserAvatarURL.ts
index b83efea1d842..d5fdd2b2d427 100644
--- a/apps/meteor/app/utils/server/getUserAvatarURL.ts
+++ b/apps/meteor/app/utils/server/getUserAvatarURL.ts
@@ -1,11 +1,6 @@
-import { settings } from '../../settings/server';
 import { getAvatarURL } from './getAvatarURL';
 
 export const getUserAvatarURL = function (username: string, cache = ''): string | undefined {
-	const externalSource = (settings.get<string>('Accounts_AvatarExternalProviderUrl') || '').trim().replace(/\/$/, '');
-	if (externalSource !== '') {
-		return externalSource.replace('{username}', username);
-	}
 	if (username == null) {
 		return;
 	}
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
index 82c39c5c1b10..e54e2b72d675 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
@@ -1,7 +1,7 @@
 import { Badge } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { defaultFeaturesPreview, useFeaturePreviewList } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { defaultFeaturesPreview, usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -9,7 +9,7 @@ export const useAccountItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 	const router = useRouter();
 
-	const { unseenFeatures, featurePreviewEnabled } = useFeaturePreviewList();
+	const { unseenFeatures, featurePreviewEnabled } = usePreferenceFeaturePreviewList();
 
 	const handleMyAccount = useEffectEvent(() => {
 		router.navigate('/account');
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
index 23def16a94a1..4e4640270087 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
@@ -18,7 +18,7 @@ type ContextualbarDialogProps = AriaDialogProps & ComponentProps<typeof Contextu
 const ContextualbarDialog = (props: ContextualbarDialogProps) => {
 	const ref = useRef(null);
 	const { dialogProps } = useDialog({ 'aria-labelledby': 'contextualbarTitle', ...props }, ref);
-	const sizes = useLayoutSizes();
+	const { contextualBar } = useLayoutSizes();
 	const position = useLayoutContextualBarPosition();
 	const { closeTab } = useRoomToolbox();
 
@@ -42,12 +42,12 @@ const ContextualbarDialog = (props: ContextualbarDialogProps) => {
 		<FocusScope autoFocus restoreFocus>
 			<FeaturePreview feature='contextualbarResizable'>
 				<FeaturePreviewOn>
-					<ContextualbarResizable defaultWidth={sizes.contextualBar}>
+					<ContextualbarResizable defaultWidth={contextualBar}>
 						<Contextualbar ref={callbackRef} width='100%' position={position} {...dialogProps} {...props} />
 					</ContextualbarResizable>
 				</FeaturePreviewOn>
 				<FeaturePreviewOff>
-					<Contextualbar ref={callbackRef} width={sizes.contextualBar} position={position} {...dialogProps} {...props} />
+					<Contextualbar ref={callbackRef} width={contextualBar} position={position} {...dialogProps} {...props} />
 				</FeaturePreviewOff>
 			</FeaturePreview>
 		</FocusScope>
diff --git a/apps/meteor/client/components/FeaturePreviewSidePanelNavigation.tsx b/apps/meteor/client/components/FeaturePreviewSidePanelNavigation.tsx
new file mode 100644
index 000000000000..f5d658ccb2f2
--- /dev/null
+++ b/apps/meteor/client/components/FeaturePreviewSidePanelNavigation.tsx
@@ -0,0 +1,10 @@
+import { FeaturePreview } from '@rocket.chat/ui-client';
+import type { ReactElement } from 'react';
+import React from 'react';
+
+import { useSidePanelNavigationScreenSize } from '../hooks/useSidePanelNavigation';
+
+export const FeaturePreviewSidePanelNavigation = ({ children }: { children: ReactElement[] }) => {
+	const disabled = !useSidePanelNavigationScreenSize();
+	return <FeaturePreview feature='sidepanelNavigation' disabled={disabled} children={children} />;
+};
diff --git a/apps/meteor/client/components/MarkdownText.spec.tsx b/apps/meteor/client/components/MarkdownText.spec.tsx
new file mode 100644
index 000000000000..86ebadad8463
--- /dev/null
+++ b/apps/meteor/client/components/MarkdownText.spec.tsx
@@ -0,0 +1,92 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render } from '@testing-library/react';
+import React from 'react';
+
+import MarkdownText from './MarkdownText';
+
+import '@testing-library/jest-dom';
+
+const normalizeHtml = (html: any) => {
+	return html.replace(/\s+/g, ' ').trim();
+};
+
+const markdownText = `
+  # Heading 1
+  **Paragraph text**: *Bold with one asterisk* **Bold with two asterisks** Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+  ## Heading 2
+  _Italic Text_: _Italic with one underscore_ __Italic with two underscores__ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+  ### Heading 3 
+  Lists, Links and elements
+  **Unordered List** 
+  - List Item 1 
+  - List Item 2 
+  - List Item 3 
+  - List Item 4
+  **Ordered List** 
+  1. List Item 1
+  2. List Item 2
+  3. List Item 3
+  4. List Item 4
+  **Links:** 
+  [Rocket.Chat](rocket.chat)
+  gabriel.engel@rocket.chat 
+  +55991999999 
+  \`Inline code\`
+  \`\`\`typescript 
+  const test = 'this is code'
+  \`\`\`
+`;
+
+it('should render html elements as expected using default parser', async () => {
+	const { container } = render(<MarkdownText content={markdownText} variant='document' />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	const normalizedHtml = normalizeHtml(container.innerHTML);
+
+	expect(normalizedHtml).toContain('<h1>Heading 1</h1>');
+	expect(normalizedHtml).toContain(
+		'<strong>Paragraph text</strong>: <strong>Bold with one asterisk</strong> <strong>Bold with two asterisks</strong> Lorem ipsum dolor sit amet',
+	);
+	expect(normalizedHtml).toContain('<h2>Heading 2</h2>');
+	expect(normalizedHtml).toContain(
+		'<em>Italic Text</em>: <em>Italic with one underscore</em> <em>Italic with two underscores</em> Lorem ipsum dolor sit amet',
+	);
+	expect(normalizedHtml).toContain('<h3>Heading 3</h3>');
+	expect(normalizedHtml).toContain('<ul> <li>List Item 1 </li><li>List Item 2 </li><li>List Item 3 </li><li>List Item 4');
+	expect(normalizedHtml).toContain('<ol> <li>List Item 1</li><li>List Item 2</li><li>List Item 3</li><li>List Item 4');
+	expect(normalizedHtml).toContain('<a title="" rel="nofollow noopener noreferrer" target="_blank">Rocket.Chat</a>');
+	expect(normalizedHtml).toContain('gabriel.engel@rocket.chat');
+	expect(normalizedHtml).toContain('+55991999999');
+	expect(normalizedHtml).toContain('<code>Inline code</code>');
+	expect(normalizedHtml).toContain('<pre><code class="language-typescript">const test = \'this is code\' </code></pre>');
+});
+
+it('should render html elements as expected using inline parser', async () => {
+	const { container } = render(<MarkdownText content={markdownText} variant='inline' />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	const normalizedHtml = normalizeHtml(container.innerHTML);
+
+	expect(normalizedHtml).toContain('# Heading 1');
+	expect(normalizedHtml).toContain(
+		'<strong>Bold with one asterisk</strong> <strong>Bold with two asterisks</strong> Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
+	);
+	expect(normalizedHtml).toContain('## Heading 2');
+	expect(normalizedHtml).toContain(
+		'<em>Italic Text</em>: <em>Italic with one underscore</em> <em>Italic with two underscores</em> Lorem ipsum dolor sit amet',
+	);
+	expect(normalizedHtml).toContain('### Heading 3');
+	expect(normalizedHtml).toContain('<strong>Unordered List</strong> - List Item 1 - List Item 2 - List Item 3 - List Item 4');
+	expect(normalizedHtml).toContain('<strong>Ordered List</strong> 1. List Item 1 2. List Item 2 3. List Item 3 4. List Item 4');
+	expect(normalizedHtml).toContain(`<a title=\"\" rel=\"nofollow noopener noreferrer\" target=\"_blank\">Rocket.Chat</a>`);
+	expect(normalizedHtml).toContain(
+		`<a href=\"mailto:gabriel.engel@rocket.chat\" title=\"mailto:gabriel.engel@rocket.chat\" rel=\"nofollow noopener noreferrer\" target=\"_blank\">gabriel.engel@rocket.chat</a>`,
+	);
+	expect(normalizedHtml).toContain('+55991999999');
+	expect(normalizedHtml).toContain('Inline code');
+	expect(normalizedHtml).toContain(`typescript const test = 'this is code'`);
+});
diff --git a/apps/meteor/client/components/MarkdownText.tsx b/apps/meteor/client/components/MarkdownText.tsx
index 6426b24810ee..0b7d2efa780e 100644
--- a/apps/meteor/client/components/MarkdownText.tsx
+++ b/apps/meteor/client/components/MarkdownText.tsx
@@ -20,12 +20,18 @@ const documentRenderer = new marked.Renderer();
 const inlineRenderer = new marked.Renderer();
 const inlineWithoutBreaks = new marked.Renderer();
 
-marked.Lexer.rules.gfm = {
-	...marked.Lexer.rules.gfm,
-	strong: /^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,
-	em: /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/,
+const walkTokens = (token: marked.Token) => {
+	const boldPattern = /^\*[^*]+\*$|^\*\*[^*]+\*\*$/;
+	const italicPattern = /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/;
+	if (boldPattern.test(token.raw)) {
+		token.type = 'strong';
+	} else if (italicPattern.test(token.raw)) {
+		token.type = 'em';
+	}
 };
 
+marked.use({ walkTokens });
+
 const linkMarked = (href: string | null, _title: string | null, text: string): string =>
 	`<a href="${href}" rel="nofollow noopener noreferrer">${text}</a> `;
 const paragraphMarked = (text: string): string => text;
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx
index e8dd4e1ddcc2..518f1ebad203 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedHtmlPreview.tsx
@@ -1,12 +1,21 @@
 import { Box } from '@rocket.chat/fuselage';
+import DOMPurify from 'dompurify';
 import type { ReactElement } from 'react';
 import React from 'react';
 
 import OEmbedCollapsible from './OEmbedCollapsible';
 import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
 
+const purifyOptions = {
+	ADD_TAGS: ['iframe'],
+	ADD_ATTR: ['frameborder', 'allow', 'allowfullscreen', 'scrolling', 'src', 'style', 'referrerpolicy'],
+	ALLOW_UNKNOWN_PROTOCOLS: true,
+};
+
 const OEmbedHtmlPreview = ({ html, ...props }: OEmbedPreviewMetadata): ReactElement => (
-	<OEmbedCollapsible {...props}>{html && <Box withRichContent dangerouslySetInnerHTML={{ __html: html }} />}</OEmbedCollapsible>
+	<OEmbedCollapsible {...props}>
+		{html && <Box withRichContent dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(html, purifyOptions) }} />}
+	</OEmbedCollapsible>
 );
 
 export default OEmbedHtmlPreview;
diff --git a/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts b/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
new file mode 100644
index 000000000000..fd88f0237d29
--- /dev/null
+++ b/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
@@ -0,0 +1,28 @@
+import type { FeaturePreviewProps } from '@rocket.chat/ui-client';
+import { useMemo } from 'react';
+
+const handleFeaturePreviewEnableQuery = (item: FeaturePreviewProps, _: any, features: FeaturePreviewProps[]) => {
+	if (item.enableQuery) {
+		const expected = item.enableQuery.value;
+		const received = features.find((el) => el.name === item.enableQuery?.name)?.value;
+		if (expected !== received) {
+			item.disabled = true;
+			item.value = false;
+		} else {
+			item.disabled = false;
+		}
+	}
+	return item;
+};
+
+const groupFeaturePreview = (features: FeaturePreviewProps[]) =>
+	Object.entries(
+		features.reduce((result, currentValue) => {
+			(result[currentValue.group] = result[currentValue.group] || []).push(currentValue);
+			return result;
+		}, {} as Record<FeaturePreviewProps['group'], FeaturePreviewProps[]>),
+	);
+
+export const useFeaturePreviewEnableQuery = (features: FeaturePreviewProps[]) => {
+	return useMemo(() => groupFeaturePreview(features.map(handleFeaturePreviewEnableQuery)), [features]);
+};
diff --git a/apps/meteor/client/hooks/useRoomInfoEndpoint.ts b/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
index 47ea84af20b6..0bac1d7eb413 100644
--- a/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
+++ b/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
@@ -1,6 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import type { OperationResult } from '@rocket.chat/rest-typings';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useUserId } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 import { minutesToMilliseconds } from 'date-fns';
@@ -8,6 +8,7 @@ import type { Meteor } from 'meteor/meteor';
 
 export const useRoomInfoEndpoint = (rid: IRoom['_id']): UseQueryResult<OperationResult<'GET', '/v1/rooms.info'>> => {
 	const getRoomInfo = useEndpoint('GET', '/v1/rooms.info');
+	const uid = useUserId();
 	return useQuery(['/v1/rooms.info', rid], () => getRoomInfo({ roomId: rid }), {
 		cacheTime: minutesToMilliseconds(15),
 		staleTime: minutesToMilliseconds(5),
@@ -17,5 +18,6 @@ export const useRoomInfoEndpoint = (rid: IRoom['_id']): UseQueryResult<Operation
 			}
 			return true;
 		},
+		enabled: !!uid,
 	});
 };
diff --git a/apps/meteor/client/hooks/useSidePanelNavigation.ts b/apps/meteor/client/hooks/useSidePanelNavigation.ts
new file mode 100644
index 000000000000..f9714580cf06
--- /dev/null
+++ b/apps/meteor/client/hooks/useSidePanelNavigation.ts
@@ -0,0 +1,14 @@
+import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
+import { useFeaturePreview } from '@rocket.chat/ui-client';
+
+export const useSidePanelNavigation = () => {
+	const isSidepanelFeatureEnabled = useFeaturePreview('sidepanelNavigation');
+	// ["xs", "sm", "md", "lg", "xl", xxl"]
+	return useSidePanelNavigationScreenSize() && isSidepanelFeatureEnabled;
+};
+
+export const useSidePanelNavigationScreenSize = () => {
+	const breakpoints = useBreakpoints();
+	// ["xs", "sm", "md", "lg", "xl", xxl"]
+	return breakpoints.includes('lg');
+};
diff --git a/apps/meteor/client/lib/RoomManager.ts b/apps/meteor/client/lib/RoomManager.ts
index 34f64e4f4c78..840493aae406 100644
--- a/apps/meteor/client/lib/RoomManager.ts
+++ b/apps/meteor/client/lib/RoomManager.ts
@@ -55,6 +55,8 @@ export const RoomManager = new (class RoomManager extends Emitter<{
 
 	private rooms: Map<IRoom['_id'], RoomStore> = new Map();
 
+	private parentRid?: IRoom['_id'] | undefined;
+
 	constructor() {
 		super();
 		debugRoomManager &&
@@ -78,6 +80,13 @@ export const RoomManager = new (class RoomManager extends Emitter<{
 	}
 
 	get opened(): IRoom['_id'] | undefined {
+		return this.parentRid ?? this.rid;
+	}
+
+	get openedSecondLevel(): IRoom['_id'] | undefined {
+		if (!this.parentRid) {
+			return undefined;
+		}
 		return this.rid;
 	}
 
@@ -106,20 +115,28 @@ export const RoomManager = new (class RoomManager extends Emitter<{
 		this.emit('changed', this.rid);
 	}
 
-	open(rid: IRoom['_id']): void {
+	private _open(rid: IRoom['_id'], parent?: IRoom['_id']): void {
 		if (rid === this.rid) {
 			return;
 		}
-
 		this.back(rid);
 		if (!this.rooms.has(rid)) {
 			this.rooms.set(rid, new RoomStore(rid));
 		}
 		this.rid = rid;
+		this.parentRid = parent;
 		this.emit('opened', this.rid);
 		this.emit('changed', this.rid);
 	}
 
+	open(rid: IRoom['_id']): void {
+		this._open(rid);
+	}
+
+	openSecondLevel(parentId: IRoom['_id'], rid: IRoom['_id']): void {
+		this._open(rid, parentId);
+	}
+
 	getStore(rid: IRoom['_id']): RoomStore | undefined {
 		return this.rooms.get(rid);
 	}
@@ -130,4 +147,11 @@ const subscribeOpenedRoom = [
 	(): IRoom['_id'] | undefined => RoomManager.opened,
 ] as const;
 
+const subscribeOpenedSecondLevelRoom = [
+	(callback: () => void): (() => void) => RoomManager.on('changed', callback),
+	(): IRoom['_id'] | undefined => RoomManager.openedSecondLevel,
+] as const;
+
 export const useOpenedRoom = (): IRoom['_id'] | undefined => useSyncExternalStore(...subscribeOpenedRoom);
+
+export const useSecondLevelOpenedRoom = (): IRoom['_id'] | undefined => useSyncExternalStore(...subscribeOpenedSecondLevelRoom);
diff --git a/apps/meteor/client/meteorOverrides/login/saml.ts b/apps/meteor/client/meteorOverrides/login/saml.ts
index 14dfcc694e5c..f2199af5c0c7 100644
--- a/apps/meteor/client/meteorOverrides/login/saml.ts
+++ b/apps/meteor/client/meteorOverrides/login/saml.ts
@@ -72,7 +72,7 @@ Meteor.logout = async function (...args) {
 
 				// Remove the userId from the client to prevent calls to the server while the logout is processed.
 				// If the logout fails, the userId will be reloaded on the resume call
-				Meteor._localStorage.removeItem(Accounts.USER_ID_KEY);
+				Accounts.storageLocation.removeItem(Accounts.USER_ID_KEY);
 
 				// A nasty bounce: 'result' has the SAML LogoutRequest but we need a proper 302 to redirected from the server.
 				window.location.replace(Meteor.absoluteUrl(`_saml/sloRedirect/${provider}/?redirect=${encodeURIComponent(result)}`));
diff --git a/apps/meteor/client/providers/AvatarUrlProvider.tsx b/apps/meteor/client/providers/AvatarUrlProvider.tsx
index b5a92c9117f2..606da39360d5 100644
--- a/apps/meteor/client/providers/AvatarUrlProvider.tsx
+++ b/apps/meteor/client/providers/AvatarUrlProvider.tsx
@@ -1,4 +1,4 @@
-import { AvatarUrlContext, useSetting } from '@rocket.chat/ui-contexts';
+import { AvatarUrlContext } from '@rocket.chat/ui-contexts';
 import type { ReactNode } from 'react';
 import React, { useMemo } from 'react';
 
@@ -10,19 +10,15 @@ type AvatarUrlProviderProps = {
 };
 
 const AvatarUrlProvider = ({ children }: AvatarUrlProviderProps) => {
-	const cdnAvatarUrl = String(useSetting('CDN_PREFIX') || '');
 	const contextValue = useMemo(
 		() => ({
 			getUserPathAvatar: ((): ((uid: string, etag?: string) => string) => {
-				if (cdnAvatarUrl) {
-					return (uid: string, etag?: string): string => `${cdnAvatarUrl}/avatar/${uid}${etag ? `?etag=${etag}` : ''}`;
-				}
 				return (uid: string, etag?: string): string => getURL(`/avatar/${uid}${etag ? `?etag=${etag}` : ''}`);
 			})(),
 			getRoomPathAvatar: ({ type, ...room }: any): string =>
 				roomCoordinator.getRoomDirectives(type || room.t).getAvatarPath({ username: room._id, ...room }) || '',
 		}),
-		[cdnAvatarUrl],
+		[],
 	);
 
 	return <AvatarUrlContext.Provider children={children} value={contextValue} />;
diff --git a/apps/meteor/client/providers/UserProvider/UserProvider.tsx b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
index 27bba21eae95..53761fbef4e7 100644
--- a/apps/meteor/client/providers/UserProvider/UserProvider.tsx
+++ b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
@@ -19,8 +19,6 @@ import { useDeleteUser } from './hooks/useDeleteUser';
 import { useEmailVerificationWarning } from './hooks/useEmailVerificationWarning';
 import { useUpdateAvatar } from './hooks/useUpdateAvatar';
 
-const getUserId = (): string | null => Meteor.userId();
-
 const getUser = (): IUser | null => Meteor.user() as IUser | null;
 
 const logout = (): Promise<void> =>
@@ -42,9 +40,9 @@ type UserProviderProps = {
 };
 
 const UserProvider = ({ children }: UserProviderProps): ReactElement => {
-	const userId = useReactiveValue(getUserId);
-	const previousUserId = useRef(userId);
 	const user = useReactiveValue(getUser);
+	const userId = user?._id ?? null;
+	const previousUserId = useRef(userId);
 	const [userLanguage, setUserLanguage] = useLocalStorage('userLanguage', '');
 	const [preferedLanguage, setPreferedLanguage] = useLocalStorage('preferedLanguage', '');
 
diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
index cc7cdfbe7761..35d098151204 100644
--- a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
@@ -167,7 +167,7 @@ function SideBarItemTemplateWithData({
 	const badges = (
 		<Margins inlineStart={8}>
 			{showBadge && isUnread && (
-				<Badge {...({ style: { display: 'inline-flex', flexShrink: 0 } } as any)} variant={variant} title={badgeTitle}>
+				<Badge role='status' {...({ style: { display: 'inline-flex', flexShrink: 0 } } as any)} variant={variant} title={badgeTitle}>
 					{unread + tunread?.length}
 				</Badge>
 			)}
@@ -180,6 +180,7 @@ function SideBarItemTemplateWithData({
 			is='a'
 			id={id}
 			data-qa='sidebar-item'
+			data-unread={highlighted}
 			unread={highlighted}
 			selected={selected}
 			href={href}
@@ -205,7 +206,7 @@ function SideBarItemTemplateWithData({
 						threadUnread={threadUnread}
 						rid={rid}
 						unread={!!unread}
-						roomOpen={false}
+						roomOpen={selected}
 						type={type}
 						cl={cl}
 						name={title}
diff --git a/apps/meteor/client/sidebar/RoomMenu.tsx b/apps/meteor/client/sidebar/RoomMenu.tsx
index 06b1352d2803..05f02220104b 100644
--- a/apps/meteor/client/sidebar/RoomMenu.tsx
+++ b/apps/meteor/client/sidebar/RoomMenu.tsx
@@ -13,6 +13,7 @@ import {
 	useTranslation,
 	useEndpoint,
 } from '@rocket.chat/ui-contexts';
+import { useQueryClient } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { memo, useMemo } from 'react';
 
@@ -100,6 +101,8 @@ const RoomMenu = ({
 	const isOmnichannelRoom = type === 'l';
 	const prioritiesMenu = useOmnichannelPrioritiesMenu(rid);
 
+	const queryClient = useQueryClient();
+
 	const canLeave = ((): boolean => {
 		if (type === 'c' && !canLeaveChannel) {
 			return false;
@@ -173,17 +176,22 @@ const RoomMenu = ({
 
 	const handleToggleRead = useMutableCallback(async () => {
 		try {
+			queryClient.invalidateQueries(['sidebar/search/spotlight']);
+
 			if (isUnread) {
 				await readMessages({ rid, readThreads: true });
 				return;
 			}
-			await unreadMessages(undefined, rid);
+
 			if (subscription == null) {
 				return;
 			}
+
 			LegacyRoomManager.close(subscription.t + subscription.name);
 
 			router.navigate('/home');
+
+			await unreadMessages(undefined, rid);
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}
diff --git a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
index 2be6b2b1dea2..51ab7a198a67 100644
--- a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
@@ -1,7 +1,7 @@
 import { Badge } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { defaultFeaturesPreview, useFeaturePreviewList } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { defaultFeaturesPreview, usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -9,7 +9,7 @@ export const useAccountItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 	const router = useRouter();
 
-	const { unseenFeatures, featurePreviewEnabled } = useFeaturePreviewList();
+	const { unseenFeatures, featurePreviewEnabled } = usePreferenceFeaturePreviewList();
 
 	const handleMyAccount = useMutableCallback(() => {
 		router.navigate('/account');
diff --git a/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
index 51b8ce495af6..e1f66ba93b4e 100644
--- a/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
@@ -180,6 +180,7 @@ const SidebarItemTemplateWithData = ({
 			is='a'
 			id={id}
 			data-qa='sidebar-item'
+			data-unread={highlighted}
 			unread={highlighted}
 			selected={selected}
 			href={href}
@@ -205,7 +206,7 @@ const SidebarItemTemplateWithData = ({
 						threadUnread={threadUnread}
 						rid={rid}
 						unread={!!unread}
-						roomOpen={false}
+						roomOpen={selected}
 						type={type}
 						cl={cl}
 						name={title}
diff --git a/apps/meteor/client/sidebarv2/RoomMenu.tsx b/apps/meteor/client/sidebarv2/RoomMenu.tsx
index e88225df40ca..aac68b9ef79e 100644
--- a/apps/meteor/client/sidebarv2/RoomMenu.tsx
+++ b/apps/meteor/client/sidebarv2/RoomMenu.tsx
@@ -13,6 +13,7 @@ import {
 	useTranslation,
 	useEndpoint,
 } from '@rocket.chat/ui-contexts';
+import { useQueryClient } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { memo, useMemo } from 'react';
 
@@ -100,6 +101,8 @@ const RoomMenu = ({
 	const isOmnichannelRoom = type === 'l';
 	const prioritiesMenu = useOmnichannelPrioritiesMenu(rid);
 
+	const queryClient = useQueryClient();
+
 	const canLeave = ((): boolean => {
 		if (type === 'c' && !canLeaveChannel) {
 			return false;
@@ -173,17 +176,22 @@ const RoomMenu = ({
 
 	const handleToggleRead = useEffectEvent(async () => {
 		try {
+			queryClient.invalidateQueries(['sidebar/search/spotlight']);
+
 			if (isUnread) {
 				await readMessages({ rid, readThreads: true });
 				return;
 			}
-			await unreadMessages(undefined, rid);
+
 			if (subscription == null) {
 				return;
 			}
+
 			LegacyRoomManager.close(subscription.t + subscription.name);
 
 			router.navigate('/home');
+
+			await unreadMessages(undefined, rid);
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}
diff --git a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
index a7e7b506de0f..9de721d8bbcd 100644
--- a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
+++ b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
@@ -1,3 +1,4 @@
+import type { SidepanelItem } from '@rocket.chat/core-typings';
 import {
 	Box,
 	Button,
@@ -16,6 +17,7 @@ import {
 	AccordionItem,
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
 import {
 	useEndpoint,
 	usePermission,
@@ -40,6 +42,8 @@ type CreateTeamModalInputs = {
 	encrypted: boolean;
 	broadcast: boolean;
 	members?: string[];
+	showDiscussions?: boolean;
+	showChannels?: boolean;
 };
 
 type CreateTeamModalProps = { onClose: () => void };
@@ -50,6 +54,7 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 	const e2eEnabledForPrivateByDefault = useSetting('E2E_Enabled_Default_PrivateRooms');
 	const namesValidation = useSetting('UTF8_Channel_Names_Validation');
 	const allowSpecialNames = useSetting('UI_Allow_room_names_with_special_chars');
+
 	const dispatchToastMessage = useToastMessageDispatch();
 	const canCreateTeam = usePermission('create-team');
 	const canSetReadOnly = usePermissionWithScopedRoles('set-readonly', ['owner']);
@@ -94,6 +99,8 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 			encrypted: (e2eEnabledForPrivateByDefault as boolean) ?? false,
 			broadcast: false,
 			members: [],
+			showChannels: true,
+			showDiscussions: true,
 		},
 	});
 
@@ -123,7 +130,10 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 		topic,
 		broadcast,
 		encrypted,
+		showChannels,
+		showDiscussions,
 	}: CreateTeamModalInputs): Promise<void> => {
+		const sidepanelItem = [showChannels && 'channels', showDiscussions && 'discussions'].filter(Boolean) as [SidepanelItem, SidepanelItem?];
 		const params = {
 			name,
 			members,
@@ -136,6 +146,7 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 					encrypted,
 				},
 			},
+			...((showChannels || showDiscussions) && { sidepanel: { items: sidepanelItem } }),
 		};
 
 		try {
@@ -157,6 +168,8 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 	const encryptedId = useUniqueId();
 	const broadcastId = useUniqueId();
 	const addMembersId = useUniqueId();
+	const showChannelsId = useUniqueId();
+	const showDiscussionsId = useUniqueId();
 
 	return (
 		<Modal
@@ -236,6 +249,55 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 				</FieldGroup>
 				<Accordion>
 					<AccordionItem title={t('Advanced_settings')}>
+						<FeaturePreview feature='sidepanelNavigation'>
+							<FeaturePreviewOff>{null}</FeaturePreviewOff>
+							<FeaturePreviewOn>
+								<FieldGroup>
+									<Box is='h5' fontScale='h5' color='titles-labels'>
+										{t('Navigation')}
+									</Box>
+									<Field>
+										<FieldRow>
+											<FieldLabel htmlFor={showChannelsId}>{t('Channels')}</FieldLabel>
+											<Controller
+												control={control}
+												name='showChannels'
+												render={({ field: { onChange, value, ref } }): ReactElement => (
+													<ToggleSwitch
+														aria-describedby={`${showChannelsId}-hint`}
+														id={showChannelsId}
+														onChange={onChange}
+														checked={value}
+														ref={ref}
+													/>
+												)}
+											/>
+										</FieldRow>
+										<FieldDescription id={`${showChannelsId}-hint`}>{t('Show_channels_description')}</FieldDescription>
+									</Field>
+
+									<Field>
+										<FieldRow>
+											<FieldLabel htmlFor={showDiscussionsId}>{t('Discussions')}</FieldLabel>
+											<Controller
+												control={control}
+												name='showDiscussions'
+												render={({ field: { onChange, value, ref } }): ReactElement => (
+													<ToggleSwitch
+														aria-describedby={`${showDiscussionsId}-hint`}
+														id={showDiscussionsId}
+														onChange={onChange}
+														checked={value}
+														ref={ref}
+													/>
+												)}
+											/>
+										</FieldRow>
+										<FieldDescription id={`${showDiscussionsId}-hint`}>{t('Show_discussions_description')}</FieldDescription>
+									</Field>
+								</FieldGroup>
+							</FeaturePreviewOn>
+						</FeaturePreview>
 						<FieldGroup>
 							<Box is='h5' fontScale='h5' color='titles-labels'>
 								{t('Security_and_permissions')}
diff --git a/apps/meteor/client/sidebarv2/header/SearchSection.tsx b/apps/meteor/client/sidebarv2/header/SearchSection.tsx
index 660b8ee19cd5..71b26b2e4053 100644
--- a/apps/meteor/client/sidebarv2/header/SearchSection.tsx
+++ b/apps/meteor/client/sidebarv2/header/SearchSection.tsx
@@ -22,6 +22,32 @@ const wrapperStyle = css`
 	background-color: ${Palette.surface['surface-sidebar']};
 `;
 
+const mobileCheck = function () {
+	let check = false;
+	(function (a: string) {
+		if (
+			/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(
+				a,
+			) ||
+			/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
+				a.substr(0, 4),
+			)
+		)
+			check = true;
+	})(navigator.userAgent || navigator.vendor || window.opera || '');
+	return check;
+};
+
+const shortcut = ((): string => {
+	if (navigator.userAgentData?.mobile || mobileCheck()) {
+		return '';
+	}
+	if (window.navigator.platform.toLowerCase().includes('mac')) {
+		return '(\u2318+K)';
+	}
+	return '(Ctrl+K)';
+})();
+
 const SearchSection = () => {
 	const t = useTranslation();
 	const user = useUser();
@@ -68,11 +94,13 @@ const SearchSection = () => {
 		};
 	}, [handleEscSearch, setFocus]);
 
+	const placeholder = [t('Search'), shortcut].filter(Boolean).join(' ');
+
 	return (
 		<Box className={['rcx-sidebar', isDirty && wrapperStyle]} ref={wrapperRef} role='search'>
 			<SidebarV2Section>
 				<TextInput
-					placeholder={t('Search')}
+					placeholder={placeholder}
 					{...rest}
 					ref={mergedRefs}
 					role='searchbox'
diff --git a/apps/meteor/client/startup/accounts.ts b/apps/meteor/client/startup/accounts.ts
index 88008a606656..50c033dc0596 100644
--- a/apps/meteor/client/startup/accounts.ts
+++ b/apps/meteor/client/startup/accounts.ts
@@ -2,7 +2,7 @@ import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
-import { settings } from '../../app/settings/client';
+// import { settings } from '../../app/settings/client';
 import { mainReady } from '../../app/ui-utils/client';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
 import { t } from '../../app/utils/lib/i18n';
@@ -25,17 +25,3 @@ Accounts.onEmailVerificationLink((token: string) => {
 		});
 	});
 });
-
-Meteor.startup(() => {
-	Tracker.autorun((computation) => {
-		const forgetUserSessionOnWindowClose = settings.get('Accounts_ForgetUserSessionOnWindowClose');
-
-		if (forgetUserSessionOnWindowClose === undefined) {
-			return;
-		}
-
-		computation.stop();
-
-		Accounts.config({ clientStorage: forgetUserSessionOnWindowClose ? 'session' : 'local' });
-	});
-});
diff --git a/apps/meteor/client/startup/e2e.ts b/apps/meteor/client/startup/e2e.ts
index de615e8f45de..e45b62563726 100644
--- a/apps/meteor/client/startup/e2e.ts
+++ b/apps/meteor/client/startup/e2e.ts
@@ -5,6 +5,7 @@ import { Tracker } from 'meteor/tracker';
 
 import { E2EEState } from '../../app/e2e/client/E2EEState';
 import { e2e } from '../../app/e2e/client/rocketchat.e2e';
+import { MentionsParser } from '../../app/mentions/lib/MentionsParser';
 import { ChatRoom } from '../../app/models/client';
 import { settings } from '../../app/settings/client';
 import { onClientBeforeSendMessage } from '../lib/onClientBeforeSendMessage';
@@ -88,6 +89,27 @@ Meteor.startup(() => {
 				return message;
 			}
 
+			const mentionsEnabled = settings.get<boolean>('E2E_Enabled_Mentions');
+
+			if (mentionsEnabled) {
+				const me = Meteor.user()?.username || '';
+				const pattern = settings.get('UTF8_User_Names_Validation');
+				const useRealName = settings.get('UI_Use_Real_Name');
+
+				const mentions = new MentionsParser({
+					pattern: () => pattern,
+					useRealName: () => useRealName,
+					me: () => me,
+				});
+
+				const e2eMentions: IMessage['e2eMentions'] = {
+					e2eUserMentions: mentions.getUserMentions(message.msg),
+					e2eChannelMentions: mentions.getChannelMentions(message.msg),
+				};
+
+				message.e2eMentions = e2eMentions;
+			}
+
 			// Should encrypt this message.
 			return e2eRoom.encryptMessage(message);
 		});
diff --git a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
deleted file mode 100644
index c109ca1aefb5..000000000000
--- a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Badge } from '@rocket.chat/fuselage';
-import { useFeaturePreviewList } from '@rocket.chat/ui-client';
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-
-const AccountFeaturePreviewBadge = () => {
-	const { t } = useTranslation();
-	const { unseenFeatures } = useFeaturePreviewList();
-
-	if (!unseenFeatures) {
-		return null;
-	}
-
-	return (
-		<Badge variant='primary' aria-label={t('Unseen_features')}>
-			{unseenFeatures}
-		</Badge>
-	);
-};
-
-export default AccountFeaturePreviewBadge;
diff --git a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
index dd9ab6a90959..358d2394003b 100644
--- a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
+++ b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
@@ -1,4 +1,3 @@
-import { css } from '@rocket.chat/css-in-js';
 import {
 	ButtonGroup,
 	Button,
@@ -13,9 +12,10 @@ import {
 	FieldLabel,
 	FieldRow,
 	FieldHint,
+	Callout,
+	Margins,
 } from '@rocket.chat/fuselage';
-import type { FeaturePreviewProps } from '@rocket.chat/ui-client';
-import { useFeaturePreviewList } from '@rocket.chat/ui-client';
+import { usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
@@ -23,26 +23,12 @@ import React, { useEffect, Fragment } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
+import { useFeaturePreviewEnableQuery } from '../../../hooks/useFeaturePreviewEnableQuery';
 
-const handleEnableQuery = (features: FeaturePreviewProps[]) => {
-	return features.map((item) => {
-		if (item.enableQuery) {
-			const expected = item.enableQuery.value;
-			const received = features.find((el) => el.name === item.enableQuery?.name)?.value;
-			if (expected !== received) {
-				item.disabled = true;
-				item.value = false;
-			} else {
-				item.disabled = false;
-			}
-		}
-		return item;
-	});
-};
 const AccountFeaturePreviewPage = () => {
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
-	const { features, unseenFeatures } = useFeaturePreviewList();
+	const { features, unseenFeatures } = usePreferenceFeaturePreviewList();
 
 	const setUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
 
@@ -85,12 +71,7 @@ const AccountFeaturePreviewPage = () => {
 		setValue('featuresPreview', updated, { shouldDirty: true });
 	};
 
-	const grouppedFeaturesPreview = Object.entries(
-		handleEnableQuery(featuresPreview).reduce((result, currentValue) => {
-			(result[currentValue.group] = result[currentValue.group] || []).push(currentValue);
-			return result;
-		}, {} as Record<FeaturePreviewProps['group'], FeaturePreviewProps[]>),
-	);
+	const grouppedFeaturesPreview = useFeaturePreviewEnableQuery(featuresPreview);
 
 	return (
 		<Page>
@@ -105,14 +86,11 @@ const AccountFeaturePreviewPage = () => {
 					)}
 					{featuresPreview.length > 0 && (
 						<>
-							<Box
-								className={css`
-									white-space: break-spaces;
-								`}
-								pbe={24}
-								fontScale='p1'
-							>
-								{t('Feature_preview_page_description')}
+							<Box>
+								<Margins block={24}>
+									<Box fontScale='p1'>{t('Feature_preview_page_description')}</Box>
+									<Callout>{t('Feature_preview_page_callout')}</Callout>
+								</Margins>
 							</Box>
 							<Accordion>
 								{grouppedFeaturesPreview?.map(([group, features], index) => (
diff --git a/apps/meteor/client/views/account/sidebarItems.tsx b/apps/meteor/client/views/account/sidebarItems.tsx
index ca0376be329d..fa2ab8bd5e40 100644
--- a/apps/meteor/client/views/account/sidebarItems.tsx
+++ b/apps/meteor/client/views/account/sidebarItems.tsx
@@ -1,10 +1,9 @@
-import { defaultFeaturesPreview } from '@rocket.chat/ui-client';
+import { defaultFeaturesPreview, FeaturePreviewBadge } from '@rocket.chat/ui-client';
 import React from 'react';
 
 import { hasPermission, hasAtLeastOnePermission } from '../../../app/authorization/client';
 import { settings } from '../../../app/settings/client';
 import { createSidebarItems } from '../../lib/createSidebarItems';
-import AccountFeaturePreviewBadge from './featurePreview/AccountFeaturePreviewBadge';
 
 export const {
 	registerSidebarItem: registerAccountSidebarItem,
@@ -54,7 +53,7 @@ export const {
 		href: '/account/feature-preview',
 		i18nLabel: 'Feature_preview',
 		icon: 'flask',
-		badge: () => <AccountFeaturePreviewBadge />,
+		badge: () => <FeaturePreviewBadge />,
 		permissionGranted: () => settings.get('Accounts_AllowFeaturePreview') && defaultFeaturesPreview?.length > 0,
 	},
 	{
diff --git a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx
new file mode 100644
index 000000000000..615fd20cf5a6
--- /dev/null
+++ b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewPage.tsx
@@ -0,0 +1,127 @@
+import {
+	ButtonGroup,
+	Button,
+	Box,
+	ToggleSwitch,
+	Accordion,
+	Field,
+	FieldGroup,
+	FieldLabel,
+	FieldRow,
+	FieldHint,
+	Callout,
+	Margins,
+} from '@rocket.chat/fuselage';
+import { useDefaultSettingFeaturePreviewList } from '@rocket.chat/ui-client';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useTranslation, useSettingsDispatch } from '@rocket.chat/ui-contexts';
+import type { ChangeEvent } from 'react';
+import React, { Fragment } from 'react';
+import { useForm } from 'react-hook-form';
+
+import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
+import { useFeaturePreviewEnableQuery } from '../../../hooks/useFeaturePreviewEnableQuery';
+import { useEditableSetting } from '../EditableSettingsContext';
+import Setting from '../settings/Setting';
+import SettingsGroupPageSkeleton from '../settings/SettingsGroupPage/SettingsGroupPageSkeleton';
+
+const AdminFeaturePreviewPage = () => {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const allowFeaturePreviewSetting = useEditableSetting('Accounts_AllowFeaturePreview');
+	const { features } = useDefaultSettingFeaturePreviewList();
+
+	const {
+		watch,
+		formState: { isDirty },
+		setValue,
+		handleSubmit,
+		reset,
+	} = useForm({
+		defaultValues: { featuresPreview: features },
+	});
+	const { featuresPreview } = watch();
+	const dispatch = useSettingsDispatch();
+
+	const handleSave = async () => {
+		try {
+			const featuresToBeSaved = featuresPreview.map((feature) => ({ name: feature.name, value: feature.value }));
+
+			await dispatch([
+				{ _id: allowFeaturePreviewSetting!._id, value: allowFeaturePreviewSetting!.value },
+				{ _id: 'Accounts_Default_User_Preferences_featuresPreview', value: JSON.stringify(featuresToBeSaved) },
+			]);
+			dispatchToastMessage({ type: 'success', message: t('Preferences_saved') });
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+		} finally {
+			reset({ featuresPreview });
+		}
+	};
+
+	const handleFeatures = (e: ChangeEvent<HTMLInputElement>) => {
+		const updated = featuresPreview.map((item) => (item.name === e.target.name ? { ...item, value: e.target.checked } : item));
+		setValue('featuresPreview', updated, { shouldDirty: true });
+	};
+
+	const grouppedFeaturesPreview = useFeaturePreviewEnableQuery(featuresPreview);
+
+	if (!allowFeaturePreviewSetting) {
+		// TODO: Implement FeaturePreviewSkeleton component
+		return <SettingsGroupPageSkeleton />;
+	}
+
+	return (
+		<Page>
+			<PageHeader title={t('Feature_preview')} />
+			<PageScrollableContentWithShadow>
+				<Box maxWidth='x600' w='full' alignSelf='center'>
+					<Box>
+						<Margins block={24}>
+							<Box fontScale='p1'>{t('Feature_preview_admin_page_description')}</Box>
+							<Callout>{t('Feature_preview_page_callout')}</Callout>
+							<Callout>{t('Feature_preview_admin_page_callout')}</Callout>
+							<Setting settingId='Accounts_AllowFeaturePreview' sectionChanged={allowFeaturePreviewSetting.changed} />
+						</Margins>
+					</Box>
+					<Accordion>
+						{grouppedFeaturesPreview?.map(([group, features], index) => (
+							<Accordion.Item defaultExpanded={index === 0} key={group} title={t(group as TranslationKey)}>
+								<FieldGroup>
+									{features.map((feature) => (
+										<Fragment key={feature.name}>
+											<Field>
+												<FieldRow>
+													<FieldLabel htmlFor={feature.name}>{t(feature.i18n)}</FieldLabel>
+													<ToggleSwitch
+														id={feature.name}
+														checked={feature.value}
+														name={feature.name}
+														onChange={handleFeatures}
+														disabled={feature.disabled || !allowFeaturePreviewSetting.value}
+													/>
+												</FieldRow>
+												{feature.description && <FieldHint mbs={12}>{t(feature.description)}</FieldHint>}
+											</Field>
+											{feature.imageUrl && <Box is='img' width='100%' height='auto' mbs={16} src={feature.imageUrl} alt='' />}
+										</Fragment>
+									))}
+								</FieldGroup>
+							</Accordion.Item>
+						))}
+					</Accordion>
+				</Box>
+			</PageScrollableContentWithShadow>
+			<PageFooter isDirty={isDirty || allowFeaturePreviewSetting.changed}>
+				<ButtonGroup>
+					<Button onClick={() => reset({ featuresPreview: features })}>{t('Cancel')}</Button>
+					<Button primary disabled={!(isDirty || allowFeaturePreviewSetting.changed)} onClick={handleSubmit(handleSave)}>
+						{t('Save_changes')}
+					</Button>
+				</ButtonGroup>
+			</PageFooter>
+		</Page>
+	);
+};
+
+export default AdminFeaturePreviewPage;
diff --git a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
new file mode 100644
index 000000000000..a7d6bd77d136
--- /dev/null
+++ b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
@@ -0,0 +1,26 @@
+import { usePermission } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { memo } from 'react';
+
+import SettingsProvider from '../../../providers/SettingsProvider';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
+import EditableSettingsProvider from '../settings/EditableSettingsProvider';
+import AdminFeaturePreviewPage from './AdminFeaturePreviewPage';
+
+const AdminFeaturePreviewRoute = (): ReactElement => {
+	const canViewFeaturesPreview = usePermission('manage-cloud');
+
+	if (!canViewFeaturesPreview) {
+		return <NotAuthorizedPage />;
+	}
+
+	return (
+		<SettingsProvider privileged>
+			<EditableSettingsProvider>
+				<AdminFeaturePreviewPage />
+			</EditableSettingsProvider>
+		</SettingsProvider>
+	);
+};
+
+export default memo(AdminFeaturePreviewRoute);
diff --git a/apps/meteor/client/views/admin/routes.tsx b/apps/meteor/client/views/admin/routes.tsx
index f70df1625871..d244d5e2f19b 100644
--- a/apps/meteor/client/views/admin/routes.tsx
+++ b/apps/meteor/client/views/admin/routes.tsx
@@ -104,6 +104,10 @@ declare module '@rocket.chat/ui-contexts' {
 			pathname: `/admin/subscription`;
 			pattern: '/admin/subscription';
 		};
+		'admin-feature-preview': {
+			pathname: '/admin/feature-preview';
+			pattern: '/admin/feature-preview';
+		};
 	}
 }
 
@@ -237,3 +241,8 @@ registerAdminRoute('/subscription', {
 	name: 'subscription',
 	component: lazy(() => import('./subscription/SubscriptionRoute')),
 });
+
+registerAdminRoute('/feature-preview', {
+	name: 'admin-feature-preview',
+	component: lazy(() => import('./featurePreview/AdminFeaturePreviewRoute')),
+});
diff --git a/apps/meteor/client/views/admin/sidebarItems.ts b/apps/meteor/client/views/admin/sidebarItems.ts
index 013206d9e9a8..fc7d307396d4 100644
--- a/apps/meteor/client/views/admin/sidebarItems.ts
+++ b/apps/meteor/client/views/admin/sidebarItems.ts
@@ -1,3 +1,5 @@
+import { defaultFeaturesPreview } from '@rocket.chat/ui-client';
+
 import { hasPermission, hasAtLeastOnePermission, hasAllPermission } from '../../../app/authorization/client';
 import { createSidebarItems } from '../../lib/createSidebarItems';
 
@@ -129,6 +131,12 @@ export const {
 		icon: 'emoji',
 		permissionGranted: (): boolean => hasPermission('manage-emoji'),
 	},
+	{
+		href: '/admin/feature-preview',
+		i18nLabel: 'Feature_preview',
+		icon: 'flask',
+		permissionGranted: () => defaultFeaturesPreview?.length > 0,
+	},
 	{
 		href: '/admin/settings',
 		i18nLabel: 'Settings',
diff --git a/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx b/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx
index 14f251042abc..623214352372 100644
--- a/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx
+++ b/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx
@@ -4,7 +4,6 @@ import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { Form } from '@rocket.chat/layout';
 import { useLogout, useRoute } from '@rocket.chat/ui-contexts';
 import { Accounts } from 'meteor/accounts-base';
-import { Meteor } from 'meteor/meteor';
 import React, { useEffect, useMemo, useRef } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
@@ -19,7 +18,7 @@ type AuthorizationFormPageProps = {
 };
 
 const AuthorizationFormPage = ({ oauthApp, redirectUri, user }: AuthorizationFormPageProps) => {
-	const token = useMemo(() => Meteor._localStorage.getItem(Accounts.LOGIN_TOKEN_KEY) ?? undefined, []);
+	const token = useMemo(() => Accounts.storageLocation.getItem(Accounts.LOGIN_TOKEN_KEY) ?? undefined, []);
 
 	const formLabelId = useUniqueId();
 
diff --git a/apps/meteor/client/views/room/RoomOpener.tsx b/apps/meteor/client/views/room/RoomOpener.tsx
index c30acf6f0e83..f87339a67a68 100644
--- a/apps/meteor/client/views/room/RoomOpener.tsx
+++ b/apps/meteor/client/views/room/RoomOpener.tsx
@@ -1,15 +1,18 @@
 import type { RoomType } from '@rocket.chat/core-typings';
-import { States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import { Box, States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import { FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
 import type { ReactElement } from 'react';
 import React, { lazy, Suspense } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { FeaturePreviewSidePanelNavigation } from '../../components/FeaturePreviewSidePanelNavigation';
 import { Header } from '../../components/Header';
 import { getErrorMessage } from '../../lib/errorHandling';
 import { NotAuthorizedError } from '../../lib/errors/NotAuthorizedError';
 import { OldUrlRoomError } from '../../lib/errors/OldUrlRoomError';
 import { RoomNotFoundError } from '../../lib/errors/RoomNotFoundError';
 import RoomSkeleton from './RoomSkeleton';
+import RoomSidepanel from './Sidepanel/RoomSidepanel';
 import { useOpenRoom } from './hooks/useOpenRoom';
 
 const RoomProvider = lazy(() => import('./providers/RoomProvider'));
@@ -23,46 +26,59 @@ type RoomOpenerProps = {
 	reference: string;
 };
 
+const isDirectOrOmnichannelRoom = (type: RoomType) => type === 'd' || type === 'l';
+
 const RoomOpener = ({ type, reference }: RoomOpenerProps): ReactElement => {
 	const { data, error, isSuccess, isError, isLoading } = useOpenRoom({ type, reference });
 	const { t } = useTranslation();
 
 	return (
-		<Suspense fallback={<RoomSkeleton />}>
-			{isLoading && <RoomSkeleton />}
-			{isSuccess && (
-				<RoomProvider rid={data.rid}>
-					<Room />
-				</RoomProvider>
+		<Box display='flex' w='full' h='full'>
+			{!isDirectOrOmnichannelRoom(type) && (
+				<FeaturePreviewSidePanelNavigation>
+					<FeaturePreviewOff>{null}</FeaturePreviewOff>
+					<FeaturePreviewOn>
+						<RoomSidepanel />
+					</FeaturePreviewOn>
+				</FeaturePreviewSidePanelNavigation>
 			)}
-			{isError &&
-				(() => {
-					if (error instanceof OldUrlRoomError) {
-						return <RoomSkeleton />;
-					}
 
-					if (error instanceof RoomNotFoundError) {
-						return <RoomNotFound />;
-					}
+			<Suspense fallback={<RoomSkeleton />}>
+				{isLoading && <RoomSkeleton />}
+				{isSuccess && (
+					<RoomProvider rid={data.rid}>
+						<Room />
+					</RoomProvider>
+				)}
+				{isError &&
+					(() => {
+						if (error instanceof OldUrlRoomError) {
+							return <RoomSkeleton />;
+						}
+
+						if (error instanceof RoomNotFoundError) {
+							return <RoomNotFound />;
+						}
 
-					if (error instanceof NotAuthorizedError) {
-						return <NotAuthorizedPage />;
-					}
+						if (error instanceof NotAuthorizedError) {
+							return <NotAuthorizedPage />;
+						}
 
-					return (
-						<RoomLayout
-							header={<Header />}
-							body={
-								<States>
-									<StatesIcon name='circle-exclamation' variation='danger' />
-									<StatesTitle>{t('core.Error')}</StatesTitle>
-									<StatesSubtitle>{getErrorMessage(error)}</StatesSubtitle>
-								</States>
-							}
-						/>
-					);
-				})()}
-		</Suspense>
+						return (
+							<RoomLayout
+								header={<Header />}
+								body={
+									<States>
+										<StatesIcon name='circle-exclamation' variation='danger' />
+										<StatesTitle>{t('core.Error')}</StatesTitle>
+										<StatesSubtitle>{getErrorMessage(error)}</StatesSubtitle>
+									</States>
+								}
+							/>
+						);
+					})()}
+			</Suspense>
+		</Box>
 	);
 };
 
diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx b/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
new file mode 100644
index 000000000000..27c45e2774e8
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
@@ -0,0 +1,66 @@
+/* eslint-disable react/no-multi-comp */
+import { Box, Sidepanel, SidepanelListItem } from '@rocket.chat/fuselage';
+import { useUserPreference } from '@rocket.chat/ui-contexts';
+import React, { memo } from 'react';
+import { Virtuoso } from 'react-virtuoso';
+
+import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
+import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
+import { useOpenedRoom, useSecondLevelOpenedRoom } from '../../../lib/RoomManager';
+import RoomSidepanelListWrapper from './RoomSidepanelListWrapper';
+import RoomSidepanelLoading from './RoomSidepanelLoading';
+import RoomSidepanelItem from './SidepanelItem';
+import { useTeamsListChildrenUpdate } from './hooks/useTeamslistChildren';
+
+const RoomSidepanel = () => {
+	const parentRid = useOpenedRoom();
+	const secondLevelOpenedRoom = useSecondLevelOpenedRoom() ?? parentRid;
+
+	if (!parentRid || !secondLevelOpenedRoom) {
+		return null;
+	}
+
+	return <RoomSidepanelWithData parentRid={parentRid} openedRoom={secondLevelOpenedRoom} />;
+};
+
+const RoomSidepanelWithData = ({ parentRid, openedRoom }: { parentRid: string; openedRoom: string }) => {
+	const sidebarViewMode = useUserPreference<'extended' | 'medium' | 'condensed'>('sidebarViewMode');
+
+	const roomInfo = useRoomInfoEndpoint(parentRid);
+	const sidepanelItems = roomInfo.data?.room?.sidepanel?.items || roomInfo.data?.parent?.sidepanel?.items;
+
+	const result = useTeamsListChildrenUpdate(
+		parentRid,
+		!roomInfo.data ? null : roomInfo.data.room?.teamId,
+		// eslint-disable-next-line no-nested-ternary
+		!sidepanelItems ? null : sidepanelItems?.length === 1 ? sidepanelItems[0] : undefined,
+	);
+	if (roomInfo.isSuccess && !roomInfo.data.room?.sidepanel && !roomInfo.data.parent?.sidepanel) {
+		return null;
+	}
+
+	if (roomInfo.isLoading || (roomInfo.isSuccess && result.isLoading)) {
+		return <RoomSidepanelLoading />;
+	}
+
+	if (!result.isSuccess || !roomInfo.isSuccess) {
+		return null;
+	}
+
+	return (
+		<Sidepanel>
+			<Box pb={8} h='full'>
+				<Virtuoso
+					totalCount={result.data.data.length}
+					data={result.data.data}
+					components={{ Item: SidepanelListItem, List: RoomSidepanelListWrapper, Scroller: VirtuosoScrollbars }}
+					itemContent={(_, data) => (
+						<RoomSidepanelItem openedRoom={openedRoom} room={data} parentRid={parentRid} viewMode={sidebarViewMode} />
+					)}
+				/>
+			</Box>
+		</Sidepanel>
+	);
+};
+
+export default memo(RoomSidepanel);
diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanelListWrapper.tsx b/apps/meteor/client/views/room/Sidepanel/RoomSidepanelListWrapper.tsx
new file mode 100644
index 000000000000..dd9e6e6ec221
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/RoomSidepanelListWrapper.tsx
@@ -0,0 +1,19 @@
+import { SidepanelList } from '@rocket.chat/fuselage';
+import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ForwardedRef, HTMLAttributes } from 'react';
+import React, { forwardRef } from 'react';
+
+import { useSidebarListNavigation } from '../../../sidebar/RoomList/useSidebarListNavigation';
+
+type RoomListWrapperProps = HTMLAttributes<HTMLDivElement>;
+
+const RoomSidepanelListWrapper = forwardRef(function RoomListWrapper(props: RoomListWrapperProps, ref: ForwardedRef<HTMLDivElement>) {
+	const t = useTranslation();
+	const { sidebarListRef } = useSidebarListNavigation();
+	const mergedRefs = useMergedRefs(ref, sidebarListRef);
+
+	return <SidepanelList aria-label={t('Channels')} ref={mergedRefs} {...props} />;
+});
+
+export default RoomSidepanelListWrapper;
diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanelLoading.tsx b/apps/meteor/client/views/room/Sidepanel/RoomSidepanelLoading.tsx
new file mode 100644
index 000000000000..00609ae6c496
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/RoomSidepanelLoading.tsx
@@ -0,0 +1,20 @@
+import { SidebarV2Item as SidebarItem, Sidepanel, SidepanelList, Skeleton } from '@rocket.chat/fuselage';
+import React from 'react';
+
+const RoomSidepanelLoading = () => (
+	<Sidepanel>
+		<SidepanelList>
+			<SidebarItem>
+				<Skeleton w='full' />
+			</SidebarItem>
+			<SidebarItem>
+				<Skeleton w='full' />
+			</SidebarItem>
+			<SidebarItem>
+				<Skeleton w='full' />
+			</SidebarItem>
+		</SidepanelList>
+	</Sidepanel>
+);
+
+export default RoomSidepanelLoading;
diff --git a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
new file mode 100644
index 000000000000..dceb69e1aba3
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
@@ -0,0 +1,29 @@
+import type { IRoom, ISubscription, Serialized } from '@rocket.chat/core-typings';
+import { useUserSubscription } from '@rocket.chat/ui-contexts';
+import React, { memo } from 'react';
+
+import { goToRoomById } from '../../../../lib/utils/goToRoomById';
+import { useTemplateByViewMode } from '../../../../sidebarv2/hooks/useTemplateByViewMode';
+import { useItemData } from '../hooks/useItemData';
+
+export type RoomSidepanelItemProps = {
+	openedRoom?: string;
+	room: Serialized<IRoom>;
+	parentRid: string;
+	viewMode?: 'extended' | 'medium' | 'condensed';
+};
+
+const RoomSidepanelItem = ({ room, openedRoom, viewMode }: RoomSidepanelItemProps) => {
+	const SidepanelItem = useTemplateByViewMode();
+	const subscription = useUserSubscription(room._id);
+
+	const itemData = useItemData({ ...room, ...subscription } as ISubscription & IRoom, { viewMode, openedRoom }); // as any because of divergent and overlaping timestamp types in subs and room (type Date vs type string)
+
+	if (!subscription) {
+		return <SidepanelItem onClick={goToRoomById} is='a' {...itemData} />;
+	}
+
+	return <SidepanelItem onClick={goToRoomById} {...itemData} />;
+};
+
+export default memo(RoomSidepanelItem);
diff --git a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/index.ts b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/index.ts
new file mode 100644
index 000000000000..5cfc0da3055b
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/index.ts
@@ -0,0 +1 @@
+export { default } from './RoomSidepanelItem';
diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx b/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx
new file mode 100644
index 000000000000..a6de01e22084
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx
@@ -0,0 +1,68 @@
+import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
+import { SidebarV2ItemBadge as SidebarItemBadge, SidebarV2ItemIcon as SidebarItemIcon } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import React, { useMemo } from 'react';
+
+import { RoomIcon } from '../../../../components/RoomIcon';
+import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
+import { getBadgeTitle, getMessage } from '../../../../sidebarv2/RoomList/SidebarItemTemplateWithData';
+import { useAvatarTemplate } from '../../../../sidebarv2/hooks/useAvatarTemplate';
+
+export const useItemData = (
+	room: ISubscription & IRoom,
+	{ openedRoom, viewMode }: { openedRoom: string | undefined; viewMode?: 'extended' | 'medium' | 'condensed' },
+) => {
+	const t = useTranslation();
+	const AvatarTemplate = useAvatarTemplate();
+
+	const highlighted = Boolean(!room.hideUnreadStatus && (room.alert || room.unread));
+
+	const icon = useMemo(
+		() => <SidebarItemIcon highlighted={highlighted} icon={<RoomIcon room={room} placement='sidebar' size='x20' />} />,
+		[highlighted, room],
+	);
+	const time = 'lastMessage' in room ? room.lastMessage?.ts : undefined;
+	const message = viewMode === 'extended' && getMessage(room, room.lastMessage, t);
+
+	const threadUnread = Number(room.tunread?.length) > 0;
+	const isUnread = room.unread > 0 || threadUnread;
+	const showBadge =
+		!room.hideUnreadStatus || (!room.hideMentionStatus && (Boolean(room.userMentions) || Number(room.tunreadUser?.length) > 0));
+	const badgeTitle = getBadgeTitle(room.userMentions, Number(room.tunread?.length), room.groupMentions, room.unread, t);
+	const variant =
+		((room.userMentions || room.tunreadUser?.length) && 'danger') ||
+		(threadUnread && 'primary') ||
+		(room.groupMentions && 'warning') ||
+		'secondary';
+
+	const badges = useMemo(
+		() => (
+			<>
+				{showBadge && isUnread && (
+					<SidebarItemBadge variant={variant} title={badgeTitle}>
+						{room.unread + (room.tunread?.length || 0)}
+					</SidebarItemBadge>
+				)}
+			</>
+		),
+		[badgeTitle, isUnread, room.tunread?.length, room.unread, showBadge, variant],
+	);
+
+	const itemData = useMemo(
+		() => ({
+			unread: highlighted,
+			selected: room.rid === openedRoom,
+			t,
+			href: roomCoordinator.getRouteLink(room.t, room) || '',
+			title: roomCoordinator.getRoomName(room.t, room) || '',
+			icon,
+			time,
+			badges,
+			avatar: AvatarTemplate && <AvatarTemplate {...room} />,
+			subtitle: message,
+		}),
+		[AvatarTemplate, badges, highlighted, icon, message, openedRoom, room, t, time],
+	);
+
+	return itemData;
+};
diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
new file mode 100644
index 000000000000..5791a6e5d547
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
@@ -0,0 +1,106 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useEffect, useMemo } from 'react';
+
+import { ChatRoom } from '../../../../../app/models/client';
+
+const sortRoomByLastMessage = (a: IRoom, b: IRoom) => {
+	if (!a.lm) {
+		return 1;
+	}
+	if (!b.lm) {
+		return -1;
+	}
+	return new Date(b.lm).toUTCString().localeCompare(new Date(a.lm).toUTCString());
+};
+
+export const useTeamsListChildrenUpdate = (
+	parentRid: string,
+	teamId?: string | null,
+	sidepanelItems?: 'channels' | 'discussions' | null,
+) => {
+	const queryClient = useQueryClient();
+
+	const query = useMemo(() => {
+		const query: Parameters<typeof ChatRoom.find>[0] = {
+			$or: [
+				{
+					_id: parentRid,
+				},
+				{
+					prid: parentRid,
+				},
+			],
+		};
+
+		if (teamId && query.$or) {
+			query.$or.push({
+				teamId,
+			});
+		}
+		return query;
+	}, [parentRid, teamId]);
+
+	const teamList = useEndpoint('GET', '/v1/teams.listChildren');
+
+	const listRoomsAndDiscussions = useEndpoint('GET', '/v1/teams.listChildren');
+	const result = useQuery({
+		queryKey: ['sidepanel', 'list', parentRid, sidepanelItems],
+		queryFn: () =>
+			listRoomsAndDiscussions({
+				roomId: parentRid,
+				sort: JSON.stringify({ lm: -1 }),
+				type: sidepanelItems || undefined,
+			}),
+		enabled: sidepanelItems !== null && teamId !== null,
+		refetchInterval: 5 * 60 * 1000,
+		keepPreviousData: true,
+	});
+
+	const { mutate: update } = useMutation({
+		mutationFn: async (params?: { action: 'add' | 'remove' | 'update'; data: IRoom }) => {
+			queryClient.setQueryData(['sidepanel', 'list', parentRid, sidepanelItems], (data: Awaited<ReturnType<typeof teamList>> | void) => {
+				if (!data) {
+					return;
+				}
+
+				if (params?.action === 'add') {
+					data.data = [JSON.parse(JSON.stringify(params.data)), ...data.data].sort(sortRoomByLastMessage);
+				}
+
+				if (params?.action === 'remove') {
+					data.data = data.data.filter((item) => item._id !== params.data?._id);
+				}
+
+				if (params?.action === 'update') {
+					data.data = data.data
+						.map((item) => (item._id === params.data?._id ? JSON.parse(JSON.stringify(params.data)) : item))
+						.sort(sortRoomByLastMessage);
+				}
+
+				return { ...data };
+			});
+		},
+	});
+
+	useEffect(() => {
+		const liveQueryHandle = ChatRoom.find(query).observe({
+			added: (item) => {
+				queueMicrotask(() => update({ action: 'add', data: item }));
+			},
+			changed: (item) => {
+				queueMicrotask(() => update({ action: 'update', data: item }));
+			},
+			removed: (item) => {
+				queueMicrotask(() => update({ action: 'remove', data: item }));
+			},
+		});
+
+		return () => {
+			liveQueryHandle.stop();
+		};
+	}, [update, query]);
+
+	return result;
+};
diff --git a/apps/meteor/client/views/room/Sidepanel/index.ts b/apps/meteor/client/views/room/Sidepanel/index.ts
new file mode 100644
index 000000000000..c236142b8b0f
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/index.ts
@@ -0,0 +1 @@
+export { default } from './RoomSidepanel';
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
index b2aac49927a1..1233768a671c 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable complexity */
-import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
+import type { IRoomWithRetentionPolicy, SidepanelItem } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import {
@@ -21,10 +21,13 @@ import {
 	Box,
 	TextAreaInput,
 	AccordionItem,
+	Divider,
 } from '@rocket.chat/fuselage';
 import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useSetting, useTranslation, useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQueryClient } from '@tanstack/react-query';
 import type { ChangeEvent } from 'react';
 import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
@@ -72,11 +75,12 @@ const getRetentionSetting = (roomType: IRoomWithRetentionPolicy['t']): string =>
 };
 
 const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) => {
+	const query = useQueryClient();
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const isFederated = useMemo(() => isRoomFederated(room), [room]);
 	// eslint-disable-next-line no-nested-ternary
-	const roomType = 'prid' in room ? 'discussion' : room.teamId ? 'team' : 'channel';
+	const roomType = 'prid' in room ? 'discussion' : room.teamMain ? 'team' : 'channel';
 
 	const retentionPolicy = useRetentionPolicy(room);
 	const retentionMaxAgeDefault = msToTimeUnit(TIMEUNIT.days, Number(useSetting<number>(getRetentionSetting(room.t)))) ?? 30;
@@ -118,6 +122,8 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 		retentionOverrideGlobal,
 		roomType: roomTypeP,
 		reactWhenReadOnly,
+		showChannels,
+		showDiscussions,
 	} = watch();
 
 	const {
@@ -158,13 +164,23 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 			retentionIgnoreThreads,
 			...formData
 		}) => {
-			const data = getDirtyFields(formData, dirtyFields);
+			const data = getDirtyFields<Partial<typeof defaultValues>>(formData, dirtyFields);
 			delete data.archived;
+			delete data.showChannels;
+			delete data.showDiscussions;
+
+			const sidepanelItems = [showChannels && 'channels', showDiscussions && 'discussions'].filter(Boolean) as [
+				SidepanelItem,
+				SidepanelItem?,
+			];
+
+			const sidepanel = sidepanelItems.length > 0 ? { items: sidepanelItems } : null;
 
 			try {
 				await saveAction({
 					rid: room._id,
 					...data,
+					...(roomType === 'team' ? { sidepanel } : null),
 					...((data.joinCode || 'joinCodeRequired' in data) && { joinCode: joinCodeRequired ? data.joinCode : '' }),
 					...((data.systemMessages || !hideSysMes) && {
 						systemMessages: hideSysMes && data.systemMessages,
@@ -180,6 +196,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 						}),
 				});
 
+				await query.invalidateQueries(['/v1/rooms.info', room._id]);
 				dispatchToastMessage({ type: 'success', message: t('Room_updated_successfully') });
 				onClickClose();
 			} catch (error) {
@@ -224,6 +241,8 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 	const retentionExcludePinnedField = useUniqueId();
 	const retentionFilesOnlyField = useUniqueId();
 	const retentionIgnoreThreads = useUniqueId();
+	const showDiscussionsField = useUniqueId();
+	const showChannelsField = useUniqueId();
 
 	const showAdvancedSettings = canViewEncrypted || canViewReadOnly || readOnly || canViewArchived || canViewJoinCode || canViewHideSysMes;
 	const showRetentionPolicy = canEditRoomRetentionPolicy && retentionPolicy?.enabled;
@@ -355,6 +374,49 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 						<Accordion>
 							{showAdvancedSettings && (
 								<AccordionItem title={t('Advanced_settings')}>
+									{roomType === 'team' && (
+										<FeaturePreview feature='sidepanelNavigation'>
+											<FeaturePreviewOff>{null}</FeaturePreviewOff>
+											<FeaturePreviewOn>
+												<FieldGroup>
+													<Box is='h5' fontScale='h5' color='titles-labels'>
+														{t('Navigation')}
+													</Box>
+													<Field>
+														<FieldRow>
+															<FieldLabel htmlFor={showChannelsField}>{t('Channels')}</FieldLabel>
+															<Controller
+																control={control}
+																name='showChannels'
+																render={({ field: { value, ...field } }) => (
+																	<ToggleSwitch id={showChannelsField} checked={value} {...field} />
+																)}
+															/>
+														</FieldRow>
+														<FieldRow>
+															<FieldHint id={`${showChannelsField}-hint`}>{t('Show_channels_description')}</FieldHint>
+														</FieldRow>
+													</Field>
+													<Field>
+														<FieldRow>
+															<FieldLabel htmlFor={showDiscussionsField}>{t('Discussions')}</FieldLabel>
+															<Controller
+																control={control}
+																name='showDiscussions'
+																render={({ field: { value, ...field } }) => (
+																	<ToggleSwitch id={showDiscussionsField} checked={value} {...field} />
+																)}
+															/>
+														</FieldRow>
+														<FieldRow>
+															<FieldHint id={`${showDiscussionsField}-hint`}>{t('Show_discussions_description')}</FieldHint>
+														</FieldRow>
+													</Field>
+												</FieldGroup>
+												<Divider mb={24} />
+											</FeaturePreviewOn>
+										</FeaturePreview>
+									)}
 									<FieldGroup>
 										<Box is='h5' fontScale='h5' color='titles-labels'>
 											{t('Security_and_permissions')}
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
index 1a002727358f..b71f8e1b5bc5 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
@@ -10,7 +10,20 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 	const retentionPolicy = useRetentionPolicy(room);
 	const canEditRoomRetentionPolicy = usePermission('edit-room-retention-policy', room._id);
 
-	const { t, ro, archived, topic, description, announcement, joinCodeRequired, sysMes, encrypted, retention, reactWhenReadOnly } = room;
+	const {
+		t,
+		ro,
+		archived,
+		topic,
+		description,
+		announcement,
+		joinCodeRequired,
+		sysMes,
+		encrypted,
+		retention,
+		reactWhenReadOnly,
+		sidepanel,
+	} = room;
 
 	return useMemo(
 		() => ({
@@ -37,6 +50,8 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 					retentionFilesOnly: retention?.filesOnly ?? retentionPolicy.filesOnly,
 					retentionIgnoreThreads: retention?.ignoreThreads ?? retentionPolicy.ignoreThreads,
 				}),
+			showDiscussions: sidepanel?.items.includes('discussions'),
+			showChannels: sidepanel?.items.includes('channels'),
 		}),
 		[
 			announcement,
@@ -53,6 +68,7 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 			encrypted,
 			reactWhenReadOnly,
 			canEditRoomRetentionPolicy,
+			sidepanel,
 		],
 	);
 };
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
index 5f94f7c407b0..86b4571d88d1 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
@@ -1,4 +1,4 @@
-import { Box, FieldGroup, Field, FieldLabel, FieldRow, FieldError, TextAreaInput } from '@rocket.chat/fuselage';
+import { Box, FieldGroup, Field, FieldLabel, FieldRow, FieldError, TextAreaInput, FieldDescription } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import type { ComponentProps } from 'react';
@@ -45,27 +45,32 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
 			onCancel={onClose}
 			confirmText={t('Report')}
 		>
+			<Box mbe={16} display='flex' alignItems='center'>
+				<UserAvatar username={username} />
+				<Box mis={8} fontScale='p2b'>
+					{displayName}
+				</Box>
+			</Box>
 			<FieldGroup>
 				<Field>
-					<FieldLabel htmlFor={reasonForReportId}>
-						<Box mbe='x12' display='flex' alignItems='center'>
-							<UserAvatar username={username} />
-							<Box mis='x12' fontScale='p1' fontWeight='700'>
-								{displayName}
-							</Box>
-						</Box>
-					</FieldLabel>
+					<FieldLabel htmlFor={reasonForReportId}>{t('Report_reason')}</FieldLabel>
+					<FieldDescription id={`${reasonForReportId}-description`}>{t('Let_moderators_know_what_the_issue_is')}</FieldDescription>
 					<FieldRow>
 						<TextAreaInput
+							id={reasonForReportId}
 							rows={3}
-							placeholder={t('Why_do_you_want_to_report_question_mark')}
 							{...register('reasonForReport', { required: t('Required_field', { field: t('Reason_for_report') }) })}
 							width='full'
-							mbe='x4'
-							aria-label={t('Reason_for_report')}
+							mbe={4}
+							aria-required='true'
+							aria-describedby={`${reasonForReportId}-description ${reasonForReportId}-error`}
 						/>
 					</FieldRow>
-					{errors.reasonForReport && <FieldError>{errors.reasonForReport.message}</FieldError>}
+					{errors.reasonForReport && (
+						<FieldError aria-live='assertive' id={`${reasonForReportId}-error`}>
+							{errors.reasonForReport.message}
+						</FieldError>
+					)}
 				</Field>
 			</FieldGroup>
 		</GenericModal>
diff --git a/apps/meteor/client/views/room/layout/RoomLayout.tsx b/apps/meteor/client/views/room/layout/RoomLayout.tsx
index fd080b916b70..3c0c4c313c99 100644
--- a/apps/meteor/client/views/room/layout/RoomLayout.tsx
+++ b/apps/meteor/client/views/room/layout/RoomLayout.tsx
@@ -1,7 +1,11 @@
+/* eslint-disable no-nested-ternary */
 import { Box } from '@rocket.chat/fuselage';
+import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import breakpointsDefinitions from '@rocket.chat/fuselage-tokens/breakpoints.json';
 import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
+import { LayoutContext, useLayout } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement, ReactNode } from 'react';
-import React, { Suspense } from 'react';
+import React, { Suspense, useMemo } from 'react';
 
 import { ContextualbarDialog } from '../../../components/Contextualbar';
 import HeaderSkeleton from '../Header/HeaderSkeleton';
@@ -14,36 +18,78 @@ type RoomLayoutProps = {
 	aside?: ReactNode;
 } & ComponentProps<typeof Box>;
 
-const RoomLayout = ({ header, body, footer, aside, ...props }: RoomLayoutProps): ReactElement => (
-	<Box h='full' display='flex' flexDirection='column' bg='room' {...props}>
-		<Suspense
-			fallback={
-				<FeaturePreview feature='newNavigation'>
-					<FeaturePreviewOff>
-						<HeaderSkeleton />
-					</FeaturePreviewOff>
-					<FeaturePreviewOn>
-						<HeaderSkeletonV2 />
-					</FeaturePreviewOn>
-				</FeaturePreview>
-			}
+const useBreakpointsElement = () => {
+	const { ref, borderBoxSize } = useResizeObserver<HTMLElement>({
+		debounceDelay: 30,
+	});
+
+	const breakpoints = useMemo(
+		() =>
+			breakpointsDefinitions
+				.filter(({ minViewportWidth }) => minViewportWidth && borderBoxSize.inlineSize && borderBoxSize.inlineSize >= minViewportWidth)
+				.map(({ name }) => name),
+		[borderBoxSize],
+	);
+
+	return {
+		ref,
+		breakpoints,
+	};
+};
+
+const RoomLayout = ({ header, body, footer, aside, ...props }: RoomLayoutProps): ReactElement => {
+	const { ref, breakpoints } = useBreakpointsElement();
+
+	const contextualbarPosition = breakpoints.includes('md') ? 'relative' : 'absolute';
+	const contextualbarSize = breakpoints.includes('sm') ? (breakpoints.includes('xl') ? '38%' : '380px') : '100%';
+
+	const layout = useLayout();
+
+	return (
+		<LayoutContext.Provider
+			value={useMemo(
+				() => ({
+					...layout,
+					contextualBarPosition: contextualbarPosition,
+					size: {
+						...layout.size,
+						contextualBar: contextualbarSize,
+					},
+				}),
+				[layout, contextualbarPosition, contextualbarSize],
+			)}
 		>
-			{header}
-		</Suspense>
-		<Box display='flex' flexGrow={1} overflow='hidden' height='full' position='relative'>
-			<Box display='flex' flexDirection='column' flexGrow={1} minWidth={0}>
-				<Box is='div' display='flex' flexDirection='column' flexGrow={1}>
-					<Suspense fallback={null}>{body}</Suspense>
+			<Box h='full' w='full' display='flex' flexDirection='column' bg='room' {...props} ref={ref}>
+				<Suspense
+					fallback={
+						<FeaturePreview feature='newNavigation'>
+							<FeaturePreviewOff>
+								<HeaderSkeleton />
+							</FeaturePreviewOff>
+							<FeaturePreviewOn>
+								<HeaderSkeletonV2 />
+							</FeaturePreviewOn>
+						</FeaturePreview>
+					}
+				>
+					{header}
+				</Suspense>
+				<Box display='flex' flexGrow={1} overflow='hidden' height='full' position='relative'>
+					<Box display='flex' flexDirection='column' flexGrow={1} minWidth={0}>
+						<Box is='div' display='flex' flexDirection='column' flexGrow={1}>
+							<Suspense fallback={null}>{body}</Suspense>
+						</Box>
+						{footer && <Suspense fallback={null}>{footer}</Suspense>}
+					</Box>
+					{aside && (
+						<ContextualbarDialog position={contextualbarPosition}>
+							<Suspense fallback={null}>{aside}</Suspense>
+						</ContextualbarDialog>
+					)}
 				</Box>
-				{footer && <Suspense fallback={null}>{footer}</Suspense>}
 			</Box>
-			{aside && (
-				<ContextualbarDialog>
-					<Suspense fallback={null}>{aside}</Suspense>
-				</ContextualbarDialog>
-			)}
-		</Box>
-	</Box>
-);
+		</LayoutContext.Provider>
+	);
+};
 
 export default RoomLayout;
diff --git a/apps/meteor/client/views/room/providers/RoomProvider.tsx b/apps/meteor/client/views/room/providers/RoomProvider.tsx
index 65c83100b1c0..d67c8566e3c6 100644
--- a/apps/meteor/client/views/room/providers/RoomProvider.tsx
+++ b/apps/meteor/client/views/room/providers/RoomProvider.tsx
@@ -8,12 +8,15 @@ import { RoomHistoryManager } from '../../../../app/ui-utils/client';
 import { UserAction } from '../../../../app/ui/client/lib/UserAction';
 import { useReactiveQuery } from '../../../hooks/useReactiveQuery';
 import { useReactiveValue } from '../../../hooks/useReactiveValue';
+import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
+import { useSidePanelNavigation } from '../../../hooks/useSidePanelNavigation';
 import { RoomManager } from '../../../lib/RoomManager';
 import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 import ImageGalleryProvider from '../../../providers/ImageGalleryProvider';
 import RoomNotFound from '../RoomNotFound';
 import RoomSkeleton from '../RoomSkeleton';
 import { useRoomRolesManagement } from '../body/hooks/useRoomRolesManagement';
+import type { IRoomWithFederationOriginalName } from '../contexts/RoomContext';
 import { RoomContext } from '../contexts/RoomContext';
 import ComposerPopupProvider from './ComposerPopupProvider';
 import RoomToolboxProvider from './RoomToolboxProvider';
@@ -30,15 +33,17 @@ type RoomProviderProps = {
 const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 	useRoomRolesManagement(rid);
 
-	const { data: room, isSuccess } = useRoomQuery(rid);
+	const resultFromServer = useRoomInfoEndpoint(rid);
+
+	const resultFromLocal = useRoomQuery(rid);
 
 	// TODO: the following effect is a workaround while we don't have a general and definitive solution for it
 	const router = useRouter();
 	useEffect(() => {
-		if (isSuccess && !room) {
+		if (resultFromLocal.isSuccess && !resultFromLocal.data) {
 			router.navigate('/home');
 		}
-	}, [isSuccess, room, router]);
+	}, [resultFromLocal.data, resultFromLocal.isSuccess, resultFromServer, router]);
 
 	const subscriptionQuery = useReactiveQuery(['subscriptions', { rid }], () => ChatSubscription.findOne({ rid }) ?? null);
 
@@ -46,7 +51,8 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 
 	useUsersNameChanged();
 
-	const pseudoRoom = useMemo(() => {
+	const pseudoRoom: IRoomWithFederationOriginalName | null = useMemo(() => {
+		const room = resultFromLocal.data;
 		if (!room) {
 			return null;
 		}
@@ -57,7 +63,7 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 			name: roomCoordinator.getRoomName(room.t, room),
 			federationOriginalName: room.name,
 		};
-	}, [room, subscriptionQuery.data]);
+	}, [resultFromLocal.data, subscriptionQuery.data]);
 
 	const { hasMorePreviousMessages, hasMoreNextMessages, isLoadingMoreMessages } = useReactiveValue(
 		useCallback(() => {
@@ -86,12 +92,69 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 		};
 	}, [hasMoreNextMessages, hasMorePreviousMessages, isLoadingMoreMessages, pseudoRoom, rid, subscriptionQuery.data]);
 
+	const isSidepanelFeatureEnabled = useSidePanelNavigation();
+
 	useEffect(() => {
+		if (isSidepanelFeatureEnabled) {
+			if (resultFromServer.isSuccess) {
+				if (resultFromServer.data.room?.teamMain) {
+					if (
+						resultFromServer.data.room.sidepanel?.items.includes('channels') ||
+						resultFromServer.data.room?.sidepanel?.items.includes('discussions')
+					) {
+						RoomManager.openSecondLevel(rid, rid);
+					} else {
+						RoomManager.open(rid);
+					}
+					return (): void => {
+						RoomManager.back(rid);
+					};
+				}
+
+				switch (true) {
+					case resultFromServer.data.room?.prid &&
+						resultFromServer.data.parent &&
+						resultFromServer.data.parent.sidepanel?.items.includes('discussions'):
+						RoomManager.openSecondLevel(resultFromServer.data.parent._id, rid);
+						break;
+					case resultFromServer.data.team?.roomId &&
+						!resultFromServer.data.room?.teamMain &&
+						resultFromServer.data.parent?.sidepanel?.items.includes('channels'):
+						RoomManager.openSecondLevel(resultFromServer.data.team.roomId, rid);
+						break;
+
+					default:
+						if (
+							resultFromServer.data.parent?.sidepanel?.items.includes('channels') ||
+							resultFromServer.data.parent?.sidepanel?.items.includes('discussions')
+						) {
+							RoomManager.openSecondLevel(rid, rid);
+						} else {
+							RoomManager.open(rid);
+						}
+						break;
+				}
+			}
+			return (): void => {
+				RoomManager.back(rid);
+			};
+		}
+
 		RoomManager.open(rid);
 		return (): void => {
 			RoomManager.back(rid);
 		};
-	}, [rid]);
+	}, [
+		isSidepanelFeatureEnabled,
+		rid,
+		resultFromServer.data?.room?.prid,
+		resultFromServer.data?.room?.teamId,
+		resultFromServer.data?.room?.teamMain,
+		resultFromServer.isSuccess,
+		resultFromServer.data?.parent,
+		resultFromServer.data?.team?.roomId,
+		resultFromServer.data,
+	]);
 
 	const subscribed = !!subscriptionQuery.data;
 
@@ -104,7 +167,7 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 	}, [rid, subscribed]);
 
 	if (!pseudoRoom) {
-		return isSuccess && !room ? <RoomNotFound /> : <RoomSkeleton />;
+		return resultFromLocal.isSuccess && !resultFromLocal.data ? <RoomNotFound /> : <RoomSkeleton />;
 	}
 
 	return (
diff --git a/apps/meteor/definition/externals/meteor/accounts-base.d.ts b/apps/meteor/definition/externals/meteor/accounts-base.d.ts
index 31b70f7b7154..0d30eed0430d 100644
--- a/apps/meteor/definition/externals/meteor/accounts-base.d.ts
+++ b/apps/meteor/definition/externals/meteor/accounts-base.d.ts
@@ -1,5 +1,6 @@
 declare module 'meteor/accounts-base' {
 	namespace Accounts {
+		const storageLocation: Window['localStorage'];
 		function createUser(
 			options: {
 				username?: string;
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts
index c5bf0a5aa392..a4b66087be2e 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts
@@ -26,3 +26,4 @@ import './afterInquiryQueued';
 import './sendPdfTranscriptOnClose';
 import './applyRoomRestrictions';
 import './afterTagRemoved';
+import './manageDepartmentUnit';
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/manageDepartmentUnit.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/manageDepartmentUnit.ts
new file mode 100644
index 000000000000..7de7ef0d6bf6
--- /dev/null
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/manageDepartmentUnit.ts
@@ -0,0 +1,53 @@
+import type { ILivechatDepartment, IOmnichannelBusinessUnit } from '@rocket.chat/core-typings';
+import { LivechatDepartment, LivechatUnit } from '@rocket.chat/models';
+
+import { hasAnyRoleAsync } from '../../../../../app/authorization/server/functions/hasRole';
+import { callbacks } from '../../../../../lib/callbacks';
+import { getUnitsFromUser } from '../methods/getUnitsFromUserRoles';
+
+export const manageDepartmentUnit = async ({ userId, departmentId, unitId }: { userId: string; departmentId: string; unitId: string }) => {
+	const accessibleUnits = await getUnitsFromUser(userId);
+	const isLivechatManager = await hasAnyRoleAsync(userId, ['admin', 'livechat-manager']);
+	const department = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, '_id' | 'ancestors' | 'parentId'>>(departmentId, {
+		projection: { ancestors: 1, parentId: 1 },
+	});
+
+	const isDepartmentAlreadyInUnit = unitId && department?.ancestors?.includes(unitId);
+	if (!department || isDepartmentAlreadyInUnit) {
+		return;
+	}
+
+	const currentDepartmentUnitId = department.parentId;
+	const canManageNewUnit = !unitId || isLivechatManager || (Array.isArray(accessibleUnits) && accessibleUnits.includes(unitId));
+	const canManageCurrentUnit =
+		!currentDepartmentUnitId || isLivechatManager || (Array.isArray(accessibleUnits) && accessibleUnits.includes(currentDepartmentUnitId));
+	if (!canManageNewUnit || !canManageCurrentUnit) {
+		return;
+	}
+
+	if (unitId) {
+		const unit = await LivechatUnit.findOneById<Pick<IOmnichannelBusinessUnit, '_id' | 'ancestors'>>(unitId, {
+			projection: { ancestors: 1 },
+		});
+
+		if (!unit) {
+			return;
+		}
+
+		if (currentDepartmentUnitId) {
+			await LivechatUnit.decrementDepartmentsCount(currentDepartmentUnitId);
+		}
+
+		await LivechatDepartment.addDepartmentToUnit(departmentId, unitId, [unitId, ...(unit.ancestors || [])]);
+		await LivechatUnit.incrementDepartmentsCount(unitId);
+		return;
+	}
+
+	if (currentDepartmentUnitId) {
+		await LivechatUnit.decrementDepartmentsCount(currentDepartmentUnitId);
+	}
+
+	await LivechatDepartment.removeDepartmentFromUnit(departmentId);
+};
+
+callbacks.add('livechat.manageDepartmentUnit', manageDepartmentUnit, callbacks.priority.HIGH, 'livechat-manage-department-unit');
diff --git a/apps/meteor/ee/server/lib/engagementDashboard/startup.ts b/apps/meteor/ee/server/lib/engagementDashboard/startup.ts
index 159b121f7043..415e0323d525 100644
--- a/apps/meteor/ee/server/lib/engagementDashboard/startup.ts
+++ b/apps/meteor/ee/server/lib/engagementDashboard/startup.ts
@@ -3,7 +3,12 @@ import { fillFirstDaysOfMessagesIfNeeded, handleMessagesDeleted, handleMessagesS
 import { fillFirstDaysOfUsersIfNeeded, handleUserCreated } from './users';
 
 export const attachCallbacks = (): void => {
-	callbacks.add('afterSaveMessage', handleMessagesSent, callbacks.priority.MEDIUM, 'engagementDashboard.afterSaveMessage');
+	callbacks.add(
+		'afterSaveMessage',
+		(message, { room }) => handleMessagesSent(message, { room }),
+		callbacks.priority.MEDIUM,
+		'engagementDashboard.afterSaveMessage',
+	);
 	callbacks.add('afterDeleteMessage', handleMessagesDeleted, callbacks.priority.MEDIUM, 'engagementDashboard.afterDeleteMessage');
 	callbacks.add('afterCreateUser', handleUserCreated, callbacks.priority.MEDIUM, 'engagementDashboard.afterCreateUser');
 };
diff --git a/apps/meteor/ee/server/models/raw/LivechatUnit.ts b/apps/meteor/ee/server/models/raw/LivechatUnit.ts
index fcabf12fa4f8..c198ee04fbb0 100644
--- a/apps/meteor/ee/server/models/raw/LivechatUnit.ts
+++ b/apps/meteor/ee/server/models/raw/LivechatUnit.ts
@@ -11,7 +11,6 @@ const addQueryRestrictions = async (originalQuery: Filter<IOmnichannelBusinessUn
 
 	const units = await getUnitsFromUser();
 	if (Array.isArray(units)) {
-		query.ancestors = { $in: units };
 		const expressions = query.$and || [];
 		const condition = { $or: [{ ancestors: { $in: units } }, { _id: { $in: units } }] };
 		query.$and = [condition, ...expressions];
@@ -109,28 +108,12 @@ export class LivechatUnitRaw extends BaseRaw<IOmnichannelBusinessUnit> implement
 		// remove other departments
 		for await (const departmentId of savedDepartments) {
 			if (!departmentsToSave.includes(departmentId)) {
-				await LivechatDepartment.updateOne(
-					{ _id: departmentId },
-					{
-						$set: {
-							parentId: null,
-							ancestors: null,
-						},
-					},
-				);
+				await LivechatDepartment.removeDepartmentFromUnit(departmentId);
 			}
 		}
 
 		for await (const departmentId of departmentsToSave) {
-			await LivechatDepartment.updateOne(
-				{ _id: departmentId },
-				{
-					$set: {
-						parentId: _id,
-						ancestors,
-					},
-				},
-			);
+			await LivechatDepartment.addDepartmentToUnit(departmentId, _id, ancestors);
 		}
 
 		await LivechatRooms.associateRoomsWithDepartmentToUnit(departmentsToSave, _id);
@@ -154,6 +137,14 @@ export class LivechatUnitRaw extends BaseRaw<IOmnichannelBusinessUnit> implement
 		return this.updateMany(query, update);
 	}
 
+	incrementDepartmentsCount(_id: string): Promise<UpdateResult | Document> {
+		return this.updateOne({ _id }, { $inc: { numDepartments: 1 } });
+	}
+
+	decrementDepartmentsCount(_id: string): Promise<UpdateResult | Document> {
+		return this.updateOne({ _id }, { $inc: { numDepartments: -1 } });
+	}
+
 	async removeById(_id: string): Promise<DeleteResult> {
 		await LivechatUnitMonitors.removeByUnitId(_id);
 		await this.removeParentAndAncestorById(_id);
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 1d6e058d7597..59da7bfded9c 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,46 @@
 # rocketchat-services
 
+## 1.3.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 1.3.5-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 79c16d315a, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
+## 1.3.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 1.3.3
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/ecdh-proxy/service.ts b/apps/meteor/ee/server/services/ecdh-proxy/service.ts
index 7ef3e8d26dcc..a795f157c9a5 100755
--- a/apps/meteor/ee/server/services/ecdh-proxy/service.ts
+++ b/apps/meteor/ee/server/services/ecdh-proxy/service.ts
@@ -1,5 +1,4 @@
-import '../../startup/broker';
-
+import '@rocket.chat/network-broker';
 import { api } from '@rocket.chat/core-services';
 
 import { ECDHProxy } from './ECDHProxy';
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 43659382eb67..390b2c646cd1 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "rocketchat-services",
 	"private": true,
-	"version": "1.3.3",
+	"version": "1.3.5-rc.1",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
@@ -25,6 +25,7 @@
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/ui-kit": "workspace:~",
diff --git a/apps/meteor/ee/server/startup/index.ts b/apps/meteor/ee/server/startup/index.ts
index a8091f0e9a37..eb09ca6ed30f 100644
--- a/apps/meteor/ee/server/startup/index.ts
+++ b/apps/meteor/ee/server/startup/index.ts
@@ -13,7 +13,7 @@ import { isRunningMs } from '../../../server/lib/isRunningMs';
 export const registerEEBroker = async (): Promise<void> => {
 	// only starts network broker if running in micro services mode
 	if (isRunningMs()) {
-		const { broker } = await import('./broker');
+		const { broker } = await import('@rocket.chat/network-broker');
 
 		api.setBroker(broker);
 		void api.start();
diff --git a/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/manageDepartmentUnit.spec.ts b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/manageDepartmentUnit.spec.ts
new file mode 100644
index 000000000000..8fbf0dcf97a2
--- /dev/null
+++ b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/manageDepartmentUnit.spec.ts
@@ -0,0 +1,183 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const livechatDepartmentStub = {
+	findOneById: sinon.stub(),
+	addDepartmentToUnit: sinon.stub(),
+	removeDepartmentFromUnit: sinon.stub(),
+};
+
+const livechatUnitStub = {
+	findOneById: sinon.stub(),
+	decrementDepartmentsCount: sinon.stub(),
+	incrementDepartmentsCount: sinon.stub(),
+};
+
+const hasAnyRoleStub = sinon.stub();
+const getUnitsFromUserStub = sinon.stub();
+
+const { manageDepartmentUnit } = proxyquire
+	.noCallThru()
+	.load('../../../../../../app/livechat-enterprise/server/hooks/manageDepartmentUnit.ts', {
+		'../methods/getUnitsFromUserRoles': {
+			getUnitsFromUser: getUnitsFromUserStub,
+		},
+		'../../../../../app/authorization/server/functions/hasRole': {
+			hasAnyRoleAsync: hasAnyRoleStub,
+		},
+		'@rocket.chat/models': {
+			LivechatDepartment: livechatDepartmentStub,
+			LivechatUnit: livechatUnitStub,
+		},
+	});
+
+describe('hooks/manageDepartmentUnit', () => {
+	beforeEach(() => {
+		livechatDepartmentStub.findOneById.reset();
+		livechatDepartmentStub.addDepartmentToUnit.reset();
+		livechatDepartmentStub.removeDepartmentFromUnit.reset();
+		livechatUnitStub.findOneById.reset();
+		livechatUnitStub.decrementDepartmentsCount.reset();
+		livechatUnitStub.incrementDepartmentsCount.reset();
+		hasAnyRoleStub.reset();
+	});
+
+	it('should not perform any operation when an invalid department is provided', async () => {
+		livechatDepartmentStub.findOneById.resolves(null);
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(['unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it('should not perform any operation if the provided department is already in unit', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(['unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it("should not perform any operation if user is a monitor and can't manage new unit", async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		hasAnyRoleStub.resolves(false);
+		getUnitsFromUserStub.resolves(['unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'new-unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it("should not perform any operation if user is a monitor and can't manage current unit", async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		hasAnyRoleStub.resolves(false);
+		getUnitsFromUserStub.resolves(['new-unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'new-unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it('should not perform any operation if user is an admin/manager but an invalid unit is provided', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		livechatUnitStub.findOneById.resolves(undefined);
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(undefined);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'new-unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it('should remove department from its current unit if user is an admin/manager', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(undefined);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: undefined });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.calledOnceWith('department-id')).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+	});
+
+	it('should add department to a unit if user is an admin/manager', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id' });
+		livechatUnitStub.findOneById.resolves({ _id: 'unit-id' });
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(undefined);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.calledOnceWith('department-id', 'unit-id', ['unit-id'])).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it('should move department to a new unit if user is an admin/manager', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		livechatUnitStub.findOneById.resolves({ _id: 'new-unit-id' });
+		hasAnyRoleStub.resolves(true);
+		getUnitsFromUserStub.resolves(undefined);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'new-unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.calledOnceWith('department-id', 'new-unit-id', ['new-unit-id'])).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.calledOnceWith('new-unit-id')).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+	});
+
+	it('should remove department from its current unit if user is a monitor that supervises the current unit', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		hasAnyRoleStub.resolves(false);
+		getUnitsFromUserStub.resolves(['unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: undefined });
+		expect(livechatDepartmentStub.addDepartmentToUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.notCalled).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.calledOnceWith('department-id')).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+	});
+
+	it('should add department to a unit if user is a monitor that supervises the new unit', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id' });
+		livechatUnitStub.findOneById.resolves({ _id: 'unit-id' });
+		hasAnyRoleStub.resolves(false);
+		getUnitsFromUserStub.resolves(['unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.calledOnceWith('department-id', 'unit-id', ['unit-id'])).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.notCalled).to.be.true;
+	});
+
+	it('should move department to a new unit if user is a monitor that supervises the current and new units', async () => {
+		livechatDepartmentStub.findOneById.resolves({ _id: 'department-id', ancestors: ['unit-id'], parentId: 'unit-id' });
+		livechatUnitStub.findOneById.resolves({ _id: 'unit-id' });
+		hasAnyRoleStub.resolves(false);
+		getUnitsFromUserStub.resolves(['unit-id', 'new-unit-id']);
+
+		await manageDepartmentUnit({ userId: 'user-id', departmentId: 'department-id', unitId: 'new-unit-id' });
+		expect(livechatDepartmentStub.addDepartmentToUnit.calledOnceWith('department-id', 'new-unit-id', ['new-unit-id'])).to.be.true;
+		expect(livechatUnitStub.incrementDepartmentsCount.calledOnceWith('new-unit-id')).to.be.true;
+		expect(livechatDepartmentStub.removeDepartmentFromUnit.notCalled).to.be.true;
+		expect(livechatUnitStub.decrementDepartmentsCount.calledOnceWith('unit-id')).to.be.true;
+	});
+});
diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts
index 7eaa9ed7595d..dcfd7a021c5e 100644
--- a/apps/meteor/lib/callbacks.ts
+++ b/apps/meteor/lib/callbacks.ts
@@ -225,6 +225,7 @@ type ChainedCallbackSignatures = {
 	'unarchiveRoom': (room: IRoom) => void;
 	'roomAvatarChanged': (room: IRoom) => void;
 	'beforeGetMentions': (mentionIds: string[], teamMentions: MessageMention[]) => Promise<string[]>;
+	'livechat.manageDepartmentUnit': (params: { userId: string; departmentId: string; unitId?: string }) => void;
 };
 
 export type Hook =
@@ -247,6 +248,7 @@ export type Hook =
 	| 'livechat.offlineMessage'
 	| 'livechat.onCheckRoomApiParams'
 	| 'livechat.onLoadConfigApi'
+	| 'livechat.manageDepartmentUnit'
 	| 'loginPageStateChange'
 	| 'mapLDAPUserData'
 	| 'onCreateUser'
@@ -254,10 +256,8 @@ export type Hook =
 	| 'onValidateLogin'
 	| 'openBroadcast'
 	| 'renderNotification'
-	| 'setReaction'
 	| 'streamMessage'
 	| 'streamNewMessage'
-	| 'unsetReaction'
 	| 'userAvatarSet'
 	| 'userConfirmationEmailRequested'
 	| 'userForgotPasswordEmailRequested'
diff --git a/apps/meteor/lib/publishFields.ts b/apps/meteor/lib/publishFields.ts
index c1483ea86cd1..48d0f9c87d5c 100644
--- a/apps/meteor/lib/publishFields.ts
+++ b/apps/meteor/lib/publishFields.ts
@@ -74,6 +74,7 @@ export const roomFields = {
 	avatarETag: 1,
 	usersCount: 1,
 	msgs: 1,
+	sidepanel: 1,
 
 	// @TODO create an API to register this fields based on room type
 	tags: 1,
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 6bbc115d5dc5..0ede05b45429 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/meteor",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "6.13.0-develop",
+	"version": "6.14.0-develop",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
@@ -242,7 +242,7 @@
 		"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2",
 		"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3",
 		"@rocket.chat/freeswitch": "workspace:^",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/fuselage-polyfills": "~0.31.25",
 		"@rocket.chat/fuselage-toastbar": "^0.33.0",
@@ -263,6 +263,7 @@
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/mp3-encoder": "0.24.0",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@rocket.chat/onboarding-ui": "~0.33.3",
 		"@rocket.chat/password-policies": "workspace:^",
diff --git a/apps/meteor/public/images/featurePreview/enhanced-navigation.png b/apps/meteor/public/images/featurePreview/enhanced-navigation.png
new file mode 100644
index 000000000000..4240326ba985
Binary files /dev/null and b/apps/meteor/public/images/featurePreview/enhanced-navigation.png differ
diff --git a/apps/meteor/public/images/featurePreview/resizable-contextual-bar.png b/apps/meteor/public/images/featurePreview/resizable-contextual-bar.png
new file mode 100644
index 000000000000..c36c7e44a29d
Binary files /dev/null and b/apps/meteor/public/images/featurePreview/resizable-contextual-bar.png differ
diff --git a/apps/meteor/public/images/featurePreview/timestamp.png b/apps/meteor/public/images/featurePreview/timestamp.png
new file mode 100644
index 000000000000..7573f97db55b
Binary files /dev/null and b/apps/meteor/public/images/featurePreview/timestamp.png differ
diff --git a/apps/meteor/server/models/raw/EmojiCustom.ts b/apps/meteor/server/models/raw/EmojiCustom.ts
index 300721f60d7b..ec3c6390f64d 100644
--- a/apps/meteor/server/models/raw/EmojiCustom.ts
+++ b/apps/meteor/server/models/raw/EmojiCustom.ts
@@ -72,4 +72,12 @@ export class EmojiCustomRaw extends BaseRaw<IEmojiCustom> implements IEmojiCusto
 	create(data: InsertionModel<IEmojiCustom>): Promise<InsertOneResult<WithId<IEmojiCustom>>> {
 		return this.insertOne(data);
 	}
+
+	countByNameOrAlias(name: string): Promise<number> {
+		const query = {
+			$or: [{ name }, { aliases: name }],
+		};
+
+		return this.countDocuments(query);
+	}
 }
diff --git a/apps/meteor/server/models/raw/LivechatDepartment.ts b/apps/meteor/server/models/raw/LivechatDepartment.ts
index b8263af030a8..9ecee34df5e9 100644
--- a/apps/meteor/server/models/raw/LivechatDepartment.ts
+++ b/apps/meteor/server/models/raw/LivechatDepartment.ts
@@ -222,6 +222,14 @@ export class LivechatDepartmentRaw extends BaseRaw<ILivechatDepartment> implemen
 		return this.updateOne({ _id }, { $set: { archived: true, enabled: false } });
 	}
 
+	addDepartmentToUnit(_id: string, unitId: string, ancestors: string[]): Promise<Document | UpdateResult> {
+		return this.updateOne({ _id }, { $set: { parentId: unitId, ancestors } });
+	}
+
+	removeDepartmentFromUnit(_id: string): Promise<Document | UpdateResult> {
+		return this.updateOne({ _id }, { $set: { parentId: null, ancestors: null } });
+	}
+
 	async createOrUpdateDepartment(
 		_id: string | null,
 		data: {
@@ -328,6 +336,10 @@ export class LivechatDepartmentRaw extends BaseRaw<ILivechatDepartment> implemen
 		return this.find(query, options);
 	}
 
+	countDepartmentsInUnit(unitId: string): Promise<number> {
+		return this.countDocuments({ parentId: unitId });
+	}
+
 	findActiveByUnitIds(unitIds: string[], options: FindOptions<ILivechatDepartment> = {}): FindCursor<ILivechatDepartment> {
 		const query = {
 			enabled: true,
diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts
index ec3bd6fe8d40..7d4a0a54dedf 100644
--- a/apps/meteor/server/models/raw/Rooms.ts
+++ b/apps/meteor/server/models/raw/Rooms.ts
@@ -2063,4 +2063,85 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 
 		return this.updateMany(query, update);
 	}
+
+	findChildrenOfTeam(
+		teamId: string,
+		teamRoomId: string,
+		userId: string,
+		filter?: string,
+		type?: 'channels' | 'discussions',
+		options?: FindOptions<IRoom>,
+	): AggregationCursor<{ totalCount: { count: number }[]; paginatedResults: IRoom[] }> {
+		const nameFilter = filter ? new RegExp(escapeRegExp(filter), 'i') : undefined;
+		return this.col.aggregate<{ totalCount: { count: number }[]; paginatedResults: IRoom[] }>([
+			{
+				$match: {
+					$and: [
+						{
+							$or: [
+								...(!type || type === 'channels' ? [{ teamId }] : []),
+								...(!type || type === 'discussions' ? [{ prid: teamRoomId }] : []),
+							],
+						},
+						...(nameFilter ? [{ $or: [{ fname: nameFilter }, { name: nameFilter }] }] : []),
+					],
+				},
+			},
+			{
+				$lookup: {
+					from: 'rocketchat_subscription',
+					let: {
+						roomId: '$_id',
+					},
+					pipeline: [
+						{
+							$match: {
+								$and: [
+									{
+										$expr: {
+											$eq: ['$rid', '$$roomId'],
+										},
+									},
+									{
+										$expr: {
+											$eq: ['$u._id', userId],
+										},
+									},
+									{
+										$expr: {
+											$ne: ['$t', 'c'],
+										},
+									},
+								],
+							},
+						},
+						{
+							$project: { _id: 1 },
+						},
+					],
+					as: 'subscription',
+				},
+			},
+			{
+				$match: {
+					$or: [
+						{ t: 'c' },
+						{
+							$expr: {
+								$ne: [{ $size: '$subscription' }, 0],
+							},
+						},
+					],
+				},
+			},
+			{ $project: { subscription: 0 } },
+			{ $sort: options?.sort || { ts: 1 } },
+			{
+				$facet: {
+					totalCount: [{ $count: 'count' }],
+					paginatedResults: [{ $skip: options?.skip || 0 }, { $limit: options?.limit || 50 }],
+				},
+			},
+		]);
+	}
 }
diff --git a/apps/meteor/server/routes/avatar/user.js b/apps/meteor/server/routes/avatar/user.js
index 269c2e90019a..1c92d24fe300 100644
--- a/apps/meteor/server/routes/avatar/user.js
+++ b/apps/meteor/server/routes/avatar/user.js
@@ -32,6 +32,13 @@ export const userAvatar = async function (req, res) {
 		return;
 	}
 
+	if (settings.get('Accounts_AvatarExternalProviderUrl')) {
+		const response = await fetch(settings.get('Accounts_AvatarExternalProviderUrl').replace('{username}', requestUsername));
+		response.headers.forEach((value, key) => res.setHeader(key, value));
+		response.body.pipe(res);
+		return;
+	}
+
 	const reqModifiedHeader = req.headers['if-modified-since'];
 
 	const file = await Avatars.findOneByName(requestUsername);
@@ -52,13 +59,6 @@ export const userAvatar = async function (req, res) {
 		return FileUpload.get(file, req, res);
 	}
 
-	if (settings.get('Accounts_AvatarExternalProviderUrl')) {
-		const response = await fetch(settings.get('Accounts_AvatarExternalProviderUrl').replace('{username}', requestUsername));
-		response.headers.forEach((value, key) => res.setHeader(key, value));
-		response.body.pipe(res);
-		return;
-	}
-
 	// if still using "letters fallback"
 	if (!wasFallbackModified(reqModifiedHeader, res)) {
 		res.writeHead(304);
diff --git a/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts b/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts
index a954e4899970..19f42626c216 100644
--- a/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts
+++ b/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts
@@ -1,9 +1,10 @@
+import type { AtLeast } from '@rocket.chat/core-typings';
 import { type IMessage, type IRoom, isMessageFromMatrixFederation, isRoomFederated } from '@rocket.chat/core-typings';
 
 import { isFederationEnabled, isFederationReady } from '../../federation/utils';
 
 export class FederationActions {
-	public static shouldPerformAction(message: IMessage, room: IRoom): boolean {
+	public static shouldPerformAction(message: IMessage, room: AtLeast<IRoom, 'federated'>): boolean {
 		if (isMessageFromMatrixFederation(message) || isRoomFederated(room)) {
 			return isFederationEnabled() && isFederationReady();
 		}
diff --git a/apps/meteor/server/services/messages/service.ts b/apps/meteor/server/services/messages/service.ts
index b20b5236b7fe..85afcf394f28 100644
--- a/apps/meteor/server/services/messages/service.ts
+++ b/apps/meteor/server/services/messages/service.ts
@@ -1,6 +1,6 @@
 import type { IMessageService } from '@rocket.chat/core-services';
 import { Authorization, ServiceClassInternal } from '@rocket.chat/core-services';
-import { type IMessage, type MessageTypesValues, type IUser, type IRoom, isEditedMessage } from '@rocket.chat/core-typings';
+import { type IMessage, type MessageTypesValues, type IUser, type IRoom, isEditedMessage, type AtLeast } from '@rocket.chat/core-typings';
 import { Messages, Rooms } from '@rocket.chat/models';
 
 import { deleteMessage } from '../../../app/lib/server/functions/deleteMessage';
@@ -244,7 +244,7 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 	// 	await Room.join({ room, user });
 	// }
 
-	async beforeReacted(message: IMessage, room: IRoom) {
+	async beforeReacted(message: IMessage, room: AtLeast<IRoom, 'federated'>) {
 		if (!FederationActions.shouldPerformAction(message, room)) {
 			throw new FederationMatrixInvalidConfigurationError('Unable to react to message');
 		}
diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts
index 27f7af1f1b1c..4be96bff9866 100644
--- a/apps/meteor/server/services/team/service.ts
+++ b/apps/meteor/server/services/team/service.ts
@@ -913,8 +913,8 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 		});
 	}
 
-	async getOneByRoomId(roomId: string): Promise<ITeam | null> {
-		const room = await Rooms.findOneById(roomId);
+	async getOneByRoomId(roomId: string, options?: FindOptions<ITeam>): Promise<ITeam | null> {
+		const room = await Rooms.findOneById(roomId, { projection: { teamId: 1 } });
 
 		if (!room) {
 			throw new Error('invalid-room');
@@ -924,7 +924,7 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 			throw new Error('room-not-on-team');
 		}
 
-		return Team.findOneById(room.teamId);
+		return Team.findOneById(room.teamId, options);
 	}
 
 	async addRolesToMember(teamId: string, userId: string, roles: Array<string>): Promise<boolean> {
@@ -1055,8 +1055,10 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 		return rooms;
 	}
 
-	private getParentRoom(team: AtLeast<ITeam, 'roomId'>): Promise<Pick<IRoom, 'name' | 'fname' | 't' | '_id'> | null> {
-		return Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | '_id'>>(team.roomId, { projection: { name: 1, fname: 1, t: 1 } });
+	private getParentRoom(team: AtLeast<ITeam, 'roomId'>): Promise<Pick<IRoom, 'name' | 'fname' | 't' | '_id' | 'sidepanel'> | null> {
+		return Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | '_id' | 'sidepanel'>>(team.roomId, {
+			projection: { name: 1, fname: 1, t: 1, sidepanel: 1 },
+		});
 	}
 
 	async getRoomInfo(
@@ -1078,4 +1080,37 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 		const parentRoom = await this.getParentRoom(team);
 		return { team, ...(parentRoom && { parentRoom }) };
 	}
+
+	// Returns the list of rooms and discussions a user has access to inside a team
+	// Rooms returned are a composition of the rooms the user is in + public rooms + discussions from the main room (if any)
+	async listChildren(
+		userId: string,
+		team: AtLeast<ITeam, '_id' | 'roomId' | 'type'>,
+		filter?: string,
+		type?: 'channels' | 'discussions',
+		sort?: Record<string, 1 | -1>,
+		skip = 0,
+		limit = 10,
+	): Promise<{ total: number; data: IRoom[] }> {
+		const mainRoom = await Rooms.findOneById(team.roomId, { projection: { _id: 1 } });
+		if (!mainRoom) {
+			throw new Error('error-invalid-team-no-main-room');
+		}
+
+		const isMember = await TeamMember.findOneByUserIdAndTeamId(userId, team._id, {
+			projection: { _id: 1 },
+		});
+
+		if (!isMember) {
+			throw new Error('error-invalid-team-not-a-member');
+		}
+
+		const [{ totalCount: [{ count: total }] = [], paginatedResults: data = [] }] =
+			(await Rooms.findChildrenOfTeam(team._id, mainRoom._id, userId, filter, type, { skip, limit, sort }).toArray()) || [];
+
+		return {
+			total,
+			data,
+		};
+	}
 }
diff --git a/apps/meteor/server/settings/accounts.ts b/apps/meteor/server/settings/accounts.ts
index b4da1cd913e9..81166af5c200 100644
--- a/apps/meteor/server/settings/accounts.ts
+++ b/apps/meteor/server/settings/accounts.ts
@@ -743,6 +743,11 @@ export const createAccountSettings = () =>
 				i18nLabel: 'Sidebar_Sections_Order',
 				i18nDescription: 'Sidebar_Sections_Order_Description',
 			});
+
+			await this.add('Accounts_Default_User_Preferences_featuresPreview', '[]', {
+				type: 'string',
+				public: true,
+			});
 		});
 
 		await this.section('Avatar', async function () {
diff --git a/apps/meteor/server/settings/e2e.ts b/apps/meteor/server/settings/e2e.ts
index 6f22784f1709..c8a69757128b 100644
--- a/apps/meteor/server/settings/e2e.ts
+++ b/apps/meteor/server/settings/e2e.ts
@@ -35,4 +35,10 @@ export const createE2ESettings = () =>
 			public: true,
 			enableQuery: { _id: 'E2E_Enable', value: true },
 		});
+
+		await this.add('E2E_Enabled_Mentions', false, {
+			type: 'boolean',
+			public: true,
+			enableQuery: { _id: 'E2E_Enable', value: true },
+		});
 	});
diff --git a/apps/meteor/tests/data/livechat/department.ts b/apps/meteor/tests/data/livechat/department.ts
index 72ab0af9f267..d7f22fca970b 100644
--- a/apps/meteor/tests/data/livechat/department.ts
+++ b/apps/meteor/tests/data/livechat/department.ts
@@ -42,36 +42,44 @@ const updateDepartment = async (departmentId: string, departmentData: Partial<Li
 	return response.body.department;
 };
 
-const createDepartmentWithMethod = (
-	initialAgents: { agentId: string; username: string }[] = [],
-	{
-		allowReceiveForwardOffline = false,
-		fallbackForwardDepartment,
-	}: {
-		allowReceiveForwardOffline?: boolean;
-		fallbackForwardDepartment?: string;
-	} = {},
-) =>
+export const createDepartmentWithMethod = ({
+	initialAgents = [],
+	allowReceiveForwardOffline = false,
+	fallbackForwardDepartment,
+	name,
+	departmentUnit,
+	userCredentials = credentials,
+	departmentId = '',
+}: {
+	initialAgents?: { agentId: string; username: string }[];
+	allowReceiveForwardOffline?: boolean;
+	fallbackForwardDepartment?: string;
+	name?: string;
+	departmentUnit?: { _id?: string };
+	userCredentials?: Credentials;
+	departmentId?: string;
+} = {}): Promise<ILivechatDepartment> =>
 	new Promise((resolve, reject) => {
 		void request
 			.post(methodCall('livechat:saveDepartment'))
-			.set(credentials)
+			.set(userCredentials)
 			.send({
 				message: JSON.stringify({
 					method: 'livechat:saveDepartment',
 					params: [
-						'',
+						departmentId,
 						{
 							enabled: true,
 							email: faker.internet.email(),
 							showOnRegistration: true,
 							showOnOfflineForm: true,
-							name: `new department ${Date.now()}`,
+							name: name || `new department ${Date.now()}`,
 							description: 'created from api',
 							allowReceiveForwardOffline,
 							fallbackForwardDepartment,
 						},
 						initialAgents,
+						departmentUnit,
 					],
 					id: 'id',
 					msg: 'method',
@@ -93,7 +101,7 @@ type OnlineAgent = {
 export const createDepartmentWithAnOnlineAgent = async (): Promise<{ department: ILivechatDepartment; agent: OnlineAgent }> => {
 	const { user, credentials } = await createAnOnlineAgent();
 
-	const department = (await createDepartmentWithMethod()) as ILivechatDepartment;
+	const department = await createDepartmentWithMethod();
 
 	await addOrRemoveAgentFromDepartment(department._id, { agentId: user._id, username: user.username }, true);
 
@@ -108,7 +116,7 @@ export const createDepartmentWithAnOnlineAgent = async (): Promise<{ department:
 
 export const createDepartmentWithAgent = async (agent: OnlineAgent): Promise<{ department: ILivechatDepartment; agent: OnlineAgent }> => {
 	const { user, credentials } = agent;
-	const department = (await createDepartmentWithMethod()) as ILivechatDepartment;
+	const department = await createDepartmentWithMethod();
 
 	await addOrRemoveAgentFromDepartment(department._id, { agentId: user._id, username: user.username }, true);
 
@@ -153,7 +161,7 @@ export const createDepartmentWithAnOfflineAgent = async ({
 }> => {
 	const { user, credentials } = await createAnOfflineAgent();
 
-	const department = (await createDepartmentWithMethod(undefined, {
+	const department = (await createDepartmentWithMethod({
 		allowReceiveForwardOffline,
 		fallbackForwardDepartment,
 	})) as ILivechatDepartment;
diff --git a/apps/meteor/tests/data/livechat/rooms.ts b/apps/meteor/tests/data/livechat/rooms.ts
index b5d89762c614..46e5cbe489a9 100644
--- a/apps/meteor/tests/data/livechat/rooms.ts
+++ b/apps/meteor/tests/data/livechat/rooms.ts
@@ -98,11 +98,55 @@ export const createDepartment = (
 	name?: string,
 	enabled = true,
 	opts: Record<string, any> = {},
+	departmentUnit?: { _id?: string },
+	userCredentials: Credentials = credentials,
 ): Promise<ILivechatDepartment> => {
 	return new Promise((resolve, reject) => {
 		void request
 			.post(api('livechat/department'))
-			.set(credentials)
+			.set(userCredentials)
+			.send({
+				department: {
+					name: name || `Department ${Date.now()}`,
+					enabled,
+					showOnOfflineForm: true,
+					showOnRegistration: true,
+					email: 'a@b.com',
+					...opts,
+				},
+				agents,
+				departmentUnit,
+			})
+			.end((err: Error, res: DummyResponse<ILivechatDepartment>) => {
+				if (err) {
+					return reject(err);
+				}
+				resolve(res.body.department);
+			});
+	});
+};
+
+export const updateDepartment = ({
+	departmentId,
+	userCredentials,
+	agents,
+	name,
+	enabled = true,
+	opts = {},
+	departmentUnit,
+}: {
+	departmentId: string;
+	userCredentials: Credentials;
+	agents?: { agentId: string }[];
+	name?: string;
+	enabled?: boolean;
+	opts?: Record<string, any>;
+	departmentUnit?: { _id?: string };
+}): Promise<ILivechatDepartment> => {
+	return new Promise((resolve, reject) => {
+		void request
+			.put(api(`livechat/department/${departmentId}`))
+			.set(userCredentials)
 			.send({
 				department: {
 					name: name || `Department ${Date.now()}`,
@@ -113,6 +157,7 @@ export const createDepartment = (
 					...opts,
 				},
 				agents,
+				departmentUnit,
 			})
 			.end((err: Error, res: DummyResponse<ILivechatDepartment>) => {
 				if (err) {
diff --git a/apps/meteor/tests/data/livechat/units.ts b/apps/meteor/tests/data/livechat/units.ts
index 03ea578e654d..8a2d0f5a833a 100644
--- a/apps/meteor/tests/data/livechat/units.ts
+++ b/apps/meteor/tests/data/livechat/units.ts
@@ -1,7 +1,7 @@
 import { faker } from '@faker-js/faker';
 import type { IOmnichannelBusinessUnit } from '@rocket.chat/core-typings';
 
-import { methodCall, credentials, request } from '../api-data';
+import { methodCall, credentials, request, api } from '../api-data';
 import type { DummyResponse } from './utils';
 
 export const createMonitor = async (username: string): Promise<{ _id: string; username: string }> => {
@@ -57,3 +57,39 @@ export const createUnit = async (
 			});
 	});
 };
+
+export const deleteUnit = async (unit: IOmnichannelBusinessUnit): Promise<IOmnichannelBusinessUnit> => {
+	return new Promise((resolve, reject) => {
+		void request
+			.post(methodCall(`livechat:removeUnit`))
+			.set(credentials)
+			.send({
+				message: JSON.stringify({
+					method: 'livechat:removeUnit',
+					params: [unit._id],
+					id: '101',
+					msg: 'method',
+				}),
+			})
+			.end((err: Error, res: DummyResponse<string, 'wrapped'>) => {
+				if (err) {
+					return reject(err);
+				}
+				resolve(JSON.parse(res.body.message).result);
+			});
+	});
+};
+
+export const getUnit = (unitId: string): Promise<IOmnichannelBusinessUnit> => {
+	return new Promise((resolve, reject) => {
+		void request
+			.get(api(`livechat/units/${unitId}`))
+			.set(credentials)
+			.end((err: Error, res: DummyResponse<IOmnichannelBusinessUnit, 'not-wrapped'>) => {
+				if (err) {
+					return reject(err);
+				}
+				resolve(res.body);
+			});
+	});
+};
diff --git a/apps/meteor/tests/data/teams.helper.ts b/apps/meteor/tests/data/teams.helper.ts
index 8fc60bd19fd4..f6cba25f86c9 100644
--- a/apps/meteor/tests/data/teams.helper.ts
+++ b/apps/meteor/tests/data/teams.helper.ts
@@ -2,11 +2,20 @@ import type { ITeam, TEAM_TYPE } from '@rocket.chat/core-typings';
 
 import { api, request } from './api-data';
 
-export const createTeam = async (credentials: Record<string, any>, teamName: string, type: TEAM_TYPE): Promise<ITeam> => {
-	const response = await request.post(api('teams.create')).set(credentials).send({
-		name: teamName,
-		type,
-	});
+export const createTeam = async (
+	credentials: Record<string, any>,
+	teamName: string,
+	type: TEAM_TYPE,
+	members?: string[],
+): Promise<ITeam> => {
+	const response = await request
+		.post(api('teams.create'))
+		.set(credentials)
+		.send({
+			name: teamName,
+			type,
+			...(members && { members }),
+		});
 
 	return response.body.team;
 };
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index 8c6297e9975d..ad98df1aaa53 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -133,11 +133,13 @@ test.describe.serial('e2e-encryption', () => {
 
 	test.beforeAll(async ({ api }) => {
 		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: true })).status()).toBe(200);
+		expect((await api.post('/settings/E2E_Enabled_Mentions', { value: true })).status()).toBe(200);
 	});
 
 	test.afterAll(async ({ api }) => {
 		expect((await api.post('/settings/E2E_Enable', { value: false })).status()).toBe(200);
 		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false })).status()).toBe(200);
+		expect((await api.post('/settings/E2E_Enabled_Mentions', { value: false })).status()).toBe(200);
 	});
 
 	test('expect create a private channel encrypted and send an encrypted message', async ({ page }) => {
@@ -265,6 +267,75 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
 	});
 
+	test('expect create a encrypted private channel and mention user', async ({ page }) => {
+		const channelName = faker.string.uuid();
+
+		await poHomeChannel.sidenav.createEncryptedChannel(channelName);
+
+		await expect(page).toHaveURL(`/group/${channelName}`);
+
+		await poHomeChannel.dismissToast();
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await poHomeChannel.content.sendMessage('hello @user1');
+
+		const userMention = await page.getByRole('button', {
+			name: 'user1',
+		});
+
+		await expect(userMention).toBeVisible();
+	});
+
+	test('expect create a encrypted private channel, mention a channel and navigate to it', async ({ page }) => {
+		const channelName = faker.string.uuid();
+
+		await poHomeChannel.sidenav.createEncryptedChannel(channelName);
+
+		await expect(page).toHaveURL(`/group/${channelName}`);
+
+		await poHomeChannel.dismissToast();
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await poHomeChannel.content.sendMessage('Are you in the #general channel?');
+
+		const channelMention = await page.getByRole('button', {
+			name: 'general',
+		});
+
+		await expect(channelMention).toBeVisible();
+
+		await channelMention.click();
+
+		await expect(page).toHaveURL(`/channel/general`);
+	});
+
+	test('expect create a encrypted private channel, mention a channel and user', async ({ page }) => {
+		const channelName = faker.string.uuid();
+
+		await poHomeChannel.sidenav.createEncryptedChannel(channelName);
+
+		await expect(page).toHaveURL(`/group/${channelName}`);
+
+		await poHomeChannel.dismissToast();
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await poHomeChannel.content.sendMessage('Are you in the #general channel, @user1 ?');
+
+		const channelMention = await page.getByRole('button', {
+			name: 'general',
+		});
+
+		const userMention = await page.getByRole('button', {
+			name: 'user1',
+		});
+
+		await expect(userMention).toBeVisible();
+		await expect(channelMention).toBeVisible();
+	});
+
 	test('should encrypted field be available on edit room', async ({ page }) => {
 		const channelName = faker.string.uuid();
 
diff --git a/apps/meteor/tests/e2e/mark-unread.spec.ts b/apps/meteor/tests/e2e/mark-unread.spec.ts
new file mode 100644
index 000000000000..81ae93965856
--- /dev/null
+++ b/apps/meteor/tests/e2e/mark-unread.spec.ts
@@ -0,0 +1,71 @@
+import { createAuxContext } from './fixtures/createAuxContext';
+import { Users } from './fixtures/userStates';
+import { HomeChannel } from './page-objects';
+import { createTargetChannel } from './utils';
+import { test, expect } from './utils/test';
+
+test.use({ storageState: Users.admin.state });
+
+test.describe.serial('mark-unread', () => {
+	let poHomeChannel: HomeChannel;
+	let targetChannel: string;
+
+	test.beforeEach(async ({ page, api }) => {
+		poHomeChannel = new HomeChannel(page);
+		targetChannel = await createTargetChannel(api, { members: ['user2'] });
+
+		await page.emulateMedia({ reducedMotion: 'reduce' });
+		await page.goto('/home');
+	});
+
+	test.afterEach(async ({ api }) => {
+		await api.post('/channels.delete', { roomName: targetChannel });
+	});
+
+	test.describe('Mark Unread - Sidebar Action', () => {
+		test('should not mark empty room as unread', async () => {
+			await poHomeChannel.sidenav.selectMarkAsUnread(targetChannel);
+
+			await expect(poHomeChannel.sidenav.getRoomBadge(targetChannel)).not.toBeVisible();
+		});
+
+		test('should mark a populated room as unread', async () => {
+			await poHomeChannel.sidenav.openChat(targetChannel);
+			await poHomeChannel.content.sendMessage('this is a message for reply');
+			await poHomeChannel.sidenav.selectMarkAsUnread(targetChannel);
+
+			await expect(poHomeChannel.sidenav.getRoomBadge(targetChannel)).toBeVisible();
+		});
+
+		test('should mark a populated room as unread - search', async () => {
+			await poHomeChannel.sidenav.openChat(targetChannel);
+			await poHomeChannel.content.sendMessage('this is a message for reply');
+			await poHomeChannel.sidenav.selectMarkAsUnread(targetChannel);
+			await poHomeChannel.sidenav.searchRoom(targetChannel);
+
+			await expect(poHomeChannel.sidenav.getSearchChannelBadge(targetChannel)).toBeVisible();
+		});
+	});
+
+	test.describe('Mark Unread - Message Action', () => {
+		let poHomeChannelUser2: HomeChannel;
+
+		test('should mark a populated room as unread', async ({ browser }) => {
+			const { page: user2Page } = await createAuxContext(browser, Users.user2);
+			poHomeChannelUser2 = new HomeChannel(user2Page);
+
+			await poHomeChannelUser2.sidenav.openChat(targetChannel);
+			await poHomeChannelUser2.content.sendMessage('this is a message for reply');
+			await user2Page.close();
+
+			await poHomeChannel.sidenav.openChat(targetChannel);
+
+			// wait for the sidebar item to be read
+			await poHomeChannel.sidenav.getSidebarItemByName(targetChannel, true).waitFor();
+			await poHomeChannel.content.openLastMessageMenu();
+			await poHomeChannel.markUnread.click();
+
+			await expect(poHomeChannel.sidenav.getRoomBadge(targetChannel)).toBeVisible();
+		});
+	});
+});
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
index 5962dc29451c..77c378281d94 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -85,7 +85,7 @@ export class HomeContent {
 		await this.joinRoomIfNeeded();
 		await this.page.waitForSelector('[name="msg"]:not([disabled])');
 		await this.page.locator('[name="msg"]').fill(text);
-		await this.page.keyboard.press('Enter');
+		await this.page.getByLabel('Send').click();
 	}
 
 	async dispatchSlashCommand(text: string): Promise<void> {
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
index d0bdd5028010..823469d02a96 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
@@ -68,8 +68,18 @@ export class HomeSidenav {
 		return this.page.locator('role=menuitemcheckbox[name="Profile"]');
 	}
 
-	getSidebarItemByName(name: string): Locator {
-		return this.page.locator(`[data-qa="sidebar-item"][aria-label="${name}"]`);
+	// TODO: refactor getSidebarItemByName to not use data-qa
+	getSidebarItemByName(name: string, isRead?: boolean): Locator {
+		return this.page.locator(
+			['[data-qa="sidebar-item"]', `[aria-label="${name}"]`, isRead && '[data-unread="false"]'].filter(Boolean).join(''),
+		);
+	}
+
+	async selectMarkAsUnread(name: string) {
+		const sidebarItem = this.getSidebarItemByName(name);
+		await sidebarItem.focus();
+		await sidebarItem.locator('.rcx-sidebar-item__menu').click();
+		await this.page.getByRole('option', { name: 'Mark Unread' }).click();
 	}
 
 	async selectPriority(name: string, priority: string) {
@@ -170,4 +180,12 @@ export class HomeSidenav {
 		await this.checkboxEncryption.click();
 		await this.btnCreate.click();
 	}
+
+	getRoomBadge(roomName: string): Locator {
+		return this.getSidebarItemByName(roomName).getByRole('status', { exact: true });
+	}
+
+	getSearchChannelBadge(name: string): Locator {
+		return this.page.locator(`[data-qa="sidebar-item"][aria-label="${name}"]`).first().getByRole('status', { exact: true });
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/home-channel.ts b/apps/meteor/tests/e2e/page-objects/home-channel.ts
index a2784ea4c67b..ce51896eb449 100644
--- a/apps/meteor/tests/e2e/page-objects/home-channel.ts
+++ b/apps/meteor/tests/e2e/page-objects/home-channel.ts
@@ -59,4 +59,8 @@ export class HomeChannel {
 	get roomHeaderToolbar(): Locator {
 		return this.page.locator('[role=toolbar][aria-label="Primary Room actions"]');
 	}
+
+	get markUnread(): Locator {
+		return this.page.locator('role=menuitem[name="Mark Unread"]');
+	}
 }
diff --git a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
index f02d9d1d1e95..31134412b8ec 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
@@ -1,11 +1,11 @@
 import { faker } from '@faker-js/faker';
 import type { ILivechatVisitor } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { before, describe, it, after } from 'mocha';
 import moment from 'moment';
 import { type Response } from 'supertest';
 
-import { getCredentials, api, request, credentials } from '../../../data/api-data';
+import { getCredentials, api, request, credentials, methodCallAnon } from '../../../data/api-data';
 import { createCustomField, deleteCustomField } from '../../../data/livechat/custom-fields';
 import {
 	makeAgentAvailable,
@@ -217,6 +217,30 @@ describe('LIVECHAT - visitors', () => {
 			expect(body.visitor).to.have.property('livechatData');
 			expect(body.visitor.livechatData).to.have.property(customFieldName, 'Not a real address :)');
 		});
+
+		describe('special cases', () => {
+			before(async () => {
+				await updateSetting('Livechat_Allow_collect_and_store_HTTP_header_informations', true);
+			});
+			after(async () => {
+				await updateSetting('Livechat_Allow_collect_and_store_HTTP_header_informations', false);
+			});
+
+			// Note: this had to use the meteor method because the endpoint used `req.headers` which we cannot send as empty
+			// method doesn't pass them to the func allowing us to create a test for it
+			it('should allow to create a visitor without passing connectionData when GDPR setting is enabled', async () => {
+				const token = `${new Date().getTime()}-test`;
+				const response = await request
+					.post(methodCallAnon('livechat:registerGuest'))
+					.send({ message: `{"msg":"method","id":"23","method":"livechat:registerGuest","params":[{ "token": "${token}"}]}` });
+
+				expect(response.body).to.have.property('success', true);
+				const r = JSON.parse(response.body.message);
+
+				expect(r.result).to.have.property('visitor');
+				expect(r.result.visitor).to.have.property('token', token);
+			});
+		});
 	});
 
 	describe('livechat/visitors.info', () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/14-units.ts b/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
index 425c776fecdb..e0c079ece243 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/14-units.ts
@@ -1,12 +1,14 @@
 import type { ILivechatDepartment, IOmnichannelBusinessUnit } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { before, after, describe, it } from 'mocha';
 
-import { getCredentials, api, request, credentials } from '../../../data/api-data';
-import { createDepartment } from '../../../data/livechat/rooms';
-import { createMonitor, createUnit } from '../../../data/livechat/units';
+import { getCredentials, api, request, credentials, methodCall } from '../../../data/api-data';
+import { deleteDepartment, getDepartmentById, createDepartmentWithMethod } from '../../../data/livechat/department';
+import { createDepartment, updateDepartment } from '../../../data/livechat/rooms';
+import { createMonitor, createUnit, deleteUnit, getUnit } from '../../../data/livechat/units';
 import { updatePermission, updateSetting } from '../../../data/permissions.helper';
-import { createUser, deleteUser } from '../../../data/users.helper';
+import { password } from '../../../data/user';
+import { createUser, deleteUser, login } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
 (IS_EE ? describe : describe.skip)('[EE] LIVECHAT - Units', () => {
@@ -14,6 +16,7 @@ import { IS_EE } from '../../../e2e/config/constants';
 
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
+		await updatePermission('manage-livechat-departments', ['livechat-manager', 'livechat-monitor', 'admin']);
 	});
 
 	describe('[GET] livechat/units', () => {
@@ -409,4 +412,547 @@ import { IS_EE } from '../../../e2e/config/constants';
 			await deleteUser(user);
 		});
 	});
+
+	describe('[POST] livechat/department', () => {
+		let monitor1: Awaited<ReturnType<typeof createUser>>;
+		let monitor1Credentials: Awaited<ReturnType<typeof login>>;
+		let monitor2: Awaited<ReturnType<typeof createUser>>;
+		let monitor2Credentials: Awaited<ReturnType<typeof login>>;
+		let unit: IOmnichannelBusinessUnit;
+
+		before(async () => {
+			monitor1 = await createUser();
+			monitor2 = await createUser();
+			await createMonitor(monitor1.username);
+			monitor1Credentials = await login(monitor1.username, password);
+			await createMonitor(monitor2.username);
+			monitor2Credentials = await login(monitor2.username, password);
+			unit = await createUnit(monitor1._id, monitor1.username, []);
+		});
+
+		after(async () => Promise.all([deleteUser(monitor1), deleteUser(monitor2), deleteUnit(unit)]));
+
+		it('should fail creating department when providing an invalid property in the department unit object', () => {
+			return request
+				.post(api('livechat/department'))
+				.set(credentials)
+				.send({
+					department: { name: 'Fail-Test', enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+					departmentUnit: { invalidProperty: true },
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'invalid-params');
+				});
+		});
+
+		it('should fail creating a department into an existing unit that a monitor does not supervise', async () => {
+			const department = await createDepartment(undefined, undefined, undefined, undefined, { _id: unit._id }, monitor2Credentials);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 0);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.not.have.property('parentId');
+			expect(fullDepartment).to.not.have.property('ancestors');
+
+			await deleteDepartment(department._id);
+		});
+
+		it('should succesfully create a department into an existing unit as an admin', async () => {
+			const department = await createDepartment(undefined, undefined, undefined, undefined, { _id: unit._id });
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+
+			await deleteDepartment(department._id);
+		});
+
+		it('should succesfully create a department into an existing unit that a monitor supervises', async () => {
+			const department = await createDepartment(undefined, undefined, undefined, undefined, { _id: unit._id }, monitor1Credentials);
+
+			// Deleting a department currently does not decrease its unit's counter. We must adjust this check when this is fixed
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+
+			await deleteDepartment(department._id);
+		});
+	});
+
+	describe('[PUT] livechat/department', () => {
+		let monitor1: Awaited<ReturnType<typeof createUser>>;
+		let monitor1Credentials: Awaited<ReturnType<typeof login>>;
+		let monitor2: Awaited<ReturnType<typeof createUser>>;
+		let monitor2Credentials: Awaited<ReturnType<typeof login>>;
+		let unit: IOmnichannelBusinessUnit;
+		let department: ILivechatDepartment;
+		let baseDepartment: ILivechatDepartment;
+
+		before(async () => {
+			monitor1 = await createUser();
+			monitor2 = await createUser();
+			await createMonitor(monitor1.username);
+			monitor1Credentials = await login(monitor1.username, password);
+			await createMonitor(monitor2.username);
+			monitor2Credentials = await login(monitor2.username, password);
+			department = await createDepartment();
+			baseDepartment = await createDepartment();
+			unit = await createUnit(monitor1._id, monitor1.username, [baseDepartment._id]);
+		});
+
+		after(async () =>
+			Promise.all([
+				deleteUser(monitor1),
+				deleteUser(monitor2),
+				deleteUnit(unit),
+				deleteDepartment(department._id),
+				deleteDepartment(baseDepartment._id),
+			]),
+		);
+
+		it("should fail updating a department's unit when providing an invalid property in the department unit object", () => {
+			const updatedName = 'updated-department-name';
+			return request
+				.put(api(`livechat/department/${department._id}`))
+				.set(credentials)
+				.send({
+					department: { name: updatedName, enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+					departmentUnit: { invalidProperty: true },
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'Match error: Unknown key in field departmentUnit.invalidProperty');
+				});
+		});
+
+		it("should fail updating a department's unit when providing an invalid _id type in the department unit object", () => {
+			const updatedName = 'updated-department-name';
+			return request
+				.put(api(`livechat/department/${department._id}`))
+				.set(credentials)
+				.send({
+					department: { name: updatedName, enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+					departmentUnit: { _id: true },
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'Match error: Expected string, got boolean in field departmentUnit._id');
+				});
+		});
+
+		it('should fail removing the last department from a unit', () => {
+			const updatedName = 'updated-department-name';
+			return request
+				.put(api(`livechat/department/${baseDepartment._id}`))
+				.set(credentials)
+				.send({
+					department: { name: updatedName, enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+					departmentUnit: {},
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'error-unit-cant-be-empty');
+				});
+		});
+
+		it('should succesfully add an existing department to a unit as an admin', async () => {
+			const updatedName = 'updated-department-name';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: { _id: unit._id },
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should succesfully remove an existing department from a unit as an admin', async () => {
+			const updatedName = 'updated-department-name';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: {},
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('parentId').that.is.null;
+			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+		});
+
+		it('should fail adding a department into an existing unit that a monitor does not supervise', async () => {
+			const updatedName = 'updated-department-name2';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: monitor2Credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: { _id: unit._id },
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('parentId').that.is.null;
+			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+		});
+
+		it('should succesfully add a department into an existing unit that a monitor supervises', async () => {
+			const updatedName = 'updated-department-name3';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: monitor1Credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: { _id: unit._id },
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('name', updatedName);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should fail removing a department from a unit that a monitor does not supervise', async () => {
+			const updatedName = 'updated-department-name4';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: monitor2Credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: {},
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('name', updatedName);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should succesfully remove a department from a unit that a monitor supervises', async () => {
+			const updatedName = 'updated-department-name5';
+
+			const updatedDepartment = await updateDepartment({
+				userCredentials: monitor1Credentials,
+				departmentId: department._id,
+				name: updatedName,
+				departmentUnit: {},
+			});
+			expect(updatedDepartment).to.have.property('name', updatedName);
+			expect(updatedDepartment).to.have.property('type', 'd');
+			expect(updatedDepartment).to.have.property('_id', department._id);
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(department._id);
+			expect(fullDepartment).to.have.property('name', updatedName);
+			expect(fullDepartment).to.have.property('parentId').that.is.null;
+			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+		});
+	});
+
+	describe('[POST] livechat:saveDepartment', () => {
+		let monitor1: Awaited<ReturnType<typeof createUser>>;
+		let monitor1Credentials: Awaited<ReturnType<typeof login>>;
+		let monitor2: Awaited<ReturnType<typeof createUser>>;
+		let monitor2Credentials: Awaited<ReturnType<typeof login>>;
+		let unit: IOmnichannelBusinessUnit;
+		const departmentName = 'Test-Department-Livechat-Method';
+		let testDepartmentId = '';
+		let baseDepartment: ILivechatDepartment;
+
+		before(async () => {
+			monitor1 = await createUser();
+			monitor2 = await createUser();
+			await createMonitor(monitor1.username);
+			monitor1Credentials = await login(monitor1.username, password);
+			await createMonitor(monitor2.username);
+			monitor2Credentials = await login(monitor2.username, password);
+			baseDepartment = await createDepartment();
+			unit = await createUnit(monitor1._id, monitor1.username, [baseDepartment._id]);
+		});
+
+		after(async () =>
+			Promise.all([
+				deleteUser(monitor1),
+				deleteUser(monitor2),
+				deleteUnit(unit),
+				deleteDepartment(testDepartmentId),
+				deleteDepartment(baseDepartment._id),
+			]),
+		);
+
+		it('should fail creating department when providing an invalid _id type in the department unit object', () => {
+			return request
+				.post(methodCall('livechat:saveDepartment'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'livechat:saveDepartment',
+						params: [
+							'',
+							{ name: 'Fail-Test', enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+							[],
+							{ _id: true },
+						],
+						id: 'id',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('message').that.is.a('string');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.property('error').that.is.an('object');
+					expect(data.error).to.have.property('errorType', 'Meteor.Error');
+					expect(data.error).to.have.property('error', 'error-invalid-department-unit');
+				});
+		});
+
+		it('should fail removing last department from unit', () => {
+			return request
+				.post(methodCall('livechat:saveDepartment'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'livechat:saveDepartment',
+						params: [
+							baseDepartment._id,
+							{ name: 'Fail-Test', enabled: true, showOnOfflineForm: true, showOnRegistration: true, email: 'bla@bla' },
+							[],
+							{},
+						],
+						id: 'id',
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('message').that.is.a('string');
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.property('error').that.is.an('object');
+					expect(data.error).to.have.property('errorType', 'Meteor.Error');
+					expect(data.error).to.have.property('error', 'error-unit-cant-be-empty');
+				});
+		});
+
+		it('should fail creating a department into an existing unit that a monitor does not supervise', async () => {
+			const departmentName = 'Fail-Test';
+
+			const department = await createDepartmentWithMethod({
+				userCredentials: monitor2Credentials,
+				name: departmentName,
+				departmentUnit: { _id: unit._id },
+			});
+			testDepartmentId = department._id;
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.not.have.property('parentId');
+			expect(fullDepartment).to.not.have.property('ancestors');
+
+			await deleteDepartment(testDepartmentId);
+		});
+
+		it('should succesfully create a department into an existing unit as an admin', async () => {
+			const testDepartment = await createDepartmentWithMethod({ name: departmentName, departmentUnit: { _id: unit._id } });
+			testDepartmentId = testDepartment._id;
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should succesfully remove an existing department from a unit as an admin', async () => {
+			await createDepartmentWithMethod({ name: departmentName, departmentUnit: {}, departmentId: testDepartmentId });
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId').that.is.null;
+			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+		});
+
+		it('should succesfully add an existing department to a unit as an admin', async () => {
+			await createDepartmentWithMethod({ name: departmentName, departmentUnit: { _id: unit._id }, departmentId: testDepartmentId });
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should succesfully remove a department from a unit that a monitor supervises', async () => {
+			await createDepartmentWithMethod({
+				name: departmentName,
+				departmentUnit: {},
+				departmentId: testDepartmentId,
+				userCredentials: monitor1Credentials,
+			});
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 1);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId').that.is.null;
+			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+		});
+
+		it('should succesfully add an existing department to a unit that a monitor supervises', async () => {
+			await createDepartmentWithMethod({
+				name: departmentName,
+				departmentUnit: { _id: unit._id },
+				departmentId: testDepartmentId,
+				userCredentials: monitor1Credentials,
+			});
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+
+		it('should fail removing a department from a unit that a monitor does not supervise', async () => {
+			await createDepartmentWithMethod({
+				name: departmentName,
+				departmentUnit: {},
+				departmentId: testDepartmentId,
+				userCredentials: monitor2Credentials,
+			});
+
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 2);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+
+			await deleteDepartment(testDepartmentId);
+		});
+
+		it('should succesfully create a department in a unit that a monitor supervises', async () => {
+			const testDepartment = await createDepartmentWithMethod({
+				name: departmentName,
+				departmentUnit: { _id: unit._id },
+				userCredentials: monitor1Credentials,
+			});
+			testDepartmentId = testDepartment._id;
+
+			// Deleting a department currently does not decrease its unit's counter. We must adjust this check when this is fixed
+			const updatedUnit = await getUnit(unit._id);
+			expect(updatedUnit).to.have.property('name', unit.name);
+			expect(updatedUnit).to.have.property('numMonitors', 1);
+			expect(updatedUnit).to.have.property('numDepartments', 3);
+
+			const fullDepartment = await getDepartmentById(testDepartmentId);
+			expect(fullDepartment).to.have.property('parentId', unit._id);
+			expect(fullDepartment).to.have.property('ancestors').that.is.an('array').with.lengthOf(1);
+			expect(fullDepartment.ancestors?.[0]).to.equal(unit._id);
+		});
+	});
 });
diff --git a/apps/meteor/tests/end-to-end/api/methods.ts b/apps/meteor/tests/end-to-end/api/methods.ts
index 08945994e438..e3c42389e506 100644
--- a/apps/meteor/tests/end-to-end/api/methods.ts
+++ b/apps/meteor/tests/end-to-end/api/methods.ts
@@ -616,9 +616,19 @@ describe('Meteor.methods', () => {
 
 	describe('[@cleanRoomHistory]', () => {
 		let rid: IRoom['_id'];
-
+		let testUser: IUser;
+		let testUserCredentials: Credentials;
 		let channelName: string;
 
+		before('update permissions', async () => {
+			await updatePermission('clean-channel-history', ['admin', 'user']);
+		});
+
+		before('create test user', async () => {
+			testUser = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+		});
+
 		before('create room', (done) => {
 			channelName = `methods-test-channel-${Date.now()}`;
 			void request
@@ -676,7 +686,36 @@ describe('Meteor.methods', () => {
 				.end(done);
 		});
 
-		after(() => deleteRoom({ type: 'p', roomId: rid }));
+		after(() =>
+			Promise.all([deleteRoom({ type: 'p', roomId: rid }), deleteUser(testUser), updatePermission('clean-channel-history', ['admin'])]),
+		);
+
+		it('should throw an error if user is not part of the room', async () => {
+			await request
+				.post(methodCall('cleanRoomHistory'))
+				.set(testUserCredentials)
+				.send({
+					message: JSON.stringify({
+						method: 'cleanRoomHistory',
+						params: [
+							{
+								roomId: rid,
+								oldest: { $date: new Date().getTime() },
+								latest: { $date: new Date().getTime() },
+							},
+						],
+						id: 'id',
+						msg: 'method',
+					}),
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.a.property('success', true);
+					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('error', 'error-not-allowed');
+				});
+		});
 
 		it('should not change the _updatedAt value when nothing is changed on the room', async () => {
 			const roomBefore = await request.get(api('groups.info')).set(credentials).query({
diff --git a/apps/meteor/tests/end-to-end/api/miscellaneous.ts b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
index b8341f7c0994..d933f1f3c4b3 100644
--- a/apps/meteor/tests/end-to-end/api/miscellaneous.ts
+++ b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
@@ -186,6 +186,7 @@ describe('miscellaneous', () => {
 					'muteFocusedConversations',
 					'notifyCalendarEvents',
 					'enableMobileRinging',
+					'featuresPreview',
 				].filter((p) => Boolean(p));
 
 				expect(res.body).to.have.property('success', true);
diff --git a/apps/meteor/tests/end-to-end/api/rooms.ts b/apps/meteor/tests/end-to-end/api/rooms.ts
index 15f85964ffff..5047af7956d8 100644
--- a/apps/meteor/tests/end-to-end/api/rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/rooms.ts
@@ -1133,6 +1133,34 @@ describe('[Rooms]', () => {
 				})
 				.end(done);
 		});
+		describe('test user is not part of room', async () => {
+			beforeEach(async () => {
+				await updatePermission('clean-channel-history', ['admin', 'user']);
+			});
+
+			afterEach(async () => {
+				await updatePermission('clean-channel-history', ['admin']);
+			});
+
+			it('should return an error when the user with right privileges is not part of the room', async () => {
+				await request
+					.post(api('rooms.cleanHistory'))
+					.set(userCredentials)
+					.send({
+						roomId: privateChannel._id,
+						latest: '9999-12-31T23:59:59.000Z',
+						oldest: '0001-01-01T00:00:00.000Z',
+						limit: 2000,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('errorType', 'error-not-allowed');
+						expect(res.body).to.have.property('error', 'User does not have access to the room [error-not-allowed]');
+					});
+			});
+		});
 	});
 	describe('[/rooms.info]', () => {
 		let testChannel: IRoom;
diff --git a/apps/meteor/tests/end-to-end/api/teams.ts b/apps/meteor/tests/end-to-end/api/teams.ts
index ca07d3e32679..b630a97b1727 100644
--- a/apps/meteor/tests/end-to-end/api/teams.ts
+++ b/apps/meteor/tests/end-to-end/api/teams.ts
@@ -2217,4 +2217,325 @@ describe('[Teams]', () => {
 			});
 		});
 	});
+
+	describe('[teams.listChildren]', () => {
+		const teamName = `team-${Date.now()}`;
+		let testTeam: ITeam;
+		let testPrivateTeam: ITeam;
+		let testUser: IUser;
+		let testUserCredentials: Credentials;
+
+		let privateRoom: IRoom;
+		let privateRoom2: IRoom;
+		let publicRoom: IRoom;
+		let publicRoom2: IRoom;
+
+		let discussionOnPrivateRoom: IRoom;
+		let discussionOnPublicRoom: IRoom;
+		let discussionOnMainRoom: IRoom;
+
+		before('Create test team', async () => {
+			testUser = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+
+			const members = testUser.username ? [testUser.username] : [];
+			testTeam = await createTeam(credentials, teamName, 0, members);
+			testPrivateTeam = await createTeam(testUserCredentials, `${teamName}private`, 1, []);
+		});
+
+		before('make user owner', async () => {
+			await request
+				.post(api('teams.updateMember'))
+				.set(credentials)
+				.send({
+					teamName: testTeam.name,
+					member: {
+						userId: testUser._id,
+						roles: ['member', 'owner'],
+					},
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200);
+		});
+
+		before('create rooms', async () => {
+			privateRoom = (await createRoom({ type: 'p', name: `test-p-${Date.now()}` })).body.group;
+			privateRoom2 = (await createRoom({ type: 'p', name: `test-p2-${Date.now()}`, credentials: testUserCredentials })).body.group;
+			publicRoom = (await createRoom({ type: 'c', name: `test-c-${Date.now()}` })).body.channel;
+			publicRoom2 = (await createRoom({ type: 'c', name: `test-c2-${Date.now()}` })).body.channel;
+
+			await Promise.all([
+				request
+					.post(api('teams.addRooms'))
+					.set(credentials)
+					.send({
+						rooms: [privateRoom._id, publicRoom._id, publicRoom2._id],
+						teamId: testTeam._id,
+					})
+					.expect(200),
+				request
+					.post(api('teams.addRooms'))
+					.set(testUserCredentials)
+					.send({
+						rooms: [privateRoom2._id],
+						teamId: testTeam._id,
+					})
+					.expect(200),
+			]);
+		});
+
+		before('Create discussions', async () => {
+			discussionOnPrivateRoom = (
+				await request
+					.post(api('rooms.createDiscussion'))
+					.set(credentials)
+					.send({
+						prid: privateRoom._id,
+						t_name: `test-d-${Date.now()}`,
+					})
+			).body.discussion;
+			discussionOnPublicRoom = (
+				await request
+					.post(api('rooms.createDiscussion'))
+					.set(credentials)
+					.send({
+						prid: publicRoom._id,
+						t_name: `test-d-${Date.now()}`,
+					})
+			).body.discussion;
+			discussionOnMainRoom = (
+				await request
+					.post(api('rooms.createDiscussion'))
+					.set(credentials)
+					.send({
+						prid: testTeam.roomId,
+						t_name: `test-d-${Date.now()}`,
+					})
+			).body.discussion;
+		});
+
+		after(async () => {
+			await Promise.all([
+				deleteRoom({ type: 'p', roomId: privateRoom._id }),
+				deleteRoom({ type: 'p', roomId: privateRoom2._id }),
+				deleteRoom({ type: 'c', roomId: publicRoom._id }),
+				deleteRoom({ type: 'c', roomId: publicRoom2._id }),
+				deleteRoom({ type: 'p', roomId: discussionOnPrivateRoom._id }),
+				deleteRoom({ type: 'c', roomId: discussionOnPublicRoom._id }),
+				deleteRoom({ type: 'c', roomId: discussionOnMainRoom._id }),
+				deleteTeam(credentials, teamName),
+				deleteTeam(credentials, testPrivateTeam.name),
+				deleteUser({ _id: testUser._id }),
+			]);
+		});
+
+		it('should fail if user is not logged in', async () => {
+			await request.get(api('teams.listChildren')).expect(401);
+		});
+
+		it('should fail if teamId is not passed as queryparam', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).expect(400);
+		});
+
+		it('should fail if teamId is not valid', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamId: 'invalid' }).expect(404);
+		});
+
+		it('should fail if teamId is empty', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamId: '' }).expect(404);
+		});
+
+		it('should fail if both properties are passed', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamId: testTeam._id, teamName: testTeam.name }).expect(400);
+		});
+
+		it('should fail if teamName is empty', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamName: '' }).expect(404);
+		});
+
+		it('should fail if teamName is invalid', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamName: 'invalid' }).expect(404);
+		});
+
+		it('should fail if roomId is empty', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ roomId: '' }).expect(404);
+		});
+
+		it('should fail if roomId is invalid', async () => {
+			await request.get(api('teams.listChildren')).set(credentials).query({ teamName: 'invalid' }).expect(404);
+		});
+
+		it('should return a list of valid rooms for user', async () => {
+			const res = await request.get(api('teams.listChildren')).query({ teamId: testTeam._id }).set(credentials).expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(5);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(5);
+
+			const mainRoom = res.body.data.find((room: IRoom) => room._id === testTeam.roomId);
+			expect(mainRoom).to.be.an('object');
+
+			const publicChannel1 = res.body.data.find((room: IRoom) => room._id === publicRoom._id);
+			expect(publicChannel1).to.be.an('object');
+
+			const publicChannel2 = res.body.data.find((room: IRoom) => room._id === publicRoom2._id);
+			expect(publicChannel2).to.be.an('object');
+
+			const privateChannel1 = res.body.data.find((room: IRoom) => room._id === privateRoom._id);
+			expect(privateChannel1).to.be.an('object');
+
+			const privateChannel2 = res.body.data.find((room: IRoom) => room._id === privateRoom2._id);
+			expect(privateChannel2).to.be.undefined;
+
+			const discussionOnP = res.body.data.find((room: IRoom) => room._id === discussionOnPrivateRoom._id);
+			expect(discussionOnP).to.be.undefined;
+
+			const discussionOnC = res.body.data.find((room: IRoom) => room._id === discussionOnPublicRoom._id);
+			expect(discussionOnC).to.be.undefined;
+
+			const mainDiscussion = res.body.data.find((room: IRoom) => room._id === discussionOnMainRoom._id);
+			expect(mainDiscussion).to.be.an('object');
+		});
+
+		it('should return a valid list of rooms for non admin member too', async () => {
+			const res = await request.get(api('teams.listChildren')).query({ teamName: testTeam.name }).set(testUserCredentials).expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(5);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(5);
+
+			const mainRoom = res.body.data.find((room: IRoom) => room._id === testTeam.roomId);
+			expect(mainRoom).to.be.an('object');
+
+			const publicChannel1 = res.body.data.find((room: IRoom) => room._id === publicRoom._id);
+			expect(publicChannel1).to.be.an('object');
+
+			const publicChannel2 = res.body.data.find((room: IRoom) => room._id === publicRoom2._id);
+			expect(publicChannel2).to.be.an('object');
+
+			const privateChannel1 = res.body.data.find((room: IRoom) => room._id === privateRoom._id);
+			expect(privateChannel1).to.be.undefined;
+
+			const privateChannel2 = res.body.data.find((room: IRoom) => room._id === privateRoom2._id);
+			expect(privateChannel2).to.be.an('object');
+
+			const discussionOnP = res.body.data.find((room: IRoom) => room._id === discussionOnPrivateRoom._id);
+			expect(discussionOnP).to.be.undefined;
+
+			const discussionOnC = res.body.data.find((room: IRoom) => room._id === discussionOnPublicRoom._id);
+			expect(discussionOnC).to.be.undefined;
+
+			const mainDiscussion = res.body.data.find((room: IRoom) => room._id === discussionOnMainRoom._id);
+			expect(mainDiscussion).to.be.an('object');
+		});
+
+		it('should return a valid list of rooms for non admin member too when filtering by teams main room id', async () => {
+			const res = await request.get(api('teams.listChildren')).query({ roomId: testTeam.roomId }).set(testUserCredentials).expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(5);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(5);
+
+			const mainRoom = res.body.data.find((room: IRoom) => room._id === testTeam.roomId);
+			expect(mainRoom).to.be.an('object');
+
+			const publicChannel1 = res.body.data.find((room: IRoom) => room._id === publicRoom._id);
+			expect(publicChannel1).to.be.an('object');
+
+			const publicChannel2 = res.body.data.find((room: IRoom) => room._id === publicRoom2._id);
+			expect(publicChannel2).to.be.an('object');
+
+			const privateChannel1 = res.body.data.find((room: IRoom) => room._id === privateRoom._id);
+			expect(privateChannel1).to.be.undefined;
+
+			const privateChannel2 = res.body.data.find((room: IRoom) => room._id === privateRoom2._id);
+			expect(privateChannel2).to.be.an('object');
+
+			const discussionOnP = res.body.data.find((room: IRoom) => room._id === discussionOnPrivateRoom._id);
+			expect(discussionOnP).to.be.undefined;
+
+			const discussionOnC = res.body.data.find((room: IRoom) => room._id === discussionOnPublicRoom._id);
+			expect(discussionOnC).to.be.undefined;
+
+			const mainDiscussion = res.body.data.find((room: IRoom) => room._id === discussionOnMainRoom._id);
+			expect(mainDiscussion).to.be.an('object');
+		});
+
+		it('should return a list of rooms filtered by name using the filter parameter', async () => {
+			const res = await request
+				.get(api('teams.listChildren'))
+				.query({ teamId: testTeam._id, filter: 'test-p' })
+				.set(credentials)
+				.expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(1);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data[0]._id).to.be.equal(privateRoom._id);
+			expect(res.body.data.find((room: IRoom) => room._id === privateRoom2._id)).to.be.undefined;
+		});
+
+		it('should paginate results', async () => {
+			const res = await request
+				.get(api('teams.listChildren'))
+				.query({ teamId: testTeam._id, offset: 1, count: 2 })
+				.set(credentials)
+				.expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(5);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(2);
+		});
+
+		it('should return only items of type channel', async () => {
+			const res = await request
+				.get(api('teams.listChildren'))
+				.query({ teamId: testTeam._id, type: 'channels' })
+				.set(credentials)
+				.expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(4);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(4);
+			expect(res.body.data.some((room: IRoom) => !!room.prid)).to.be.false;
+		});
+
+		it('should return only items of type discussion', async () => {
+			const res = await request
+				.get(api('teams.listChildren'))
+				.query({ teamId: testTeam._id, type: 'discussions' })
+				.set(credentials)
+				.expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(1);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(1);
+			expect(res.body.data.every((room: IRoom) => !!room.prid)).to.be.true;
+		});
+
+		it('should return both when type is not passed', async () => {
+			const res = await request.get(api('teams.listChildren')).query({ teamId: testTeam._id }).set(credentials).expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(5);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(5);
+			expect(res.body.data.some((room: IRoom) => !!room.prid)).to.be.true;
+			expect(res.body.data.some((room: IRoom) => !room.prid)).to.be.true;
+		});
+
+		it('should fail if type is other than channel or discussion', async () => {
+			await request.get(api('teams.listChildren')).query({ teamId: testTeam._id, type: 'other' }).set(credentials).expect(400);
+		});
+
+		it('should properly list children of a private team', async () => {
+			const res = await request.get(api('teams.listChildren')).query({ teamId: testPrivateTeam._id }).set(testUserCredentials).expect(200);
+
+			expect(res.body).to.have.property('total').to.be.equal(1);
+			expect(res.body).to.have.property('data').to.be.an('array');
+			expect(res.body.data).to.have.lengthOf(1);
+		});
+
+		it('should throw an error when a non member user tries to fetch info for team', async () => {
+			await request.get(api('teams.listChildren')).query({ teamId: testPrivateTeam._id }).set(credentials).expect(400);
+		});
+	});
 });
diff --git a/apps/meteor/tests/unit/app/lib/server/functions/setUsername.spec.ts b/apps/meteor/tests/unit/app/lib/server/functions/setUsername.spec.ts
new file mode 100644
index 000000000000..c6b6f9a26fae
--- /dev/null
+++ b/apps/meteor/tests/unit/app/lib/server/functions/setUsername.spec.ts
@@ -0,0 +1,271 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+describe('setUsername', () => {
+	const userId = 'userId';
+	const username = 'validUsername';
+
+	const stubs = {
+		Users: {
+			findOneById: sinon.stub(),
+			setUsername: sinon.stub(),
+		},
+		Accounts: {
+			sendEnrollmentEmail: sinon.stub(),
+		},
+		settings: {
+			get: sinon.stub(),
+		},
+		api: {
+			broadcast: sinon.stub(),
+		},
+		Invites: {
+			findOneById: sinon.stub(),
+		},
+		callbacks: {
+			run: sinon.stub(),
+		},
+		checkUsernameAvailability: sinon.stub(),
+		validateUsername: sinon.stub(),
+		saveUserIdentity: sinon.stub(),
+		joinDefaultChannels: sinon.stub(),
+		getAvatarSuggestionForUser: sinon.stub(),
+		setUserAvatar: sinon.stub(),
+		addUserToRoom: sinon.stub(),
+		notifyOnUserChange: sinon.stub(),
+		RateLimiter: {
+			limitFunction: sinon.stub(),
+		},
+		underscore: {
+			escape: sinon.stub(),
+		},
+		SystemLogger: sinon.stub(),
+	};
+
+	const { setUsernameWithValidation, _setUsername } = proxyquire
+		.noCallThru()
+		.load('../../../../../../app/lib/server/functions/setUsername', {
+			'meteor/meteor': { Meteor: { Error } },
+			'@rocket.chat/core-services': { api: stubs.api },
+			'@rocket.chat/models': { Users: stubs.Users, Invites: stubs.Invites },
+			'meteor/accounts-base': { Accounts: stubs.Accounts },
+			'underscore': stubs.underscore,
+			'../../../settings/server': { settings: stubs.settings },
+			'../lib': { notifyOnUserChange: stubs.notifyOnUserChange, RateLimiter: stubs.RateLimiter },
+			'./addUserToRoom': { addUserToRoom: stubs.addUserToRoom },
+			'./checkUsernameAvailability': { checkUsernameAvailability: stubs.checkUsernameAvailability },
+			'./getAvatarSuggestionForUser': { getAvatarSuggestionForUser: stubs.getAvatarSuggestionForUser },
+			'./joinDefaultChannels': { joinDefaultChannels: stubs.joinDefaultChannels },
+			'./saveUserIdentity': { saveUserIdentity: stubs.saveUserIdentity },
+			'./setUserAvatar': { setUserAvatar: stubs.setUserAvatar },
+			'./validateUsername': { validateUsername: stubs.validateUsername },
+			'../../../../lib/callbacks': { callbacks: stubs.callbacks },
+			'../../../../server/lib/logger/system': { SystemLogger: stubs.SystemLogger },
+		});
+
+	afterEach(() => {
+		stubs.Users.findOneById.reset();
+		stubs.Users.setUsername.reset();
+		stubs.Accounts.sendEnrollmentEmail.reset();
+		stubs.settings.get.reset();
+		stubs.api.broadcast.reset();
+		stubs.Invites.findOneById.reset();
+		stubs.callbacks.run.reset();
+		stubs.checkUsernameAvailability.reset();
+		stubs.validateUsername.reset();
+		stubs.saveUserIdentity.reset();
+		stubs.joinDefaultChannels.reset();
+		stubs.getAvatarSuggestionForUser.reset();
+		stubs.setUserAvatar.reset();
+		stubs.addUserToRoom.reset();
+		stubs.notifyOnUserChange.reset();
+		stubs.RateLimiter.limitFunction.reset();
+		stubs.underscore.escape.reset();
+		stubs.SystemLogger.reset();
+	});
+
+	describe('setUsernameWithValidation', () => {
+		it('should throw an error if username is invalid', async () => {
+			try {
+				await setUsernameWithValidation(userId, '');
+			} catch (error: any) {
+				expect(error.message).to.equal('error-invalid-username');
+			}
+		});
+
+		it('should throw an error if user is not found', async () => {
+			stubs.Users.findOneById.withArgs(userId).returns(null);
+
+			try {
+				await setUsernameWithValidation(userId, username);
+			} catch (error: any) {
+				expect(stubs.Users.findOneById.calledOnce).to.be.true;
+				expect(error.message).to.equal('error-invalid-user');
+			}
+		});
+
+		it('should throw an error if username change is not allowed', async () => {
+			stubs.Users.findOneById.resolves({ username: 'oldUsername' });
+			stubs.settings.get.withArgs('Accounts_AllowUsernameChange').returns(false);
+
+			try {
+				await setUsernameWithValidation(userId, username);
+			} catch (error: any) {
+				expect(stubs.settings.get.calledOnce).to.be.true;
+				expect(error.message).to.equal('error-not-allowed');
+			}
+		});
+
+		it('should throw an error if username is not valid', async () => {
+			stubs.Users.findOneById.resolves({ username: null });
+			stubs.validateUsername.returns(false);
+
+			try {
+				await setUsernameWithValidation(userId, 'invalid-username');
+			} catch (error: any) {
+				expect(stubs.validateUsername.calledOnce).to.be.true;
+				expect(error.message).to.equal('username-invalid');
+			}
+		});
+
+		it('should throw an error if username is already in use', async () => {
+			stubs.Users.findOneById.resolves({ username: null });
+			stubs.validateUsername.returns(true);
+			stubs.checkUsernameAvailability.resolves(false);
+
+			try {
+				await setUsernameWithValidation(userId, 'existingUsername');
+			} catch (error: any) {
+				expect(stubs.checkUsernameAvailability.calledOnce).to.be.true;
+				expect(error.message).to.equal('error-field-unavailable');
+			}
+		});
+
+		it('should save the user identity when valid username is set', async () => {
+			stubs.Users.findOneById.resolves({ _id: userId, username: null });
+			stubs.settings.get.withArgs('Accounts_AllowUsernameChange').returns(true);
+			stubs.validateUsername.returns(true);
+			stubs.checkUsernameAvailability.resolves(true);
+			stubs.saveUserIdentity.resolves(true);
+
+			await setUsernameWithValidation(userId, 'newUsername');
+
+			expect(stubs.saveUserIdentity.calledOnce).to.be.true;
+			expect(stubs.joinDefaultChannels.calledOnceWith(userId, undefined)).to.be.true;
+		});
+	});
+
+	describe('_setUsername', () => {
+		it('should return false if userId or username is missing', async () => {
+			const result = await _setUsername(null, '', {});
+			expect(result).to.be.false;
+		});
+
+		it('should return false if username is invalid', async () => {
+			stubs.validateUsername.returns(false);
+
+			const result = await _setUsername(userId, 'invalid-username', {});
+			expect(result).to.be.false;
+		});
+
+		it('should return user if username is already set', async () => {
+			stubs.validateUsername.returns(true);
+			const mockUser = { username };
+
+			const result = await _setUsername(userId, username, mockUser);
+			expect(result).to.equal(mockUser);
+		});
+
+		it('should set username when user has no previous username', async () => {
+			const mockUser = { _id: userId, emails: [{ address: 'test@example.com' }] };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.Users.setUsername.calledOnceWith(userId, username));
+			expect(stubs.checkUsernameAvailability.calledOnceWith(username));
+			expect(stubs.api.broadcast.calledOnceWith('user.autoupdate', { user: mockUser }));
+		});
+
+		it('should set username when user has and old that is different from new', async () => {
+			const mockUser = { _id: userId, username: 'oldUsername', emails: [{ address: 'test@example.com' }] };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.Users.setUsername.calledOnceWith(userId, username));
+			expect(stubs.checkUsernameAvailability.calledOnceWith(username));
+			expect(stubs.api.broadcast.calledOnceWith('user.autoupdate', { user: mockUser }));
+		});
+
+		it('should set username when user has and old that is different from new', async () => {
+			const mockUser = { _id: userId, username: 'oldUsername', emails: [{ address: 'test@example.com' }] };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.Users.setUsername.calledOnceWith(userId, username));
+			expect(stubs.checkUsernameAvailability.calledOnceWith(username));
+			expect(stubs.api.broadcast.calledOnceWith('user.autoupdate', { user: mockUser }));
+		});
+
+		it('should set avatar if Accounts_SetDefaultAvatar is enabled', async () => {
+			const mockUser = { _id: userId, username: null };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+			stubs.settings.get.withArgs('Accounts_SetDefaultAvatar').returns(true);
+			stubs.getAvatarSuggestionForUser.resolves({ gravatar: { blob: 'blobData', contentType: 'image/png' } });
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.setUserAvatar.calledOnceWith(mockUser, 'blobData', 'image/png', 'gravatar')).to.be.true;
+		});
+
+		it('should not set avatar if Accounts_SetDefaultAvatar is disabled', async () => {
+			const mockUser = { _id: userId, username: null };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+			stubs.settings.get.withArgs('Accounts_SetDefaultAvatar').returns(false);
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.setUserAvatar.called).to.be.false;
+		});
+
+		it('should not set avatar if no avatar suggestions are available', async () => {
+			const mockUser = { _id: userId, username: null };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+			stubs.settings.get.withArgs('Accounts_SetDefaultAvatar').returns(true);
+			stubs.getAvatarSuggestionForUser.resolves({});
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.setUserAvatar.called).to.be.false;
+		});
+
+		it('should add user to room if inviteToken is present', async () => {
+			const mockUser = { _id: userId, username: null, inviteToken: 'invite token' };
+			stubs.validateUsername.returns(true);
+			stubs.Users.findOneById.resolves(mockUser);
+			stubs.checkUsernameAvailability.resolves(true);
+			stubs.settings.get.withArgs('Accounts_SetDefaultAvatar').returns(true);
+			stubs.getAvatarSuggestionForUser.resolves({ gravatar: { blob: 'blobData', contentType: 'image/png' } });
+			stubs.Invites.findOneById.resolves({ rid: 'room id' });
+
+			await _setUsername(userId, username, mockUser);
+
+			expect(stubs.addUserToRoom.calledOnceWith('room id', mockUser)).to.be.true;
+		});
+	});
+});
diff --git a/apps/meteor/tests/unit/app/reactions/server/setReaction.spec.ts b/apps/meteor/tests/unit/app/reactions/server/setReaction.spec.ts
new file mode 100644
index 000000000000..e267825a6a18
--- /dev/null
+++ b/apps/meteor/tests/unit/app/reactions/server/setReaction.spec.ts
@@ -0,0 +1,428 @@
+import { expect } from 'chai';
+import { beforeEach, describe, it } from 'mocha';
+import p from 'proxyquire';
+import sinon from 'sinon';
+
+const meteorMethodsMock = sinon.stub();
+const emojiList: Record<string, any> = {};
+const modelsMock = {
+	EmojiCustom: {
+		countByNameOrAlias: sinon.stub(),
+	},
+	Users: {
+		findOneById: sinon.stub(),
+	},
+	Messages: {
+		findOneById: sinon.stub(),
+		setReactions: sinon.stub(),
+		unsetReactions: sinon.stub(),
+	},
+	Rooms: {
+		findOneById: sinon.stub(),
+		unsetReactionsInLastMessage: sinon.stub(),
+		setReactionsInLastMessage: sinon.stub(),
+	},
+};
+const canAccessRoomAsyncMock = sinon.stub();
+const isTheLastMessageMock = sinon.stub();
+const notifyOnMessageChangeMock = sinon.stub();
+const hasPermissionAsyncMock = sinon.stub();
+const i18nMock = { t: sinon.stub() };
+const callbacksRunMock = sinon.stub();
+const meteorErrorMock = class extends Error {
+	constructor(message: string) {
+		super(message);
+	}
+};
+
+const { removeUserReaction, executeSetReaction, setReaction } = p.noCallThru().load('../../../../../app/reactions/server/setReaction.ts', {
+	'@rocket.chat/models': modelsMock,
+	'@rocket.chat/core-services': { Message: { beforeReacted: sinon.stub() } },
+	'meteor/meteor': { Meteor: { methods: meteorMethodsMock, Error: meteorErrorMock } },
+	'../../../lib/callbacks': { callbacks: { run: callbacksRunMock } },
+	'../../../server/lib/i18n': { i18n: i18nMock },
+	'../../authorization/server': { canAccessRoomAsync: canAccessRoomAsyncMock },
+	'../../authorization/server/functions/hasPermission': { hasPermissionAsync: hasPermissionAsyncMock },
+	'../../emoji/server': { emoji: { list: emojiList } },
+	'../../lib/server/functions/isTheLastMessage': { isTheLastMessage: isTheLastMessageMock },
+	'../../lib/server/lib/notifyListener': {
+		notifyOnMessageChange: notifyOnMessageChangeMock,
+	},
+});
+
+describe('Reactions', () => {
+	describe('removeUserReaction', () => {
+		it('should return the message unmodified when no reactions exist', () => {
+			const message = {};
+
+			const result = removeUserReaction(message as any, 'test', 'test');
+			expect(result).to.equal(message);
+		});
+		it('should remove the reaction from a message', () => {
+			const message = {
+				reactions: {
+					test: {
+						usernames: ['test', 'test2'],
+					},
+				},
+			};
+
+			const result = removeUserReaction(message as any, 'test', 'test');
+			expect(result.reactions.test.usernames).to.not.include('test');
+			expect(result.reactions.test.usernames).to.include('test2');
+		});
+		it('should remove the reaction from a message when the user is the last one on the array', () => {
+			const message = {
+				reactions: {
+					test: {
+						usernames: ['test'],
+					},
+				},
+			};
+
+			const result = removeUserReaction(message as any, 'test', 'test');
+			expect(result.reactions.test).to.be.undefined;
+		});
+		it('should remove username only from the reaction thats passed in', () => {
+			const message = {
+				reactions: {
+					test: {
+						usernames: ['test', 'test2'],
+					},
+					other: {
+						usernames: ['test', 'test2'],
+					},
+				},
+			};
+
+			const result = removeUserReaction(message as any, 'test', 'test');
+			expect(result.reactions.test.usernames).to.not.include('test');
+			expect(result.reactions.test.usernames).to.include('test2');
+			expect(result.reactions.other.usernames).to.include('test');
+			expect(result.reactions.other.usernames).to.include('test2');
+		});
+		it('should do nothing if username is not in the reaction', () => {
+			const message = {
+				reactions: {
+					test: {
+						usernames: ['test', 'test2'],
+					},
+				},
+			};
+
+			const result = removeUserReaction(message as any, 'test', 'test3');
+			expect(result.reactions.test.usernames).to.not.include('test3');
+			expect(result.reactions.test.usernames).to.include('test');
+			expect(result.reactions.test.usernames).to.include('test2');
+		});
+	});
+	describe('executeSetReaction', () => {
+		beforeEach(() => {
+			modelsMock.EmojiCustom.countByNameOrAlias.reset();
+		});
+		it('should throw an error if reaction is not on emojione list', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(0);
+			await expect(executeSetReaction('test', 'test', 'test')).to.be.rejectedWith('error-not-allowed');
+		});
+		it('should fail if user does not exist', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			await expect(executeSetReaction('test', 'test', 'test')).to.be.rejectedWith('error-invalid-user');
+		});
+		it('should fail if message does not exist', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			await expect(executeSetReaction('test', 'test', 'test')).to.be.rejectedWith('error-not-allowed');
+		});
+		it('should return nothing if user already reacted and its trying to react again', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Messages.findOneById.resolves({ reactions: { ':test:': { usernames: ['test'] } } });
+			expect(await executeSetReaction('test', 'test', 'test', true)).to.be.undefined;
+		});
+		it('should return nothing if user hasnt reacted and its trying to unreact', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Messages.findOneById.resolves({ reactions: { ':test:': { usernames: ['testxxxx'] } } });
+			expect(await executeSetReaction('test', 'test', 'test', false)).to.be.undefined;
+		});
+		it('should fail if room does not exist', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Messages.findOneById.resolves({ reactions: { ':test:': { usernames: ['test'] } } });
+			modelsMock.Rooms.findOneById.resolves(undefined);
+			await expect(executeSetReaction('test', 'test', 'test')).to.be.rejectedWith('error-not-allowed');
+		});
+		it('should fail if user doesnt have acccess to the room', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Messages.findOneById.resolves({ reactions: { ':test:': { usernames: ['test'] } } });
+			modelsMock.Rooms.findOneById.resolves({ t: 'd' });
+			canAccessRoomAsyncMock.resolves(false);
+			await expect(executeSetReaction('test', 'test', 'test')).to.be.rejectedWith('not-authorized');
+		});
+		it('should call setReaction with correct params', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Messages.findOneById.resolves({ reactions: { ':test:': { usernames: ['test'] } } });
+			modelsMock.Rooms.findOneById.resolves({ t: 'c' });
+			canAccessRoomAsyncMock.resolves(true);
+
+			const res = await executeSetReaction('test', 'test', 'test');
+			expect(res).to.be.undefined;
+		});
+		it('should use the message from param when the type is not an string', async () => {
+			modelsMock.EmojiCustom.countByNameOrAlias.resolves(1);
+			modelsMock.Users.findOneById.resolves({ username: 'test' });
+			modelsMock.Rooms.findOneById.resolves({ t: 'c' });
+			canAccessRoomAsyncMock.resolves(true);
+
+			await executeSetReaction('test', 'test', { reactions: { ':test:': { usernames: ['test'] } } });
+			expect(modelsMock.Messages.findOneById.calledOnce).to.be.false;
+		});
+	});
+	describe('setReaction', () => {
+		beforeEach(() => {
+			canAccessRoomAsyncMock.reset();
+			hasPermissionAsyncMock.reset();
+			isTheLastMessageMock.reset();
+			modelsMock.Messages.setReactions.reset();
+			modelsMock.Rooms.setReactionsInLastMessage.reset();
+			modelsMock.Rooms.unsetReactionsInLastMessage.reset();
+			modelsMock.Messages.unsetReactions.reset();
+			callbacksRunMock.reset();
+		});
+		it('should throw an error if user is muted from the room', async () => {
+			const room = {
+				muted: ['test'],
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			await expect(setReaction(room, user, message, ':test:')).to.be.rejectedWith('error-not-allowed');
+		});
+		it('should throw an error if room is readonly and cannot be reacted when readonly and user trying doesnt have permissions and user is not unmuted from room', async () => {
+			const room = {
+				ro: true,
+				reactWhenReadOnly: false,
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			canAccessRoomAsyncMock.resolves(false);
+			await expect(setReaction(room, user, message, ':test:')).to.be.rejectedWith("You can't send messages because the room is readonly.");
+		});
+		it('should remove the user reaction if userAlreadyReacted is true and call unsetReaction if reaction is the last one on message', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			await setReaction(room, user, message, reaction, true);
+			expect(modelsMock.Messages.unsetReactions.calledWith(message._id)).to.be.true;
+		});
+		it('should call Rooms.unsetReactionsInLastMessage when userAlreadyReacted is true and reaction is the last one on message', async () => {
+			const room = {
+				_id: 'test',
+				lastMessage: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			isTheLastMessageMock.resolves(true);
+
+			await setReaction(room, user, message, reaction, true);
+			expect(modelsMock.Messages.unsetReactions.calledWith(message._id)).to.be.true;
+			expect(modelsMock.Rooms.unsetReactionsInLastMessage.calledWith(room._id)).to.be.true;
+		});
+		it('should update the reactions object when userAlreadyReacted is true and there is more reactions on message', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+					':test2:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			await setReaction(room, user, message, reaction, true);
+			expect(modelsMock.Messages.setReactions.calledWith(message._id, sinon.match({ ':test2:': { usernames: ['test'] } }))).to.be.true;
+		});
+		it('should call Rooms.setReactionsInLastMessage when userAlreadyReacted is true and reaction is not the last one on message', async () => {
+			const room = {
+				_id: 'test',
+				lastMessage: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+					':test2:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			isTheLastMessageMock.resolves(true);
+
+			await setReaction(room, user, message, reaction, true);
+			expect(modelsMock.Messages.setReactions.calledWith(message._id, sinon.match({ ':test2:': { usernames: ['test'] } }))).to.be.true;
+			expect(modelsMock.Rooms.setReactionsInLastMessage.calledWith(room._id, sinon.match({ ':test2:': { usernames: ['test'] } }))).to.be
+				.true;
+		});
+		it('should call afterUnsetReaction callback when userAlreadyReacted is true', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			await setReaction(room, user, message, reaction, true);
+			expect(
+				callbacksRunMock.calledWith(
+					'afterUnsetReaction',
+					sinon.match({ _id: 'test' }),
+					sinon.match({ user, reaction, shouldReact: false, oldMessage: message }),
+				),
+			).to.be.true;
+		});
+		it('should set reactions when userAlreadyReacted is false', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			const reaction = ':test:';
+			await setReaction(room, user, message, reaction, false);
+			expect(modelsMock.Messages.setReactions.calledWith(message._id, sinon.match({ ':test:': { usernames: ['test'] } }))).to.be.true;
+		});
+		it('should properly add username to the list of reactions when userAlreadyReacted is false', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test2',
+			};
+			const message = {
+				_id: 'test',
+				reactions: {
+					':test:': {
+						usernames: ['test'],
+					},
+				},
+			};
+			const reaction = ':test:';
+
+			await setReaction(room, user, message, reaction, false);
+			expect(modelsMock.Messages.setReactions.calledWith(message._id, sinon.match({ ':test:': { usernames: ['test', 'test2'] } }))).to.be
+				.true;
+		});
+		it('should call Rooms.setReactionInLastMessage when userAlreadyReacted is false', async () => {
+			const room = {
+				_id: 'x5',
+				lastMessage: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			const reaction = ':test:';
+
+			isTheLastMessageMock.resolves(true);
+
+			await setReaction(room, user, message, reaction, false);
+			expect(modelsMock.Messages.setReactions.calledWith(message._id, sinon.match({ ':test:': { usernames: ['test'] } }))).to.be.true;
+			expect(modelsMock.Rooms.setReactionsInLastMessage.calledWith(room._id, sinon.match({ ':test:': { usernames: ['test'] } }))).to.be
+				.true;
+		});
+		it('should call afterSetReaction callback when userAlreadyReacted is false', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			const reaction = ':test:';
+
+			await setReaction(room, user, message, reaction, false);
+			expect(
+				callbacksRunMock.calledWith('afterSetReaction', sinon.match({ _id: 'test' }), sinon.match({ user, reaction, shouldReact: true })),
+			).to.be.true;
+		});
+		it('should return undefined on a successful reaction', async () => {
+			const room = {
+				_id: 'test',
+			};
+			const user = {
+				username: 'test',
+			};
+			const message = {
+				_id: 'test',
+			};
+			const reaction = ':test:';
+
+			expect(await setReaction(room, user, message, reaction, false)).to.be.undefined;
+		});
+	});
+});
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 63a8eb47d7c6..d2793509ff54 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @rocket.chat/uikit-playground
 
+## 0.5.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.1
+  - @rocket.chat/ui-avatar@7.0.0-rc.1
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
+## 0.5.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [599762739a, 274f4f5881, cd0d50016e, 78e6ba4820, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
+## 0.4.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@10.0.1
+  - @rocket.chat/ui-contexts@10.0.1
+  - @rocket.chat/ui-avatar@6.0.1
+  </details>
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 791526c46f9d..82ebd11ee8dc 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.4.0",
+  "version": "0.5.0-rc.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -15,8 +15,9 @@
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/tooltip": "^0.19.16",
     "@lezer/highlight": "^1.1.6",
+    "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/css-in-js": "~0.31.25",
-    "@rocket.chat/fuselage": "^0.59.0",
+    "@rocket.chat/fuselage": "^0.59.1",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
     "@rocket.chat/fuselage-toastbar": "^0.33.0",
diff --git a/apps/uikit-playground/vite.config.ts b/apps/uikit-playground/vite.config.ts
index 61a5ab30e647..4d382d652859 100644
--- a/apps/uikit-playground/vite.config.ts
+++ b/apps/uikit-playground/vite.config.ts
@@ -7,11 +7,11 @@ export default defineConfig(() => ({
   esbuild: {},
   plugins: [react()],
   optimizeDeps: {
-    include: ['@rocket.chat/ui-contexts', '@rocket.chat/message-parser'],
+    include: ['@rocket.chat/ui-contexts', '@rocket.chat/message-parser', '@rocket.chat/core-typings'],
   },
   build: {
     commonjsOptions: {
-      include: [/ui-contexts/, /message-parser/, /node_modules/],
+      include: [/ui-contexts/, /core-typings/, /message-parser/, /node_modules/],
     },
   },
 }));
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 8d306d7b1c17..4c86f21b24c4 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @rocket.chat/account-service
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.4.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/account-service/Dockerfile b/ee/apps/account-service/Dockerfile
index acbc5b0371d2..c80d4f2eb376 100644
--- a/ee/apps/account-service/Dockerfile
+++ b/ee/apps/account-service/Dockerfile
@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index b9e45ed14eda..755327bfd874 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/account-service",
 	"private": true,
-	"version": "0.4.6",
+	"version": "0.4.8-rc.1",
 	"description": "Rocket.Chat Account service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -20,6 +20,7 @@
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tools": "workspace:^",
diff --git a/ee/apps/account-service/src/service.ts b/ee/apps/account-service/src/service.ts
index f166233ca137..c2f64e37bde3 100755
--- a/ee/apps/account-service/src/service.ts
+++ b/ee/apps/account-service/src/service.ts
@@ -1,19 +1,15 @@
-import { api } from '@rocket.chat/core-services';
-import type { Document } from 'mongodb';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3033;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md
index 494c052e8cf8..c587761cdb38 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @rocket.chat/authorization-service
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.4.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/Dockerfile b/ee/apps/authorization-service/Dockerfile
index c662d8765300..9a9e8ded922c 100644
--- a/ee/apps/authorization-service/Dockerfile
+++ b/ee/apps/authorization-service/Dockerfile
@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index b7912b8bc94d..e9de2c4acd74 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/authorization-service",
 	"private": true,
-	"version": "0.4.6",
+	"version": "0.4.8-rc.1",
 	"description": "Rocket.Chat Authorization service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -20,6 +20,7 @@
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@types/node": "^14.18.63",
diff --git a/ee/apps/authorization-service/src/service.ts b/ee/apps/authorization-service/src/service.ts
index 29162b636229..1698ef7a115c 100755
--- a/ee/apps/authorization-service/src/service.ts
+++ b/ee/apps/authorization-service/src/service.ts
@@ -1,19 +1,15 @@
-import { api } from '@rocket.chat/core-services';
-import type { Document } from 'mongodb';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3034;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md
index 97565b8bde88..975b9af1abf2 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  - @rocket.chat/instance-status@0.1.8-rc.1
+  </details>
+
+## 0.3.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/instance-status@0.1.7-rc.0
+  </details>
+
+## 0.3.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  - @rocket.chat/instance-status@0.1.7
+  </details>
+
 ## 0.3.6
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/Dockerfile b/ee/apps/ddp-streamer/Dockerfile
index f556cbde6752..32103dc3528b 100644
--- a/ee/apps/ddp-streamer/Dockerfile
+++ b/ee/apps/ddp-streamer/Dockerfile
@@ -40,6 +40,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 87029e4b8993..36c244f41180 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/ddp-streamer",
 	"private": true,
-	"version": "0.3.6",
+	"version": "0.3.8-rc.1",
 	"description": "Rocket.Chat DDP-Streamer service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -23,6 +23,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"colorette": "^1.4.0",
diff --git a/ee/apps/ddp-streamer/src/service.ts b/ee/apps/ddp-streamer/src/service.ts
index b5cd20f7ec02..58552240cadd 100755
--- a/ee/apps/ddp-streamer/src/service.ts
+++ b/ee/apps/ddp-streamer/src/service.ts
@@ -1,16 +1,12 @@
-import { api } from '@rocket.chat/core-services';
-import type { Document } from 'mongodb';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md
index 21fc879f9fd9..613d6ef3f377 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/omnichannel-services@0.3.5-rc.1
+  - @rocket.chat/pdf-worker@0.2.5-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.4.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/omnichannel-services@0.3.4-rc.0
+  - @rocket.chat/pdf-worker@0.2.4-rc.0
+  </details>
+
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/omnichannel-services@0.3.4
+  - @rocket.chat/pdf-worker@0.2.4
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/Dockerfile b/ee/apps/omnichannel-transcript/Dockerfile
index 6a93a8e5e8be..9b7e47968e68 100644
--- a/ee/apps/omnichannel-transcript/Dockerfile
+++ b/ee/apps/omnichannel-transcript/Dockerfile
@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 27290070b653..4094ada4ef18 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/omnichannel-transcript",
 	"private": true,
-	"version": "0.4.6",
+	"version": "0.4.8-rc.1",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -22,6 +22,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@rocket.chat/pdf-worker": "workspace:^",
 		"@rocket.chat/tools": "workspace:^",
diff --git a/ee/apps/omnichannel-transcript/src/service.ts b/ee/apps/omnichannel-transcript/src/service.ts
index 14cbc5b8438a..ad60687d5ba4 100644
--- a/ee/apps/omnichannel-transcript/src/service.ts
+++ b/ee/apps/omnichannel-transcript/src/service.ts
@@ -1,20 +1,16 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
-import type { Document } from 'mongodb';
+import { broker } from '@rocket.chat/network-broker';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3036;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md
index a1ed37bb6fde..795b6a2df283 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @rocket.chat/presence-service
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/presence@0.2.8-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.4.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/presence@0.2.7-rc.0
+  </details>
+
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/presence@0.2.7
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/Dockerfile b/ee/apps/presence-service/Dockerfile
index aa9c1c0bd6c9..430880d29606 100644
--- a/ee/apps/presence-service/Dockerfile
+++ b/ee/apps/presence-service/Dockerfile
@@ -40,6 +40,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 5968631341b0..736fffd09e49 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/presence-service",
 	"private": true,
-	"version": "0.4.6",
+	"version": "0.4.8-rc.1",
 	"description": "Rocket.Chat Presence service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -20,6 +20,7 @@
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/presence": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@types/node": "^14.18.63",
diff --git a/ee/apps/presence-service/src/service.ts b/ee/apps/presence-service/src/service.ts
index b7275a29106f..0c51c30dc577 100755
--- a/ee/apps/presence-service/src/service.ts
+++ b/ee/apps/presence-service/src/service.ts
@@ -1,19 +1,15 @@
-import { api } from '@rocket.chat/core-services';
-import type { Document } from 'mongodb';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
+import { broker } from '@rocket.chat/network-broker';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3031;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md
index 16dc2590f38b..cca63889589c 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @rocket.chat/queue-worker
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/omnichannel-services@0.3.5-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.4.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/omnichannel-services@0.3.4-rc.0
+  </details>
+
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/omnichannel-services@0.3.4
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/Dockerfile b/ee/apps/queue-worker/Dockerfile
index 6a93a8e5e8be..9b7e47968e68 100644
--- a/ee/apps/queue-worker/Dockerfile
+++ b/ee/apps/queue-worker/Dockerfile
@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index b3d8b0aff94e..6712d59bba5e 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/queue-worker",
 	"private": true,
-	"version": "0.4.6",
+	"version": "0.4.8-rc.1",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -22,6 +22,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@types/node": "^14.18.63",
 		"ejson": "^2.2.3",
diff --git a/ee/apps/queue-worker/src/service.ts b/ee/apps/queue-worker/src/service.ts
index 8583257a6860..c11376d56534 100644
--- a/ee/apps/queue-worker/src/service.ts
+++ b/ee/apps/queue-worker/src/service.ts
@@ -1,20 +1,16 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
-import type { Document } from 'mongodb';
+import { broker } from '@rocket.chat/network-broker';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 
 const PORT = process.env.PORT || 3038;
 
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md
index ccbb83e7de0b..05843d5502b1 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.4.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
+## 0.4.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/Dockerfile b/ee/apps/stream-hub-service/Dockerfile
index c662d8765300..9a9e8ded922c 100644
--- a/ee/apps/stream-hub-service/Dockerfile
+++ b/ee/apps/stream-hub-service/Dockerfile
@@ -37,6 +37,9 @@ COPY ./packages/logger/dist packages/logger/dist
 
 COPY ./packages/server-cloud-communication/ packages/server-cloud-communication/
 
+COPY ./ee/packages/network-broker/package.json ee/packages/network-broker/package.json
+COPY ./ee/packages/network-broker/dist ee/packages/network-broker/dist
+
 COPY ./ee/packages/license/package.json packages/license/package.json
 COPY ./ee/packages/license/dist packages/license/dist
 
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 9fd5cf0586f6..4858d24d9611 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/stream-hub-service",
 	"private": true,
-	"version": "0.4.6",
+	"version": "0.4.8-rc.1",
 	"description": "Rocket.Chat Stream Hub service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -21,6 +21,7 @@
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
+		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@types/node": "^14.18.63",
 		"ejson": "^2.2.3",
diff --git a/ee/apps/stream-hub-service/src/service.ts b/ee/apps/stream-hub-service/src/service.ts
index 4975b5b306be..5e035548dc38 100755
--- a/ee/apps/stream-hub-service/src/service.ts
+++ b/ee/apps/stream-hub-service/src/service.ts
@@ -1,11 +1,9 @@
-import { api } from '@rocket.chat/core-services';
+import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
 import { Logger } from '@rocket.chat/logger';
-import type { Document } from 'mongodb';
+import { broker } from '@rocket.chat/network-broker';
 import polka from 'polka';
 
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
-import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 import { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher';
 import { StreamHub } from './StreamHub';
 
@@ -14,9 +12,7 @@ const PORT = process.env.PORT || 3035;
 (async () => {
 	const db = await getConnection();
 
-	const trash = await getCollection<Document>(Collections.Trash);
-
-	registerServiceModels(db, trash);
+	registerServiceModels(db, await getTrashCollection());
 
 	api.setBroker(broker);
 
diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md
index 181b6dfb0e7f..92b07995bb4b 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @rocket.chat/license
 
+## 0.2.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
+## 0.2.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  </details>
+
+## 0.2.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  </details>
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 3eceb35e27ff..30a89b4334bd 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.6",
+	"version": "0.2.8-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/network-broker/.eslintrc.json b/ee/packages/network-broker/.eslintrc.json
new file mode 100644
index 000000000000..a83aeda48e66
--- /dev/null
+++ b/ee/packages/network-broker/.eslintrc.json
@@ -0,0 +1,4 @@
+{
+	"extends": ["@rocket.chat/eslint-config"],
+	"ignorePatterns": ["**/dist"]
+}
diff --git a/ee/packages/network-broker/jest.config.ts b/ee/packages/network-broker/jest.config.ts
new file mode 100644
index 000000000000..c18c8ae02465
--- /dev/null
+++ b/ee/packages/network-broker/jest.config.ts
@@ -0,0 +1,6 @@
+import server from '@rocket.chat/jest-presets/server';
+import type { Config } from 'jest';
+
+export default {
+	preset: server.preset,
+} satisfies Config;
diff --git a/ee/packages/network-broker/package.json b/ee/packages/network-broker/package.json
new file mode 100644
index 000000000000..c4d3ea1b284b
--- /dev/null
+++ b/ee/packages/network-broker/package.json
@@ -0,0 +1,39 @@
+{
+	"name": "@rocket.chat/network-broker",
+	"version": "0.1.0",
+	"private": true,
+	"devDependencies": {
+		"@rocket.chat/eslint-config": "workspace:^",
+		"@types/chai": "~4.3.19",
+		"@types/ejson": "^2.2.2",
+		"@types/node": "^14.18.63",
+		"@types/sinon": "^10.0.20",
+		"chai": "^4.3.10",
+		"eslint": "~8.45.0",
+		"jest": "~29.7.0",
+		"sinon": "^14.0.2",
+		"typescript": "~5.5.4"
+	},
+	"scripts": {
+		"lint": "eslint src",
+		"lint:fix": "eslint src --fix",
+		"test": "jest",
+		"build": "tsc",
+		"testunit": "jest",
+		"typecheck": "tsc --noEmit --skipLibCheck"
+	},
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"volta": {
+		"extends": "../../../package.json"
+	},
+	"dependencies": {
+		"@rocket.chat/core-services": "workspace:^",
+		"ejson": "^2.2.3",
+		"moleculer": "^0.14.34",
+		"pino": "^8.15.0"
+	}
+}
diff --git a/apps/meteor/ee/server/lib/EnterpriseCheck.ts b/ee/packages/network-broker/src/EnterpriseCheck.ts
similarity index 100%
rename from apps/meteor/ee/server/lib/EnterpriseCheck.ts
rename to ee/packages/network-broker/src/EnterpriseCheck.ts
diff --git a/apps/meteor/ee/tests/unit/server/NetworkBroker.tests.ts b/ee/packages/network-broker/src/NetworkBroker.test.ts
similarity index 85%
rename from apps/meteor/ee/tests/unit/server/NetworkBroker.tests.ts
rename to ee/packages/network-broker/src/NetworkBroker.test.ts
index 1aac9c33fc33..c79fb12e7049 100644
--- a/apps/meteor/ee/tests/unit/server/NetworkBroker.tests.ts
+++ b/ee/packages/network-broker/src/NetworkBroker.test.ts
@@ -2,8 +2,8 @@ import { ServiceClass } from '@rocket.chat/core-services';
 import { expect } from 'chai';
 import sinon from 'sinon';
 
-import { BrokerMocked } from '../../../../tests/mocks/server/BrokerMocked';
-import { NetworkBroker } from '../../../server/NetworkBroker';
+import { BrokerMocked } from '../../../../apps/meteor/tests/mocks/server/BrokerMocked';
+import { NetworkBroker } from './NetworkBroker';
 
 class DelayedStopBroker extends BrokerMocked {
 	async destroyService(name: string) {
diff --git a/apps/meteor/ee/server/NetworkBroker.ts b/ee/packages/network-broker/src/NetworkBroker.ts
similarity index 94%
rename from apps/meteor/ee/server/NetworkBroker.ts
rename to ee/packages/network-broker/src/NetworkBroker.ts
index 0fed6fca542d..e326357cba0a 100644
--- a/apps/meteor/ee/server/NetworkBroker.ts
+++ b/ee/packages/network-broker/src/NetworkBroker.ts
@@ -2,7 +2,7 @@ import { asyncLocalStorage } from '@rocket.chat/core-services';
 import type { IBroker, IBrokerNode, IServiceMetrics, IServiceClass, EventSignatures } from '@rocket.chat/core-services';
 import type { ServiceBroker, Context, ServiceSchema } from 'moleculer';
 
-import { EnterpriseCheck } from './lib/EnterpriseCheck';
+import { EnterpriseCheck } from './EnterpriseCheck';
 
 const events: { [k: string]: string } = {
 	onNodeConnected: '$node.connected',
@@ -25,7 +25,7 @@ const waitForServicesTimeout = parseInt(WAIT_FOR_SERVICES_TIMEOUT, 10) || 10000;
 export class NetworkBroker implements IBroker {
 	private broker: ServiceBroker;
 
-	private started: Promise<void>;
+	private started: Promise<boolean> = Promise.resolve(false);
 
 	metrics: IServiceMetrics;
 
@@ -36,7 +36,9 @@ export class NetworkBroker implements IBroker {
 	}
 
 	async call(method: string, data: any): Promise<any> {
-		await this.started;
+		if (!(await this.started)) {
+			return;
+		}
 
 		const context = asyncLocalStorage.getStore();
 
@@ -54,7 +56,9 @@ export class NetworkBroker implements IBroker {
 	}
 
 	async waitAndCall(method: string, data: any): Promise<any> {
-		await this.started;
+		if (!(await this.started)) {
+			return;
+		}
 
 		try {
 			await this.broker.waitForServices(method.split('.')[0], waitForServicesTimeout);
@@ -182,6 +186,8 @@ export class NetworkBroker implements IBroker {
 	}
 
 	async start(): Promise<void> {
-		this.started = this.broker.start();
+		await this.broker.start();
+
+		this.started = Promise.resolve(true);
 	}
 }
diff --git a/apps/meteor/ee/server/startup/broker.ts b/ee/packages/network-broker/src/index.ts
similarity index 98%
rename from apps/meteor/ee/server/startup/broker.ts
rename to ee/packages/network-broker/src/index.ts
index daae4ace4e05..caa12890b514 100644
--- a/apps/meteor/ee/server/startup/broker.ts
+++ b/ee/packages/network-broker/src/index.ts
@@ -3,7 +3,7 @@ import EJSON from 'ejson';
 import { Errors, Serializers, ServiceBroker } from 'moleculer';
 import { pino } from 'pino';
 
-import { NetworkBroker } from '../NetworkBroker';
+import { NetworkBroker } from './NetworkBroker';
 
 const {
 	MS_NAMESPACE = '',
diff --git a/ee/packages/network-broker/tsconfig.json b/ee/packages/network-broker/tsconfig.json
new file mode 100644
index 000000000000..ada83b80ff89
--- /dev/null
+++ b/ee/packages/network-broker/tsconfig.json
@@ -0,0 +1,9 @@
+{
+	"extends": "../../../tsconfig.base.server.json",
+	"compilerOptions": {
+		"declaration": true,
+		"outDir": "./dist",
+		"rootDir": "./src",
+	},
+	"files": ["./src/index.ts"]
+}
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index f54493a31cd1..339277317d7f 100644
--- a/ee/packages/omnichannel-services/CHANGELOG.md
+++ b/ee/packages/omnichannel-services/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @rocket.chat/omnichannel-services
 
+## 0.3.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/pdf-worker@0.2.5-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.3.5-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  - @rocket.chat/pdf-worker@0.2.4-rc.0
+  </details>
+
+## 0.3.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/pdf-worker@0.2.4
+  - @rocket.chat/model-typings@0.7.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 696ac6fee640..98f507325586 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/omnichannel-services",
-	"version": "0.3.3",
+	"version": "0.3.5-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md
index ccc01c92e84f..60f03a15a1de 100644
--- a/ee/packages/pdf-worker/CHANGELOG.md
+++ b/ee/packages/pdf-worker/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @rocket.chat/pdf-worker
 
+## 0.2.5-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
+## 0.2.5-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  </details>
+
+## 0.2.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 234463087a4e..570b3baab2e2 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/pdf-worker",
-	"version": "0.2.3",
+	"version": "0.2.5-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index a4effccb5f2b..7b8bc5b28116 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @rocket.chat/presence
 
+## 0.2.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/core-services@0.7.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.2.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/core-services@0.7.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
+## 0.2.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.6.1
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 4d599562b278..912b4bf453fd 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.6",
+	"version": "0.2.8-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/ee/packages/ui-theming/CHANGELOG.md b/ee/packages/ui-theming/CHANGELOG.md
index 3a4956d146c3..b25ae24af33d 100644
--- a/ee/packages/ui-theming/CHANGELOG.md
+++ b/ee/packages/ui-theming/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/ui-theming
 
+## 0.3.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index d6e3e93c01a4..29fe229ca532 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -1,10 +1,10 @@
 {
 	"name": "@rocket.chat/ui-theming",
-	"version": "0.2.1",
+	"version": "0.3.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/ui-contexts": "workspace:~",
diff --git a/package.json b/package.json
index f3e3ce3d3e91..f06deed440ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.13.0-develop",
+	"version": "6.14.0-develop",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 50096d81e901..18b99f365728 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @rocket.chat/api-client
 
+## 0.2.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  </details>
+
+## 0.2.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  </details>
+
+## 0.2.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  </details>
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index b8d9ac155144..b87cdb6600d9 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/api-client",
-	"version": "0.2.6",
+	"version": "0.2.8-rc.1",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index adb1b989bad0..fcf1229c306a 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @rocket.chat/apps
 
+## 0.1.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  </details>
+
+## 0.1.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 274f4f5881, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  </details>
+
+## 0.1.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/model-typings@0.7.1
+  </details>
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index ba7d008543b7..af88aff27664 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.6",
+	"version": "0.1.8-rc.1",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index a73f804408ba..aafc8e1f0c6c 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @rocket.chat/core-services
 
+## 0.7.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.7.0-rc.0
+
+### Minor Changes
+
+- ([#33011](https://github.com/RocketChat/Rocket.Chat/pull/33011)) Return `parent` and `team` information when calling `rooms.info` endpoint
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 79c16d315a, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
+## 0.6.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 74250ffa8c16..2ee07033e732 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.6.0",
+	"version": "0.7.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-services/src/index.ts b/packages/core-services/src/index.ts
index 6d1c96c71aad..34694b078e01 100644
--- a/packages/core-services/src/index.ts
+++ b/packages/core-services/src/index.ts
@@ -76,6 +76,8 @@ export {
 	AnalyticsOverviewDataResult,
 } from './types/IOmnichannelAnalyticsService';
 
+export { getConnection, getTrashCollection } from './lib/mongo';
+
 export {
 	AutoUpdateRecord,
 	FindVoipRoomsParams,
diff --git a/apps/meteor/ee/server/services/mongo.ts b/packages/core-services/src/lib/mongo.ts
similarity index 72%
rename from apps/meteor/ee/server/services/mongo.ts
rename to packages/core-services/src/lib/mongo.ts
index 27e9e931c039..fab1fd108d99 100644
--- a/apps/meteor/ee/server/services/mongo.ts
+++ b/packages/core-services/src/lib/mongo.ts
@@ -5,16 +5,6 @@ const { MONGO_URL = 'mongodb://localhost:27017/rocketchat' } = process.env;
 
 const name = /^mongodb:\/\/.*?(?::[0-9]+)?\/([^?]*)/.exec(MONGO_URL)?.[1];
 
-export enum Collections {
-	Subscriptions = 'rocketchat_subscription',
-	UserSession = 'usersSessions',
-	User = 'users',
-	Trash = 'rocketchat__trash',
-	Messages = 'rocketchat_message',
-	Rooms = 'rocketchat_room',
-	Settings = 'rocketchat_settings',
-}
-
 function connectDb(options?: MongoClientOptions): Promise<MongoClient> {
 	const client = new MongoClient(MONGO_URL, options);
 
@@ -44,9 +34,9 @@ export const getConnection = ((): ((options?: MongoClientOptions) => Promise<Db>
 	};
 })();
 
-export async function getCollection<T extends Document>(name: Collections): Promise<Collection<T>> {
+export async function getTrashCollection<T extends Document>(): Promise<Collection<T>> {
 	if (!db) {
 		db = await getConnection();
 	}
-	return db.collection<T>(name);
+	return db.collection<T>('rocketchat__trash');
 }
diff --git a/packages/core-services/src/types/IMessageService.ts b/packages/core-services/src/types/IMessageService.ts
index ca84f78ea677..29da139ef63c 100644
--- a/packages/core-services/src/types/IMessageService.ts
+++ b/packages/core-services/src/types/IMessageService.ts
@@ -1,4 +1,4 @@
-import type { IMessage, MessageTypesValues, IUser, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, MessageTypesValues, IUser, IRoom, AtLeast } from '@rocket.chat/core-typings';
 
 export interface IMessageService {
 	sendMessage({ fromId, rid, msg }: { fromId: string; rid: string; msg: string }): Promise<IMessage>;
@@ -21,6 +21,6 @@ export interface IMessageService {
 	deleteMessage(user: IUser, message: IMessage): Promise<void>;
 	updateMessage(message: IMessage, user: IUser, originalMsg?: IMessage): Promise<void>;
 	reactToMessage(userId: string, reaction: string, messageId: IMessage['_id'], shouldReact?: boolean): Promise<void>;
-	beforeReacted(message: IMessage, room: IRoom): Promise<void>;
+	beforeReacted(message: IMessage, room: AtLeast<IRoom, 'federated'>): Promise<void>;
 	beforeDelete(message: IMessage, room: IRoom): Promise<void>;
 }
diff --git a/packages/core-services/src/types/ITeamService.ts b/packages/core-services/src/types/ITeamService.ts
index 3caa6a2e97df..132df89470ca 100644
--- a/packages/core-services/src/types/ITeamService.ts
+++ b/packages/core-services/src/types/ITeamService.ts
@@ -112,7 +112,7 @@ export interface ITeamService {
 	getOneById<P extends Document>(teamId: string, options?: FindOptions<P extends ITeam ? ITeam : P>): Promise<ITeam | P | null>;
 	getOneByName(teamName: string | RegExp, options?: FindOptions<ITeam>): Promise<ITeam | null>;
 	getOneByMainRoomId(teamId: string): Promise<Pick<ITeam, '_id'> | null>;
-	getOneByRoomId(teamId: string): Promise<ITeam | null>;
+	getOneByRoomId(teamId: string, options?: FindOptions<ITeam>): Promise<ITeam | null>;
 	getMatchingTeamRooms(teamId: string, rids: Array<string>): Promise<Array<string>>;
 	autocomplete(uid: string, name: string): Promise<ITeamAutocompleteResult[]>;
 	getAllPublicTeams(options?: FindOptions<ITeam>): Promise<Array<ITeam>>;
@@ -129,4 +129,13 @@ export interface ITeamService {
 	getRoomInfo(
 		room: AtLeast<IRoom, 'teamId' | 'teamMain' | '_id'>,
 	): Promise<{ team?: Pick<ITeam, 'name' | 'roomId' | 'type'>; parentRoom?: Pick<IRoom, 'name' | 'fname' | 't' | '_id'> }>;
+	listChildren(
+		userId: string,
+		team: AtLeast<ITeam, '_id' | 'roomId' | 'type'>,
+		filter?: string,
+		type?: 'channels' | 'discussions',
+		sort?: Record<string, 1 | -1>,
+		skip?: number,
+		limit?: number,
+	): Promise<{ total: number; data: IRoom[] }>;
 }
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index ac2c861590c0..e7171dedd7b6 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @rocket.chat/core-typings
 
+## 6.13.0-rc.1
+
+## 6.13.0-rc.0
+
+### Minor Changes
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- ([#32510](https://github.com/RocketChat/Rocket.Chat/pull/32510)) Added a new setting to enable mentions in end to end encrypted channels
+
+- <details><summary>Updated dependencies [79c16d315a]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  </details>
+
+## 6.12.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  </details>
+
 ## 6.12.0
 
 ### Minor Changes
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 86123a156e75..0db23760066b 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.13.0-develop",
+	"version": "6.14.0-develop",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/core-typings/src/ILivechatDepartment.ts b/packages/core-typings/src/ILivechatDepartment.ts
index a73cf55cb235..0138a88226fb 100644
--- a/packages/core-typings/src/ILivechatDepartment.ts
+++ b/packages/core-typings/src/ILivechatDepartment.ts
@@ -16,6 +16,7 @@ export interface ILivechatDepartment {
 	archived?: boolean;
 	departmentsAllowedToForward?: string[];
 	maxNumberSimultaneousChat?: number;
+	parentId?: string;
 	ancestors?: string[];
 	allowReceiveForwardOffline?: boolean;
 	// extra optional fields
diff --git a/packages/core-typings/src/IMessage/IMessage.ts b/packages/core-typings/src/IMessage/IMessage.ts
index 205cbaccd466..6c5511966ac8 100644
--- a/packages/core-typings/src/IMessage/IMessage.ts
+++ b/packages/core-typings/src/IMessage/IMessage.ts
@@ -170,6 +170,7 @@ export interface IMessage extends IRocketChatRecord {
 	tcount?: number;
 	t?: MessageTypesValues;
 	e2e?: 'pending' | 'done';
+	e2eMentions?: { e2eUserMentions?: string[]; e2eChannelMentions?: string[] };
 	otrAck?: string;
 
 	urls?: MessageUrl[];
diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts
index 0ce1b1041de6..95f2836da1e7 100644
--- a/packages/core-typings/src/IRoom.ts
+++ b/packages/core-typings/src/IRoom.ts
@@ -99,6 +99,9 @@ export const isSidepanelItem = (item: any): item is SidepanelItem => {
 };
 
 export const isValidSidepanel = (sidepanel: IRoom['sidepanel']) => {
+	if (sidepanel === null) {
+		return true;
+	}
 	if (!sidepanel?.items) {
 		return false;
 	}
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 9c0c43c6f16e..297acb29b0cf 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @rocket.chat/cron
 
+## 0.1.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.1.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
+## 0.1.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index aa1226271bba..f9ac01ce7740 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.6",
+	"version": "0.1.8-rc.1",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 29e062a1374d..5e81a05f3804 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @rocket.chat/ddp-client
 
+## 0.3.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/api-client@0.2.8-rc.1
+  </details>
+
+## 0.3.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/api-client@0.2.7-rc.0
+  </details>
+
+## 0.3.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/api-client@0.2.7
+  </details>
+
 ## 0.3.6
 
 ### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 0fc47dc9a122..c2dc8b95a4b9 100644
--- a/packages/ddp-client/package.json
+++ b/packages/ddp-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ddp-client",
-	"version": "0.3.6",
+	"version": "0.3.8-rc.1",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 41cc87932393..14c2fea3c3c1 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,52 @@
 # Change Log
 
+## 11.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/gazzodown@11.0.0-rc.1
+  - @rocket.chat/ui-avatar@7.0.0-rc.1
+  - @rocket.chat/ui-video-conf@11.0.0-rc.1
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
+## 11.0.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- ([#33179](https://github.com/RocketChat/Rocket.Chat/pull/33179)) Fixed an error that incorrectly showed conference calls as not answered after they ended
+
+- ([#32999](https://github.com/RocketChat/Rocket.Chat/pull/32999)) Fixes multiple selection for MultiStaticSelectElement in UiKit
+
+- <details><summary>Updated dependencies [274f4f5881, cd0d50016e, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/ui-video-conf@11.0.0-rc.0
+  - @rocket.chat/gazzodown@11.0.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/gazzodown@10.0.1
+  - @rocket.chat/ui-contexts@10.0.1
+  - @rocket.chat/ui-avatar@6.0.1
+  - @rocket.chat/ui-video-conf@10.0.1
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 80874491a951..975051db933f 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/fuselage-ui-kit",
   "private": true,
-  "version": "10.0.0",
+  "version": "11.0.0-rc.1",
   "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
   "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
   "author": {
@@ -50,10 +50,10 @@
     "@rocket.chat/icons": "*",
     "@rocket.chat/prettier-config": "*",
     "@rocket.chat/styled": "*",
-    "@rocket.chat/ui-avatar": "*",
-    "@rocket.chat/ui-contexts": "*",
+    "@rocket.chat/ui-avatar": "7.0.0-rc.1",
+    "@rocket.chat/ui-contexts": "11.0.0-rc.1",
     "@rocket.chat/ui-kit": "*",
-    "@rocket.chat/ui-video-conf": "*",
+    "@rocket.chat/ui-video-conf": "11.0.0-rc.1",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
@@ -66,7 +66,7 @@
     "@rocket.chat/apps-engine": "1.45.0-alpha.868",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.59.0",
+    "@rocket.chat/fuselage": "^0.59.1",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
     "@rocket.chat/icons": "~0.38.0",
diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx
index 969ad0af1d7c..7125dbbf1bc4 100644
--- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx
@@ -1,3 +1,4 @@
+import { VideoConferenceStatus } from '@rocket.chat/core-typings';
 import {
   useGoToRoom,
   useTranslation,
@@ -133,9 +134,14 @@ const VideoConferenceBlock = ({
               <VideoConfMessageButton onClick={callAgainHandler}>
                 {isUserCaller ? t('Call_again') : t('Call_back')}
               </VideoConfMessageButton>
-              <VideoConfMessageFooterText>
-                {t('Call_was_not_answered')}
-              </VideoConfMessageFooterText>
+              {[
+                VideoConferenceStatus.EXPIRED,
+                VideoConferenceStatus.DECLINED,
+              ].includes(data.status) && (
+                <VideoConfMessageFooterText>
+                  {t('Call_was_not_answered')}
+                </VideoConfMessageFooterText>
+              )}
             </>
           )}
           {data.type !== 'direct' &&
@@ -151,16 +157,21 @@ const VideoConferenceBlock = ({
                 </VideoConfMessageFooterText>
               </>
             ) : (
-              <VideoConfMessageFooterText>
-                {t('Call_was_not_answered')}
-              </VideoConfMessageFooterText>
+              [
+                VideoConferenceStatus.EXPIRED,
+                VideoConferenceStatus.DECLINED,
+              ].includes(data.status) && (
+                <VideoConfMessageFooterText>
+                  {t('Call_was_not_answered')}
+                </VideoConfMessageFooterText>
+              )
             ))}
         </VideoConfMessageFooter>
       </VideoConfMessage>
     );
   }
 
-  if (data.type === 'direct' && data.status === 0) {
+  if (data.type === 'direct' && data.status === VideoConferenceStatus.CALLING) {
     return (
       <VideoConfMessage>
         <VideoConfMessageRow>
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 74cd44cc291c..5ce5e8e7afed 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @rocket.chat/gazzodown
 
+## 11.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [2f9eea03d2]:</summary>
+
+  - @rocket.chat/ui-client@11.0.0-rc.1
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
+## 11.0.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [bb94c9c67a, 274f4f5881, cd0d50016e, 79c16d315a, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/ui-client@11.0.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/ui-contexts@10.0.1
+  - @rocket.chat/ui-client@10.0.1
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index c2fbf136b2d6..cf4a9209d649 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.0",
+	"version": "11.0.0-rc.1",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -28,7 +28,7 @@
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-tokens": "^0.33.1",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/message-parser": "workspace:^",
@@ -72,10 +72,10 @@
 		"@rocket.chat/css-in-js": "*",
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-tokens": "*",
-		"@rocket.chat/message-parser": "0.31.29",
+		"@rocket.chat/message-parser": "0.31.31-rc.0",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "*",
-		"@rocket.chat/ui-contexts": "*",
+		"@rocket.chat/ui-client": "11.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index 8a7e4f7317b9..3fa9140d4e99 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @rocket.chat/i18n
 
+## 0.8.0-rc.1
+
+### Minor Changes
+
+- ([#33212](https://github.com/RocketChat/Rocket.Chat/pull/33212)) Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
+
+## 0.8.0-rc.0
+
+### Minor Changes
+
+- ([#33156](https://github.com/RocketChat/Rocket.Chat/pull/33156)) added `sidepanelNavigation` to feature preview list
+
+- ([#33139](https://github.com/RocketChat/Rocket.Chat/pull/33139)) Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
+  However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
+- ([#32945](https://github.com/RocketChat/Rocket.Chat/pull/32945)) Added a new setting which allows workspace admins to disable email two factor authentication for SSO (OAuth) users. If enabled, SSO users won't be asked for email two factor authentication.
+
+### Patch Changes
+
+- ([#32510](https://github.com/RocketChat/Rocket.Chat/pull/32510)) Added a new setting to enable mentions in end to end encrypted channels
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 7c66e102d578..b93b9e9926cc 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/i18n",
-	"version": "0.7.0",
+	"version": "0.8.0-rc.1",
 	"private": true,
 	"type": "module",
 	"main": "./dist/index.js",
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 1ea0f8d0d86c..ba7ed6ec627a 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -85,6 +85,7 @@
   "Accounts_AllowEmailChange": "Allow Email Change",
   "Accounts_AllowEmailNotifications": "Allow Email Notifications",
   "Accounts_AllowFeaturePreview": "Allow Feature Preview",
+  "Accounts_AllowFeaturePreview_Description": "Make feature preview available to all workspace members.",
   "Accounts_AllowPasswordChange": "Allow Password Change",
   "Accounts_AllowPasswordChangeForOAuthUsers": "Allow Password Change for OAuth Users",
   "Accounts_AllowRealNameChange": "Allow Name Change",
@@ -1131,8 +1132,8 @@
   "Common_Access": "Common Access",
   "Commit": "Commit",
   "Community": "Community",
-  "Contextualbar_resizable": "Contextual bar resizable",
-  "Contextualbar_resizable_description": "Allows you to adjust the size of the contextual bar by simply dragging, giving you instant customization and flexibility",
+  "Contextualbar_resizable": "Resizable contextual bar",
+  "Contextualbar_resizable_description": "Adjust the size of the contextual bar by clicking and dragging the edge, giving you instant customization and flexibility.",
   "Free_Edition": "Free edition",
   "Composer_not_available_phone_calls": "Messages are not available on phone calls",
   "Condensed": "Condensed",
@@ -1797,8 +1798,8 @@
   "Duplicated_Email_address_will_be_ignored": "Duplicated email address will be ignored.",
   "Markdown_Marked_Tables": "Enable Marked Tables",
   "duplicated-account": "Duplicated account",
-  "E2E_Allow_Unencrypted_Messages": "Unencrypted messages in encrypted rooms",
-  "E2E_Allow_Unencrypted_Messages_Description": "Allow plain text messages to be sent in encrypted rooms. These messages will not be encrypted.",
+  "E2E_Allow_Unencrypted_Messages": "Access unencrypted content in encrypted rooms",
+  "E2E_Allow_Unencrypted_Messages_Description": "Allow access to encrypted rooms to people without room encryption keys. They'll be able to see and send unencrypted messages.",
   "E2E Encryption": "E2E Encryption",
   "E2E_Encryption_enabled_for_room": "End-to-end encryption enabled for #{{roomName}}",
   "E2E_Encryption_disabled_for_room": "End-to-end encryption disabled for #{{roomName}}",
@@ -1814,6 +1815,8 @@
   "E2E_Enabled": "E2E Enabled",
   "E2E_Enabled_Default_DirectRooms": "Enable encryption for Direct Rooms by default",
   "E2E_Enabled_Default_PrivateRooms": "Enable encryption for Private Rooms by default",
+  "E2E_Enabled_Mentions": "Mentions",
+  "E2E_Enabled_Mentions_Description": "Notify people, and highlight user, channel, and team mentions in encrypted content.",
   "E2E_Enable_Encrypt_Files": "Encrypt files",
   "E2E_Enable_Encrypt_Files_Description": "Encrypt files sent inside encrypted rooms. Check for possible conflicts in [file upload settings.](admin/settings/FileUpload)",
   "E2E_Encryption_Password_Change": "Change Encryption Password",
@@ -1956,8 +1959,8 @@
   "Enable_Password_History": "Enable Password History",
   "Enable_Password_History_Description": "When enabled, users won't be able to update their passwords to some of their most recently used passwords.",
   "Enable_Svg_Favicon": "Enable SVG favicon",
-  "Enable_timestamp": "Enable timestamp parsing in messages",
-  "Enable_timestamp_description": "Enable timestamps to be parsed in messages",
+  "Enable_timestamp": "Timestamp in messages",
+  "Enable_timestamp_description": "Render Unix timestamps inside messages in your local (system) timezone.",
   "Enable_to_bypass_email_verification": "Enable to bypass email verification",
   "Enable_two-factor_authentication": "Enable two-factor authentication via TOTP",
   "Enable_two-factor_authentication_email": "Enable two-factor authentication via Email",
@@ -2296,7 +2299,10 @@
   "Favorite_Rooms": "Enable Favorite Rooms",
   "Favorites": "Favorites",
   "Feature_preview": "Feature preview",
-  "Feature_preview_page_description": "Welcome to the features preview page! Here, you can enable the latest cutting-edge features that are currently under development and not yet officially released.\n\nPlease note that these configurations are still in the testing phase and may not be stable or fully functional.",
+  "Feature_preview_page_description": "Enable the latest features that are currently under development.",
+  "Feature_preview_page_callout": "Feature previews are being tested and may not be stable or fully functional. Features may become premium capabilities once officially released.",
+  "Feature_preview_admin_page_description": "Choose what feature previews to make available to workspace members.",
+  "Feature_preview_admin_page_callout": "Features enabled here will be enabled to each user in their feature preview preferences.",
   "featured": "featured",
   "Featured": "Featured",
   "Feature_depends_on_selected_call_provider_to_be_enabled_from_administration_settings": "This feature depends on the above selected call provider to be enabled from the administration settings (Admin -> Video Conference).",
@@ -3214,6 +3220,7 @@
   "leave-p": "Leave Private Groups",
   "leave-p_description": "Permission to leave private groups",
   "Lets_get_you_new_one_": "Let's get you a new one!",
+  "Let_moderators_know_what_the_issue_is": "Let moderators know what the issue is",
   "Let_them_know": "Let them know",
   "Left": "Left",
   "License": "License",
@@ -4382,7 +4389,7 @@
   "Queue_Time": "Queue Time",
   "Queue_management": "Queue Management",
   "Quick_reactions": "Quick reactions",
-  "Quick_reactions_description": "The three most used reactions get an easy access while your mouse is over the message",
+  "Quick_reactions_description": "Easily access your most used and most recent emoji message reactions by hovering on a message.",
   "quote": "quote",
   "Quote": "Quote",
   "Random": "Random",
@@ -4512,6 +4519,7 @@
   "Report_exclamation_mark": "Report!",
   "Report_has_been_sent": "Report has been sent",
   "Report_Number": "Report Number",
+  "Report_reason": "Report reason",
   "Report_this_message_question_mark": "Report this message?",
   "Report_User": "Report user",
   "Reporting": "Reporting",
@@ -6593,8 +6601,8 @@
   "Incoming_Calls": "Incoming calls",
   "Advanced_settings": "Advanced settings",
   "Security_and_permissions": "Security and permissions",
-  "Sidepanel_navigation": "Sidepanel navigation for teams",
-  "Sidepanel_navigation_description": "Option to open a sidepanel with channels and/or discussions associated with the team. This allows team owners to customize communication methods to best meet their team’s needs. This feature is only available when Enhanced navigation experience is enabled.",
+  "Sidepanel_navigation": "Secondary navigation for teams",
+  "Sidepanel_navigation_description": "Display channels and/or discussions associated with teams by default. This allows team owners to customize communication methods to best meet their team’s needs. This is currently in feature preview and will be a premium capability once fully released.",
   "Show_channels_description": "Show team channels in second sidebar",
   "Show_discussions_description": "Show team discussions in second sidebar"
 }
diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json
index 090e081e83fa..3110d6e82a67 100644
--- a/packages/i18n/src/locales/hi-IN.i18n.json
+++ b/packages/i18n/src/locales/hi-IN.i18n.json
@@ -2169,7 +2169,6 @@
   "Favorite_Rooms": "पसंदीदा कमरे सक्षम करें",
   "Favorites": "पसंदीदा",
   "Feature_preview": "फ़ीचर पूर्वावलोकन",
-  "Feature_preview_page_description": "फीचर पूर्वावलोकन पृष्ठ पर आपका स्वागत है! यहां, आप नवीनतम अत्याधुनिक सुविधाओं को सक्षम कर सकते हैं जो वर्तमान में विकास के अधीन हैं और अभी तक आधिकारिक तौर पर जारी नहीं की गई हैं।\n\nकृपया ध्यान दें कि ये कॉन्फ़िगरेशन अभी भी परीक्षण चरण में हैं और स्थिर या पूरी तरह कार्यात्मक नहीं हो सकते हैं।",
   "featured": "प्रदर्शित",
   "Featured": "प्रदर्शित",
   "Feature_depends_on_selected_call_provider_to_be_enabled_from_administration_settings": "यह सुविधा प्रशासन सेटिंग्स (एडमिन -> वीडियो कॉन्फ्रेंस) से सक्षम होने के लिए उपरोक्त चयनित कॉल प्रदाता पर निर्भर करती है।",
@@ -4128,7 +4127,6 @@
   "Queue_Time": "कतार समय",
   "Queue_management": "कतार प्रबंधन",
   "Quick_reactions": "त्वरित प्रतिक्रियाएँ",
-  "Quick_reactions_description": "जब आपका माउस संदेश पर होता है तो सबसे अधिक उपयोग की जाने वाली तीन प्रतिक्रियाओं तक आसान पहुंच मिलती है",
   "quote": "उद्धरण",
   "Quote": "उद्धरण",
   "Random": "Random",
@@ -4987,7 +4985,7 @@
   "The_application_will_be_able_to": "<1>{{appName}}</1> यह करने में सक्षम होगा:",
   "The_channel_name_is_required": "चैनल का नाम आवश्यक है",
   "The_emails_are_being_sent": "ईमेल भेजे जा रहे हैं.",
-  "The_empty_room__roomName__will_be_removed_automatically": "खाली कमरा <span style=\"font-weight: bold;\">{{roomName}}</span> स्वचालित रूप से हटा दिया जाएगा।",   
+  "The_empty_room__roomName__will_be_removed_automatically": "खाली कमरा <span style=\"font-weight: bold;\">{{roomName}}</span> स्वचालित रूप से हटा दिया जाएगा।",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "छवि का आकार बदलना काम नहीं करेगा क्योंकि हम आपके सर्वर पर स्थापित ImageMagick या ग्राफ़िक्सMagick का पता नहीं लगा सकते हैं।",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "संदेश एक चर्चा है आप संदेशों को पुनर्प्राप्त नहीं कर पाएंगे!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "मोबाइल सूचनाएं सभी उपयोगकर्ताओं के लिए अक्षम कर दी गई थीं, पुश गेटवे को फिर से सक्षम करने के लिए \"एडमिन > पुश\" पर जाएं",
@@ -6134,4 +6132,4 @@
   "Unlimited_seats": "असीमित सीटें",
   "Unlimited_MACs": "असीमित एमएसी",
   "Unlimited_seats_MACs": "असीमित सीटें और एमएसी"
-}
\ No newline at end of file
+}
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index bebd0fd56b85..dacdd5e1d383 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @rocket.chat/instance-status
 
+## 0.1.8-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.1
+  </details>
+
+## 0.1.8-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [927710d778]:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.0
+  </details>
+
+## 0.1.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.2.4
+  </details>
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 5ea3b2cb6e0d..79f0a19faf15 100644
--- a/packages/instance-status/package.json
+++ b/packages/instance-status/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/instance-status",
-	"version": "0.1.6",
+	"version": "0.1.8-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 598fae50d68d..b5e6fc40dff6 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.1
+  </details>
+
+## 1.20.0-rc.0
+
+### Minor Changes
+
+- ([#33139](https://github.com/RocketChat/Rocket.Chat/pull/33139)) Added new setting `Allow visitors to finish conversations` that allows admins to decide if omnichannel visitors can close a conversation or not. This doesn't affect agent's capabilities of room closing, neither apps using the livechat bridge to close rooms.
+  However, if currently your integration relies on `livechat/room.close` endpoint for closing conversations, it's advised to use the authenticated version `livechat/room.closeByUser` of it before turning off this setting.
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [cd0d50016e, 79c16d315a]:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  </details>
+
+## 1.19.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/gazzodown@10.0.1
+  </details>
+
 ## 1.19.3
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index ce7bb92d6b78..5663d8746eea 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.3",
+	"version": "1.20.0-rc.1",
 	"files": [
 		"/build"
 	],
diff --git a/packages/message-parser/CHANGELOG.md b/packages/message-parser/CHANGELOG.md
index 39c82e350b58..0655d17fe0cb 100644
--- a/packages/message-parser/CHANGELOG.md
+++ b/packages/message-parser/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## 0.31.31-rc.0
+
+### Patch Changes
+
+- ([#33227](https://github.com/RocketChat/Rocket.Chat/pull/33227)) Improved the performance of the message parser
+
+## 0.31.30
+
+### Patch Changes
+
+- ([#33254](https://github.com/RocketChat/Rocket.Chat/pull/33254) by [@dionisio-bot](https://github.com/dionisio-bot)) Improved the performance of the message parser
+
 ## 0.31.29
 
 ### Patch Changes
diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index e58727ba38c2..00eacaea9f19 100644
--- a/packages/message-parser/package.json
+++ b/packages/message-parser/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/message-parser",
   "description": "Rocket.Chat parser for messages",
-  "version": "0.31.29",
+  "version": "0.31.31-rc.0",
   "author": {
     "name": "Rocket.Chat",
     "url": "https://rocket.chat/"
diff --git a/packages/mock-providers/CHANGELOG.md b/packages/mock-providers/CHANGELOG.md
index 3a2edfdf99ff..a18b8b2e51fc 100644
--- a/packages/mock-providers/CHANGELOG.md
+++ b/packages/mock-providers/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @rocket.chat/mock-providers
 
+## 0.1.3-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [2f9eea03d2]:</summary>
+
+  - @rocket.chat/i18n@0.8.0-rc.1
+  </details>
+
+## 0.1.3-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [bb94c9c67a, 7c14fd1a80, 274f4f5881, 0f21fa01a3]:</summary>
+
+  - @rocket.chat/i18n@0.8.0-rc.0
+  </details>
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index f9e9b4d06ab8..3cd4aef7325d 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/mock-providers",
-	"version": "0.1.2",
+	"version": "0.1.3-rc.1",
 	"private": true,
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index b743a1132b48..54c1a0769d1e 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,42 @@
 # @rocket.chat/model-typings
 
+## 0.8.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
+## 0.8.0-rc.0
+
+### Minor Changes
+
+- ([#32682](https://github.com/RocketChat/Rocket.Chat/pull/32682)) Added support for specifying a unit on departments' creation and update
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  </details>
+
+## 0.7.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  </details>
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 30144dabb49a..2c535eb950ad 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.0",
+	"version": "0.8.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.4",
diff --git a/packages/model-typings/src/models/IEmojiCustomModel.ts b/packages/model-typings/src/models/IEmojiCustomModel.ts
index fba5f1c3ea10..30f0323c1ec7 100644
--- a/packages/model-typings/src/models/IEmojiCustomModel.ts
+++ b/packages/model-typings/src/models/IEmojiCustomModel.ts
@@ -10,4 +10,5 @@ export interface IEmojiCustomModel extends IBaseModel<IEmojiCustom> {
 	setAliases(_id: string, aliases: string[]): Promise<UpdateResult>;
 	setExtension(_id: string, extension: string): Promise<UpdateResult>;
 	create(data: InsertionModel<IEmojiCustom>): Promise<InsertOneResult<WithId<IEmojiCustom>>>;
+	countByNameOrAlias(name: string): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/ILivechatDepartmentModel.ts b/packages/model-typings/src/models/ILivechatDepartmentModel.ts
index 75fe0f54b2eb..fe366256eff7 100644
--- a/packages/model-typings/src/models/ILivechatDepartmentModel.ts
+++ b/packages/model-typings/src/models/ILivechatDepartmentModel.ts
@@ -59,6 +59,7 @@ export interface ILivechatDepartmentModel extends IBaseModel<ILivechatDepartment
 	): Promise<FindCursor<ILivechatDepartment>>;
 	findOneByIdOrName(_idOrName: string, options?: FindOptions<ILivechatDepartment>): Promise<ILivechatDepartment | null>;
 	findByUnitIds(unitIds: string[], options?: FindOptions<ILivechatDepartment>): FindCursor<ILivechatDepartment>;
+	countDepartmentsInUnit(unitId: string): Promise<number>;
 	findActiveByUnitIds(unitIds: string[], options?: FindOptions<ILivechatDepartment>): FindCursor<ILivechatDepartment>;
 	findNotArchived(options?: FindOptions<ILivechatDepartment>): FindCursor<ILivechatDepartment>;
 	getBusinessHoursWithDepartmentStatuses(): Promise<
@@ -73,4 +74,6 @@ export interface ILivechatDepartmentModel extends IBaseModel<ILivechatDepartment
 	findEnabledInIds(departmentsIds: string[], options?: FindOptions<ILivechatDepartment>): FindCursor<ILivechatDepartment>;
 	archiveDepartment(_id: string): Promise<Document | UpdateResult>;
 	unarchiveDepartment(_id: string): Promise<Document | UpdateResult>;
+	addDepartmentToUnit(_id: string, unitId: string, ancestors: string[]): Promise<Document | UpdateResult>;
+	removeDepartmentFromUnit(_id: string): Promise<Document | UpdateResult>;
 }
diff --git a/packages/model-typings/src/models/ILivechatUnitModel.ts b/packages/model-typings/src/models/ILivechatUnitModel.ts
index 8858ee5b580e..24a482eccd0e 100644
--- a/packages/model-typings/src/models/ILivechatUnitModel.ts
+++ b/packages/model-typings/src/models/ILivechatUnitModel.ts
@@ -32,6 +32,8 @@ export interface ILivechatUnitModel extends IBaseModel<IOmnichannelBusinessUnit>
 		departments: { departmentId: string }[],
 	): Promise<Omit<IOmnichannelBusinessUnit, '_updatedAt'>>;
 	removeParentAndAncestorById(parentId: string): Promise<UpdateResult | Document>;
+	incrementDepartmentsCount(_id: string): Promise<UpdateResult | Document>;
+	decrementDepartmentsCount(_id: string): Promise<UpdateResult | Document>;
 	removeById(_id: string): Promise<DeleteResult>;
 	findOneByIdOrName(_idOrName: string, options: FindOptions<IOmnichannelBusinessUnit>): Promise<IOmnichannelBusinessUnit | null>;
 	findByMonitorId(monitorId: string): Promise<string[]>;
diff --git a/packages/model-typings/src/models/IRoomsModel.ts b/packages/model-typings/src/models/IRoomsModel.ts
index 9097a89c1413..91802f836719 100644
--- a/packages/model-typings/src/models/IRoomsModel.ts
+++ b/packages/model-typings/src/models/IRoomsModel.ts
@@ -282,4 +282,12 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 	getSubscribedRoomIdsWithoutE2EKeys(uid: IUser['_id']): Promise<IRoom['_id'][]>;
 	removeUsersFromE2EEQueueByRoomId(roomId: IRoom['_id'], uids: IUser['_id'][]): Promise<Document | UpdateResult>;
 	removeUserFromE2EEQueue(uid: IUser['_id']): Promise<Document | UpdateResult>;
+	findChildrenOfTeam(
+		teamId: string,
+		teamRoomId: string,
+		userId: string,
+		filter?: string,
+		type?: 'channels' | 'discussions',
+		options?: FindOptions<IRoom>,
+	): AggregationCursor<{ totalCount: { count: number }[]; paginatedResults: IRoom[] }>;
 }
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 1238c213ec4f..a332d48b4443 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @rocket.chat/models
 
+## 0.3.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.1
+  </details>
+
+## 0.3.0-rc.0
+
+### Minor Changes
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [9a38c8e13f, 927710d778, 3a161c4310, 12d6307998]:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.0
+  </details>
+
+## 0.2.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.7.1
+  </details>
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index e55ce8d5a0e1..aee39a8e841c 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.3",
+	"version": "0.3.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/peggy-loader/CHANGELOG.md b/packages/peggy-loader/CHANGELOG.md
index 0c1ace99d7d4..6985a0b2c912 100644
--- a/packages/peggy-loader/CHANGELOG.md
+++ b/packages/peggy-loader/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## 0.31.27-rc.0
+
+### Patch Changes
+
+- ([#33227](https://github.com/RocketChat/Rocket.Chat/pull/33227)) Improved the performance of the message parser
+## 0.31.26
+
+### Patch Changes
+
+- ([#33254](https://github.com/RocketChat/Rocket.Chat/pull/33254) by [@dionisio-bot](https://github.com/dionisio-bot)) Improved the performance of the message parser
+
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json
index 6eb584f62d24..e36ae8d1012b 100644
--- a/packages/peggy-loader/package.json
+++ b/packages/peggy-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rocket.chat/peggy-loader",
-  "version": "0.31.25",
+  "version": "0.31.27-rc.0",
   "description": "Peggy loader for webpack",
   "keywords": [
     "peggy",
diff --git a/packages/release-action/action.yml b/packages/release-action/action.yml
index 2fc8fe35d565..23d7382aab6d 100644
--- a/packages/release-action/action.yml
+++ b/packages/release-action/action.yml
@@ -10,7 +10,7 @@ inputs:
     required: false
 
 runs:
-  using: "node16"
+  using: "node20"
   main: "dist/index.js"
 
 branding:
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 7cce8dcc6e99..8dff96c33b7e 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @rocket.chat/rest-typings
 
+## 6.13.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  </details>
+
+## 6.13.0-rc.0
+
+### Minor Changes
+
+- ([#32682](https://github.com/RocketChat/Rocket.Chat/pull/32682)) Added support for specifying a unit on departments' creation and update
+
+- ([#32729](https://github.com/RocketChat/Rocket.Chat/pull/32729)) Implemented "omnichannel/contacts.update" endpoint to update contacts
+
+- ([#33011](https://github.com/RocketChat/Rocket.Chat/pull/33011)) Return `parent` and `team` information when calling `rooms.info` endpoint
+
+- ([#32693](https://github.com/RocketChat/Rocket.Chat/pull/32693)) Introduced "create contacts" endpoint to omnichannel
+
+- ([#33177](https://github.com/RocketChat/Rocket.Chat/pull/33177)) New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [274f4f5881, 79c16d315a, 927710d778, 12d6307998]:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/message-parser@0.31.30-rc.0
+  </details>
+
+## 6.12.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [3cbb9f6252]:</summary>
+
+  - @rocket.chat/message-parser@0.31.30
+  - @rocket.chat/core-typings@6.12.1
+  </details>
+
 ## 6.12.0
 
 ### Minor Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 972577210f56..30a448980c9b 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.13.0-develop",
+	"version": "6.14.0-develop",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/jest": "~29.5.13",
diff --git a/packages/rest-typings/src/v1/omnichannel.ts b/packages/rest-typings/src/v1/omnichannel.ts
index a1c714c013b8..b494e5d0e5a9 100644
--- a/packages/rest-typings/src/v1/omnichannel.ts
+++ b/packages/rest-typings/src/v1/omnichannel.ts
@@ -576,7 +576,8 @@ type POSTLivechatDepartmentProps = {
 		chatClosingTags?: string[];
 		fallbackForwardDepartment?: string;
 	};
-	agents: { agentId: string; count?: number; order?: number }[];
+	agents?: { agentId: string; count?: number; order?: number }[];
+	departmentUnit?: { _id?: string };
 };
 
 const POSTLivechatDepartmentSchema = {
@@ -645,6 +646,15 @@ const POSTLivechatDepartmentSchema = {
 			},
 			nullable: true,
 		},
+		departmentUnit: {
+			type: 'object',
+			properties: {
+				_id: {
+					type: 'string',
+				},
+			},
+			additionalProperties: false,
+		},
 	},
 	required: ['department'],
 	additionalProperties: false,
diff --git a/packages/rest-typings/src/v1/rooms.ts b/packages/rest-typings/src/v1/rooms.ts
index c837ba7186bd..16debe87e44c 100644
--- a/packages/rest-typings/src/v1/rooms.ts
+++ b/packages/rest-typings/src/v1/rooms.ts
@@ -626,7 +626,7 @@ export type RoomsEndpoints = {
 	'/v1/rooms.info': {
 		GET: (params: RoomsInfoProps) => {
 			room: IRoom | undefined;
-			parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u'>;
+			parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u' | 'sidepanel'>;
 			team?: Pick<ITeam, 'name' | 'roomId' | 'type' | '_id'>;
 		};
 	};
diff --git a/packages/rest-typings/src/v1/teams/TeamsListChildren.ts b/packages/rest-typings/src/v1/teams/TeamsListChildren.ts
new file mode 100644
index 000000000000..41128e18a05f
--- /dev/null
+++ b/packages/rest-typings/src/v1/teams/TeamsListChildren.ts
@@ -0,0 +1,36 @@
+import type { ITeam } from '@rocket.chat/core-typings';
+
+import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
+import { ajv } from '../Ajv';
+
+type GeneralProps = {
+	filter?: string;
+	type?: 'channels' | 'discussions';
+};
+
+export type TeamsListChildrenProps =
+	| PaginatedRequest<
+			{
+				teamId: ITeam['_id'];
+			} & GeneralProps
+	  >
+	| PaginatedRequest<{ teamName: ITeam['name'] } & GeneralProps>
+	| PaginatedRequest<{ roomId: ITeam['roomId'] } & GeneralProps>;
+
+const TeamsListChildrenPropsSchema = {
+	type: 'object',
+	properties: {
+		teamId: { type: 'string' },
+		teamName: { type: 'string' },
+		type: { type: 'string', enum: ['channels', 'discussions'] },
+		roomId: { type: 'string' },
+		filter: { type: 'string' },
+		offset: { type: 'number' },
+		count: { type: 'number' },
+		sort: { type: 'string' },
+	},
+	additionalProperties: false,
+	oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }, { required: ['roomId'] }],
+};
+
+export const isTeamsListChildrenProps = ajv.compile<TeamsListChildrenProps>(TeamsListChildrenPropsSchema);
diff --git a/packages/rest-typings/src/v1/teams/index.ts b/packages/rest-typings/src/v1/teams/index.ts
index d63e6da8bd8a..a4ae6c7bca0f 100644
--- a/packages/rest-typings/src/v1/teams/index.ts
+++ b/packages/rest-typings/src/v1/teams/index.ts
@@ -6,6 +6,7 @@ import type { TeamsAddMembersProps } from './TeamsAddMembersProps';
 import type { TeamsConvertToChannelProps } from './TeamsConvertToChannelProps';
 import type { TeamsDeleteProps } from './TeamsDeleteProps';
 import type { TeamsLeaveProps } from './TeamsLeaveProps';
+import type { TeamsListChildrenProps } from './TeamsListChildren';
 import type { TeamsRemoveMemberProps } from './TeamsRemoveMemberProps';
 import type { TeamsRemoveRoomProps } from './TeamsRemoveRoomProps';
 import type { TeamsUpdateMemberProps } from './TeamsUpdateMemberProps';
@@ -19,6 +20,7 @@ export * from './TeamsRemoveMemberProps';
 export * from './TeamsRemoveRoomProps';
 export * from './TeamsUpdateMemberProps';
 export * from './TeamsUpdateProps';
+export * from './TeamsListChildren';
 
 type ITeamAutocompleteResult = Pick<IRoom, '_id' | 'fname' | 'teamId' | 'name' | 't' | 'avatarETag'>;
 
@@ -184,4 +186,8 @@ export type TeamsEndpoints = {
 			room: IRoom;
 		};
 	};
+
+	'/v1/teams.listChildren': {
+		GET: (params: TeamsListChildrenProps) => PaginatedResult<{ data: IRoom[] }>;
+	};
 };
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index a9fa21cf7195..b5fc9c4b46d3 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @rocket.chat/ui-avatar
 
+## 7.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  </details>
+
+## 7.0.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
+## 6.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.1
+  </details>
+
 ## 6.0.0
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 0423b68f2b43..5c319c8837a5 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,10 +1,10 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.0",
+	"version": "7.0.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "*",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 1d172fe1054f..0d5f01b17910 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @rocket.chat/ui-client
 
+## 11.0.0-rc.1
+
+### Minor Changes
+
+- ([#33212](https://github.com/RocketChat/Rocket.Chat/pull/33212)) Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/ui-avatar@7.0.0-rc.1
+  </details>
+
+## 11.0.0-rc.0
+
+### Minor Changes
+
+- ([#33156](https://github.com/RocketChat/Rocket.Chat/pull/33156)) added `sidepanelNavigation` to feature preview list
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+- ([#33225](https://github.com/RocketChat/Rocket.Chat/pull/33225)) Implemented new feature preview for Sidepanel
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [cd0d50016e]:</summary>
+
+  - @rocket.chat/ui-avatar@7.0.0-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.1
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index a84317f37abc..3b551cf83681 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.0",
+	"version": "11.0.0-rc.1",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -21,7 +21,7 @@
 		"@babel/core": "~7.22.20",
 		"@react-aria/toolbar": "^3.0.0-beta.1",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
@@ -61,8 +61,8 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "*",
-		"@rocket.chat/ui-contexts": "*",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-client/src/components/FeaturePreview/FeaturePreview.tsx b/packages/ui-client/src/components/FeaturePreview/FeaturePreview.tsx
index 09ec0700cb79..c297cc839abc 100644
--- a/packages/ui-client/src/components/FeaturePreview/FeaturePreview.tsx
+++ b/packages/ui-client/src/components/FeaturePreview/FeaturePreview.tsx
@@ -5,8 +5,16 @@ import { Children, Suspense, cloneElement } from 'react';
 import { useFeaturePreview } from '../../hooks/useFeaturePreview';
 import { FeaturesAvailable } from '../../hooks/useFeaturePreviewList';
 
-export const FeaturePreview = ({ feature, children }: { feature: FeaturesAvailable; children: ReactElement[] }) => {
-	const featureToggleEnabled = useFeaturePreview(feature);
+export const FeaturePreview = ({
+	feature,
+	disabled = false,
+	children,
+}: {
+	disabled?: boolean;
+	feature: FeaturesAvailable;
+	children: ReactElement[];
+}) => {
+	const featureToggleEnabled = useFeaturePreview(feature) && !disabled;
 
 	const toggledChildren = Children.map(children, (child) =>
 		cloneElement(child, {
diff --git a/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx b/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
new file mode 100644
index 000000000000..eece30cc7280
--- /dev/null
+++ b/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
@@ -0,0 +1,21 @@
+import { Badge } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+
+import { usePreferenceFeaturePreviewList } from '../../hooks/usePreferenceFeaturePreviewList';
+
+const FeaturePreviewBadge = () => {
+	const t = useTranslation();
+	const { unseenFeatures } = usePreferenceFeaturePreviewList();
+
+	if (!unseenFeatures) {
+		return null;
+	}
+
+	return (
+		<Badge variant='primary' aria-label={t('Unseen_features')}>
+			{unseenFeatures}
+		</Badge>
+	);
+};
+
+export default FeaturePreviewBadge;
diff --git a/packages/ui-client/src/components/FeaturePreview/index.ts b/packages/ui-client/src/components/FeaturePreview/index.ts
new file mode 100644
index 000000000000..f6b8e5f2071e
--- /dev/null
+++ b/packages/ui-client/src/components/FeaturePreview/index.ts
@@ -0,0 +1,2 @@
+export { FeaturePreview, FeaturePreviewOn, FeaturePreviewOff } from './FeaturePreview';
+export { default as FeaturePreviewBadge } from './FeaturePreviewBadge';
diff --git a/packages/ui-client/src/components/index.ts b/packages/ui-client/src/components/index.ts
index 8642983229aa..7308c8e75431 100644
--- a/packages/ui-client/src/components/index.ts
+++ b/packages/ui-client/src/components/index.ts
@@ -11,7 +11,7 @@ export * as UserStatus from './UserStatus';
 export * from './Header';
 export * from './HeaderV2';
 export * from './MultiSelectCustom/MultiSelectCustom';
-export * from './FeaturePreview/FeaturePreview';
+export * from './FeaturePreview';
 export * from './RoomBanner';
 export { default as UserAutoComplete } from './UserAutoComplete';
 export * from './GenericMenu';
diff --git a/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts b/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
new file mode 100644
index 000000000000..373862379cc1
--- /dev/null
+++ b/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
@@ -0,0 +1,12 @@
+import { useSetting } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import { parseSetting, useFeaturePreviewList } from './useFeaturePreviewList';
+
+export const useDefaultSettingFeaturePreviewList = () => {
+	const featurePreviewSettingJSON = useSetting<string>('Accounts_Default_User_Preferences_featuresPreview');
+
+	const settingFeaturePreview = useMemo(() => parseSetting(featurePreviewSettingJSON), [featurePreviewSettingJSON]);
+
+	return useFeaturePreviewList(settingFeaturePreview ?? []);
+};
diff --git a/packages/ui-client/src/hooks/useFeaturePreview.ts b/packages/ui-client/src/hooks/useFeaturePreview.ts
index 4bdda9c9251a..bd46adfdefff 100644
--- a/packages/ui-client/src/hooks/useFeaturePreview.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreview.ts
@@ -1,7 +1,8 @@
-import { type FeaturesAvailable, useFeaturePreviewList } from './useFeaturePreviewList';
+import { type FeaturesAvailable } from './useFeaturePreviewList';
+import { usePreferenceFeaturePreviewList } from './usePreferenceFeaturePreviewList';
 
 export const useFeaturePreview = (featureName: FeaturesAvailable) => {
-	const { features } = useFeaturePreviewList();
+	const { features } = usePreferenceFeaturePreviewList();
 
 	const currentFeature = features?.find((feature) => feature.name === featureName);
 
diff --git a/packages/ui-client/src/hooks/useFeaturePreviewList.ts b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
index 172045197f8c..08bda4ff81ff 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
@@ -1,5 +1,4 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useUserPreference, useSetting } from '@rocket.chat/ui-contexts';
 
 export type FeaturesAvailable =
 	| 'quickReactions'
@@ -24,6 +23,7 @@ export type FeaturePreviewProps = {
 	};
 };
 
+// TODO: Move the features preview array to another directory to be accessed from both BE and FE.
 export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 	{
 		name: 'quickReactions',
@@ -47,6 +47,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		i18n: 'Enable_timestamp',
 		description: 'Enable_timestamp_description',
 		group: 'Message',
+		imageUrl: 'images/featurePreview/timestamp.png',
 		value: false,
 		enabled: true,
 	},
@@ -55,6 +56,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		i18n: 'Contextualbar_resizable',
 		description: 'Contextualbar_resizable_description',
 		group: 'Navigation',
+		imageUrl: 'images/featurePreview/resizable-contextual-bar.png',
 		value: false,
 		enabled: true,
 	},
@@ -63,6 +65,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		i18n: 'New_navigation',
 		description: 'New_navigation_description',
 		group: 'Navigation',
+		imageUrl: 'images/featurePreview/enhanced-navigation.png',
 		value: false,
 		enabled: true,
 	},
@@ -72,7 +75,7 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		description: 'Sidepanel_navigation_description',
 		group: 'Navigation',
 		value: false,
-		enabled: false,
+		enabled: true,
 		enableQuery: {
 			name: 'newNavigation',
 			value: true,
@@ -82,22 +85,27 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 
 export const enabledDefaultFeatures = defaultFeaturesPreview.filter((feature) => feature.enabled);
 
-export const useFeaturePreviewList = () => {
-	const featurePreviewEnabled = useSetting<boolean>('Accounts_AllowFeaturePreview');
-	const userFeaturesPreview = useUserPreference<FeaturePreviewProps[]>('featuresPreview');
-
-	if (!featurePreviewEnabled) {
-		return { unseenFeatures: 0, features: [] as FeaturePreviewProps[], featurePreviewEnabled };
+// TODO: Remove this logic after we have a way to store object settings.
+export const parseSetting = (setting?: FeaturePreviewProps[] | string) => {
+	if (typeof setting === 'string') {
+		try {
+			return JSON.parse(setting) as FeaturePreviewProps[];
+		} catch (_) {
+			return;
+		}
 	}
+	return setting;
+};
 
+export const useFeaturePreviewList = (featuresList: Pick<FeaturePreviewProps, 'name' | 'value'>[]) => {
 	const unseenFeatures = enabledDefaultFeatures.filter(
-		(feature) => !userFeaturesPreview?.find((userFeature) => userFeature.name === feature.name),
+		(defaultFeature) => !featuresList?.find((feature) => feature.name === defaultFeature.name),
 	).length;
 
-	const mergedFeatures = enabledDefaultFeatures.map((feature) => {
-		const userFeature = userFeaturesPreview?.find((userFeature) => userFeature.name === feature.name);
-		return { ...feature, ...userFeature };
+	const mergedFeatures = enabledDefaultFeatures.map((defaultFeature) => {
+		const features = featuresList?.find((feature) => feature.name === defaultFeature.name);
+		return { ...defaultFeature, ...features };
 	});
 
-	return { unseenFeatures, features: mergedFeatures, featurePreviewEnabled };
+	return { unseenFeatures, features: mergedFeatures };
 };
diff --git a/packages/ui-client/src/hooks/useFeaturePreviewList.spec.tsx b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.spec.tsx
similarity index 79%
rename from packages/ui-client/src/hooks/useFeaturePreviewList.spec.tsx
rename to packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.spec.tsx
index e348cfb6a864..ac3d6f92d51a 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.spec.tsx
+++ b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.spec.tsx
@@ -1,10 +1,11 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { renderHook } from '@testing-library/react';
 
-import { useFeaturePreviewList, enabledDefaultFeatures } from './useFeaturePreviewList';
+import { enabledDefaultFeatures } from './useFeaturePreviewList';
+import { usePreferenceFeaturePreviewList } from './usePreferenceFeaturePreviewList';
 
 it('should return the number of unseen features and Accounts_AllowFeaturePreview enabled ', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot().withSetting('Accounts_AllowFeaturePreview', true).build(),
 	});
@@ -18,7 +19,7 @@ it('should return the number of unseen features and Accounts_AllowFeaturePreview
 });
 
 it('should return the number of unseen features and Accounts_AllowFeaturePreview disabled ', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot().withSetting('Accounts_AllowFeaturePreview', false).build(),
 	});
@@ -32,7 +33,7 @@ it('should return the number of unseen features and Accounts_AllowFeaturePreview
 });
 
 it('should return 0 unseen features', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_AllowFeaturePreview', true)
@@ -49,7 +50,7 @@ it('should return 0 unseen features', () => {
 });
 
 it('should ignore removed feature previews', () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_AllowFeaturePreview', true)
@@ -72,7 +73,7 @@ it('should ignore removed feature previews', () => {
 });
 
 it('should turn off ignored feature previews', async () => {
-	const { result } = renderHook(() => useFeaturePreviewList(), {
+	const { result } = renderHook(() => usePreferenceFeaturePreviewList(), {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_AllowFeaturePreview', true)
diff --git a/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts
new file mode 100644
index 000000000000..d7c4c13417d2
--- /dev/null
+++ b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts
@@ -0,0 +1,16 @@
+import { useSetting, useUserPreference } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import { FeaturePreviewProps, parseSetting, useFeaturePreviewList } from './useFeaturePreviewList';
+
+export const usePreferenceFeaturePreviewList = () => {
+	const featurePreviewEnabled = useSetting<boolean>('Accounts_AllowFeaturePreview');
+	const userFeaturesPreviewPreference = useUserPreference<FeaturePreviewProps[]>('featuresPreview');
+	const userFeaturesPreview = useMemo(() => parseSetting(userFeaturesPreviewPreference), [userFeaturesPreviewPreference]);
+	const { unseenFeatures, features } = useFeaturePreviewList(userFeaturesPreview ?? []);
+
+	if (!featurePreviewEnabled) {
+		return { unseenFeatures: 0, features: [] as FeaturePreviewProps[], featurePreviewEnabled };
+	}
+	return { unseenFeatures, features, featurePreviewEnabled };
+};
diff --git a/packages/ui-client/src/index.ts b/packages/ui-client/src/index.ts
index 3e640343da5b..a96ef265aadc 100644
--- a/packages/ui-client/src/index.ts
+++ b/packages/ui-client/src/index.ts
@@ -1,5 +1,7 @@
 export * from './components';
 export * from './hooks/useFeaturePreview';
+export * from './hooks/useDefaultSettingFeaturePreviewList';
 export * from './hooks/useFeaturePreviewList';
+export * from './hooks/usePreferenceFeaturePreviewList';
 export * from './hooks/useDocumentTitle';
 export * from './helpers';
diff --git a/packages/ui-composer/CHANGELOG.md b/packages/ui-composer/CHANGELOG.md
index 757dee9a2549..20d5d6ac715d 100644
--- a/packages/ui-composer/CHANGELOG.md
+++ b/packages/ui-composer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rocket.chat/ui-composer
 
+## 0.3.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 0f97fef22508..c43f3485880e 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rocket.chat/ui-composer",
-  "version": "0.2.1",
+  "version": "0.3.0-rc.0",
   "private": true,
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -19,7 +19,7 @@
     "@babel/core": "~7.22.20",
     "@react-aria/toolbar": "^3.0.0-beta.1",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.59.0",
+    "@rocket.chat/fuselage": "^0.59.1",
     "@rocket.chat/icons": "~0.38.0",
     "@storybook/addon-actions": "~6.5.16",
     "@storybook/addon-docs": "~6.5.16",
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index aa0f00bc0e83..4e29a0d34993 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @rocket.chat/ui-contexts
 
+## 11.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [2f9eea03d2]:</summary>
+
+  - @rocket.chat/i18n@0.8.0-rc.1
+  - @rocket.chat/core-typings@6.13.0-rc.1
+  - @rocket.chat/rest-typings@6.13.0-rc.1
+  - @rocket.chat/ddp-client@0.3.8-rc.1
+  </details>
+
+## 11.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [bb94c9c67a, 9a38c8e13f, 7c14fd1a80, 9eaefdc892, 274f4f5881, 532f08819e, 927710d778, 3a161c4310, 0f21fa01a3, 12d6307998]:</summary>
+
+  - @rocket.chat/i18n@0.8.0-rc.0
+  - @rocket.chat/rest-typings@6.13.0-rc.0
+  - @rocket.chat/core-typings@6.13.0-rc.0
+  - @rocket.chat/ddp-client@0.3.7-rc.0
+  </details>
+
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.12.1
+  - @rocket.chat/rest-typings@6.12.1
+  - @rocket.chat/ddp-client@0.3.7
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 3ef588432a7c..c3b0d5465da2 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "10.0.0",
+	"version": "11.0.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md
index 0ebba8028576..450c89d74361 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @rocket.chat/ui-video-conf
 
+## 11.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  - @rocket.chat/ui-avatar@7.0.0-rc.1
+  </details>
+
+## 11.0.0-rc.0
+
+### Minor Changes
+
+- ([#32821](https://github.com/RocketChat/Rocket.Chat/pull/32821)) Replaced new `SidebarV2` components under feature preview
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [cd0d50016e]:</summary>
+
+  - @rocket.chat/ui-avatar@7.0.0-rc.0
+  - @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.1
+  - @rocket.chat/ui-avatar@6.0.1
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index eb363da1ceae..fa14113988a2 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -1,12 +1,12 @@
 {
 	"name": "@rocket.chat/ui-video-conf",
-	"version": "10.0.0",
+	"version": "11.0.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@rocket.chat/fuselage": "^0.59.0",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
@@ -39,8 +39,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "*",
-		"@rocket.chat/ui-contexts": "*",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.1",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 601f9aa63494..01be06de3c00 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @rocket.chat/web-ui-registration
 
+## 11.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.1
+  </details>
+
+## 11.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+- @rocket.chat/ui-contexts@11.0.0-rc.0
+  </details>
+
+## 10.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@10.0.1
+  </details>
+
 ## 10.0.0
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index ae08e05ee218..c039b3fc6c94 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/web-ui-registration",
-	"version": "10.0.0",
+	"version": "11.0.0-rc.1",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -47,7 +47,7 @@
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "*",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.1",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/yarn.lock b/yarn.lock
index 76771c1ed546..7445b3bac8d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8441,6 +8441,7 @@ __metadata:
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@rocket.chat/tools": "workspace:^"
@@ -8556,6 +8557,7 @@ __metadata:
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@types/gc-stats": ^1.4.3
@@ -8719,6 +8721,7 @@ __metadata:
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@types/ejson": ^2.2.2
@@ -8926,7 +8929,7 @@ __metadata:
     "@rocket.chat/apps-engine": 1.45.0-alpha.868
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/gazzodown": "workspace:^"
@@ -8975,19 +8978,19 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": "*"
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-avatar": 7.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     "@rocket.chat/ui-kit": "*"
-    "@rocket.chat/ui-video-conf": "*"
+    "@rocket.chat/ui-video-conf": 11.0.0-rc.1
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/fuselage@npm:^0.59.0":
-  version: 0.59.0
-  resolution: "@rocket.chat/fuselage@npm:0.59.0"
+"@rocket.chat/fuselage@npm:^0.59.0, @rocket.chat/fuselage@npm:^0.59.1":
+  version: 0.59.1
+  resolution: "@rocket.chat/fuselage@npm:0.59.1"
   dependencies:
     "@rocket.chat/css-in-js": ^0.31.25
     "@rocket.chat/css-supports": ^0.31.25
@@ -9005,7 +9008,7 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-virtuoso: 1.2.4
-  checksum: 259dce5381a3c3e0d7c7f3dc7ab51346cb65a9f4906a5ca5d6a976627d05e01e7f8a3a940604d0ad1b2b4ed89c250a871ef3fb253f6bbb69d35bc931e193898d
+  checksum: 6ecceaefe8b2c6b9fe0ba3b6e19360f5d46af9697e7c97af16cce6c9eea2cb79255f38ccffdbc4766b4104c079281b4980fe7c924cd62fe5d2d341581fdf4f62
   languageName: node
   linkType: hard
 
@@ -9016,7 +9019,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-tokens": ^0.33.1
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
@@ -9063,10 +9066,10 @@ __metadata:
     "@rocket.chat/css-in-js": "*"
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-tokens": "*"
-    "@rocket.chat/message-parser": 0.31.29
+    "@rocket.chat/message-parser": 0.31.31-rc.0
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": "*"
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-client": 11.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     katex: "*"
     react: "*"
   languageName: unknown
@@ -9389,7 +9392,7 @@ __metadata:
     "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2
     "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3
     "@rocket.chat/freeswitch": "workspace:^"
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/fuselage-toastbar": ^0.33.0
@@ -9413,6 +9416,7 @@ __metadata:
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/mp3-encoder": 0.24.0
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
     "@rocket.chat/onboarding-ui": ~0.33.3
     "@rocket.chat/password-policies": "workspace:^"
@@ -9790,6 +9794,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rocket.chat/network-broker@workspace:^, @rocket.chat/network-broker@workspace:ee/packages/network-broker":
+  version: 0.0.0-use.local
+  resolution: "@rocket.chat/network-broker@workspace:ee/packages/network-broker"
+  dependencies:
+    "@rocket.chat/core-services": "workspace:^"
+    "@rocket.chat/eslint-config": "workspace:^"
+    "@types/chai": ~4.3.19
+    "@types/ejson": ^2.2.2
+    "@types/node": ^14.18.63
+    "@types/sinon": ^10.0.20
+    chai: ^4.3.10
+    ejson: ^2.2.3
+    eslint: ~8.45.0
+    jest: ~29.7.0
+    moleculer: ^0.14.34
+    pino: ^8.15.0
+    sinon: ^14.0.2
+    typescript: ~5.5.4
+  languageName: unknown
+  linkType: soft
+
 "@rocket.chat/omnichannel-services@workspace:^, @rocket.chat/omnichannel-services@workspace:ee/packages/omnichannel-services":
   version: 0.0.0-use.local
   resolution: "@rocket.chat/omnichannel-services@workspace:ee/packages/omnichannel-services"
@@ -9836,6 +9861,7 @@ __metadata:
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
     "@rocket.chat/pdf-worker": "workspace:^"
     "@rocket.chat/tools": "workspace:^"
@@ -9973,6 +9999,7 @@ __metadata:
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/presence": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@types/gc-stats": ^1.4.3
@@ -10038,6 +10065,7 @@ __metadata:
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
     "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
@@ -10195,6 +10223,7 @@ __metadata:
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@types/bcrypt": ^5.0.2
@@ -10263,7 +10292,7 @@ __metadata:
   resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar"
   dependencies:
     "@babel/core": ~7.22.20
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/ui-contexts": "workspace:^"
     "@types/react": ~17.0.80
     "@types/react-dom": ~17.0.25
@@ -10276,7 +10305,7 @@ __metadata:
     typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10288,7 +10317,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@react-aria/toolbar": ^3.0.0-beta.1
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10327,8 +10356,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": "*"
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-avatar": 7.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -10341,7 +10370,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@react-aria/toolbar": ^3.0.0-beta.1
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/icons": ~0.38.0
     "@storybook/addon-actions": ~6.5.16
     "@storybook/addon-docs": ~6.5.16
@@ -10435,7 +10464,7 @@ __metadata:
   resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming"
   dependencies:
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/ui-contexts": "workspace:~"
@@ -10465,7 +10494,7 @@ __metadata:
     "@rocket.chat/css-in-js": ~0.31.25
     "@rocket.chat/emitter": ~0.31.25
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10497,8 +10526,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": "*"
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-avatar": 7.0.0-rc.1
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10569,8 +10598,9 @@ __metadata:
     "@codemirror/lang-json": ^6.0.1
     "@codemirror/tooltip": ^0.19.16
     "@lezer/highlight": ^1.1.6
+    "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.59.0
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/fuselage-toastbar": ^0.33.0
@@ -10642,7 +10672,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": "*"
+    "@rocket.chat/ui-contexts": 11.0.0-rc.1
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"
@@ -37290,6 +37320,7 @@ __metadata:
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
+    "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@rocket.chat/ui-kit": "workspace:~"