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/brown-singers-appear.md b/.changeset/brown-singers-appear.md
new file mode 100644
index 000000000000..8a9a69f225ac
--- /dev/null
+++ b/.changeset/brown-singers-appear.md
@@ -0,0 +1,7 @@
+---
+'@rocket.chat/ui-client': minor
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+added `sidepanelNavigation` to feature preview list
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/bump-patch-1727392133102.md b/.changeset/bump-patch-1727392133102.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1727392133102.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1727482167703.md b/.changeset/bump-patch-1727482167703.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1727482167703.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1727817480079.md b/.changeset/bump-patch-1727817480079.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1727817480079.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1728026023781.md b/.changeset/bump-patch-1728026023781.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1728026023781.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1728416283220.md b/.changeset/bump-patch-1728416283220.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1728416283220.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/dry-taxis-cry.md b/.changeset/dry-taxis-cry.md
new file mode 100644
index 000000000000..ae8244087d9e
--- /dev/null
+++ b/.changeset/dry-taxis-cry.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes a race condition that causes livechat conversations to get stuck in the agent's sidebar panel after being forwarded.
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/four-cherries-kneel.md b/.changeset/four-cherries-kneel.md
new file mode 100644
index 000000000000..095d5af0aa76
--- /dev/null
+++ b/.changeset/four-cherries-kneel.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+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.
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/healthy-rivers-nail.md b/.changeset/healthy-rivers-nail.md
new file mode 100644
index 000000000000..a8da9bec846e
--- /dev/null
+++ b/.changeset/healthy-rivers-nail.md
@@ -0,0 +1,8 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+"@rocket.chat/livechat": minor
+---
+
+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.
diff --git a/.changeset/heavy-snails-help.md b/.changeset/heavy-snails-help.md
new file mode 100644
index 000000000000..fb10bac9ea8f
--- /dev/null
+++ b/.changeset/heavy-snails-help.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/rest-typings": minor
+---
+
+Implemented "omnichannel/contacts.update" endpoint to update contacts
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/khaki-cameras-glow.md b/.changeset/khaki-cameras-glow.md
new file mode 100644
index 000000000000..87470d5c497b
--- /dev/null
+++ b/.changeset/khaki-cameras-glow.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where the retention policy warning keep displaying even if the retention is disabled inside the room
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-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/many-balloons-scream.md b/.changeset/many-balloons-scream.md
new file mode 100644
index 000000000000..f017cdb81137
--- /dev/null
+++ b/.changeset/many-balloons-scream.md
@@ -0,0 +1,13 @@
+---
+'@rocket.chat/uikit-playground': minor
+'@rocket.chat/fuselage-ui-kit': minor
+'@rocket.chat/ui-theming': minor
+'@rocket.chat/ui-video-conf': minor
+'@rocket.chat/ui-composer': minor
+'@rocket.chat/gazzodown': minor
+'@rocket.chat/ui-avatar': minor
+'@rocket.chat/ui-client': minor
+'@rocket.chat/meteor': minor
+---
+
+Replaced new `SidebarV2` components under feature preview
diff --git a/.changeset/many-rules-shout.md b/.changeset/many-rules-shout.md
new file mode 100644
index 000000000000..eacb88108a0f
--- /dev/null
+++ b/.changeset/many-rules-shout.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
diff --git a/.changeset/mighty-drinks-hide.md b/.changeset/mighty-drinks-hide.md
new file mode 100644
index 000000000000..955d1ed760cc
--- /dev/null
+++ b/.changeset/mighty-drinks-hide.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/fuselage-ui-kit": patch
+---
+
+Fixes multiple selection for MultiStaticSelectElement in UiKit
diff --git a/.changeset/nasty-tools-enjoy.md b/.changeset/nasty-tools-enjoy.md
new file mode 100644
index 000000000000..b6e8dae3785a
--- /dev/null
+++ b/.changeset/nasty-tools-enjoy.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed a code issue on NPS service. It was passing `startAt` as the expiration date when creating a banner.
diff --git a/.changeset/pink-swans-teach.md b/.changeset/pink-swans-teach.md
new file mode 100644
index 000000000000..7c85572a78d5
--- /dev/null
+++ b/.changeset/pink-swans-teach.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed retention policy max age settings not being respected after upgrade
diff --git a/.changeset/poor-falcons-doubt.md b/.changeset/poor-falcons-doubt.md
new file mode 100644
index 000000000000..cb297885c5a9
--- /dev/null
+++ b/.changeset/poor-falcons-doubt.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/livechat': patch
+---
+
+Fixes an issue where the unread message counter in the livechat widget does not update when a visitor receives their first response from an agent while the widget is minimized.
diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 000000000000..c1eafc495c79
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,109 @@
+{
+  "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",
+    "bump-patch-1727392133102",
+    "bump-patch-1727482167703",
+    "bump-patch-1727817480079",
+    "bump-patch-1728026023781",
+    "bump-patch-1728416283220",
+    "cyan-ladybugs-thank",
+    "dirty-stingrays-beg",
+    "dry-taxis-cry",
+    "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/quiet-cherries-punch.md b/.changeset/quiet-cherries-punch.md
new file mode 100644
index 000000000000..25c08506db41
--- /dev/null
+++ b/.changeset/quiet-cherries-punch.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-services": minor
+"@rocket.chat/rest-typings": minor
+---
+
+Return `parent` and `team` information when calling `rooms.info` endpoint
diff --git a/.changeset/rich-toes-bow.md b/.changeset/rich-toes-bow.md
new file mode 100644
index 000000000000..a670f0756f1e
--- /dev/null
+++ b/.changeset/rich-toes-bow.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Prevented uiInteraction to subscribe multiple times
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/short-drinks-itch.md b/.changeset/short-drinks-itch.md
new file mode 100644
index 000000000000..ee57330ffc86
--- /dev/null
+++ b/.changeset/short-drinks-itch.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/message-parser': patch
+'@rocket.chat/peggy-loader': patch
+---
+
+Improved the performance of the message parser
diff --git a/.changeset/sixty-spoons-own.md b/.changeset/sixty-spoons-own.md
new file mode 100644
index 000000000000..0b717c3965ef
--- /dev/null
+++ b/.changeset/sixty-spoons-own.md
@@ -0,0 +1,9 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-typings": minor
+"@rocket.chat/model-typings": minor
+"@rocket.chat/models": minor
+"@rocket.chat/rest-typings": minor
+---
+
+Introduced "create contacts" endpoint to omnichannel
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/stupid-pigs-share.md b/.changeset/stupid-pigs-share.md
new file mode 100644
index 000000000000..55d68c66d587
--- /dev/null
+++ b/.changeset/stupid-pigs-share.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Wraps some room settings in an accordion advanced settings section in room edit contextual bar to improve organization
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/tame-mayflies-press.md b/.changeset/tame-mayflies-press.md
new file mode 100644
index 000000000000..e470306cbc25
--- /dev/null
+++ b/.changeset/tame-mayflies-press.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Implemented sending email via apps
diff --git a/.changeset/tiny-geckos-kiss.md b/.changeset/tiny-geckos-kiss.md
new file mode 100644
index 000000000000..d38150970310
--- /dev/null
+++ b/.changeset/tiny-geckos-kiss.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+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.
diff --git a/.changeset/wet-hats-walk.md b/.changeset/wet-hats-walk.md
new file mode 100644
index 000000000000..4c3565e75523
--- /dev/null
+++ b/.changeset/wet-hats-walk.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue that caused an infinite loading state when uploading a private app to Rocket.Chat
diff --git a/.changeset/wise-avocados-taste.md b/.changeset/wise-avocados-taste.md
new file mode 100644
index 000000000000..c4c9bce010b8
--- /dev/null
+++ b/.changeset/wise-avocados-taste.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where multi-step modals were closing unexpectedly
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/actions/meteor-build/action.yml b/.github/actions/meteor-build/action.yml
index 525595146700..551a57d28a7c 100644
--- a/.github/actions/meteor-build/action.yml
+++ b/.github/actions/meteor-build/action.yml
@@ -133,3 +133,4 @@ runs:
         name: build
         path: /tmp/Rocket.Chat.tar.gz
         overwrite: true
+        include-hidden-files: true
diff --git a/.github/workflows/ci-deploy-gh-pages-preview.yml b/.github/workflows/ci-deploy-gh-pages-preview.yml
new file mode 100644
index 000000000000..17f247ddad94
--- /dev/null
+++ b/.github/workflows/ci-deploy-gh-pages-preview.yml
@@ -0,0 +1,41 @@
+# .github/workflows/ci-preview.yml
+name: Deploy PR previews
+concurrency: preview-${{ github.ref }}
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - closed
+
+jobs:
+  deploy-preview:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: rharkor/caching-for-turbo@v1.5
+        if: github.event.action != 'closed'
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-node
+        if: github.event.action != 'closed'
+        with:
+          node-version: 14.21.3
+          cache-modules: true
+          install: true
+
+      - name: Build
+        if: github.event.action != 'closed'
+        run: |
+          yarn turbo run build-preview
+          yarn turbo run .:build-preview-move
+          npx indexifier .preview --html  --extensions .html  > .preview/index.html
+
+      - uses: rossjrw/pr-preview-action@v1
+        with:
+          source-dir: .preview
+          preview-branch: gh-pages
+          umbrella-dir: pr-preview
+          action: auto
diff --git a/.github/workflows/ci-deploy-gh-pages.yml b/.github/workflows/ci-deploy-gh-pages.yml
new file mode 100644
index 000000000000..b381e05ae5d8
--- /dev/null
+++ b/.github/workflows/ci-deploy-gh-pages.yml
@@ -0,0 +1,38 @@
+# .github/workflows/ci-preview-deploy.yml
+name: Deploy GitHub Pages
+concurrency: preview-deploy-${{ github.ref }}
+on:
+  push:
+    branches:
+      - main
+      - master
+      - develop
+jobs:
+  deploy-preview:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: rharkor/caching-for-turbo@v1.5
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-node
+        with:
+          node-version: 14.21.3
+          cache-modules: true
+          install: true
+
+      - name: Build
+        run: |
+          yarn turbo run build-preview
+          yarn turbo run .:build-preview-move
+          npx indexifier .preview --html  --extensions .html  > .preview/index.html
+          mv .preview ${{ github.ref_name }}
+          mkdir .preview
+          mv ${{ github.ref_name }} .preview
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: .preview
+          keep_files: true
diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
index e6c02b7b6417..a80a40419e9f 100644
--- a/.github/workflows/ci-test-e2e.yml
+++ b/.github/workflows/ci-test-e2e.yml
@@ -291,8 +291,9 @@ jobs:
         if: inputs.type == 'ui' && always()
         uses: actions/upload-artifact@v4
         with:
-          name: playwright-test-trace-${{ matrix.mongodb-version }}-${{ matrix.shard }}
+          name: playwright-test-trace-${{ inputs.release }}-${{ matrix.mongodb-version }}-${{ matrix.shard }}
           path: ./apps/meteor/tests/e2e/.playwright*
+          include-hidden-files: true
 
       - name: Show server logs if E2E test failed
         if: failure()
@@ -326,6 +327,7 @@ jobs:
         with:
           name: e2e-api-ee-coverage-${{ matrix.mongodb-version }}-${{ matrix.shard }}
           path: /tmp/coverage
+          include-hidden-files: true
 
       - name: Store e2e-ee-coverage
         if: inputs.type == 'ui' && inputs.release == 'ee'
@@ -333,3 +335,4 @@ jobs:
         with:
           name: e2e-ee-coverage-${{ matrix.mongodb-version }}-${{ matrix.shard }}
           path: ./apps/meteor/coverage*
+          include-hidden-files: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 514dd6d1c518..40260f71d21f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -824,7 +824,7 @@ jobs:
         with:
           token: ${{ secrets.DISTRIBUTION_TOKEN }}
           event-type: new_release
-          repository: RocketChat/Release.Distributions
+          repository: RocketChat/public-releases
           client-payload: '{"tag": "${{ github.ref_name }}"}'
 
   docs-update:
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/.gitignore b/.gitignore
index 4e6e4bb29da9..dbad2c29a22c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,8 @@ yarn-error.log*
 .history
 .envrc
 
+.preview
+
 *.sublime-workspace
 
 **/.vim/
diff --git a/.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch b/.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch
new file mode 100644
index 000000000000..005ab83cfb48
--- /dev/null
+++ b/.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch
@@ -0,0 +1,13 @@
+diff --git a/index.d.ts b/index.d.ts
+index f64eda7889619f2a1e7cbd5bb5e3533fc8aaa182..3d815a3b7aaf426235aa92422129079aa5826908 100644
+--- a/index.d.ts
++++ b/index.d.ts
+@@ -725,7 +725,7 @@ declare namespace Moleculer {
+ 		this: T
+ 	) => void | Promise<void>;
+ 
+-	interface ServiceSchema<S = ServiceSettingSchema, T = void> {
++	interface ServiceSchema<S = ServiceSettingSchema, T = Service<S>> {
+ 		name: string;
+ 		version?: string | number;
+ 		settings?: S;
diff --git a/.yarn/patches/typia-npm-5.3.3-21d3e18463.patch b/.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch
similarity index 64%
rename from .yarn/patches/typia-npm-5.3.3-21d3e18463.patch
rename to .yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch
index 1487a9f4712d..22a02fa15957 100644
--- a/.yarn/patches/typia-npm-5.3.3-21d3e18463.patch
+++ b/.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch
@@ -1,22 +1,22 @@
 diff --git a/lib/factories/internal/metadata/iterate_metadata_intersection.js b/lib/factories/internal/metadata/iterate_metadata_intersection.js
-index 260670b8ea37b63dcacadeffa26450f81087c90e..f07b44b16099d896ab40c46f03df86ee2f2c1a90 100644
+index da05ef3ac6f397d68b8fa10285f62d1794c57579..0f2b9b26e01cebd0b9c04a2db8857f911cfbaf57 100644
 --- a/lib/factories/internal/metadata/iterate_metadata_intersection.js
 +++ b/lib/factories/internal/metadata/iterate_metadata_intersection.js
-@@ -247,7 +247,7 @@ var iterate_metadata_intersection = function (checker) {
+@@ -181,7 +181,7 @@ var iterate_metadata_intersection = function (checker) {
                          var tags = MetadataTypeTagFactory_1.MetadataTypeTagFactory.analyze(errors)(target)(objects.map(function (om) { return om.objects; }).flat(), explore);
                          if (tags.length)
                              if (target === "array")
 -                                meta.arrays.at(-1).tags.push(tags);
 +                                meta.arrays.slice(-1)[0].tags.push(tags);
-                             else if (booleanLiteral === null)
+                             else if (atomics.size)
                                  meta.atomics.find(function (a) { return a.type === target; }).tags.push(tags);
-                             else {
+                             else if (constants.length) {
 diff --git a/lib/programmers/CheckerProgrammer.js b/lib/programmers/CheckerProgrammer.js
-index bbec09f22798d144b96f59bb946e7e32e3438c05..dc13cb47b72358b8e6165b768cff2360db2bd617 100644
+index 662e6ff51c91598229c88f691b7ce07200957167..4028a50cc92ee293e98b13822293d0fb35c64c1f 100644
 --- a/lib/programmers/CheckerProgrammer.js
 +++ b/lib/programmers/CheckerProgrammer.js
-@@ -458,8 +458,8 @@ var CheckerProgrammer;
-                                 ? "".concat(explore.postfix.slice(0, -1), "[").concat(index, "]\"")
+@@ -529,8 +529,8 @@ var CheckerProgrammer;
+                                 ? "".concat((0, postfix_of_tuple_1.postfix_of_tuple)(explore.postfix), "[").concat(index, "]\"")
                                  : "\"[".concat(index, "]\"") }));
                      });
 -                    var rest = tuple.elements.length && tuple.elements.at(-1).rest !== null
@@ -27,7 +27,7 @@ index bbec09f22798d144b96f59bb946e7e32e3438c05..dc13cb47b72358b8e6165b768cff2360
                      var arrayLength = typescript_1.default.factory.createPropertyAccessExpression(input, "length");
                      return config.combiner(explore)("and")(input, __spreadArray(__spreadArray(__spreadArray([], __read((rest === null
 diff --git a/lib/programmers/TypiaProgrammer.js b/lib/programmers/TypiaProgrammer.js
-index c75ab1bc077b788e36c32834ea4916c22df34500..99452220e2dd090d4d562296e26fb266faa617f9 100644
+index db244cb5e40fd68e15b7a06936b0f92802e5e4c9..c2f64885f67cc543c62b0b09e141c88684f99253 100644
 --- a/lib/programmers/TypiaProgrammer.js
 +++ b/lib/programmers/TypiaProgrammer.js
 @@ -165,7 +165,7 @@ var TypiaProgrammer;
@@ -39,34 +39,53 @@ index c75ab1bc077b788e36c32834ea4916c22df34500..99452220e2dd090d4d562296e26fb266
                              })()
                              : [0, 0], 2), line = _k[0], pos = _k[1];
                          console.error("".concat(file, ":").concat(line, ":").concat(pos, " - ").concat(category, " TS").concat(diag.code, ": ").concat(diag.messageText));
-diff --git a/lib/programmers/internal/application_tuple.js b/lib/programmers/internal/application_tuple.js
-index 5c1853a3a1692f95fe702bdae9813e958f54ac4c..04ca996c2ffe72d1cd5969e45a38e91937b975b1 100644
---- a/lib/programmers/internal/application_tuple.js
-+++ b/lib/programmers/internal/application_tuple.js
-@@ -22,15 +22,15 @@ var application_tuple = function (options) {
-                 var schema = __assign(__assign({ type: "array", items: tuple.type.elements.map(function (meta, i) {
-                         var _a;
-                         return (0, application_schema_1.application_schema)(options)(false)(components)((_a = meta.rest) !== null && _a !== void 0 ? _a : meta)(__assign(__assign({}, attribute), { "x-typia-rest": i === tuple.type.elements.length - 1 && meta.rest !== null, "x-typia-required": meta.required, "x-typia-optional": meta.optional }));
--                    }) }, attribute), { minItems: !!((_a = tuple.type.elements.at(-1)) === null || _a === void 0 ? void 0 : _a.rest)
-+                    }) }, attribute), { minItems: !!((_a = tuple.type.elements.slice(-1)[0]) === null || _a === void 0 ? void 0 : _a.rest)
-                         ? tuple.type.elements.length - 1
--                        : tuple.type.elements.filter(function (x) { return !x.optional; }).length, maxItems: !!((_b = tuple.type.elements.at(-1)) === null || _b === void 0 ? void 0 : _b.rest)
-+                        : tuple.type.elements.filter(function (x) { return !x.optional; }).length, maxItems: !!((_b = tuple.type.elements.slice(-1)[0]) === null || _b === void 0 ? void 0 : _b.rest)
-                         ? undefined
-                         : tuple.type.elements.length });
-                 if (options.purpose === "ajv")
-                     if (tuple.type.elements.length === 0)
-                         return schema;
--                    else if (!((_c = tuple.type.elements.at(-1)) === null || _c === void 0 ? void 0 : _c.rest))
-+                    else if (!((_c = tuple.type.elements.slice(-1)[0]) === null || _c === void 0 ? void 0 : _c.rest))
-                         return schema;
-                 var wrapper = __assign(__assign({}, schema), { items: (0, application_schema_1.application_schema)(options)(false)(components)(tuple.type.elements.reduce(function (x, y) { var _a, _b; return Metadata_1.Metadata.merge((_a = x.rest) !== null && _a !== void 0 ? _a : x, (_b = y.rest) !== null && _b !== void 0 ? _b : y); }, Metadata_1.Metadata.initialize()))(tuple.type.recursive ? {} : attribute), "x-typia-tuple": schema, minItems: schema.minItems, maxItems: schema.maxItems });
-                 return wrapper;
+diff --git a/lib/programmers/internal/application_v30_tuple.js b/lib/programmers/internal/application_v30_tuple.js
+index 94e8827fd94df3792c1d7b2cdacac604175ba8ca..c9a3a1bcdd978b97a080ed2c467188d808d10c8f 100644
+--- a/lib/programmers/internal/application_v30_tuple.js
++++ b/lib/programmers/internal/application_v30_tuple.js
+@@ -21,9 +21,9 @@ var application_v30_tuple = function (components) {
+     return function (tuple) {
+         return function (attribute) {
+             var _a, _b;
+-            return (__assign(__assign({}, attribute), { type: "array", items: (0, application_v30_schema_1.application_v30_schema)(false)(components)(tuple.type.recursive ? {} : attribute)(tuple.type.elements.reduce(function (x, y) { var _a, _b; return Metadata_1.Metadata.merge((_a = x.rest) !== null && _a !== void 0 ? _a : x, (_b = y.rest) !== null && _b !== void 0 ? _b : y); }, Metadata_1.Metadata.initialize())), minItems: !!((_a = tuple.type.elements.at(-1)) === null || _a === void 0 ? void 0 : _a.rest)
++            return (__assign(__assign({}, attribute), { type: "array", items: (0, application_v30_schema_1.application_v30_schema)(false)(components)(tuple.type.recursive ? {} : attribute)(tuple.type.elements.reduce(function (x, y) { var _a, _b; return Metadata_1.Metadata.merge((_a = x.rest) !== null && _a !== void 0 ? _a : x, (_b = y.rest) !== null && _b !== void 0 ? _b : y); }, Metadata_1.Metadata.initialize())), minItems: !!((_a = tuple.type.elements.slice(-1)[0]) === null || _a === void 0 ? void 0 : _a.rest)
+                     ? tuple.type.elements.length - 1
+-                    : tuple.type.elements.filter(function (x) { return !x.optional; }).length, maxItems: !!((_b = tuple.type.elements.at(-1)) === null || _b === void 0 ? void 0 : _b.rest)
++                    : tuple.type.elements.filter(function (x) { return !x.optional; }).length, maxItems: !!((_b = tuple.type.elements.slice(-1)[0]) === null || _b === void 0 ? void 0 : _b.rest)
+                     ? undefined
+                     : tuple.type.elements.length }));
+         };
+diff --git a/lib/programmers/internal/application_v31_tuple.js b/lib/programmers/internal/application_v31_tuple.js
+index af7bbbe1536244eec93d7311e289fc8b34245c0f..e7f126b72a3480f761f57e4d43826a26b8b06e3f 100644
+--- a/lib/programmers/internal/application_v31_tuple.js
++++ b/lib/programmers/internal/application_v31_tuple.js
+@@ -7,7 +7,7 @@ exports.application_v31_tuple = void 0;
+ var application_v31_tuple = function (generator) {
+     return function (tuple) {
+         var _a, _b;
+-        var tail = (_b = (_a = tuple.type.elements.at(-1)) === null || _a === void 0 ? void 0 : _a.rest) !== null && _b !== void 0 ? _b : null;
++        var tail = (_b = (_a = tuple.type.elements.slice(-1)[0]) === null || _a === void 0 ? void 0 : _a.rest) !== null && _b !== void 0 ? _b : null;
+         var prefixItems = tuple.type.isRest()
+             ? tuple.type.elements.slice(0, -1)
+             : tuple.type.elements;
+diff --git a/lib/programmers/internal/decode_union_object.js b/lib/programmers/internal/decode_union_object.js
+index c283bdfdcfb99f26954e6d76d35ccef4f78ddcee..7cdef1aeec80238014cf9457ca4351f02e99b638 100644
+--- a/lib/programmers/internal/decode_union_object.js
++++ b/lib/programmers/internal/decode_union_object.js
+@@ -72,7 +72,7 @@ var iterate = function (escaper) {
+                 ? typescript_1.default.factory.createIfStatement(b.condition, typescript_1.default.factory.createReturnStatement(b.value), undefined)
+                 : typescript_1.default.factory.createReturnStatement(b.value);
+         });
+-        if (branches.at(-1).condition !== null)
++        if (branches.slice(-1)[0].condition !== null)
+             statements.push(escaper(input, expected));
+         return typescript_1.default.factory.createBlock(statements, true);
+     };
 diff --git a/lib/programmers/json/JsonStringifyProgrammer.js b/lib/programmers/json/JsonStringifyProgrammer.js
-index ce0ae787164f7eba68ef35b05232b4b94ad8e7d7..8f70cfc8c8e9d82cd1ec5004ca5637487f57b3bc 100644
+index 77f2812cb509f5b9093dc311f8ae8558e4469a74..54a6c4e22f9cfa87cd30f8ade50e6cb8ccda9957 100644
 --- a/lib/programmers/json/JsonStringifyProgrammer.js
 +++ b/lib/programmers/json/JsonStringifyProgrammer.js
-@@ -424,10 +424,10 @@ var JsonStringifyProgrammer;
+@@ -469,10 +469,10 @@ var JsonStringifyProgrammer;
                      var rest = (function () {
                          if (tuple.elements.length === 0)
                              return null;
@@ -80,10 +99,10 @@ index ce0ae787164f7eba68ef35b05232b4b94ad8e7d7..8f70cfc8c8e9d82cd1ec5004ca563748
                      })();
                      return StringifyJoinder_1.StringifyJoiner.tuple(children, rest);
 diff --git a/lib/programmers/misc/MiscCloneProgrammer.js b/lib/programmers/misc/MiscCloneProgrammer.js
-index 3db6bc92637284468c5fe47ef59f51a9b41d06eb..0b3fa9deaaadf28d4f348225c0d44f49700c1bca 100644
+index 38bec89fba26db7a9c3ee71abd49086692c7e78b..9b9d7a9b0606da78224ce083bcbd7e07cd6ce82e 100644
 --- a/lib/programmers/misc/MiscCloneProgrammer.js
 +++ b/lib/programmers/misc/MiscCloneProgrammer.js
-@@ -291,11 +291,11 @@ var MiscCloneProgrammer;
+@@ -318,11 +318,11 @@ var MiscCloneProgrammer;
                      var rest = (function () {
                          if (tuple.elements.length === 0)
                              return null;
@@ -98,10 +117,10 @@ index 3db6bc92637284468c5fe47ef59f51a9b41d06eb..0b3fa9deaaadf28d4f348225c0d44f49
                      return CloneJoiner_1.CloneJoiner.tuple(children, rest);
                  };
 diff --git a/lib/programmers/misc/MiscPruneProgrammer.js b/lib/programmers/misc/MiscPruneProgrammer.js
-index 8440aaba9e449dae2468e96dfd7035ac7e170cfc..e97ceec78427b7eed08db23cc4775fdb10c6b2ff 100644
+index d4a9c66c0b5508b4ffdc4b7684364a9d748f6508..33f9356bab69faffadb8c2b49997d2c3ca429810 100644
 --- a/lib/programmers/misc/MiscPruneProgrammer.js
 +++ b/lib/programmers/misc/MiscPruneProgrammer.js
-@@ -272,11 +272,11 @@ var MiscPruneProgrammer;
+@@ -305,11 +305,11 @@ var MiscPruneProgrammer;
                      var rest = (function () {
                          if (tuple.elements.length === 0)
                              return null;
@@ -116,10 +135,10 @@ index 8440aaba9e449dae2468e96dfd7035ac7e170cfc..e97ceec78427b7eed08db23cc4775fdb
                      return PruneJoiner_1.PruneJoiner.tuple(children, rest);
                  };
 diff --git a/lib/programmers/notations/NotationGeneralProgrammer.js b/lib/programmers/notations/NotationGeneralProgrammer.js
-index 6e0b582a802180d7671c00b999469e7e59193b30..f11cc1d523875a040d3e27ce9a850b083c5d0275 100644
+index dfe64a21a5a81a7e887ab5ae02d73e6d3bdddb03..aa4b6070ed6a83c49018384e3a0c1dbd4a7c540b 100644
 --- a/lib/programmers/notations/NotationGeneralProgrammer.js
 +++ b/lib/programmers/notations/NotationGeneralProgrammer.js
-@@ -301,11 +301,11 @@ var NotationGeneralProgrammer;
+@@ -328,11 +328,11 @@ var NotationGeneralProgrammer;
                      var rest = (function () {
                          if (tuple.elements.length === 0)
                              return null;
@@ -134,36 +153,36 @@ index 6e0b582a802180d7671c00b999469e7e59193b30..f11cc1d523875a040d3e27ce9a850b08
                      return NotationJoiner_1.NotationJoiner.tuple(children, rest);
                  };
 diff --git a/lib/transformers/CallExpressionTransformer.js b/lib/transformers/CallExpressionTransformer.js
-index 2c5a23879d171ee271ebf6857dc9c65ec29c0ea7..96a40845614f6c54fe8e4ebc48a7d8efeba52a41 100644
+index f7be23d98552526d8c2348ba0f3d32b8d31e522b..133af0caa37ffcf7330811ef7bda79e75b9ecd89 100644
 --- a/lib/transformers/CallExpressionTransformer.js
 +++ b/lib/transformers/CallExpressionTransformer.js
-@@ -101,7 +101,7 @@ var CallExpressionTransformer;
-             var location = path_1.default.resolve(declaration.getSourceFile().fileName);
-             if (isTarget(location) === false)
-                 return expression;
+@@ -129,7 +129,7 @@ var CallExpressionTransformer;
+             // TRANSFORMATION
+             //----
+             // FUNCTION NAME
 -            var module = location.split(path_1.default.sep).at(-1).split(".")[0];
 +            var module = location.split(path_1.default.sep).slice(-1)[0].split(".")[0];
              var name = project.checker.getTypeAtLocation(declaration).symbol.name;
+             // FIND TRANSFORMER
              var functor = (_b = FUNCTORS[module]) === null || _b === void 0 ? void 0 : _b[name];
-             if (functor === undefined)
 diff --git a/src/factories/internal/metadata/iterate_metadata_intersection.ts b/src/factories/internal/metadata/iterate_metadata_intersection.ts
-index f46caa25c987092597073e046ae3b9e8130bd994..1eedd727c74f173a5b98a9572b865e058885811d 100644
+index c4d93a961385c09abb6f448896ad4636b648703b..99b1547e6a501caf28a452390fe721cd47dc2ca1 100644
 --- a/src/factories/internal/metadata/iterate_metadata_intersection.ts
 +++ b/src/factories/internal/metadata/iterate_metadata_intersection.ts
-@@ -214,7 +214,7 @@ export const iterate_metadata_intersection =
+@@ -188,7 +188,7 @@ export const iterate_metadata_intersection =
          target,
        )(objects.map((om) => om.objects).flat(), explore);
        if (tags.length)
 -        if (target === "array") meta.arrays.at(-1)!.tags.push(tags);
 +        if (target === "array") meta.arrays.slice(-1)[0]!.tags.push(tags);
-         else if (booleanLiteral === null)
+         else if (atomics.size)
            meta.atomics.find((a) => a.type === target)!.tags.push(tags);
-         else {
+         else if (constants.length) {
 diff --git a/src/programmers/CheckerProgrammer.ts b/src/programmers/CheckerProgrammer.ts
-index 892748b80755b89d1449f4d515aa3166534c6b19..8cb5ce35fe6f918545c82066f0583dead2661c89 100644
+index 40f46e8212a5173e19e0214422086655de908933..18a1a2371cac697e1b621a8fbc6b090b691e3072 100644
 --- a/src/programmers/CheckerProgrammer.ts
 +++ b/src/programmers/CheckerProgrammer.ts
-@@ -702,14 +702,14 @@ export namespace CheckerProgrammer {
+@@ -785,14 +785,14 @@ export namespace CheckerProgrammer {
            ),
          );
        const rest: ts.Expression | null =
@@ -181,47 +200,66 @@ index 892748b80755b89d1449f4d515aa3166534c6b19..8cb5ce35fe6f918545c82066f0583dea
                  ...explore,
                  start: tuple.elements.length - 1,
 diff --git a/src/programmers/TypiaProgrammer.ts b/src/programmers/TypiaProgrammer.ts
-index e01eccf62eccd73e1f0720db897f539256a6bbc1..cae5eb6fc702d359d4886acefdb68d42691edf97 100644
+index 67d9fc138483832aae43574fd2753bbe40a27d14..4397517aa620a8733c51917eebfa467f2922bf6d 100644
 --- a/src/programmers/TypiaProgrammer.ts
 +++ b/src/programmers/TypiaProgrammer.ts
 @@ -101,7 +101,7 @@ export namespace TypiaProgrammer {
-               .file!.text.substring(0, diag.start)
-               .split("\n");
-             if (lines.length === 0) return [0, 0];
--            return [lines.length, lines.at(-1)!.length + 1];
-+            return [lines.length, lines.slice(-1)[0]!.length + 1];
-           })()
-         : [0, 0];
-       console.error(
-diff --git a/src/programmers/internal/application_tuple.ts b/src/programmers/internal/application_tuple.ts
-index 5e10b9051e4a846f298aa8f086109e8d6bb38bf9..a8e24d5c2a2a4a4d5d1dc49eb45b4784654a4b66 100644
---- a/src/programmers/internal/application_tuple.ts
-+++ b/src/programmers/internal/application_tuple.ts
-@@ -28,16 +28,16 @@ export const application_tuple =
-         }),
+               .file!.text.substring(0, diag.start)
+               .split("\n");
+             if (lines.length === 0) return [0, 0];
+-            return [lines.length, lines.at(-1)!.length + 1];
++            return [lines.length, lines.slice(-1)[0]!.length + 1];
+           })()
+         : [0, 0];
+       console.error(
+diff --git a/src/programmers/internal/application_v30_tuple.ts b/src/programmers/internal/application_v30_tuple.ts
+index 0431273d439c6069a1bb5fbfd7808c5e8d0ea255..4b27cfc3ebde7ce9dcdb5161d34e70004a327b1e 100644
+--- a/src/programmers/internal/application_v30_tuple.ts
++++ b/src/programmers/internal/application_v30_tuple.ts
+@@ -24,10 +24,10 @@ export const application_v30_tuple =
+         Metadata.initialize(),
        ),
-       ...attribute,
--      minItems: !!tuple.type.elements.at(-1)?.rest
-+      minItems: !!tuple.type.elements.slice(-1)[0]?.rest
-         ? tuple.type.elements.length - 1
-         : tuple.type.elements.filter((x) => !x.optional).length,
--      maxItems: !!tuple.type.elements.at(-1)?.rest
-+      maxItems: !!tuple.type.elements.slice(-1)[0]?.rest
-         ? undefined
-         : tuple.type.elements.length,
-     };
-     if (options.purpose === "ajv")
-       if (tuple.type.elements.length === 0) return schema;
--      else if (!tuple.type.elements.at(-1)?.rest) return schema;
-+      else if (!tuple.type.elements.slice(-1)[0]?.rest) return schema;
- 
-     const wrapper: IJsonSchema.IArray = {
-       ...schema,
+     ),
+-    minItems: !!tuple.type.elements.at(-1)?.rest
++    minItems: !!tuple.type.elements.slice(-1)[0]?.rest
+       ? tuple.type.elements.length - 1
+       : tuple.type.elements.filter((x) => !x.optional).length,
+-    maxItems: !!tuple.type.elements.at(-1)?.rest
++    maxItems: !!tuple.type.elements.slice(-1)[0]?.rest
+       ? undefined!
+       : tuple.type.elements.length,
+   });
+diff --git a/src/programmers/internal/application_v31_tuple.ts b/src/programmers/internal/application_v31_tuple.ts
+index 426abad3423de706c368b35b2cf6b4845f6f3d91..be15ec0fda1725bf1ea882c9901e0f837c052fde 100644
+--- a/src/programmers/internal/application_v31_tuple.ts
++++ b/src/programmers/internal/application_v31_tuple.ts
+@@ -9,7 +9,7 @@ import { MetadataTuple } from "../../schemas/metadata/MetadataTuple";
+ export const application_v31_tuple =
+   (generator: (meta: Metadata) => OpenApi.IJsonSchema) =>
+   (tuple: MetadataTuple): OpenApi.IJsonSchema.ITuple => {
+-    const tail: Metadata | null = tuple.type.elements.at(-1)?.rest ?? null;
++    const tail: Metadata | null = tuple.type.elements.slice(-1)[0]?.rest ?? null;
+     const prefixItems: Metadata[] = tuple.type.isRest()
+       ? tuple.type.elements.slice(0, -1)
+       : tuple.type.elements;
+diff --git a/src/programmers/internal/decode_union_object.ts b/src/programmers/internal/decode_union_object.ts
+index f60bf69f91f35dee2efc807475fd6eca71aab052..ef8d51160f7eb9853ec0c827827aaa6c65db1587 100644
+--- a/src/programmers/internal/decode_union_object.ts
++++ b/src/programmers/internal/decode_union_object.ts
+@@ -87,7 +87,7 @@ const iterate =
+           )
+         : ts.factory.createReturnStatement(b.value),
+     );
+-    if (branches.at(-1)!.condition !== null)
++    if (branches.slice(-1)[0]!.condition !== null)
+       statements.push(escaper(input, expected));
+     return ts.factory.createBlock(statements, true);
+   };
 diff --git a/src/programmers/json/JsonStringifyProgrammer.ts b/src/programmers/json/JsonStringifyProgrammer.ts
-index c317cec2c78e984a6e64c7bf287d0c67e530e309..5974830c62dbd2b865aa2e64e2e757283258d872 100644
+index 558e5bf4b79f5cc28791ba0f5e40ebe6599361ce..c43d77b5d15343af90f7362d1757fc758659d5c9 100644
 --- a/src/programmers/json/JsonStringifyProgrammer.ts
 +++ b/src/programmers/json/JsonStringifyProgrammer.ts
-@@ -543,7 +543,7 @@ export namespace JsonStringifyProgrammer {
+@@ -560,7 +560,7 @@ export namespace JsonStringifyProgrammer {
          );
        const rest = (() => {
          if (tuple.elements.length === 0) return null;
@@ -230,7 +268,7 @@ index c317cec2c78e984a6e64c7bf287d0c67e530e309..5974830c62dbd2b865aa2e64e2e75728
          if (last.rest === null) return null;
  
          const code = decode(project)(config)(importer)(
-@@ -552,7 +552,7 @@ export namespace JsonStringifyProgrammer {
+@@ -569,7 +569,7 @@ export namespace JsonStringifyProgrammer {
              undefined,
              [ExpressionFactory.number(tuple.elements.length - 1)],
            ),
@@ -240,10 +278,10 @@ index c317cec2c78e984a6e64c7bf287d0c67e530e309..5974830c62dbd2b865aa2e64e2e75728
              ...explore,
              start: tuple.elements.length - 1,
 diff --git a/src/programmers/misc/MiscCloneProgrammer.ts b/src/programmers/misc/MiscCloneProgrammer.ts
-index 94d768b0a0738c0caccd711671351d1f22fa3848..739fd5f2baf4d2eb8e9dd65d73179242a0244707 100644
+index c8c9cb90085eff7dd68ac332a362674ca33d93d8..76a810816bc4ad57ff5e1787a33cd7f01471ffbe 100644
 --- a/src/programmers/misc/MiscCloneProgrammer.ts
 +++ b/src/programmers/misc/MiscCloneProgrammer.ts
-@@ -343,7 +343,7 @@ export namespace MiscCloneProgrammer {
+@@ -395,7 +395,7 @@ export namespace MiscCloneProgrammer {
        const rest = (() => {
          if (tuple.elements.length === 0) return null;
  
@@ -252,7 +290,7 @@ index 94d768b0a0738c0caccd711671351d1f22fa3848..739fd5f2baf4d2eb8e9dd65d73179242
          const rest: Metadata | null = last.rest;
          if (rest === null) return null;
  
-@@ -353,7 +353,7 @@ export namespace MiscCloneProgrammer {
+@@ -405,7 +405,7 @@ export namespace MiscCloneProgrammer {
              undefined,
              [ExpressionFactory.number(tuple.elements.length - 1)],
            ),
@@ -262,10 +300,10 @@ index 94d768b0a0738c0caccd711671351d1f22fa3848..739fd5f2baf4d2eb8e9dd65d73179242
              ...explore,
              start: tuple.elements.length - 1,
 diff --git a/src/programmers/misc/MiscPruneProgrammer.ts b/src/programmers/misc/MiscPruneProgrammer.ts
-index ed1465267066e382ae6696a25a806c2489597593..661f3cd93ae66070c978bd3e8d2b8db07189fe47 100644
+index 1051204a00041ddfb39da9de77b35ab8b44b75ee..73db30fdc06955f43dc2f563cbfc174e50a1bc6f 100644
 --- a/src/programmers/misc/MiscPruneProgrammer.ts
 +++ b/src/programmers/misc/MiscPruneProgrammer.ts
-@@ -310,7 +310,7 @@ export namespace MiscPruneProgrammer {
+@@ -347,7 +347,7 @@ export namespace MiscPruneProgrammer {
        const rest = (() => {
          if (tuple.elements.length === 0) return null;
  
@@ -274,7 +312,7 @@ index ed1465267066e382ae6696a25a806c2489597593..661f3cd93ae66070c978bd3e8d2b8db0
          const rest: Metadata | null = last.rest;
          if (rest === null || filter(rest) === false) return null;
  
-@@ -320,7 +320,7 @@ export namespace MiscPruneProgrammer {
+@@ -357,7 +357,7 @@ export namespace MiscPruneProgrammer {
              undefined,
              [ExpressionFactory.number(tuple.elements.length - 1)],
            ),
@@ -284,10 +322,10 @@ index ed1465267066e382ae6696a25a806c2489597593..661f3cd93ae66070c978bd3e8d2b8db0
              ...explore,
              start: tuple.elements.length - 1,
 diff --git a/src/programmers/notations/NotationGeneralProgrammer.ts b/src/programmers/notations/NotationGeneralProgrammer.ts
-index bd49b1e34002b1a1ec4f5444a8f91fa0ab794360..71d676de290986045910602ab10c6ef09a19c07d 100644
+index d8b2e22a8f9f3bfcb8f3e7987edaa7bf19a48720..96632214cb02b1534dc1987a0f892a3bf41e892f 100644
 --- a/src/programmers/notations/NotationGeneralProgrammer.ts
 +++ b/src/programmers/notations/NotationGeneralProgrammer.ts
-@@ -353,7 +353,7 @@ export namespace NotationGeneralProgrammer {
+@@ -411,7 +411,7 @@ export namespace NotationGeneralProgrammer {
        const rest = (() => {
          if (tuple.elements.length === 0) return null;
  
@@ -296,7 +334,7 @@ index bd49b1e34002b1a1ec4f5444a8f91fa0ab794360..71d676de290986045910602ab10c6ef0
          const rest: Metadata | null = last.rest;
          if (rest === null) return null;
  
-@@ -363,7 +363,7 @@ export namespace NotationGeneralProgrammer {
+@@ -421,7 +421,7 @@ export namespace NotationGeneralProgrammer {
              undefined,
              [ExpressionFactory.number(tuple.elements.length - 1)],
            ),
@@ -306,15 +344,15 @@ index bd49b1e34002b1a1ec4f5444a8f91fa0ab794360..71d676de290986045910602ab10c6ef0
              ...explore,
              start: tuple.elements.length - 1,
 diff --git a/src/transformers/CallExpressionTransformer.ts b/src/transformers/CallExpressionTransformer.ts
-index c58a1b143ce4f204bb249a4858c9d16a26f97408..9e9ffcf73e4c01aa6ac8c213669fdcd50e0181b9 100644
+index 99a4604f1a1944336b4d93dc61390269c346c243..c31ba72f1d206c441d6c237314a1c4d5c808dd09 100644
 --- a/src/transformers/CallExpressionTransformer.ts
 +++ b/src/transformers/CallExpressionTransformer.ts
-@@ -111,7 +111,7 @@ export namespace CallExpressionTransformer {
-       // TRANSFORMATION
-       //----
-       // FUNCTION NAME
--      const module: string = location.split(path.sep).at(-1)!.split(".")[0]!;
-+      const module: string = location.split(path.sep).slice(-1)[0]!.split(".")[0]!;
-       const { name } = project.checker.getTypeAtLocation(declaration).symbol;
- 
-       // FIND TRANSFORMER
+@@ -131,7 +131,7 @@ export namespace CallExpressionTransformer {
+       // TRANSFORMATION
+       //----
+       // FUNCTION NAME
+-      const module: string = location.split(path.sep).at(-1)!.split(".")[0]!;
++      const module: string = location.split(path.sep).slice(-1)[0]!.split(".")[0]!;
+       const { name } = project.checker.getTypeAtLocation(declaration).symbol;
+ 
+       // FIND TRANSFORMER
diff --git a/README.md b/README.md
index 56e38c111e97..6461ad602516 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Free for 30 days. Afterward, choose between continuing to host on our secure clo
 You can follow these instructions to setup a dev environment:
 
 - Install **Node 14.x (LTS)** either [manually](https://nodejs.org/dist/latest-v14.x/) or using a tool like [nvm](https://github.com/creationix/nvm) or [volta](https://volta.sh/) (recommended)
-- Install **Meteor** ([version here](apps/meteor/.meteor/release)): https://www.meteor.com/developers/install
+- Install **Meteor** ([version here](apps/meteor/.meteor/release)): https://docs.meteor.com/about/install.html
 - Install **yarn**: https://yarnpkg.com/getting-started/install
 - Clone this repo: `git clone https://github.com/RocketChat/Rocket.Chat.git`
 - Run `yarn` to install dependencies
diff --git a/_templates/package/new/package.json.ejs.t b/_templates/package/new/package.json.ejs.t
index 6bee52f55927..b2827ee3fb89 100644
--- a/_templates/package/new/package.json.ejs.t
+++ b/_templates/package/new/package.json.ejs.t
@@ -19,6 +19,7 @@ to: packages/<%= name %>/package.json
 		"test": "jest",
 		"build": "rm -rf dist && tsc -p tsconfig.json",
 		"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput"
+		"build-preview": "mkdir -p ../../.preview && cp -r ./dist ../../.preview/<%= name.toLowerCase() %>"
 	},
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index c7029b774cc0..340ae30e35a7 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,306 @@
 # @rocket.chat/meteor
 
+## 6.13.0-rc.6
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/license@0.2.8-rc.6
+  - @rocket.chat/omnichannel-services@0.3.5-rc.6
+  - @rocket.chat/pdf-worker@0.2.5-rc.6
+  - @rocket.chat/presence@0.2.8-rc.6
+  - @rocket.chat/api-client@0.2.8-rc.6
+  - @rocket.chat/apps@0.1.8-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/cron@0.1.8-rc.6
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.6
+  - @rocket.chat/gazzodown@11.0.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.6
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.6
+  - @rocket.chat/ui-video-conf@11.0.0-rc.6
+  - @rocket.chat/web-ui-registration@11.0.0-rc.6
+  - @rocket.chat/instance-status@0.1.8-rc.6
+  </details>
+
+## 6.13.0-rc.5
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/license@0.2.8-rc.5
+  - @rocket.chat/omnichannel-services@0.3.5-rc.5
+  - @rocket.chat/pdf-worker@0.2.5-rc.5
+  - @rocket.chat/presence@0.2.8-rc.5
+  - @rocket.chat/api-client@0.2.8-rc.5
+  - @rocket.chat/apps@0.1.8-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/cron@0.1.8-rc.5
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.5
+  - @rocket.chat/gazzodown@11.0.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.5
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.5
+  - @rocket.chat/ui-client@11.0.0-rc.5
+  - @rocket.chat/ui-video-conf@11.0.0-rc.5
+  - @rocket.chat/web-ui-registration@11.0.0-rc.5
+  - @rocket.chat/instance-status@0.1.8-rc.5
+  </details>
+
+## 6.13.0-rc.4
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/license@0.2.8-rc.4
+  - @rocket.chat/omnichannel-services@0.3.5-rc.4
+  - @rocket.chat/pdf-worker@0.2.5-rc.4
+  - @rocket.chat/presence@0.2.8-rc.4
+  - @rocket.chat/api-client@0.2.8-rc.4
+  - @rocket.chat/apps@0.1.8-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/cron@0.1.8-rc.4
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.4
+  - @rocket.chat/gazzodown@11.0.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.4
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.4
+  - @rocket.chat/ui-client@11.0.0-rc.4
+  - @rocket.chat/ui-video-conf@11.0.0-rc.4
+  - @rocket.chat/web-ui-registration@11.0.0-rc.4
+  - @rocket.chat/instance-status@0.1.8-rc.4
+  </details>
+
+## 6.13.0-rc.3
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33381](https://github.com/RocketChat/Rocket.Chat/pull/33381)) Fixes a race condition that causes livechat conversations to get stuck in the agent's sidebar panel after being forwarded.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/license@0.2.8-rc.3
+  - @rocket.chat/omnichannel-services@0.3.5-rc.3
+  - @rocket.chat/pdf-worker@0.2.5-rc.3
+  - @rocket.chat/presence@0.2.8-rc.3
+  - @rocket.chat/api-client@0.2.8-rc.3
+  - @rocket.chat/apps@0.1.8-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/cron@0.1.8-rc.3
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.3
+  - @rocket.chat/gazzodown@11.0.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.3
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.3
+  - @rocket.chat/ui-client@11.0.0-rc.3
+  - @rocket.chat/ui-video-conf@11.0.0-rc.3
+  - @rocket.chat/web-ui-registration@11.0.0-rc.3
+  - @rocket.chat/instance-status@0.1.8-rc.3
+  </details>
+
+## 6.13.0-rc.2
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/license@0.2.8-rc.2
+  - @rocket.chat/omnichannel-services@0.3.5-rc.2
+  - @rocket.chat/pdf-worker@0.2.5-rc.2
+  - @rocket.chat/presence@0.2.8-rc.2
+  - @rocket.chat/api-client@0.2.8-rc.2
+  - @rocket.chat/apps@0.1.8-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/cron@0.1.8-rc.2
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.2
+  - @rocket.chat/gazzodown@11.0.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.3.0-rc.2
+  - @rocket.chat/ui-theming@0.3.0-rc.0
+  - @rocket.chat/ui-avatar@7.0.0-rc.2
+  - @rocket.chat/ui-client@11.0.0-rc.2
+  - @rocket.chat/ui-video-conf@11.0.0-rc.2
+  - @rocket.chat/web-ui-registration@11.0.0-rc.2
+  - @rocket.chat/instance-status@0.1.8-rc.2
+  </details>
+
+## 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
diff --git a/apps/meteor/app/2fa/server/code/EmailCheck.spec.ts b/apps/meteor/app/2fa/server/code/EmailCheck.spec.ts
new file mode 100644
index 000000000000..5c3574f0b395
--- /dev/null
+++ b/apps/meteor/app/2fa/server/code/EmailCheck.spec.ts
@@ -0,0 +1,70 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const settingsMock = sinon.stub();
+
+const { EmailCheck } = proxyquire.noCallThru().load('./EmailCheck', {
+	'@rocket.chat/models': {
+		Users: {},
+	},
+	'meteor/accounts-base': {
+		Accounts: {
+			_bcryptRounds: () => '123',
+		},
+	},
+	'../../../../server/lib/i18n': {
+		i18n: {
+			t: (key: string) => key,
+		},
+	},
+	'../../../mailer/server/api': {
+		send: () => undefined,
+	},
+	'../../../settings/server': {
+		settings: {
+			get: settingsMock,
+		},
+	},
+});
+
+const normalUserMock = { services: { email2fa: { enabled: true } }, emails: [{ email: 'abc@gmail.com', verified: true }] };
+const normalUserWithUnverifiedEmailMock = {
+	services: { email2fa: { enabled: true } },
+	emails: [{ email: 'abc@gmail.com', verified: false }],
+};
+const OAuthUserMock = { services: { google: {} }, emails: [{ email: 'abc@gmail.com', verified: true }] };
+
+describe('EmailCheck', () => {
+	let emailCheck: typeof EmailCheck;
+	beforeEach(() => {
+		settingsMock.reset();
+
+		emailCheck = new EmailCheck();
+	});
+
+	it('should return EmailCheck is enabled for a normal user', () => {
+		settingsMock.returns(true);
+
+		const isEmail2FAEnabled = emailCheck.isEnabled(normalUserMock);
+
+		expect(isEmail2FAEnabled).to.be.equal(true);
+	});
+
+	it('should return EmailCheck is not enabled for a normal user with unverified email', () => {
+		settingsMock.returns(true);
+
+		const isEmail2FAEnabled = emailCheck.isEnabled(normalUserWithUnverifiedEmailMock);
+
+		expect(isEmail2FAEnabled).to.be.equal(false);
+	});
+
+	it('should return EmailCheck is not enabled for a OAuth user with setting being false', () => {
+		settingsMock.returns(true);
+
+		const isEmail2FAEnabled = emailCheck.isEnabled(OAuthUserMock);
+
+		expect(isEmail2FAEnabled).to.be.equal(false);
+	});
+});
diff --git a/apps/meteor/app/2fa/server/code/EmailCheck.ts b/apps/meteor/app/2fa/server/code/EmailCheck.ts
index 123df96ee264..d947c1b30c2e 100644
--- a/apps/meteor/app/2fa/server/code/EmailCheck.ts
+++ b/apps/meteor/app/2fa/server/code/EmailCheck.ts
@@ -1,4 +1,4 @@
-import type { IUser } from '@rocket.chat/core-typings';
+import { isOAuthUser, type IUser } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 import bcrypt from 'bcrypt';
@@ -24,6 +24,10 @@ export class EmailCheck implements ICodeCheck {
 			return false;
 		}
 
+		if (!settings.get('Accounts_twoFactorAuthentication_email_available_for_OAuth_users') && isOAuthUser(user)) {
+			return false;
+		}
+
 		if (!user.services?.email2fa?.enabled) {
 			return false;
 		}
diff --git a/apps/meteor/app/2fa/server/code/index.ts b/apps/meteor/app/2fa/server/code/index.ts
index 1fbe658e5682..b05157416e31 100644
--- a/apps/meteor/app/2fa/server/code/index.ts
+++ b/apps/meteor/app/2fa/server/code/index.ts
@@ -45,14 +45,10 @@ function getAvailableMethodNames(user: IUser): string[] {
 export async function getUserForCheck(userId: string): Promise<IUser | null> {
 	return Users.findOneById(userId, {
 		projection: {
-			'emails': 1,
-			'language': 1,
-			'createdAt': 1,
-			'services.totp': 1,
-			'services.email2fa': 1,
-			'services.emailCode': 1,
-			'services.password': 1,
-			'services.resume.loginTokens': 1,
+			emails: 1,
+			language: 1,
+			createdAt: 1,
+			services: 1,
 		},
 	});
 }
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/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
index dd4da47bff05..8348b8429e4e 100644
--- a/apps/meteor/app/api/server/v1/misc.ts
+++ b/apps/meteor/app/api/server/v1/misc.ts
@@ -1,6 +1,6 @@
 import crypto from 'crypto';
 
-import type { IUser } from '@rocket.chat/core-typings';
+import { isOAuthUser, type IUser } from '@rocket.chat/core-typings';
 import { Settings, Users } from '@rocket.chat/models';
 import {
 	isShieldSvgProps,
@@ -26,7 +26,7 @@ import { hasPermissionAsync } from '../../../authorization/server/functions/hasP
 import { passwordPolicy } from '../../../lib/server';
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
-import { getDefaultUserFields } from '../../../utils/server/functions/getDefaultUserFields';
+import { getBaseUserFields } from '../../../utils/server/functions/getBaseUserFields';
 import { isSMTPConfigured } from '../../../utils/server/functions/isSMTPConfigured';
 import { getURL } from '../../../utils/server/getURL';
 import { API } from '../api';
@@ -176,15 +176,19 @@ API.v1.addRoute(
 	{ authRequired: true },
 	{
 		async get() {
-			const fields = getDefaultUserFields();
-			const { services, ...user } = (await Users.findOneById(this.userId, { projection: fields })) as IUser;
+			const userFields = { ...getBaseUserFields(), services: 1 };
+			const { services, ...user } = (await Users.findOneById(this.userId, { projection: userFields })) as IUser;
 
 			return API.v1.success(
 				await getUserInfo({
 					...user,
+					isOAuthUser: isOAuthUser({ ...user, services }),
 					...(services && {
 						services: {
-							...services,
+							...(services.github && { github: services.github }),
+							...(services.gitlab && { gitlab: services.gitlab }),
+							...(services.email2fa?.enabled && { email2fa: { enabled: services.email2fa.enabled } }),
+							...(services.totp?.enabled && { totp: { enabled: services.totp.enabled } }),
 							password: {
 								// The password hash shouldn't be leaked but the client may need to know if it exists.
 								exists: Boolean(services?.password?.bcrypt),
diff --git a/apps/meteor/app/api/server/v1/rooms.ts b/apps/meteor/app/api/server/v1/rooms.ts
index a0ed75ceea30..3dc62e462ddf 100644
--- a/apps/meteor/app/api/server/v1/rooms.ts
+++ b/apps/meteor/app/api/server/v1/rooms.ts
@@ -1,4 +1,4 @@
-import { Media } from '@rocket.chat/core-services';
+import { Media, Team } from '@rocket.chat/core-services';
 import type { IRoom, IUpload } from '@rocket.chat/core-typings';
 import { Messages, Rooms, Users, Uploads, Subscriptions } from '@rocket.chat/models';
 import type { Notifications } from '@rocket.chat/rest-typings';
@@ -417,7 +417,19 @@ API.v1.addRoute(
 				return API.v1.failure('not-allowed', 'Not Allowed');
 			}
 
-			return API.v1.success({ room: (await Rooms.findOneByIdOrName(room._id, { projection: fields })) ?? undefined });
+			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, sidepanel: 1 },
+				}));
+			const { team, parentRoom } = await Team.getRoomInfo(room);
+			const parent = discussionParent || parentRoom;
+
+			return API.v1.success({
+				room: (await Rooms.findOneByIdOrName(room._id, { projection: fields })) ?? undefined,
+				...(team && { team }),
+				...(parent && { parent }),
+			});
 		},
 	},
 );
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/apps/server/bridges/bridges.js b/apps/meteor/app/apps/server/bridges/bridges.js
index 6d52a1d8e56d..aeab9f191039 100644
--- a/apps/meteor/app/apps/server/bridges/bridges.js
+++ b/apps/meteor/app/apps/server/bridges/bridges.js
@@ -5,6 +5,7 @@ import { AppApisBridge } from './api';
 import { AppCloudBridge } from './cloud';
 import { AppCommandsBridge } from './commands';
 import { AppDetailChangesBridge } from './details';
+import { AppEmailBridge } from './email';
 import { AppEnvironmentalVariableBridge } from './environmental';
 import { AppHttpBridge } from './http';
 import { AppInternalBridge } from './internal';
@@ -53,6 +54,7 @@ export class RealAppBridges extends AppBridges {
 		this._moderationBridge = new AppModerationBridge(orch);
 		this._threadBridge = new AppThreadBridge(orch);
 		this._roleBridge = new AppRoleBridge(orch);
+		this._emailBridge = new AppEmailBridge(orch);
 	}
 
 	getCommandBridge() {
@@ -150,4 +152,8 @@ export class RealAppBridges extends AppBridges {
 	getRoleBridge() {
 		return this._roleBridge;
 	}
+
+	getEmailBridge() {
+		return this._emailBridge;
+	}
 }
diff --git a/apps/meteor/app/apps/server/bridges/email.ts b/apps/meteor/app/apps/server/bridges/email.ts
new file mode 100644
index 000000000000..4c9cb9a93ed6
--- /dev/null
+++ b/apps/meteor/app/apps/server/bridges/email.ts
@@ -0,0 +1,16 @@
+import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import type { IEmail } from '@rocket.chat/apps-engine/definition/email';
+import { EmailBridge } from '@rocket.chat/apps-engine/server/bridges';
+
+import * as Mailer from '../../../mailer/server/api';
+
+export class AppEmailBridge extends EmailBridge {
+	constructor(private readonly orch: IAppServerOrchestrator) {
+		super();
+	}
+
+	protected async sendEmail(email: IEmail, appId: string): Promise<void> {
+		this.orch.debugLog(`The app ${appId} is sending an email.`);
+		await Mailer.send(email);
+	}
+}
diff --git a/apps/meteor/app/authorization/server/constant/permissions.ts b/apps/meteor/app/authorization/server/constant/permissions.ts
index 6efe99e14d0e..46d40713bad1 100644
--- a/apps/meteor/app/authorization/server/constant/permissions.ts
+++ b/apps/meteor/app/authorization/server/constant/permissions.ts
@@ -93,6 +93,18 @@ export const permissions = [
 		_id: 'view-l-room',
 		roles: ['livechat-manager', 'livechat-monitor', 'livechat-agent', 'admin'],
 	},
+	{
+		_id: 'create-livechat-contact',
+		roles: ['livechat-manager', 'livechat-monitor', 'livechat-agent', 'admin'],
+	},
+	{
+		_id: 'update-livechat-contact',
+		roles: ['livechat-manager', 'livechat-monitor', 'livechat-agent', 'admin'],
+	},
+	{
+		_id: 'view-livechat-contact',
+		roles: ['livechat-manager', 'livechat-monitor', 'livechat-agent', 'admin'],
+	},
 	{ _id: 'view-livechat-manager', roles: ['livechat-manager', 'livechat-monitor', 'admin'] },
 	{
 		_id: 'view-omnichannel-contact-center',
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/channel-settings/server/functions/saveStreamingOptions.ts b/apps/meteor/app/channel-settings/server/functions/saveStreamingOptions.ts
deleted file mode 100644
index aee596402cc6..000000000000
--- a/apps/meteor/app/channel-settings/server/functions/saveStreamingOptions.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Rooms } from '@rocket.chat/models';
-import { Match, check } from 'meteor/check';
-import { Meteor } from 'meteor/meteor';
-
-export const saveStreamingOptions = async function (rid: string, options: Record<string, any>): Promise<void> {
-	if (!Match.test(rid, String)) {
-		throw new Meteor.Error('invalid-room', 'Invalid room', {
-			function: 'RocketChat.saveStreamingOptions',
-		});
-	}
-
-	check(options, {
-		id: Match.Optional(String),
-		type: Match.Optional(String),
-		url: Match.Optional(String),
-		thumbnail: Match.Optional(String),
-		isAudioOnly: Match.Optional(Boolean),
-		message: Match.Optional(String),
-	});
-
-	await Rooms.setStreamingOptionsById(rid, options);
-};
diff --git a/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts b/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts
index 44ad253d83ef..04e8fdbaf186 100644
--- a/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts
+++ b/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts
@@ -21,7 +21,6 @@ import { saveRoomReadOnly } from '../functions/saveRoomReadOnly';
 import { saveRoomSystemMessages } from '../functions/saveRoomSystemMessages';
 import { saveRoomTopic } from '../functions/saveRoomTopic';
 import { saveRoomType } from '../functions/saveRoomType';
-import { saveStreamingOptions } from '../functions/saveStreamingOptions';
 
 type RoomSettings = {
 	roomAvatar: string;
@@ -37,7 +36,6 @@ type RoomSettings = {
 	systemMessages: MessageTypesValues[];
 	default: boolean;
 	joinCode: string;
-	streamingOptions: NonNullable<IRoom['streamingOptions']>;
 	retentionEnabled: boolean;
 	retentionMaxAge: number;
 	retentionExcludePinned: boolean;
@@ -272,9 +270,6 @@ const settingSavers: RoomSettingsSavers = {
 			void Team.update(user._id, room.teamId, { type, updateRoom: false });
 		}
 	},
-	async streamingOptions({ value, rid }) {
-		await saveStreamingOptions(rid, value);
-	},
 	async readOnly({ value, room, rid, user }) {
 		if (value !== room.ro) {
 			await saveRoomReadOnly(rid, value, user);
@@ -354,7 +349,6 @@ const fields: (keyof RoomSettings)[] = [
 	'systemMessages',
 	'default',
 	'joinCode',
-	'streamingOptions',
 	'retentionEnabled',
 	'retentionMaxAge',
 	'retentionExcludePinned',
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/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/client/lib/chartHandler.ts b/apps/meteor/app/livechat/client/lib/chartHandler.ts
index 19c1a004ca22..da2d4be3735c 100644
--- a/apps/meteor/app/livechat/client/lib/chartHandler.ts
+++ b/apps/meteor/app/livechat/client/lib/chartHandler.ts
@@ -177,10 +177,9 @@ export const drawDoughnutChart = async (
 	chartContext: { destroy: () => void } | undefined,
 	dataLabels: string[],
 	dataPoints: number[],
-): Promise<ChartType<'doughnut', number[], string> | void> => {
+): Promise<ChartType> => {
 	if (!chart) {
-		console.error('No chart element');
-		return;
+		throw new Error('No chart element');
 	}
 	if (chartContext) {
 		chartContext.destroy();
@@ -200,7 +199,7 @@ export const drawDoughnutChart = async (
 			],
 		},
 		options: doughnutChartConfiguration(title),
-	});
+	}) as ChartType;
 };
 
 /**
@@ -209,12 +208,12 @@ export const drawDoughnutChart = async (
  * @param  {String} label [chart label]
  * @param  {Array(Double)} data  [updated data]
  */
-export const updateChart = async (c: ChartType, label: string, data: { [x: string]: number }): Promise<void> => {
+export const updateChart = async (c: ChartType, label: string, data: number[]): Promise<void> => {
 	const chart = await c;
 	if (chart.data?.labels?.indexOf(label) === -1) {
 		// insert data
 		chart.data.labels.push(label);
-		chart.data.datasets.forEach((dataset: { data: any[] }, idx: string | number) => {
+		chart.data.datasets.forEach((dataset: { data: any[] }, idx: number) => {
 			dataset.data.push(data[idx]);
 		});
 	} else {
@@ -224,7 +223,7 @@ export const updateChart = async (c: ChartType, label: string, data: { [x: strin
 			return;
 		}
 
-		chart.data.datasets.forEach((dataset: { data: { [x: string]: any } }, idx: string | number) => {
+		chart.data.datasets.forEach((dataset: { data: { [x: string]: any } }, idx: number) => {
 			dataset.data[index] = data[idx];
 		});
 	}
diff --git a/apps/meteor/app/livechat/imports/server/rest/appearance.ts b/apps/meteor/app/livechat/imports/server/rest/appearance.ts
index 48863fc9e5d3..7496b6243abe 100644
--- a/apps/meteor/app/livechat/imports/server/rest/appearance.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/appearance.ts
@@ -51,6 +51,7 @@ API.v1.addRoute(
 				'Livechat_background',
 				'Livechat_widget_position',
 				'Livechat_hide_system_messages',
+				'Omnichannel_allow_visitors_to_close_conversation',
 			];
 
 			const valid = settings.every((setting) => validSettingList.includes(setting._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/api/lib/appearance.ts b/apps/meteor/app/livechat/server/api/lib/appearance.ts
index 785413ead9d1..0fc7d3547b2c 100644
--- a/apps/meteor/app/livechat/server/api/lib/appearance.ts
+++ b/apps/meteor/app/livechat/server/api/lib/appearance.ts
@@ -28,6 +28,7 @@ export async function findAppearance(): Promise<{ appearance: ISetting[] }> {
 				'Livechat_background',
 				'Livechat_widget_position',
 				'Livechat_hide_system_messages',
+				'Omnichannel_allow_visitors_to_close_conversation',
 			],
 		},
 	};
diff --git a/apps/meteor/app/livechat/server/api/lib/livechat.ts b/apps/meteor/app/livechat/server/api/lib/livechat.ts
index a922edd40899..8041566d796e 100644
--- a/apps/meteor/app/livechat/server/api/lib/livechat.ts
+++ b/apps/meteor/app/livechat/server/api/lib/livechat.ts
@@ -142,6 +142,7 @@ export async function settings({ businessUnit = '' }: { businessUnit?: string }
 			hiddenSystemMessages: initSettings.Livechat_hide_system_messages,
 			livechatLogo: initSettings.Assets_livechat_widget_logo,
 			hideWatermark: initSettings.Livechat_hide_watermark || false,
+			visitorsCanCloseChat: initSettings.Omnichannel_allow_visitors_to_close_conversation,
 		},
 		theme: {
 			title: initSettings.Livechat_title,
diff --git a/apps/meteor/app/livechat/server/api/v1/contact.ts b/apps/meteor/app/livechat/server/api/v1/contact.ts
index 57c1d117f1b0..f3fec80b23fe 100644
--- a/apps/meteor/app/livechat/server/api/v1/contact.ts
+++ b/apps/meteor/app/livechat/server/api/v1/contact.ts
@@ -1,14 +1,22 @@
-import { LivechatCustomField, LivechatVisitors } from '@rocket.chat/models';
+import { LivechatContacts, LivechatCustomField, LivechatVisitors } from '@rocket.chat/models';
+import {
+	isPOSTOmnichannelContactsProps,
+	isPOSTUpdateOmnichannelContactsProps,
+	isGETOmnichannelContactsProps,
+} from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { API } from '../../../../api/server';
-import { Contacts } from '../../lib/Contacts';
+import { Contacts, createContact, updateContact } from '../../lib/Contacts';
 
 API.v1.addRoute(
 	'omnichannel/contact',
-	{ authRequired: true, permissionsRequired: ['view-l-room'] },
+	{
+		authRequired: true,
+		permissionsRequired: ['view-l-room'],
+	},
 	{
 		async post() {
 			check(this.bodyParams, {
@@ -82,3 +90,49 @@ API.v1.addRoute(
 		},
 	},
 );
+
+API.v1.addRoute(
+	'omnichannel/contacts',
+	{ authRequired: true, permissionsRequired: ['create-livechat-contact'], validateParams: isPOSTOmnichannelContactsProps },
+	{
+		async post() {
+			if (process.env.TEST_MODE?.toUpperCase() !== 'TRUE') {
+				throw new Meteor.Error('error-not-allowed', 'This endpoint is only allowed in test mode');
+			}
+			const contactId = await createContact({ ...this.bodyParams, unknown: false });
+
+			return API.v1.success({ contactId });
+		},
+	},
+);
+
+API.v1.addRoute(
+	'omnichannel/contacts.update',
+	{ authRequired: true, permissionsRequired: ['update-livechat-contact'], validateParams: isPOSTUpdateOmnichannelContactsProps },
+	{
+		async post() {
+			if (process.env.TEST_MODE?.toUpperCase() !== 'TRUE') {
+				throw new Meteor.Error('error-not-allowed', 'This endpoint is only allowed in test mode');
+			}
+
+			const contact = await updateContact({ ...this.bodyParams });
+
+			return API.v1.success({ contact });
+		},
+	},
+);
+
+API.v1.addRoute(
+	'omnichannel/contacts.get',
+	{ authRequired: true, permissionsRequired: ['view-livechat-contact'], validateParams: isGETOmnichannelContactsProps },
+	{
+		async get() {
+			if (process.env.TEST_MODE?.toUpperCase() !== 'TRUE') {
+				throw new Meteor.Error('error-not-allowed', 'This endpoint is only allowed in test mode');
+			}
+			const contact = await LivechatContacts.findOneById(this.queryParams.contactId);
+
+			return API.v1.success({ contact });
+		},
+	},
+);
diff --git a/apps/meteor/app/livechat/server/api/v1/room.ts b/apps/meteor/app/livechat/server/api/v1/room.ts
index 565f8e0bb3f4..7aacfacb4476 100644
--- a/apps/meteor/app/livechat/server/api/v1/room.ts
+++ b/apps/meteor/app/livechat/server/api/v1/room.ts
@@ -107,6 +107,10 @@ API.v1.addRoute(
 		async post() {
 			const { rid, token } = this.bodyParams;
 
+			if (!rcSettings.get('Omnichannel_allow_visitors_to_close_conversation')) {
+				throw new Error('error-not-allowed-to-close-conversation');
+			}
+
 			const visitor = await findGuest(token);
 			if (!visitor) {
 				throw new Error('invalid-token');
diff --git a/apps/meteor/app/livechat/server/lib/Contacts.ts b/apps/meteor/app/livechat/server/lib/Contacts.ts
index c20b5dbdb661..f6f812ce8af8 100644
--- a/apps/meteor/app/livechat/server/lib/Contacts.ts
+++ b/apps/meteor/app/livechat/server/lib/Contacts.ts
@@ -1,5 +1,21 @@
-import type { ILivechatCustomField, ILivechatVisitor, IOmnichannelRoom } from '@rocket.chat/core-typings';
-import { LivechatVisitors, Users, LivechatRooms, LivechatCustomField, LivechatInquiry, Rooms, Subscriptions } from '@rocket.chat/models';
+import type {
+	ILivechatContact,
+	ILivechatContactChannel,
+	ILivechatCustomField,
+	ILivechatVisitor,
+	IOmnichannelRoom,
+	IUser,
+} from '@rocket.chat/core-typings';
+import {
+	LivechatVisitors,
+	Users,
+	LivechatRooms,
+	LivechatCustomField,
+	LivechatInquiry,
+	Rooms,
+	Subscriptions,
+	LivechatContacts,
+} from '@rocket.chat/models';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import type { MatchKeysAndValues, OnlyFieldsOfType } from 'mongodb';
@@ -26,6 +42,26 @@ type RegisterContactProps = {
 	};
 };
 
+type CreateContactParams = {
+	name: string;
+	emails?: string[];
+	phones?: string[];
+	unknown: boolean;
+	customFields?: Record<string, string | unknown>;
+	contactManager?: string;
+	channels?: ILivechatContactChannel[];
+};
+
+type UpdateContactParams = {
+	contactId: string;
+	name?: string;
+	emails?: string[];
+	phones?: string[];
+	customFields?: Record<string, unknown>;
+	contactManager?: string;
+	channels?: ILivechatContactChannel[];
+};
+
 export const Contacts = {
 	async registerContact({
 		token,
@@ -165,3 +201,99 @@ export const Contacts = {
 		return contactId;
 	},
 };
+
+export async function createContact(params: CreateContactParams): Promise<string> {
+	const { name, emails, phones, customFields = {}, contactManager, channels, unknown } = params;
+
+	if (contactManager) {
+		await validateContactManager(contactManager);
+	}
+
+	const allowedCustomFields = await getAllowedCustomFields();
+	validateCustomFields(allowedCustomFields, customFields);
+
+	const { insertedId } = await LivechatContacts.insertOne({
+		name,
+		emails,
+		phones,
+		contactManager,
+		channels,
+		customFields,
+		unknown,
+	});
+
+	return insertedId;
+}
+
+export async function updateContact(params: UpdateContactParams): Promise<ILivechatContact> {
+	const { contactId, name, emails, phones, customFields, contactManager, channels } = params;
+
+	const contact = await LivechatContacts.findOneById<Pick<ILivechatContact, '_id'>>(contactId, { projection: { _id: 1 } });
+
+	if (!contact) {
+		throw new Error('error-contact-not-found');
+	}
+
+	if (contactManager) {
+		await validateContactManager(contactManager);
+	}
+
+	if (customFields) {
+		const allowedCustomFields = await getAllowedCustomFields();
+		validateCustomFields(allowedCustomFields, customFields);
+	}
+
+	const updatedContact = await LivechatContacts.updateContact(contactId, { name, emails, phones, contactManager, channels, customFields });
+
+	return updatedContact;
+}
+
+async function getAllowedCustomFields(): Promise<ILivechatCustomField[]> {
+	return LivechatCustomField.findByScope(
+		'visitor',
+		{
+			projection: { _id: 1, label: 1, regexp: 1, required: 1 },
+		},
+		false,
+	).toArray();
+}
+
+export function validateCustomFields(allowedCustomFields: ILivechatCustomField[], customFields: Record<string, string | unknown>) {
+	for (const cf of allowedCustomFields) {
+		if (!customFields.hasOwnProperty(cf._id)) {
+			if (cf.required) {
+				throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
+			}
+			continue;
+		}
+		const cfValue: string = trim(customFields[cf._id]);
+
+		if (!cfValue || typeof cfValue !== 'string') {
+			if (cf.required) {
+				throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
+			}
+			continue;
+		}
+
+		if (cf.regexp) {
+			const regex = new RegExp(cf.regexp);
+			if (!regex.test(cfValue)) {
+				throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
+			}
+		}
+	}
+
+	const allowedCustomFieldIds = new Set(allowedCustomFields.map((cf) => cf._id));
+	for (const key in customFields) {
+		if (!allowedCustomFieldIds.has(key)) {
+			throw new Error(i18n.t('error-custom-field-not-allowed', { key }));
+		}
+	}
+}
+
+export async function validateContactManager(contactManagerUserId: string) {
+	const contactManagerUser = await Users.findOneAgentById<Pick<IUser, '_id'>>(contactManagerUserId, { projection: { _id: 1 } });
+	if (!contactManagerUser) {
+		throw new Error('error-contact-manager-not-found');
+	}
+}
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index be79d565f6de..6c2d655f4c95 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -71,6 +71,7 @@ import * as Mailer from '../../../mailer/server/api';
 import { metrics } from '../../../metrics/server';
 import { settings } from '../../../settings/server';
 import { businessHourManager } from '../business-hour';
+import { createContact } from './Contacts';
 import { parseAgentCustomFields, updateDepartmentAgents, validateEmail, normalizeTransferredByData } from './Helper';
 import { QueueManager } from './QueueManager';
 import { RoutingManager } from './RoutingManager';
@@ -588,6 +589,10 @@ class LivechatClass {
 		}
 	}
 
+	isValidObject(obj: unknown): obj is Record<string, any> {
+		return typeof obj === 'object' && obj !== null;
+	}
+
 	async registerGuest({
 		id,
 		token,
@@ -653,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;
@@ -664,6 +669,16 @@ class LivechatClass {
 			}
 		}
 
+		if (process.env.TEST_MODE?.toUpperCase() === 'TRUE') {
+			const contactId = await createContact({
+				name: name ?? (visitorDataToUpdate.username as string),
+				emails: email ? [email] : [],
+				phones: phone ? [phone.number] : [],
+				unknown: true,
+			});
+			visitorDataToUpdate.contactId = contactId;
+		}
+
 		const upsertedLivechatVisitor = await LivechatVisitors.updateOneByIdOrToken(visitorDataToUpdate, {
 			upsert: true,
 			returnDocument: 'after',
@@ -1068,6 +1083,7 @@ class LivechatClass {
 			'Livechat_background',
 			'Assets_livechat_widget_logo',
 			'Livechat_hide_watermark',
+			'Omnichannel_allow_visitors_to_close_conversation',
 		] as const;
 
 		type SettingTypes = (typeof validSettings)[number] | 'Livechat_Show_Connecting';
@@ -1777,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 } }) : null;
+		const department = _id
+			? await LivechatDepartment.findOneById(_id, { projection: { _id: 1, archived: 1, enabled: 1, parentId: 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', {
@@ -1875,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/models/client/index.ts b/apps/meteor/app/models/client/index.ts
index 354baa2b71fd..397a1e45bb18 100644
--- a/apps/meteor/app/models/client/index.ts
+++ b/apps/meteor/app/models/client/index.ts
@@ -11,7 +11,6 @@ import CustomSounds from './models/CustomSounds';
 import EmojiCustom from './models/EmojiCustom';
 import { Roles } from './models/Roles';
 import { RoomRoles } from './models/RoomRoles';
-import { UserAndRoom } from './models/UserAndRoom';
 import { UserRoles } from './models/UserRoles';
 import { Users } from './models/Users';
 
@@ -23,22 +22,21 @@ export {
 	CachedChatSubscription,
 	CachedUserList,
 	RoomRoles,
-	UserAndRoom,
 	UserRoles,
 	AuthzCachedCollection,
 	ChatPermissions,
 	CustomSounds,
 	EmojiCustom,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	Users,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	ChatRoom,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	ChatSubscription,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	ChatSubscription as Subscriptions,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	ChatMessage,
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	ChatMessage as Messages,
 };
diff --git a/apps/meteor/app/models/client/models/CachedChatRoom.ts b/apps/meteor/app/models/client/models/CachedChatRoom.ts
index f66e5b447432..248b68554583 100644
--- a/apps/meteor/app/models/client/models/CachedChatRoom.ts
+++ b/apps/meteor/app/models/client/models/CachedChatRoom.ts
@@ -46,7 +46,6 @@ class CachedChatRoom extends CachedCollection<IRoom> {
 					usernames: room.usernames,
 					usersCount: room.usersCount,
 					lastMessage: room.lastMessage,
-					streamingOptions: room.streamingOptions,
 					teamId: room.teamId,
 					teamMain: room.teamMain,
 					v: (room as IOmnichannelRoom | undefined)?.v,
@@ -111,6 +110,6 @@ class CachedChatRoom extends CachedCollection<IRoom> {
 const instance = new CachedChatRoom();
 
 export {
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	instance as CachedChatRoom,
 };
diff --git a/apps/meteor/app/models/client/models/CachedChatSubscription.ts b/apps/meteor/app/models/client/models/CachedChatSubscription.ts
index 0e325453539a..d17493e57f2e 100644
--- a/apps/meteor/app/models/client/models/CachedChatSubscription.ts
+++ b/apps/meteor/app/models/client/models/CachedChatSubscription.ts
@@ -35,7 +35,6 @@ class CachedChatSubscription extends CachedCollection<SubscriptionWithRoom, ISub
 				lm: 1,
 				lastMessage: 1,
 				uids: 1,
-				streamingOptions: 1,
 				usernames: 1,
 				usersCount: 1,
 				topic: 1,
@@ -96,7 +95,6 @@ class CachedChatSubscription extends CachedCollection<SubscriptionWithRoom, ISub
 			avatarETag: room?.avatarETag,
 			retention: (room as IRoomWithRetentionPolicy | undefined)?.retention,
 			lastMessage: room?.lastMessage,
-			streamingOptions: room?.streamingOptions,
 			teamId: room?.teamId,
 			teamMain: room?.teamMain,
 			uids: room?.uids,
@@ -141,6 +139,6 @@ class CachedChatSubscription extends CachedCollection<SubscriptionWithRoom, ISub
 const instance = new CachedChatSubscription();
 
 export {
-	/** @deprecated */
+	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	instance as CachedChatSubscription,
 };
diff --git a/apps/meteor/app/models/client/models/ChatMessage.ts b/apps/meteor/app/models/client/models/ChatMessage.ts
index bd8852a70662..1e9b066bdaaa 100644
--- a/apps/meteor/app/models/client/models/ChatMessage.ts
+++ b/apps/meteor/app/models/client/models/ChatMessage.ts
@@ -25,5 +25,5 @@ class ChatMessageCollection
 	public declare queries: MinimongoCollection<IMessage & { ignored?: boolean }>['queries'];
 }
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const ChatMessage = new ChatMessageCollection();
diff --git a/apps/meteor/app/models/client/models/ChatRoom.ts b/apps/meteor/app/models/client/models/ChatRoom.ts
index 00528233daed..f23f20e8048e 100644
--- a/apps/meteor/app/models/client/models/ChatRoom.ts
+++ b/apps/meteor/app/models/client/models/ChatRoom.ts
@@ -2,7 +2,7 @@ import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 
 import { CachedChatRoom } from './CachedChatRoom';
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const ChatRoom = Object.assign(CachedChatRoom.collection, {
 	setReactionsInLastMessage(this: typeof CachedChatRoom.collection, roomId: IRoom['_id'], lastMessage: IMessage) {
 		return this.update({ _id: roomId }, { $set: { lastMessage } });
diff --git a/apps/meteor/app/models/client/models/ChatSubscription.ts b/apps/meteor/app/models/client/models/ChatSubscription.ts
index 023f9d8f4649..aa7892fe5031 100644
--- a/apps/meteor/app/models/client/models/ChatSubscription.ts
+++ b/apps/meteor/app/models/client/models/ChatSubscription.ts
@@ -6,7 +6,7 @@ import type { Filter } from 'mongodb';
 import { isTruthy } from '../../../../lib/isTruthy';
 import { CachedChatSubscription } from './CachedChatSubscription';
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const ChatSubscription = Object.assign(CachedChatSubscription.collection, {
 	isUserInRole: mem(
 		function (this: typeof CachedChatSubscription.collection, _uid: IUser['_id'], roleId: IRole['_id'], rid?: IRoom['_id']) {
diff --git a/apps/meteor/app/models/client/models/Roles.ts b/apps/meteor/app/models/client/models/Roles.ts
index 475c0465c7cc..a048905cd2b4 100644
--- a/apps/meteor/app/models/client/models/Roles.ts
+++ b/apps/meteor/app/models/client/models/Roles.ts
@@ -53,5 +53,5 @@ class RolesCollection extends Mongo.Collection<IRole> implements MinimongoCollec
 	public declare queries: MinimongoCollection<IRole>['queries'];
 }
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const Roles = new RolesCollection();
diff --git a/apps/meteor/app/models/client/models/RoomRoles.ts b/apps/meteor/app/models/client/models/RoomRoles.ts
index bb9fabbedbf2..ab347a59eada 100644
--- a/apps/meteor/app/models/client/models/RoomRoles.ts
+++ b/apps/meteor/app/models/client/models/RoomRoles.ts
@@ -1,5 +1,5 @@
 import type { ISubscription } from '@rocket.chat/core-typings';
 import { Mongo } from 'meteor/mongo';
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const RoomRoles = new Mongo.Collection<Pick<ISubscription, '_id' | 'rid' | 'u' | 'roles'>>(null);
diff --git a/apps/meteor/app/models/client/models/UserAndRoom.ts b/apps/meteor/app/models/client/models/UserAndRoom.ts
deleted file mode 100644
index f43b2c0fdbe0..000000000000
--- a/apps/meteor/app/models/client/models/UserAndRoom.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Mongo } from 'meteor/mongo';
-
-export const UserAndRoom = new Mongo.Collection(null);
diff --git a/apps/meteor/app/models/client/models/UserRoles.ts b/apps/meteor/app/models/client/models/UserRoles.ts
index 9e68239bdb44..04a1710e8b9c 100644
--- a/apps/meteor/app/models/client/models/UserRoles.ts
+++ b/apps/meteor/app/models/client/models/UserRoles.ts
@@ -1,7 +1,7 @@
 import type { IRocketChatRecord, IRole } from '@rocket.chat/core-typings';
 import { Mongo } from 'meteor/mongo';
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const UserRoles = new Mongo.Collection<
 	IRocketChatRecord & {
 		roles?: IRole['_id'][];
diff --git a/apps/meteor/app/models/client/models/Users.ts b/apps/meteor/app/models/client/models/Users.ts
index 26d333cc8bb1..e2d8c7856752 100644
--- a/apps/meteor/app/models/client/models/Users.ts
+++ b/apps/meteor/app/models/client/models/Users.ts
@@ -38,5 +38,5 @@ Object.assign(Meteor.users, {
 	remove: UsersCollection.prototype.remove,
 });
 
-/** @deprecated */
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 export const Users = Meteor.users as UsersCollection;
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/statistics/server/lib/statistics.ts b/apps/meteor/app/statistics/server/lib/statistics.ts
index cff2aaefcc5a..e5001b2bff87 100644
--- a/apps/meteor/app/statistics/server/lib/statistics.ts
+++ b/apps/meteor/app/statistics/server/lib/statistics.ts
@@ -542,7 +542,6 @@ export const statistics = {
 		statistics.totalOTRRooms = await Rooms.findByCreatedOTR().count();
 		statistics.totalOTR = settings.get('OTR_Count');
 		statistics.totalBroadcastRooms = await Rooms.findByBroadcast().count();
-		statistics.totalRoomsWithActiveLivestream = await Rooms.findByActiveLivestream().count();
 		statistics.totalTriggeredEmails = settings.get('Triggered_Emails_Count');
 		statistics.totalRoomsWithStarred = await Messages.countRoomsWithStarredMessages({ readPreference });
 		statistics.totalRoomsWithPinned = await Messages.countRoomsWithPinnedMessages({ readPreference });
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/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 7285c1c94e10..19164d07ee1b 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.12.1"
+	"version": "6.13.0-rc.6"
 }
diff --git a/apps/meteor/app/utils/server/functions/getBaseUserFields.ts b/apps/meteor/app/utils/server/functions/getBaseUserFields.ts
new file mode 100644
index 000000000000..5e2a3bf2b4d7
--- /dev/null
+++ b/apps/meteor/app/utils/server/functions/getBaseUserFields.ts
@@ -0,0 +1,34 @@
+type UserFields = {
+	[k: string]: number;
+};
+
+export const getBaseUserFields = (): UserFields => ({
+	'name': 1,
+	'username': 1,
+	'nickname': 1,
+	'emails': 1,
+	'status': 1,
+	'statusDefault': 1,
+	'statusText': 1,
+	'statusConnection': 1,
+	'bio': 1,
+	'avatarOrigin': 1,
+	'utcOffset': 1,
+	'language': 1,
+	'settings': 1,
+	'enableAutoAway': 1,
+	'idleTimeLimit': 1,
+	'roles': 1,
+	'active': 1,
+	'defaultRoom': 1,
+	'customFields': 1,
+	'requirePasswordChange': 1,
+	'requirePasswordChangeReason': 1,
+	'statusLivechat': 1,
+	'banners': 1,
+	'oauth.authorizedClients': 1,
+	'_updatedAt': 1,
+	'avatarETag': 1,
+	'extension': 1,
+	'openBusinessHours': 1,
+});
diff --git a/apps/meteor/app/utils/server/functions/getDefaultUserFields.ts b/apps/meteor/app/utils/server/functions/getDefaultUserFields.ts
index 03d0cae77ab9..293eb8607342 100644
--- a/apps/meteor/app/utils/server/functions/getDefaultUserFields.ts
+++ b/apps/meteor/app/utils/server/functions/getDefaultUserFields.ts
@@ -1,39 +1,14 @@
-type DefaultUserFields = {
+import { getBaseUserFields } from './getBaseUserFields';
+
+type UserFields = {
 	[k: string]: number;
 };
 
-export const getDefaultUserFields = (): DefaultUserFields => ({
-	'name': 1,
-	'username': 1,
-	'nickname': 1,
-	'emails': 1,
-	'status': 1,
-	'statusDefault': 1,
-	'statusText': 1,
-	'statusConnection': 1,
-	'bio': 1,
-	'avatarOrigin': 1,
-	'utcOffset': 1,
-	'language': 1,
-	'settings': 1,
-	'enableAutoAway': 1,
-	'idleTimeLimit': 1,
-	'roles': 1,
-	'active': 1,
-	'defaultRoom': 1,
-	'customFields': 1,
-	'requirePasswordChange': 1,
-	'requirePasswordChangeReason': 1,
+export const getDefaultUserFields = (): UserFields => ({
+	...getBaseUserFields(),
 	'services.github': 1,
 	'services.gitlab': 1,
 	'services.password.bcrypt': 1,
 	'services.totp.enabled': 1,
 	'services.email2fa.enabled': 1,
-	'statusLivechat': 1,
-	'banners': 1,
-	'oauth.authorizedClients': 1,
-	'_updatedAt': 1,
-	'avatarETag': 1,
-	'extension': 1,
-	'openBusinessHours': 1,
 });
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/NavBarPagesToolbar/NavBarItemAuditMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx
index 07936f6f4276..7c8a50338e7d 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx
@@ -1,9 +1,9 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useCurrentRoutePath, useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
 import { useAuditMenu } from './hooks/useAuditMenu';
 
 type NavBarItemAuditMenuProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx
index 4a2bbc916b57..85687bb12a2e 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx
@@ -1,9 +1,9 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useCurrentRoutePath, useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
 import { useMarketPlaceMenu } from './hooks/useMarketPlaceMenu';
 
 type NavBarItemMarketPlaceMenuProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx
index 88a2a5de31aa..97c8d7299497 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx
@@ -1,6 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { usePermission, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 
 export const useAuditMenu = () => {
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.tsx
index fd704ffafe1f..034ab0367e81 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.tsx
@@ -1,8 +1,8 @@
 import { Badge, Skeleton } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, usePermission, useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
 import { useUserDropdownAppsActionButtons } from '../../../hooks/useAppActionButtons';
 import { useAppRequestStats } from '../../../views/marketplace/hooks/useAppRequestStats';
 
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx
index 045b36425512..8236eec030e8 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx
@@ -1,9 +1,9 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useCurrentRoutePath, useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
 import { useAdministrationMenu } from './hooks/useAdministrationMenu';
 
 type NavBarItemAdministrationMenuProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
index 531ff8a74b66..22895d55388f 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
@@ -1,11 +1,10 @@
 import type { IUser } from '@rocket.chat/core-typings';
+import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo, useState } from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
-import { useHandleMenuAction } from '../../../components/GenericMenu/hooks/useHandleMenuAction';
 import UserMenuButton from './UserMenuButton';
 import { useUserMenu } from './hooks/useUserMenu';
 
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
index bf1b7e55f244..e54e2b72d675 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
@@ -1,16 +1,15 @@
 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';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 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/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
index 2957d22c5e32..1c9cf09e4610 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
@@ -1,11 +1,11 @@
 import { Box } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useSetting } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { callbacks } from '../../../../../lib/callbacks';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import MarkdownText from '../../../../components/MarkdownText';
 import { UserStatus } from '../../../../components/UserStatus';
 import { userStatuses } from '../../../../lib/userStatuses';
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
index a969c853d797..85a481f3e257 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
@@ -1,9 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLogout, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import UserMenuHeader from '../UserMenuHeader';
 import { useAccountItems } from './useAccountItems';
 import { useStatusItems } from './useStatusItems';
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx
index 54d4818128ea..e3c4a358c7c1 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx
@@ -1,7 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useAtLeastOnePermission, usePermission, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
-
 const ADMIN_PERMISSIONS = [
 	'view-statistics',
 	'run-import',
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/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
index cd39a187cd89..b1dcb9d8dfbc 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
@@ -120,7 +120,7 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
 								<Controller
 									control={control}
 									name='parentRoom'
-									rules={{ required: t('error-the-field-is-required', { field: t('Discussion_target_channel') }) }}
+									rules={{ required: t('Required_field', { field: t('Discussion_target_channel') }) }}
 									render={({ field: { name, onBlur, onChange, value } }) => (
 										<RoomAutoComplete
 											name={name}
@@ -152,7 +152,7 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
 							<Controller
 								name='name'
 								control={control}
-								rules={{ required: t('Field_required') }}
+								rules={{ required: t('Required_field', { field: t('Name') }) }}
 								render={({ field }) => (
 									<TextInput
 										id={discussionNameId}
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..69e7a8c25cd2
--- /dev/null
+++ b/apps/meteor/client/components/MarkdownText.spec.tsx
@@ -0,0 +1,104 @@
+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'
+  \`\`\`
+  **Bold text within __Italics__**
+  *Bold text with single asterik and underscore within _Italics_*
+  __Italics within **Bold** text__
+  _Italics within *Bold* text with single underscore and asterik_
+`;
+
+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>');
+	expect(normalizedHtml).toContain('<strong>Bold text within <em>Italics</em></strong>');
+	expect(normalizedHtml).toContain('<strong>Bold text with single asterik and underscore within <em>Italics</em></strong>');
+	expect(normalizedHtml).toContain('<em>Italics within <strong>Bold</strong> text</em>');
+	expect(normalizedHtml).toContain('<em>Italics within <strong>Bold</strong> text with single underscore and asterik</em>');
+});
+
+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'`);
+	expect(normalizedHtml).toContain('<strong>Bold text within <em>Italics</em></strong>');
+	expect(normalizedHtml).toContain('<strong>Bold text with single asterik and underscore within <em>Italics</em></strong>');
+	expect(normalizedHtml).toContain('<em>Italics within <strong>Bold</strong> text</em>');
+	expect(normalizedHtml).toContain('<em>Italics within <strong>Bold</strong> text with single underscore and asterik</em>');
+});
diff --git a/apps/meteor/client/components/MarkdownText.tsx b/apps/meteor/client/components/MarkdownText.tsx
index c9af942f6e1c..16bd1b71430a 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 === 'em') {
+		token.type = 'strong' as 'em';
+	} else if (italicPattern.test(token.raw) && token.type === 'strong') {
+		token.type = 'em' as 'strong';
+	}
 };
 
+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/Omnichannel/modals/CloseChatModal.tsx b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
index 7c028fb5c876..489eb4a04602 100644
--- a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
@@ -84,11 +84,11 @@ const CloseChatModal = ({
 			const requestData = transcriptEmail && visitorEmail ? { email: visitorEmail, subject } : undefined;
 
 			if (!comment?.trim() && commentRequired) {
-				setError('comment', { type: 'custom', message: t('The_field_is_required', t('Comment')) });
+				setError('comment', { type: 'custom', message: t('Required_field', { field: t('Comment') }) });
 			}
 
 			if (transcriptEmail && !subject) {
-				setError('subject', { type: 'custom', message: t('The_field_is_required', t('Subject')) });
+				setError('subject', { type: 'custom', message: t('Required_field', { field: t('Subject') }) });
 			}
 
 			if (!tags?.length && tagRequired) {
@@ -154,12 +154,7 @@ const CloseChatModal = ({
 							<FieldRow>
 								<TextInput
 									{...register('comment')}
-									error={
-										errors.comment &&
-										t('error-the-field-is-required', {
-											field: t('Comment'),
-										})
-									}
+									error={errors.comment && t('Required_field', { field: t('Comment') })}
 									flexGrow={1}
 									placeholder={t('Please_add_a_comment')}
 								/>
@@ -206,12 +201,7 @@ const CloseChatModal = ({
 														<TextInput
 															{...register('subject', { required: true })}
 															className='active'
-															error={
-																errors.subject &&
-																t('error-the-field-is-required', {
-																	field: t('Subject'),
-																})
-															}
+															error={errors.subject && t('Required_field', { field: t('Subject') })}
 															flexGrow={1}
 														/>
 													</FieldRow>
diff --git a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
index c06b6a190465..67deb558c1ed 100644
--- a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
@@ -74,7 +74,7 @@ const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, on
 								disabled={!!emailDefault || !!transcriptRequest}
 								error={errors.email?.message}
 								flexGrow={1}
-								{...register('email', { required: t('The_field_is_required', t('Email')) })}
+								{...register('email', { required: t('Required_field', { field: t('Email') }) })}
 							/>
 						</FieldRow>
 						<FieldError>{errors.email?.message}</FieldError>
@@ -86,7 +86,7 @@ const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, on
 								disabled={!!transcriptRequest}
 								error={errors.subject?.message}
 								flexGrow={1}
-								{...register('subject', { required: t('The_field_is_required', t('Subject')) })}
+								{...register('subject', { required: t('Required_field', { field: t('Subject') }) })}
 							/>
 						</FieldRow>
 						<FieldError>{errors.subject?.message}</FieldError>
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx
index 60f3af65eb9d..6a841c30491b 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx
@@ -1,53 +1,29 @@
-import { UserStatus, type IOmnichannelRoomFromAppSource } from '@rocket.chat/core-typings';
+import { type IOmnichannelSourceFromApp } from '@rocket.chat/core-typings';
 import { Icon, Box } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import React from 'react';
 
 import { AsyncStatePhase } from '../../../lib/asyncState/AsyncStatePhase';
 import { useOmnichannelRoomIcon } from './context/OmnichannelRoomIconContext';
 
-const colors = {
-	busy: 'status-font-on-danger',
-	away: 'status-font-on-warning',
-	online: 'status-font-on-success',
-	offline: 'annotation',
-	disabled: 'annotation',
+type OmnichannelAppSourceRoomIconProps = {
+	source: IOmnichannelSourceFromApp;
+	color: ComponentProps<typeof Box>['color'];
+	size: ComponentProps<typeof Icon>['size'];
+	placement: 'sidebar' | 'default';
 };
 
-const convertBoxSizeToNumber = (boxSize: ComponentProps<typeof Icon>['size']): number => {
-	switch (boxSize) {
-		case 'x20': {
-			return 20;
-		}
-		case 'x24': {
-			return 24;
-		}
-		case 'x16':
-		default: {
-			return 16;
-		}
-	}
-};
+export const OmnichannelAppSourceRoomIcon = ({ source, color, size, placement }: OmnichannelAppSourceRoomIconProps) => {
+	const icon = (placement === 'sidebar' && source.sidebarIcon) || source.defaultIcon;
+	const { phase, value } = useOmnichannelRoomIcon(source.id, icon || '');
 
-export const OmnichannelAppSourceRoomIcon = ({
-	room,
-	size = 16,
-	placement = 'default',
-}: {
-	room: IOmnichannelRoomFromAppSource;
-	size: ComponentProps<typeof Icon>['size'];
-	placement: 'sidebar' | 'default';
-}): ReactElement => {
-	const color = colors[room.v.status || UserStatus.OFFLINE];
-	const icon = (placement === 'sidebar' && room.source.sidebarIcon) || room.source.defaultIcon;
-	const { phase, value } = useOmnichannelRoomIcon(room.source.id, icon || '');
-	const fontSize = convertBoxSizeToNumber(size);
 	if ([AsyncStatePhase.REJECTED, AsyncStatePhase.LOADING].includes(phase)) {
 		return <Icon name='headset' size={size} color={color} />;
 	}
+
 	return (
-		<Box size={fontSize} color={color}>
-			<Box is='svg' size={fontSize} aria-hidden='true'>
+		<Box size={size} color={color}>
+			<Box is='svg' size={size} aria-hidden='true'>
 				<Box is='use' href={`#${value}`} />
 			</Box>
 		</Box>
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelCoreSourceRoomIcon.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelCoreSourceRoomIcon.tsx
index 03a49e26cf9d..dd93771a55ca 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelCoreSourceRoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelCoreSourceRoomIcon.tsx
@@ -1,16 +1,8 @@
-import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { IOmnichannelSource } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import React from 'react';
 
-const colors = {
-	busy: 'status-font-on-danger',
-	away: 'status-font-on-warning',
-	online: 'status-font-on-success',
-	offline: 'annotation',
-	disabled: 'annotation',
-};
-
 const iconMap = {
 	widget: 'livechat',
 	email: 'mail',
@@ -20,13 +12,13 @@ const iconMap = {
 	other: 'headset',
 } as const;
 
-export const OmnichannelCoreSourceRoomIcon = ({
-	room,
-	size = 'x16',
-}: {
-	room: IOmnichannelRoom;
+type OmnichannelCoreSourceRoomIconProps = {
+	source: IOmnichannelSource;
+	color: ComponentProps<typeof Icon>['color'];
 	size: ComponentProps<typeof Icon>['size'];
-}): ReactElement => {
-	const icon = iconMap[room.source?.type || 'other'] || 'headset';
-	return <Icon name={icon} size={size} color={colors[room.v?.status || 'offline']} />;
+};
+
+export const OmnichannelCoreSourceRoomIcon = ({ source, color, size }: OmnichannelCoreSourceRoomIconProps) => {
+	const icon = iconMap[source?.type || 'other'] || 'headset';
+	return <Icon name={icon} size={size} color={color} />;
 };
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelRoomIcon.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelRoomIcon.tsx
index 5542d7bf2333..51f466c7f477 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelRoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelRoomIcon.tsx
@@ -1,23 +1,34 @@
-import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
-import { isOmnichannelRoomFromAppSource } from '@rocket.chat/core-typings';
+import type { IOmnichannelSource } from '@rocket.chat/core-typings';
+import { UserStatus, isOmnichannelSourceFromApp } from '@rocket.chat/core-typings';
 import type { Icon } from '@rocket.chat/fuselage';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import React from 'react';
 
 import { OmnichannelAppSourceRoomIcon } from './OmnichannelAppSourceRoomIcon';
 import { OmnichannelCoreSourceRoomIcon } from './OmnichannelCoreSourceRoomIcon';
 
-export const OmnichannelRoomIcon = ({
-	room,
-	size,
-	placement = 'default',
-}: {
-	room: IOmnichannelRoom;
+const colors = {
+	busy: 'status-font-on-danger',
+	away: 'status-font-on-warning',
+	online: 'status-font-on-success',
+	offline: 'annotation',
+	disabled: 'annotation',
+} as const;
+
+type OmnichannelRoomIconProps = {
+	source: IOmnichannelSource;
+	color?: ComponentProps<typeof Icon>['color'];
+	status?: UserStatus;
 	size: ComponentProps<typeof Icon>['size'];
-	placement: 'sidebar' | 'default';
-}): ReactElement => {
-	if (isOmnichannelRoomFromAppSource(room)) {
-		return <OmnichannelAppSourceRoomIcon placement={placement} room={room} size={size} />;
+	placement?: 'sidebar' | 'default';
+};
+
+export const OmnichannelRoomIcon = ({ source, color, status, size = 'x16', placement = 'default' }: OmnichannelRoomIconProps) => {
+	const iconColor = color ?? colors[status || UserStatus.OFFLINE];
+
+	if (isOmnichannelSourceFromApp(source)) {
+		return <OmnichannelAppSourceRoomIcon source={source} placement={placement} color={iconColor} size={size} />;
 	}
-	return <OmnichannelCoreSourceRoomIcon room={room} size={size} />;
+
+	return <OmnichannelCoreSourceRoomIcon source={source} color={iconColor} size={size} />;
 };
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/lib/OmnichannelRoomIcon.ts b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/lib/OmnichannelRoomIconManager.ts
similarity index 88%
rename from apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/lib/OmnichannelRoomIcon.ts
rename to apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/lib/OmnichannelRoomIconManager.ts
index b0263ed9ff06..dbcdfccf933f 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/lib/OmnichannelRoomIcon.ts
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/lib/OmnichannelRoomIconManager.ts
@@ -3,7 +3,7 @@ import DOMPurify from 'dompurify';
 
 import { sdk } from '../../../../../app/utils/client/lib/SDKClient';
 
-const OmnichannelRoomIcon = new (class extends Emitter {
+const OmnichannelRoomIconManager = new (class extends Emitter {
 	icons = new Map<string, string>();
 
 	constructor() {
@@ -23,7 +23,7 @@ const OmnichannelRoomIcon = new (class extends Emitter {
 		sdk.rest
 			.send(`/apps/public/${appId}/get-sidebar-icon?icon=${icon}`, 'GET')
 			.then((response: any) => {
-				response.text().then((text: any) => {
+				response.text().then((text: string) => {
 					this.icons.set(
 						`${appId}-${icon}`,
 						DOMPurify.sanitize(text, {
@@ -44,4 +44,4 @@ const OmnichannelRoomIcon = new (class extends Emitter {
 	}
 })();
 
-export default OmnichannelRoomIcon;
+export default OmnichannelRoomIconManager;
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider.tsx
index 7ee5be7ee0e6..06d16af25794 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider.tsx
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider.tsx
@@ -6,9 +6,9 @@ import { useSyncExternalStore } from 'use-sync-external-store/shim';
 import type { AsyncState } from '../../../../lib/asyncState/AsyncState';
 import { AsyncStatePhase } from '../../../../lib/asyncState/AsyncStatePhase';
 import { OmnichannelRoomIconContext } from '../context/OmnichannelRoomIconContext';
-import OmnichannelRoomIcon from '../lib/OmnichannelRoomIcon';
+import OmnichannelRoomIconManager from '../lib/OmnichannelRoomIconManager';
 
-let icons = Array.from(OmnichannelRoomIcon.icons.values());
+let icons = Array.from(OmnichannelRoomIconManager.icons.values());
 
 type OmnichannelRoomIconProviderProps = {
 	children?: ReactNode;
@@ -18,8 +18,8 @@ export const OmnichannelRoomIconProvider = ({ children }: OmnichannelRoomIconPro
 	const svgIcons = useSyncExternalStore(
 		useCallback(
 			(callback): (() => void) =>
-				OmnichannelRoomIcon.on('change', () => {
-					icons = Array.from(OmnichannelRoomIcon.icons.values());
+				OmnichannelRoomIconManager.on('change', () => {
+					icons = Array.from(OmnichannelRoomIconManager.icons.values());
 					callback();
 				}),
 			[],
@@ -31,7 +31,7 @@ export const OmnichannelRoomIconProvider = ({ children }: OmnichannelRoomIconPro
 		<OmnichannelRoomIconContext.Provider
 			value={useMemo(() => {
 				const extractSnapshot = (app: string, iconName: string): AsyncState<string> => {
-					const icon = OmnichannelRoomIcon.get(app, iconName);
+					const icon = OmnichannelRoomIconManager.get(app, iconName);
 
 					if (icon) {
 						return {
@@ -57,7 +57,7 @@ export const OmnichannelRoomIconProvider = ({ children }: OmnichannelRoomIconPro
 						iconName: string,
 					): [subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => AsyncState<string>] => [
 						(callback): (() => void) =>
-							OmnichannelRoomIcon.on(`${app}-${iconName}`, () => {
+							OmnichannelRoomIconManager.on(`${app}-${iconName}`, () => {
 								snapshots.set(`${app}-${iconName}`, extractSnapshot(app, iconName));
 
 								// Then we call the callback (onStoreChange), signaling React to re-render
diff --git a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
index e71ed259ae69..d757071fedf5 100644
--- a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
@@ -1,4 +1,4 @@
-import type { IOmnichannelRoom, IRoom } from '@rocket.chat/core-typings';
+import type { IRoom } from '@rocket.chat/core-typings';
 import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Icon } from '@rocket.chat/fuselage';
 import type { ComponentProps, ReactElement } from 'react';
@@ -24,8 +24,8 @@ export const RoomIcon = ({
 		return <Icon name='phone' size={size} />;
 	}
 
-	if (isOmnichannelRoom(room as IRoom)) {
-		return <OmnichannelRoomIcon placement={placement} room={room as IOmnichannelRoom} size={size} />;
+	if (isOmnichannelRoom(room)) {
+		return <OmnichannelRoomIcon placement={placement} source={room.source} status={room.v?.status} size={size} />;
 	}
 
 	if (isValidElement<any>(iconPropsOrReactNode)) {
diff --git a/apps/meteor/client/components/UrlChangeModal.tsx b/apps/meteor/client/components/UrlChangeModal.tsx
index 13d0523c92aa..912a140d60f4 100644
--- a/apps/meteor/client/components/UrlChangeModal.tsx
+++ b/apps/meteor/client/components/UrlChangeModal.tsx
@@ -23,7 +23,14 @@ const UrlChangeModal = ({ onConfirm, siteUrl, currentUrl, onClose }: UrlChangeMo
 					__html: t('The_setting_s_is_configured_to_s_and_you_are_accessing_from_s', t('Site_Url'), siteUrl, currentUrl),
 				}}
 			/>
-			<p dangerouslySetInnerHTML={{ __html: t('Do_you_want_to_change_to_s_question', currentUrl) }} />
+			<p
+				dangerouslySetInnerHTML={{
+					__html: t('Do_you_want_to_change_to_s_question', {
+						postProcess: 'sprintf',
+						sprintf: [currentUrl],
+					}),
+				}}
+			/>
 		</GenericModal>
 	);
 };
diff --git a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
index 6c35f7b73dbd..155599c5b51d 100644
--- a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
@@ -1,11 +1,10 @@
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu, type GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import React from 'react';
 
 import type { MessageActionConditionProps, MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
-import GenericMenu from '../../GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../GenericMenu/GenericMenuItem';
 
 type MessageActionConfigOption = Omit<MessageActionConfig, 'condition' | 'context' | 'order' | 'action'> & {
 	action: (e?: MouseEvent<HTMLElement>) => void;
diff --git a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction.ts b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction.ts
index 9d867d571cf7..8d1fa251c051 100644
--- a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction.ts
@@ -15,7 +15,6 @@ export const useStartCallRoomAction = () => {
 	const federated = isRoomFederated(room);
 
 	const ownUser = room.uids?.length === 1 ?? false;
-	const live = room?.streamingOptions?.type === 'call' ?? false;
 
 	const permittedToPostReadonly = usePermission('post-readonly', room._id);
 	const permittedToCallManagement = usePermission('call-management', room._id);
@@ -81,8 +80,8 @@ export const useStartCallRoomAction = () => {
 				disabled: true,
 			}),
 			full: true,
-			order: live ? -1 : 4,
+			order: 4,
 			featured: true,
 		};
-	}, [allowed, disabled, groups, handleOpenVideoConf, live, t]);
+	}, [allowed, disabled, groups, handleOpenVideoConf, t]);
 };
diff --git a/apps/meteor/client/hooks/useAppActionButtons.ts b/apps/meteor/client/hooks/useAppActionButtons.ts
index 5ee20f7772bf..64c46f370a1f 100644
--- a/apps/meteor/client/hooks/useAppActionButtons.ts
+++ b/apps/meteor/client/hooks/useAppActionButtons.ts
@@ -1,5 +1,6 @@
 import type { IUIActionButton, UIActionButtonContext } from '@rocket.chat/apps-engine/definition/ui';
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useStream, useToastMessageDispatch, useUserId } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
@@ -10,7 +11,6 @@ import { UiKitTriggerTimeoutError } from '../../app/ui-message/client/UiKitTrigg
 import type { MessageActionConfig, MessageActionContext } from '../../app/ui-utils/client/lib/MessageAction';
 import type { MessageBoxAction } from '../../app/ui-utils/client/lib/messageBox';
 import { Utilities } from '../../ee/lib/misc/Utilities';
-import type { GenericMenuItemProps } from '../components/GenericMenu/GenericMenuItem';
 import { useUiKitActionManager } from '../uikit/hooks/useUiKitActionManager';
 import { useApplyButtonFilters, useApplyButtonAuthFilter } from './useApplyButtonFilters';
 
diff --git a/apps/meteor/client/hooks/useAppUiKitInteraction.ts b/apps/meteor/client/hooks/useAppUiKitInteraction.ts
index 55741b1961b4..56d984c709e6 100644
--- a/apps/meteor/client/hooks/useAppUiKitInteraction.ts
+++ b/apps/meteor/client/hooks/useAppUiKitInteraction.ts
@@ -1,3 +1,4 @@
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { useStream, useUserId } from '@rocket.chat/ui-contexts';
 import type * as UiKit from '@rocket.chat/ui-kit';
 import { useEffect } from 'react';
@@ -6,13 +7,12 @@ export const useAppUiKitInteraction = (handleServerInteraction: (interaction: Ui
 	const notifyUser = useStream('notify-user');
 	const uid = useUserId();
 
+	const handle = useEffectEvent(handleServerInteraction);
 	useEffect(() => {
 		if (!uid) {
 			return;
 		}
 
-		return notifyUser(`${uid}/uiInteraction`, (interaction) => {
-			handleServerInteraction(interaction);
-		});
-	}, [notifyUser, uid, handleServerInteraction]);
+		return notifyUser(`${uid}/uiInteraction`, handle);
+	}, [notifyUser, uid, handle]);
 };
diff --git a/apps/meteor/client/hooks/useEndpointAction.ts b/apps/meteor/client/hooks/useEndpointAction.ts
index c7c371a04e1f..2cfb22b18548 100644
--- a/apps/meteor/client/hooks/useEndpointAction.ts
+++ b/apps/meteor/client/hooks/useEndpointAction.ts
@@ -15,7 +15,7 @@ type UseEndpointActionOptions<TPathPattern extends PathPattern> = (undefined ext
 export function useEndpointAction<TMethod extends Method, TPathPattern extends PathPattern>(
 	method: TMethod,
 	pathPattern: TPathPattern,
-	options: UseEndpointActionOptions<TPathPattern> = { keys: {} as UrlParams<TPathPattern> },
+	options: NoInfer<UseEndpointActionOptions<TPathPattern>> = { keys: {} as UrlParams<TPathPattern> },
 ) {
 	const sendData = useEndpoint(method, pathPattern, options.keys as UrlParams<TPathPattern>);
 
diff --git a/apps/meteor/client/hooks/useEndpointData.ts b/apps/meteor/client/hooks/useEndpointData.ts
index 6e759ad587e5..93942946ede0 100644
--- a/apps/meteor/client/hooks/useEndpointData.ts
+++ b/apps/meteor/client/hooks/useEndpointData.ts
@@ -20,11 +20,11 @@ const deprecationWarning = log('useEndpointData is deprecated, use @tanstack/rea
  */
 export const useEndpointData = <TPathPattern extends PathPattern>(
 	endpoint: TPathPattern,
-	options: {
+	options: NoInfer<{
 		keys?: UrlParams<TPathPattern>;
 		params?: OperationParams<'GET', TPathPattern>;
 		initialValue?: Serialized<OperationResult<'GET', TPathPattern>> | (() => Serialized<OperationResult<'GET', TPathPattern>>);
-	} = {},
+	}> = {},
 ): AsyncState<Serialized<OperationResult<'GET', TPathPattern>>> & {
 	reload: () => void;
 } => {
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/lib/createRouteGroup.tsx b/apps/meteor/client/lib/createRouteGroup.tsx
index e418ecc56e99..70eab4782dd1 100644
--- a/apps/meteor/client/lib/createRouteGroup.tsx
+++ b/apps/meteor/client/lib/createRouteGroup.tsx
@@ -1,4 +1,4 @@
-import { type IRouterPaths, type RouteName, type RouterPathPattern } from '@rocket.chat/ui-contexts';
+import type { IRouterPaths, RouteName, RouterPathPattern } from '@rocket.chat/ui-contexts';
 import React, { type ElementType, type ReactNode } from 'react';
 
 import { router } from '../providers/RouterProvider';
@@ -9,21 +9,21 @@ type GroupName = 'omnichannel' | 'marketplace' | 'account' | 'admin';
 
 type GroupPrefix<TGroupName extends GroupName> = IRouterPaths[`${TGroupName}-index`]['pattern'];
 
-type RouteNamesOf<TGroupName extends GroupName> = Extract<
+type RouteNamesOf<TGroupName extends GroupName> = (
 	| keyof {
 			[TRouteName in RouteName as IRouterPaths[TRouteName]['pattern'] extends `${GroupPrefix<TGroupName>}/${string}`
 				? TRouteName
 				: never]: never;
 	  }
-	| `${GroupName}-index`,
-	RouteName
->;
+	| `${GroupName}-index`
+) &
+	RouteName;
 
-type TrimPrefix<T extends string, P extends string> = T extends `${P}${infer U}` ? U : T;
+type TrimPrefix<T, P extends string> = T extends `${P}${infer U}` ? U : T;
 
 export const createRouteGroup = <TGroupName extends GroupName>(
 	name: TGroupName,
-	prefix: GroupPrefix<TGroupName>,
+	prefix: NoInfer<GroupPrefix<TGroupName>>,
 	RouterComponent: ElementType<{
 		children?: ReactNode;
 	}>,
diff --git a/apps/meteor/client/lib/getLocalePercentage.ts b/apps/meteor/client/lib/getLocalePercentage.ts
index e6f2fa3bbff1..3aa84b59f03f 100644
--- a/apps/meteor/client/lib/getLocalePercentage.ts
+++ b/apps/meteor/client/lib/getLocalePercentage.ts
@@ -1,9 +1,6 @@
-export const getLocalePercentage = (locale: string, total: number, fraction: number, decimalCount = 2): string => {
-	const option = {
+export const getLocalePercentage = (locale: string, total: number, fraction: number, decimalCount = 2) =>
+	new Intl.NumberFormat(locale, {
 		style: 'percent',
 		minimumFractionDigits: decimalCount,
 		maximumFractionDigits: decimalCount,
-	};
-
-	return new Intl.NumberFormat(locale, option).format(fraction / total);
-};
+	}).format(fraction / total);
diff --git a/apps/meteor/client/lib/utils/createAnchor.ts b/apps/meteor/client/lib/utils/createAnchor.ts
deleted file mode 100644
index 836b30582f91..000000000000
--- a/apps/meteor/client/lib/utils/createAnchor.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { registerAnchor } from './deleteAnchor';
-
-type T = keyof HTMLElementTagNameMap;
-
-export const createAnchor: {
-	(id: string, tag?: T): T extends undefined ? HTMLElementTagNameMap['div'] : HTMLElementTagNameMap[T];
-} = (id: string, tag = 'div') => {
-	const anchor = document.getElementById(id);
-	if (anchor && anchor.tagName.toLowerCase() === tag) {
-		return anchor as any;
-	}
-	const a = document.createElement(tag);
-	a.id = id;
-	document.body.appendChild(a);
-
-	registerAnchor(a, () => document.body.removeChild(a));
-	return a;
-};
diff --git a/apps/meteor/client/lib/utils/deleteAnchor.ts b/apps/meteor/client/lib/utils/deleteAnchor.ts
deleted file mode 100644
index 33e34046ea3b..000000000000
--- a/apps/meteor/client/lib/utils/deleteAnchor.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-const anchor = new WeakMap<HTMLElement, () => void>();
-
-export const deleteAnchor = (element: HTMLElement): void => {
-	const fn = anchor.get(element);
-	if (fn) {
-		fn();
-	}
-};
-export const registerAnchor = (element: HTMLElement, fn: () => void): void => {
-	anchor.set(element, fn);
-};
diff --git a/apps/meteor/client/navbar/actions/NavbarAdministrationAction.tsx b/apps/meteor/client/navbar/actions/NavbarAdministrationAction.tsx
index 3431b9e928ad..f3c34c333dc5 100644
--- a/apps/meteor/client/navbar/actions/NavbarAdministrationAction.tsx
+++ b/apps/meteor/client/navbar/actions/NavbarAdministrationAction.tsx
@@ -1,9 +1,8 @@
+import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
 import { useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
-import { useHandleMenuAction } from '../../components/GenericMenu/hooks/useHandleMenuAction';
 import { NavbarAction } from '../../components/Navbar';
 import { useAdministrationItems } from '../../sidebar/header/actions/hooks/useAdministrationItems';
 
diff --git a/apps/meteor/client/navbar/actions/NavbarAuditAction.tsx b/apps/meteor/client/navbar/actions/NavbarAuditAction.tsx
index fc613be29b99..7e679faf0ab2 100644
--- a/apps/meteor/client/navbar/actions/NavbarAuditAction.tsx
+++ b/apps/meteor/client/navbar/actions/NavbarAuditAction.tsx
@@ -1,9 +1,8 @@
+import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
 import { useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
-import { useHandleMenuAction } from '../../components/GenericMenu/hooks/useHandleMenuAction';
 import { NavbarAction } from '../../components/Navbar';
 import { useAuditItems } from '../../sidebar/header/actions/hooks/useAuditItems';
 
diff --git a/apps/meteor/client/navbar/actions/NavbarMarketplaceAction.tsx b/apps/meteor/client/navbar/actions/NavbarMarketplaceAction.tsx
index 8f54b8260b2b..92e3eccf592a 100644
--- a/apps/meteor/client/navbar/actions/NavbarMarketplaceAction.tsx
+++ b/apps/meteor/client/navbar/actions/NavbarMarketplaceAction.tsx
@@ -1,10 +1,9 @@
 import { IconButton } from '@rocket.chat/fuselage';
+import { GenericMenu, useHandleMenuAction } from '@rocket.chat/ui-client';
 import { useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
-import { useHandleMenuAction } from '../../components/GenericMenu/hooks/useHandleMenuAction';
 import { NavbarAction } from '../../components/Navbar';
 import { useAppsItems } from '../../sidebar/header/actions/hooks/useAppsItems';
 
diff --git a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
index bba1fd135782..a158a13f9711 100644
--- a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
@@ -44,7 +44,7 @@ const BusinessHoursMultiple = ({ className }: { className?: ComponentProps<typeo
 					<Controller
 						name='name'
 						control={control}
-						rules={{ required: t('error-the-field-is-required', { field: t('Name') }) }}
+						rules={{ required: t('Required_field', { field: t('Name') }) }}
 						render={({ field }) => <TextInput id={nameField} {...field} aria-describedby={`${departmentsField}-error`} />}
 					/>
 				</FieldRow>
diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
index 51c993d2542f..e2bc979f3f4d 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
@@ -43,7 +43,7 @@ const CannedResponseForm = () => {
 				<Controller
 					name='shortcut'
 					control={control}
-					rules={{ required: t('The_field_is_required', t('Shortcut')) }}
+					rules={{ required: t('Required_field', { field: t('Shortcut') }) }}
 					render={({ field }) => (
 						<TextInput
 							{...field}
@@ -76,7 +76,7 @@ const CannedResponseForm = () => {
 					<Controller
 						name='text'
 						control={control}
-						rules={{ required: t('The_field_is_required', t('Message')) }}
+						rules={{ required: t('Required_field', { field: t('Message') }) }}
 						render={({ field: { value, onChange, name, onBlur } }) => (
 							<CannedResponsesComposer
 								id={messageField}
@@ -168,7 +168,7 @@ const CannedResponseForm = () => {
 								<Controller
 									name='departmentId'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Department')) }}
+									rules={{ required: t('Required_field', { field: t('Department') }) }}
 									render={({ field: { value, onChange } }) => (
 										<AutoCompleteDepartment
 											{...(hasMonitorPermission && { onlyMyDepartments: hasMonitorPermission })}
diff --git a/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
index 62adc2a0405f..76a95cf4a0e7 100644
--- a/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
@@ -13,6 +13,7 @@ import {
 	StatesAction,
 } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { UserAutoComplete } from '@rocket.chat/ui-client';
 import { useTranslation, useToastMessageDispatch, useMethod, useEndpoint, useSetModal } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
@@ -31,7 +32,6 @@ import {
 } from '../../components/GenericTable';
 import { usePagination } from '../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../components/GenericTable/hooks/useSort';
-import UserAutoComplete from '../../components/UserAutoComplete';
 import { queryClient } from '../../lib/queryClient';
 
 const MonitorsTable = () => {
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
index 592cd6b0f932..09bfda04fe28 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
@@ -47,7 +47,7 @@ const PriorityEditForm = ({ data, onSave, onCancel }: PriorityEditFormProps): Re
 		const { name } = getValues();
 
 		if (!isValid) {
-			return dispatchToastMessage({ type: 'error', message: t('The_field_is_required') });
+			return dispatchToastMessage({ type: 'error', message: t('Required_field', { field: t('Name') }) });
 		}
 
 		try {
@@ -77,7 +77,7 @@ const PriorityEditForm = ({ data, onSave, onCancel }: PriorityEditFormProps): Re
 				<Controller
 					name='name'
 					control={control}
-					rules={{ required: t('The_field_is_required', t('Name')), validate: (v) => v?.trim() !== '' }}
+					rules={{ required: t('Required_field', { field: t('Name') }), validate: (v) => v?.trim() !== '' }}
 					render={({ field: { value, onChange } }): ReactElement => (
 						<StringSettingInput
 							_id=''
diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
index 0b4ab02791da..0585cbcf4959 100644
--- a/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
@@ -37,7 +37,7 @@ function SlaEdit({ data, isNew, slaId, reload, ...props }: SlaEditProps): ReactE
 	const { field: nameField } = useController({
 		control,
 		name: 'name',
-		rules: { required: t('The_field_is_required', t('Name')) },
+		rules: { required: t('Required_field', { field: t('Name') }) },
 	});
 
 	const { field: dueTimeField } = useController({
@@ -45,7 +45,7 @@ function SlaEdit({ data, isNew, slaId, reload, ...props }: SlaEditProps): ReactE
 		name: 'dueTimeInMinutes',
 		rules: {
 			validate(value) {
-				return Number(value || 0) <= 0 ? t('The_field_is_required', t('Estimated_wait_time_in_minutes')) : true;
+				return Number(value || 0) <= 0 ? t('Required_field', { field: t('Estimated_wait_time_in_minutes') }) : true;
 			},
 		},
 	});
@@ -56,7 +56,7 @@ function SlaEdit({ data, isNew, slaId, reload, ...props }: SlaEditProps): ReactE
 		const { name, description, dueTimeInMinutes } = getValues();
 
 		if (!isValid || !name || dueTimeInMinutes === undefined) {
-			return dispatchToastMessage({ type: 'error', message: t('The_field_is_required') });
+			return dispatchToastMessage({ type: 'error', message: t('Required_field') });
 		}
 
 		try {
diff --git a/apps/meteor/client/omnichannel/tags/TagEdit.tsx b/apps/meteor/client/omnichannel/tags/TagEdit.tsx
index 767b56e91675..215fe33cdbd1 100644
--- a/apps/meteor/client/omnichannel/tags/TagEdit.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagEdit.tsx
@@ -88,7 +88,7 @@ const TagEdit = ({ tagData, currentDepartments }: TagEditProps) => {
 								<Controller
 									name='name'
 									control={control}
-									rules={{ required: t('The_field_is_required', 'name') }}
+									rules={{ required: t('Required_field', { field: t('Name') }) }}
 									render={({ field }) => <TextInput {...field} error={errors?.name?.message} aria-describedby={`${nameField}-error`} />}
 								/>
 							</FieldRow>
diff --git a/apps/meteor/client/omnichannel/units/UnitEdit.tsx b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
index e71e8e2a94d0..b2feb1db8a8f 100644
--- a/apps/meteor/client/omnichannel/units/UnitEdit.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
@@ -168,7 +168,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 								<Controller
 									name='name'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Name')) }}
+									rules={{ required: t('Required_field', { field: t('Name') }) }}
 									render={({ field }) => (
 										<TextInput
 											id={nameField}
@@ -195,7 +195,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 								<Controller
 									name='visibility'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Visibility')) }}
+									rules={{ required: t('Required_field', { field: t('Visibility') }) }}
 									render={({ field }) => (
 										<Select
 											id={visibilityField}
@@ -220,7 +220,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 								<Controller
 									name='departments'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Departments')) }}
+									rules={{ required: t('Required_field', { field: t('Departments') }) }}
 									render={({ field: { name, value, onChange, onBlur } }) => (
 										<PaginatedMultiSelectFiltered
 											id={departmentsField}
@@ -267,7 +267,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
 								<Controller
 									name='monitors'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Monitors')) }}
+									rules={{ required: t('Required_field', { field: t('Monitors') }) }}
 									render={({ field: { name, value, onChange, onBlur } }) => (
 										<PaginatedMultiSelectFiltered
 											id={monitorsField}
diff --git a/apps/meteor/client/portals/TooltipPortal.tsx b/apps/meteor/client/portals/TooltipPortal.tsx
index 6897a98ad5d6..a4f7b03c4296 100644
--- a/apps/meteor/client/portals/TooltipPortal.tsx
+++ b/apps/meteor/client/portals/TooltipPortal.tsx
@@ -1,18 +1,15 @@
+import { AnchorPortal } from '@rocket.chat/ui-client';
 import type { ReactNode } from 'react';
-import React, { memo, useEffect, useState } from 'react';
-import { createPortal } from 'react-dom';
+import React, { memo } from 'react';
 
-import { createAnchor } from '../lib/utils/createAnchor';
-import { deleteAnchor } from '../lib/utils/deleteAnchor';
+const tooltipAnchorId = 'tooltip-root';
 
 type TooltipPortalProps = {
 	children?: ReactNode;
 };
 
 const TooltipPortal = ({ children }: TooltipPortalProps) => {
-	const [tooltipRoot] = useState(() => createAnchor('tooltip-root'));
-	useEffect(() => (): void => deleteAnchor(tooltipRoot), [tooltipRoot]);
-	return <>{createPortal(children, tooltipRoot)}</>;
+	return <AnchorPortal id={tooltipAnchorId}>{children}</AnchorPortal>;
 };
 
 export default memo(TooltipPortal);
diff --git a/apps/meteor/client/portals/VideoConfPopupPortal.tsx b/apps/meteor/client/portals/VideoConfPopupPortal.tsx
index b1c0746e93e2..4da4b0c39a51 100644
--- a/apps/meteor/client/portals/VideoConfPopupPortal.tsx
+++ b/apps/meteor/client/portals/VideoConfPopupPortal.tsx
@@ -1,18 +1,15 @@
+import { AnchorPortal } from '@rocket.chat/ui-client';
 import type { ReactElement, ReactNode } from 'react';
-import React, { memo, useEffect, useState } from 'react';
-import { createPortal } from 'react-dom';
+import React, { memo } from 'react';
 
-import { createAnchor } from '../lib/utils/createAnchor';
-import { deleteAnchor } from '../lib/utils/deleteAnchor';
+const videoConfAnchorId = 'video-conf-root';
 
 type VideoConfPortalProps = {
 	children?: ReactNode;
 };
 
 const VideoConfPortal = ({ children }: VideoConfPortalProps): ReactElement => {
-	const [videoConfRoot] = useState(() => createAnchor('video-conf-root'));
-	useEffect(() => (): void => deleteAnchor(videoConfRoot), [videoConfRoot]);
-	return <>{createPortal(children, videoConfRoot)}</>;
+	return <AnchorPortal id={videoConfAnchorId}>{children}</AnchorPortal>;
 };
 
 export default memo(VideoConfPortal);
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/CallProvider/CallProvider.tsx b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
index f2c884aeb05f..6e728dc35eb6 100644
--- a/apps/meteor/client/providers/CallProvider/CallProvider.tsx
+++ b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
@@ -11,7 +11,7 @@ import {
 } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { Random } from '@rocket.chat/random';
-import type { Device, IExperimentalHTMLAudioElement } from '@rocket.chat/ui-contexts';
+import type { Device } from '@rocket.chat/ui-contexts';
 import {
 	useRouter,
 	useUser,
@@ -65,7 +65,7 @@ export const CallProvider = ({ children }: CallProviderProps) => {
 
 	const hasVoIPEnterpriseLicense = useIsVoipEnterprise();
 
-	const remoteAudioMediaRef = useRef<IExperimentalHTMLAudioElement>(null); // TODO: Create a dedicated file for the AUDIO and make the controls accessible
+	const remoteAudioMediaRef = useRef<HTMLAudioElement>(null); // TODO: Create a dedicated file for the AUDIO and make the controls accessible
 
 	const [queueCounter, setQueueCounter] = useState(0);
 	const [queueName, setQueueName] = useState('');
diff --git a/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx b/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
index 90ced3b0459a..c8fd77fa257b 100644
--- a/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
+++ b/apps/meteor/client/providers/DeviceProvider/DeviceProvider.tsx
@@ -1,5 +1,5 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import type { Device, IExperimentalHTMLAudioElement, DeviceContextValue } from '@rocket.chat/ui-contexts';
+import type { Device, DeviceContextValue } from '@rocket.chat/ui-contexts';
 import { DeviceContext } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useEffect, useState, useMemo } from 'react';
@@ -33,7 +33,7 @@ export const DeviceProvider = ({ children }: DeviceProviderProps): ReactElement
 	};
 
 	const setAudioOutputDevice = useMutableCallback(
-		({ outputDevice, HTMLAudioElement }: { outputDevice: Device; HTMLAudioElement: IExperimentalHTMLAudioElement }): void => {
+		({ outputDevice, HTMLAudioElement }: { outputDevice: Device; HTMLAudioElement: HTMLAudioElement }): void => {
 			if (!isSetSinkIdAvailable()) {
 				throw new Error('setSinkId is not available in this browser');
 			}
diff --git a/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx b/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx
index 65bf99ed116f..2f835819afe6 100644
--- a/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx
+++ b/apps/meteor/client/providers/DeviceProvider/lib/isSetSinkIdAvailable.tsx
@@ -1,6 +1,4 @@
-import type { IExperimentalHTMLAudioElement } from '@rocket.chat/ui-contexts';
-
 export const isSetSinkIdAvailable = (): boolean => {
-	const audio = new Audio() as IExperimentalHTMLAudioElement;
+	const audio = new Audio();
 	return !!audio.setSinkId;
 };
diff --git a/apps/meteor/client/providers/TranslationProvider.tsx b/apps/meteor/client/providers/TranslationProvider.tsx
index 0c0ef00b5ac0..eb546c91c6bd 100644
--- a/apps/meteor/client/providers/TranslationProvider.tsx
+++ b/apps/meteor/client/providers/TranslationProvider.tsx
@@ -84,7 +84,7 @@ const useI18next = (lng: string): typeof i18next => {
 				loadPath: 'i18n/{{lng}}.json',
 				parse: (data: string, _lngs?: string | string[], namespaces: string | string[] = []) =>
 					extractTranslationKeys(JSON.parse(data), namespaces),
-				request: (_options, url, _payload, callback) => {
+				request: (_options: unknown, url: string, _payload: unknown, callback: (error: unknown, data: unknown) => void) => {
 					const params = url.split('/');
 
 					const lng = params[params.length - 1];
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.spec.tsx b/apps/meteor/client/sidebar/RoomMenu.spec.tsx
new file mode 100644
index 000000000000..e12063c9cdb0
--- /dev/null
+++ b/apps/meteor/client/sidebar/RoomMenu.spec.tsx
@@ -0,0 +1,67 @@
+import type { RoomType } from '@rocket.chat/core-typings';
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import RoomMenu from './RoomMenu';
+
+jest.mock('../../client/lib/rooms/roomCoordinator', () => ({
+	roomCoordinator: {
+		getRoomDirectives: () => ({
+			getUiText: () => 'leaveWarning',
+		}),
+	},
+}));
+
+jest.mock('../../app/ui-utils/client', () => ({
+	LegacyRoomManager: {
+		close: jest.fn(),
+	},
+}));
+
+const defaultProps = {
+	rid: 'roomId',
+	type: 'c' as RoomType,
+	hideDefaultOptions: false,
+	placement: 'right-start',
+};
+
+const renderOptions = {
+	wrapper: mockAppRoot()
+		.withTranslations('en', 'core', {
+			Hide: 'Hide',
+			Mark_unread: 'Mark Unread',
+			Favorite: 'Favorite',
+			Leave_room: 'Leave',
+		})
+		.withSetting('Favorite_Rooms', true)
+		.withPermission('leave-c')
+		.withPermission('leave-p')
+		.build(),
+	legacyRoot: true,
+};
+
+it('should display all the menu options for regular rooms', async () => {
+	render(<RoomMenu {...defaultProps} />, renderOptions);
+
+	const menu = screen.queryByRole('button');
+	await userEvent.click(menu as HTMLElement);
+
+	expect(await screen.findByRole('option', { name: 'Hide' })).toBeInTheDocument();
+	expect(await screen.findByRole('option', { name: 'Favorite' })).toBeInTheDocument();
+	expect(await screen.findByRole('option', { name: 'Mark Unread' })).toBeInTheDocument();
+	expect(await screen.findByRole('option', { name: 'Leave' })).toBeInTheDocument();
+});
+
+it('should display only mark unread and favorite for omnichannel rooms', async () => {
+	render(<RoomMenu {...defaultProps} type='l' />, renderOptions);
+
+	const menu = screen.queryByRole('button');
+	await userEvent.click(menu as HTMLElement);
+
+	expect(await screen.findAllByRole('option')).toHaveLength(2);
+	expect(screen.queryByRole('option', { name: 'Hide' })).not.toBeInTheDocument();
+	expect(screen.queryByRole('option', { name: 'Leave' })).not.toBeInTheDocument();
+});
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/CreateChannel/CreateChannelModal.tsx b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
index 27ad314b2ab8..03e1122da773 100644
--- a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
@@ -222,7 +222,7 @@ const CreateChannelModal = ({ teamId = '', onClose, reload }: CreateChannelModal
 								id={nameId}
 								data-qa-type='channel-name-input'
 								{...register('name', {
-									required: t('error-the-field-is-required', { field: t('Name') }),
+									required: t('Required_field', { field: t('Name') }),
 									validate: (value) => validateChannelName(value),
 								})}
 								error={errors.name?.message}
diff --git a/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx b/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
index ad1abdcbf399..3543234bca96 100644
--- a/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
+++ b/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
@@ -181,7 +181,7 @@ const CreateTeamModal = ({ onClose }: { onClose: () => void }): ReactElement =>
 								id={nameId}
 								aria-invalid={errors.name ? 'true' : 'false'}
 								{...register('name', {
-									required: t('error-the-field-is-required', { field: t('Name') }),
+									required: t('Required_field', { field: t('Name') }),
 									validate: (value) => validateTeamName(value),
 								})}
 								addon={<Icon size='x20' name={isPrivate ? 'team-lock' : 'team'} />}
diff --git a/apps/meteor/client/sidebar/header/UserMenu.tsx b/apps/meteor/client/sidebar/header/UserMenu.tsx
index 592fc19656e9..b106caa20b16 100644
--- a/apps/meteor/client/sidebar/header/UserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/UserMenu.tsx
@@ -1,11 +1,15 @@
 import type { IUser } from '@rocket.chat/core-typings';
-import { FeaturePreview, FeaturePreviewOn, FeaturePreviewOff } from '@rocket.chat/ui-client';
+import {
+	FeaturePreview,
+	FeaturePreviewOn,
+	FeaturePreviewOff,
+	GenericMenu,
+	useHandleMenuAction,
+	type GenericMenuItemProps,
+} from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useState, memo } from 'react';
 
-import GenericMenu from '../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../components/GenericMenu/GenericMenuItem';
-import { useHandleMenuAction } from '../../components/GenericMenu/hooks/useHandleMenuAction';
 import UserAvatarWithStatus from './UserAvatarWithStatus';
 import UserAvatarWithStatusUnstable from './UserAvatarWithStatusUnstable';
 import { useUserMenu } from './hooks/useUserMenu';
diff --git a/apps/meteor/client/sidebar/header/actions/Administration.tsx b/apps/meteor/client/sidebar/header/actions/Administration.tsx
index fbed4afec4cb..a0016db7e75c 100644
--- a/apps/meteor/client/sidebar/header/actions/Administration.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Administration.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import { useAdministrationMenu } from './hooks/useAdministrationMenu';
 
 type AdministrationProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
index 478e7cce33e1..3392db4ed917 100644
--- a/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import { useCreateRoom } from './hooks/useCreateRoomMenu';
 
 type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/sidebar/header/actions/Sort.tsx b/apps/meteor/client/sidebar/header/actions/Sort.tsx
index e7f3b398e5f6..1fe4b947c661 100644
--- a/apps/meteor/client/sidebar/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Sort.tsx
@@ -1,9 +1,9 @@
 import { Sidebar } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import { useSortMenu } from './hooks/useSortMenu';
 
 type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx
index 5e802c2d1851..9c74bacd23ce 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx
@@ -1,7 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useRoute, useRouter, useAtLeastOnePermission, usePermission } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 const ADMIN_PERMISSIONS = [
 	'view-statistics',
 	'run-import',
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
index 5be021cf0b7e..cf71cf4223b9 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationMenu.tsx
@@ -1,6 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useAdministrationItems } from './useAdministrationItems';
 import { useAppsItems } from './useAppsItems';
 import { useAuditItems } from './useAuditItems';
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAppsItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAppsItems.tsx
index 3717f33fb195..f7b9cea0d56a 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAppsItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAppsItems.tsx
@@ -1,8 +1,8 @@
 import { Badge, Skeleton } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useRoute, usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useUserDropdownAppsActionButtons } from '../../../../hooks/useAppActionButtons';
 import { useAppRequestStats } from '../../../../views/marketplace/hooks/useAppRequestStats';
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx
index 8e2640711347..cf53f1ffef03 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useAuditItems.tsx
@@ -1,6 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useRoute, usePermission } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
 
 /**
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomItems.tsx
index 7b2770a60ab5..1bc64d1ba8d1 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomItems.tsx
@@ -1,7 +1,7 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useSetting, useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
 
 import CreateDiscussion from '../../../../components/CreateDiscussion';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import CreateChannelWithData from '../../CreateChannel';
 import CreateDirectMessage from '../../CreateDirectMessage';
 import CreateTeam from '../../CreateTeam';
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx
index 646b85c838be..5dcb53f2ad2f 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx
@@ -1,9 +1,8 @@
 import { CheckBox } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 export const useGroupingListItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
index b3ac63f13773..7e628378749d 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.tsx.tsx
@@ -1,6 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import MatrixFederationSearch from '../../MatrixFederationSearch';
 import { useCreateRoomModal } from '../../hooks/useCreateRoomModal';
 
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx
index 56041ab4e571..0e2bf818a0bf 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx
@@ -1,8 +1,8 @@
 import { RadioButton } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import {
 	OmnichannelSortingDisclaimer,
 	useOmnichannelSortingDisclaimer,
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx
index ca2855d09db5..a33230a15729 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx
@@ -1,9 +1,8 @@
 import { RadioButton, ToggleSwitch } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 export const useViewModeItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 
diff --git a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
index 1f18d826843d..51ab7a198a67 100644
--- a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
@@ -1,16 +1,15 @@
 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';
 
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
-
 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/sidebar/header/hooks/useStatusItems.tsx b/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx
index 026f7c80400e..dc3fa2a3b277 100644
--- a/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx
@@ -1,11 +1,11 @@
 import { Box } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useSetting } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { callbacks } from '../../../../lib/callbacks';
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
 import MarkdownText from '../../../components/MarkdownText';
 import { UserStatus } from '../../../components/UserStatus';
 import { userStatuses } from '../../../lib/userStatuses';
diff --git a/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx b/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
index de43d30306e9..c0c6f94a4ed8 100644
--- a/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
@@ -1,9 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLogout, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../components/GenericMenu/GenericMenuItem';
 import UserMenuHeader from '../UserMenuHeader';
 import { useAccountItems } from './useAccountItems';
 import { useStatusItems } from './useStatusItems';
diff --git a/apps/meteor/client/sidebarv2/Item/Condensed.tsx b/apps/meteor/client/sidebarv2/Item/Condensed.tsx
index db76935d4c3f..6ca428fc7208 100644
--- a/apps/meteor/client/sidebarv2/Item/Condensed.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Condensed.tsx
@@ -1,11 +1,11 @@
-import { IconButton, Sidebar } from '@rocket.chat/fuselage';
+import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { ReactElement } from 'react';
 import React, { memo, useState } from 'react';
 
 type CondensedProps = {
-	title: ReactElement | string;
+	title: string;
 	titleIcon?: ReactElement;
 	avatar: ReactElement | boolean;
 	icon?: IconName;
@@ -19,7 +19,7 @@ type CondensedProps = {
 	clickable?: boolean;
 };
 
-const Condensed = ({ icon, title = '', avatar, actions, href, unread, menu, badges, ...props }: CondensedProps) => {
+const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, selected }: CondensedProps) => {
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
 
 	const isReduceMotionEnabled = usePrefersReducedMotion();
@@ -32,28 +32,18 @@ const Condensed = ({ icon, title = '', avatar, actions, href, unread, menu, badg
 	};
 
 	return (
-		<Sidebar.Item {...props} {...({ href } as any)} clickable={!!href}>
-			{avatar && <Sidebar.Item.Avatar>{avatar}</Sidebar.Item.Avatar>}
-			<Sidebar.Item.Content>
-				<Sidebar.Item.Wrapper>
-					{icon}
-					<Sidebar.Item.Title data-qa='sidebar-item-title' className={(unread && 'rcx-sidebar-item--highlighted') as string}>
-						{title}
-					</Sidebar.Item.Title>
-				</Sidebar.Item.Wrapper>
-				{badges && <Sidebar.Item.Badge>{badges}</Sidebar.Item.Badge>}
-				{menu && (
-					<Sidebar.Item.Menu {...handleMenuEvent}>
-						{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-item__menu icon='kebab' />}
-					</Sidebar.Item.Menu>
-				)}
-			</Sidebar.Item.Content>
-			{actions && (
-				<Sidebar.Item.Container>
-					<Sidebar.Item.Actions>{actions}</Sidebar.Item.Actions>
-				</Sidebar.Item.Container>
+		<SidebarV2Item href={href} selected={selected}>
+			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
+			{icon && icon}
+			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
+			{badges && badges}
+			{actions && actions}
+			{menu && (
+				<SidebarV2ItemMenu {...handleMenuEvent}>
+					{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
+				</SidebarV2ItemMenu>
 			)}
-		</Sidebar.Item>
+		</SidebarV2Item>
 	);
 };
 
diff --git a/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx b/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
index a6392eae5d61..7029e9f24dc1 100644
--- a/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
@@ -25,14 +25,7 @@ export default {
 const Template: ComponentStory<typeof Extended> = (args) => (
 	<Extended
 		{...args}
-		title={
-			<Box display='flex' flexDirection='row' w='full' alignItems='center'>
-				<Box flexGrow='1' withTruncatedText>
-					John Doe
-				</Box>
-				<Box fontScale='micro'>15:38</Box>
-			</Box>
-		}
+		title='John Doe'
 		subtitle={
 			<Box display='flex' flexDirection='row' w='full' alignItems='center'>
 				<Box flexGrow='1' withTruncatedText>
diff --git a/apps/meteor/client/sidebarv2/Item/Extended.tsx b/apps/meteor/client/sidebarv2/Item/Extended.tsx
index f288f5fd35c6..13112bc96cec 100644
--- a/apps/meteor/client/sidebarv2/Item/Extended.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Extended.tsx
@@ -1,4 +1,14 @@
-import { Sidebar, IconButton } from '@rocket.chat/fuselage';
+import {
+	SidebarV2Item,
+	SidebarV2ItemAvatarWrapper,
+	SidebarV2ItemCol,
+	SidebarV2ItemRow,
+	SidebarV2ItemTitle,
+	SidebarV2ItemTimestamp,
+	SidebarV2ItemContent,
+	SidebarV2ItemMenu,
+	IconButton,
+} from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import React, { memo, useState } from 'react';
@@ -7,7 +17,7 @@ import { useShortTimeAgo } from '../../hooks/useTimeAgo';
 
 type ExtendedProps = {
 	icon?: IconName;
-	title?: React.ReactNode;
+	title: string;
 	avatar?: React.ReactNode | boolean;
 	actions?: React.ReactNode;
 	href?: string;
@@ -24,7 +34,7 @@ type ExtendedProps = {
 
 const Extended = ({
 	icon,
-	title = '',
+	title,
 	avatar,
 	actions,
 	href,
@@ -37,7 +47,6 @@ const Extended = ({
 	threadUnread: _threadUnread,
 	unread,
 	selected,
-	...props
 }: ExtendedProps) => {
 	const formatDate = useShortTimeAgo();
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
@@ -47,42 +56,33 @@ const Extended = ({
 	const handleMenu = useEffectEvent((e) => {
 		setMenuVisibility(e.target.offsetWidth > 0 && Boolean(menu));
 	});
-
 	const handleMenuEvent = {
 		[isReduceMotionEnabled ? 'onMouseEnter' : 'onTransitionEnd']: handleMenu,
 	};
 
 	return (
-		<Sidebar.Item selected={selected} highlighted={unread} {...props} {...({ href } as any)} clickable={!!href}>
-			{avatar && <Sidebar.Item.Avatar>{avatar}</Sidebar.Item.Avatar>}
-			<Sidebar.Item.Content>
-				<Sidebar.Item.Content>
-					<Sidebar.Item.Wrapper>
-						{icon}
-						<Sidebar.Item.Title data-qa='sidebar-item-title' className={(unread && 'rcx-sidebar-item--highlighted') as string}>
-							{title}
-						</Sidebar.Item.Title>
-						{time && <Sidebar.Item.Time>{formatDate(time)}</Sidebar.Item.Time>}
-					</Sidebar.Item.Wrapper>
-				</Sidebar.Item.Content>
-				<Sidebar.Item.Content>
-					<Sidebar.Item.Wrapper>
-						<Sidebar.Item.Subtitle className={(unread && 'rcx-sidebar-item--highlighted') as string}>{subtitle}</Sidebar.Item.Subtitle>
-						<Sidebar.Item.Badge>{badges}</Sidebar.Item.Badge>
-						{menu && (
-							<Sidebar.Item.Menu {...handleMenuEvent}>
-								{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-item__menu icon='kebab' />}
-							</Sidebar.Item.Menu>
-						)}
-					</Sidebar.Item.Wrapper>
-				</Sidebar.Item.Content>
-			</Sidebar.Item.Content>
-			{actions && (
-				<Sidebar.Item.Container>
-					<Sidebar.Item.Actions>{actions}</Sidebar.Item.Actions>
-				</Sidebar.Item.Container>
-			)}
-		</Sidebar.Item>
+		<SidebarV2Item href={href} selected={selected}>
+			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
+
+			<SidebarV2ItemCol>
+				<SidebarV2ItemRow>
+					{icon && icon}
+					<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
+					{time && <SidebarV2ItemTimestamp>{formatDate(time)}</SidebarV2ItemTimestamp>}
+				</SidebarV2ItemRow>
+
+				<SidebarV2ItemRow>
+					<SidebarV2ItemContent unread={unread}>{subtitle}</SidebarV2ItemContent>
+					{badges && badges}
+					{actions && actions}
+					{menu && (
+						<SidebarV2ItemMenu {...handleMenuEvent}>
+							{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
+						</SidebarV2ItemMenu>
+					)}
+				</SidebarV2ItemRow>
+			</SidebarV2ItemCol>
+		</SidebarV2Item>
 	);
 };
 
diff --git a/apps/meteor/client/sidebarv2/Item/Medium.tsx b/apps/meteor/client/sidebarv2/Item/Medium.tsx
index ffc13047f66d..13d2305ad7d5 100644
--- a/apps/meteor/client/sidebarv2/Item/Medium.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Medium.tsx
@@ -1,12 +1,13 @@
-import { Sidebar, IconButton } from '@rocket.chat/fuselage';
+import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
+import type { Keys as IconName } from '@rocket.chat/icons';
 import React, { memo, useState } from 'react';
 
 type MediumProps = {
-	title: React.ReactNode;
+	title: string;
 	titleIcon?: React.ReactNode;
 	avatar: React.ReactNode | boolean;
-	icon?: string;
+	icon?: IconName;
 	actions?: React.ReactNode;
 	href?: string;
 	unread?: boolean;
@@ -16,7 +17,7 @@ type MediumProps = {
 	menuOptions?: any;
 };
 
-const Medium = ({ icon, title = '', avatar, actions, href, badges, unread, menu, ...props }: MediumProps) => {
+const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, selected }: MediumProps) => {
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
 
 	const isReduceMotionEnabled = usePrefersReducedMotion();
@@ -29,28 +30,18 @@ const Medium = ({ icon, title = '', avatar, actions, href, badges, unread, menu,
 	};
 
 	return (
-		<Sidebar.Item {...props} href={href} clickable={!!href}>
-			{avatar && <Sidebar.Item.Avatar>{avatar}</Sidebar.Item.Avatar>}
-			<Sidebar.Item.Content>
-				<Sidebar.Item.Wrapper>
-					{icon}
-					<Sidebar.Item.Title data-qa='sidebar-item-title' className={unread ? 'rcx-sidebar-item--highlighted' : undefined}>
-						{title}
-					</Sidebar.Item.Title>
-				</Sidebar.Item.Wrapper>
-				{badges && <Sidebar.Item.Badge>{badges}</Sidebar.Item.Badge>}
-				{menu && (
-					<Sidebar.Item.Menu {...handleMenuEvent}>
-						{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-item__menu icon='kebab' />}
-					</Sidebar.Item.Menu>
-				)}
-			</Sidebar.Item.Content>
-			{actions && (
-				<Sidebar.Item.Container>
-					<Sidebar.Item.Actions>{actions}</Sidebar.Item.Actions>
-				</Sidebar.Item.Container>
+		<SidebarV2Item href={href} selected={selected}>
+			<SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>
+			{icon && icon}
+			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
+			{badges && badges}
+			{actions && actions}
+			{menu && (
+				<SidebarV2ItemMenu {...handleMenuEvent}>
+					{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
+				</SidebarV2ItemMenu>
 			)}
-		</Sidebar.Item>
+		</SidebarV2Item>
 	);
 };
 
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
index 3f137d4709c7..5f6592210d65 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
@@ -1,11 +1,11 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { css } from '@rocket.chat/css-in-js';
-import { Box } from '@rocket.chat/fuselage';
+/* eslint-disable react/no-multi-comp */
+import type { ISubscription, IRoom } from '@rocket.chat/core-typings';
+import { Box, SidebarV2GroupTitle } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useUserPreference, useUserId, useTranslation } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
-import { Virtuoso } from 'react-virtuoso';
+import { GroupedVirtuoso } from 'react-virtuoso';
 
 import { VirtuosoScrollbars } from '../../components/CustomScrollbars';
 import { useOpenedRoom } from '../../lib/RoomManager';
@@ -18,7 +18,25 @@ import RoomListRow from './RoomListRow';
 import RoomListRowWrapper from './RoomListRowWrapper';
 import RoomListWrapper from './RoomListWrapper';
 
-const computeItemKey = (index: number, room: IRoom): IRoom['_id'] | number => room._id || index;
+const getRoomsByGroup = (rooms: (ISubscription & IRoom)[]) => {
+	const groupCounts = rooms
+		.reduce((acc, item, index) => {
+			if (typeof item === 'string') {
+				acc.push(index);
+			}
+			return acc;
+		}, [] as number[])
+		.map((item, index, arr) => (arr[index + 1] ? arr[index + 1] : rooms.length) - item - 1);
+
+	const groupList = rooms.filter((item) => typeof item === 'string') as unknown as TranslationKey[];
+	const roomList = rooms.filter((item) => typeof item !== 'string');
+
+	return {
+		groupCounts,
+		groupList,
+		roomList,
+	};
+};
 
 const RoomList = () => {
 	const t = useTranslation();
@@ -26,7 +44,7 @@ const RoomList = () => {
 	const roomsList = useRoomList();
 	const avatarTemplate = useAvatarTemplate();
 	const sideBarItemTemplate = useTemplateByViewMode();
-	const { ref } = useResizeObserver({ debounceDelay: 100 });
+	const { ref } = useResizeObserver<HTMLElement>({ debounceDelay: 100 });
 	const openedRoom = useOpenedRoom() ?? '';
 	const sidebarViewMode = useUserPreference<'extended' | 'medium' | 'condensed'>('sidebarViewMode') || 'extended';
 
@@ -35,7 +53,7 @@ const RoomList = () => {
 		() => ({
 			extended,
 			t,
-			SideBarItemTemplate: sideBarItemTemplate,
+			SidebarItemTemplate: sideBarItemTemplate,
 			AvatarTemplate: avatarTemplate,
 			openedRoom,
 			sidebarViewMode,
@@ -47,87 +65,16 @@ const RoomList = () => {
 	usePreventDefault(ref);
 	useShortcutOpenMenu(ref);
 
-	const roomsListStyle = css`
-		position: relative;
-
-		display: flex;
-
-		overflow-x: hidden;
-		overflow-y: hidden;
-
-		flex: 1 1 auto;
-
-		height: 100%;
-
-		&--embedded {
-			margin-top: 2rem;
-		}
-
-		&__list:not(:last-child) {
-			margin-bottom: 22px;
-		}
-
-		&__type {
-			display: flex;
-
-			flex-direction: row;
-
-			padding: 0 var(--sidebar-default-padding) 1rem var(--sidebar-default-padding);
-
-			color: var(--rooms-list-title-color);
-
-			font-size: var(--rooms-list-title-text-size);
-			align-items: center;
-			justify-content: space-between;
-
-			&-text--livechat {
-				flex: 1;
-			}
-		}
-
-		&__empty-room {
-			padding: 0 var(--sidebar-default-padding);
-
-			color: var(--rooms-list-empty-text-color);
-
-			font-size: var(--rooms-list-empty-text-size);
-		}
-
-		&__toolbar-search {
-			position: absolute;
-			z-index: 10;
-			left: 0;
-
-			overflow-y: scroll;
-
-			height: 100%;
-
-			background-color: var(--sidebar-background);
-
-			padding-block-start: 12px;
-		}
-
-		@media (max-width: 400px) {
-			padding: 0 calc(var(--sidebar-small-default-padding) - 4px);
-
-			&__type,
-			&__empty-room {
-				padding: 0 calc(var(--sidebar-small-default-padding) - 4px) 0.5rem calc(var(--sidebar-small-default-padding) - 4px);
-			}
-		}
-	`;
+	const { groupCounts, groupList, roomList } = getRoomsByGroup(roomsList);
 
 	return (
-		<Box className={[roomsListStyle, 'sidebar--custom-colors'].filter(Boolean)}>
-			<Box h='full' w='full' ref={ref}>
-				<Virtuoso
-					totalCount={roomsList.length}
-					data={roomsList}
-					components={{ Item: RoomListRowWrapper, List: RoomListWrapper, Scroller: VirtuosoScrollbars }}
-					computeItemKey={computeItemKey}
-					itemContent={(_, data): ReactElement => <RoomListRow data={itemData} item={data} />}
-				/>
-			</Box>
+		<Box position='relative' display='flex' overflow='hidden' height='full' flexGrow={1} flexShrink={1} flexBasis='auto' ref={ref}>
+			<GroupedVirtuoso
+				groupCounts={groupCounts}
+				groupContent={(index) => <SidebarV2GroupTitle title={t(groupList[index])} />}
+				itemContent={(index) => <RoomListRow data={itemData} item={roomList[index]} />}
+				components={{ Item: RoomListRowWrapper, List: RoomListWrapper, Scroller: VirtuosoScrollbars }}
+			/>
 		</Box>
 	);
 };
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
index 64796d2e12e4..b520033056f3 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
@@ -1,18 +1,17 @@
 import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
-import { SidebarSection } from '@rocket.chat/fuselage';
 import type { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo, useMemo } from 'react';
 
 import { useVideoConfAcceptCall, useVideoConfRejectIncomingCall, useVideoConfIncomingCalls } from '../../contexts/VideoConfContext';
 import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
 import type { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
-import SideBarItemTemplateWithData from './SideBarItemTemplateWithData';
+import SidebarItemTemplateWithData from './SidebarItemTemplateWithData';
 
 type RoomListRowProps = {
 	data: {
 		extended: boolean;
 		t: ReturnType<typeof useTranslation>;
-		SideBarItemTemplate: ReturnType<typeof useTemplateByViewMode>;
+		SidebarItemTemplate: ReturnType<typeof useTemplateByViewMode>;
 		AvatarTemplate: ReturnType<typeof useAvatarTemplate>;
 		openedRoom: string;
 		sidebarViewMode: 'extended' | 'condensed' | 'medium';
@@ -22,7 +21,7 @@ type RoomListRowProps = {
 };
 
 const RoomListRow = ({ data, item }: RoomListRowProps) => {
-	const { extended, t, SideBarItemTemplate, AvatarTemplate, openedRoom, sidebarViewMode } = data;
+	const { extended, t, SidebarItemTemplate, AvatarTemplate, openedRoom, sidebarViewMode } = data;
 
 	const acceptCall = useVideoConfAcceptCall();
 	const rejectCall = useVideoConfRejectIncomingCall();
@@ -38,22 +37,14 @@ const RoomListRow = ({ data, item }: RoomListRowProps) => {
 		[acceptCall, rejectCall, currentCall],
 	);
 
-	if (typeof item === 'string') {
-		return (
-			<SidebarSection>
-				<SidebarSection.Title>{t(item)}</SidebarSection.Title>
-			</SidebarSection>
-		);
-	}
-
 	return (
-		<SideBarItemTemplateWithData
+		<SidebarItemTemplateWithData
 			sidebarViewMode={sidebarViewMode}
 			selected={item.rid === openedRoom}
 			t={t}
 			room={item}
 			extended={extended}
-			SideBarItemTemplate={SideBarItemTemplate}
+			SidebarItemTemplate={SidebarItemTemplate}
 			AvatarTemplate={AvatarTemplate}
 			videoConfActions={videoConfActions}
 		/>
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListRowWrapper.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListRowWrapper.tsx
index b2cd75193466..a848c74ad1d5 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomListRowWrapper.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListRowWrapper.tsx
@@ -1,10 +1,11 @@
+import { SidebarV2ListItem } from '@rocket.chat/fuselage';
 import type { ForwardedRef, HTMLAttributes } from 'react';
 import React, { forwardRef } from 'react';
 
 type RoomListRoomWrapperProps = HTMLAttributes<HTMLDivElement>;
 
 const RoomListRoomWrapper = forwardRef(function RoomListRoomWrapper(props: RoomListRoomWrapperProps, ref: ForwardedRef<HTMLDivElement>) {
-	return <div role='listitem' ref={ref} {...props} />;
+	return <SidebarV2ListItem ref={ref} {...props} />;
 });
 
 export default RoomListRoomWrapper;
diff --git a/apps/meteor/client/sidebarv2/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
similarity index 85%
rename from apps/meteor/client/sidebarv2/RoomList/SideBarItemTemplateWithData.tsx
rename to apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
index 4eaba8cc37f0..e1f66ba93b4e 100644
--- a/apps/meteor/client/sidebarv2/RoomList/SideBarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
@@ -1,6 +1,6 @@
 import type { IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { isDirectMessageRoom, isMultipleDirectMessageRoom, isOmnichannelRoom, isVideoConfMessage } from '@rocket.chat/core-typings';
-import { Badge, Sidebar, SidebarItemAction, SidebarItemActions, Margins } from '@rocket.chat/fuselage';
+import { SidebarV2Action, SidebarV2Actions, SidebarV2ItemBadge, SidebarV2ItemIcon } from '@rocket.chat/fuselage';
 import type { useTranslation } from '@rocket.chat/ui-contexts';
 import { useLayout } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes, ComponentType, ReactElement, ReactNode } from 'react';
@@ -15,7 +15,7 @@ import { OmnichannelBadges } from '../badges/OmnichannelBadges';
 import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
 import { normalizeSidebarMessage } from './normalizeSidebarMessage';
 
-const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: ReturnType<typeof useTranslation>): string | undefined => {
+export const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: ReturnType<typeof useTranslation>): string | undefined => {
 	if (!lastMessage) {
 		return t('No_messages_yet');
 	}
@@ -34,7 +34,7 @@ const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: ReturnTyp
 	return `${lastMessage.u.name || lastMessage.u.username}: ${normalizeSidebarMessage(lastMessage, t)}`;
 };
 
-const getBadgeTitle = (
+export const getBadgeTitle = (
 	userMentions: number,
 	threadUnread: number,
 	groupMentions: number,
@@ -61,7 +61,7 @@ const getBadgeTitle = (
 type RoomListRowProps = {
 	extended: boolean;
 	t: ReturnType<typeof useTranslation>;
-	SideBarItemTemplate: ComponentType<
+	SidebarItemTemplate: ComponentType<
 		{
 			icon: ReactNode;
 			title: ReactNode;
@@ -98,13 +98,13 @@ type RoomListRowProps = {
 	};
 };
 
-const SideBarItemTemplateWithData = ({
+const SidebarItemTemplateWithData = ({
 	room,
 	id,
 	selected,
 	style,
 	extended,
-	SideBarItemTemplate,
+	SidebarItemTemplate,
 	AvatarTemplate,
 	t,
 	isAnonymous,
@@ -132,19 +132,19 @@ const SideBarItemTemplateWithData = ({
 
 	const highlighted = Boolean(!hideUnreadStatus && (alert || unread));
 	const icon = (
-		// TODO: Remove icon='at'
-		<Sidebar.Item.Icon highlighted={highlighted} icon='at'>
-			<RoomIcon room={room} placement='sidebar' isIncomingCall={Boolean(videoConfActions)} />
-		</Sidebar.Item.Icon>
+		<SidebarV2ItemIcon
+			highlighted={highlighted}
+			icon={<RoomIcon room={room} placement='sidebar' size='x20' isIncomingCall={Boolean(videoConfActions)} />}
+		/>
 	);
 
 	const actions = useMemo(
 		() =>
 			videoConfActions && (
-				<SidebarItemActions>
-					<SidebarItemAction onClick={videoConfActions.acceptCall} secondary success icon='phone' />
-					<SidebarItemAction onClick={videoConfActions.rejectCall} secondary danger icon='phone-off' />
-				</SidebarItemActions>
+				<SidebarV2Actions>
+					<SidebarV2Action onClick={videoConfActions.acceptCall} mini secondary success icon='phone' />
+					<SidebarV2Action onClick={videoConfActions.rejectCall} mini secondary danger icon='phone-off' />
+				</SidebarV2Actions>
 			),
 		[videoConfActions],
 	);
@@ -165,21 +165,22 @@ const SideBarItemTemplateWithData = ({
 	const badgeTitle = getBadgeTitle(userMentions, tunread.length, groupMentions, unread, t);
 
 	const badges = (
-		<Margins inlineStart={8}>
+		<>
 			{showBadge && isUnread && (
-				<Badge {...({ style: { display: 'inline-flex', flexShrink: 0 } } as any)} variant={variant} title={badgeTitle}>
+				<SidebarV2ItemBadge variant={variant} title={badgeTitle}>
 					{unread + tunread?.length}
-				</Badge>
+				</SidebarV2ItemBadge>
 			)}
 			{isOmnichannelRoom(room) && <OmnichannelBadges room={room} />}
-		</Margins>
+		</>
 	);
 
 	return (
-		<SideBarItemTemplate
+		<SidebarItemTemplate
 			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}
@@ -229,7 +230,7 @@ const keys: (keyof RoomListRowProps)[] = [
 	'style',
 	'extended',
 	'selected',
-	'SideBarItemTemplate',
+	'SidebarItemTemplate',
 	'AvatarTemplate',
 	't',
 	'sidebarViewMode',
@@ -237,7 +238,7 @@ const keys: (keyof RoomListRowProps)[] = [
 ];
 
 // eslint-disable-next-line react/no-multi-comp
-export default memo(SideBarItemTemplateWithData, (prevProps, nextProps) => {
+export default memo(SidebarItemTemplateWithData, (prevProps, nextProps) => {
 	if (keys.some((key) => prevProps[key] !== nextProps[key])) {
 		return false;
 	}
diff --git a/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts b/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts
index f5c2d00d4b2c..343df536c3f4 100644
--- a/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts
+++ b/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts
@@ -1,8 +1,8 @@
 import { useFocusManager } from '@react-aria/focus';
 import { useCallback } from 'react';
 
-const isListItem = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-item');
-const isListItemMenu = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-item__menu');
+const isListItem = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-item');
+const isListItemMenu = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-item__menu');
 
 /**
  * Custom hook to provide the sidebar navigation by keyboard.
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/Sidebar.tsx b/apps/meteor/client/sidebarv2/Sidebar.tsx
index 573d90dd0d23..7209f51507d9 100644
--- a/apps/meteor/client/sidebarv2/Sidebar.tsx
+++ b/apps/meteor/client/sidebarv2/Sidebar.tsx
@@ -1,5 +1,4 @@
-import { css } from '@rocket.chat/css-in-js';
-import { Box } from '@rocket.chat/fuselage';
+import { SidebarV2 } from '@rocket.chat/fuselage';
 import { useSessionStorage } from '@rocket.chat/fuselage-hooks';
 import { useSetting, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
@@ -15,31 +14,18 @@ const Sidebar = () => {
 	const [bannerDismissed, setBannerDismissed] = useSessionStorage('presence_cap_notifier', false);
 	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
 
-	const sidebarLink = css`
-		a {
-			text-decoration: none;
-		}
-	`;
-
 	return (
-		<Box
-			display='flex'
-			flexDirection='column'
-			height='100%'
-			is='nav'
-			className={[
-				'rcx-sidebar--main',
-				`rcx-sidebar rcx-sidebar--${sidebarViewMode}`,
-				sidebarHideAvatar && 'rcx-sidebar--hide-avatar',
-				sidebarLink,
-			].filter(Boolean)}
+		<SidebarV2
 			aria-label='sidebar'
+			className={['rcx-sidebar--main', `rcx-sidebar rcx-sidebar--${sidebarViewMode}`, sidebarHideAvatar && 'rcx-sidebar--hide-avatar']
+				.filter(Boolean)
+				.join(' ')}
 		>
 			<SearchSection />
 			{presenceDisabled && !bannerDismissed && <StatusDisabledSection onDismiss={() => setBannerDismissed(true)} />}
 			<SidebarRoomList />
 			<SidebarFooter />
-		</Box>
+		</SidebarV2>
 	);
 };
 
diff --git a/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx b/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
index 38a1df5a5ec8..2ff468f4f72b 100644
--- a/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
+++ b/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
@@ -222,7 +222,7 @@ const CreateChannelModal = ({ teamId = '', onClose, reload }: CreateChannelModal
 								id={nameId}
 								data-qa-type='channel-name-input'
 								{...register('name', {
-									required: t('error-the-field-is-required', { field: t('Name') }),
+									required: t('Required_field', { field: t('Name') }),
 									validate: (value) => validateChannelName(value),
 								})}
 								error={errors.name?.message}
diff --git a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
index e907558ce278..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
@@ -183,7 +196,7 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 								id={nameId}
 								aria-invalid={errors.name ? 'true' : 'false'}
 								{...register('name', {
-									required: t('error-the-field-is-required', { field: t('Name') }),
+									required: t('Required_field', { field: t('Name') }),
 									validate: (value) => validateTeamName(value),
 								})}
 								addon={<Icon size='x20' name={isPrivate ? 'team-lock' : 'team'} />}
@@ -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/SearchList.tsx b/apps/meteor/client/sidebarv2/header/SearchList.tsx
index 70c666fead50..b132af80f674 100644
--- a/apps/meteor/client/sidebarv2/header/SearchList.tsx
+++ b/apps/meteor/client/sidebarv2/header/SearchList.tsx
@@ -34,7 +34,7 @@ const SearchList = ({ filterText, onEscSearch }: SearchListProps) => {
 		() => ({
 			items,
 			t,
-			SideBarItemTemplate: sideBarItemTemplate,
+			SidebarItemTemplate: sideBarItemTemplate,
 			avatarTemplate,
 			useRealName,
 			extended,
diff --git a/apps/meteor/client/sidebarv2/header/SearchSection.tsx b/apps/meteor/client/sidebarv2/header/SearchSection.tsx
index c1f3f8cf8c21..71b26b2e4053 100644
--- a/apps/meteor/client/sidebarv2/header/SearchSection.tsx
+++ b/apps/meteor/client/sidebarv2/header/SearchSection.tsx
@@ -1,5 +1,5 @@
 import { css } from '@rocket.chat/css-in-js';
-import { Box, Icon, TextInput, Palette, Sidebar } from '@rocket.chat/fuselage';
+import { Box, Icon, TextInput, Palette, SidebarV2Section } from '@rocket.chat/fuselage';
 import { useMergedRefs, useOutsideClick } from '@rocket.chat/fuselage-hooks';
 import { useTranslation, useUser } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useEffect, useRef } from 'react';
@@ -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,19 +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'>
-			<Box
-				pi={16}
-				h='x44'
-				display='flex'
-				alignItems='center'
-				className={css`
-					gap: 8px;
-				`}
-			>
+			<SidebarV2Section>
 				<TextInput
-					placeholder={t('Search')}
+					placeholder={placeholder}
 					{...rest}
 					ref={mergedRefs}
 					role='searchbox'
@@ -94,8 +114,7 @@ const SearchSection = () => {
 						<CreateRoom />
 					</>
 				)}
-			</Box>
-			<Sidebar.Divider />
+			</SidebarV2Section>
 			{isDirty && <SearchList filterText={filterText} onEscSearch={handleEscSearch} />}
 		</Box>
 	);
diff --git a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
index 478e7cce33e1..f12de10f19f9 100644
--- a/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/CreateRoom.tsx
@@ -1,9 +1,9 @@
-import { Sidebar } from '@rocket.chat/fuselage';
+import { SidebarV2Action } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import { useCreateRoom } from './hooks/useCreateRoomMenu';
 
 type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
@@ -13,7 +13,7 @@ const CreateRoom = (props: CreateRoomProps) => {
 
 	const sections = useCreateRoom();
 
-	return <GenericMenu icon='edit-rounded' sections={sections} title={t('Create_new')} is={Sidebar.TopBar.Action} {...props} />;
+	return <GenericMenu icon='edit-rounded' sections={sections} title={t('Create_new')} is={SidebarV2Action} {...props} />;
 };
 
 export default CreateRoom;
diff --git a/apps/meteor/client/sidebarv2/header/actions/Search.tsx b/apps/meteor/client/sidebarv2/header/actions/Search.tsx
deleted file mode 100644
index 06d42114d76b..000000000000
--- a/apps/meteor/client/sidebarv2/header/actions/Search.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Sidebar } from '@rocket.chat/fuselage';
-import { useEffectEvent, useOutsideClick } from '@rocket.chat/fuselage-hooks';
-import type { HTMLAttributes } from 'react';
-import React, { useState, useEffect, useRef } from 'react';
-import tinykeys from 'tinykeys';
-
-import SearchList from '../../search/SearchList';
-
-type SearchProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
-
-const Search = (props: SearchProps) => {
-	const [searchOpen, setSearchOpen] = useState(false);
-
-	const ref = useRef<HTMLElement>(null);
-	const handleCloseSearch = useEffectEvent(() => {
-		setSearchOpen(false);
-	});
-
-	useOutsideClick([ref], handleCloseSearch);
-
-	const openSearch = useEffectEvent(() => {
-		setSearchOpen(true);
-	});
-
-	useEffect(() => {
-		const unsubscribe = tinykeys(window, {
-			'$mod+K': (event) => {
-				event.preventDefault();
-				openSearch();
-			},
-			'$mod+P': (event) => {
-				event.preventDefault();
-				openSearch();
-			},
-		});
-
-		return (): void => {
-			unsubscribe();
-		};
-	}, [openSearch]);
-
-	return (
-		<>
-			<Sidebar.TopBar.Action icon='magnifier' onClick={openSearch} {...props} />
-			{searchOpen && <SearchList ref={ref} onClose={handleCloseSearch} />}
-		</>
-	);
-};
-
-export default Search;
diff --git a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
index e7f3b398e5f6..d5394c28c6e6 100644
--- a/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/Sort.tsx
@@ -1,9 +1,9 @@
-import { Sidebar } from '@rocket.chat/fuselage';
+import { SidebarV2Action } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import { useSortMenu } from './hooks/useSortMenu';
 
 type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
@@ -13,9 +13,7 @@ const Sort = (props: SortProps) => {
 
 	const sections = useSortMenu();
 
-	return (
-		<GenericMenu icon='sort' sections={sections} title={t('Display')} selectionMode='multiple' is={Sidebar.TopBar.Action} {...props} />
-	);
+	return <GenericMenu icon='sort' sections={sections} title={t('Display')} selectionMode='multiple' is={SidebarV2Action} {...props} />;
 };
 
 export default Sort;
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomItems.tsx
index 3935ad0039df..4d313975d6f5 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomItems.tsx
@@ -1,7 +1,7 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useSetting, useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
 
 import CreateDiscussion from '../../../../components/CreateDiscussion';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import CreateChannelModal from '../../CreateChannelModal';
 import CreateDirectMessage from '../../CreateDirectMessage';
 import CreateTeamModal from '../../CreateTeamModal';
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx
index 646b85c838be..5dcb53f2ad2f 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx
@@ -1,9 +1,8 @@
 import { CheckBox } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 export const useGroupingListItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts b/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
index b3ac63f13773..7e628378749d 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useMatrixFederationItems.ts
@@ -1,6 +1,6 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import MatrixFederationSearch from '../../MatrixFederationSearch';
 import { useCreateRoomModal } from '../../hooks/useCreateRoomModal';
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx
index 56041ab4e571..0e2bf818a0bf 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx
@@ -1,8 +1,8 @@
 import { RadioButton } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import {
 	OmnichannelSortingDisclaimer,
 	useOmnichannelSortingDisclaimer,
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx
index ca2855d09db5..a33230a15729 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx
@@ -1,9 +1,8 @@
 import { RadioButton, ToggleSwitch } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
-
 export const useViewModeItems = (): GenericMenuItemProps[] => {
 	const t = useTranslation();
 
diff --git a/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx b/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx
index 9fd1023a32e7..e5bf780ee5b0 100644
--- a/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx
+++ b/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx
@@ -18,7 +18,7 @@ export const useAvatarTemplate = (
 			return null;
 		}
 
-		const size = ((): 'x36' | 'x28' | 'x16' => {
+		const size = ((): 'x36' | 'x28' | 'x20' => {
 			switch (viewMode) {
 				case 'extended':
 					return 'x36';
@@ -26,7 +26,7 @@ export const useAvatarTemplate = (
 					return 'x28';
 				case 'condensed':
 				default:
-					return 'x16';
+					return 'x20';
 			}
 		})();
 
diff --git a/apps/meteor/client/sidebarv2/search/Row.tsx b/apps/meteor/client/sidebarv2/search/Row.tsx
index 68ceecd2ad88..f8541546ec4b 100644
--- a/apps/meteor/client/sidebarv2/search/Row.tsx
+++ b/apps/meteor/client/sidebarv2/search/Row.tsx
@@ -2,7 +2,7 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 
-import SideBarItemTemplateWithData from '../RoomList/SideBarItemTemplateWithData';
+import SidebarItemTemplateWithData from '../RoomList/SidebarItemTemplateWithData';
 import UserItem from './UserItem';
 
 type RowProps = {
@@ -11,7 +11,7 @@ type RowProps = {
 };
 
 const Row = ({ item, data }: RowProps): ReactElement => {
-	const { t, SideBarItemTemplate, avatarTemplate: AvatarTemplate, useRealName, extended } = data;
+	const { t, SidebarItemTemplate, avatarTemplate: AvatarTemplate, useRealName, extended } = data;
 
 	if (item.t === 'd' && !item.u) {
 		return (
@@ -20,18 +20,18 @@ const Row = ({ item, data }: RowProps): ReactElement => {
 				useRealName={useRealName}
 				t={t}
 				item={item}
-				SideBarItemTemplate={SideBarItemTemplate}
+				SidebarItemTemplate={SidebarItemTemplate}
 				AvatarTemplate={AvatarTemplate}
 			/>
 		);
 	}
 	return (
-		<SideBarItemTemplateWithData
+		<SidebarItemTemplateWithData
 			id={`search-${item._id}`}
 			extended={extended}
 			t={t}
 			room={item}
-			SideBarItemTemplate={SideBarItemTemplate}
+			SidebarItemTemplate={SidebarItemTemplate}
 			AvatarTemplate={AvatarTemplate}
 		/>
 	);
diff --git a/apps/meteor/client/sidebarv2/search/SearchList.tsx b/apps/meteor/client/sidebarv2/search/SearchList.tsx
deleted file mode 100644
index c43fe854ac30..000000000000
--- a/apps/meteor/client/sidebarv2/search/SearchList.tsx
+++ /dev/null
@@ -1,382 +0,0 @@
-import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
-import { css } from '@rocket.chat/css-in-js';
-import { Sidebar, TextInput, Box, Icon } from '@rocket.chat/fuselage';
-import { useMutableCallback, useDebouncedValue, useAutoFocus, useUniqueId, useMergedRefs } from '@rocket.chat/fuselage-hooks';
-import { escapeRegExp } from '@rocket.chat/string-helpers';
-import { useUserPreference, useUserSubscriptions, useSetting, useTranslation, useMethod } from '@rocket.chat/ui-contexts';
-import type { UseQueryResult } from '@tanstack/react-query';
-import { useQuery } from '@tanstack/react-query';
-import type {
-	ReactElement,
-	MutableRefObject,
-	SetStateAction,
-	Dispatch,
-	FormEventHandler,
-	Ref,
-	MouseEventHandler,
-	ForwardedRef,
-} from 'react';
-import React, { forwardRef, useState, useMemo, useEffect, useRef } from 'react';
-import type { VirtuosoHandle } from 'react-virtuoso';
-import { Virtuoso } from 'react-virtuoso';
-import tinykeys from 'tinykeys';
-
-import { VirtuosoScrollbars } from '../../components/CustomScrollbars';
-import { getConfig } from '../../lib/utils/getConfig';
-import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
-import { usePreventDefault } from '../hooks/usePreventDefault';
-import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
-import Row from './Row';
-
-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;
-};
-
-declare global {
-	// eslint-disable-next-line @typescript-eslint/naming-convention
-	interface Window {
-		opera?: string;
-	}
-	// eslint-disable-next-line @typescript-eslint/naming-convention
-	interface Navigator {
-		userAgentData?: {
-			mobile: boolean;
-		};
-	}
-}
-
-const shortcut = ((): string => {
-	if (navigator.userAgentData?.mobile || mobileCheck()) {
-		return '';
-	}
-	if (window.navigator.platform.toLowerCase().includes('mac')) {
-		return '(\u2318+K)';
-	}
-	return '(Ctrl+K)';
-})();
-
-const LIMIT = parseInt(String(getConfig('Sidebar_Search_Spotlight_LIMIT', 20)));
-
-const options = {
-	sort: {
-		lm: -1,
-		name: 1,
-	},
-	limit: LIMIT,
-} as const;
-
-const useSearchItems = (filterText: string): UseQueryResult<(ISubscription & IRoom)[] | undefined, Error> => {
-	const [, mention, name] = useMemo(() => filterText.match(/(@|#)?(.*)/i) || [], [filterText]);
-	const query = useMemo(() => {
-		const filterRegex = new RegExp(escapeRegExp(name), 'i');
-
-		return {
-			$or: [{ name: filterRegex }, { fname: filterRegex }],
-			...(mention && {
-				t: mention === '@' ? 'd' : { $ne: 'd' },
-			}),
-		};
-	}, [name, mention]);
-
-	const localRooms = useUserSubscriptions(query, options);
-
-	const usernamesFromClient = [...localRooms?.map(({ t, name }) => (t === 'd' ? name : null))].filter(Boolean) as string[];
-
-	const searchForChannels = mention === '#';
-	const searchForDMs = mention === '@';
-
-	const type = useMemo(() => {
-		if (searchForChannels) {
-			return { users: false, rooms: true, includeFederatedRooms: true };
-		}
-		if (searchForDMs) {
-			return { users: true, rooms: false };
-		}
-		return { users: true, rooms: true, includeFederatedRooms: true };
-	}, [searchForChannels, searchForDMs]);
-
-	const getSpotlight = useMethod('spotlight');
-
-	return useQuery(
-		['sidebar/search/spotlight', name, usernamesFromClient, type, localRooms.map(({ _id, name }) => _id + name)],
-		async () => {
-			if (localRooms.length === LIMIT) {
-				return localRooms;
-			}
-
-			const spotlight = await getSpotlight(name, usernamesFromClient, type);
-
-			const filterUsersUnique = ({ _id }: { _id: string }, index: number, arr: { _id: string }[]): boolean =>
-				index === arr.findIndex((user) => _id === user._id);
-
-			const roomFilter = (room: { t: string; uids?: string[]; _id: string; name?: string }): boolean =>
-				!localRooms.find(
-					(item) =>
-						(room.t === 'd' && room.uids && room.uids.length > 1 && room.uids?.includes(item._id)) ||
-						[item.rid, item._id].includes(room._id),
-				);
-			const usersFilter = (user: { _id: string }): boolean =>
-				!localRooms.find((room) => room.t === 'd' && room.uids && room.uids?.length === 2 && room.uids.includes(user._id));
-
-			const userMap = (user: {
-				_id: string;
-				name: string;
-				username: string;
-				avatarETag?: string;
-			}): {
-				_id: string;
-				t: string;
-				name: string;
-				fname: string;
-				avatarETag?: string;
-			} => ({
-				_id: user._id,
-				t: 'd',
-				name: user.username,
-				fname: user.name,
-				avatarETag: user.avatarETag,
-			});
-
-			type resultsFromServerType = {
-				_id: string;
-				t: string;
-				name: string;
-				teamMain?: boolean;
-				fname?: string;
-				avatarETag?: string | undefined;
-				uids?: string[] | undefined;
-			}[];
-
-			const resultsFromServer: resultsFromServerType = [];
-			resultsFromServer.push(...spotlight.users.filter(filterUsersUnique).filter(usersFilter).map(userMap));
-			resultsFromServer.push(...spotlight.rooms.filter(roomFilter));
-
-			const exact = resultsFromServer?.filter((item) => [item.name, item.fname].includes(name));
-			return Array.from(new Set([...exact, ...localRooms, ...resultsFromServer]));
-		},
-		{
-			staleTime: 60_000,
-			keepPreviousData: true,
-			placeholderData: localRooms,
-		},
-	);
-};
-
-const useInput = (initial: string): { value: string; onChange: FormEventHandler; setValue: Dispatch<SetStateAction<string>> } => {
-	const [value, setValue] = useState(initial);
-	const onChange = useMutableCallback((e) => {
-		setValue(e.currentTarget.value);
-	});
-	return { value, onChange, setValue };
-};
-
-const toggleSelectionState = (next: HTMLElement, current: HTMLElement | undefined, input: HTMLElement | undefined): void => {
-	input?.setAttribute('aria-activedescendant', next.id);
-	next.setAttribute('aria-selected', 'true');
-	next.classList.add('rcx-sidebar-item--selected');
-	if (current) {
-		current.removeAttribute('aria-selected');
-		current.classList.remove('rcx-sidebar-item--selected');
-	}
-};
-
-type SearchListProps = {
-	onClose: () => void;
-};
-
-const SearchList = forwardRef(function SearchList({ onClose }: SearchListProps, ref: ForwardedRef<any>) {
-	const listId = useUniqueId();
-	const t = useTranslation();
-	const { setValue: setFilterValue, ...filter } = useInput('');
-
-	const cursorRef = useRef<HTMLInputElement>(null);
-	const autofocus: Ref<HTMLInputElement> = useMergedRefs(useAutoFocus<HTMLInputElement>(), cursorRef);
-
-	const listRef = useRef<VirtuosoHandle>(null);
-	const boxRef = useRef<HTMLDivElement>(null);
-
-	const selectedElement: MutableRefObject<HTMLElement | null | undefined> = useRef(null);
-	const itemIndexRef = useRef(0);
-
-	const sidebarViewMode = useUserPreference('sidebarViewMode');
-	const useRealName = useSetting('UI_Use_Real_Name');
-
-	const sideBarItemTemplate = useTemplateByViewMode();
-	const avatarTemplate = useAvatarTemplate();
-
-	const extended = sidebarViewMode === 'extended';
-
-	const filterText = useDebouncedValue(filter.value, 100);
-
-	const placeholder = [t('Search'), shortcut].filter(Boolean).join(' ');
-
-	const { data: items = [], isLoading } = useSearchItems(filterText);
-
-	const itemData = useMemo(
-		() => ({
-			items,
-			t,
-			SideBarItemTemplate: sideBarItemTemplate,
-			avatarTemplate,
-			useRealName,
-			extended,
-			sidebarViewMode,
-		}),
-		[avatarTemplate, extended, items, useRealName, sideBarItemTemplate, sidebarViewMode, t],
-	);
-
-	const changeSelection = useMutableCallback((dir) => {
-		let nextSelectedElement = null;
-
-		if (dir === 'up') {
-			const potentialElement = selectedElement.current?.parentElement?.previousSibling as HTMLElement;
-			if (potentialElement) {
-				nextSelectedElement = potentialElement.querySelector('a');
-			}
-		} else {
-			const potentialElement = selectedElement.current?.parentElement?.nextSibling as HTMLElement;
-			if (potentialElement) {
-				nextSelectedElement = potentialElement.querySelector('a');
-			}
-		}
-
-		if (nextSelectedElement) {
-			toggleSelectionState(nextSelectedElement, selectedElement.current || undefined, cursorRef?.current || undefined);
-			return nextSelectedElement;
-		}
-		return selectedElement.current;
-	});
-
-	const resetCursor = useMutableCallback(() => {
-		setTimeout(() => {
-			itemIndexRef.current = 0;
-			listRef.current?.scrollToIndex({ index: itemIndexRef.current });
-			selectedElement.current = boxRef.current?.querySelector('a.rcx-sidebar-item');
-			if (selectedElement.current) {
-				toggleSelectionState(selectedElement.current, undefined, cursorRef?.current || undefined);
-			}
-		}, 0);
-	});
-
-	usePreventDefault(boxRef);
-
-	useEffect(() => {
-		resetCursor();
-	});
-
-	useEffect(() => {
-		resetCursor();
-	}, [filterText, resetCursor]);
-
-	useEffect(() => {
-		if (!cursorRef?.current) {
-			return;
-		}
-		return tinykeys(cursorRef?.current, {
-			Escape: (event) => {
-				event.preventDefault();
-				setFilterValue((value) => {
-					if (!value) {
-						onClose();
-					}
-					resetCursor();
-					return '';
-				});
-			},
-			Tab: onClose,
-			ArrowUp: () => {
-				const currentElement = changeSelection('up');
-				itemIndexRef.current = Math.max(itemIndexRef.current - 1, 0);
-				listRef.current?.scrollToIndex({ index: itemIndexRef.current });
-				selectedElement.current = currentElement;
-			},
-			ArrowDown: () => {
-				const currentElement = changeSelection('down');
-				itemIndexRef.current = Math.min(itemIndexRef.current + 1, items.length + 1);
-				listRef.current?.scrollToIndex({ index: itemIndexRef.current });
-				selectedElement.current = currentElement;
-			},
-			Enter: (event) => {
-				event.preventDefault();
-				if (selectedElement.current && items.length > 0) {
-					selectedElement.current.click();
-				} else {
-					onClose();
-				}
-			},
-		});
-	}, [cursorRef, changeSelection, items.length, onClose, resetCursor, setFilterValue]);
-
-	const handleClick: MouseEventHandler<HTMLElement> = (e): void => {
-		if (e.target instanceof Element && [e.target.tagName, e.target.parentElement?.tagName].includes('BUTTON')) {
-			return;
-		}
-		return onClose();
-	};
-
-	return (
-		<Box
-			position='absolute'
-			rcx-sidebar
-			h='full'
-			display='flex'
-			flexDirection='column'
-			zIndex={99}
-			w='full'
-			className={css`
-				left: 0;
-				top: 0;
-			`}
-			ref={ref}
-			role='search'
-		>
-			<Sidebar.TopBar.Section {...({ flexShrink: 0 } as any)} is='form'>
-				<TextInput
-					aria-owns={listId}
-					ref={autofocus}
-					{...filter}
-					placeholder={placeholder}
-					role='searchbox'
-					addon={<Icon name='cross' size='x20' onClick={onClose} />}
-				/>
-			</Sidebar.TopBar.Section>
-			<Box
-				ref={boxRef}
-				role='listbox'
-				id={listId}
-				tabIndex={-1}
-				flexShrink={1}
-				h='full'
-				w='full'
-				aria-live='polite'
-				aria-atomic='true'
-				aria-busy={isLoading}
-				onClick={handleClick}
-			>
-				<Virtuoso
-					style={{ height: '100%', width: '100%' }}
-					totalCount={items.length}
-					data={items}
-					components={{ Scroller: VirtuosoScrollbars }}
-					computeItemKey={(_, room) => room._id}
-					itemContent={(_, data): ReactElement => <Row data={itemData} item={data} />}
-					ref={listRef}
-				/>
-			</Box>
-		</Box>
-	);
-});
-
-export default SearchList;
diff --git a/apps/meteor/client/sidebarv2/search/UserItem.tsx b/apps/meteor/client/sidebarv2/search/UserItem.tsx
index 8b9667913311..9cfa97fd797c 100644
--- a/apps/meteor/client/sidebarv2/search/UserItem.tsx
+++ b/apps/meteor/client/sidebarv2/search/UserItem.tsx
@@ -1,5 +1,5 @@
 import type { IUser } from '@rocket.chat/core-typings';
-import { Sidebar } from '@rocket.chat/fuselage';
+import { SidebarV2ItemIcon } from '@rocket.chat/fuselage';
 import React, { memo } from 'react';
 
 import { ReactiveUserStatus } from '../../components/UserStatus';
@@ -13,24 +13,20 @@ type UserItemProps = {
 		t: string;
 	};
 	t: (value: string) => string;
-	SideBarItemTemplate: any;
+	SidebarItemTemplate: any;
 	AvatarTemplate: any;
 	id: string;
 	style?: CSSStyleRule;
 	useRealName?: boolean;
 };
 
-const UserItem = ({ item, id, style, t, SideBarItemTemplate, AvatarTemplate, useRealName }: UserItemProps) => {
+const UserItem = ({ item, id, style, t, SidebarItemTemplate, AvatarTemplate, useRealName }: UserItemProps) => {
 	const title = useRealName ? item.fname || item.name : item.name || item.fname;
-	const icon = (
-		<Sidebar.Item.Icon icon={'' as any}>
-			<ReactiveUserStatus uid={item._id} />
-		</Sidebar.Item.Icon>
-	);
+	const icon = <SidebarV2ItemIcon icon={<ReactiveUserStatus uid={item._id} />} />;
 	const href = roomCoordinator.getRouteLink(item.t, { name: item.name });
 
 	return (
-		<SideBarItemTemplate
+		<SidebarItemTemplate
 			is='a'
 			style={{ height: '100%', ...style }}
 			id={id}
diff --git a/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx b/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
index 50367d7db3e5..a0f3245e8835 100644
--- a/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
+++ b/apps/meteor/client/sidebarv2/sections/StatusDisabledSection.tsx
@@ -1,4 +1,4 @@
-import { SidebarBanner } from '@rocket.chat/fuselage';
+import { SidebarV2Banner } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -11,11 +11,11 @@ const StatusDisabledSection = ({ onDismiss }: StatusDisabledSectionProps) => {
 	const handleStatusDisabledModal = useStatusDisabledModal();
 
 	return (
-		<SidebarBanner
-			text={t('User_status_temporarily_disabled')}
-			description={t('Learn_more')}
+		<SidebarV2Banner
+			title={t('User_status_temporarily_disabled')}
+			linkText={t('Learn_more')}
 			onClose={onDismiss}
-			onClick={handleStatusDisabledModal}
+			linkProps={{ onClick: handleStatusDisabledModal, tabIndex: 0 }}
 		/>
 	);
 };
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/AccountFeaturePreviewPage.tsx b/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewPage.tsx
index c8cd7138e5a6..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,11 +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 AccountFeaturePreviewPage = () => {
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
-	const { features, unseenFeatures } = useFeaturePreviewList();
+	const { features, unseenFeatures } = usePreferenceFeaturePreviewList();
 
 	const setUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
 
@@ -70,12 +71,7 @@ const AccountFeaturePreviewPage = () => {
 		setValue('featuresPreview', updated, { shouldDirty: true });
 	};
 
-	const grouppedFeaturesPreview = Object.entries(
-		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>
@@ -90,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) => (
@@ -108,7 +101,13 @@ const AccountFeaturePreviewPage = () => {
 													<Field>
 														<FieldRow>
 															<FieldLabel htmlFor={feature.name}>{t(feature.i18n)}</FieldLabel>
-															<ToggleSwitch id={feature.name} checked={feature.value} name={feature.name} onChange={handleFeatures} />
+															<ToggleSwitch
+																id={feature.name}
+																checked={feature.value}
+																name={feature.name}
+																onChange={handleFeatures}
+																disabled={feature.disabled}
+															/>
 														</FieldRow>
 														{feature.description && <FieldHint mbs={12}>{t(feature.description)}</FieldHint>}
 													</Field>
diff --git a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
index 2c11b7a384cd..ce9fad8591fa 100644
--- a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
+++ b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
@@ -1,6 +1,6 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
-import { SelectLegacy, Box, Button, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
-import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { SelectLegacy, Box, Button, Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
@@ -13,7 +13,11 @@ import { useRemoveWebDAVAccountIntegrationMutation } from './hooks/useRemoveWebD
 const AccountIntegrationsPage = () => {
 	const { data: webdavAccountIntegrations } = useWebDAVAccountIntegrationsQuery();
 
-	const { handleSubmit, control } = useForm<{ accountSelected: string }>();
+	const {
+		handleSubmit,
+		control,
+		formState: { errors },
+	} = useForm<{ accountSelected: string }>();
 
 	const options: SelectOption[] = useMemo(
 		() => webdavAccountIntegrations?.map(({ _id, ...current }) => [_id, getWebdavServerName(current)]) ?? [],
@@ -36,6 +40,8 @@ const AccountIntegrationsPage = () => {
 		removeMutation.mutate({ accountSelected });
 	});
 
+	const accountSelectedId = useUniqueId();
+
 	return (
 		<Page>
 			<PageHeader title={t('Integrations')} />
@@ -47,22 +53,18 @@ const AccountIntegrationsPage = () => {
 							<Controller
 								control={control}
 								name='accountSelected'
-								rules={{ required: true }}
-								render={({ field: { onChange, value, name, ref } }) => (
-									<SelectLegacy
-										ref={ref}
-										name={name}
-										options={options}
-										onChange={onChange}
-										value={value}
-										placeholder={t('Select_an_option')}
-									/>
-								)}
+								rules={{ required: t('Required_field', { field: t('WebDAV_Accounts') }) }}
+								render={({ field }) => <SelectLegacy {...field} options={options} placeholder={t('Select_an_option')} />}
 							/>
 							<Button type='submit' danger>
 								{t('Remove')}
 							</Button>
 						</FieldRow>
+						{errors?.accountSelected && (
+							<FieldError aria-live='assertive' id={`${accountSelectedId}-error`}>
+								{errors.accountSelected.message}
+							</FieldError>
+						)}
 					</Field>
 				</Box>
 			</PageScrollableContentWithShadow>
diff --git a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
index 0de462cd5bd3..95398b352049 100644
--- a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
@@ -166,7 +166,9 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 							<Controller
 								control={control}
 								name='name'
-								rules={{ validate: (name) => (requireName && name === '' ? t('error-the-field-is-required', { field: t('Name') }) : true) }}
+								rules={{
+									required: requireName && t('Required_field', { field: t('Name') }),
+								}}
 								render={({ field }) => (
 									<TextInput
 										{...field}
@@ -196,7 +198,7 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 								control={control}
 								name='username'
 								rules={{
-									required: t('error-the-field-is-required', { field: t('Username') }),
+									required: t('Required_field', { field: t('Username') }),
 									validate: (username) => validateUsername(username),
 								}}
 								render={({ field }) => (
@@ -305,7 +307,10 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 						<Controller
 							control={control}
 							name='email'
-							rules={{ validate: { validateEmail: (email) => (validateEmail(email) ? undefined : t('error-invalid-email-address')) } }}
+							rules={{
+								required: t('Required_field', { field: t('Email') }),
+								validate: { validateEmail: (email) => (validateEmail(email) ? undefined : t('error-invalid-email-address')) },
+							}}
 							render={({ field }) => (
 								<TextInput
 									{...field}
diff --git a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
index 536ba8a04ef7..81435536e981 100644
--- a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
+++ b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
@@ -1,6 +1,6 @@
 import { Box, Accordion, ButtonGroup, Button } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting, useTranslation, useUser } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
@@ -15,10 +15,15 @@ const passwordDefaultValues = { password: '', confirmationPassword: '' };
 
 const AccountSecurityPage = (): ReactElement => {
 	const t = useTranslation();
+	const user = useUser();
+
+	const isEmail2FAAvailableForOAuth = useSetting('Accounts_twoFactorAuthentication_email_available_for_OAuth_users');
+	const isOAuthUser = user?.isOAuthUser;
+	const isEmail2FAAllowed = !isOAuthUser || isEmail2FAAvailableForOAuth;
 
 	const methods = useForm({
 		defaultValues: passwordDefaultValues,
-		mode: 'onBlur',
+		mode: 'all',
 	});
 	const {
 		reset,
@@ -30,6 +35,7 @@ const AccountSecurityPage = (): ReactElement => {
 	const twoFactorByEmailEnabled = useSetting('Accounts_TwoFactorAuthentication_By_Email_Enabled');
 	const e2eEnabled = useSetting('E2E_Enable');
 	const allowPasswordChange = useSetting('Accounts_AllowPasswordChange');
+	const showEmailTwoFactor = twoFactorByEmailEnabled && isEmail2FAAllowed;
 
 	const passwordFormId = useUniqueId();
 
@@ -48,10 +54,10 @@ const AccountSecurityPage = (): ReactElement => {
 						</FormProvider>
 					)}
 					<Accordion>
-						{(twoFactorTOTP || twoFactorByEmailEnabled) && twoFactorEnabled && (
+						{(twoFactorTOTP || showEmailTwoFactor) && twoFactorEnabled && (
 							<Accordion.Item title={t('Two Factor Authentication')}>
 								{twoFactorTOTP && <TwoFactorTOTP />}
-								{twoFactorByEmailEnabled && <TwoFactorEmail />}
+								{showEmailTwoFactor && <TwoFactorEmail />}
 							</Accordion.Item>
 						)}
 						{e2eEnabled && (
diff --git a/apps/meteor/client/views/account/security/ChangePassword.tsx b/apps/meteor/client/views/account/security/ChangePassword.tsx
index c70d9e166175..e5cb61e34547 100644
--- a/apps/meteor/client/views/account/security/ChangePassword.tsx
+++ b/apps/meteor/client/views/account/security/ChangePassword.tsx
@@ -53,13 +53,13 @@ const ChangePassword = (props: AllHTMLAttributes<HTMLFormElement>) => {
 							control={control}
 							name='password'
 							rules={{
+								required: t('Required_field', { field: t('New_password') }),
 								validate: () => (password?.length && !passwordIsValid ? t('Password_must_meet_the_complexity_requirements') : true),
 							}}
-							render={({ field: { onChange, value } }) => (
+							render={({ field }) => (
 								<PasswordInput
+									{...field}
 									id={passwordId}
-									onChange={onChange}
-									value={value}
 									error={errors.password?.message}
 									flexGrow={1}
 									addon={<Icon name='key' size='x20' />}
@@ -84,12 +84,14 @@ const ChangePassword = (props: AllHTMLAttributes<HTMLFormElement>) => {
 						<Controller
 							control={control}
 							name='confirmationPassword'
-							rules={{ validate: (confirmationPassword) => (password !== confirmationPassword ? t('Passwords_do_not_match') : true) }}
-							render={({ field: { onChange, value } }) => (
+							rules={{
+								required: t('Required_field', { field: t('Confirm_password') }),
+								validate: (confirmationPassword) => (password !== confirmationPassword ? t('Passwords_do_not_match') : true),
+							}}
+							render={({ field }) => (
 								<PasswordInput
+									{...field}
 									id={confirmPasswordId}
-									onChange={onChange}
-									value={value}
 									error={errors.confirmationPassword?.message}
 									flexGrow={1}
 									addon={<Icon name='key' size='x20' />}
diff --git a/apps/meteor/client/views/account/security/EndToEnd.tsx b/apps/meteor/client/views/account/security/EndToEnd.tsx
index 72213f3202ba..b2fb982ebb9b 100644
--- a/apps/meteor/client/views/account/security/EndToEnd.tsx
+++ b/apps/meteor/client/views/account/security/EndToEnd.tsx
@@ -1,8 +1,9 @@
 import { Box, Margins, PasswordInput, Field, FieldGroup, FieldLabel, FieldRow, FieldError, FieldHint, Button } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useMethod, useTranslation, useLogout } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { useCallback, useEffect } from 'react';
-import { useForm } from 'react-hook-form';
+import { Controller, useForm } from 'react-hook-form';
 
 import { e2e } from '../../../../app/e2e/client/rocketchat.e2e';
 
@@ -17,17 +18,17 @@ const EndToEnd = (props: ComponentProps<typeof Box>): ReactElement => {
 	const resetE2eKey = useMethod('e2e.resetOwnE2EKey');
 
 	const {
-		register,
 		handleSubmit,
 		watch,
 		resetField,
 		formState: { errors, isValid },
+		control,
 	} = useForm({
 		defaultValues: {
 			password: '',
 			passwordConfirm: '',
 		},
-		mode: 'onChange',
+		mode: 'all',
 	});
 
 	const { password } = watch();
@@ -64,37 +65,71 @@ const EndToEnd = (props: ComponentProps<typeof Box>): ReactElement => {
 		}
 	}, [password, resetField]);
 
+	const passwordId = useUniqueId();
+	const e2ePasswordExplanationId = useUniqueId();
+	const passwordConfirmId = useUniqueId();
+
 	return (
 		<Box display='flex' flexDirection='column' alignItems='flex-start' mbs={16} {...props}>
 			<Margins blockEnd={8}>
 				<Box fontScale='h4'>{t('E2E_Encryption_Password_Change')}</Box>
-				<Box dangerouslySetInnerHTML={{ __html: t('E2E_Encryption_Password_Explanation') }} />
+				<Box id={e2ePasswordExplanationId} dangerouslySetInnerHTML={{ __html: t('E2E_Encryption_Password_Explanation') }} />
 				<FieldGroup w='full'>
 					<Field>
-						<FieldLabel id='New_encryption_password'>{t('New_encryption_password')}</FieldLabel>
+						<FieldLabel htmlFor={passwordId}>{t('New_encryption_password')}</FieldLabel>
 						<FieldRow>
-							<PasswordInput
-								{...register('password', { required: true })}
-								placeholder={t('New_Password_Placeholder')}
-								disabled={!keysExist}
-								aria-labelledby='New_encryption_password'
+							<Controller
+								control={control}
+								name='password'
+								rules={{ required: t('Required_field', { field: t('New_encryption_password') }) }}
+								render={({ field }) => (
+									<PasswordInput
+										{...field}
+										id={passwordId}
+										error={errors.password?.message}
+										placeholder={t('New_Password_Placeholder')}
+										disabled={!keysExist}
+										aria-describedby={`${e2ePasswordExplanationId} ${passwordId}-hint ${passwordId}-error`}
+										aria-invalid={errors.password ? 'true' : 'false'}
+									/>
+								)}
 							/>
 						</FieldRow>
-						{!keysExist && <FieldHint>{t('EncryptionKey_Change_Disabled')}</FieldHint>}
+						{!keysExist && <FieldHint id={`${passwordId}-hint`}>{t('EncryptionKey_Change_Disabled')}</FieldHint>}
+						{errors?.password && (
+							<FieldError aria-live='assertive' id={`${passwordId}-error`}>
+								{errors.password.message}
+							</FieldError>
+						)}
 					</Field>
 					{hasTypedPassword && (
 						<Field>
-							<FieldLabel id='Confirm_new_encryption_password'>{t('Confirm_new_encryption_password')}</FieldLabel>
-							<PasswordInput
-								error={errors.passwordConfirm?.message}
-								{...register('passwordConfirm', {
-									required: true,
-									validate: (value: string) => (password !== value ? 'Your passwords do no match' : true),
-								})}
-								placeholder={t('Confirm_New_Password_Placeholder')}
-								aria-labelledby='Confirm_new_encryption_password'
-							/>
-							{errors.passwordConfirm && <FieldError>{errors.passwordConfirm.message}</FieldError>}
+							<FieldLabel htmlFor={passwordConfirmId}>{t('Confirm_new_encryption_password')}</FieldLabel>
+							<FieldRow>
+								<Controller
+									control={control}
+									name='passwordConfirm'
+									rules={{
+										required: t('Required_field', { field: t('Confirm_new_encryption_password') }),
+										validate: (value: string) => (password !== value ? 'Your passwords do no match' : true),
+									}}
+									render={({ field }) => (
+										<PasswordInput
+											{...field}
+											id={passwordConfirmId}
+											error={errors.passwordConfirm?.message}
+											placeholder={t('Confirm_New_Password_Placeholder')}
+											aria-describedby={`${passwordConfirmId}-error`}
+											aria-invalid={errors.password ? 'true' : 'false'}
+										/>
+									)}
+								/>
+							</FieldRow>
+							{errors.passwordConfirm && (
+								<FieldError aria-live='assertive' id={`${passwordConfirmId}-error`}>
+									{errors.passwordConfirm.message}
+								</FieldError>
+							)}
 						</Field>
 					)}
 				</FieldGroup>
diff --git a/apps/meteor/client/views/account/security/TwoFactorEmail.tsx b/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
index c890dc61e658..3654d17b5dec 100644
--- a/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
+++ b/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
@@ -1,11 +1,11 @@
 import { Box, Button, Margins } from '@rocket.chat/fuselage';
 import { useUser, useTranslation } from '@rocket.chat/ui-contexts';
-import type { ComponentProps, ReactElement } from 'react';
+import type { ComponentProps } from 'react';
 import React, { useCallback } from 'react';
 
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
 
-const TwoFactorEmail = (props: ComponentProps<typeof Box>): ReactElement => {
+const TwoFactorEmail = (props: ComponentProps<typeof Box>) => {
 	const t = useTranslation();
 	const user = useUser();
 
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/customEmoji/AddCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
index 31721cb4f7ab..1824a9ee6ab4 100644
--- a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
@@ -1,4 +1,4 @@
-import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, FieldError, Icon } from '@rocket.chat/fuselage';
+import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, FieldError, IconButton } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent } from 'react';
 import React, { useCallback, useState } from 'react';
@@ -82,7 +82,7 @@ const AddCustomEmoji = ({ close, onChange, ...props }: AddCustomEmojiProps): Rea
 					<FieldRow>
 						<TextInput value={name} onChange={handleChangeName} placeholder={t('Name')} />
 					</FieldRow>
-					{errors.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+					{errors.name && <FieldError>{t('Required_field', { field: t('Name') })}</FieldError>}
 				</Field>
 				<Field>
 					<FieldLabel>{t('Aliases')}</FieldLabel>
@@ -94,12 +94,9 @@ const AddCustomEmoji = ({ close, onChange, ...props }: AddCustomEmojiProps): Rea
 				<Field>
 					<FieldLabel alignSelf='stretch' display='flex' justifyContent='space-between' alignItems='center'>
 						{t('Custom_Emoji')}
-						{/* FIXME: replace to IconButton */}
-						<Button square onClick={clickUpload}>
-							<Icon name='upload' size='x20' />
-						</Button>
+						<IconButton secondary small icon='upload' onClick={clickUpload} />
 					</FieldLabel>
-					{errors.emoji && <FieldError>{t('error-the-field-is-required', { field: t('Custom_Emoji') })}</FieldError>}
+					{errors.emoji && <FieldError>{t('Required_field', { field: t('Custom_Emoji') })}</FieldError>}
 					{newEmojiPreview && (
 						<Box display='flex' flexDirection='row' mi='neg-x4' justifyContent='center'>
 							<Margins inline={4}>
diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
index 8f63b2ac7b48..49ee12b69dd0 100644
--- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
@@ -150,7 +150,7 @@ const EditCustomEmoji = ({ close, onChange, data, ...props }: EditCustomEmojiPro
 						<FieldRow>
 							<TextInput value={name} onChange={handleChangeName} placeholder={t('Name')} />
 						</FieldRow>
-						{errors.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+						{errors.name && <FieldError>{t('Required_field', { field: t('Name') })}</FieldError>}
 					</Field>
 					<Field>
 						<FieldLabel>{t('Aliases')}</FieldLabel>
diff --git a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
index 82f668a2d7d5..430d05ceaa53 100644
--- a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
@@ -1,4 +1,4 @@
-import { Field, FieldLabel, FieldRow, TextInput, Box, Icon, Margins, Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { Field, FieldLabel, FieldRow, TextInput, Box, Margins, Button, ButtonGroup, IconButton } from '@rocket.chat/fuselage';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, FormEvent } from 'react';
 import React, { useState, useCallback } from 'react';
@@ -34,8 +34,8 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
 			const soundData = createSoundData(soundFile, name);
 			const validation = validate(soundData, soundFile) as Array<Parameters<typeof t>[0]>;
 
-			validation.forEach((error) => {
-				throw new Error(t('error-the-field-is-required', { field: t(error) }));
+			validation.forEach((invalidFieldName) => {
+				throw new Error(t('Required_field', { field: t(invalidFieldName) }));
 			});
 
 			try {
@@ -97,12 +97,9 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
 				</Field>
 				<Field>
 					<FieldLabel alignSelf='stretch'>{t('Sound_File_mp3')}</FieldLabel>
-					<Box display='flex' flexDirection='row' mbs='none'>
+					<Box display='flex' flexDirection='row' mbs='none' alignItems='center'>
 						<Margins inline={4}>
-							{/* FIXME: replace to IconButton */}
-							<Button square onClick={clickUpload}>
-								<Icon name='upload' size='x20' />
-							</Button>
+							<IconButton secondary small icon='upload' onClick={clickUpload} />
 							{sound?.name || t('None')}
 						</Margins>
 					</Box>
@@ -111,7 +108,7 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
 			<ContextualbarFooter>
 				<ButtonGroup stretch>
 					<Button onClick={close}>{t('Cancel')}</Button>
-					<Button primary onClick={handleSave} disabled={name === ''}>
+					<Button primary onClick={handleSave}>
 						{t('Save')}
 					</Button>
 				</ButtonGroup>
diff --git a/apps/meteor/client/views/admin/customSounds/EditSound.tsx b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
index b358d0bb7c84..1274e9deda35 100644
--- a/apps/meteor/client/views/admin/customSounds/EditSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
@@ -76,10 +76,10 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
 				}
 			}
 
-			validation.forEach((error) =>
+			validation.forEach((invalidFieldName) =>
 				dispatchToastMessage({
 					type: 'error',
-					message: t('error-the-field-is-required', { field: t(error) }),
+					message: t('Required_field', { field: t(invalidFieldName) }),
 				}),
 			);
 		},
@@ -131,9 +131,9 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
 				</Field>
 				<Field>
 					<FieldLabel alignSelf='stretch'>{t('Sound_File_mp3')}</FieldLabel>
-					<Box display='flex' flexDirection='row' mbs='none'>
+					<Box display='flex' flexDirection='row' mbs='none' alignItems='center'>
 						<Margins inline={4}>
-							<IconButton icon='upload' secondary onClick={clickUpload} />
+							<IconButton secondary small icon='upload' onClick={clickUpload} />
 							{sound?.name || 'none'}
 						</Margins>
 					</Box>
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
index 78c2618b4c53..07376208aaef 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
@@ -28,9 +28,10 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor
 		register,
 		control,
 		handleSubmit,
-		formState: { isDirty, errors },
+		formState: { errors },
 	} = useForm({
 		defaultValues: { name: status?.name ?? '', statusType: status?.statusType ?? '' },
+		mode: 'all',
 	});
 
 	const saveStatus = useEndpoint('POST', _id ? '/v1/custom-user-status.update' : '/v1/custom-user-status.create');
@@ -94,9 +95,9 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor
 					<Field>
 						<FieldLabel>{t('Name')}</FieldLabel>
 						<FieldRow>
-							<TextInput {...register('name', { required: true })} placeholder={t('Name')} />
+							<TextInput {...register('name', { required: t('Required_field', { field: t('Name') }) })} placeholder={t('Name')} />
 						</FieldRow>
-						{errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+						{errors.name && <FieldError>{errors.name.message}</FieldError>}
 					</Field>
 					<Field>
 						<FieldLabel>{t('Presence')}</FieldLabel>
@@ -104,18 +105,18 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor
 							<Controller
 								name='statusType'
 								control={control}
-								rules={{ required: true }}
+								rules={{ required: t('Required_field', { field: t('Presence') }) }}
 								render={({ field }): ReactElement => <Select {...field} placeholder={t('Presence')} options={presenceOptions} />}
 							/>
 						</FieldRow>
-						{errors?.statusType && <FieldError>{t('error-the-field-is-required', { field: t('Presence') })}</FieldError>}
+						{errors.statusType && <FieldError>{errors.statusType.message}</FieldError>}
 					</Field>
 				</FieldGroup>
 			</ContextualbarScrollableContent>
 			<ContextualbarFooter>
 				<ButtonGroup stretch>
 					<Button onClick={onClose}>{t('Cancel')}</Button>
-					<Button form={formId} primary type='submit' disabled={!isDirty}>
+					<Button form={formId} primary type='submit'>
 						{t('Save')}
 					</Button>
 				</ButtonGroup>
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
index c5cbd6f6aa1d..3537eddf9cc5 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
@@ -66,6 +66,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 			imapSecure: inboxData?.imap.secure ?? false,
 			imapRetries: inboxData?.imap.maxRetries ?? 10,
 		},
+		mode: 'all',
 	});
 
 	const handleDelete = useMutableCallback(() => {
@@ -153,7 +154,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 		}
 
 		if (!validateEmail(email)) {
-			return t('Validate_email_address');
+			return t('error-invalid-email-address');
 		}
 
 		const { emailInbox } = await emailAlreadyExistsAction({ email });
@@ -211,7 +212,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='name'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Name') }) }}
+										rules={{ required: t('Required_field', { field: t('Name') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={nameField}
@@ -239,7 +240,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 										name='email'
 										control={control}
 										rules={{
-											required: t('error-the-field-is-required', { field: t('Email') }),
+											required: t('Required_field', { field: t('Email') }),
 											validate: (value) => checkEmailExists(value),
 										}}
 										render={({ field }) => (
@@ -313,7 +314,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='smtpServer'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Server') }) }}
+										rules={{ required: t('Required_field', { field: t('Server') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={smtpServerField}
@@ -340,7 +341,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='smtpPort'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Port') }) }}
+										rules={{ required: t('Required_field', { field: t('Port') }) }}
 										render={({ field }) => (
 											<NumberInput
 												id={smtpPortField}
@@ -367,7 +368,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='smtpUsername'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Username') }) }}
+										rules={{ required: t('Required_field', { field: t('Username') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={smtpUsernameField}
@@ -394,7 +395,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='smtpPassword'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Password') }) }}
+										rules={{ required: t('Required_field', { field: t('Password') }) }}
 										render={({ field }) => (
 											<PasswordInput
 												id={smtpPasswordField}
@@ -435,7 +436,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='imapServer'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Server') }) }}
+										rules={{ required: t('Required_field', { field: t('Server') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={imapServerField}
@@ -462,7 +463,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='imapPort'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Port') }) }}
+										rules={{ required: t('Required_field', { field: t('Port') }) }}
 										render={({ field }) => (
 											<NumberInput
 												id={imapPortField}
@@ -489,7 +490,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='imapUsername'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Username') }) }}
+										rules={{ required: t('Required_field', { field: t('Username') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={imapUsernameField}
@@ -516,7 +517,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='imapPassword'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Password') }) }}
+										rules={{ required: t('Required_field', { field: t('Password') }) }}
 										render={({ field }) => (
 											<PasswordInput
 												id={imapPasswordField}
@@ -543,7 +544,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
 									<Controller
 										name='imapRetries'
 										control={control}
-										rules={{ required: t('error-the-field-is-required', { field: t('Max_Retry') }) }}
+										rules={{ required: t('Required_field', { field: t('Max_Retry') }) }}
 										render={({ field }) => (
 											<NumberInput
 												id={imapRetriesField}
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/integrations/incoming/IncomingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
index bd43c76b2138..c463324b42cc 100644
--- a/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
@@ -167,7 +167,7 @@ const IncomingWebhookForm = ({ webhookData }: { webhookData?: Serialized<IIncomi
 								<Controller
 									name='channel'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Post_to_Channel')) }}
+									rules={{ required: t('Required_field', { field: t('Post_to_Channel') }) }}
 									render={({ field }) => (
 										<TextInput
 											id={channelField}
@@ -201,7 +201,7 @@ const IncomingWebhookForm = ({ webhookData }: { webhookData?: Serialized<IIncomi
 								<Controller
 									name='username'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Post_to_Channel')) }}
+									rules={{ required: t('Required_field', { field: t('Post_to_Channel') }) }}
 									render={({ field }) => (
 										<TextInput
 											id={usernameField}
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
index a14cdd2ada46..00c6f8270bfd 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
@@ -242,7 +242,7 @@ const OutgoingWebhookForm = () => {
 								<Controller
 									name='urls'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('URLs')) }}
+									rules={{ required: t('Required_field', { field: t('URLs') }) }}
 									render={({ field }) => (
 										<TextAreaInput
 											id={urlsField}
@@ -280,7 +280,7 @@ const OutgoingWebhookForm = () => {
 								<Controller
 									name='username'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Post_as')) }}
+									rules={{ required: t('Required_field', { field: t('Post_as') }) }}
 									render={({ field }) => (
 										<TextInput
 											id={usernameField}
@@ -367,7 +367,7 @@ const OutgoingWebhookForm = () => {
 								<Controller
 									name='token'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Token')) }}
+									rules={{ required: t('Required_field', { field: t('Token') }) }}
 									render={({ field }) => (
 										<TextInput
 											id={tokenField}
diff --git a/apps/meteor/client/views/admin/mailer/MailerPage.tsx b/apps/meteor/client/views/admin/mailer/MailerPage.tsx
index 9f0c8e7627ad..19e6424ea9e9 100644
--- a/apps/meteor/client/views/admin/mailer/MailerPage.tsx
+++ b/apps/meteor/client/views/admin/mailer/MailerPage.tsx
@@ -84,7 +84,8 @@ const MailerPage = () => {
 									id={fromEmailId}
 									placeholder={t('Type_your_email')}
 									{...register('fromEmail', {
-										validate: (fromEmail) => (!validateEmail(fromEmail) ? t('Invalid_email') : true),
+										required: t('Required_field', { field: t('From') }),
+										validate: (fromEmail) => (validateEmail(fromEmail) ? undefined : t('error-invalid-email-address')),
 									})}
 									error={errors.fromEmail?.message}
 									aria-required='true'
@@ -138,7 +139,7 @@ const MailerPage = () => {
 							<FieldRow>
 								<TextInput
 									id={subjectId}
-									{...register('subject', { required: t('error-the-field-is-required', { field: t('Subject') }) })}
+									{...register('subject', { required: t('Required_field', { field: t('Subject') }) })}
 									aria-describedby={`${subjectId}-error`}
 									error={errors.subject?.message}
 									aria-required='true'
@@ -159,7 +160,7 @@ const MailerPage = () => {
 								<TextAreaInput
 									id={emailBodyId}
 									{...register('emailBody', {
-										required: t('error-the-field-is-required', { field: t('Email_body') }),
+										required: t('Required_field', { field: t('Email_body') }),
 										validate: (emailBody) => (emailBody?.indexOf('[unsubscribe]') === -1 ? t('error-missing-unsubscribe-link') : true),
 									})}
 									rows={10}
diff --git a/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx b/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
index 1cbe3c7c121b..878b4d84f507 100644
--- a/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
+++ b/apps/meteor/client/views/admin/moderation/MessageContextFooter.tsx
@@ -1,8 +1,8 @@
 import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import useDeactivateUserAction from './hooks/useDeactivateUserAction';
 import useDeleteMessagesAction from './hooks/useDeleteMessagesAction';
 import useDismissUserAction from './hooks/useDismissUserAction';
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
index 53615ad0321c..85d081e652da 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleActions.tsx
@@ -1,8 +1,8 @@
 // import { Menu, Option } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import type { ModerationConsoleRowProps } from './ModerationConsoleTableRow';
 import useDeactivateUserAction from './hooks/useDeactivateUserAction';
 import useDeleteMessagesAction from './hooks/useDeleteMessagesAction';
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
index eb1ec183fcfe..13da70b48da2 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
@@ -1,7 +1,7 @@
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
 import useResetAvatarAction from '../hooks/useResetAvatarAction';
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx b/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
index 601e403e7e74..c437746ad8ef 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/UserContextFooter.tsx
@@ -1,8 +1,8 @@
 import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
 import useResetAvatarAction from '../hooks/useResetAvatarAction';
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useDeactivateUserAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useDeactivateUserAction.tsx
index 2ac0eeffe131..ac046fe80633 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useDeactivateUserAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useDeactivateUserAction.tsx
@@ -1,9 +1,9 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useRouteParameter, useRouter, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import GenericModal from '../../../../components/GenericModal';
 
 const useDeactivateUserAction = (userId: string, isUserReport?: boolean): GenericMenuItemProps => {
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx
index 4d5d5690492d..3fb22dfd0c5e 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx
@@ -1,8 +1,8 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useRouteParameter, useRouter, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import GenericModal from '../../../../components/GenericModal';
 
 const useDeleteMessagesAction = (userId: string): GenericMenuItemProps => {
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useDismissUserAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useDismissUserAction.tsx
index 09a30358d737..72e5dc03fd95 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useDismissUserAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useDismissUserAction.tsx
@@ -1,9 +1,9 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useRouter, useSetModal, useToastMessageDispatch, useRouteParameter } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import GenericModal from '../../../../components/GenericModal';
 
 const useDismissUserAction = (userId: string, isUserReport?: boolean): GenericMenuItemProps => {
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx
index 377aad97b186..8e488234814b 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx
@@ -1,8 +1,8 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useEndpoint, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import GenericModal from '../../../../components/GenericModal';
 
 const useResetAvatarAction = (userId: string): GenericMenuItemProps => {
diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
index 79d2fbe11140..2d9cb51e848f 100644
--- a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
@@ -48,6 +48,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
 			active: data.active,
 			redirectUri: Array.isArray(data.redirectUri) ? data.redirectUri.join('\n') : data.redirectUri,
 		},
+		mode: 'all',
 	});
 
 	const setModal = useSetModal();
@@ -118,7 +119,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
 						<TextInput {...register('name', { required: true })} />
 					</FieldRow>
 					<FieldHint>{t('Give_the_application_a_name_This_will_be_seen_by_your_users')}</FieldHint>
-					{errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+					{errors?.name && <FieldError>{t('Required_field', { field: t('Name') })}</FieldError>}
 				</Field>
 				<Field>
 					<FieldLabel>{t('Redirect_URI')}</FieldLabel>
@@ -126,7 +127,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
 						<TextAreaInput rows={5} {...register('redirectUri', { required: true })} />
 					</FieldRow>
 					<FieldHint>{t('After_OAuth2_authentication_users_will_be_redirected_to_this_URL')}</FieldHint>
-					{errors?.redirectUri && <FieldError>{t('error-the-field-is-required', { field: t('Redirect_URI') })}</FieldError>}
+					{errors?.redirectUri && <FieldError>{t('Required_field', { field: t('Redirect_URI') })}</FieldError>}
 				</Field>
 				<Field>
 					<FieldLabel>{t('Client_ID')}</FieldLabel>
diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
index 9a66e46e6b39..0982a99ccd92 100644
--- a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
@@ -69,10 +69,10 @@ const OAuthAddApp = (): ReactElement => {
 				<Field>
 					<FieldLabel>{t('Application_Name')}</FieldLabel>
 					<FieldRow>
-						<TextInput {...register('name', { required: true })} />
+						<TextInput {...register('name', { required: t('Required_field', { field: t('Name') }) })} />
 					</FieldRow>
 					<FieldHint>{t('Give_the_application_a_name_This_will_be_seen_by_your_users')}</FieldHint>
-					{errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+					{errors?.name && <FieldError>{errors.name.message}</FieldError>}
 				</Field>
 				<Field>
 					<FieldLabel>{t('Redirect_URI')}</FieldLabel>
@@ -80,7 +80,7 @@ const OAuthAddApp = (): ReactElement => {
 						<TextAreaInput rows={5} {...register('redirectUri', { required: true })} />
 					</FieldRow>
 					<FieldHint>{t('After_OAuth2_authentication_users_will_be_redirected_to_this_URL')}</FieldHint>
-					{errors?.redirectUri && <FieldError>{t('error-the-field-is-required', { field: t('Redirect_URI') })}</FieldError>}
+					{errors?.redirectUri && <FieldError>{t('Required_field', { field: t('Redirect_URI') })}</FieldError>}
 				</Field>
 				<Field>
 					<FieldRow>
diff --git a/apps/meteor/client/views/admin/permissions/RoleForm.tsx b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
index 2a063ce7d05a..17b1381f1af2 100644
--- a/apps/meteor/client/views/admin/permissions/RoleForm.tsx
+++ b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
@@ -33,9 +33,13 @@ const RoleForm = ({ className, editing = false, isProtected = false, isDisabled
 			<Field className={className}>
 				<FieldLabel>{t('Role')}</FieldLabel>
 				<FieldRow>
-					<TextInput disabled={editing || isDisabled} placeholder={t('Role')} {...register('name', { required: true })} />
+					<TextInput
+						disabled={editing || isDisabled}
+						placeholder={t('Role')}
+						{...register('name', { required: t('Required_field', { field: t('Role') }) })}
+					/>
 				</FieldRow>
-				{errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Role') })}</FieldError>}
+				{errors?.name && <FieldError>{errors.name.message}</FieldError>}
 			</Field>
 			<Field className={className}>
 				<FieldLabel>{t('Description')}</FieldLabel>
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
index 4bfb2afc81d3..3e3c6988e6cf 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
@@ -70,7 +70,7 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
 									<Controller
 										control={control}
 										name='rid'
-										rules={{ required: t('error-the-field-is-required', { field: t('Room') }) }}
+										rules={{ required: t('Required_field', { field: t('Room') }) }}
 										render={({ field: { onChange, value } }) => (
 											<RoomAutoComplete
 												id={roomFieldId}
@@ -98,7 +98,7 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
 								<Controller
 									control={control}
 									name='users'
-									rules={{ required: t('error-the-field-is-required', { field: t('Users') }) }}
+									rules={{ required: t('Required_field', { field: t('Users') }) }}
 									render={({ field: { onChange, value } }) => (
 										<UserAutoCompleteMultiple
 											id={usersFieldId}
diff --git a/apps/meteor/client/views/admin/rooms/EditRoom.tsx b/apps/meteor/client/views/admin/rooms/EditRoom.tsx
index 1a993979eec8..fa40f74cfadb 100644
--- a/apps/meteor/client/views/admin/rooms/EditRoom.tsx
+++ b/apps/meteor/client/views/admin/rooms/EditRoom.tsx
@@ -156,7 +156,7 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => {
 					<FieldRow>
 						<Controller
 							name='roomName'
-							rules={{ required: t('The_field_is_required', t('Name')) }}
+							rules={{ required: t('Required_field', { field: t('Name') }) }}
 							control={control}
 							render={({ field }) => (
 								<TextInput
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/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
index 7254b5386f33..4c7360d8f600 100644
--- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
@@ -18,7 +18,7 @@ const CreateOAuthModal = ({ onConfirm, onClose }: CreateOAuthModalProps): ReactE
 	const handleConfirm = (e: SyntheticEvent): void => {
 		e.preventDefault();
 		if (!text.length) {
-			setError(t('Name_cant_be_empty'));
+			setError(t('Required_field', { field: t('Name') }));
 			return;
 		}
 		onConfirm(text);
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/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index 023d3df851e5..a0ee877af551 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -221,8 +221,8 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 								control={control}
 								name='email'
 								rules={{
-									required: t('Email_is_required'),
-									validate: (email) => (validateEmail(email) ? undefined : t('ensure_email_address_valid')),
+									required: t('Required_field', { field: t('Email') }),
+									validate: (email) => (validateEmail(email) ? undefined : t('error-invalid-email-address')),
 								}}
 								render={({ field }) => (
 									<TextInput
@@ -237,7 +237,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 							/>
 						</FieldRow>
 						{errors?.email && (
-							<FieldError aria-live='assertive' id={`${emailId}-error`} fontScale='c1' mbs={12}>
+							<FieldError aria-live='assertive' id={`${emailId}-error`}>
 								{errors.email.message}
 							</FieldError>
 						)}
@@ -286,7 +286,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 							<Controller
 								control={control}
 								name='name'
-								rules={{ required: t('The_field_is_required', t('Name')) }}
+								rules={{ required: t('Required_field', { field: t('Name') }) }}
 								render={({ field }) => (
 									<TextInput
 										{...field}
@@ -311,7 +311,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 							<Controller
 								control={control}
 								name='username'
-								rules={{ required: t('The_field_is_required', t('Username')) }}
+								rules={{ required: t('Required_field', { field: t('Username') }) }}
 								render={({ field }) => (
 									<TextInput
 										{...field}
@@ -366,7 +366,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 								<Controller
 									control={control}
 									name='roles'
-									rules={{ required: t('The_field_is_required', t('Roles')) }}
+									rules={{ required: t('Required_field', { field: t('Roles') }) }}
 									render={({ field: { onChange, value } }) => (
 										<MultiSelectFiltered
 											id={rolesId}
diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
index 25d7a52a6ad4..034d7d2efb0f 100644
--- a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
@@ -57,7 +57,7 @@ const AdminUserSetRandomPasswordContent = ({
 					name='password'
 					rules={{
 						validate: () => (password?.length && !passwordIsValid ? t('Password_must_meet_the_complexity_requirements') : true),
-						required: isNewUserPage && t('The_field_is_required', t('Password')),
+						required: isNewUserPage && t('Required_field', { field: t('Password') }),
 					}}
 					render={({ field }) => (
 						<PasswordInput
@@ -83,7 +83,7 @@ const AdminUserSetRandomPasswordContent = ({
 						control={control}
 						name='passwordConfirmation'
 						rules={{
-							required: isNewUserPage && t('The_field_is_required', t('Confirm_password')),
+							required: isNewUserPage && t('Required_field', { field: t('Confirm_password') }),
 							deps: ['password'],
 							validate: (confirmationPassword) => (password !== confirmationPassword ? t('Invalid_confirm_pass') : true),
 						}}
diff --git a/apps/meteor/client/views/admin/viewLogs/ansispan.ts b/apps/meteor/client/views/admin/viewLogs/ansispan.ts
index 7f1709e48ef2..8aa5bccb1195 100644
--- a/apps/meteor/client/views/admin/viewLogs/ansispan.ts
+++ b/apps/meteor/client/views/admin/viewLogs/ansispan.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-control-regex */
 const foregroundColors = {
 	30: 'var(--rcx-color-font-secondary-info, #6C727A)',
 	31: 'var(--rcx-color-font-danger, #D40C26)',
@@ -16,13 +17,13 @@ export const ansispan = (str: string): string => {
 		.replace(/>/g, '&gt;')
 		.replace(/</g, '&lt;')
 		.replace(/(.\d{8}-\d\d:\d\d:\d\d\.\d\d\d\(?.{0,2}\)?)/, '<span>$1</span>')
-		.replace(/\033\[1m/g, '<strong>')
-		.replace(/\033\[22m/g, '</strong>')
-		.replace(/\033\[3m/g, '<em>')
-		.replace(/\033\[23m/g, '</em>')
-		.replace(/\033\[m/g, '</span>')
-		.replace(/\033\[0m/g, '</span>')
-		.replace(/\033\[39m/g, '</span>');
+		.replace(/\x1b\[1m/g, '<strong>')
+		.replace(/\x1b\[22m/g, '</strong>')
+		.replace(/\x1b\[3m/g, '<em>')
+		.replace(/\x1b\[23m/g, '</em>')
+		.replace(/\x1b\[m/g, '</span>')
+		.replace(/\x1b\[0m/g, '</span>')
+		.replace(/\x1b\[39m/g, '</span>');
 	return Object.entries(foregroundColors).reduce((str, [ansiCode, color]) => {
 		const span = `<span style="color: ${color}">`;
 		return str.replace(new RegExp(`\\033\\[${ansiCode}m`, 'g'), span).replace(new RegExp(`\\033\\[0;${ansiCode}m`, 'g'), span);
diff --git a/apps/meteor/client/views/audit/components/AuditForm.tsx b/apps/meteor/client/views/audit/components/AuditForm.tsx
index 343fbeff0138..5f45ddc2b5fe 100644
--- a/apps/meteor/client/views/audit/components/AuditForm.tsx
+++ b/apps/meteor/client/views/audit/components/AuditForm.tsx
@@ -50,7 +50,7 @@ const AuditForm = ({ type, onSubmit, setSelectedRoom }: AuditFormProps) => {
 					<FieldLabel>{t('Date')}</FieldLabel>
 					<FieldRow>
 						<DateRangePicker value={dateRangeField.value} onChange={dateRangeField.onChange} display='flex' flexGrow={1} />
-						{dateRangeFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Date'))}</FieldError>}
+						{dateRangeFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Date') })}</FieldError>}
 						{dateRangeFieldState.error?.type === 'validate' && <FieldError>{dateRangeFieldState.error.message}</FieldError>}
 					</FieldRow>
 				</Field>
diff --git a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
index 1eb5e1aaf99d..2a79b3b5270f 100644
--- a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
@@ -39,7 +39,7 @@ const DirectTab = ({ form: { control } }: DirectTabProps): ReactElement => {
 					placeholder={t('Username_Placeholder')}
 				/>
 			</FieldRow>
-			{usersFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Users'))}</FieldError>}
+			{usersFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Users') })}</FieldError>}
 			{usersFieldState.error?.type === 'validate' && <FieldError>{usersFieldState.error.message}</FieldError>}
 		</Field>
 	);
diff --git a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
index 5381376eb57f..00d0da8f3e31 100644
--- a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
@@ -39,7 +39,7 @@ const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElemen
 						placeholder={t('Username_Placeholder')}
 					/>
 				</FieldRow>
-				{visitorFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Visitor'))}</FieldError>}
+				{visitorFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Visitor') })}</FieldError>}
 				{visitorFieldState.error?.type === 'validate' && <FieldError>{visitorFieldState.error.message}</FieldError>}
 			</Field>
 			<Field flexShrink={1} marginInlineStart={8}>
@@ -48,7 +48,7 @@ const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElemen
 					<AutoCompleteAgent
 						error={(() => {
 							if (agentFieldState.error?.type === 'required') {
-								return t('The_field_is_required', t('Agent'));
+								return t('Required_field', { field: t('Agent') });
 							}
 
 							return agentFieldState.error?.message;
@@ -58,7 +58,7 @@ const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElemen
 						placeholder={t('Username_Placeholder')}
 					/>
 				</FieldRow>
-				{agentFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Agent'))}</FieldError>}
+				{agentFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Agent') })}</FieldError>}
 				{agentFieldState.error?.type === 'validate' && <FieldError>{agentFieldState.error.message}</FieldError>}
 			</Field>
 		</>
diff --git a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
index 3a3c0ab2c3d5..069a907749ac 100644
--- a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
@@ -34,7 +34,7 @@ const RoomsTab = ({ form: { control }, setSelectedRoom }: RoomsTabProps) => {
 					}
 				/>
 			</FieldRow>
-			{ridFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Channel_name'))}</FieldError>}
+			{ridFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Channel_name') })}</FieldError>}
 			{ridFieldState.error?.type === 'validate' && <FieldError>{ridFieldState.error.message}</FieldError>}
 		</Field>
 	);
diff --git a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
index c1ed01e1c4d3..50b372ad3291 100644
--- a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
@@ -22,7 +22,7 @@ const UsersTab = ({ form: { control } }: UsersTabProps): ReactElement => {
 			required: true,
 			validate: (value) => {
 				if (value.length < 1) {
-					return t('The_field_is_required', t('Users'));
+					return t('Required_field', { field: t('Users') });
 				}
 			},
 		},
@@ -39,7 +39,7 @@ const UsersTab = ({ form: { control } }: UsersTabProps): ReactElement => {
 					placeholder={t('Username_Placeholder')}
 				/>
 			</FieldRow>
-			{usersFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Users'))}</FieldError>}
+			{usersFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Users') })}</FieldError>}
 			{usersFieldState.error?.type === 'validate' && <FieldError>{usersFieldState.error.message}</FieldError>}
 		</Field>
 	);
diff --git a/apps/meteor/client/views/marketplace/AppMenu.tsx b/apps/meteor/client/views/marketplace/AppMenu.tsx
index be1159ebd4e2..a1d3942ee304 100644
--- a/apps/meteor/client/views/marketplace/AppMenu.tsx
+++ b/apps/meteor/client/views/marketplace/AppMenu.tsx
@@ -1,9 +1,9 @@
 import type { App } from '@rocket.chat/core-typings';
 import { MenuItem, MenuItemContent, MenuSection, MenuV2, Skeleton } from '@rocket.chat/fuselage';
+import { useHandleMenuAction } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 
-import { useHandleMenuAction } from '../../components/GenericMenu/hooks/useHandleMenuAction';
 import type { AppMenuOption } from './hooks/useAppMenu';
 import { useAppMenu } from './hooks/useAppMenu';
 
diff --git a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
index f10d3e989e0a..3b784e24c375 100644
--- a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
+++ b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
@@ -114,8 +114,11 @@ export const useInstallApp = (file: File, url: string): { install: () => void; i
 	};
 
 	const extractManifestFromAppFile = async (appFile: File) => {
-		const manifest = await getManifestFromZippedApp(appFile);
-		return manifest;
+		try {
+			return getManifestFromZippedApp(appFile);
+		} catch (error) {
+			handleInstallError(error as Error);
+		}
 	};
 
 	const install = async () => {
@@ -158,6 +161,7 @@ export const useInstallApp = (file: File, url: string): { install: () => void; i
 				handleEnableUnlimitedApps={() => {
 					openExternalLink(manageSubscriptionUrl);
 					setModal(null);
+					setInstalling(false);
 				}}
 			/>,
 		);
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx
index 47d60b3d9958..4ad019281bbf 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx
@@ -1,10 +1,10 @@
 import { Button, Box, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { UserAutoComplete } from '@rocket.chat/ui-client';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 
-import UserAutoComplete from '../../../../components/UserAutoComplete';
 import { useEndpointAction } from '../../../../hooks/useEndpointAction';
 
 type AddAgentProps = {
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
index 4253ff023ee9..a4435398d9a9 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
@@ -52,6 +52,7 @@ const AppearanceForm = () => {
 	const livechatWidgetPositionField = useUniqueId();
 	const livechatBackgroundField = useUniqueId();
 	const livechatHideSystemMessagesField = useUniqueId();
+	const omnichannelVisitorsCanCloseConversationField = useUniqueId();
 
 	return (
 		<Accordion>
@@ -140,6 +141,20 @@ const AppearanceForm = () => {
 							/>
 						</FieldRow>
 					</Field>
+					<Field>
+						<FieldRow>
+							<FieldLabel htmlFor={omnichannelVisitorsCanCloseConversationField}>
+								{t('Omnichannel_allow_visitors_to_close_conversation')}
+							</FieldLabel>
+							<Controller
+								name='Omnichannel_allow_visitors_to_close_conversation'
+								control={control}
+								render={({ field: { value, ...field } }) => (
+									<ToggleSwitch id={omnichannelVisitorsCanCloseConversationField} {...field} checked={value} />
+								)}
+							/>
+						</FieldRow>
+					</Field>
 				</FieldGroup>
 			</Accordion.Item>
 
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
index a2cfb7b8103b..b90c32af6a7d 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
@@ -28,6 +28,7 @@ type LivechatAppearanceSettings = {
 	Livechat_conversation_finished_text: string;
 	Livechat_enable_message_character_limit: boolean;
 	Livechat_message_character_limit: number;
+	Omnichannel_allow_visitors_to_close_conversation: boolean;
 };
 
 type AppearanceSettings = Partial<LivechatAppearanceSettings>;
diff --git a/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx b/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx
index 2e01ffc802cd..7d48b657aae8 100644
--- a/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx
+++ b/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx
@@ -112,7 +112,7 @@ const EditCustomFields = ({ customFieldData }: { customFieldData?: Serialized<IL
 										name='field'
 										control={control}
 										rules={{
-											required: t('The_field_is_required', t('Field')),
+											required: t('Required_field', { field: t('Field') }),
 											validate: (value) => (!/^[0-9a-zA-Z-_]+$/.test(value) ? t('error-invalid-custom-field-name') : undefined),
 										}}
 										render={({ field }) => (
@@ -141,7 +141,7 @@ const EditCustomFields = ({ customFieldData }: { customFieldData?: Serialized<IL
 									<Controller
 										name='label'
 										control={control}
-										rules={{ required: t('The_field_is_required', t('Label')) }}
+										rules={{ required: t('Required_field', { field: t('Label') }) }}
 										render={({ field }) => (
 											<TextInput
 												id={labelField}
diff --git a/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx b/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx
index c1aed1dbe7ae..52bb159b2e04 100644
--- a/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx
@@ -258,7 +258,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
 									flexGrow={1}
 									error={errors.name?.message as string}
 									placeholder={t('Name')}
-									{...register('name', { required: t('The_field_is_required', 'name') })}
+									{...register('name', { required: t('Required_field', { field: t('Name') }) })}
 								/>
 							</FieldRow>
 							{errors.name && (
@@ -296,7 +296,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
 									addon={<Icon name='mail' size='x20' />}
 									placeholder={t('Email')}
 									{...register('email', {
-										required: t('The_field_is_required', 'email'),
+										required: t('Required_field', { field: t('Email') }),
 										validate: (email) => validateEmail(email) || t('error-invalid-email-address'),
 									})}
 									aria-describedby={`${emailField}-error`}
@@ -442,7 +442,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
 								<Controller
 									control={control}
 									name='chatClosingTags'
-									rules={{ required: t('The_field_is_required', 'tags') }}
+									rules={{ required: t('Required_field', 'tags') }}
 									render={({ field: { value, onChange } }) => (
 										<DepartmentTags
 											id={chatClosingTagsField}
diff --git a/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx b/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
index 074bb0fe531a..235f4f95d1fa 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
@@ -56,7 +56,7 @@ const SourceField = ({ room }: SourceFieldProps) => {
 			<Label>{t('Channel')}</Label>
 			<Info>
 				<Box display='flex' alignItems='center'>
-					<OmnichannelRoomIcon room={room} size='x24' placement='default' />
+					<OmnichannelRoomIcon source={room.source} status={room.v.status} size='x24' />
 					<Label mi={8} mbe='0'>
 						{defaultTypesLabels[room.source.type] || roomSource}
 					</Label>
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
index 4d025f1f25b5..f4d2e8119c39 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
@@ -122,7 +122,7 @@ const ContactNewEdit = ({ id, data, close }: ContactNewEditProps): ReactElement
 		return !contact || contact._id === id;
 	};
 
-	const validateName = (v: string): string | boolean => (!v.trim() ? t('The_field_is_required', t('Name')) : true);
+	const validateName = (v: string): string | boolean => (!v.trim() ? t('Required_field', { field: t('Name') }) : true);
 
 	const handleContactManagerChange = async (userId: string): Promise<void> => {
 		setUserId(userId);
diff --git a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
index e21896eef9fa..24817a03846e 100644
--- a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
@@ -1,10 +1,10 @@
 import { Button, Box, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { UserAutoComplete } from '@rocket.chat/ui-client';
 import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 
-import UserAutoComplete from '../../../components/UserAutoComplete';
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
 
 const AddManager = ({ reload }: { reload: () => void }): ReactElement => {
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
similarity index 61%
rename from apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.js
rename to apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
index 4724bea74350..f1b2d0eed337 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
@@ -1,4 +1,8 @@
+import type { OperationParams } from '@rocket.chat/rest-typings';
+import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
 import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { Chart as ChartType } from 'chart.js';
+import type { MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
 
 import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler';
@@ -16,20 +20,25 @@ const initialData = {
 	offline: 0,
 };
 
-const init = (canvas, context, t) =>
+const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TranslationContextValue['translate']): Promise<ChartType> =>
 	drawDoughnutChart(
 		canvas,
 		t('Agents'),
 		context,
-		labels.map((l) => t(l)),
+		labels.map((l) => t(l as TranslationKey)),
 		Object.values(initialData),
 	);
 
-const AgentStatusChart = ({ params, reloadRef, ...props }) => {
+type AgentStatusChartsProps = {
+	params: OperationParams<'GET', '/v1/livechat/analytics/dashboards/charts/agents-status'>;
+	reloadRef: MutableRefObject<{ [x: string]: () => void }>;
+};
+
+const AgentStatusChart = ({ params, reloadRef, ...props }: AgentStatusChartsProps) => {
 	const t = useTranslation();
 
-	const canvas = useRef();
-	const context = useRef();
+	const canvas: MutableRefObject<HTMLCanvasElement | null> = useRef(null);
+	const context: MutableRefObject<ChartType | undefined> = useRef();
 
 	const updateChartData = useUpdateChartData({
 		context,
@@ -46,7 +55,9 @@ const AgentStatusChart = ({ params, reloadRef, ...props }) => {
 
 	useEffect(() => {
 		const initChart = async () => {
-			context.current = await init(canvas.current, context.current, t);
+			if (canvas?.current) {
+				context.current = await init(canvas.current, context.current, t);
+			}
 		};
 		initChart();
 	}, [t]);
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
similarity index 61%
rename from apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.js
rename to apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
index 5a540dcd2dbd..b84dfe6918a2 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
@@ -1,4 +1,8 @@
+import type { OperationParams } from '@rocket.chat/rest-typings';
+import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
 import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { Chart as ChartType } from 'chart.js';
+import type { MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
 
 import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler';
@@ -16,20 +20,25 @@ const initialData = {
 	closed: 0,
 };
 
-const init = (canvas, context, t) =>
+const init = (canvas: HTMLCanvasElement, context: ChartType | undefined, t: TranslationContextValue['translate']) =>
 	drawDoughnutChart(
 		canvas,
 		t('Chats'),
 		context,
-		labels.map((l) => t(l)),
+		labels.map((l) => t(l as TranslationKey)),
 		Object.values(initialData),
 	);
 
-const ChatsChart = ({ params, reloadRef, ...props }) => {
+type ChatsChartProps = {
+	params: OperationParams<'GET', '/v1/livechat/analytics/dashboards/charts/chats'>;
+	reloadRef: MutableRefObject<{ [x: string]: () => void }>;
+};
+
+const ChatsChart = ({ params, reloadRef, ...props }: ChatsChartProps) => {
 	const t = useTranslation();
 
-	const canvas = useRef();
-	const context = useRef();
+	const canvas: MutableRefObject<HTMLCanvasElement | null> = useRef(null);
+	const context: MutableRefObject<ChartType | undefined> = useRef();
 
 	const updateChartData = useUpdateChartData({
 		context,
@@ -46,7 +55,9 @@ const ChatsChart = ({ params, reloadRef, ...props }) => {
 
 	useEffect(() => {
 		const initChart = async () => {
-			context.current = await init(canvas.current, context.current, t);
+			if (canvas?.current) {
+				context.current = await init(canvas.current, context.current, t);
+			}
 		};
 		initChart();
 	}, [t]);
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
index 805d828a9893..d942b93a4223 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/useUpdateChartData.ts
@@ -1,19 +1,19 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { TranslationContextValue } from '@rocket.chat/ui-contexts';
 import { type Chart } from 'chart.js';
-import { type TFunction } from 'i18next';
-import { type RefObject } from 'react';
+import { type MutableRefObject } from 'react';
 
 import { updateChart } from '../../../../../app/livechat/client/lib/chartHandler';
 
 type UseUpdateChartDataOptions = {
-	context: RefObject<Chart | undefined>;
-	canvas: RefObject<HTMLCanvasElement | null>;
-	init: (canvas: HTMLCanvasElement, context: undefined, t: TFunction) => Promise<Chart>;
-	t: TFunction;
+	context: MutableRefObject<Chart | undefined>;
+	canvas: MutableRefObject<HTMLCanvasElement | null>;
+	init: (canvas: HTMLCanvasElement, context: undefined, t: TranslationContextValue['translate']) => Promise<Chart>;
+	t: TranslationContextValue['translate'];
 };
 
 export const useUpdateChartData = ({ context: contextRef, canvas: canvasRef, init, t }: UseUpdateChartDataOptions) =>
-	useMutableCallback(async (label: string, data: { [x: string]: number }) => {
+	useMutableCallback(async (label: string, data: number[]) => {
 		const canvas = canvasRef.current;
 
 		if (!canvas) {
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx
index d3a43adf701d..c3e4d0aeb535 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.stories.tsx
@@ -12,10 +12,10 @@ export const Default: ComponentStory<typeof CounterContainer> = (args) => <Count
 Default.storyName = 'CounterContainer';
 Default.args = {
 	initialData: [
-		{ title: 'total conversations', value: 10 },
-		{ title: 'open conversations', value: 10 },
-		{ title: 'total messages', value: 10 },
-		{ title: 'total visitors' },
+		{ title: 'Total_conversations', value: 10 },
+		{ title: 'Open_conversations', value: 10 },
+		{ title: 'Total_messages', value: 10 },
+		{ title: 'Total_visitors', value: 0 },
 	],
-	data: [],
+	data: { totalizers: [] },
 };
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
similarity index 59%
rename from apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.js
rename to apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
index 1340647a4616..f10909e19f01 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
@@ -1,4 +1,5 @@
 import { Skeleton } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState } from 'react';
 
@@ -6,10 +7,25 @@ import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import CounterItem from './CounterItem';
 import CounterRow from './CounterRow';
 
-const CounterContainer = ({ data, state, initialData, ...props }) => {
+export type DataType = {
+	title: string;
+	value: number | string;
+}[];
+
+type Totalizers = {
+	totalizers: DataType;
+};
+
+type CounterContainerProps = {
+	data?: Totalizers;
+	state: AsyncStatePhase;
+	initialData: DataType;
+};
+
+const CounterContainer = ({ data, state, initialData, ...props }: CounterContainerProps) => {
 	const t = useTranslation();
 
-	const [displayData, setDisplayData] = useState(initialData);
+	const [displayData, setDisplayData] = useState<DataType>(initialData);
 
 	const { totalizers } = data || { totalizers: initialData };
 
@@ -22,7 +38,7 @@ const CounterContainer = ({ data, state, initialData, ...props }) => {
 	return (
 		<CounterRow {...props}>
 			{displayData.map(({ title, value }, i) => (
-				<CounterItem key={i} title={title ? t(title) : <Skeleton width='x60' />} count={value} />
+				<CounterItem key={i} title={title ? t(title as TranslationKey) : <Skeleton width='x60' />} count={value} />
 			))}
 		</CounterRow>
 	);
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/AgentsOverview.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/AgentsOverview.tsx
similarity index 61%
rename from apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/AgentsOverview.js
rename to apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/AgentsOverview.tsx
index 08eafa0aebab..3ad469fe5840 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/AgentsOverview.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/AgentsOverview.tsx
@@ -1,3 +1,5 @@
+import type { OperationParams } from '@rocket.chat/rest-typings';
+import type { MutableRefObject } from 'react';
 import React from 'react';
 
 import { useEndpointData } from '../../../../hooks/useEndpointData';
@@ -8,9 +10,14 @@ const overviewInitalValue = {
 	value: '-',
 };
 
+type AgentsOverviewChartsProps = {
+	params: OperationParams<'GET', '/v1/livechat/analytics/dashboards/agents-productivity-totalizers'>;
+	reloadRef: MutableRefObject<{ [x: string]: () => void }>;
+};
+
 const initialData = [overviewInitalValue, overviewInitalValue, overviewInitalValue];
 
-const AgentsOverview = ({ params, reloadRef, ...props }) => {
+const AgentsOverview = ({ params, reloadRef, ...props }: AgentsOverviewChartsProps) => {
 	const {
 		value: data,
 		phase: state,
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ChatsOverview.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ChatsOverview.tsx
similarity index 60%
rename from apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ChatsOverview.js
rename to apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ChatsOverview.tsx
index c351d297c5c3..626f350cadeb 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ChatsOverview.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ChatsOverview.tsx
@@ -1,3 +1,5 @@
+import type { OperationParams } from '@rocket.chat/rest-typings';
+import type { MutableRefObject } from 'react';
 import React from 'react';
 
 import { useEndpointData } from '../../../../hooks/useEndpointData';
@@ -9,7 +11,12 @@ const initialData = [
 	{ title: '', value: '00:00:00' },
 ];
 
-const ChatsOverview = ({ params, reloadRef, ...props }) => {
+type ChatsOverviewProps = {
+	params: OperationParams<'GET', '/v1/livechat/analytics/dashboards/chats-totalizers'>;
+	reloadRef: MutableRefObject<{ [x: string]: () => void }>;
+};
+
+const ChatsOverview = ({ params, reloadRef, ...props }: ChatsOverviewProps) => {
 	const { value: data, phase: state, reload } = useEndpointData('/v1/livechat/analytics/dashboards/chats-totalizers', { params });
 
 	reloadRef.current.chatsOverview = reload;
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ConversationOverview.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ConversationOverview.tsx
similarity index 61%
rename from apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ConversationOverview.js
rename to apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ConversationOverview.tsx
index 08d7a9d101e2..52cc76bfc1aa 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ConversationOverview.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ConversationOverview.tsx
@@ -1,3 +1,5 @@
+import type { OperationParams } from '@rocket.chat/rest-typings';
+import type { MutableRefObject } from 'react';
 import React from 'react';
 
 import { useEndpointData } from '../../../../hooks/useEndpointData';
@@ -10,7 +12,12 @@ const overviewInitalValue = {
 
 const initialData = [overviewInitalValue, overviewInitalValue, overviewInitalValue, overviewInitalValue];
 
-const ConversationOverview = ({ params, reloadRef, ...props }) => {
+type ConversationOverviewProps = {
+	params: OperationParams<'GET', '/v1/livechat/analytics/dashboards/conversation-totalizers'>;
+	reloadRef: MutableRefObject<{ [x: string]: () => void }>;
+};
+
+const ConversationOverview = ({ params, reloadRef, ...props }: ConversationOverviewProps) => {
 	const { value: data, phase: state, reload } = useEndpointData('/v1/livechat/analytics/dashboards/conversation-totalizers', { params });
 
 	reloadRef.current.conversationOverview = reload;
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ProductivityOverview.js b/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ProductivityOverview.tsx
similarity index 60%
rename from apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ProductivityOverview.js
rename to apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ProductivityOverview.tsx
index 691a2e1b8840..8f3667077c3e 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ProductivityOverview.js
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/overviews/ProductivityOverview.tsx
@@ -1,3 +1,5 @@
+import type { OperationParams } from '@rocket.chat/rest-typings';
+import type { MutableRefObject } from 'react';
 import React from 'react';
 
 import { useEndpointData } from '../../../../hooks/useEndpointData';
@@ -7,7 +9,12 @@ const defaultValue = { title: '', value: '00:00:00' };
 
 const initialData = [defaultValue, defaultValue, defaultValue, defaultValue];
 
-const ProductivityOverview = ({ params, reloadRef, ...props }) => {
+type ProductivityOverviewProps = {
+	params: OperationParams<'GET', '/v1/livechat/analytics/dashboards/productivity-totalizers'>;
+	reloadRef: MutableRefObject<{ [x: string]: () => void }>;
+};
+
+const ProductivityOverview = ({ params, reloadRef, ...props }: ProductivityOverviewProps) => {
 	const { value: data, phase: state, reload } = useEndpointData('/v1/livechat/analytics/dashboards/productivity-totalizers', { params });
 
 	reloadRef.current.productivityOverview = reload;
diff --git a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
index 60124362e97b..6545d859a9f8 100644
--- a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
@@ -169,7 +169,7 @@ const EditTrigger = ({ triggerData }: { triggerData?: Serialized<ILivechatTrigge
 								<Controller
 									name='name'
 									control={control}
-									rules={{ required: t('The_field_is_required', t('Name')) }}
+									rules={{ required: t('Required_field', { field: t('Name') }) }}
 									render={({ field }) => (
 										<TextInput
 											{...field}
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
index 16c98520bc38..6b8f11b9203e 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
@@ -69,7 +69,7 @@ export const ActionExternalServiceUrl = ({ control, trigger, index, disabled, ..
 					control={control}
 					defaultValue=''
 					rules={{
-						required: t('The_field_is_required', t('External_service_url')),
+						required: t('Required_field', { field: t('External_service_url') }),
 						validate: testExternalService,
 						deps: serviceTimeoutFieldName,
 					}}
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
index 24ebe2aa5500..0905b8afbc8d 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
@@ -46,7 +46,7 @@ export const ExternalServiceActionForm = ({ control, trigger, index, ...props }:
 						name={timeoutFieldName}
 						defaultValue={10000}
 						rules={{
-							required: t('The_field_is_required', t('Timeout_in_miliseconds')),
+							required: t('Required_field', { field: t('Timeout_in_miliseconds') }),
 							min: { value: 0, message: t('Timeout_in_miliseconds_cant_be_negative_number') },
 						}}
 						render={({ field }) => {
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
index 83154648971f..d34ce4240c73 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
@@ -34,7 +34,7 @@ export const SendMessageActionForm = ({ control, index, ...props }: SendMessageA
 						control={control}
 						name={name}
 						defaultValue=''
-						rules={{ required: t('The_field_is_required', t('Message')) }}
+						rules={{ required: t('Required_field', { field: t('Message') }) }}
 						render={({ field }) => (
 							<TextAreaInput
 								error={messageError?.message}
diff --git a/apps/meteor/client/views/room/Header/HeaderIconWithRoom.tsx b/apps/meteor/client/views/room/Header/HeaderIconWithRoom.tsx
index 10de9166d964..98eb417cd611 100644
--- a/apps/meteor/client/views/room/Header/HeaderIconWithRoom.tsx
+++ b/apps/meteor/client/views/room/Header/HeaderIconWithRoom.tsx
@@ -14,7 +14,7 @@ type HeaderIconWithRoomProps = {
 const HeaderIconWithRoom = ({ room }: HeaderIconWithRoomProps): ReactElement => {
 	const icon = useRoomIcon(room);
 	if (isOmnichannelRoom(room)) {
-		return <OmnichannelRoomIcon room={room} size='x20' placement='default' />;
+		return <OmnichannelRoomIcon source={room.source} status={room.v?.status} size='x20' />;
 	}
 
 	return <HeaderIcon icon={icon} />;
diff --git a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx
index bdda6f33f0e3..ff9880ba1e84 100644
--- a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx
+++ b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx
@@ -1,11 +1,11 @@
 import type { Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { HeaderToolbarAction, HeaderToolbarDivider } from '../../../../components/Header';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext';
diff --git a/apps/meteor/client/views/room/HeaderV2/HeaderIconWithRoom.tsx b/apps/meteor/client/views/room/HeaderV2/HeaderIconWithRoom.tsx
index 91cb397f30cc..33f34ec7a86a 100644
--- a/apps/meteor/client/views/room/HeaderV2/HeaderIconWithRoom.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/HeaderIconWithRoom.tsx
@@ -14,7 +14,7 @@ type HeaderIconWithRoomProps = {
 const HeaderIconWithRoom = ({ room }: HeaderIconWithRoomProps): ReactElement => {
 	const icon = useRoomIcon(room);
 	if (isOmnichannelRoom(room)) {
-		return <OmnichannelRoomIcon room={room} size='x20' placement='default' />;
+		return <OmnichannelRoomIcon source={room.source} status={room.v?.status} size='x20' />;
 	}
 
 	return <HeaderIcon icon={icon} />;
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx
index 5fda368711c1..abf9b41b89da 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx
@@ -1,11 +1,11 @@
 import type { Box } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { HeaderToolbarAction, HeaderToolbarDivider } from '../../../../components/Header';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext';
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..6ee16a850202
--- /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.length}
+					data={result.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..8bb4d84eaebe
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx
@@ -0,0 +1,29 @@
+import type { IRoom, ISubscription } 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: 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..1722a42c7a4d
--- /dev/null
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
@@ -0,0 +1,62 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { useQuery } from '@tanstack/react-query';
+import type { Mongo } from 'meteor/mongo';
+import { useEffect, useMemo } from 'react';
+
+import { ChatRoom } from '../../../../../app/models/client';
+
+export const useTeamsListChildrenUpdate = (
+	parentRid: string,
+	teamId?: string | null,
+	sidepanelItems?: 'channels' | 'discussions' | null,
+) => {
+	const query = useMemo(() => {
+		const query: Mongo.Selector<IRoom> = {
+			$or: [
+				{
+					_id: parentRid,
+				},
+			],
+		};
+
+		if ((!sidepanelItems || sidepanelItems === 'discussions') && query.$or) {
+			query.$or.push({
+				prid: parentRid,
+			});
+		}
+
+		if ((!sidepanelItems || sidepanelItems === 'channels') && teamId && query.$or) {
+			query.$or.push({
+				teamId,
+			});
+		}
+		return query;
+	}, [parentRid, teamId, sidepanelItems]);
+
+	const result = useQuery({
+		queryKey: ['sidepanel', 'list', parentRid, sidepanelItems],
+		queryFn: () =>
+			ChatRoom.find(query, {
+				sort: { lm: -1 },
+			}).fetch(),
+		enabled: sidepanelItems !== null && teamId !== null,
+		refetchInterval: 5 * 60 * 1000,
+		keepPreviousData: true,
+	});
+
+	const { refetch } = result;
+
+	useEffect(() => {
+		const liveQueryHandle = ChatRoom.find(query).observe({
+			added: () => queueMicrotask(() => refetch({ exact: false })),
+			changed: () => queueMicrotask(() => refetch({ exact: false })),
+			removed: () => queueMicrotask(() => refetch({ exact: false })),
+		});
+
+		return () => {
+			liveQueryHandle.stop();
+		};
+	}, [query, refetch]);
+
+	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/UserCard/UserCardWithData.tsx b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
index a12e9a143cc2..a26b5f31e77d 100644
--- a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
+++ b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
@@ -1,11 +1,11 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useSetting, useRolesDescription, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 
 import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
-import GenericMenu from '../../../components/GenericMenu/GenericMenu';
 import LocalTime from '../../../components/LocalTime';
 import { UserCard, UserCardAction, UserCardRole, UserCardSkeleton } from '../../../components/UserCard';
 import { ReactiveUserStatus } from '../../../components/UserStatus';
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
index 90216f159069..38396844866b 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
@@ -1,5 +1,7 @@
 import type { IRoom, IMessage } from '@rocket.chat/core-typings';
 import type { Icon } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { MessageComposerAction, MessageComposerActionsDivider } from '@rocket.chat/ui-composer';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useTranslation, useLayoutHiddenActions } from '@rocket.chat/ui-contexts';
@@ -8,8 +10,6 @@ import React, { memo } from 'react';
 
 import { messageBox } from '../../../../../../app/ui-utils/client';
 import { isTruthy } from '../../../../../../lib/isTruthy';
-import GenericMenu from '../../../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../../../components/GenericMenu/GenericMenuItem';
 import { useMessageboxAppsActionButtons } from '../../../../../hooks/useAppActionButtons';
 import { useChat } from '../../../contexts/ChatContext';
 import { useRoom } from '../../../contexts/RoomContext';
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts
index 58cd7b72189b..9738f714fa97 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts
@@ -1,9 +1,9 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import { useEffect, useMemo } from 'react';
 
 import { AudioRecorder } from '../../../../../../../app/ui/client/lib/recorderjs/AudioRecorder';
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 import { useChat } from '../../../../contexts/ChatContext';
 import { useMediaActionTitle } from '../../hooks/useMediaActionTitle';
 import { useMediaPermissions } from '../../hooks/useMediaPermissions';
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx
index 50702f6887aa..03bff48876f3 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx
@@ -1,10 +1,10 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useSetting, usePermission, useSetModal } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
 import CreateDiscussion from '../../../../../../components/CreateDiscussion';
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 
 export const useCreateDiscussionAction = (room?: IRoom): GenericMenuItemProps => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts
index f911b2b63b1f..f576aba9803c 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts
@@ -1,7 +1,7 @@
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation, useSetting } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 import { useFileInput } from '../../../../../../hooks/useFileInput';
 import { useChat } from '../../../../contexts/ChatContext';
 
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx
index bf44496b0d67..a49253c2744d 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx
@@ -1,9 +1,9 @@
 import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useSetting, useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 import ShareLocationModal from '../../../../ShareLocation/ShareLocationModal';
 
 export const useShareLocationAction = (room?: IRoom, tmid?: IMessage['tmid']): GenericMenuItemProps => {
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts
index cd7e2c5af6fc..2608597fb202 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts
@@ -1,9 +1,9 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import { useEffect, useMemo } from 'react';
 
 import { VideoRecorder } from '../../../../../../../app/ui/client/lib/recorderjs/videoRecorder';
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 import { useChat } from '../../../../contexts/ChatContext';
 import { useMediaActionTitle } from '../../hooks/useMediaActionTitle';
 import { useMediaPermissions } from '../../hooks/useMediaPermissions';
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx
index ae80a7407851..806bebaa65e3 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx
@@ -1,9 +1,9 @@
 import type { IWebdavAccountIntegration } from '@rocket.chat/core-typings';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useSetModal, useSetting } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import type { GenericMenuItemProps } from '../../../../../../components/GenericMenu/GenericMenuItem';
 import { useWebDAVAccountIntegrationsQuery } from '../../../../../../hooks/webdav/useWebDAVAccountIntegrationsQuery';
 import { useChat } from '../../../../contexts/ChatContext';
 import AddWebdavAccountModal from '../../../../webdav/AddWebdavAccountModal';
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
index b2ba79792e04..d39b74c079a2 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx
@@ -1,9 +1,9 @@
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
 import { isPromptButton, type FormattingButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
-import GenericMenu from '../../../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../../../components/GenericMenu/GenericMenuItem';
 import type { ComposerAPI } from '../../../../../lib/chats/ChatAPI';
 
 type FormattingToolbarDropdownProps = {
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
index 57aa18c7bb66..1e4f30bcfed2 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
@@ -39,11 +39,13 @@ const ExportMessages = () => {
 			toUsers: [],
 			additionalEmails: '',
 			messagesCount: 0,
-			subject: t('Mail_Messages_Subject', roomName),
+			subject: t('Mail_Messages_Subject', {
+				postProcess: 'sprintf',
+				sprintf: [roomName],
+			}),
 			format: 'html',
 		},
 	});
-
 	const exportOptions = useMemo<SelectOption[]>(
 		() => [
 			['email', t('Send_via_email')],
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 ce2a7862bb0b..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,4 +1,5 @@
-import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
+/* eslint-disable complexity */
+import type { IRoomWithRetentionPolicy, SidepanelItem } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import {
@@ -19,10 +20,14 @@ import {
 	ButtonGroup,
 	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';
@@ -70,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;
@@ -116,6 +122,8 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 		retentionOverrideGlobal,
 		roomType: roomTypeP,
 		reactWhenReadOnly,
+		showChannels,
+		showDiscussions,
 	} = watch();
 
 	const {
@@ -156,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,
@@ -178,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) {
@@ -222,6 +241,13 @@ 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;
+
+	const showAccordion = showAdvancedSettings || showRetentionPolicy;
 
 	return (
 		<>
@@ -249,7 +275,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 									name='roomName'
 									control={control}
 									rules={{
-										required: t('error-the-field-is-required', { field: t('Name') }),
+										required: t('Required_field', { field: t('Name') }),
 										validate: (value) => validateName(value),
 									}}
 									render={({ field }) => (
@@ -315,7 +341,6 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 								</FieldRow>
 							</Field>
 						)}
-
 						{canViewType && (
 							<Field>
 								<FieldRow>
@@ -344,243 +369,301 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 								</FieldRow>
 							</Field>
 						)}
-						{canViewEncrypted && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={encryptedField}>{t('Encrypted')}</FieldLabel>
-									<Controller
-										control={control}
-										name='encrypted'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch
-												id={encryptedField}
-												aria-describedby={`${encryptedField}-hint`}
-												{...field}
-												disabled={!canToggleEncryption || isFederated}
-												checked={value}
-											/>
-										)}
-									/>
-								</FieldRow>
-								<FieldRow>
-									<FieldHint id={`${encryptedField}-hint`}>{t('Encrypted_field_hint')}</FieldHint>
-								</FieldRow>
-							</Field>
-						)}
-						{canViewReadOnly && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={readOnlyField}>{t('Read_only')}</FieldLabel>
-									<Controller
-										control={control}
-										name='readOnly'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch
-												id={readOnlyField}
-												{...field}
-												checked={value}
-												disabled={!canSetReadOnly || isFederated}
-												aria-describedby={`${readOnlyField}-hint`}
-											/>
-										)}
-									/>
-								</FieldRow>
-								<FieldHint id={`${readOnlyField}-hint`}>
-									{readOnly ? t('Read_only_field_hint_enabled', { roomType }) : t('Read_only_field_hint_disabled')}
-								</FieldHint>
-							</Field>
-						)}
-						{readOnly && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={reactWhenReadOnlyField}>{t('React_when_read_only')}</FieldLabel>
-									<Controller
-										control={control}
-										name='reactWhenReadOnly'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch
-												id={reactWhenReadOnlyField}
-												{...field}
-												disabled={!canSetReactWhenReadOnly}
-												checked={value}
-												aria-describedby={`${reactWhenReadOnlyField}-hint`}
-											/>
-										)}
-									/>
-								</FieldRow>
-								<FieldRow>
-									<FieldHint id={`${reactWhenReadOnlyField}-hint`}>
-										{reactWhenReadOnly ? t('Anyone_can_react_to_messages') : t('Only_authorized_users_can_react_to_messages')}
-									</FieldHint>
-								</FieldRow>
-							</Field>
-						)}
-						{canViewArchived && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={archivedField}>{t('Room_archivation_state_true')}</FieldLabel>
-									<Controller
-										control={control}
-										name='archived'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch
-												id={archivedField}
-												aria-describedby={`${archivedField}-hint`}
-												{...field}
-												disabled={!canArchiveOrUnarchive}
-												checked={value}
-											/>
-										)}
-									/>
-								</FieldRow>
-								{archived && (
-									<FieldRow>
-										<FieldHint id={`${archivedField}-hint`}>{t('New_messages_cannot_be_sent')}</FieldHint>
-									</FieldRow>
-								)}
-							</Field>
-						)}
-						{canViewJoinCode && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={joinCodeRequiredField}>{t('Password_to_access')}</FieldLabel>
-									<Controller
-										control={control}
-										name='joinCodeRequired'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch id={joinCodeRequiredField} {...field} disabled={isFederated} checked={value} />
-										)}
-									/>
-								</FieldRow>
-								{joinCodeRequired && (
-									<FieldRow>
-										<Controller
-											name='joinCode'
-											control={control}
-											render={({ field }) => <PasswordInput {...field} placeholder={t('Reset_password')} disabled={!joinCodeRequired} />}
-										/>
-									</FieldRow>
-								)}
-							</Field>
-						)}
-						{canViewHideSysMes && (
-							<Field>
-								<FieldRow>
-									<FieldLabel htmlFor={hideSysMesField}>{t('Hide_System_Messages')}</FieldLabel>
-									<Controller
-										control={control}
-										name='hideSysMes'
-										render={({ field: { value, ...field } }) => (
-											<ToggleSwitch id={hideSysMesField} {...field} checked={value} disabled={isFederated} />
-										)}
-									/>
-								</FieldRow>
-								<FieldRow>
-									<Controller
-										control={control}
-										name='systemMessages'
-										render={({ field }) => (
-											<MultiSelect
-												{...field}
-												options={sysMesOptions}
-												disabled={!hideSysMes || isFederated}
-												placeholder={t('Select_messages_to_hide')}
-											/>
-										)}
-									/>
-								</FieldRow>
-							</Field>
-						)}
 					</FieldGroup>
-					{canEditRoomRetentionPolicy && retentionPolicy?.enabled && (
+					{showAccordion && (
 						<Accordion>
-							<Accordion.Item title={t('Prune')}>
-								<FieldGroup>
-									<Field>
-										<FieldRow>
-											<FieldLabel htmlFor={retentionEnabledField}>{t('RetentionPolicyRoom_Enabled')}</FieldLabel>
-											<Controller
-												control={control}
-												name='retentionEnabled'
-												render={({ field: { value, ...field } }) => <ToggleSwitch id={retentionEnabledField} {...field} checked={value} />}
-											/>
-										</FieldRow>
-									</Field>
-									<Field>
-										<FieldRow>
-											<FieldLabel htmlFor={retentionOverrideGlobalField}>{t('RetentionPolicyRoom_OverrideGlobal')}</FieldLabel>
-											<Controller
-												control={control}
-												name='retentionOverrideGlobal'
-												render={({ field: { value, ...field } }) => (
-													<ToggleSwitch id={retentionOverrideGlobalField} {...field} disabled={!retentionEnabled} checked={value} />
-												)}
-											/>
-										</FieldRow>
-									</Field>
-									{retentionOverrideGlobal && (
-										<>
-											<Callout type='danger'>
-												<RawText>{t('RetentionPolicyRoom_ReadTheDocs')}</RawText>
-											</Callout>
+							{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')}
+										</Box>
+										{canViewEncrypted && (
 											<Field>
-												<FieldLabel htmlFor={retentionMaxAgeField}>
-													{t('RetentionPolicyRoom_MaxAge', { max: retentionMaxAgeDefault })}
-												</FieldLabel>
 												<FieldRow>
+													<FieldLabel htmlFor={encryptedField}>{t('Encrypted')}</FieldLabel>
 													<Controller
 														control={control}
-														name='retentionMaxAge'
-														render={({ field: { onChange, ...field } }) => (
-															<NumberInput
-																id={retentionMaxAgeField}
+														name='encrypted'
+														render={({ field: { value, ...field } }) => (
+															<ToggleSwitch
+																id={encryptedField}
+																aria-describedby={`${encryptedField}-hint`}
 																{...field}
-																onChange={(e: ChangeEvent<HTMLInputElement>) => onChange(Number(e.currentTarget.value))}
+																disabled={!canToggleEncryption || isFederated}
+																checked={value}
 															/>
 														)}
 													/>
 												</FieldRow>
+												<FieldRow>
+													<FieldHint id={`${encryptedField}-hint`}>{t('Encrypted_field_hint')}</FieldHint>
+												</FieldRow>
 											</Field>
+										)}
+										{canViewReadOnly && (
 											<Field>
 												<FieldRow>
-													<FieldLabel htmlFor={retentionExcludePinnedField}>{t('RetentionPolicyRoom_ExcludePinned')}</FieldLabel>
+													<FieldLabel htmlFor={readOnlyField}>{t('Read_only')}</FieldLabel>
 													<Controller
 														control={control}
-														name='retentionExcludePinned'
+														name='readOnly'
 														render={({ field: { value, ...field } }) => (
-															<ToggleSwitch id={retentionExcludePinnedField} {...field} checked={value} />
+															<ToggleSwitch
+																id={readOnlyField}
+																{...field}
+																checked={value}
+																disabled={!canSetReadOnly || isFederated}
+																aria-describedby={`${readOnlyField}-hint`}
+															/>
 														)}
 													/>
 												</FieldRow>
+												<FieldHint id={`${readOnlyField}-hint`}>
+													{readOnly ? t('Read_only_field_hint_enabled', { roomType }) : t('Read_only_field_hint_disabled')}
+												</FieldHint>
 											</Field>
+										)}
+										{readOnly && (
 											<Field>
 												<FieldRow>
-													<FieldLabel htmlFor={retentionFilesOnlyField}>{t('RetentionPolicyRoom_FilesOnly')}</FieldLabel>
+													<FieldLabel htmlFor={reactWhenReadOnlyField}>{t('React_when_read_only')}</FieldLabel>
 													<Controller
 														control={control}
-														name='retentionFilesOnly'
+														name='reactWhenReadOnly'
 														render={({ field: { value, ...field } }) => (
-															<ToggleSwitch id={retentionFilesOnlyField} {...field} checked={value} />
+															<ToggleSwitch
+																id={reactWhenReadOnlyField}
+																{...field}
+																disabled={!canSetReactWhenReadOnly}
+																checked={value}
+																aria-describedby={`${reactWhenReadOnlyField}-hint`}
+															/>
 														)}
 													/>
 												</FieldRow>
+												<FieldRow>
+													<FieldHint id={`${reactWhenReadOnlyField}-hint`}>
+														{reactWhenReadOnly ? t('Anyone_can_react_to_messages') : t('Only_authorized_users_can_react_to_messages')}
+													</FieldHint>
+												</FieldRow>
 											</Field>
+										)}
+										{canViewArchived && (
 											<Field>
 												<FieldRow>
-													<FieldLabel htmlFor={retentionIgnoreThreads}>{t('RetentionPolicy_DoNotPruneThreads')}</FieldLabel>
+													<FieldLabel htmlFor={archivedField}>{t('Room_archivation_state_true')}</FieldLabel>
 													<Controller
 														control={control}
-														name='retentionIgnoreThreads'
+														name='archived'
 														render={({ field: { value, ...field } }) => (
-															<ToggleSwitch id={retentionIgnoreThreads} {...field} checked={value} />
+															<ToggleSwitch
+																id={archivedField}
+																aria-describedby={`${archivedField}-hint`}
+																{...field}
+																disabled={!canArchiveOrUnarchive}
+																checked={value}
+															/>
 														)}
 													/>
 												</FieldRow>
+												{archived && (
+													<FieldRow>
+														<FieldHint id={`${archivedField}-hint`}>{t('New_messages_cannot_be_sent')}</FieldHint>
+													</FieldRow>
+												)}
 											</Field>
-										</>
-									)}
-								</FieldGroup>
-							</Accordion.Item>
+										)}
+										{canViewJoinCode && (
+											<Field>
+												<FieldRow>
+													<FieldLabel htmlFor={joinCodeRequiredField}>{t('Password_to_access')}</FieldLabel>
+													<Controller
+														control={control}
+														name='joinCodeRequired'
+														render={({ field: { value, ...field } }) => (
+															<ToggleSwitch id={joinCodeRequiredField} {...field} disabled={isFederated} checked={value} />
+														)}
+													/>
+												</FieldRow>
+												{joinCodeRequired && (
+													<FieldRow>
+														<Controller
+															name='joinCode'
+															control={control}
+															render={({ field }) => (
+																<PasswordInput {...field} placeholder={t('Reset_password')} disabled={!joinCodeRequired} />
+															)}
+														/>
+													</FieldRow>
+												)}
+											</Field>
+										)}
+										{canViewHideSysMes && (
+											<Field>
+												<FieldRow>
+													<FieldLabel htmlFor={hideSysMesField}>{t('Hide_System_Messages')}</FieldLabel>
+													<Controller
+														control={control}
+														name='hideSysMes'
+														render={({ field: { value, ...field } }) => (
+															<ToggleSwitch id={hideSysMesField} {...field} checked={value} disabled={isFederated} />
+														)}
+													/>
+												</FieldRow>
+												<FieldRow>
+													<Controller
+														control={control}
+														name='systemMessages'
+														render={({ field }) => (
+															<MultiSelect
+																{...field}
+																options={sysMesOptions}
+																disabled={!hideSysMes || isFederated}
+																placeholder={t('Select_messages_to_hide')}
+															/>
+														)}
+													/>
+												</FieldRow>
+											</Field>
+										)}
+									</FieldGroup>
+								</AccordionItem>
+							)}
+							{showRetentionPolicy && (
+								<AccordionItem title={t('Prune')}>
+									<FieldGroup>
+										<Field>
+											<FieldRow>
+												<FieldLabel htmlFor={retentionEnabledField}>{t('RetentionPolicyRoom_Enabled')}</FieldLabel>
+												<Controller
+													control={control}
+													name='retentionEnabled'
+													render={({ field: { value, ...field } }) => (
+														<ToggleSwitch id={retentionEnabledField} {...field} checked={value} />
+													)}
+												/>
+											</FieldRow>
+										</Field>
+										<Field>
+											<FieldRow>
+												<FieldLabel htmlFor={retentionOverrideGlobalField}>{t('RetentionPolicyRoom_OverrideGlobal')}</FieldLabel>
+												<Controller
+													control={control}
+													name='retentionOverrideGlobal'
+													render={({ field: { value, ...field } }) => (
+														<ToggleSwitch id={retentionOverrideGlobalField} {...field} disabled={!retentionEnabled} checked={value} />
+													)}
+												/>
+											</FieldRow>
+										</Field>
+										{retentionOverrideGlobal && (
+											<>
+												<Callout type='danger'>
+													<RawText>{t('RetentionPolicyRoom_ReadTheDocs')}</RawText>
+												</Callout>
+												<Field>
+													<FieldLabel htmlFor={retentionMaxAgeField}>
+														{t('RetentionPolicyRoom_MaxAge', { max: retentionMaxAgeDefault })}
+													</FieldLabel>
+													<FieldRow>
+														<Controller
+															control={control}
+															name='retentionMaxAge'
+															render={({ field: { onChange, ...field } }) => (
+																<NumberInput
+																	id={retentionMaxAgeField}
+																	{...field}
+																	onChange={(e: ChangeEvent<HTMLInputElement>) => onChange(Number(e.currentTarget.value))}
+																/>
+															)}
+														/>
+													</FieldRow>
+												</Field>
+												<Field>
+													<FieldRow>
+														<FieldLabel htmlFor={retentionExcludePinnedField}>{t('RetentionPolicyRoom_ExcludePinned')}</FieldLabel>
+														<Controller
+															control={control}
+															name='retentionExcludePinned'
+															render={({ field: { value, ...field } }) => (
+																<ToggleSwitch id={retentionExcludePinnedField} {...field} checked={value} />
+															)}
+														/>
+													</FieldRow>
+												</Field>
+												<Field>
+													<FieldRow>
+														<FieldLabel htmlFor={retentionFilesOnlyField}>{t('RetentionPolicyRoom_FilesOnly')}</FieldLabel>
+														<Controller
+															control={control}
+															name='retentionFilesOnly'
+															render={({ field: { value, ...field } }) => (
+																<ToggleSwitch id={retentionFilesOnlyField} {...field} checked={value} />
+															)}
+														/>
+													</FieldRow>
+												</Field>
+												<Field>
+													<FieldRow>
+														<FieldLabel htmlFor={retentionIgnoreThreads}>{t('RetentionPolicy_DoNotPruneThreads')}</FieldLabel>
+														<Controller
+															control={control}
+															name='retentionIgnoreThreads'
+															render={({ field: { value, ...field } }) => (
+																<ToggleSwitch id={retentionIgnoreThreads} {...field} checked={value} />
+															)}
+														/>
+													</FieldRow>
+												</Field>
+											</>
+										)}
+									</FieldGroup>
+								</AccordionItem>
+							)}
 						</Accordion>
 					)}
 				</form>
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/Info/RoomInfo/RoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
index b0bf1d083a71..31f96a344677 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Box, Callout, IconButton } from '@rocket.chat/fuselage';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -12,7 +13,6 @@ import {
 	ContextualbarClose,
 	ContextualbarTitle,
 } from '../../../../../components/Contextualbar';
-import GenericMenu from '../../../../../components/GenericMenu/GenericMenu';
 import {
 	InfoPanel,
 	InfoPanelActionGroup,
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
index 7df7c468bb01..c265a28cb284 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersActions.tsx
@@ -1,9 +1,9 @@
 import type { IUser, IRoom } from '@rocket.chat/core-typings';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
 import { useUserInfoActions } from '../../hooks/useUserInfoActions';
 
 type RoomMembersActionsProps = {
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
index d62ebb96befa..5f94f7c407b0 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
@@ -1,4 +1,5 @@
 import { Box, FieldGroup, Field, FieldLabel, FieldRow, FieldError, TextAreaInput } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import type { ComponentProps } from 'react';
 import React from 'react';
@@ -8,14 +9,14 @@ import { useTranslation } from 'react-i18next';
 import GenericModal from '../../../../components/GenericModal/GenericModal';
 
 type ReportUserModalProps = {
-	onConfirm: (description: string) => void;
+	onConfirm: (reasonForReport: string) => void;
 	onClose: () => void;
 	displayName: string;
 	username: string;
 };
 
 type ReportUserModalsFields = {
-	description: string;
+	reasonForReport: string;
 };
 
 const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUserModalProps) => {
@@ -25,16 +26,18 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
 		formState: { errors },
 	} = useForm<ReportUserModalsFields>({
 		defaultValues: {
-			description: '',
+			reasonForReport: '',
 		},
 	});
 
 	const { t } = useTranslation();
 
+	const reasonForReportId = useUniqueId();
+
 	return (
 		<GenericModal
 			wrapperFunction={(props: ComponentProps<typeof Box>) => (
-				<Box is='form' onSubmit={handleSubmit(({ description }) => onConfirm(description))} {...props} />
+				<Box is='form' onSubmit={handleSubmit(({ reasonForReport }) => onConfirm(reasonForReport))} {...props} />
 			)}
 			variant='danger'
 			title={t('Report_User')}
@@ -44,7 +47,7 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
 		>
 			<FieldGroup>
 				<Field>
-					<FieldLabel>
+					<FieldLabel htmlFor={reasonForReportId}>
 						<Box mbe='x12' display='flex' alignItems='center'>
 							<UserAvatar username={username} />
 							<Box mis='x12' fontScale='p1' fontWeight='700'>
@@ -56,12 +59,13 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
 						<TextAreaInput
 							rows={3}
 							placeholder={t('Why_do_you_want_to_report_question_mark')}
-							{...register('description', { required: t('Please_fill_out_reason_for_report') })}
+							{...register('reasonForReport', { required: t('Required_field', { field: t('Reason_for_report') }) })}
 							width='full'
 							mbe='x4'
+							aria-label={t('Reason_for_report')}
 						/>
 					</FieldRow>
-					{errors.description && <FieldError>{errors.description.message}</FieldError>}
+					{errors.reasonForReport && <FieldError>{errors.reasonForReport.message}</FieldError>}
 				</Field>
 			</FieldGroup>
 		</GenericModal>
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
index 0b4f30fb1f29..17e8bd1470ba 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoActions.tsx
@@ -1,11 +1,11 @@
 /* eslint-disable react/display-name, react/no-multi-comp */
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { ButtonGroup, IconButton, Skeleton } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
 import { UserInfoAction } from '../../../../components/UserInfo';
 import { useMemberExists } from '../../../hooks/useMemberExists';
 import { useUserInfoActions } from '../../hooks/useUserInfoActions';
diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts
new file mode 100644
index 000000000000..b5d9079c9cab
--- /dev/null
+++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts
@@ -0,0 +1,84 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { renderHook } from '@testing-library/react';
+
+import { createFakeRoom } from '../../../../tests/mocks/data';
+import { useRetentionPolicy } from './useRetentionPolicy';
+
+const getGlobalSettings = ({
+	enabled = false,
+	filesOnly = false,
+	doNotPrunePinned = false,
+	ignoreThreads = false,
+	appliesToChannels = false,
+	appliesToGroups = false,
+	appliesToDMs = false,
+}) => {
+	return mockAppRoot()
+		.withSetting('RetentionPolicy_Enabled', enabled)
+		.withSetting('RetentionPolicy_FilesOnly', filesOnly)
+		.withSetting('RetentionPolicy_DoNotPrunePinned', doNotPrunePinned)
+		.withSetting('RetentionPolicy_DoNotPruneThreads', ignoreThreads)
+		.withSetting('RetentionPolicy_AppliesToChannels', appliesToChannels)
+		.withSetting('RetentionPolicy_AppliesToGroups', appliesToGroups)
+		.withSetting('RetentionPolicy_AppliesToDMs', appliesToDMs);
+};
+
+const defaultValue = {
+	enabled: false,
+	isActive: false,
+	filesOnly: false,
+	excludePinned: false,
+	ignoreThreads: false,
+};
+
+const roomTypeConfig = {
+	c: { appliesToChannels: true },
+	p: { appliesToGroups: true },
+	d: { appliesToDMs: true },
+};
+
+const CHANNELS_TYPE = 'c';
+
+it('should return the default value if global retention is not enabled', async () => {
+	const fakeRoom = createFakeRoom({ t: CHANNELS_TYPE });
+
+	const { result } = renderHook(() => useRetentionPolicy(fakeRoom), {
+		legacyRoot: true,
+		wrapper: getGlobalSettings({}).build(),
+	});
+
+	expect(result.current).toEqual(expect.objectContaining(defaultValue));
+});
+
+it('should return enabled true if global retention is enabled', async () => {
+	const fakeRoom = createFakeRoom({ t: CHANNELS_TYPE });
+
+	const { result } = renderHook(() => useRetentionPolicy(fakeRoom), {
+		legacyRoot: true,
+		wrapper: getGlobalSettings({ enabled: true }).build(),
+	});
+
+	expect(result.current).toEqual(expect.objectContaining({ ...defaultValue, enabled: true }));
+});
+
+it('should return enabled and active true global retention is active for rooms of the type', async () => {
+	const fakeRoom = createFakeRoom({ t: CHANNELS_TYPE });
+
+	const { result } = renderHook(() => useRetentionPolicy(fakeRoom), {
+		legacyRoot: true,
+		wrapper: getGlobalSettings({ enabled: true, ...roomTypeConfig[CHANNELS_TYPE] }).build(),
+	});
+
+	expect(result.current).toEqual(expect.objectContaining({ ...defaultValue, enabled: true, isActive: true }));
+});
+
+it('should isActive be false if global retention is active for rooms of the type and room has retention.enabled false', async () => {
+	const fakeRoom = createFakeRoom({ t: CHANNELS_TYPE, retention: { enabled: false } });
+
+	const { result } = renderHook(() => useRetentionPolicy(fakeRoom), {
+		legacyRoot: true,
+		wrapper: getGlobalSettings({ enabled: true, ...roomTypeConfig[CHANNELS_TYPE] }).build(),
+	});
+
+	expect(result.current?.isActive).toBe(false);
+});
diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
index 96efedef692e..076ad13c5a0f 100644
--- a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
+++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
@@ -4,7 +4,9 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import { TIMEUNIT, isValidTimespan, timeUnitToMs } from '../../../lib/convertTimeUnit';
 
 const hasRetentionPolicy = (room: IRoom & { retention?: any }): room is IRoomWithRetentionPolicy =>
-	'retention' in room && room.retention !== undefined && 'overrideGlobal' in room.retention && isValidTimespan(room.retention.maxAge);
+	'retention' in room && room.retention !== undefined;
+
+const isRetentionOverridden = (room: IRoom & { retention?: any }) => 'overrideGlobal' in room.retention && room.retention.overrideGlobal;
 
 type RetentionPolicySettings = {
 	enabled: boolean;
@@ -41,7 +43,7 @@ const isActive = (room: IRoom, { enabled, appliesToChannels, appliesToGroups, ap
 };
 
 const extractFilesOnly = (room: IRoom, { filesOnly }: RetentionPolicySettings): boolean => {
-	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
+	if (hasRetentionPolicy(room) && isRetentionOverridden(room)) {
 		return room.retention.filesOnly;
 	}
 
@@ -49,7 +51,7 @@ const extractFilesOnly = (room: IRoom, { filesOnly }: RetentionPolicySettings):
 };
 
 const extractExcludePinned = (room: IRoom, { doNotPrunePinned }: RetentionPolicySettings): boolean => {
-	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
+	if (hasRetentionPolicy(room) && isRetentionOverridden(room)) {
 		return room.retention.excludePinned;
 	}
 
@@ -57,7 +59,7 @@ const extractExcludePinned = (room: IRoom, { doNotPrunePinned }: RetentionPolicy
 };
 
 const extractIgnoreThreads = (room: IRoom, { ignoreThreads }: RetentionPolicySettings): boolean => {
-	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
+	if (hasRetentionPolicy(room) && isRetentionOverridden(room)) {
 		return room.retention.ignoreThreads;
 	}
 
@@ -65,7 +67,7 @@ const extractIgnoreThreads = (room: IRoom, { ignoreThreads }: RetentionPolicySet
 };
 
 const getMaxAge = (room: IRoom, { maxAgeChannels, maxAgeGroups, maxAgeDMs }: RetentionPolicySettings): number => {
-	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
+	if (hasRetentionPolicy(room) && isRetentionOverridden(room) && isValidTimespan(room.retention.maxAge)) {
 		return timeUnitToMs(TIMEUNIT.days, room.retention.maxAge);
 	}
 
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
index 2a70ff55ee34..c04df6b7521a 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
@@ -1,10 +1,10 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import type { Icon } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLayoutHiddenActions } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import { useMemo } from 'react';
 
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useEmbeddedLayout } from '../../../../hooks/useEmbeddedLayout';
 import { useAddUserAction } from './actions/useAddUserAction';
 import { useBlockUserAction } from './actions/useBlockUserAction';
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/modals/FileUploadModal/FileUploadModal.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
index 312776397b32..23135d9b961e 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
@@ -47,7 +47,7 @@ const FileUploadModal = ({
 		if (!name) {
 			return dispatchToastMessage({
 				type: 'error',
-				message: t('error-the-field-is-required', { field: t('Name') }),
+				message: t('Required_field', { field: t('Upload_file_name') }),
 			});
 		}
 
@@ -99,7 +99,7 @@ const FileUploadModal = ({
 							<FieldRow>
 								<TextInput value={name} onChange={handleName} />
 							</FieldRow>
-							{!name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+							{!name && <FieldError>{t('Required_field', { field: t('Upload_file_name') })}</FieldError>}
 						</Field>
 						{showDescription && (
 							<Field>
@@ -116,7 +116,7 @@ const FileUploadModal = ({
 						<Button secondary onClick={onClose}>
 							{t('Cancel')}
 						</Button>
-						<Button primary type='submit' disabled={!name}>
+						<Button primary type='submit'>
 							{t('Send')}
 						</Button>
 					</Modal.FooterControllers>
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/client/views/room/webdav/AddWebdavAccountModal.tsx b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
index 7e003f79a208..63ebaecc5eb6 100644
--- a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
+++ b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
@@ -55,23 +55,32 @@ const AddWebdavAccountModal = ({ onClose, onConfirm }: AddWebdavAccountModalProp
 					<Field>
 						<FieldLabel>{t('Webdav_Server_URL')}</FieldLabel>
 						<FieldRow>
-							<TextInput placeholder={t('Webdav_Server_URL')} {...register('serverURL', { required: true })} />
+							<TextInput
+								placeholder={t('Webdav_Server_URL')}
+								{...register('serverURL', { required: t('Required_field', { field: t('Webdav_Server_URL') }) })}
+							/>
 						</FieldRow>
-						{errors.serverURL && <FieldError>{t('error-the-field-is-required', { field: t('Webdav_Server_URL') })}</FieldError>}
+						{errors.serverURL && <FieldError>{errors.serverURL.message}</FieldError>}
 					</Field>
 					<Field>
 						<FieldLabel>{t('Username')}</FieldLabel>
 						<FieldRow>
-							<TextInput placeholder={t('Username')} {...register('username', { required: true })} />
+							<TextInput
+								placeholder={t('Username')}
+								{...register('username', { required: t('Required_field', { field: t('Username') }) })}
+							/>
 						</FieldRow>
-						{errors.username && <FieldError>{t('error-the-field-is-required', { field: t('Username') })}</FieldError>}
+						{errors.username && <FieldError>{errors.username.message}</FieldError>}
 					</Field>
 					<Field>
 						<FieldLabel>{t('Password')}</FieldLabel>
 						<FieldRow>
-							<PasswordInput placeholder={t('Password')} {...register('password', { required: true })} />
+							<PasswordInput
+								placeholder={t('Password')}
+								{...register('password', { required: t('Required_field', { field: t('Password') }) })}
+							/>
 						</FieldRow>
-						{errors.password && <FieldError>{t('error-the-field-is-required', { field: t('Password') })}</FieldError>}
+						{errors.password && <FieldError>{errors.password.message}</FieldError>}
 					</Field>
 				</FieldGroup>
 			</Modal.Content>
diff --git a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
index c51763bee733..e64a4e33c1bb 100644
--- a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
+++ b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
@@ -30,7 +30,7 @@ const SaveToWebdavModal = ({ onClose, data }: SaveToWebdavModalProps): ReactElem
 		control,
 		handleSubmit,
 		formState: { errors },
-	} = useForm<{ accountId: string }>();
+	} = useForm<{ accountId: string }>({ mode: 'all' });
 
 	const enabled = useSetting<boolean>('Webdav_Integration_Enabled', false);
 
@@ -98,13 +98,13 @@ const SaveToWebdavModal = ({ onClose, data }: SaveToWebdavModalProps): ReactElem
 								<Controller
 									name='accountId'
 									control={control}
-									rules={{ required: true }}
+									rules={{ required: t('Required_field', { field: t('Select_a_webdav_server') }) }}
 									render={({ field }): ReactElement => (
 										<Select {...field} options={accountsOptions} id={accountIdField} placeholder={t('Select_an_option')} />
 									)}
 								/>
 							</FieldRow>
-							{errors.accountId && <FieldError>{t('Field_required')}</FieldError>}
+							{errors.accountId && <FieldError>{errors.accountId.message}</FieldError>}
 						</Field>
 					</FieldGroup>
 				)}
diff --git a/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx b/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
index bfbbce5d37e1..fd1691bcb16d 100644
--- a/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
+++ b/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
@@ -105,7 +105,10 @@ const RegisterUsername = () => {
 							<Field>
 								<FieldLabel id='username-label'>{t('Username')}</FieldLabel>
 								<FieldRow>
-									<TextInput aria-labelledby='username-label' {...register('username', { required: t('Username_cant_be_empty') })} />
+									<TextInput
+										aria-labelledby='username-label'
+										{...register('username', { required: t('Required_field', { field: t('Username') }) })}
+									/>
 								</FieldRow>
 								{errors.username && (
 									<FieldError>
diff --git a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
index 2bc6c4f8a820..91e47b4a590f 100644
--- a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
+++ b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
@@ -23,6 +23,7 @@ export const SetupWizardRoute = (): ReactElement | null => {
 	}
 
 	return (
+		// FIXME: setting the defaultNS here is problematic for components/hooks expecting it to be 'core'
 		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
 			<SetupWizardProvider>
 				<DarkModeProvider.default>
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
index 97b1bdceb670..418883869a4a 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
@@ -1,10 +1,10 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { CheckBox } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import GenericMenu from '../../../../components/GenericMenu/GenericMenu';
-import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem';
 import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
 import { useRemoveRoomFromTeam } from './hooks/useRemoveRoomFromTeam';
 import { useToggleAutoJoin } from './hooks/useToggleAutoJoin';
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 1b9cf6109764..5d8f857ad8ff 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,97 @@
 # rocketchat-services
 
+## 1.3.5-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 1.3.5-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 1.3.5-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 1.3.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 1.3.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 3d6b7decbf5c..1e6e859d7639 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.4",
+	"version": "1.3.5-rc.6",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
@@ -18,7 +18,7 @@
 	"author": "Rocket.Chat",
 	"license": "MIT",
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "~0.31.25",
@@ -30,7 +30,7 @@
 		"@rocket.chat/ui-kit": "workspace:~",
 		"ajv": "^8.11.0",
 		"bcrypt": "^5.0.1",
-		"body-parser": "^1.20.2",
+		"body-parser": "^1.20.3",
 		"colorette": "^2.0.20",
 		"cookie": "^0.5.0",
 		"cookie-parser": "^1.4.6",
@@ -40,7 +40,7 @@
 		"fibers": "^5.0.3",
 		"jaeger-client": "^3.19.0",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.6.1",
 		"pino": "^8.15.0",
@@ -51,18 +51,18 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/icons": "~0.38.0",
-		"@types/cookie": "^0.5.3",
-		"@types/cookie-parser": "^1.4.5",
-		"@types/ejson": "^2.2.1",
-		"@types/express": "^4.17.20",
-		"@types/fibers": "^3.1.3",
+		"@types/cookie": "^0.5.4",
+		"@types/cookie-parser": "^1.4.7",
+		"@types/ejson": "^2.2.2",
+		"@types/express": "^4.17.21",
+		"@types/fibers": "^3.1.4",
 		"@types/node": "^14.18.63",
-		"@types/ws": "^8.5.8",
+		"@types/ws": "^8.5.12",
 		"npm-run-all": "^4.1.5",
 		"pino-pretty": "^7.6.1",
 		"pm2": "^5.2.0",
-		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"ts-node": "^10.9.2",
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../../package.json"
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 1e9274526ef5..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,
@@ -86,7 +87,6 @@ export const roomFields = {
 	reactWhenReadOnly: 1,
 	sysMes: 1,
 	sentiment: 1,
-	streamingOptions: 1,
 	broadcast: 1,
 	encrypted: 1,
 	e2eKeyId: 1,
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 5796920e8650..0e761cad06fd 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.12.1",
+	"version": "6.13.0-rc.6",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
@@ -66,7 +66,7 @@
 	"devDependencies": {
 		"@axe-core/playwright": "^4.7.3",
 		"@babel/core": "~7.22.20",
-		"@babel/eslint-parser": "~7.23.3",
+		"@babel/eslint-parser": "~7.23.10",
 		"@babel/plugin-proposal-nullish-coalescing-operator": "~7.18.6",
 		"@babel/plugin-proposal-optional-chaining": "~7.21.0",
 		"@babel/preset-env": "~7.22.20",
@@ -87,76 +87,76 @@
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "0.0.13",
 		"@tanstack/react-query-devtools": "^4.19.1",
-		"@testing-library/react": "~16.0.0",
+		"@testing-library/react": "~16.0.1",
 		"@testing-library/user-event": "~14.5.2",
-		"@types/adm-zip": "^0.5.3",
+		"@types/adm-zip": "^0.5.5",
 		"@types/archiver": "^5.3.4",
-		"@types/bad-words": "^3.0.2",
-		"@types/bcrypt": "^5.0.1",
-		"@types/body-parser": "^1.19.4",
-		"@types/busboy": "^1.5.2",
-		"@types/chai": "~4.3.16",
-		"@types/chai-as-promised": "^7.1.7",
-		"@types/chai-datetime": "0.0.38",
-		"@types/chai-dom": "1.11.2",
-		"@types/chai-spies": "~1.0.5",
-		"@types/codemirror": "^5.60.12",
-		"@types/cookie-parser": "^1.4.5",
-		"@types/cors": "^2.8.15",
-		"@types/cssom": "^0.4.2",
+		"@types/bad-words": "^3.0.3",
+		"@types/bcrypt": "^5.0.2",
+		"@types/body-parser": "^1.19.5",
+		"@types/busboy": "^1.5.4",
+		"@types/chai": "~4.3.19",
+		"@types/chai-as-promised": "^7.1.8",
+		"@types/chai-datetime": "0.0.39",
+		"@types/chai-dom": "1.11.3",
+		"@types/chai-spies": "~1.0.6",
+		"@types/codemirror": "^5.60.15",
+		"@types/cookie-parser": "^1.4.7",
+		"@types/cors": "^2.8.17",
+		"@types/cssom": "^0.4.3",
 		"@types/dompurify": "^2.3.3",
-		"@types/ejson": "^2.2.1",
-		"@types/express": "^4.17.20",
+		"@types/ejson": "^2.2.2",
+		"@types/express": "^4.17.21",
 		"@types/express-rate-limit": "^5.1.3",
-		"@types/fibers": "^3.1.3",
-		"@types/google-libphonenumber": "^7.4.29",
-		"@types/gravatar": "^1.8.5",
+		"@types/fibers": "^3.1.4",
+		"@types/google-libphonenumber": "^7.4.30",
+		"@types/gravatar": "^1.8.6",
 		"@types/he": "^1.1.2",
-		"@types/i18next-sprintf-postprocessor": "^0.2.2",
-		"@types/imap": "^0.8.39",
-		"@types/jest": "~29.5.12",
+		"@types/i18next-sprintf-postprocessor": "^0.2.3",
+		"@types/imap": "^0.8.40",
+		"@types/jest": "~29.5.13",
 		"@types/jsdom": "^16.2.15",
-		"@types/jsdom-global": "^3.0.6",
-		"@types/jsrsasign": "^10.5.11",
-		"@types/later": "^1.2.8",
+		"@types/jsdom-global": "^3.0.7",
+		"@types/jsrsasign": "^10.5.14",
+		"@types/later": "^1.2.9",
 		"@types/ldapjs": "^2.2.5",
-		"@types/less": "~3.0.5",
+		"@types/less": "~3.0.6",
 		"@types/lodash.clonedeep": "^4.5.9",
-		"@types/lodash.get": "^4.4.8",
-		"@types/mailparser": "^3.4.3",
+		"@types/lodash.get": "^4.4.9",
+		"@types/mailparser": "^3.4.4",
 		"@types/marked": "^4.0.8",
 		"@types/meteor": "^2.9.8",
-		"@types/meteor-collection-hooks": "^0.8.8",
+		"@types/meteor-collection-hooks": "^0.8.9",
 		"@types/mkdirp": "^1.0.2",
 		"@types/mocha": "github:whitecolor/mocha-types",
 		"@types/moment-timezone": "^0.5.30",
 		"@types/node": "^14.18.63",
-		"@types/node-gcm": "^1.0.3",
-		"@types/node-rsa": "^1.1.3",
-		"@types/nodemailer": "^6.4.13",
-		"@types/oauth2-server": "^3.0.15",
-		"@types/parseurl": "^1.3.2",
-		"@types/prometheus-gc-stats": "^0.6.3",
-		"@types/proxyquire": "^1.3.30",
-		"@types/psl": "^1.1.2",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
-		"@types/rewire": "^2.5.29",
+		"@types/node-gcm": "^1.0.5",
+		"@types/node-rsa": "^1.1.4",
+		"@types/nodemailer": "^6.4.15",
+		"@types/oauth2-server": "^3.0.17",
+		"@types/parseurl": "^1.3.3",
+		"@types/prometheus-gc-stats": "^0.6.4",
+		"@types/proxyquire": "^1.3.31",
+		"@types/psl": "^1.1.3",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
+		"@types/rewire": "^2.5.30",
 		"@types/sanitize-html": "^2.9.3",
 		"@types/semver": "^7.3.10",
 		"@types/sharp": "^0.30.5",
 		"@types/sinon": "^10.0.20",
-		"@types/strict-uri-encode": "^2.0.1",
+		"@types/strict-uri-encode": "^2.0.2",
 		"@types/string-strip-html": "^5.0.1",
-		"@types/supertest": "^2.0.15",
-		"@types/supports-color": "~7.2.0",
-		"@types/textarea-caret": "^3.0.2",
-		"@types/ua-parser-js": "^0.7.38",
-		"@types/use-subscription": "^1.0.1",
-		"@types/use-sync-external-store": "^0.0.5",
+		"@types/supertest": "^2.0.16",
+		"@types/supports-color": "~7.2.1",
+		"@types/textarea-caret": "^3.0.3",
+		"@types/ua-parser-js": "^0.7.39",
+		"@types/use-subscription": "^1.0.2",
+		"@types/use-sync-external-store": "^0.0.6",
 		"@types/uuid": "^8.3.4",
-		"@types/xml-crypto": "~1.4.4",
-		"@types/xml-encryption": "~1.2.3",
+		"@types/xml-crypto": "~1.4.6",
+		"@types/xml-encryption": "~1.2.4",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
 		"@typescript-eslint/parser": "~5.60.1",
 		"autoprefixer": "^9.8.8",
@@ -164,12 +164,12 @@
 		"babel-plugin-array-includes": "^2.0.3",
 		"babel-plugin-istanbul": "^6.1.1",
 		"chai": "^4.3.10",
-		"chai-as-promised": "^7.1.1",
-		"chai-datetime": "^1.8.0",
+		"chai-as-promised": "^7.1.2",
+		"chai-datetime": "^1.8.1",
 		"chai-dom": "^1.11.0",
 		"chai-spies": "~1.0.0",
 		"cross-env": "^7.0.3",
-		"docker-compose": "^0.24.3",
+		"docker-compose": "^0.24.8",
 		"emojione-assets": "^4.5.0",
 		"eslint": "~8.45.0",
 		"eslint-config-prettier": "~8.8.0",
@@ -179,7 +179,7 @@
 		"eslint-plugin-playwright": "~0.15.3",
 		"eslint-plugin-prettier": "~4.2.1",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-testing-library": "~6.2.2",
 		"eslint-plugin-you-dont-need-lodash-underscore": "~6.12.0",
 		"fast-glob": "^3.2.12",
@@ -190,8 +190,8 @@
 		"nyc": "^15.1.0",
 		"outdent": "~0.8.0",
 		"pino-pretty": "^7.6.1",
-		"playwright-qase-reporter": "^1.2.1",
-		"postcss": "~8.4.31",
+		"playwright-qase-reporter": "^1.2.2",
+		"postcss": "~8.4.45",
 		"postcss-custom-properties": "^11.0.0",
 		"postcss-easy-import": "^3.0.0",
 		"postcss-load-config": "^3.1.4",
@@ -200,7 +200,7 @@
 		"postcss-url": "^10.1.3",
 		"prettier": "~2.8.8",
 		"proxyquire": "^2.1.3",
-		"react-docgen-typescript-plugin": "^1.0.5",
+		"react-docgen-typescript-plugin": "^1.0.8",
 		"rewire": "^6.0.0",
 		"sinon": "^14.0.2",
 		"source-map": "^0.7.4",
@@ -209,15 +209,15 @@
 		"supertest": "^6.2.3",
 		"supports-color": "~7.2.0",
 		"template-file": "^6.0.1",
-		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"ts-node": "^10.9.2",
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
 		"@babel/runtime": "~7.22.15",
 		"@bugsnag/js": "~7.20.2",
 		"@bugsnag/plugin-react": "~7.19.0",
 		"@google-cloud/storage": "^6.11.0",
-		"@kaciras/deasync": "^1.0.3",
+		"@kaciras/deasync": "^1.0.4",
 		"@nivo/bar": "0.84.0",
 		"@nivo/core": "0.84.0",
 		"@nivo/heatmap": "0.84.0",
@@ -230,7 +230,7 @@
 		"@rocket.chat/agenda": "workspace:^",
 		"@rocket.chat/api-client": "workspace:^",
 		"@rocket.chat/apps": "workspace:^",
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/base64": "workspace:^",
 		"@rocket.chat/cas-validate": "workspace:^",
 		"@rocket.chat/core-services": "workspace:^",
@@ -241,7 +241,7 @@
 		"@rocket.chat/favicon": "workspace:^",
 		"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2",
 		"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3",
-		"@rocket.chat/fuselage": "^0.57.1",
+		"@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",
@@ -252,7 +252,7 @@
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/instance-status": "workspace:^",
 		"@rocket.chat/jwt": "workspace:^",
-		"@rocket.chat/layout": "~0.31.26",
+		"@rocket.chat/layout": "~0.31.27",
 		"@rocket.chat/license": "workspace:^",
 		"@rocket.chat/log-format": "workspace:^",
 		"@rocket.chat/logger": "workspace:^",
@@ -287,15 +287,15 @@
 		"@slack/bolt": "^3.14.0",
 		"@slack/rtm-api": "^6.0.0",
 		"@tanstack/react-query": "^4.16.1",
-		"@types/cookie": "^0.5.3",
+		"@types/cookie": "^0.5.4",
 		"@types/katex": "^0.14.0",
 		"@types/lodash": "^4.14.200",
-		"@types/lodash.debounce": "^4.0.8",
-		"@types/object-path": "^0.11.3",
-		"@types/proxy-from-env": "^1.0.3",
-		"@types/speakeasy": "^2.0.9",
+		"@types/lodash.debounce": "^4.0.9",
+		"@types/object-path": "^0.11.4",
+		"@types/proxy-from-env": "^1.0.4",
+		"@types/speakeasy": "^2.0.10",
 		"@xmldom/xmldom": "^0.8.10",
-		"adm-zip": "0.5.10",
+		"adm-zip": "0.5.16",
 		"ajv": "^8.11.0",
 		"ajv-formats": "~2.1.1",
 		"apn": "2.2.0",
@@ -306,14 +306,14 @@
 		"aws-sdk": "^2.1363.0",
 		"bad-words": "^3.0.4",
 		"bcrypt": "^5.0.1",
-		"body-parser": "1.20.2",
+		"body-parser": "1.20.3",
 		"bson": "^4.6.4",
 		"busboy": "^1.6.0",
 		"bytebuffer": "5.0.1",
 		"chalk": "^4.0.0",
 		"change-case": "^4.1.2",
 		"chart.js": "^3.8.0",
-		"codemirror": "^5.65.15",
+		"codemirror": "^5.65.17",
 		"colorette": "^2.0.20",
 		"colors": "^1.4.0",
 		"connect": "^3.7.0",
@@ -321,7 +321,7 @@
 		"cookie-parser": "^1.4.6",
 		"cors": "^2.8.5",
 		"cron": "~1.8.2",
-		"css-vars-ponyfill": "^2.4.8",
+		"css-vars-ponyfill": "^2.4.9",
 		"csv-parse": "^5.2.0",
 		"date-fns": "^2.28.0",
 		"date.js": "~0.3.3",
@@ -342,7 +342,7 @@
 		"filenamify": "^4.3.0",
 		"filesize": "9.0.11",
 		"generate-password": "^1.7.1",
-		"google-libphonenumber": "^3.2.33",
+		"google-libphonenumber": "^3.2.38",
 		"gravatar": "^1.8.2",
 		"he": "^1.2.0",
 		"highlight.js": "^11.6.0",
@@ -361,7 +361,7 @@
 		"jsdom": "^16.7.0",
 		"jsrsasign": "^10.5.24",
 		"juice": "^8.0.0",
-		"katex": "~0.16.9",
+		"katex": "~0.16.11",
 		"ldap-escape": "^2.0.6",
 		"ldapjs": "^2.3.3",
 		"limax": "^3.0.0",
@@ -372,13 +372,13 @@
 		"mailparser": "^3.4.0",
 		"marked": "^4.2.5",
 		"mem": "^8.1.1",
-		"meteor-node-stubs": "^1.2.5",
+		"meteor-node-stubs": "^1.2.10",
 		"mime-db": "^1.52.0",
 		"mime-type": "^4.0.0",
 		"mkdirp": "^1.0.4",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"moment": "^2.29.4",
-		"moment-timezone": "^0.5.43",
+		"moment-timezone": "^0.5.45",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"nats": "^2.6.1",
@@ -402,7 +402,7 @@
 		"query-string": "^7.1.3",
 		"queue-fifo": "^0.2.6",
 		"rc-scrollbars": "^1.1.6",
-		"re-resizable": "^6.9.9",
+		"re-resizable": "^6.9.18",
 		"react": "~17.0.2",
 		"react-aria": "~3.23.1",
 		"react-dom": "~17.0.2",
@@ -419,7 +419,7 @@
 		"sodium-native": "^3.3.0",
 		"sodium-plus": "^0.9.0",
 		"speakeasy": "^2.0.0",
-		"stream-buffers": "^3.0.2",
+		"stream-buffers": "^3.0.3",
 		"strict-uri-encode": "^2.0.0",
 		"string-strip-html": "^7.0.3",
 		"suretype": "~2.4.1",
@@ -430,16 +430,16 @@
 		"turndown": "^7.1.2",
 		"twilio": "^3.76.1",
 		"twit": "^2.2.11",
-		"typia": "^5.3.3",
-		"ua-parser-js": "^1.0.37",
-		"underscore": "^1.13.6",
+		"typia": "~6.9.0",
+		"ua-parser-js": "^1.0.38",
+		"underscore": "^1.13.7",
 		"universal-perf-hooks": "^1.0.1",
 		"url-polyfill": "^1.1.12",
 		"use-subscription": "~1.6.0",
-		"use-sync-external-store": "^1.2.0",
+		"use-sync-external-store": "^1.2.2",
 		"uuid": "^8.3.2",
 		"vm2": "^3.9.19",
-		"webdav": "^4.11.3",
+		"webdav": "^4.11.4",
 		"xml-crypto": "~3.1.0",
 		"xml-encryption": "~3.0.2",
 		"xml2js": "~0.5.0",
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/lib/i18n.ts b/apps/meteor/server/lib/i18n.ts
index bc3ed6184937..da0efeb5c4a4 100644
--- a/apps/meteor/server/lib/i18n.ts
+++ b/apps/meteor/server/lib/i18n.ts
@@ -6,6 +6,7 @@ import { availableTranslationNamespaces, defaultTranslationNamespace, extractTra
 
 void i18n.init({
 	lng: 'en',
+	fallbackLng: 'en',
 	defaultNS: defaultTranslationNamespace,
 	ns: availableTranslationNamespaces,
 	nsSeparator: '.',
diff --git a/apps/meteor/server/models/LivechatContacts.ts b/apps/meteor/server/models/LivechatContacts.ts
new file mode 100644
index 000000000000..d341ae87b021
--- /dev/null
+++ b/apps/meteor/server/models/LivechatContacts.ts
@@ -0,0 +1,6 @@
+import { registerModel } from '@rocket.chat/models';
+
+import { db } from '../database/utils';
+import { LivechatContactsRaw } from './raw/LivechatContacts';
+
+registerModel('ILivechatContactsModel', new LivechatContactsRaw(db));
diff --git a/apps/meteor/server/models/raw/BaseRaw.ts b/apps/meteor/server/models/raw/BaseRaw.ts
index d822038b177e..3e763017bbd3 100644
--- a/apps/meteor/server/models/raw/BaseRaw.ts
+++ b/apps/meteor/server/models/raw/BaseRaw.ts
@@ -318,33 +318,33 @@ export abstract class BaseRaw<
 
 	async findOneAndDelete(filter: Filter<T>, options?: FindOneAndDeleteOptions): Promise<ModifyResult<T>> {
 		if (!this.trash) {
-			if (options) {
-				return this.col.findOneAndDelete(filter, options);
-			}
-			return this.col.findOneAndDelete(filter);
+			return this.col.findOneAndDelete(filter, options || {});
 		}
 
-		const result = await this.col.findOneAndDelete(filter);
-
-		const { value: doc } = result;
+		const doc = await this.col.findOne(filter);
 		if (!doc) {
-			return result;
+			return { ok: 1, value: null };
 		}
 
 		const { _id, ...record } = doc;
-
 		const trash: TDeleted = {
 			...record,
 			_deletedAt: new Date(),
 			__collection__: this.name,
 		} as unknown as TDeleted;
 
-		// since the operation is not atomic, we need to make sure that the record is not already deleted/inserted
 		await this.trash?.updateOne({ _id } as Filter<TDeleted>, { $set: trash } as UpdateFilter<TDeleted>, {
 			upsert: true,
 		});
 
-		return result;
+		try {
+			await this.col.deleteOne({ _id } as Filter<T>);
+		} catch (e) {
+			await this.trash?.deleteOne({ _id } as Filter<TDeleted>);
+			throw e;
+		}
+
+		return { ok: 1, value: doc };
 	}
 
 	async deleteMany(filter: Filter<T>, options?: DeleteOptions & { onTrash?: (record: ResultFields<T, C>) => void }): Promise<DeleteResult> {
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/LivechatContacts.ts b/apps/meteor/server/models/raw/LivechatContacts.ts
new file mode 100644
index 000000000000..88dac1b9f5c1
--- /dev/null
+++ b/apps/meteor/server/models/raw/LivechatContacts.ts
@@ -0,0 +1,20 @@
+import type { ILivechatContact, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
+import type { ILivechatContactsModel } from '@rocket.chat/model-typings';
+import type { Collection, Db } from 'mongodb';
+
+import { BaseRaw } from './BaseRaw';
+
+export class LivechatContactsRaw extends BaseRaw<ILivechatContact> implements ILivechatContactsModel {
+	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<ILivechatContact>>) {
+		super(db, 'livechat_contact', trash);
+	}
+
+	async updateContact(contactId: string, data: Partial<ILivechatContact>): Promise<ILivechatContact> {
+		const updatedValue = await this.findOneAndUpdate(
+			{ _id: contactId },
+			{ $set: { ...data, unknown: false } },
+			{ returnDocument: 'after' },
+		);
+		return updatedValue.value as ILivechatContact;
+	}
+}
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 8d2805becb3b..7d4a0a54dedf 100644
--- a/apps/meteor/server/models/raw/Rooms.ts
+++ b/apps/meteor/server/models/raw/Rooms.ts
@@ -642,15 +642,6 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		);
 	}
 
-	findByActiveLivestream(options: FindOptions<IRoom> = {}): FindCursor<IRoom> {
-		return this.find(
-			{
-				'streamingOptions.type': 'livestream',
-			},
-			options,
-		);
-	}
-
 	setAsFederated(roomId: IRoom['_id']): Promise<UpdateResult> {
 		return this.updateOne({ _id: roomId }, { $set: { federated: true } });
 	}
@@ -1034,15 +1025,6 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		return this.updateOne(query, update);
 	}
 
-	setStreamingOptionsById(_id: IRoom['_id'], streamingOptions: IRoom['streamingOptions']): Promise<UpdateResult> {
-		const update: UpdateFilter<IRoom> = {
-			$set: {
-				streamingOptions,
-			},
-		};
-		return this.updateOne({ _id }, update);
-	}
-
 	setReadOnlyById(_id: IRoom['_id'], readOnly: NonNullable<IRoom['ro']>): Promise<UpdateResult> {
 		const query: Filter<IRoom> = {
 			_id,
@@ -2081,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/models/startup.ts b/apps/meteor/server/models/startup.ts
index 3d6dc6066689..eaca155674f5 100644
--- a/apps/meteor/server/models/startup.ts
+++ b/apps/meteor/server/models/startup.ts
@@ -22,6 +22,7 @@ import './Integrations';
 import './Invites';
 import './LivechatAgentActivity';
 import './LivechatBusinessHours';
+import './LivechatContacts';
 import './LivechatCustomField';
 import './LivechatDepartment';
 import './LivechatDepartmentAgents';
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/federation/Federation.ts b/apps/meteor/server/services/federation/Federation.ts
index c8e2a9b1bc57..34331dc00971 100644
--- a/apps/meteor/server/services/federation/Federation.ts
+++ b/apps/meteor/server/services/federation/Federation.ts
@@ -17,7 +17,9 @@ const allowedActionsInFederatedRooms: ValueOf<typeof RoomMemberActions>[] = [
 	RoomMemberActions.LEAVE,
 ];
 
-const allowedActionsForModerators = allowedActionsInFederatedRooms.filter((action) => action !== RoomMemberActions.SET_AS_OWNER);
+const allowedActionsForModerators: ValueOf<typeof RoomMemberActions>[] = allowedActionsInFederatedRooms.filter(
+	(action) => action !== RoomMemberActions.SET_AS_OWNER,
+);
 
 const allowedRoomSettingsChangesInFederatedRooms: ValueOf<typeof RoomSettingsEnum>[] = [RoomSettingsEnum.NAME, RoomSettingsEnum.TOPIC];
 
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/nps/service.ts b/apps/meteor/server/services/nps/service.ts
index 9554a472fb0a..be5b44582a5a 100644
--- a/apps/meteor/server/services/nps/service.ts
+++ b/apps/meteor/server/services/nps/service.ts
@@ -21,7 +21,10 @@ export class NPSService extends ServiceClassInternal implements INPSService {
 
 		const any = await Nps.findOne({}, { projection: { _id: 1 } });
 		if (!any) {
-			await Banner.create(getBannerForAdmins(nps.startAt));
+			if (nps.expireAt < nps.startAt || nps.expireAt < new Date()) {
+				throw new Error('NPS already expired');
+			}
+			await Banner.create(getBannerForAdmins(nps.expireAt));
 
 			await notifyAdmins(nps.startAt);
 		}
diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts
index 190464f48da4..4be96bff9866 100644
--- a/apps/meteor/server/services/team/service.ts
+++ b/apps/meteor/server/services/team/service.ts
@@ -20,6 +20,7 @@ import type {
 	ITeam,
 	ITeamMember,
 	ITeamStats,
+	AtLeast,
 } from '@rocket.chat/core-typings';
 import type { InsertionModel } from '@rocket.chat/model-typings';
 import { Team, Rooms, Subscriptions, Users, TeamMember } from '@rocket.chat/models';
@@ -912,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');
@@ -923,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> {
@@ -1053,4 +1054,63 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 
 		return rooms;
 	}
+
+	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(
+		room: AtLeast<IRoom, 'teamId' | 'teamMain' | '_id'>,
+	): Promise<{ team?: Pick<ITeam, 'name' | 'roomId' | 'type'>; parentRoom?: Pick<IRoom, 'name' | 'fname' | 't' | '_id'> }> {
+		if (!room.teamId) {
+			return {};
+		}
+
+		const team = await Team.findOneById(room.teamId, { projection: { _id: 1, name: 1, roomId: 1, type: 1 } });
+		if (!team) {
+			return {};
+		}
+
+		if (room.teamMain) {
+			return { team };
+		}
+
+		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 a744c47b2a41..81166af5c200 100644
--- a/apps/meteor/server/settings/accounts.ts
+++ b/apps/meteor/server/settings/accounts.ts
@@ -31,6 +31,18 @@ export const createAccountSettings = () =>
 				public: true,
 			});
 
+			await this.add('Accounts_twoFactorAuthentication_email_available_for_OAuth_users', true, {
+				type: 'boolean',
+				enableQuery: [
+					enable2FA,
+					{
+						_id: 'Accounts_TwoFactorAuthentication_By_Email_Enabled',
+						value: true,
+					},
+				],
+				public: true,
+			});
+
 			await this.add('Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In', true, {
 				type: 'boolean',
 				enableQuery: [
@@ -731,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/server/settings/omnichannel.ts b/apps/meteor/server/settings/omnichannel.ts
index ed1daa8ce228..c86cd6674d4e 100644
--- a/apps/meteor/server/settings/omnichannel.ts
+++ b/apps/meteor/server/settings/omnichannel.ts
@@ -157,6 +157,13 @@ export const createOmniSettings = () =>
 			i18nLabel: 'Show_agent_email',
 		});
 
+		await this.add('Omnichannel_allow_visitors_to_close_conversation', true, {
+			type: 'boolean',
+			group: 'Omnichannel',
+			public: true,
+			enableQuery: omnichannelEnabledQuery,
+		});
+
 		await this.add('Livechat_request_comment_when_closing_conversation', true, {
 			type: 'boolean',
 			group: 'Omnichannel',
diff --git a/apps/meteor/server/startup/cloudRegistration.ts b/apps/meteor/server/startup/cloudRegistration.ts
index 65d870de4d89..e69d4446d6ec 100644
--- a/apps/meteor/server/startup/cloudRegistration.ts
+++ b/apps/meteor/server/startup/cloudRegistration.ts
@@ -1,7 +1,5 @@
 import { Settings } from '@rocket.chat/models';
 
-import { notifyOnSettingChangedById } from '../../app/lib/server/lib/notifyListener';
-
 export async function ensureCloudWorkspaceRegistered(): Promise<void> {
 	const cloudWorkspaceClientId = await Settings.getValueById('Cloud_Workspace_Client_Id');
 	const cloudWorkspaceClientSecret = await Settings.getValueById('Cloud_Workspace_Client_Secret');
@@ -18,6 +16,5 @@ export async function ensureCloudWorkspaceRegistered(): Promise<void> {
 	}
 
 	// otherwise, set the setup wizard to in_progress forcing admins to complete the registration
-	(await Settings.updateValueById('Show_Setup_Wizard', 'in_progress')).modifiedCount &&
-		void notifyOnSettingChangedById('Show_Setup_Wizard');
+	await Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
 }
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/apps/apps-modal.spec.ts b/apps/meteor/tests/e2e/apps/apps-modal.spec.ts
index 53a4d479bb27..a74a439183d1 100644
--- a/apps/meteor/tests/e2e/apps/apps-modal.spec.ts
+++ b/apps/meteor/tests/e2e/apps/apps-modal.spec.ts
@@ -7,7 +7,7 @@ import { expect, test } from '../utils/test';
 
 test.use({ storageState: Users.user1.state });
 
-test.describe.serial('Apps > ContextualBar', () => {
+test.describe.serial('Apps > Modal', () => {
 	let poHomeChannel: HomeChannel;
 	let poModal: Modal;
 
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index d98acaf847c4..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();
 
@@ -280,6 +351,7 @@ test.describe.serial('e2e-encryption', () => {
 
 		await poHomeChannel.tabs.btnRoomInfo.click();
 		await poHomeChannel.tabs.room.btnEdit.click();
+		await poHomeChannel.tabs.room.advancedSettingsAccordion.click();
 
 		await expect(poHomeChannel.tabs.room.checkboxEncrypted).toBeVisible();
 	});
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/omnichannel/omnichannel-contact-center.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
index d0e7b7133423..d3c667e20f82 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
@@ -42,7 +42,7 @@ const URL = {
 };
 
 const ERROR = {
-	nameRequired: 'The field Name is required.',
+	nameRequired: 'Name required',
 	invalidEmail: 'Invalid email address',
 	existingEmail: 'Email already exists',
 	existingPhone: 'Phone already exists',
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
index 872eafdfb2a2..023d11de4757 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
@@ -8,8 +8,8 @@ import { createDepartment, deleteDepartment } from '../utils/omnichannel/departm
 import { test, expect } from '../utils/test';
 
 const ERROR = {
-	requiredName: 'The field name is required.',
-	requiredEmail: 'The field email is required.',
+	requiredName: 'Name required',
+	requiredEmail: 'Email required',
 	invalidEmail: 'Invalid email address',
 };
 
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management.spec.ts
new file mode 100644
index 000000000000..ee91c49bfb16
--- /dev/null
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management.spec.ts
@@ -0,0 +1,120 @@
+import { createFakeVisitor } from '../../mocks/data';
+import { IS_EE } from '../config/constants';
+import { createAuxContext } from '../fixtures/createAuxContext';
+import { Users } from '../fixtures/userStates';
+import { HomeOmnichannel, OmnichannelLiveChat } from '../page-objects';
+import { test, expect } from '../utils/test';
+
+const firstVisitor = createFakeVisitor();
+
+const secondVisitor = createFakeVisitor();
+
+test.use({ storageState: Users.user1.state });
+
+test.describe('OC - Livechat - Queue Management', () => {
+	test.skip(!IS_EE, 'Enterprise Only');
+
+	let poHomeOmnichannel: HomeOmnichannel;
+	let poLiveChat: OmnichannelLiveChat;
+
+	const waitingQueueMessage = 'This is a message from Waiting Queue';
+	const queuePosition1 = 'Your spot is #1';
+	const queuePosition2 = 'Your spot is #2';
+
+	test.beforeAll(async ({ api, browser }) => {
+		await Promise.all([
+			api.post('/settings/Livechat_Routing_Method', { value: 'Manual_Selection' }),
+			api.post('/settings/Livechat_waiting_queue', { value: true }),
+			api.post('/settings/Livechat_waiting_queue_message', { value: waitingQueueMessage }),
+			api.post('/livechat/users/agent', { username: 'user1' }),
+		]);
+
+		const { page: omniPage } = await createAuxContext(browser, Users.user1, '/', true);
+		poHomeOmnichannel = new HomeOmnichannel(omniPage);
+	});
+
+	test.beforeEach(async ({ browser, api }) => {
+		const context = await browser.newContext();
+		const page2 = await context.newPage();
+
+		poLiveChat = new OmnichannelLiveChat(page2, api);
+		await poLiveChat.page.goto('/livechat');
+	});
+
+	test.afterAll(async ({ api }) => {
+		await Promise.all([
+			api.post('/settings/Livechat_Routing_Method', { value: 'Auto_Selection' }),
+			api.post('/settings/Livechat_waiting_queue', { value: false }),
+			api.post('/settings/Livechat_waiting_queue_message', { value: '' }),
+			api.delete('/livechat/users/agent/user1'),
+		]);
+		await poHomeOmnichannel.page.close();
+	});
+
+	test.afterEach(async () => {
+		await poLiveChat.closeChat();
+		await poLiveChat.page.close();
+	});
+
+	test('OC - Queue Management - Waiting Queue Message enabled', async () => {
+		await test.step('should start livechat session', async () => {
+			await poLiveChat.openAnyLiveChatAndSendMessage({
+				liveChatUser: firstVisitor,
+				message: 'Test message',
+				isOffline: false,
+			});
+		});
+		await test.step('expect to receive Waiting Queue message on chat', async () => {
+			await expect(poLiveChat.page.locator(`div >> text=${waitingQueueMessage}`)).toBeVisible();
+		});
+	});
+
+	test.describe('OC - Queue Management - Update Queue Position', () => {
+		let poLiveChat2: OmnichannelLiveChat;
+
+		test.beforeEach(async ({ browser, api }) => {
+			const context = await browser.newContext();
+			const page = await context.newPage();
+			poLiveChat2 = new OmnichannelLiveChat(page, api);
+			await poLiveChat2.page.goto('/livechat');
+		});
+
+		test.afterEach(async () => {
+			await poLiveChat2.closeChat();
+			await poLiveChat2.page.close();
+		});
+
+		test('Update user position on Queue', async () => {
+			await test.step('should start secondary livechat session', async () => {
+				await poLiveChat2.openAnyLiveChatAndSendMessage({
+					liveChatUser: secondVisitor,
+					message: 'Test message',
+					isOffline: false,
+				});
+			});
+
+			await test.step('should start primary livechat session', async () => {
+				await poLiveChat.openAnyLiveChatAndSendMessage({
+					liveChatUser: firstVisitor,
+					message: 'Test message',
+					isOffline: false,
+				});
+			});
+
+			await test.step('should verify the queue position of the primary user', async () => {
+				await expect(poLiveChat.page.locator(`div[role='alert'] >> text=${queuePosition2}`)).toBeVisible();
+			});
+
+			await test.step('should allow the agent to take the secondary user chat', async () => {
+				await poHomeOmnichannel.sidenav.getQueuedChat(secondVisitor.name).click();
+				await expect(poHomeOmnichannel.content.btnTakeChat).toBeVisible();
+				await poHomeOmnichannel.content.btnTakeChat.click();
+				await expect(poHomeOmnichannel.content.lastSystemMessageBody).toHaveText('joined the channel');
+			});
+
+			await test.step('expect the queue position of the primary user to update after the secondary users chat is taken', async () => {
+				await expect(poLiveChat.page.locator(`div[role='alert'] >> text=${queuePosition1}`)).toBeVisible();
+			});
+		});
+	});
+});
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
index bf14584ed89f..cf805ca233dd 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts
@@ -2,6 +2,7 @@ import { createFakeVisitor } from '../../mocks/data';
 import { createAuxContext } from '../fixtures/createAuxContext';
 import { Users } from '../fixtures/userStates';
 import { HomeOmnichannel, OmnichannelLiveChat } from '../page-objects';
+import { setSettingValueById } from '../utils';
 import { createAgent } from '../utils/omnichannel/agents';
 import { test, expect } from '../utils/test';
 
@@ -57,7 +58,7 @@ test.describe.serial('OC - Livechat', () => {
 		});
 	});
 
-	test('OC - Livechat - Send message to livechat costumer', async () => {
+	test('OC - Livechat - Send message to livechat customer', async () => {
 		await poHomeOmnichannel.sidenav.openChat(firstVisitor.name);
 
 		await test.step('expect message to be sent by agent', async () => {
@@ -75,9 +76,23 @@ test.describe.serial('OC - Livechat', () => {
 			await expect(poLiveChat.unreadMessagesBadge(1)).toBeVisible();
 		});
 
+		await test.step('expect multiple messages to be received by minimized livechat', async () => {
+			await poHomeOmnichannel.content.sendMessage('this_a_test_message_once_again_from_agent');
+			await expect(poLiveChat.unreadMessagesBadge(2)).toBeVisible();
+		});
+
 		await test.step('expect unread messages to be visible after a reload', async () => {
 			await poLiveChat.page.reload();
-			await expect(poLiveChat.unreadMessagesBadge(1)).toBeVisible();
+			await expect(poLiveChat.unreadMessagesBadge(2)).toBeVisible();
+		});
+	});
+
+	test('OC - Livechat - Send message to agent after reload', async () => {
+		await test.step('expect unread counter to be empty after user sends a message', async () => {
+			await poLiveChat.openAnyLiveChat();
+			await poLiveChat.onlineAgentMessage.fill('this_a_test_message_from_user');
+			await poLiveChat.btnSendMessageToOnlineAgent.click();
+			expect(await poLiveChat.unreadMessagesBadge(0).all()).toHaveLength(0);
 		});
 	});
 
@@ -93,6 +108,57 @@ test.describe.serial('OC - Livechat', () => {
 	});
 });
 
+test.describe.serial('OC - Livechat - Visitors closing the room is disabled', () => {
+	let poLiveChat: OmnichannelLiveChat;
+	let poHomeOmnichannel: HomeOmnichannel;
+
+	test.beforeAll(async ({ api }) => {
+		await api.post('/livechat/users/agent', { username: 'user1' });
+	});
+
+	test.beforeAll(async ({ browser, api }) => {
+		const { page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false);
+
+		poLiveChat = new OmnichannelLiveChat(livechatPage, api);
+	});
+
+	test.beforeAll(async ({ browser, api }) => {
+		await setSettingValueById(api, 'Livechat_allow_visitor_closing_chat', false);
+		const { page: omniPage } = await createAuxContext(browser, Users.user1, '/', true);
+		poHomeOmnichannel = new HomeOmnichannel(omniPage);
+	});
+
+	test.afterAll(async ({ api }) => {
+		await setSettingValueById(api, 'Livechat_allow_visitor_closing_chat', true);
+		await api.delete('/livechat/users/agent/user1');
+		await poLiveChat.page.close();
+	});
+
+	test('OC - Livechat - Close Chat disabled', async () => {
+		await poLiveChat.page.reload();
+		await poLiveChat.openAnyLiveChat();
+		await poLiveChat.sendMessage(firstVisitor, false);
+		await poLiveChat.onlineAgentMessage.fill('this_a_test_message_from_user');
+		await poLiveChat.btnSendMessageToOnlineAgent.click();
+
+		await test.step('expect to close a livechat conversation', async () => {
+			await expect(poLiveChat.btnOptions).not.toBeVisible();
+			await expect(poLiveChat.btnCloseChat).not.toBeVisible();
+		});
+	});
+
+	test('OC - Livechat - Close chat disabled, agents can close', async () => {
+		await poHomeOmnichannel.sidenav.openChat(firstVisitor.name);
+
+		await test.step('expect livechat conversation to be closed by agent', async () => {
+			await poHomeOmnichannel.content.btnCloseChat.click();
+			await poHomeOmnichannel.content.closeChatModal.inputComment.fill('this_is_a_test_comment');
+			await poHomeOmnichannel.content.closeChatModal.btnConfirm.click();
+			await expect(poHomeOmnichannel.toastSuccess).toBeVisible();
+		});
+	});
+});
+
 test.describe.serial('OC - Livechat - Resub after close room', () => {
 	let poLiveChat: OmnichannelLiveChat;
 	let poHomeOmnichannel: HomeOmnichannel;
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts
index 1da1837572e5..9ee1d8d99fd9 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts
@@ -8,7 +8,7 @@ import { test, expect } from '../utils/test';
 const PRIORITY_NAME = faker.person.firstName();
 
 const ERROR = {
-	fieldNameRequired: 'The field Name is required.',
+	fieldNameRequired: 'Name required',
 };
 
 test.skip(!IS_EE, 'Omnichannel Priorities > Enterprise Only');
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts
index 35a371c61ba6..d5b5544e9ace 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts
@@ -6,8 +6,8 @@ import { OmnichannelSlaPolicies } from '../page-objects/omnichannel-sla-policies
 import { test, expect } from '../utils/test';
 
 const ERROR = {
-	nameRequired: 'The field Name is required.',
-	estimatedWaitTimeRequired: 'The field Estimated wait time (time in minutes) is required.',
+	nameRequired: 'Name required',
+	estimatedWaitTimeRequired: 'Estimated wait time (time in minutes) required',
 };
 
 const INITIAL_SLA = {
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 9d5e2081ca93..519d9a4102aa 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-flextab-room.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
index 3d0fca96a37a..f0eb7b726d45 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
@@ -91,6 +91,10 @@ export class HomeFlextabRoom {
 		return this.page.getByRole('dialog').getByRole('alert', { name: 'Retention policy warning callout' });
 	}
 
+	get advancedSettingsAccordion(): Locator {
+		return this.page.getByRole('dialog').getByRole('button', { name: 'Advanced settings' });
+	}
+
 	get pruneAccordion(): Locator {
 		return this.page.getByRole('dialog').getByRole('button', { name: 'Prune', exact: true });
 	}
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/e2e/page-objects/omnichannel-livechat.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts
index 330fc981237f..e52ae45782c8 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts
@@ -88,6 +88,19 @@ export class OmnichannelLiveChat {
 		await this.btnNewChat.click();
 	}
 
+	async openAnyLiveChatAndSendMessage(params: {
+		liveChatUser: { name: string; email: string };
+		message: string;
+		isOffline?: boolean;
+		department?: string;
+	}): Promise<void> {
+		const { liveChatUser, message, isOffline, department } = params;
+		await this.openAnyLiveChat();
+		await this.sendMessage(liveChatUser, isOffline, department);
+		await this.onlineAgentMessage.fill(message);
+		await this.btnSendMessageToOnlineAgent.click();
+	}
+
 	unreadMessagesBadge(count: number): Locator {
 		const name = count === 1 ? `${count} unread message` : `${count} unread messages`;
 
diff --git a/apps/meteor/tests/e2e/retention-policy.spec.ts b/apps/meteor/tests/e2e/retention-policy.spec.ts
index 128f8eea2d74..9d6dab66448d 100644
--- a/apps/meteor/tests/e2e/retention-policy.spec.ts
+++ b/apps/meteor/tests/e2e/retention-policy.spec.ts
@@ -115,6 +115,7 @@ test.describe.serial('retention-policy', () => {
 				await auxContext.poHomeChannel.sidenav.openChat(targetChannel);
 				await auxContext.poHomeChannel.tabs.btnRoomInfo.click();
 				await auxContext.poHomeChannel.tabs.room.btnEdit.click();
+				await auxContext.poHomeChannel.tabs.room.advancedSettingsAccordion.click();
 				await auxContext.poHomeChannel.tabs.room.checkboxReadOnly.check();
 				await auxContext.poHomeChannel.tabs.room.btnSave.click();
 
diff --git a/apps/meteor/tests/e2e/team-management.spec.ts b/apps/meteor/tests/e2e/team-management.spec.ts
index 74daca0e7be3..690fa2b5b5dd 100644
--- a/apps/meteor/tests/e2e/team-management.spec.ts
+++ b/apps/meteor/tests/e2e/team-management.spec.ts
@@ -77,6 +77,7 @@ test.describe.serial('teams-management', () => {
 		await poHomeTeam.sidenav.openChat(targetTeam);
 		await poHomeTeam.tabs.btnRoomInfo.click();
 		await poHomeTeam.tabs.room.btnEdit.click();
+		await poHomeTeam.tabs.room.advancedSettingsAccordion.click();
 		await poHomeTeam.tabs.room.checkboxReadOnly.click();
 		await poHomeTeam.tabs.room.btnSave.click();
 
diff --git a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
index 7142725a1d99..4388a4d24341 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
@@ -689,6 +689,25 @@ describe('LIVECHAT - rooms', () => {
 				expect(latestRoom).to.not.have.property('pdfTranscriptFileId');
 			},
 		);
+
+		describe('Special case: visitors closing is disabled', () => {
+			before(async () => {
+				await updateSetting('Omnichannel_allow_visitors_to_close_conversation', false);
+			});
+			after(async () => {
+				await updateSetting('Omnichannel_allow_visitors_to_close_conversation', true);
+			});
+			it('should not allow visitor to close a conversation', async () => {
+				const { room, visitor } = await startANewLivechatRoomAndTakeIt();
+				await request
+					.post(api('livechat/room.close'))
+					.send({
+						token: visitor.token,
+						rid: room._id,
+					})
+					.expect(400);
+			});
+		});
 	});
 
 	describe('livechat/room.forward', () => {
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 5bc961087efc..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,
@@ -56,6 +56,7 @@ describe('LIVECHAT - visitors', () => {
 			expect(body).to.have.property('success', true);
 			expect(body).to.have.property('visitor');
 			expect(body.visitor).to.have.property('token', 'test');
+			expect(body.visitor).to.have.property('contactId');
 
 			// Ensure all new visitors are created as online :)
 			expect(body.visitor).to.have.property('status', 'online');
@@ -216,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/livechat/contacts.ts b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
new file mode 100644
index 000000000000..c33ef255c25c
--- /dev/null
+++ b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
@@ -0,0 +1,635 @@
+import { faker } from '@faker-js/faker';
+import type { ILivechatAgent, IUser } from '@rocket.chat/core-typings';
+import { expect } from 'chai';
+import { before, after, describe, it } from 'mocha';
+
+import { getCredentials, api, request, credentials } from '../../../data/api-data';
+import { createCustomField, deleteCustomField } from '../../../data/livechat/custom-fields';
+import { createAgent } from '../../../data/livechat/rooms';
+import { removeAgent } from '../../../data/livechat/users';
+import { removePermissionFromAllRoles, restorePermissionToRoles, updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { createUser, deleteUser } from '../../../data/users.helper';
+
+describe('LIVECHAT - contacts', () => {
+	let agentUser: IUser;
+	let livechatAgent: ILivechatAgent;
+	before((done) => getCredentials(done));
+
+	before(async () => {
+		await updateSetting('Livechat_enabled', true);
+		agentUser = await createUser();
+		livechatAgent = await createAgent(agentUser.username);
+	});
+
+	after(async () => {
+		await removeAgent(livechatAgent._id);
+		await deleteUser(agentUser);
+		await restorePermissionToRoles('create-livechat-contact');
+		await updateSetting('Livechat_enabled', true);
+	});
+
+	describe('[POST] omnichannel/contacts', () => {
+		before(async () => {
+			await updatePermission('create-livechat-contact', ['admin']);
+		});
+
+		after(async () => {
+			await restorePermissionToRoles('create-livechat-contact');
+		});
+
+		it('should be able to create a new contact', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+				});
+
+			expect(res.body).to.have.property('success', true);
+			expect(res.body).to.have.property('contactId');
+			expect(res.body.contactId).to.be.an('string');
+		});
+
+		it("should return an error if user doesn't have 'create-livechat-contact' permission", async () => {
+			await removePermissionFromAllRoles('create-livechat-contact');
+
+			const res = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+				});
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+
+			await restorePermissionToRoles('create-livechat-contact');
+		});
+
+		it('should return an error if contact manager not exists', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+					contactManager: 'invalid',
+				});
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body).to.have.property('error');
+			expect(res.body.error).to.be.equal('error-contact-manager-not-found');
+		});
+
+		it('should return an error if contact manager is not a livechat-agent', async () => {
+			const normalUser = await createUser();
+
+			const res = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+					contactManager: normalUser._id,
+				});
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body).to.have.property('error');
+			expect(res.body.error).to.be.equal('error-contact-manager-not-found');
+
+			await deleteUser(normalUser);
+		});
+
+		it('should be able to create a new contact with a contact manager', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+					contactManager: livechatAgent._id,
+				});
+
+			expect(res.body).to.have.property('success', true);
+			expect(res.body).to.have.property('contactId');
+			expect(res.body.contactId).to.be.an('string');
+		});
+
+		describe('Custom Fields', () => {
+			before(async () => {
+				await createCustomField({
+					field: 'cf1',
+					label: 'Custom Field 1',
+					scope: 'visitor',
+					visibility: 'public',
+					type: 'input',
+					required: true,
+					regexp: '^[0-9]+$',
+					searchable: true,
+					public: true,
+				});
+			});
+
+			after(async () => {
+				await deleteCustomField('cf1');
+			});
+
+			it('should validate custom fields correctly', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts'))
+					.set(credentials)
+					.send({
+						name: faker.person.fullName(),
+						emails: [faker.internet.email().toLowerCase()],
+						phones: [faker.phone.number()],
+						customFields: {
+							cf1: '123',
+						},
+					});
+
+				expect(res.body).to.have.property('success', true);
+				expect(res.body).to.have.property('contactId');
+				expect(res.body.contactId).to.be.an('string');
+			});
+
+			it('should return an error for missing required custom field', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts'))
+					.set(credentials)
+					.send({
+						name: faker.person.fullName(),
+						emails: [faker.internet.email().toLowerCase()],
+						phones: [faker.phone.number()],
+						customFields: {},
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('Invalid value for Custom Field 1 field');
+			});
+
+			it('should return an error for invalid custom field value', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts'))
+					.set(credentials)
+					.send({
+						name: faker.person.fullName(),
+						emails: [faker.internet.email().toLowerCase()],
+						phones: [faker.phone.number()],
+						customFields: {
+							cf1: 'invalid',
+						},
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('Invalid value for Custom Field 1 field');
+			});
+		});
+
+		describe('Fields Validation', () => {
+			it('should return an error if name is missing', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts'))
+					.set(credentials)
+					.send({
+						emails: [faker.internet.email().toLowerCase()],
+						phones: [faker.phone.number()],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal("must have required property 'name' [invalid-params]");
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if emails is missing', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts'))
+					.set(credentials)
+					.send({
+						name: faker.person.fullName(),
+						phones: [faker.phone.number()],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal("must have required property 'emails' [invalid-params]");
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if phones is missing', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts'))
+					.set(credentials)
+					.send({
+						name: faker.person.fullName(),
+						emails: [faker.internet.email().toLowerCase()],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal("must have required property 'phones' [invalid-params]");
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if emails is not an array', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts'))
+					.set(credentials)
+					.send({
+						name: faker.person.fullName(),
+						emails: 'invalid',
+						phones: [faker.phone.number()],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be array [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if emails is not an array of strings', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts'))
+					.set(credentials)
+					.send({
+						name: faker.person.fullName(),
+						emails: [{ invalid: true }],
+						phones: [faker.phone.number()],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be string [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if phones is not an array of strings', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts'))
+					.set(credentials)
+					.send({
+						name: faker.person.fullName(),
+						emails: [faker.internet.email().toLowerCase()],
+						phones: [{ invalid: true }],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be string [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if additional fields are provided', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts'))
+					.set(credentials)
+					.send({
+						name: faker.person.fullName(),
+						emails: [faker.internet.email().toLowerCase()],
+						phones: [faker.phone.number()],
+						additional: 'invalid',
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must NOT have additional properties [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+		});
+	});
+
+	describe('[POST] omnichannel/contacts.update', () => {
+		let contactId: string;
+
+		before(async () => {
+			const { body } = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+				});
+			contactId = body.contactId;
+		});
+
+		after(async () => {
+			await restorePermissionToRoles('update-livechat-contact');
+		});
+
+		it('should be able to update a contact', async () => {
+			const name = faker.person.fullName();
+			const emails = [faker.internet.email().toLowerCase()];
+			const phones = [faker.phone.number()];
+
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId,
+				name,
+				emails,
+				phones,
+			});
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact._id).to.be.equal(contactId);
+			expect(res.body.contact.name).to.be.equal(name);
+			expect(res.body.contact.emails).to.be.deep.equal(emails);
+			expect(res.body.contact.phones).to.be.deep.equal(phones);
+		});
+
+		it('should set the unknown field to false when updating a contact', async () => {
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId,
+				name: faker.person.fullName(),
+			});
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact._id).to.be.equal(contactId);
+			expect(res.body.contact.unknown).to.be.equal(false);
+		});
+
+		it('should be able to update the contact manager', async () => {
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId,
+				contactManager: livechatAgent._id,
+			});
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact._id).to.be.equal(contactId);
+			expect(res.body.contact.contactManager).to.be.equal(livechatAgent._id);
+		});
+
+		it('should return an error if contact does not exist', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.update'))
+				.set(credentials)
+				.send({
+					contactId: 'invalid',
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+				});
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body).to.have.property('error');
+			expect(res.body.error).to.be.equal('error-contact-not-found');
+		});
+
+		it('should return an error if contact manager not exists', async () => {
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId,
+				contactManager: 'invalid',
+			});
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body).to.have.property('error');
+			expect(res.body.error).to.be.equal('error-contact-manager-not-found');
+		});
+
+		describe('Permissions', () => {
+			before(async () => {
+				await removePermissionFromAllRoles('update-livechat-contact');
+			});
+
+			after(async () => {
+				await restorePermissionToRoles('update-livechat-contact');
+			});
+
+			it("should return an error if user doesn't have 'update-livechat-contact' permission", async () => {
+				const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+					contactId,
+				});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+			});
+		});
+
+		describe('Custom Fields', () => {
+			before(async () => {
+				await createCustomField({
+					field: 'cf1',
+					label: 'Custom Field 1',
+					scope: 'visitor',
+					visibility: 'public',
+					type: 'input',
+					required: true,
+					regexp: '^[0-9]+$',
+					searchable: true,
+					public: true,
+				});
+			});
+
+			after(async () => {
+				await deleteCustomField('cf1');
+			});
+
+			it('should validate custom fields correctly', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						contactId,
+						customFields: {
+							cf1: '123',
+						},
+					});
+
+				expect(res.status).to.be.equal(200);
+				expect(res.body).to.have.property('success', true);
+				expect(res.body.contact._id).to.be.equal(contactId);
+			});
+
+			it('should return an error for invalid custom field value', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						contactId,
+						customFields: {
+							cf1: 'invalid',
+						},
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('Invalid value for Custom Field 1 field');
+			});
+
+			it('should return an error if additional custom fields are provided', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						contactId,
+						customFields: {
+							cf1: '123',
+							cf2: 'invalid',
+						},
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('Custom field cf2 is not allowed');
+			});
+		});
+
+		describe('Fields Validation', () => {
+			it('should return an error if contactId is missing', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						emails: [faker.internet.email().toLowerCase()],
+						phones: [faker.phone.number()],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal("must have required property 'contactId' [invalid-params]");
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if emails is not an array', async () => {
+				const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+					contactId,
+					emails: 'invalid',
+				});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be array [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if emails is not an array of strings', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						contactId,
+						emails: [{ invalid: true }],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be string [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if phones is not an array', async () => {
+				const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+					contactId,
+					phones: 'invalid',
+				});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be array [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if phones is not an array of strings', async () => {
+				const res = await request
+					.post(api('omnichannel/contacts.update'))
+					.set(credentials)
+					.send({
+						contactId,
+						phones: [{ invalid: true }],
+					});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must be string [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+
+			it('should return an error if additional fields are provided', async () => {
+				const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+					contactId,
+					unknown: true,
+				});
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error');
+				expect(res.body.error).to.be.equal('must NOT have additional properties [invalid-params]');
+				expect(res.body.errorType).to.be.equal('invalid-params');
+			});
+		});
+	});
+
+	describe('[GET] omnichannel/contacts.get', () => {
+		let contactId: string;
+		const contact = {
+			name: faker.person.fullName(),
+			emails: [faker.internet.email().toLowerCase()],
+			phones: [faker.phone.number()],
+			contactManager: agentUser?._id,
+		};
+
+		before(async () => {
+			await updatePermission('view-livechat-contact', ['admin']);
+			const { body } = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({ ...contact });
+			contactId = body.contactId;
+		});
+
+		after(async () => {
+			await restorePermissionToRoles('view-livechat-contact');
+		});
+
+		it('should be able get a contact by id', async () => {
+			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact._id).to.be.equal(contactId);
+			expect(res.body.contact.name).to.be.equal(contact.name);
+			expect(res.body.contact.emails).to.be.deep.equal(contact.emails);
+			expect(res.body.contact.phones).to.be.deep.equal(contact.phones);
+			expect(res.body.contact.contactManager).to.be.equal(contact.contactManager);
+		});
+
+		it('should return null if contact does not exist', async () => {
+			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: 'invalid' });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contact).to.be.null;
+		});
+
+		it("should return an error if user doesn't have 'view-livechat-contact' permission", async () => {
+			await removePermissionFromAllRoles('view-livechat-contact');
+
+			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId });
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+
+			await restorePermissionToRoles('view-livechat-contact');
+		});
+
+		it('should return an error if contactId is missing', async () => {
+			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials);
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body).to.have.property('error');
+			expect(res.body.error).to.be.equal("must have required property 'contactId' [invalid-params]");
+			expect(res.body.errorType).to.be.equal('invalid-params');
+		});
+	});
+});
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 bb4cbb8fb196..15f85964ffff 100644
--- a/apps/meteor/tests/end-to-end/api/rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/rooms.ts
@@ -1264,8 +1264,164 @@ describe('[Rooms]', () => {
 				})
 				.end(done);
 		});
-	});
 
+		it('should not return parent & team for room thats not on a team nor is a discussion', async () => {
+			await request
+				.get(api('rooms.info'))
+				.set(credentials)
+				.query({
+					roomId: testChannel._id,
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('room').and.to.be.an('object');
+					expect(res.body.room).to.not.have.property('team');
+					expect(res.body.room).to.not.have.property('prid');
+				});
+		});
+
+		describe('with team and parent data', () => {
+			const testChannelName = `channel.test.${Date.now()}-${Math.random()}`;
+			const teamName = `test-team-${Date.now()}`;
+			const discussionName = `test-discussion-${Date.now()}`;
+			const testChannelOutsideTeamname = `channel.test.outside.${Date.now()}-${Math.random()}`;
+			let testChannel: IRoom;
+			let testDiscussion: IRoom;
+			let testDiscussionMainRoom: IRoom;
+			let testTeam: ITeam;
+			let testChannelOutside: IRoom;
+			let testDiscussionOutsideTeam: IRoom;
+
+			before(async () => {
+				testChannel = (await createRoom({ type: 'c', name: testChannelName })).body.channel;
+
+				const teamResponse = await request.post(api('teams.create')).set(credentials).send({ name: teamName, type: 1 }).expect(200);
+				testTeam = teamResponse.body.team;
+
+				const resDiscussion = await request.post(api('rooms.createDiscussion')).set(credentials).send({
+					prid: testChannel._id,
+					t_name: discussionName,
+				});
+				testDiscussion = resDiscussion.body.discussion;
+
+				testDiscussionMainRoom = (
+					await request
+						.post(api('rooms.createDiscussion'))
+						.set(credentials)
+						.send({
+							prid: testTeam.roomId,
+							t_name: `test-discussion-${Date.now()}-team`,
+						})
+				).body.discussion;
+
+				await request
+					.post(api('teams.addRooms'))
+					.set(credentials)
+					.send({ rooms: [testChannel._id], teamId: testTeam._id });
+			});
+
+			before(async () => {
+				testChannelOutside = (await createRoom({ type: 'c', name: testChannelOutsideTeamname })).body.channel;
+				testDiscussionOutsideTeam = (
+					await request
+						.post(api('rooms.createDiscussion'))
+						.set(credentials)
+						.send({
+							prid: testChannelOutside._id,
+							t_name: `test-discussion-${Date.now()}`,
+						})
+				).body.discussion;
+			});
+
+			after(() =>
+				Promise.all([
+					deleteRoom({ type: 'c', roomId: testChannel._id }),
+					deleteRoom({ type: 'p', roomId: testDiscussion._id }),
+					deleteRoom({ type: 'c', roomId: testChannelOutside._id }),
+					deleteRoom({ type: 'p', roomId: testDiscussionOutsideTeam._id }),
+					deleteRoom({ type: 'p', roomId: testDiscussionMainRoom._id }),
+					deleteTeam(credentials, teamName),
+				]),
+			);
+
+			it('should return the channel info, team and parent info', async () => {
+				const result = await request.get(api('rooms.info')).set(credentials).query({ roomId: testChannel._id }).expect(200);
+
+				expect(result.body).to.have.property('success', true);
+				expect(result.body).to.have.property('team');
+				expect(result.body).to.have.property('parent');
+				expect(result.body.parent).to.have.property('_id').and.to.equal(testTeam.roomId);
+			});
+
+			it('should return the dicsussion room info and parent info', async () => {
+				await request
+					.get(api('rooms.info'))
+					.set(credentials)
+					.query({ roomId: testDiscussion._id })
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.property('parent').and.to.be.an('object');
+						expect(res.body.parent).to.have.property('_id').and.to.be.equal(testChannel._id);
+					});
+			});
+
+			it('should not return parent info for the main room of the team', async () => {
+				await request
+					.get(api('rooms.info'))
+					.set(credentials)
+					.query({ roomId: testTeam.roomId })
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.not.have.property('parent');
+						expect(res.body).to.have.property('team');
+					});
+			});
+
+			it('should not return team for room outside team', async () => {
+				await request
+					.get(api('rooms.info'))
+					.set(credentials)
+					.query({ roomId: testChannelOutside._id })
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.not.have.property('team');
+						expect(res.body).to.not.have.property('parent');
+					});
+			});
+
+			it('should return the parent for discussion outside team', async () => {
+				await request
+					.get(api('rooms.info'))
+					.set(credentials)
+					.query({ roomId: testDiscussionOutsideTeam._id })
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.property('parent').and.to.be.an('object');
+						expect(res.body.parent).to.have.property('_id').and.to.be.equal(testChannelOutside._id);
+						expect(res.body).to.not.have.property('team');
+					});
+			});
+
+			it('should return the parent for a discussion created from team main room', async () => {
+				await request
+					.get(api('rooms.info'))
+					.set(credentials)
+					.query({ roomId: testDiscussionMainRoom._id })
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.property('parent').and.to.be.an('object');
+						expect(res.body.parent).to.have.property('_id').and.to.be.equal(testTeam.roomId);
+						expect(res.body).to.not.have.property('team');
+					});
+			});
+		});
+	});
 	describe('[/rooms.leave]', () => {
 		let testChannel: IRoom;
 		let testGroup: 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/mocks/data.ts b/apps/meteor/tests/mocks/data.ts
index 14f03a6bd9ab..fd6a0ce91123 100644
--- a/apps/meteor/tests/mocks/data.ts
+++ b/apps/meteor/tests/mocks/data.ts
@@ -21,7 +21,7 @@ export function createFakeUser(overrides?: Partial<IUser>): IUser {
 	};
 }
 
-export const createFakeRoom = (overrides?: Partial<IRoom>): IRoom => ({
+export const createFakeRoom = (overrides?: Partial<IRoom & { retention?: { enabled: boolean } }>): IRoom => ({
 	_id: faker.database.mongodbObjectId(),
 	_updatedAt: faker.date.recent(),
 	t: faker.helpers.arrayElement(['c', 'p', 'd']),
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/livechat/server/lib/Contacts.spec.ts b/apps/meteor/tests/unit/app/livechat/server/lib/Contacts.spec.ts
new file mode 100644
index 000000000000..fef3c59469f8
--- /dev/null
+++ b/apps/meteor/tests/unit/app/livechat/server/lib/Contacts.spec.ts
@@ -0,0 +1,102 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const modelsMock = {
+	Users: {
+		findOneAgentById: sinon.stub(),
+	},
+	LivechatContacts: {
+		findOneById: sinon.stub(),
+		updateContact: sinon.stub(),
+	},
+};
+const { validateCustomFields, validateContactManager, updateContact } = proxyquire
+	.noCallThru()
+	.load('../../../../../../app/livechat/server/lib/Contacts', {
+		'meteor/check': sinon.stub(),
+		'meteor/meteor': sinon.stub(),
+		'@rocket.chat/models': modelsMock,
+	});
+
+describe('[OC] Contacts', () => {
+	describe('validateCustomFields', () => {
+		const mockCustomFields = [{ _id: 'cf1', label: 'Custom Field 1', regexp: '^[0-9]+$', required: true }];
+
+		it('should validate custom fields correctly', () => {
+			expect(() => validateCustomFields(mockCustomFields, { cf1: '123' })).to.not.throw();
+		});
+
+		it('should throw an error if a required custom field is missing', () => {
+			expect(() => validateCustomFields(mockCustomFields, {})).to.throw();
+		});
+
+		it('should NOT throw an error when a non-required custom field is missing', () => {
+			const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
+			const customFields = {};
+
+			expect(() => validateCustomFields(allowedCustomFields, customFields)).not.to.throw();
+		});
+
+		it('should throw an error if a custom field value does not match the regexp', () => {
+			expect(() => validateCustomFields(mockCustomFields, { cf1: 'invalid' })).to.throw();
+		});
+
+		it('should handle an empty customFields input without throwing an error', () => {
+			const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
+			const customFields = {};
+
+			expect(() => validateCustomFields(allowedCustomFields, customFields)).not.to.throw();
+		});
+
+		it('should throw an error if a extra custom field is passed', () => {
+			const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
+			const customFields = { field2: 'value' };
+
+			expect(() => validateCustomFields(allowedCustomFields, customFields)).to.throw();
+		});
+	});
+
+	describe('validateContactManager', () => {
+		beforeEach(() => {
+			modelsMock.Users.findOneAgentById.reset();
+		});
+
+		it('should throw an error if the user does not exist', async () => {
+			modelsMock.Users.findOneAgentById.resolves(undefined);
+			await expect(validateContactManager('any_id')).to.be.rejectedWith('error-contact-manager-not-found');
+		});
+
+		it('should not throw an error if the user has the "livechat-agent" role', async () => {
+			const user = { _id: 'userId' };
+			modelsMock.Users.findOneAgentById.resolves(user);
+
+			await expect(validateContactManager('userId')).to.not.be.rejected;
+			expect(modelsMock.Users.findOneAgentById.getCall(0).firstArg).to.be.equal('userId');
+		});
+	});
+
+	describe('updateContact', () => {
+		beforeEach(() => {
+			modelsMock.LivechatContacts.findOneById.reset();
+			modelsMock.LivechatContacts.updateContact.reset();
+		});
+
+		it('should throw an error if the contact does not exist', async () => {
+			modelsMock.LivechatContacts.findOneById.resolves(undefined);
+			await expect(updateContact('any_id')).to.be.rejectedWith('error-contact-not-found');
+			expect(modelsMock.LivechatContacts.updateContact.getCall(0)).to.be.null;
+		});
+
+		it('should update the contact with correct params', async () => {
+			modelsMock.LivechatContacts.findOneById.resolves({ _id: 'contactId' });
+			modelsMock.LivechatContacts.updateContact.resolves({ _id: 'contactId', name: 'John Doe' } as any);
+
+			const updatedContact = await updateContact({ contactId: 'contactId', name: 'John Doe' });
+
+			expect(modelsMock.LivechatContacts.updateContact.getCall(0).args[0]).to.be.equal('contactId');
+			expect(modelsMock.LivechatContacts.updateContact.getCall(0).args[1]).to.be.deep.contain({ name: 'John Doe' });
+			expect(updatedContact).to.be.deep.equal({ _id: 'contactId', name: 'John Doe' });
+		});
+	});
+});
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/meteor/tests/unit/server/services/nps/spec.tests.ts b/apps/meteor/tests/unit/server/services/nps/spec.tests.ts
new file mode 100644
index 000000000000..21c5ecfe7c98
--- /dev/null
+++ b/apps/meteor/tests/unit/server/services/nps/spec.tests.ts
@@ -0,0 +1,103 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import p from 'proxyquire';
+import sinon from 'sinon';
+
+const modelsMock = {
+	'NpsVote': {},
+	'Nps': {
+		findOne: sinon.stub(),
+		save: sinon.stub(),
+	},
+	'Settings': {
+		getValueById: sinon.stub(),
+	},
+	'@noCallThru': true,
+};
+
+const servicesMock = {
+	Banner: {
+		create: sinon.stub(),
+	},
+};
+
+const getbannerforadminsMock = sinon.stub();
+
+const { NPSService } = p('../../../../../server/services/nps/service.ts', {
+	'@rocket.chat/models': modelsMock,
+	'@rocket.chat/core-services': servicesMock,
+	'./sendNpsResults': { 'sendNpsResults': sinon.stub(), '@noCallThru': true },
+	'../../lib/logger/system': { 'SystemLogger': { error: sinon.stub() }, '@noCallThru': true },
+	'./notification': { 'notifyAdmins': sinon.stub(), 'getBannerForAdmins': getbannerforadminsMock, '@noCallThru': true },
+});
+
+describe('NPS Service', () => {
+	it('should instantiate properly', () => {
+		expect(new NPSService()).to.be.an('object');
+	});
+
+	describe('@create', () => {
+		beforeEach(() => {
+			modelsMock.Settings.getValueById.reset();
+			modelsMock.Nps.findOne.reset();
+			modelsMock.Nps.save.reset();
+			servicesMock.Banner.create.reset();
+			getbannerforadminsMock.reset();
+		});
+		it('should fail when user opted out of nps', async () => {
+			modelsMock.Settings.getValueById.withArgs('NPS_survey_enabled').resolves(false);
+
+			await expect(new NPSService().create({})).to.be.rejectedWith('Server opted-out for NPS surveys');
+		});
+		it('should fail when nps expireDate is less than nps startAt', async () => {
+			modelsMock.Settings.getValueById.withArgs('NPS_survey_enabled').resolves(true);
+			modelsMock.Nps.findOne.resolves(null);
+
+			await expect(new NPSService().create({ expireAt: new Date('2020-01-01'), startAt: new Date('2020-01-02') })).to.be.rejectedWith(
+				'NPS already expired',
+			);
+		});
+		it('should fail when expireDate is less than current date', async () => {
+			modelsMock.Settings.getValueById.withArgs('NPS_survey_enabled').resolves(true);
+			modelsMock.Nps.findOne.resolves(null);
+
+			await expect(new NPSService().create({ expireAt: new Date('2020-01-02'), startAt: new Date('2020-01-01') })).to.be.rejectedWith(
+				'NPS already expired',
+			);
+		});
+		it('should try to create a banner when theres no nps saved', async () => {
+			modelsMock.Settings.getValueById.withArgs('NPS_survey_enabled').resolves(true);
+			modelsMock.Nps.findOne.resolves(null);
+
+			const today = new Date();
+			const tomorrow = new Date(today.getTime() + 24 * 60 * 60 * 1000);
+
+			await new NPSService().create({
+				expireAt: tomorrow,
+				startAt: today,
+				createdBy: { _id: 'tomorrow', username: 'tomorrow' },
+				npsId: 'test',
+			});
+			expect(getbannerforadminsMock.called).to.be.true;
+			expect(getbannerforadminsMock.calledWith(tomorrow)).to.be.true;
+			expect(modelsMock.Nps.save.called).to.be.true;
+			expect(
+				modelsMock.Nps.save.calledWith(
+					sinon.match({
+						expireAt: tomorrow,
+						startAt: today,
+						status: 'open',
+						_id: 'test',
+						createdBy: { _id: 'tomorrow', username: 'tomorrow' },
+					}),
+				),
+			).to.be.true;
+		});
+		it('should fail if theres an error when saving the Nps', async () => {
+			modelsMock.Settings.getValueById.withArgs('NPS_survey_enabled').resolves(true);
+			modelsMock.Nps.findOne.resolves({ _id: 'test' });
+			modelsMock.Nps.save.rejects();
+			await expect(new NPSService().create({})).to.be.rejectedWith('Error creating NPS');
+		});
+	});
+});
diff --git a/packages/uikit-playground/.eslintignore b/apps/uikit-playground/.eslintignore
similarity index 100%
rename from packages/uikit-playground/.eslintignore
rename to apps/uikit-playground/.eslintignore
diff --git a/packages/uikit-playground/.eslintrc.cjs b/apps/uikit-playground/.eslintrc.cjs
similarity index 100%
rename from packages/uikit-playground/.eslintrc.cjs
rename to apps/uikit-playground/.eslintrc.cjs
diff --git a/packages/uikit-playground/.gitignore b/apps/uikit-playground/.gitignore
similarity index 100%
rename from packages/uikit-playground/.gitignore
rename to apps/uikit-playground/.gitignore
diff --git a/packages/uikit-playground/.prettierrc b/apps/uikit-playground/.prettierrc
similarity index 100%
rename from packages/uikit-playground/.prettierrc
rename to apps/uikit-playground/.prettierrc
diff --git a/packages/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
similarity index 91%
rename from packages/uikit-playground/CHANGELOG.md
rename to apps/uikit-playground/CHANGELOG.md
index 2c569add2627..8b1c72004a69 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,93 @@
 # @rocket.chat/uikit-playground
 
+## 0.5.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.6
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  - @rocket.chat/ui-avatar@7.0.0-rc.6
+  </details>
+
+## 0.5.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.5
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/ui-avatar@7.0.0-rc.5
+  </details>
+
+## 0.5.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.4
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/ui-avatar@7.0.0-rc.4
+  </details>
+
+## 0.5.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.3
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/ui-avatar@7.0.0-rc.3
+  </details>
+
+## 0.5.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/fuselage-ui-kit@11.0.0-rc.2
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/ui-avatar@7.0.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/uikit-playground/index.html b/apps/uikit-playground/index.html
similarity index 100%
rename from packages/uikit-playground/index.html
rename to apps/uikit-playground/index.html
diff --git a/packages/uikit-playground/package.json b/apps/uikit-playground/package.json
similarity index 72%
rename from packages/uikit-playground/package.json
rename to apps/uikit-playground/package.json
index 228484c2b3d6..c31fd7e3da47 100644
--- a/packages/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -1,11 +1,12 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.4.1",
+  "version": "0.5.0-rc.6",
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
+    "build-preview": "tsc && vite build",
+    ".:build-preview-move": "mkdir -p ../../.preview/ && cp -r ./dist ../../.preview/uikit-playground",
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"
   },
@@ -14,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.57.1",
+    "@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",
@@ -37,20 +39,20 @@
     "react-split-pane": "^0.1.92",
     "react-virtuoso": "^4.7.1",
     "reactflow": "^11.7.2",
-    "use-subscription": "^1.8.0"
+    "use-subscription": "^1.8.2"
   },
   "devDependencies": {
-    "@types/react": "~17.0.69",
-    "@types/react-beautiful-dnd": "^13.1.6",
-    "@types/react-dom": "~17.0.22",
-    "@types/use-subscription": "^1.0.1",
+    "@types/react": "~17.0.80",
+    "@types/react-beautiful-dnd": "^13.1.8",
+    "@types/react-dom": "~17.0.25",
+    "@types/use-subscription": "^1.0.2",
     "@typescript-eslint/eslint-plugin": "~5.60.1",
     "@typescript-eslint/parser": "~5.60.1",
     "@vitejs/plugin-react": "^4.0.0",
     "eslint": "~8.45.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.4",
-    "typescript": "~5.3.3",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-react-refresh": "^0.4.11",
+    "typescript": "~5.5.4",
     "vite": "^4.3.9"
   },
   "volta": {
diff --git a/packages/uikit-playground/postcss.config.js b/apps/uikit-playground/postcss.config.js
similarity index 100%
rename from packages/uikit-playground/postcss.config.js
rename to apps/uikit-playground/postcss.config.js
diff --git a/packages/uikit-playground/public/vite.svg b/apps/uikit-playground/public/vite.svg
similarity index 100%
rename from packages/uikit-playground/public/vite.svg
rename to apps/uikit-playground/public/vite.svg
diff --git a/packages/uikit-playground/src/App.css b/apps/uikit-playground/src/App.css
similarity index 100%
rename from packages/uikit-playground/src/App.css
rename to apps/uikit-playground/src/App.css
diff --git a/packages/uikit-playground/src/App.tsx b/apps/uikit-playground/src/App.tsx
similarity index 100%
rename from packages/uikit-playground/src/App.tsx
rename to apps/uikit-playground/src/App.tsx
diff --git a/packages/uikit-playground/src/Components/CodeEditor/BlockEditor.tsx b/apps/uikit-playground/src/Components/CodeEditor/BlockEditor.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/BlockEditor.tsx
rename to apps/uikit-playground/src/Components/CodeEditor/BlockEditor.tsx
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/Extensions.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/Extensions.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/Extensions.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/Extensions.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/HighlightStyle.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/HighlightStyle.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/HighlightStyle.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/HighlightStyle.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/basicSetup.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/basicSetup.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/basicSetup.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/basicSetup.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/index.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/index.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/index.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/jsonLinter.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/jsonLinter.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/jsonLinter.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/jsonLinter.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/payloadLinter.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/payloadLinter.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/payloadLinter.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/payloadLinter.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Extensions/theme.ts b/apps/uikit-playground/src/Components/CodeEditor/Extensions/theme.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Extensions/theme.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Extensions/theme.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Parser/index.ts b/apps/uikit-playground/src/Components/CodeEditor/Parser/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Parser/index.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Parser/index.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/Parser/parsePayload.ts b/apps/uikit-playground/src/Components/CodeEditor/Parser/parsePayload.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/Parser/parsePayload.ts
rename to apps/uikit-playground/src/Components/CodeEditor/Parser/parsePayload.ts
diff --git a/packages/uikit-playground/src/Components/CodeEditor/PreviewEditor.tsx b/apps/uikit-playground/src/Components/CodeEditor/PreviewEditor.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/PreviewEditor.tsx
rename to apps/uikit-playground/src/Components/CodeEditor/PreviewEditor.tsx
diff --git a/packages/uikit-playground/src/Components/CodeEditor/index.tsx b/apps/uikit-playground/src/Components/CodeEditor/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/CodeEditor/index.tsx
rename to apps/uikit-playground/src/Components/CodeEditor/index.tsx
diff --git a/packages/uikit-playground/src/Components/ComponentSideBar/ScrollableSideBar.tsx b/apps/uikit-playground/src/Components/ComponentSideBar/ScrollableSideBar.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ComponentSideBar/ScrollableSideBar.tsx
rename to apps/uikit-playground/src/Components/ComponentSideBar/ScrollableSideBar.tsx
diff --git a/packages/uikit-playground/src/Components/ComponentSideBar/SideBar.tsx b/apps/uikit-playground/src/Components/ComponentSideBar/SideBar.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ComponentSideBar/SideBar.tsx
rename to apps/uikit-playground/src/Components/ComponentSideBar/SideBar.tsx
diff --git a/packages/uikit-playground/src/Components/ComponentSideBar/SliderBtn.tsx b/apps/uikit-playground/src/Components/ComponentSideBar/SliderBtn.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ComponentSideBar/SliderBtn.tsx
rename to apps/uikit-playground/src/Components/ComponentSideBar/SliderBtn.tsx
diff --git a/packages/uikit-playground/src/Components/ComponentSideBar/index.tsx b/apps/uikit-playground/src/Components/ComponentSideBar/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ComponentSideBar/index.tsx
rename to apps/uikit-playground/src/Components/ComponentSideBar/index.tsx
diff --git a/packages/uikit-playground/src/Components/CreateNewScreen/CreateNewScreenContainer.tsx b/apps/uikit-playground/src/Components/CreateNewScreen/CreateNewScreenContainer.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/CreateNewScreen/CreateNewScreenContainer.tsx
rename to apps/uikit-playground/src/Components/CreateNewScreen/CreateNewScreenContainer.tsx
diff --git a/packages/uikit-playground/src/Components/CreateNewScreen/ScreenThumbnail.tsx b/apps/uikit-playground/src/Components/CreateNewScreen/ScreenThumbnail.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/CreateNewScreen/ScreenThumbnail.tsx
rename to apps/uikit-playground/src/Components/CreateNewScreen/ScreenThumbnail.tsx
diff --git a/packages/uikit-playground/src/Components/CreateNewScreen/index.ts b/apps/uikit-playground/src/Components/CreateNewScreen/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/CreateNewScreen/index.ts
rename to apps/uikit-playground/src/Components/CreateNewScreen/index.ts
diff --git a/packages/uikit-playground/src/Components/Draggable/DraggableList.tsx b/apps/uikit-playground/src/Components/Draggable/DraggableList.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Draggable/DraggableList.tsx
rename to apps/uikit-playground/src/Components/Draggable/DraggableList.tsx
diff --git a/packages/uikit-playground/src/Components/Draggable/DraggableListItem.tsx b/apps/uikit-playground/src/Components/Draggable/DraggableListItem.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Draggable/DraggableListItem.tsx
rename to apps/uikit-playground/src/Components/Draggable/DraggableListItem.tsx
diff --git a/packages/uikit-playground/src/Components/DropDown/DropDown.tsx b/apps/uikit-playground/src/Components/DropDown/DropDown.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/DropDown.tsx
rename to apps/uikit-playground/src/Components/DropDown/DropDown.tsx
diff --git a/packages/uikit-playground/src/Components/DropDown/Items.tsx b/apps/uikit-playground/src/Components/DropDown/Items.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/Items.tsx
rename to apps/uikit-playground/src/Components/DropDown/Items.tsx
diff --git a/packages/uikit-playground/src/Components/DropDown/ItemsIcon.tsx b/apps/uikit-playground/src/Components/DropDown/ItemsIcon.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/ItemsIcon.tsx
rename to apps/uikit-playground/src/Components/DropDown/ItemsIcon.tsx
diff --git a/packages/uikit-playground/src/Components/DropDown/index.tsx b/apps/uikit-playground/src/Components/DropDown/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/index.tsx
rename to apps/uikit-playground/src/Components/DropDown/index.tsx
diff --git a/packages/uikit-playground/src/Components/DropDown/itemsStyle.ts b/apps/uikit-playground/src/Components/DropDown/itemsStyle.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/itemsStyle.ts
rename to apps/uikit-playground/src/Components/DropDown/itemsStyle.ts
diff --git a/packages/uikit-playground/src/Components/DropDown/types.ts b/apps/uikit-playground/src/Components/DropDown/types.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/DropDown/types.ts
rename to apps/uikit-playground/src/Components/DropDown/types.ts
diff --git a/packages/uikit-playground/src/Components/FlowContainer/ConnectionLine.tsx b/apps/uikit-playground/src/Components/FlowContainer/ConnectionLine.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/ConnectionLine.tsx
rename to apps/uikit-playground/src/Components/FlowContainer/ConnectionLine.tsx
diff --git a/packages/uikit-playground/src/Components/FlowContainer/ControlButtons/ControlButtons.tsx b/apps/uikit-playground/src/Components/FlowContainer/ControlButtons/ControlButtons.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/ControlButtons/ControlButtons.tsx
rename to apps/uikit-playground/src/Components/FlowContainer/ControlButtons/ControlButtons.tsx
diff --git a/packages/uikit-playground/src/Components/FlowContainer/ControlButtons/index.ts b/apps/uikit-playground/src/Components/FlowContainer/ControlButtons/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/ControlButtons/index.ts
rename to apps/uikit-playground/src/Components/FlowContainer/ControlButtons/index.ts
diff --git a/packages/uikit-playground/src/Components/FlowContainer/FlowContainer.tsx b/apps/uikit-playground/src/Components/FlowContainer/FlowContainer.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/FlowContainer.tsx
rename to apps/uikit-playground/src/Components/FlowContainer/FlowContainer.tsx
diff --git a/packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.scss b/apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.scss
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.scss
rename to apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.scss
diff --git a/packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx b/apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx
rename to apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/UIKitWrapper.tsx
diff --git a/packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/index.ts b/apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/UIKitWrapper/index.ts
rename to apps/uikit-playground/src/Components/FlowContainer/UIKitWrapper/index.ts
diff --git a/packages/uikit-playground/src/Components/FlowContainer/index.ts b/apps/uikit-playground/src/Components/FlowContainer/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/index.ts
rename to apps/uikit-playground/src/Components/FlowContainer/index.ts
diff --git a/packages/uikit-playground/src/Components/FlowContainer/utils.ts b/apps/uikit-playground/src/Components/FlowContainer/utils.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/FlowContainer/utils.ts
rename to apps/uikit-playground/src/Components/FlowContainer/utils.ts
diff --git a/packages/uikit-playground/src/Components/HomeContainer/HomeContainer.tsx b/apps/uikit-playground/src/Components/HomeContainer/HomeContainer.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/HomeContainer/HomeContainer.tsx
rename to apps/uikit-playground/src/Components/HomeContainer/HomeContainer.tsx
diff --git a/packages/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsList.tsx b/apps/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsList.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsList.tsx
rename to apps/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsList.tsx
diff --git a/packages/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsThumbnail.tsx b/apps/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsThumbnail.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsThumbnail.tsx
rename to apps/uikit-playground/src/Components/HomeContainer/ProjectsList/ProjectsThumbnail.tsx
diff --git a/packages/uikit-playground/src/Components/HomeContainer/ProjectsList/index.ts b/apps/uikit-playground/src/Components/HomeContainer/ProjectsList/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/HomeContainer/ProjectsList/index.ts
rename to apps/uikit-playground/src/Components/HomeContainer/ProjectsList/index.ts
diff --git a/packages/uikit-playground/src/Components/HomeContainer/index.ts b/apps/uikit-playground/src/Components/HomeContainer/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/HomeContainer/index.ts
rename to apps/uikit-playground/src/Components/HomeContainer/index.ts
diff --git a/packages/uikit-playground/src/Components/NavBar/BurgerIcon/BurgerIcon.tsx b/apps/uikit-playground/src/Components/NavBar/BurgerIcon/BurgerIcon.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/BurgerIcon/BurgerIcon.tsx
rename to apps/uikit-playground/src/Components/NavBar/BurgerIcon/BurgerIcon.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/BurgerIcon/Line.tsx b/apps/uikit-playground/src/Components/NavBar/BurgerIcon/Line.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/BurgerIcon/Line.tsx
rename to apps/uikit-playground/src/Components/NavBar/BurgerIcon/Line.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/BurgerIcon/Wrapper.tsx b/apps/uikit-playground/src/Components/NavBar/BurgerIcon/Wrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/BurgerIcon/Wrapper.tsx
rename to apps/uikit-playground/src/Components/NavBar/BurgerIcon/Wrapper.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/BurgerIcon/index.tsx b/apps/uikit-playground/src/Components/NavBar/BurgerIcon/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/BurgerIcon/index.tsx
rename to apps/uikit-playground/src/Components/NavBar/BurgerIcon/index.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/Divider.tsx b/apps/uikit-playground/src/Components/NavBar/Divider.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/Divider.tsx
rename to apps/uikit-playground/src/Components/NavBar/Divider.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/Logo.tsx b/apps/uikit-playground/src/Components/NavBar/Logo.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/Logo.tsx
rename to apps/uikit-playground/src/Components/NavBar/Logo.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/NavBar.tsx b/apps/uikit-playground/src/Components/NavBar/NavBar.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/NavBar.tsx
rename to apps/uikit-playground/src/Components/NavBar/NavBar.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/RightNavBtn.tsx b/apps/uikit-playground/src/Components/NavBar/RightNavBtn.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/RightNavBtn.tsx
rename to apps/uikit-playground/src/Components/NavBar/RightNavBtn.tsx
diff --git a/packages/uikit-playground/src/Components/NavBar/index.tsx b/apps/uikit-playground/src/Components/NavBar/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/NavBar/index.tsx
rename to apps/uikit-playground/src/Components/NavBar/index.tsx
diff --git a/packages/uikit-playground/src/Components/PersistStore/PersistStore.tsx b/apps/uikit-playground/src/Components/PersistStore/PersistStore.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/PersistStore/PersistStore.tsx
rename to apps/uikit-playground/src/Components/PersistStore/PersistStore.tsx
diff --git a/packages/uikit-playground/src/Components/PersistStore/index.ts b/apps/uikit-playground/src/Components/PersistStore/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/PersistStore/index.ts
rename to apps/uikit-playground/src/Components/PersistStore/index.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Display.tsx b/apps/uikit-playground/src/Components/Preview/Display/Display.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Display.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Display.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/BannerSurface.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/BannerSurface.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/BannerSurface.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/BannerSurface.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/ContextualBarSurface.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/ContextualBarSurface.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/ContextualBarSurface.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/ContextualBarSurface.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/MessageSurface.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/MessageSurface.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/MessageSurface.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/MessageSurface.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/ModalSurface.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/ModalSurface.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/ModalSurface.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/ModalSurface.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/Reorder.ts b/apps/uikit-playground/src/Components/Preview/Display/Surface/Reorder.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/Reorder.ts
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/Reorder.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/Surface.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/Surface.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/Surface.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/Surface.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/SurfaceRender.tsx b/apps/uikit-playground/src/Components/Preview/Display/Surface/SurfaceRender.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/SurfaceRender.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/SurfaceRender.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/constant.ts b/apps/uikit-playground/src/Components/Preview/Display/Surface/constant.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/constant.ts
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/constant.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Display/Surface/index.ts b/apps/uikit-playground/src/Components/Preview/Display/Surface/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/Surface/index.ts
rename to apps/uikit-playground/src/Components/Preview/Display/Surface/index.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/DeleteElementBtn.tsx b/apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/DeleteElementBtn.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/DeleteElementBtn.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/DeleteElementBtn.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.scss b/apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.scss
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.scss
rename to apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.scss
diff --git a/packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.tsx b/apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.tsx
rename to apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/UiKitElementWrapper.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/index.ts b/apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/index.ts
rename to apps/uikit-playground/src/Components/Preview/Display/UiKitElementWrapper/index.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Display/index.ts b/apps/uikit-playground/src/Components/Preview/Display/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Display/index.ts
rename to apps/uikit-playground/src/Components/Preview/Display/index.ts
diff --git a/packages/uikit-playground/src/Components/Preview/Editor/ActionBlockEditor.tsx b/apps/uikit-playground/src/Components/Preview/Editor/ActionBlockEditor.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Editor/ActionBlockEditor.tsx
rename to apps/uikit-playground/src/Components/Preview/Editor/ActionBlockEditor.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Editor/ActionPreviewEditor.tsx b/apps/uikit-playground/src/Components/Preview/Editor/ActionPreviewEditor.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Editor/ActionPreviewEditor.tsx
rename to apps/uikit-playground/src/Components/Preview/Editor/ActionPreviewEditor.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Editor/EditorPanel.tsx b/apps/uikit-playground/src/Components/Preview/Editor/EditorPanel.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Editor/EditorPanel.tsx
rename to apps/uikit-playground/src/Components/Preview/Editor/EditorPanel.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Editor/index.tsx b/apps/uikit-playground/src/Components/Preview/Editor/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Editor/index.tsx
rename to apps/uikit-playground/src/Components/Preview/Editor/index.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/NavPanel/NavPanel.tsx b/apps/uikit-playground/src/Components/Preview/NavPanel/NavPanel.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/NavPanel/NavPanel.tsx
rename to apps/uikit-playground/src/Components/Preview/NavPanel/NavPanel.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/NavPanel/index.tsx b/apps/uikit-playground/src/Components/Preview/NavPanel/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/NavPanel/index.tsx
rename to apps/uikit-playground/src/Components/Preview/NavPanel/index.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/Preview.tsx b/apps/uikit-playground/src/Components/Preview/Preview.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Preview.tsx
rename to apps/uikit-playground/src/Components/Preview/Preview.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/SplitPlaneContainer.tsx b/apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/SplitPlaneContainer.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/SplitPlaneContainer.tsx
rename to apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/SplitPlaneContainer.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/index.ts b/apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/index.ts
rename to apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/index.ts
diff --git a/packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/splitPlane.css b/apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/splitPlane.css
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/SplitPlaneContainer/splitPlane.css
rename to apps/uikit-playground/src/Components/Preview/SplitPlaneContainer/splitPlane.css
diff --git a/packages/uikit-playground/src/Components/Preview/Wrapper.tsx b/apps/uikit-playground/src/Components/Preview/Wrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/Wrapper.tsx
rename to apps/uikit-playground/src/Components/Preview/Wrapper.tsx
diff --git a/packages/uikit-playground/src/Components/Preview/index.tsx b/apps/uikit-playground/src/Components/Preview/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Preview/index.tsx
rename to apps/uikit-playground/src/Components/Preview/index.tsx
diff --git a/packages/uikit-playground/src/Components/PrototypeRender/PrototypeRender.scss b/apps/uikit-playground/src/Components/PrototypeRender/PrototypeRender.scss
similarity index 100%
rename from packages/uikit-playground/src/Components/PrototypeRender/PrototypeRender.scss
rename to apps/uikit-playground/src/Components/PrototypeRender/PrototypeRender.scss
diff --git a/packages/uikit-playground/src/Components/PrototypeRender/PrototypeRender.tsx b/apps/uikit-playground/src/Components/PrototypeRender/PrototypeRender.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/PrototypeRender/PrototypeRender.tsx
rename to apps/uikit-playground/src/Components/PrototypeRender/PrototypeRender.tsx
diff --git a/packages/uikit-playground/src/Components/PrototypeRender/index.ts b/apps/uikit-playground/src/Components/PrototypeRender/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/PrototypeRender/index.ts
rename to apps/uikit-playground/src/Components/PrototypeRender/index.ts
diff --git a/packages/uikit-playground/src/Components/PtototypeContainer/PrototypeContainer.tsx b/apps/uikit-playground/src/Components/PtototypeContainer/PrototypeContainer.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/PtototypeContainer/PrototypeContainer.tsx
rename to apps/uikit-playground/src/Components/PtototypeContainer/PrototypeContainer.tsx
diff --git a/packages/uikit-playground/src/Components/PtototypeContainer/index.ts b/apps/uikit-playground/src/Components/PtototypeContainer/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/PtototypeContainer/index.ts
rename to apps/uikit-playground/src/Components/PtototypeContainer/index.ts
diff --git a/packages/uikit-playground/src/Components/RenderPayload/RenderPayload.tsx b/apps/uikit-playground/src/Components/RenderPayload/RenderPayload.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/RenderPayload/RenderPayload.tsx
rename to apps/uikit-playground/src/Components/RenderPayload/RenderPayload.tsx
diff --git a/packages/uikit-playground/src/Components/RenderPayload/intex.ts b/apps/uikit-playground/src/Components/RenderPayload/intex.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/RenderPayload/intex.ts
rename to apps/uikit-playground/src/Components/RenderPayload/intex.ts
diff --git a/packages/uikit-playground/src/Components/Routes/HomeLayout.tsx b/apps/uikit-playground/src/Components/Routes/HomeLayout.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Routes/HomeLayout.tsx
rename to apps/uikit-playground/src/Components/Routes/HomeLayout.tsx
diff --git a/packages/uikit-playground/src/Components/Routes/ProjectSpecificLayout.tsx b/apps/uikit-playground/src/Components/Routes/ProjectSpecificLayout.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Routes/ProjectSpecificLayout.tsx
rename to apps/uikit-playground/src/Components/Routes/ProjectSpecificLayout.tsx
diff --git a/packages/uikit-playground/src/Components/Routes/ProtectedLayout.tsx b/apps/uikit-playground/src/Components/Routes/ProtectedLayout.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Routes/ProtectedLayout.tsx
rename to apps/uikit-playground/src/Components/Routes/ProtectedLayout.tsx
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/CreateNewScreenButton.tsx b/apps/uikit-playground/src/Components/ScreenThumbnail/CreateNewScreenButton.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/CreateNewScreenButton.tsx
rename to apps/uikit-playground/src/Components/ScreenThumbnail/CreateNewScreenButton.tsx
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/EditMenu/EditMenu.tsx b/apps/uikit-playground/src/Components/ScreenThumbnail/EditMenu/EditMenu.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/EditMenu/EditMenu.tsx
rename to apps/uikit-playground/src/Components/ScreenThumbnail/EditMenu/EditMenu.tsx
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/EditMenu/index.ts b/apps/uikit-playground/src/Components/ScreenThumbnail/EditMenu/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/EditMenu/index.ts
rename to apps/uikit-playground/src/Components/ScreenThumbnail/EditMenu/index.ts
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/EditableLabel.tsx b/apps/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/EditableLabel.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/EditableLabel.tsx
rename to apps/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/EditableLabel.tsx
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/Editablelabel.scss b/apps/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/Editablelabel.scss
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/Editablelabel.scss
rename to apps/uikit-playground/src/Components/ScreenThumbnail/EditableLabel/Editablelabel.scss
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/ScreenThumbnailWrapper.tsx b/apps/uikit-playground/src/Components/ScreenThumbnail/ScreenThumbnailWrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/ScreenThumbnailWrapper.tsx
rename to apps/uikit-playground/src/Components/ScreenThumbnail/ScreenThumbnailWrapper.tsx
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.scss b/apps/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.scss
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.scss
rename to apps/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.scss
diff --git a/packages/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.tsx b/apps/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.tsx
rename to apps/uikit-playground/src/Components/ScreenThumbnail/Thumbnail.tsx
diff --git a/packages/uikit-playground/src/Components/SurfaceSelect/SurfaceSelect.tsx b/apps/uikit-playground/src/Components/SurfaceSelect/SurfaceSelect.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/SurfaceSelect/SurfaceSelect.tsx
rename to apps/uikit-playground/src/Components/SurfaceSelect/SurfaceSelect.tsx
diff --git a/packages/uikit-playground/src/Components/SurfaceSelect/index.ts b/apps/uikit-playground/src/Components/SurfaceSelect/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/SurfaceSelect/index.ts
rename to apps/uikit-playground/src/Components/SurfaceSelect/index.ts
diff --git a/packages/uikit-playground/src/Components/SurfaceSelect/options.ts b/apps/uikit-playground/src/Components/SurfaceSelect/options.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/SurfaceSelect/options.ts
rename to apps/uikit-playground/src/Components/SurfaceSelect/options.ts
diff --git a/packages/uikit-playground/src/Components/Templates/Container/Container.tsx b/apps/uikit-playground/src/Components/Templates/Container/Container.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/Container/Container.tsx
rename to apps/uikit-playground/src/Components/Templates/Container/Container.tsx
diff --git a/packages/uikit-playground/src/Components/Templates/Container/Payload.tsx b/apps/uikit-playground/src/Components/Templates/Container/Payload.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/Container/Payload.tsx
rename to apps/uikit-playground/src/Components/Templates/Container/Payload.tsx
diff --git a/packages/uikit-playground/src/Components/Templates/Container/Section.tsx b/apps/uikit-playground/src/Components/Templates/Container/Section.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/Container/Section.tsx
rename to apps/uikit-playground/src/Components/Templates/Container/Section.tsx
diff --git a/packages/uikit-playground/src/Components/Templates/Container/index.ts b/apps/uikit-playground/src/Components/Templates/Container/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/Container/index.ts
rename to apps/uikit-playground/src/Components/Templates/Container/index.ts
diff --git a/packages/uikit-playground/src/Components/Templates/Templates.tsx b/apps/uikit-playground/src/Components/Templates/Templates.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/Templates.tsx
rename to apps/uikit-playground/src/Components/Templates/Templates.tsx
diff --git a/packages/uikit-playground/src/Components/Templates/index.ts b/apps/uikit-playground/src/Components/Templates/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/Templates/index.ts
rename to apps/uikit-playground/src/Components/Templates/index.ts
diff --git a/packages/uikit-playground/src/Components/ToggleTabs/index.tsx b/apps/uikit-playground/src/Components/ToggleTabs/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/ToggleTabs/index.tsx
rename to apps/uikit-playground/src/Components/ToggleTabs/index.tsx
diff --git a/packages/uikit-playground/src/Components/navMenu/Menu/MenuItem.tsx b/apps/uikit-playground/src/Components/navMenu/Menu/MenuItem.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/navMenu/Menu/MenuItem.tsx
rename to apps/uikit-playground/src/Components/navMenu/Menu/MenuItem.tsx
diff --git a/packages/uikit-playground/src/Components/navMenu/Menu/Wrapper.tsx b/apps/uikit-playground/src/Components/navMenu/Menu/Wrapper.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/navMenu/Menu/Wrapper.tsx
rename to apps/uikit-playground/src/Components/navMenu/Menu/Wrapper.tsx
diff --git a/packages/uikit-playground/src/Components/navMenu/Menu/index.tsx b/apps/uikit-playground/src/Components/navMenu/Menu/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/navMenu/Menu/index.tsx
rename to apps/uikit-playground/src/Components/navMenu/Menu/index.tsx
diff --git a/packages/uikit-playground/src/Components/navMenu/NavMenu.tsx b/apps/uikit-playground/src/Components/navMenu/NavMenu.tsx
similarity index 100%
rename from packages/uikit-playground/src/Components/navMenu/NavMenu.tsx
rename to apps/uikit-playground/src/Components/navMenu/NavMenu.tsx
diff --git a/packages/uikit-playground/src/Components/navMenu/index.ts b/apps/uikit-playground/src/Components/navMenu/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Components/navMenu/index.ts
rename to apps/uikit-playground/src/Components/navMenu/index.ts
diff --git a/packages/uikit-playground/src/Context/action/actionPreviewAction.ts b/apps/uikit-playground/src/Context/action/actionPreviewAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/actionPreviewAction.ts
rename to apps/uikit-playground/src/Context/action/actionPreviewAction.ts
diff --git a/packages/uikit-playground/src/Context/action/activeProjectAction.ts b/apps/uikit-playground/src/Context/action/activeProjectAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/activeProjectAction.ts
rename to apps/uikit-playground/src/Context/action/activeProjectAction.ts
diff --git a/packages/uikit-playground/src/Context/action/activeScreenAction.ts b/apps/uikit-playground/src/Context/action/activeScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/activeScreenAction.ts
rename to apps/uikit-playground/src/Context/action/activeScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/createNewProjectAction.ts b/apps/uikit-playground/src/Context/action/createNewProjectAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/createNewProjectAction.ts
rename to apps/uikit-playground/src/Context/action/createNewProjectAction.ts
diff --git a/packages/uikit-playground/src/Context/action/createNewScreenAction.ts b/apps/uikit-playground/src/Context/action/createNewScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/createNewScreenAction.ts
rename to apps/uikit-playground/src/Context/action/createNewScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/deleteProjectAction.ts b/apps/uikit-playground/src/Context/action/deleteProjectAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/deleteProjectAction.ts
rename to apps/uikit-playground/src/Context/action/deleteProjectAction.ts
diff --git a/packages/uikit-playground/src/Context/action/deleteScreenAction.ts b/apps/uikit-playground/src/Context/action/deleteScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/deleteScreenAction.ts
rename to apps/uikit-playground/src/Context/action/deleteScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/duplicateProjectAction.ts b/apps/uikit-playground/src/Context/action/duplicateProjectAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/duplicateProjectAction.ts
rename to apps/uikit-playground/src/Context/action/duplicateProjectAction.ts
diff --git a/packages/uikit-playground/src/Context/action/duplicateScreenAction.ts b/apps/uikit-playground/src/Context/action/duplicateScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/duplicateScreenAction.ts
rename to apps/uikit-playground/src/Context/action/duplicateScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/editorTabsToggleAction.ts b/apps/uikit-playground/src/Context/action/editorTabsToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/editorTabsToggleAction.ts
rename to apps/uikit-playground/src/Context/action/editorTabsToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/index.ts b/apps/uikit-playground/src/Context/action/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/index.ts
rename to apps/uikit-playground/src/Context/action/index.ts
diff --git a/packages/uikit-playground/src/Context/action/isMobileAction.ts b/apps/uikit-playground/src/Context/action/isMobileAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/isMobileAction.ts
rename to apps/uikit-playground/src/Context/action/isMobileAction.ts
diff --git a/packages/uikit-playground/src/Context/action/isTabletAction.ts b/apps/uikit-playground/src/Context/action/isTabletAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/isTabletAction.ts
rename to apps/uikit-playground/src/Context/action/isTabletAction.ts
diff --git a/packages/uikit-playground/src/Context/action/navMenuToggleAction.ts b/apps/uikit-playground/src/Context/action/navMenuToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/navMenuToggleAction.ts
rename to apps/uikit-playground/src/Context/action/navMenuToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/openCreateNewScreenAction.ts b/apps/uikit-playground/src/Context/action/openCreateNewScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/openCreateNewScreenAction.ts
rename to apps/uikit-playground/src/Context/action/openCreateNewScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/previewTabsToggleAction.ts b/apps/uikit-playground/src/Context/action/previewTabsToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/previewTabsToggleAction.ts
rename to apps/uikit-playground/src/Context/action/previewTabsToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/renameProjectAction.ts b/apps/uikit-playground/src/Context/action/renameProjectAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/renameProjectAction.ts
rename to apps/uikit-playground/src/Context/action/renameProjectAction.ts
diff --git a/packages/uikit-playground/src/Context/action/renameScreenAction.ts b/apps/uikit-playground/src/Context/action/renameScreenAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/renameScreenAction.ts
rename to apps/uikit-playground/src/Context/action/renameScreenAction.ts
diff --git a/packages/uikit-playground/src/Context/action/sidebarToggleAction.ts b/apps/uikit-playground/src/Context/action/sidebarToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/sidebarToggleAction.ts
rename to apps/uikit-playground/src/Context/action/sidebarToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/surfaceAction.ts b/apps/uikit-playground/src/Context/action/surfaceAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/surfaceAction.ts
rename to apps/uikit-playground/src/Context/action/surfaceAction.ts
diff --git a/packages/uikit-playground/src/Context/action/tabsToggleAction.ts b/apps/uikit-playground/src/Context/action/tabsToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/tabsToggleAction.ts
rename to apps/uikit-playground/src/Context/action/tabsToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/templatesToggleAction.ts b/apps/uikit-playground/src/Context/action/templatesToggleAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/templatesToggleAction.ts
rename to apps/uikit-playground/src/Context/action/templatesToggleAction.ts
diff --git a/packages/uikit-playground/src/Context/action/updateFlowEdgesAction.ts b/apps/uikit-playground/src/Context/action/updateFlowEdgesAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/updateFlowEdgesAction.ts
rename to apps/uikit-playground/src/Context/action/updateFlowEdgesAction.ts
diff --git a/packages/uikit-playground/src/Context/action/updateNodesAndViewPortAction.ts b/apps/uikit-playground/src/Context/action/updateNodesAndViewPortAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/updateNodesAndViewPortAction.ts
rename to apps/uikit-playground/src/Context/action/updateNodesAndViewPortAction.ts
diff --git a/packages/uikit-playground/src/Context/action/updatePayloadAction.ts b/apps/uikit-playground/src/Context/action/updatePayloadAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/updatePayloadAction.ts
rename to apps/uikit-playground/src/Context/action/updatePayloadAction.ts
diff --git a/packages/uikit-playground/src/Context/action/userAction.ts b/apps/uikit-playground/src/Context/action/userAction.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/action/userAction.ts
rename to apps/uikit-playground/src/Context/action/userAction.ts
diff --git a/packages/uikit-playground/src/Context/createCtx.tsx b/apps/uikit-playground/src/Context/createCtx.tsx
similarity index 100%
rename from packages/uikit-playground/src/Context/createCtx.tsx
rename to apps/uikit-playground/src/Context/createCtx.tsx
diff --git a/packages/uikit-playground/src/Context/index.tsx b/apps/uikit-playground/src/Context/index.tsx
similarity index 100%
rename from packages/uikit-playground/src/Context/index.tsx
rename to apps/uikit-playground/src/Context/index.tsx
diff --git a/packages/uikit-playground/src/Context/initialState.ts b/apps/uikit-playground/src/Context/initialState.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/initialState.ts
rename to apps/uikit-playground/src/Context/initialState.ts
diff --git a/packages/uikit-playground/src/Context/reducer.ts b/apps/uikit-playground/src/Context/reducer.ts
similarity index 100%
rename from packages/uikit-playground/src/Context/reducer.ts
rename to apps/uikit-playground/src/Context/reducer.ts
diff --git a/packages/uikit-playground/src/Pages/FlowDiagram.tsx b/apps/uikit-playground/src/Pages/FlowDiagram.tsx
similarity index 100%
rename from packages/uikit-playground/src/Pages/FlowDiagram.tsx
rename to apps/uikit-playground/src/Pages/FlowDiagram.tsx
diff --git a/packages/uikit-playground/src/Pages/Home.tsx b/apps/uikit-playground/src/Pages/Home.tsx
similarity index 100%
rename from packages/uikit-playground/src/Pages/Home.tsx
rename to apps/uikit-playground/src/Pages/Home.tsx
diff --git a/packages/uikit-playground/src/Pages/Playground.tsx b/apps/uikit-playground/src/Pages/Playground.tsx
similarity index 100%
rename from packages/uikit-playground/src/Pages/Playground.tsx
rename to apps/uikit-playground/src/Pages/Playground.tsx
diff --git a/packages/uikit-playground/src/Pages/Prototype.tsx b/apps/uikit-playground/src/Pages/Prototype.tsx
similarity index 100%
rename from packages/uikit-playground/src/Pages/Prototype.tsx
rename to apps/uikit-playground/src/Pages/Prototype.tsx
diff --git a/packages/uikit-playground/src/Pages/SignInSignUp.tsx b/apps/uikit-playground/src/Pages/SignInSignUp.tsx
similarity index 100%
rename from packages/uikit-playground/src/Pages/SignInSignUp.tsx
rename to apps/uikit-playground/src/Pages/SignInSignUp.tsx
diff --git a/packages/uikit-playground/src/Payload/action/checkbox.ts b/apps/uikit-playground/src/Payload/action/checkbox.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/action/checkbox.ts
rename to apps/uikit-playground/src/Payload/action/checkbox.ts
diff --git a/packages/uikit-playground/src/Payload/action/radioButton.ts b/apps/uikit-playground/src/Payload/action/radioButton.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/action/radioButton.ts
rename to apps/uikit-playground/src/Payload/action/radioButton.ts
diff --git a/packages/uikit-playground/src/Payload/action/timePicker.ts b/apps/uikit-playground/src/Payload/action/timePicker.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/action/timePicker.ts
rename to apps/uikit-playground/src/Payload/action/timePicker.ts
diff --git a/packages/uikit-playground/src/Payload/action/toggleSwitch.ts b/apps/uikit-playground/src/Payload/action/toggleSwitch.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/action/toggleSwitch.ts
rename to apps/uikit-playground/src/Payload/action/toggleSwitch.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/BlocksTree.ts b/apps/uikit-playground/src/Payload/actionBlock/BlocksTree.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/BlocksTree.ts
rename to apps/uikit-playground/src/Payload/actionBlock/BlocksTree.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/button.ts b/apps/uikit-playground/src/Payload/actionBlock/action/button.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/button.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/button.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/datePicker.ts b/apps/uikit-playground/src/Payload/actionBlock/action/datePicker.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/datePicker.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/datePicker.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/image.ts b/apps/uikit-playground/src/Payload/actionBlock/action/image.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/image.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/image.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/index.ts b/apps/uikit-playground/src/Payload/actionBlock/action/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/input.ts b/apps/uikit-playground/src/Payload/actionBlock/action/input.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/input.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/input.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/linearScale.ts b/apps/uikit-playground/src/Payload/actionBlock/action/linearScale.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/linearScale.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/linearScale.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/menu.ts b/apps/uikit-playground/src/Payload/actionBlock/action/menu.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/menu.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/menu.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/action/staticSelect.ts b/apps/uikit-playground/src/Payload/actionBlock/action/staticSelect.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/action/staticSelect.ts
rename to apps/uikit-playground/src/Payload/actionBlock/action/staticSelect.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/context/index.ts b/apps/uikit-playground/src/Payload/actionBlock/context/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/context/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/context/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/divider/index.ts b/apps/uikit-playground/src/Payload/actionBlock/divider/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/divider/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/divider/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/image/index.ts b/apps/uikit-playground/src/Payload/actionBlock/image/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/image/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/image/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/input/datePicker.ts b/apps/uikit-playground/src/Payload/actionBlock/input/datePicker.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/input/datePicker.ts
rename to apps/uikit-playground/src/Payload/actionBlock/input/datePicker.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/input/index.ts b/apps/uikit-playground/src/Payload/actionBlock/input/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/input/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/input/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/input/input.ts b/apps/uikit-playground/src/Payload/actionBlock/input/input.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/input/input.ts
rename to apps/uikit-playground/src/Payload/actionBlock/input/input.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/input/linearScale.ts b/apps/uikit-playground/src/Payload/actionBlock/input/linearScale.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/input/linearScale.ts
rename to apps/uikit-playground/src/Payload/actionBlock/input/linearScale.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/input/staticSelect.ts b/apps/uikit-playground/src/Payload/actionBlock/input/staticSelect.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/input/staticSelect.ts
rename to apps/uikit-playground/src/Payload/actionBlock/input/staticSelect.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/preview/index.ts b/apps/uikit-playground/src/Payload/actionBlock/preview/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/preview/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/preview/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/button.ts b/apps/uikit-playground/src/Payload/actionBlock/section/button.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/button.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/button.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/datePicker.ts b/apps/uikit-playground/src/Payload/actionBlock/section/datePicker.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/datePicker.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/datePicker.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/image.ts b/apps/uikit-playground/src/Payload/actionBlock/section/image.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/image.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/image.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/index.ts b/apps/uikit-playground/src/Payload/actionBlock/section/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/index.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/index.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/menu.ts b/apps/uikit-playground/src/Payload/actionBlock/section/menu.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/menu.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/menu.ts
diff --git a/packages/uikit-playground/src/Payload/actionBlock/section/text.ts b/apps/uikit-playground/src/Payload/actionBlock/section/text.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionBlock/section/text.ts
rename to apps/uikit-playground/src/Payload/actionBlock/section/text.ts
diff --git a/packages/uikit-playground/src/Payload/actionPreview/container.ts b/apps/uikit-playground/src/Payload/actionPreview/container.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionPreview/container.ts
rename to apps/uikit-playground/src/Payload/actionPreview/container.ts
diff --git a/packages/uikit-playground/src/Payload/actionPreview/generateActionPreview.ts b/apps/uikit-playground/src/Payload/actionPreview/generateActionPreview.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/actionPreview/generateActionPreview.ts
rename to apps/uikit-playground/src/Payload/actionPreview/generateActionPreview.ts
diff --git a/packages/uikit-playground/src/Payload/callout/index.ts b/apps/uikit-playground/src/Payload/callout/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/callout/index.ts
rename to apps/uikit-playground/src/Payload/callout/index.ts
diff --git a/packages/uikit-playground/src/Payload/index.ts b/apps/uikit-playground/src/Payload/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/index.ts
rename to apps/uikit-playground/src/Payload/index.ts
diff --git a/packages/uikit-playground/src/Payload/tabNavigation/disabled.ts b/apps/uikit-playground/src/Payload/tabNavigation/disabled.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/tabNavigation/disabled.ts
rename to apps/uikit-playground/src/Payload/tabNavigation/disabled.ts
diff --git a/packages/uikit-playground/src/Payload/tabNavigation/index.ts b/apps/uikit-playground/src/Payload/tabNavigation/index.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/tabNavigation/index.ts
rename to apps/uikit-playground/src/Payload/tabNavigation/index.ts
diff --git a/packages/uikit-playground/src/Payload/tabNavigation/plain.ts b/apps/uikit-playground/src/Payload/tabNavigation/plain.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/tabNavigation/plain.ts
rename to apps/uikit-playground/src/Payload/tabNavigation/plain.ts
diff --git a/packages/uikit-playground/src/Payload/tabNavigation/selected.ts b/apps/uikit-playground/src/Payload/tabNavigation/selected.ts
similarity index 100%
rename from packages/uikit-playground/src/Payload/tabNavigation/selected.ts
rename to apps/uikit-playground/src/Payload/tabNavigation/selected.ts
diff --git a/packages/uikit-playground/src/Routes/Routes.ts b/apps/uikit-playground/src/Routes/Routes.ts
similarity index 100%
rename from packages/uikit-playground/src/Routes/Routes.ts
rename to apps/uikit-playground/src/Routes/Routes.ts
diff --git a/packages/uikit-playground/src/_global.css b/apps/uikit-playground/src/_global.css
similarity index 100%
rename from packages/uikit-playground/src/_global.css
rename to apps/uikit-playground/src/_global.css
diff --git a/packages/uikit-playground/src/cssVariables.css b/apps/uikit-playground/src/cssVariables.css
similarity index 100%
rename from packages/uikit-playground/src/cssVariables.css
rename to apps/uikit-playground/src/cssVariables.css
diff --git a/packages/uikit-playground/src/hooks/useAuth.tsx b/apps/uikit-playground/src/hooks/useAuth.tsx
similarity index 100%
rename from packages/uikit-playground/src/hooks/useAuth.tsx
rename to apps/uikit-playground/src/hooks/useAuth.tsx
diff --git a/packages/uikit-playground/src/hooks/useCodeMirror.ts b/apps/uikit-playground/src/hooks/useCodeMirror.ts
similarity index 100%
rename from packages/uikit-playground/src/hooks/useCodeMirror.ts
rename to apps/uikit-playground/src/hooks/useCodeMirror.ts
diff --git a/packages/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts b/apps/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts
similarity index 100%
rename from packages/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts
rename to apps/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts
diff --git a/packages/uikit-playground/src/hooks/useHorizontalScroll.ts b/apps/uikit-playground/src/hooks/useHorizontalScroll.ts
similarity index 100%
rename from packages/uikit-playground/src/hooks/useHorizontalScroll.ts
rename to apps/uikit-playground/src/hooks/useHorizontalScroll.ts
diff --git a/packages/uikit-playground/src/hooks/useNodesAndEdges.ts b/apps/uikit-playground/src/hooks/useNodesAndEdges.ts
similarity index 100%
rename from packages/uikit-playground/src/hooks/useNodesAndEdges.ts
rename to apps/uikit-playground/src/hooks/useNodesAndEdges.ts
diff --git a/packages/uikit-playground/src/index.css b/apps/uikit-playground/src/index.css
similarity index 100%
rename from packages/uikit-playground/src/index.css
rename to apps/uikit-playground/src/index.css
diff --git a/packages/uikit-playground/src/logo.svg b/apps/uikit-playground/src/logo.svg
similarity index 100%
rename from packages/uikit-playground/src/logo.svg
rename to apps/uikit-playground/src/logo.svg
diff --git a/packages/uikit-playground/src/main.tsx b/apps/uikit-playground/src/main.tsx
similarity index 100%
rename from packages/uikit-playground/src/main.tsx
rename to apps/uikit-playground/src/main.tsx
diff --git a/packages/uikit-playground/src/module.d.ts b/apps/uikit-playground/src/module.d.ts
similarity index 100%
rename from packages/uikit-playground/src/module.d.ts
rename to apps/uikit-playground/src/module.d.ts
diff --git a/packages/uikit-playground/src/utils/codePrettier.ts b/apps/uikit-playground/src/utils/codePrettier.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/codePrettier.ts
rename to apps/uikit-playground/src/utils/codePrettier.ts
diff --git a/packages/uikit-playground/src/utils/filterEdges.ts b/apps/uikit-playground/src/utils/filterEdges.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/filterEdges.ts
rename to apps/uikit-playground/src/utils/filterEdges.ts
diff --git a/packages/uikit-playground/src/utils/formatDate.ts b/apps/uikit-playground/src/utils/formatDate.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/formatDate.ts
rename to apps/uikit-playground/src/utils/formatDate.ts
diff --git a/packages/uikit-playground/src/utils/getDate.ts b/apps/uikit-playground/src/utils/getDate.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/getDate.ts
rename to apps/uikit-playground/src/utils/getDate.ts
diff --git a/packages/uikit-playground/src/utils/getUniqueId.ts b/apps/uikit-playground/src/utils/getUniqueId.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/getUniqueId.ts
rename to apps/uikit-playground/src/utils/getUniqueId.ts
diff --git a/packages/uikit-playground/src/utils/intendCode.ts b/apps/uikit-playground/src/utils/intendCode.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/intendCode.ts
rename to apps/uikit-playground/src/utils/intendCode.ts
diff --git a/packages/uikit-playground/src/utils/persistStore.ts b/apps/uikit-playground/src/utils/persistStore.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/persistStore.ts
rename to apps/uikit-playground/src/utils/persistStore.ts
diff --git a/packages/uikit-playground/src/utils/templates.ts b/apps/uikit-playground/src/utils/templates.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/templates.ts
rename to apps/uikit-playground/src/utils/templates.ts
diff --git a/packages/uikit-playground/src/utils/uiKitRenderer.ts b/apps/uikit-playground/src/utils/uiKitRenderer.ts
similarity index 100%
rename from packages/uikit-playground/src/utils/uiKitRenderer.ts
rename to apps/uikit-playground/src/utils/uiKitRenderer.ts
diff --git a/packages/uikit-playground/src/vite-env.d.ts b/apps/uikit-playground/src/vite-env.d.ts
similarity index 100%
rename from packages/uikit-playground/src/vite-env.d.ts
rename to apps/uikit-playground/src/vite-env.d.ts
diff --git a/packages/uikit-playground/tsconfig.json b/apps/uikit-playground/tsconfig.json
similarity index 100%
rename from packages/uikit-playground/tsconfig.json
rename to apps/uikit-playground/tsconfig.json
diff --git a/packages/uikit-playground/vite.config.ts b/apps/uikit-playground/vite.config.ts
similarity index 70%
rename from packages/uikit-playground/vite.config.ts
rename to apps/uikit-playground/vite.config.ts
index a18e01b590e8..4d382d652859 100644
--- a/packages/uikit-playground/vite.config.ts
+++ b/apps/uikit-playground/vite.config.ts
@@ -3,15 +3,15 @@ import react from '@vitejs/plugin-react';
 
 // https://vitejs.dev/config/
 export default defineConfig(() => ({
-  logLevel: 'info',
+  base: './',
   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 5897afdf4f24..59a4ada810c5 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,96 @@
 # @rocket.chat/account-service
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 0c2dccb08bc9..fccc333b2c5b 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.7",
+	"version": "0.4.8-rc.6",
 	"description": "Rocket.Chat Account service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -29,9 +29,9 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
 		"pino": "^8.15.0",
@@ -40,12 +40,12 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/bcrypt": "^5.0.1",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/bcrypt": "^5.0.2",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"ts-node": "^10.9.2",
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/account-service/src/service.js",
 	"files": [
diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md
index 0d505da757a9..3a74e48465cb 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,96 @@
 # @rocket.chat/authorization-service
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 7c4f3d8abafd..0a852f1fa9b0 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.7",
+	"version": "0.4.8-rc.6",
 	"description": "Rocket.Chat Authorization service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -27,9 +27,9 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
 		"pino": "^8.15.0",
@@ -37,11 +37,11 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"ts-node": "^10.9.2",
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/authorization-service/src/service.js",
 	"files": [
diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md
index ebd5e0d3ce93..ec81e858c1fd 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,103 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  - @rocket.chat/instance-status@0.1.8-rc.6
+  </details>
+
+## 0.3.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  - @rocket.chat/instance-status@0.1.8-rc.5
+  </details>
+
+## 0.3.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  - @rocket.chat/instance-status@0.1.8-rc.4
+  </details>
+
+## 0.3.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  - @rocket.chat/instance-status@0.1.8-rc.3
+  </details>
+
+## 0.3.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  - @rocket.chat/instance-status@0.1.8-rc.2
+  </details>
+
+## 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
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 8af959506d40..c31e1cdd02fd 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.7",
+	"version": "0.3.8-rc.6",
 	"description": "Rocket.Chat DDP-Streamer service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -15,7 +15,7 @@
 	],
 	"author": "Rocket.Chat",
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "~0.31.25",
@@ -30,34 +30,34 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"jaeger-client": "^3.19.0",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
 		"pino": "^8.15.0",
 		"polka": "^0.5.2",
 		"sharp": "^0.32.6",
-		"underscore": "^1.13.6",
+		"underscore": "^1.13.7",
 		"uuid": "^7.0.3",
 		"ws": "^8.8.1"
 	},
 	"devDependencies": {
 		"@rocket.chat/ddp-client": "workspace:~",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/ejson": "^2.2.1",
-		"@types/gc-stats": "^1.4.2",
+		"@types/ejson": "^2.2.2",
+		"@types/gc-stats": "^1.4.3",
 		"@types/meteor": "^2.9.8",
 		"@types/node": "^14.18.63",
-		"@types/polka": "^0.5.6",
+		"@types/polka": "^0.5.7",
 		"@types/sharp": "^0.30.5",
 		"@types/uuid": "^8.3.4",
-		"@types/ws": "^8.5.8",
+		"@types/ws": "^8.5.12",
 		"eslint": "~8.45.0",
 		"pino-pretty": "^7.6.1",
-		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"ts-node": "^10.9.2",
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/service.js",
 	"files": [
diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md
index 885b7746b929..4c26ead7f78d 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,103 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/omnichannel-services@0.3.5-rc.6
+  - @rocket.chat/pdf-worker@0.2.5-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/omnichannel-services@0.3.5-rc.5
+  - @rocket.chat/pdf-worker@0.2.5-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/omnichannel-services@0.3.5-rc.4
+  - @rocket.chat/pdf-worker@0.2.5-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.5-rc.3
+  - @rocket.chat/pdf-worker@0.2.5-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/omnichannel-services@0.3.5-rc.2
+  - @rocket.chat/pdf-worker@0.2.5-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index fb995abe4083..464ba9af2247 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.7",
+	"version": "0.4.8-rc.6",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -31,10 +31,10 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
-		"moment-timezone": "^0.5.43",
+		"moleculer": "^0.14.34",
+		"moment-timezone": "^0.5.45",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
@@ -43,11 +43,11 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"ts-node": "^10.9.2",
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/omnichannel-transcript/src/service.js",
 	"files": [
diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md
index 9af1812bbfb6..57e20e88ac11 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,96 @@
 # @rocket.chat/presence-service
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/presence@0.2.8-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/presence@0.2.8-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/presence@0.2.8-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/presence@0.2.8-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/presence@0.2.8-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 1069cb43c155..f1335b2ddd20 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.7",
+	"version": "0.4.8-rc.6",
 	"description": "Rocket.Chat Presence service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -27,9 +27,9 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
 		"pino": "^8.15.0",
@@ -37,11 +37,11 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"ts-node": "^10.9.2",
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/presence-service/src/service.js",
 	"files": [
diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md
index ae79b6e2e5d4..b8260d3fec4c 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,96 @@
 # @rocket.chat/queue-worker
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/omnichannel-services@0.3.5-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/omnichannel-services@0.3.5-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/omnichannel-services@0.3.5-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.5-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/omnichannel-services@0.3.5-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 574b06ec6dcf..6ae6b4ea8fec 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.7",
+	"version": "0.4.8-rc.6",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -29,10 +29,10 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
-		"moment-timezone": "^0.5.43",
+		"moleculer": "^0.14.34",
+		"moment-timezone": "^0.5.45",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
@@ -41,11 +41,11 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"ts-node": "^10.9.2",
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/queue-worker/src/service.js",
 	"files": [
diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md
index 98e7bcecc2e2..4de6dc748196 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,89 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.4.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.4.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.4.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.4.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index c74b037c256f..50dffd921595 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.7",
+	"version": "0.4.8-rc.6",
 	"description": "Rocket.Chat Stream Hub service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -27,9 +27,9 @@
 		"event-loop-stats": "^1.4.1",
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
-		"gc-stats": "^1.4.0",
+		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.31",
+		"moleculer": "^0.14.34",
 		"mongodb": "^4.17.2",
 		"nats": "^2.4.0",
 		"pino": "^8.15.0",
@@ -38,12 +38,12 @@
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@types/bcrypt": "^5.0.1",
-		"@types/gc-stats": "^1.4.2",
-		"@types/polka": "^0.5.6",
+		"@types/bcrypt": "^5.0.2",
+		"@types/gc-stats": "^1.4.3",
+		"@types/polka": "^0.5.7",
 		"eslint": "~8.45.0",
-		"ts-node": "^10.9.1",
-		"typescript": "~5.3.3"
+		"ts-node": "^10.9.2",
+		"typescript": "~5.5.4"
 	},
 	"main": "./dist/ee/apps/stream-hub-service/src/service.js",
 	"files": [
diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md
index dacd1671ba3e..d089e7f736e0 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @rocket.chat/license
 
+## 0.2.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  </details>
+
+## 0.2.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  </details>
+
+## 0.2.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  </details>
+
+## 0.2.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  </details>
+
+## 0.2.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  </details>
+
+## 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
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index cf95c63a7327..4b28df13c112 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,16 +1,16 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.2.7",
+	"version": "0.2.8-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/bcrypt": "^5.0.1",
-		"@types/jest": "~29.5.12",
-		"@types/ws": "^8.5.8",
+		"@types/bcrypt": "^5.0.2",
+		"@types/jest": "~29.5.13",
+		"@types/ws": "^8.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-websocket-mock": "~2.5.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "tsc",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index 946060b52dd9..05c28dbfde8d 100644
--- a/ee/packages/omnichannel-services/CHANGELOG.md
+++ b/ee/packages/omnichannel-services/CHANGELOG.md
@@ -1,5 +1,103 @@
 # @rocket.chat/omnichannel-services
 
+## 0.3.5-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/pdf-worker@0.2.5-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.3.5-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/pdf-worker@0.2.5-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.3.5-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/pdf-worker@0.2.5-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.3.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/pdf-worker@0.2.5-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.3.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/pdf-worker@0.2.5-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 2678bb9a09da..eba036bfe5cb 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -1,14 +1,14 @@
 {
 	"name": "@rocket.chat/omnichannel-services",
-	"version": "0.3.4",
+	"version": "0.3.5-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
@@ -28,7 +28,7 @@
 		"eventemitter3": "^4.0.7",
 		"fibers": "^5.0.3",
 		"mem": "^8.1.1",
-		"moment-timezone": "^0.5.43",
+		"moment-timezone": "^0.5.45",
 		"mongo-message-queue": "^1.0.0",
 		"mongodb": "^4.17.2",
 		"pino": "^8.15.0"
diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md
index 92f2a8e72554..a898e5f97c89 100644
--- a/ee/packages/pdf-worker/CHANGELOG.md
+++ b/ee/packages/pdf-worker/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @rocket.chat/pdf-worker
 
+## 0.2.5-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  </details>
+
+## 0.2.5-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  </details>
+
+## 0.2.5-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  </details>
+
+## 0.2.5-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  </details>
+
+## 0.2.5-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  </details>
+
+## 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
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 1a47e3c09395..3ebb27b33920 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -1,20 +1,20 @@
 {
 	"name": "@rocket.chat/pdf-worker",
-	"version": "0.2.4",
+	"version": "0.2.5-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@storybook/addon-essentials": "~6.5.16",
 		"@storybook/react": "~6.5.16",
-		"@testing-library/react": "~16.0.0",
-		"@types/emojione": "^2.2.8",
-		"@types/jest": "~29.5.12",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
+		"@testing-library/react": "~16.0.1",
+		"@types/emojione": "^2.2.9",
+		"@types/jest": "~29.5.13",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"react-dom": "~18.3.1",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "tsc -p tsconfig.build.json && cp -r src/public dist/public",
@@ -38,7 +38,7 @@
 		"emoji-assets": "^7.0.1",
 		"emoji-toolkit": "^7.0.1",
 		"moment": "^2.29.4",
-		"moment-timezone": "^0.5.43",
+		"moment-timezone": "^0.5.45",
 		"react": "~18.3.1"
 	},
 	"volta": {
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 2628fcd41103..18a1af23c896 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,82 @@
 # @rocket.chat/presence
 
+## 0.2.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/core-services@0.7.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.2.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/core-services@0.7.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.2.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/core-services@0.7.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.2.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/core-services@0.7.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.2.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/core-services@0.7.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 4b6f39759dd5..5b26bd898121 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,19 +1,19 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.7",
+	"version": "0.2.8-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
 		"@babel/preset-env": "~7.22.20",
 		"@babel/preset-typescript": "~7.22.15",
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@types/node": "^14.18.63",
 		"babel-jest": "^29.0.3",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint src",
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 da2b71c1877b..29fe229ca532 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -1,22 +1,22 @@
 {
 	"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.57.1",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/ui-contexts": "workspace:~",
-		"@types/react": "~17.0.69",
+		"@types/react": "~17.0.80",
 		"eslint": "~8.45.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-testing-library": "^5.11.1",
 		"react": "~17.0.2",
-		"react-docgen-typescript-plugin": "~1.0.5",
-		"typescript": "~5.3.3"
+		"react-docgen-typescript-plugin": "~1.0.8",
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/package.json b/package.json
index 9be25273f5e7..ed611ca67fcb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.12.1",
+	"version": "6.13.0-rc.6",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
@@ -18,10 +18,10 @@
 	},
 	"devDependencies": {
 		"@changesets/cli": "^2.26.2",
-		"@types/chart.js": "^2.9.39",
-		"@types/js-yaml": "^4.0.8",
+		"@types/chart.js": "^2.9.41",
+		"@types/js-yaml": "^4.0.9",
 		"ts-node": "^10.9.2",
-		"turbo": "latest"
+		"turbo": "^2.1.2"
 	},
 	"workspaces": [
 		"apps/*",
@@ -64,8 +64,8 @@
 		"@storybook/react-docgen-typescript-plugin@1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0": "patch:@storybook/react-docgen-typescript-plugin@npm%3A1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0#./.yarn/patches/@storybook-react-docgen-typescript-plugin-npm-1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0-b31cc57c40.patch",
 		"mongodb@^4.17.1": "patch:mongodb@npm:4.17.1#.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch",
 		"@rocket.chat/forked-matrix-sdk-crypto-nodejs": "0.1.0-beta.13",
-		"typia@5.3.3": "patch:typia@npm:5.3.3#.yarn/patches/typia-npm-5.3.3-21d3e18463.patch",
-		"typia@~5.3.3": "patch:typia@npm%3A5.3.3#./.yarn/patches/typia-npm-5.3.3-21d3e18463.patch"
+		"typia@~6.9.0": "patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch",
+		"moleculer@^0.14.34": "patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch"
 	},
 	"dependencies": {
 		"node-gyp": "^9.4.1"
diff --git a/packages/account-utils/package.json b/packages/account-utils/package.json
index e33876a02d28..4ec6cd3bcab5 100644
--- a/packages/account-utils/package.json
+++ b/packages/account-utils/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/agenda/package.json b/packages/agenda/package.json
index 71b8b01bd6b0..2d1fc084c383 100644
--- a/packages/agenda/package.json
+++ b/packages/agenda/package.json
@@ -8,13 +8,13 @@
 		"date.js": "~0.3.3",
 		"debug": "~4.1.1",
 		"human-interval": "^2.0.1",
-		"moment-timezone": "~0.5.43",
+		"moment-timezone": "~0.5.45",
 		"mongodb": "^4.17.2"
 	},
 	"devDependencies": {
-		"@types/debug": "^4.1.10",
+		"@types/debug": "^4.1.12",
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index 211a2eba796d..0fbf1c9420c4 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @rocket.chat/api-client
 
+## 0.2.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  </details>
+
+## 0.2.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  </details>
+
+## 0.2.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  </details>
+
+## 0.2.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  </details>
+
+## 0.2.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index 3756f8526acf..5774166e116a 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -1,14 +1,14 @@
 {
 	"name": "@rocket.chat/api-client",
-	"version": "0.2.7",
+	"version": "0.2.8-rc.6",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
-		"@types/strict-uri-encode": "^2.0.1",
+		"@types/jest": "~29.5.13",
+		"@types/strict-uri-encode": "^2.0.2",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-fetch-mock": "^3.0.3",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "tsc",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index ce7fc6c17d43..22ce4478cde9 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @rocket.chat/apps
 
+## 0.1.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  </details>
+
+## 0.1.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  </details>
+
+## 0.1.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  </details>
+
+## 0.1.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  </details>
+
+## 0.1.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 5a8bd648729e..04b361b9f48e 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,10 +1,10 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.1.7",
+	"version": "0.1.8-rc.6",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
@@ -18,7 +18,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^"
 	}
diff --git a/packages/base64/package.json b/packages/base64/package.json
index c58a652877a3..441fed0e06c1 100644
--- a/packages/base64/package.json
+++ b/packages/base64/package.json
@@ -21,7 +21,7 @@
 		"@typescript-eslint/parser": "~5.60.1",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/cas-validate/package.json b/packages/cas-validate/package.json
index 769b74d38e56..a7cccb911781 100644
--- a/packages/cas-validate/package.json
+++ b/packages/cas-validate/package.json
@@ -5,7 +5,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 093ce016595e..0db80e7f2acb 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,91 @@
 # @rocket.chat/core-services
 
+## 0.7.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.7.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.7.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.7.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.7.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 09d63653d1cb..ee2006dc8547 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.1",
+	"version": "0.7.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -8,15 +8,13 @@
 		"@babel/preset-typescript": "~7.22.15",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/babel__core": "^7.20.3",
-		"@types/babel__preset-env": "^7.9.4",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"babel-jest": "^29.5.0",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"mongodb": "^4.17.2",
 		"prettier": "~2.8.8",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
@@ -34,14 +32,14 @@
 		"extends": "../../package.json"
 	},
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
-		"@types/fibers": "^3.1.3",
+		"@types/fibers": "^3.1.4",
 		"fibers": "^5.0.3"
 	}
 }
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 2d67bf515fca..132df89470ca 100644
--- a/packages/core-services/src/types/ITeamService.ts
+++ b/packages/core-services/src/types/ITeamService.ts
@@ -9,6 +9,7 @@ import type {
 	IRoom,
 	IUser,
 	IRole,
+	AtLeast,
 } from '@rocket.chat/core-typings';
 import type { Document, Filter, FindOptions } from 'mongodb';
 
@@ -111,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>>;
@@ -125,4 +126,16 @@ export interface ITeamService {
 	getStatistics(): Promise<ITeamStats>;
 	findBySubscribedUserIds(userId: string, callerId?: string): Promise<ITeam[]>;
 	addRolesToMember(teamId: string, userId: string, roles: Array<string>): Promise<boolean>;
+	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 7c513ef0bdd5..f915f94e51d0 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,34 @@
 # @rocket.chat/core-typings
 
+## 6.13.0-rc.6
+
+## 6.13.0-rc.5
+
+## 6.13.0-rc.4
+
+## 6.13.0-rc.3
+
+## 6.13.0-rc.2
+
+## 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
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 0970df8d81e4..7e2e7f7be0cd 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,13 +1,13 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.12.1",
+	"version": "6.13.0-rc.6",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
 		"mongodb": "^4.17.2",
 		"prettier": "~2.8.8",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
@@ -22,7 +22,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
diff --git a/packages/core-typings/src/ILivechatContact.ts b/packages/core-typings/src/ILivechatContact.ts
new file mode 100644
index 000000000000..1e7bd4ff5399
--- /dev/null
+++ b/packages/core-typings/src/ILivechatContact.ts
@@ -0,0 +1,25 @@
+import type { IRocketChatRecord } from './IRocketChatRecord';
+
+export interface ILivechatContactChannel {
+	name: string;
+	verified: boolean;
+	visitorId: string;
+}
+
+export interface ILivechatContactConflictingField {
+	field: string;
+	oldValue: string;
+	newValue: string;
+}
+
+export interface ILivechatContact extends IRocketChatRecord {
+	name: string;
+	phones?: string[];
+	emails?: string[];
+	contactManager?: string;
+	unknown?: boolean;
+	hasConflict?: boolean;
+	conflictingFields?: ILivechatContactConflictingField[];
+	customFields?: Record<string, string | unknown>;
+	channels?: ILivechatContactChannel[];
+}
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/ILivechatVisitor.ts b/packages/core-typings/src/ILivechatVisitor.ts
index 21819cc23f24..eefb4ebd720c 100644
--- a/packages/core-typings/src/ILivechatVisitor.ts
+++ b/packages/core-typings/src/ILivechatVisitor.ts
@@ -49,6 +49,7 @@ export interface ILivechatVisitor extends IRocketChatRecord {
 	};
 	activity?: string[];
 	disabled?: boolean;
+	contactId?: string;
 }
 
 export interface ILivechatVisitorDTO {
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 4a2124e98b98..95f2836da1e7 100644
--- a/packages/core-typings/src/IRoom.ts
+++ b/packages/core-typings/src/IRoom.ts
@@ -53,15 +53,6 @@ export interface IRoom extends IRocketChatRecord {
 		_id: string;
 	};
 
-	streamingOptions?: {
-		id?: string;
-		type?: string;
-		url?: string;
-		thumbnail?: string;
-		isAudioOnly?: boolean;
-		message?: string;
-	};
-
 	prid?: string;
 	avatarETag?: string;
 
@@ -108,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;
 	}
@@ -172,6 +166,31 @@ export enum OmnichannelSourceType {
 	OTHER = 'other', // catch-all source type
 }
 
+export interface IOmnichannelSource {
+	// TODO: looks like this is not so required as the definition suggests
+	// The source, or client, which created the Omnichannel room
+	type: OmnichannelSourceType;
+	// An optional identification of external sources, such as an App
+	id?: string;
+	// A human readable alias that goes with the ID, for post analytical purposes
+	alias?: string;
+	// A label to be shown in the room info
+	label?: string;
+	// The sidebar icon
+	sidebarIcon?: string;
+	// The default sidebar icon
+	defaultIcon?: string;
+}
+
+export interface IOmnichannelSourceFromApp extends IOmnichannelSource {
+	type: OmnichannelSourceType.APP;
+	id: string;
+	label: string;
+	sidebarIcon?: string;
+	defaultIcon?: string;
+	alias?: string;
+}
+
 export interface IOmnichannelGenericRoom extends Omit<IRoom, 'default' | 'featured' | 'broadcast'> {
 	t: 'l' | 'v';
 	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token' | 'activity'> & {
@@ -185,21 +204,7 @@ export interface IOmnichannelGenericRoom extends Omit<IRoom, 'default' | 'featur
 		replyTo: string;
 		subject: string;
 	};
-	source: {
-		// TODO: looks like this is not so required as the definition suggests
-		// The source, or client, which created the Omnichannel room
-		type: OmnichannelSourceType;
-		// An optional identification of external sources, such as an App
-		id?: string;
-		// A human readable alias that goes with the ID, for post analytical purposes
-		alias?: string;
-		// A label to be shown in the room info
-		label?: string;
-		// The sidebar icon
-		sidebarIcon?: string;
-		// The default sidebar icon
-		defaultIcon?: string;
-	};
+	source: IOmnichannelSource;
 
 	// Note: this field is used only for email transcripts. For Pdf transcripts, we have a separate field.
 	transcriptRequest?: IRequestTranscript;
@@ -333,13 +338,7 @@ export interface IVoipRoom extends IOmnichannelGenericRoom {
 }
 
 export interface IOmnichannelRoomFromAppSource extends IOmnichannelRoom {
-	source: {
-		type: OmnichannelSourceType.APP;
-		id: string;
-		alias?: string;
-		sidebarIcon?: string;
-		defaultIcon?: string;
-	};
+	source: IOmnichannelSourceFromApp;
 }
 
 export type IVoipRoomClosingInfo = Pick<IOmnichannelGenericRoom, 'closer' | 'closedBy' | 'closedAt' | 'tags'> &
@@ -356,12 +355,8 @@ export const isOmnichannelRoom = (room: Pick<IRoom, 't'>): room is IOmnichannelR
 
 export const isVoipRoom = (room: IRoom): room is IVoipRoom & IRoom => room.t === 'v';
 
-export const isOmnichannelRoomFromAppSource = (room: IOmnichannelRoom): room is IOmnichannelRoomFromAppSource => {
-	if (!isOmnichannelRoom(room)) {
-		return false;
-	}
-
-	return room.source?.type === OmnichannelSourceType.APP;
+export const isOmnichannelSourceFromApp = (source: IOmnichannelSource): source is IOmnichannelSourceFromApp => {
+	return source?.type === OmnichannelSourceType.APP;
 };
 
 export type RoomAdminFieldsType =
diff --git a/packages/core-typings/src/IStats.ts b/packages/core-typings/src/IStats.ts
index 826396bbb9c7..671024f7aa02 100644
--- a/packages/core-typings/src/IStats.ts
+++ b/packages/core-typings/src/IStats.ts
@@ -177,7 +177,6 @@ export interface IStats {
 	dashboardCount: number;
 	joinJitsiButton: number;
 	totalBroadcastRooms: number;
-	totalRoomsWithActiveLivestream: number;
 	totalTriggeredEmails: number;
 	totalRoomsWithStarred: number;
 	totalRoomsWithPinned: number;
diff --git a/packages/core-typings/src/IUser.ts b/packages/core-typings/src/IUser.ts
index fa411c6f7e47..d6854bef7243 100644
--- a/packages/core-typings/src/IUser.ts
+++ b/packages/core-typings/src/IUser.ts
@@ -45,7 +45,35 @@ export type ILoginUsername =
 	  };
 export type LoginUsername = string | ILoginUsername;
 
-export interface IUserServices {
+export interface IOAuthUserServices {
+	google?: any;
+	facebook?: any;
+	github?: any;
+	linkedin?: any;
+	twitter?: any;
+	gitlab?: any;
+	saml?: {
+		inResponseTo?: string;
+		provider?: string;
+		idp?: string;
+		idpSession?: string;
+		nameID?: string;
+	};
+	ldap?: {
+		id: string;
+		idAttribute?: string;
+	};
+	nextcloud?: {
+		accessToken: string;
+		refreshToken: string;
+		serverURL: string;
+	};
+	dolphin?: {
+		NickName?: string;
+	};
+}
+
+export interface IUserServices extends IOAuthUserServices {
 	password?: {
 		exists?: boolean;
 		bcrypt?: string;
@@ -62,12 +90,6 @@ export interface IUserServices {
 		refreshToken: string;
 		expiresAt: Date;
 	};
-	google?: any;
-	facebook?: any;
-	github?: any;
-	linkedin?: any;
-	twitter?: any;
-	gitlab?: any;
 	totp?: {
 		enabled: boolean;
 		hashedBackup: string[];
@@ -79,27 +101,37 @@ export interface IUserServices {
 		changedAt: Date;
 	};
 	emailCode?: IUserEmailCode;
-	saml?: {
-		inResponseTo?: string;
-		provider?: string;
-		idp?: string;
-		idpSession?: string;
-		nameID?: string;
-	};
-	ldap?: {
-		id: string;
-		idAttribute?: string;
-	};
-	nextcloud?: {
-		accessToken: string;
-		refreshToken: string;
-		serverURL: string;
-	};
-	dolphin?: {
-		NickName?: string;
-	};
 }
 
+type IUserService = keyof IUserServices;
+type IOAuthService = keyof IOAuthUserServices;
+
+const defaultOAuthKeys = [
+	'google',
+	'dolphin',
+	'facebook',
+	'github',
+	'gitlab',
+	'google',
+	'ldap',
+	'linkedin',
+	'nextcloud',
+	'saml',
+	'twitter',
+] as IOAuthService[];
+const userServiceKeys = ['emailCode', 'email2fa', 'totp', 'resume', 'password', 'passwordHistory', 'cloud', 'email'] as IUserService[];
+
+export const isUserServiceKey = (key: string): key is IUserService =>
+	userServiceKeys.includes(key as IUserService) || defaultOAuthKeys.includes(key as IOAuthService);
+
+export const isDefaultOAuthUser = (user: IUser): boolean =>
+	!!user.services && Object.keys(user.services).some((key) => defaultOAuthKeys.includes(key as IOAuthService));
+
+export const isCustomOAuthUser = (user: IUser): boolean =>
+	!!user.services && Object.keys(user.services).some((key) => !isUserServiceKey(key));
+
+export const isOAuthUser = (user: IUser): boolean => isDefaultOAuthUser(user) || isCustomOAuthUser(user);
+
 export interface IUserEmail {
 	address: string;
 	verified?: boolean;
@@ -183,6 +215,7 @@ export interface IUser extends IRocketChatRecord {
 	_pendingAvatarUrl?: string;
 	requirePasswordChange?: boolean;
 	requirePasswordChangeReason?: string;
+	isOAuthUser?: boolean; // client only field
 }
 
 export interface IRegisterUser extends IUser {
diff --git a/packages/core-typings/src/index.ts b/packages/core-typings/src/index.ts
index c04ffa998d77..5d2e2935a466 100644
--- a/packages/core-typings/src/index.ts
+++ b/packages/core-typings/src/index.ts
@@ -96,6 +96,7 @@ export * from './ILivechatCustomField';
 export * from './IOmnichannel';
 export * from './ILivechatAgentActivity';
 export * from './ILivechatBusinessHour';
+export * from './ILivechatContact';
 export * from './ILivechatVisitor';
 export * from './ILivechatDepartmentAgents';
 export * from './ILivechatAgent';
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index dd7e8a5734d8..8b2917bbeb9c 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @rocket.chat/cron
 
+## 0.1.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.1.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.1.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.1.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.1.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 472f88b8a84d..2f0daa8f658e 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,10 +1,10 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.7",
+	"version": "0.1.8-rc.6",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 3844c4431e8e..aa9feebb0c55 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,82 @@
 # @rocket.chat/ddp-client
 
+## 0.3.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/api-client@0.2.8-rc.6
+  </details>
+
+## 0.3.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/api-client@0.2.8-rc.5
+  </details>
+
+## 0.3.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/api-client@0.2.8-rc.4
+  </details>
+
+## 0.3.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/api-client@0.2.8-rc.3
+  </details>
+
+## 0.3.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/api-client@0.2.8-rc.2
+  </details>
+
+## 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
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index 8241a0a5e515..765b691537a5 100644
--- a/packages/ddp-client/package.json
+++ b/packages/ddp-client/package.json
@@ -1,14 +1,14 @@
 {
 	"name": "@rocket.chat/ddp-client",
-	"version": "0.3.7",
+	"version": "0.3.8-rc.6",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
-		"@types/ws": "^8.5.8",
+		"@types/jest": "~29.5.13",
+		"@types/ws": "^8.5.12",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-websocket-mock": "~2.5.0",
-		"typescript": "~5.3.3",
+		"typescript": "~5.5.4",
 		"ws": "^8.13.0"
 	},
 	"peerDependencies": {
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index c0fa20f58227..4915221b71ca 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -4,8 +4,8 @@
 	"description": "Rocket.Chat's JS/TS ESLint config",
 	"dependencies": {
 		"@babel/core": "^7.20.7",
-		"@babel/eslint-parser": "~7.23.3",
-		"@types/eslint": "~8.44.6",
+		"@babel/eslint-parser": "~7.23.10",
+		"@types/eslint": "~8.44.9",
 		"@types/prettier": "^2.6.3",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
 		"@typescript-eslint/parser": "~5.60.1",
diff --git a/packages/favicon/package.json b/packages/favicon/package.json
index b61eaee02a68..67f5c6dcdfea 100644
--- a/packages/favicon/package.json
+++ b/packages/favicon/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index 6c5e6c9bbdd0..65f5201518c4 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,104 @@
 # Change Log
 
+## 11.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/gazzodown@11.0.0-rc.6
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  - @rocket.chat/ui-avatar@7.0.0-rc.6
+  - @rocket.chat/ui-video-conf@11.0.0-rc.6
+  </details>
+
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/gazzodown@11.0.0-rc.5
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/ui-avatar@7.0.0-rc.5
+  - @rocket.chat/ui-video-conf@11.0.0-rc.5
+  </details>
+
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/gazzodown@11.0.0-rc.4
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/ui-avatar@7.0.0-rc.4
+  - @rocket.chat/ui-video-conf@11.0.0-rc.4
+  </details>
+
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/gazzodown@11.0.0-rc.3
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/ui-avatar@7.0.0-rc.3
+  - @rocket.chat/ui-video-conf@11.0.0-rc.3
+  </details>
+
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/gazzodown@11.0.0-rc.2
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/ui-avatar@7.0.0-rc.2
+  - @rocket.chat/ui-video-conf@11.0.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 0dfb8ea74aa2..f051aea22585 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.1",
+  "version": "11.0.0-rc.6",
   "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": "6.0.1",
-    "@rocket.chat/ui-contexts": "10.0.1",
-    "@rocket.chat/ui-kit": "0.36.1",
-    "@rocket.chat/ui-video-conf": "10.0.1",
+    "@rocket.chat/ui-avatar": "7.0.0-rc.6",
+    "@rocket.chat/ui-contexts": "11.0.0-rc.6",
+    "@rocket.chat/ui-kit": "*",
+    "@rocket.chat/ui-video-conf": "11.0.0-rc.6",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
@@ -63,10 +63,10 @@
     "@babel/preset-env": "~7.22.20",
     "@babel/preset-react": "~7.22.15",
     "@babel/preset-typescript": "~7.22.15",
-    "@rocket.chat/apps-engine": "1.45.0-alpha.866",
+    "@rocket.chat/apps-engine": "1.46.0",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.57.1",
+    "@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",
@@ -86,12 +86,10 @@
     "@storybook/source-loader": "~6.5.16",
     "@storybook/theming": "~6.5.16",
     "@tanstack/react-query": "^4.16.1",
-    "@testing-library/react": "~16.0.0",
+    "@testing-library/react": "~16.0.1",
     "@testing-library/user-event": "~14.5.2",
-    "@types/babel__core": "^7.20.3",
-    "@types/babel__preset-env": "^7.9.4",
-    "@types/react": "~17.0.69",
-    "@types/react-dom": "~17.0.22",
+    "@types/react": "~17.0.80",
+    "@types/react-dom": "~17.0.25",
     "babel-loader": "~8.2.5",
     "cross-env": "^7.0.3",
     "eslint": "~8.45.0",
@@ -100,13 +98,13 @@
     "normalize.css": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "~2.8.8",
-    "react-docgen-typescript-plugin": "~1.0.5",
+    "react-docgen-typescript-plugin": "~1.0.8",
     "react-dom": "^17.0.2",
-    "react-i18next": "^14.1.0",
+    "react-i18next": "~13.2.2",
     "rimraf": "^3.0.2",
-    "storybook-dark-mode": "~3.0.1",
+    "storybook-dark-mode": "~3.0.3",
     "tslib": "^2.5.3",
-    "typescript": "~5.3.3"
+    "typescript": "~5.5.4"
   },
   "dependencies": {
     "@rocket.chat/core-typings": "workspace:^",
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/fuselage-ui-kit/src/hooks/useUiKitState.spec.ts b/packages/fuselage-ui-kit/src/hooks/useUiKitState.spec.ts
new file mode 100644
index 000000000000..4a62fcbda98b
--- /dev/null
+++ b/packages/fuselage-ui-kit/src/hooks/useUiKitState.spec.ts
@@ -0,0 +1,69 @@
+import {
+  BlockContext,
+  type MultiStaticSelectElement,
+} from '@rocket.chat/ui-kit';
+import { act, renderHook } from '@testing-library/react';
+
+import { useUiKitState } from './useUiKitState';
+
+describe('state function', () => {
+  const context = BlockContext.NONE;
+
+  it('should handle arrays', async () => {
+    const element: MultiStaticSelectElement = {
+      type: 'multi_static_select',
+      placeholder: { type: 'plain_text', text: '' },
+      options: [],
+      initialValue: ['A', 'B'],
+      appId: 'app-id',
+      blockId: 'block-id',
+      actionId: 'action-id',
+    };
+
+    const { result } = renderHook(() => useUiKitState(element, context), {
+      legacyRoot: true,
+    });
+
+    await act(async () => {
+      const [, state] = result.current;
+      await state({
+        target: {
+          value: ['C', 'D'],
+        },
+      });
+    });
+
+    expect(result.current[0].value).toEqual(['C', 'D']);
+  });
+});
+
+describe('action function', () => {
+  const context = BlockContext.ACTION;
+
+  it('should handle arrays', async () => {
+    const element: MultiStaticSelectElement = {
+      type: 'multi_static_select',
+      placeholder: { type: 'plain_text', text: '' },
+      options: [],
+      initialValue: ['A', 'B'],
+      appId: 'app-id',
+      blockId: 'block-id',
+      actionId: 'action-id',
+    };
+
+    const { result } = renderHook(() => useUiKitState(element, context), {
+      legacyRoot: true,
+    });
+
+    await act(async () => {
+      const [, action] = result.current;
+      await action({
+        target: {
+          value: ['C', 'D'],
+        },
+      });
+    });
+
+    expect(result.current[0].value).toEqual(['C', 'D']);
+  });
+});
diff --git a/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts b/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts
index 6af9245f9a51..be2813e5d28a 100644
--- a/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts
+++ b/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts
@@ -42,7 +42,7 @@ export const useUiKitState = <TElement extends UiKit.ActionableElement>(
       | Event
       | { target: EventTarget }
       | { target: { value: UiKit.ActionOf<TElement> } }
-  ) => void
+  ) => Promise<void>
 ] => {
   const { blockId, actionId, appId, dispatchActionConfig } = element;
   const {
@@ -70,15 +70,20 @@ export const useUiKitState = <TElement extends UiKit.ActionableElement>(
     const {
       target: { value: elValue },
     } = e;
+
     setLoading(true);
 
     if (Array.isArray(value)) {
-      const idx = value.findIndex((value) => value === elValue);
-
-      if (idx > -1) {
-        setValue(value.filter((_, i) => i !== idx));
+      if (Array.isArray(elValue)) {
+        setValue(elValue);
       } else {
-        setValue([...value, elValue]);
+        const idx = value.findIndex((value) => value === elValue);
+
+        if (idx > -1) {
+          setValue(value.filter((_, i) => i !== idx));
+        } else {
+          setValue([...value, elValue]);
+        }
       }
     } else {
       setValue(elValue);
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 1437387ad146..1feb3f37e34e 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,86 @@
 # @rocket.chat/gazzodown
 
+## 11.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  </details>
+
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/ui-client@11.0.0-rc.5
+  </details>
+
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/ui-client@11.0.0-rc.4
+  </details>
+
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/ui-client@11.0.0-rc.3
+  </details>
+
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/ui-client@11.0.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 622bfdc35c36..38475931ed8e 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,12 +1,34 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "10.0.1",
+	"version": "11.0.0-rc.6",
 	"private": true,
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"scripts": {
+		"build": "rm -rf dist && tsc -p tsconfig.build.json",
+		"build-storybook": "build-storybook",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
+		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
+		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+		"storybook": "start-storybook -p 6006",
+		"test": "jest",
+		"testunit": "jest",
+		"typecheck": "tsc --noEmit"
+	},
+	"dependencies": {
+		"date-fns": "^3.3.1",
+		"dompurify": "^3.1.6",
+		"highlight.js": "^11.5.1",
+		"react-error-boundary": "^3.1.4"
+	},
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.57.1",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-tokens": "^0.33.1",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/message-parser": "workspace:^",
@@ -22,62 +44,40 @@
 		"@storybook/manager-webpack4": "~6.5.16",
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "~0.0.13",
-		"@testing-library/react": "~16.0.0",
-		"@types/jest": "~29.5.12",
-		"@types/katex": "~0.16.5",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
+		"@testing-library/react": "~16.0.1",
+		"@types/dompurify": "^3.0.5",
+		"@types/jest": "~29.5.13",
+		"@types/katex": "~0.16.7",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
 		"@typescript-eslint/parser": "~5.60.1",
 		"babel-loader": "^8.3.0",
 		"eslint": "~8.45.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-storybook": "~0.6.15",
 		"identity-obj-proxy": "^3.0.0",
 		"jest": "~29.7.0",
-		"katex": "~0.16.9",
+		"katex": "~0.16.11",
 		"outdent": "^0.8.0",
-		"react-docgen-typescript-plugin": "~1.0.5",
+		"react-docgen-typescript-plugin": "~1.0.8",
 		"react-dom": "~17.0.2",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
-	"scripts": {
-		"build": "rm -rf dist && tsc -p tsconfig.build.json",
-		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
-		"typecheck": "tsc --noEmit",
-		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
-		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
-		"testunit": "jest",
-		"test": "jest",
-		"storybook": "start-storybook -p 6006",
-		"build-storybook": "build-storybook"
-	},
-	"main": "./dist/index.js",
-	"typings": "./dist/index.d.ts",
-	"files": [
-		"/dist"
-	],
 	"peerDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "*",
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-tokens": "*",
-		"@rocket.chat/message-parser": "0.31.30",
+		"@rocket.chat/message-parser": "0.31.31-rc.0",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "10.0.1",
-		"@rocket.chat/ui-contexts": "10.0.1",
+		"@rocket.chat/ui-client": "11.0.0-rc.5",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
 		"katex": "*",
 		"react": "*"
 	},
-	"dependencies": {
-		"@types/dompurify": "^3.0.5",
-		"date-fns": "^3.3.1",
-		"dompurify": "^3.1.6",
-		"highlight.js": "^11.5.1",
-		"react-error-boundary": "^3.1.4"
-	},
 	"volta": {
 		"extends": "../../package.json"
 	}
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 466c022ad904..9dd0c4534340 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,13 +1,13 @@
 {
 	"name": "@rocket.chat/i18n",
-	"version": "0.7.0",
+	"version": "0.8.0-rc.1",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"tsup": "^6.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "node ./src/index.mjs",
diff --git a/packages/i18n/src/locales/af.i18n.json b/packages/i18n/src/locales/af.i18n.json
index 40ab367489b6..661360c109b2 100644
--- a/packages/i18n/src/locales/af.i18n.json
+++ b/packages/i18n/src/locales/af.i18n.json
@@ -2367,7 +2367,6 @@
   "The_application_name_is_required": "Die aansoek naam is nodig",
   "The_channel_name_is_required": "Die kanaal naam is nodig",
   "The_emails_are_being_sent": "Die e-posse word gestuur.",
-  "The_field_is_required": "Die veld%s is nodig.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die grootte van die prentjie sal nie werk nie omdat ons ImageMagick of GraphicsMagick nie op u bediener geïnstalleer het nie.",
   "The_redirectUri_is_required": "Die redirectUri is nodig",
   "The_server_will_restart_in_s_seconds": "Die bediener sal herbegin in%s sekondes",
diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json
index d3a86879f716..6d3d406e6c81 100644
--- a/packages/i18n/src/locales/ar.i18n.json
+++ b/packages/i18n/src/locales/ar.i18n.json
@@ -4126,8 +4126,7 @@
   "The_application_name_is_required": "اسم التطبيق مطلوب",
   "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> will be تلقائيًا.",
-  "The_field_is_required": "الحقل %s مطلوب.",
+  "The_empty_room__roomName__will_be_removed_automatically": "ستتم إزالة الغرفة الفارغة <span style=\"font-weight: bold;\">{{roomName}}</span> will be تلقائيًا.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "لن يعمل تغيير حجم الصورة لأننا لا نستطيع اكتشاف تثبيت ImageMagick أو GraphicsMagick على الخادم الخاص بك.",
   "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": "تم تعطيل إشعارات الهاتف المحمول لجميع المستخدمين، انتقل إلى \"المسؤول > منبثق\" لتمكين البوابة المنبثقة مرة أخرى",
diff --git a/packages/i18n/src/locales/az.i18n.json b/packages/i18n/src/locales/az.i18n.json
index 118be4b37920..7b1c3f48fa1c 100644
--- a/packages/i18n/src/locales/az.i18n.json
+++ b/packages/i18n/src/locales/az.i18n.json
@@ -2366,8 +2366,7 @@
   "Thank_you_for_your_feedback": "Əlaqə üçün təşəkkür edirik",
   "The_application_name_is_required": "Ərizə adı tələb olunur",
   "The_channel_name_is_required": "Kanal adı tələb olunur",
-  "The_emails_are_being_sent": "E-poçt göndərilir.",
-  "The_field_is_required": "%s sahə tələb olunur.",
+  "The_emails_are_being_sent": "E-poçt göndərilir.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ImageMagick və ya GraphicsMagick-i serverinizdə yükləməyəcəyimiz üçün şəkil ölçüsünün işləməyəcəyi.",
   "The_redirectUri_is_required": "RedirectUri tələb olunur",
   "The_server_will_restart_in_s_seconds": "Server%s saniyə ərzində yenidən başlayacaq",
diff --git a/packages/i18n/src/locales/be-BY.i18n.json b/packages/i18n/src/locales/be-BY.i18n.json
index 858688468755..daea286edfed 100644
--- a/packages/i18n/src/locales/be-BY.i18n.json
+++ b/packages/i18n/src/locales/be-BY.i18n.json
@@ -2384,8 +2384,7 @@
   "Thank_you_for_your_feedback": "Дзякуй за ваш водгук",
   "The_application_name_is_required": "Імя прыкладання патрабуецца",
   "The_channel_name_is_required": "Назва канала патрабуецца",
-  "The_emails_are_being_sent": "Лісты былі адпраўленыя.",
-  "The_field_is_required": "Поле %s патрабуецца.",
+  "The_emails_are_being_sent": "Лісты былі адпраўленыя.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Змяніць памер малюнка не будзе працаваць, таму што мы не можам выявіць ImageMagick або GraphicsMagick усталяваны на вашым серверы.",
   "The_redirectUri_is_required": "RedirectUri патрабуецца",
   "The_server_will_restart_in_s_seconds": "Сервер будзе перазагружаны у %s секунд",
diff --git a/packages/i18n/src/locales/bg.i18n.json b/packages/i18n/src/locales/bg.i18n.json
index ac7c8ddcd000..f7bc5ad2cf8f 100644
--- a/packages/i18n/src/locales/bg.i18n.json
+++ b/packages/i18n/src/locales/bg.i18n.json
@@ -2363,8 +2363,7 @@
   "Thank_you_for_your_feedback": "Благодарим Ви за обратната връзка",
   "The_application_name_is_required": "Името на приложението е задължително",
   "The_channel_name_is_required": "Името на канала е задължително",
-  "The_emails_are_being_sent": "Изпращат се имейлите.",
-  "The_field_is_required": "Полето %s е задължително.",
+  "The_emails_are_being_sent": "Изпращат се имейлите.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Размерът на изображението няма да работи, защото не можем да открием ImageMagick или GraphicsMagick, инсталирани на вашия сървър.",
   "The_redirectUri_is_required": "Необходимо е пренасочването",
   "The_server_will_restart_in_s_seconds": "Сървъра ще бъде рестартиран след %s секунди",
diff --git a/packages/i18n/src/locales/bs.i18n.json b/packages/i18n/src/locales/bs.i18n.json
index ebe0b045c418..85e70bbb0abc 100644
--- a/packages/i18n/src/locales/bs.i18n.json
+++ b/packages/i18n/src/locales/bs.i18n.json
@@ -2360,8 +2360,7 @@
   "Thank_you_for_your_feedback": "Hvala vam na povratnim informacijama",
   "The_application_name_is_required": "Naziv aplikacije je potreban",
   "The_channel_name_is_required": "Ime sobe je potrebno",
-  "The_emails_are_being_sent": "E-mailovi su poslani.",
-  "The_field_is_required": "Polje %s je traženo.",
+  "The_emails_are_being_sent": "E-mailovi su poslani.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Promjena veličine slike neće raditi, jer ne možemo provjeriti da je ImageMagick ili GraphicsMagick instaliran na vašem poslužitelju.",
   "The_redirectUri_is_required": "RedirectUri je potrebno",
   "The_server_will_restart_in_s_seconds": "Poslužitelj će se ponovno pokrenuti u %s sekundi",
diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json
index 3f74fc967416..f4d304e08633 100644
--- a/packages/i18n/src/locales/ca.i18n.json
+++ b/packages/i18n/src/locales/ca.i18n.json
@@ -4044,8 +4044,7 @@
   "The_application_name_is_required": "El nom de laplicació és obligatori.",
   "The_channel_name_is_required": "Es requereix el nom del canal",
   "The_emails_are_being_sent": "Els missatges de correu-e s'estan enviant.",
-  "The_empty_room__roomName__will_be_removed_automatically": "La sala buida <span style=\"font-weight: bold;\">{{roomName}}</span> s'eliminarà automàticament.",
-  "The_field_is_required": "El camp %s és obligatori.",
+  "The_empty_room__roomName__will_be_removed_automatically": "La sala buida <span style=\"font-weight: bold;\">{{roomName}}</span> s'eliminarà automàticament.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "L'ajust de mida de les imatges no funcionarà perquè no podem detectar ni ImageMagick ni GraphicsMagick al servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "El missatge és una discussió, no podrà recuperar els missatges!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Les notificacions mòbils es deshabilitaron per a tots els usuaris, aneu a \"Admin> Push\" per habilitar Push inici novament",
diff --git a/packages/i18n/src/locales/cs.i18n.json b/packages/i18n/src/locales/cs.i18n.json
index 914d6c35d485..a74224912766 100644
--- a/packages/i18n/src/locales/cs.i18n.json
+++ b/packages/i18n/src/locales/cs.i18n.json
@@ -3413,8 +3413,7 @@
   "The_application_name_is_required": "Název aplikace je vyžadován",
   "The_channel_name_is_required": "Název místnosti je vyžadován",
   "The_emails_are_being_sent": "Tyto e-maily jsou odesílány.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Prázdná místnost <span style=\"font-weight: bold;\">{{roomName}}</span> bude automaticky odstraněna.",
-  "The_field_is_required": "Pole %s je povinné.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Prázdná místnost <span style=\"font-weight: bold;\">{{roomName}}</span> bude automaticky odstraněna.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Nelze změnit velikost obrázku, protože na serveru nebyl nalezen ImageMagick ani GraphicsMagick.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Zpráva je diskuse, ze které nebudete moci obnovit zprávy!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilní oznámení byla deaktivována všem uživatelům, v admin sekci \"Notifikace\" znovu aktivujte Push Gateway",
diff --git a/packages/i18n/src/locales/cy.i18n.json b/packages/i18n/src/locales/cy.i18n.json
index f9c7b4d7ec87..7f63d511201f 100644
--- a/packages/i18n/src/locales/cy.i18n.json
+++ b/packages/i18n/src/locales/cy.i18n.json
@@ -2361,8 +2361,7 @@
   "Thank_you_for_your_feedback": "Diolch i chi am eich adborth",
   "The_application_name_is_required": "Mae angen enw'r cais",
   "The_channel_name_is_required": "Mae angen enw'r sianel",
-  "The_emails_are_being_sent": "Mae'r negeseuon e-bost yn cael eu hanfon.",
-  "The_field_is_required": "Mae'r maes %s yn ofynnol.",
+  "The_emails_are_being_sent": "Mae'r negeseuon e-bost yn cael eu hanfon.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Ni fydd maint y delwedd yn gweithio oherwydd na allwn ganfod ImageMagick neu GraphicsMagick ar eich gweinydd.",
   "The_redirectUri_is_required": "Mae angen y redirectUri",
   "The_server_will_restart_in_s_seconds": "Bydd y gweinydd yn ailgychwyn yn %s eiliad",
diff --git a/packages/i18n/src/locales/da.i18n.json b/packages/i18n/src/locales/da.i18n.json
index a675ab4843c0..2aabbfcd8642 100644
--- a/packages/i18n/src/locales/da.i18n.json
+++ b/packages/i18n/src/locales/da.i18n.json
@@ -3521,8 +3521,7 @@
   "The_application_name_is_required": "Ansøgningsnavnet er påkrævet",
   "The_channel_name_is_required": "Kanalnavnet er påkrævet",
   "The_emails_are_being_sent": "E-mailsne bliver sendt.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Det tomme rum <span style=\"font-weight: bold;\">{{roomName}}</span> fjernes automatisk.",
-  "The_field_is_required": "Feltet%s er påkrævet.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Det tomme rum <span style=\"font-weight: bold;\">{{roomName}}</span> fjernes automatisk.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Billedforstørrelsen fungerer ikke, fordi vi ikke kan opdage ImageMagick eller GraphicsMagick installeret på din server.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meddelelsen er en diskussion og du vil derfor ikke kunne gendanne meddelelserne!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilmeddelelser blev deaktiveret for alle brugere. Tilgå \"Admin > Push\" for at aktivere Push Gateway igen",
diff --git a/packages/i18n/src/locales/de-AT.i18n.json b/packages/i18n/src/locales/de-AT.i18n.json
index 0be8030f5738..bbe960596a28 100644
--- a/packages/i18n/src/locales/de-AT.i18n.json
+++ b/packages/i18n/src/locales/de-AT.i18n.json
@@ -2368,8 +2368,7 @@
   "Thank_you_for_your_feedback": "Vielen Dank für Ihre Rückmeldung.",
   "The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden.",
   "The_channel_name_is_required": "Ein Name für den Raum muss angegeben werden.",
-  "The_emails_are_being_sent": "Die E-Mails werden gesendet.",
-  "The_field_is_required": "Das Feld %s ist erforderlich.",
+  "The_emails_are_being_sent": "Die E-Mails werden gesendet.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
   "The_redirectUri_is_required": "Es muss eine Weiterleitung-URL angegeben werden.",
   "The_server_will_restart_in_s_seconds": "Der Server wird in %s Sekunden neu gestartet",
diff --git a/packages/i18n/src/locales/de-IN.i18n.json b/packages/i18n/src/locales/de-IN.i18n.json
index 41da8fb3c809..edccd128e314 100644
--- a/packages/i18n/src/locales/de-IN.i18n.json
+++ b/packages/i18n/src/locales/de-IN.i18n.json
@@ -2661,8 +2661,7 @@
   "Thank_you_for_your_feedback": "Vielen Dank für Deine Rückmeldung",
   "The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden",
   "The_channel_name_is_required": "Ein Name für den Kanal muss angegeben werden",
-  "The_emails_are_being_sent": "E-Mails werden gesendet",
-  "The_field_is_required": "Das Feld %s ist erforderlich",
+  "The_emails_are_being_sent": "E-Mails werden gesendet",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Diese Nachricht ist eine Diskussion. Wenn Du diese löschst, wirst Du die Nachrichten der Diskussion nicht mehr auffinden können.",
   "The_peer__peer__does_not_exist": "Der Peer <em>{{peer}}</ em> ist nicht vorhanden.",
diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
index 72963c308e67..59e329014186 100644
--- a/packages/i18n/src/locales/de.i18n.json
+++ b/packages/i18n/src/locales/de.i18n.json
@@ -4635,8 +4635,7 @@
   "The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden",
   "The_channel_name_is_required": "Ein Name für den Channel muss angegeben werden",
   "The_emails_are_being_sent": "E-Mails werden gesendet",
-  "The_empty_room__roomName__will_be_removed_automatically": "Der leere Raum <span style=\"font-weight: bold;\">{{roomName}}</span> wird automatisch entfernt.",
-  "The_field_is_required": "Das Feld %s ist erforderlich",
+  "The_empty_room__roomName__will_be_removed_automatically": "Der leere Raum <span style=\"font-weight: bold;\">{{roomName}}</span> wird automatisch entfernt.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Diese Nachricht ist eine Diskussion. Wenn Sie diese löschen, werden Sie die Nachrichten der Diskussion nicht mehr auffinden können.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Die mobilen Benachrichtigungen wurden für alle Benutzer deaktiviert, wechseln Sie zu \"Admin > Push\", um das Push-Gateway erneut zu aktivieren",
diff --git a/packages/i18n/src/locales/el.i18n.json b/packages/i18n/src/locales/el.i18n.json
index 731a56695f7a..3e335c6638d3 100644
--- a/packages/i18n/src/locales/el.i18n.json
+++ b/packages/i18n/src/locales/el.i18n.json
@@ -2373,8 +2373,7 @@
   "Thank_you_for_your_feedback": "Ευχαριστούμε για τα σχόλιά σας",
   "The_application_name_is_required": "Το όνομα της εφαρμογής απαιτείται",
   "The_channel_name_is_required": "Το όνομα του καναλιού απαιτείται",
-  "The_emails_are_being_sent": "Τα μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται.",
-  "The_field_is_required": "Το πεδίο %s απαιτείται.",
+  "The_emails_are_being_sent": "Τα μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Το μέγεθος της εικόνας δεν θα λειτουργήσει, επειδή δεν μπορεί να ανιχνεύσει ImageMagick ή GraphicsMagick εγκατεστημένο στον server σας.",
   "The_redirectUri_is_required": "Η redirectUri απαιτείται",
   "The_server_will_restart_in_s_seconds": "Ο διακομιστής θα κάνει επανεκκίνηση στο %s δευτερόλεπτα",
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 204cc75b79f5..27978d72e7dd 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",
@@ -282,6 +283,8 @@
   "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "Time to expire the code sent via email in seconds",
   "Accounts_TwoFactorAuthentication_By_Email_Enabled": "Enable Two Factor Authentication via Email",
   "Accounts_TwoFactorAuthentication_By_Email_Enabled_Description": "Users with email verified and the option enabled in their profile page will receive an email with a temporary code to authorize certain actions like login, save the profile, etc.",
+  "Accounts_twoFactorAuthentication_email_available_for_OAuth_users": "Make two factor via email available for oAuth users",
+  "Accounts_twoFactorAuthentication_email_available_for_OAuth_users_Description": "People that use oAuth will receive an email with a temporary code to authorize actions like login, save profile, etc.",
   "Accounts_TwoFactorAuthentication_Enabled": "Enable Two Factor Authentication",
   "Accounts_TwoFactorAuthentication_Enabled_Description": "If deactivated, this setting will deactivate all Two Factor Authentication.  \nTo force users to use Two Factor Authentication, the admin has to configure the 'user' role to enforce it.",
   "Accounts_TwoFactorAuthentication_Enforce_Password_Fallback": "Enforce password fallback",
@@ -989,6 +992,7 @@
   "Channels_list": "List of public channels",
   "Channel_what_is_this_channel_about": "What is this channel about?",
   "Chart": "Chart",
+  "Chats": "Chats",
   "Chat_button": "Chat button",
   "Chat_close": "Chat Close",
   "Chat_closed": "Chat closed",
@@ -1122,8 +1126,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",
@@ -1679,7 +1683,7 @@
   "Direct_Message": "Direct message",
   "Livechat_Facebook_Enabled": "Facebook integration enabled",
   "Direct_message_creation_description": "Select one or more people to message",
-  "Direct_message_creation_error": "Please select at least one person",
+  "Direct_message_creation_error": "Select at least one person",
   "Direct_message_creation_description_hint": "More people cannot be added once created",
   "Direct_message_someone": "Direct message someone",
   "Direct_message_you_have_joined": "You have joined a new direct message with",
@@ -1797,11 +1801,13 @@
   "Markdown_SupportSchemesForLink_Description": "Comma-separated list of allowed schemes",
   "E2E_enable": "Enable E2E",
   "E2E_disable": "Disable E2E",
-  "E2E_Enable_alert": "This feature is currently in beta! Please report bugs to github.com/RocketChat/Rocket.Chat/issues and be aware of:<br/>- Encrypted messages of encrypted rooms will not be found by search operations.<br/>- The mobile apps may not support the encrypted messages (they are implementing it).<br/>- Bots may not be able to see encrypted messages until they implement support for it.<br/>- Uploads will not be encrypted in this version.",
+  "E2E_Enable_alert": "This feature is currently in beta! Please report bugs to github.com/RocketChat/Rocket.Chat/issues and be aware of:<br/>- Encrypted messages of encrypted rooms will not be found by search operations.<br/>- Bots may not be able to see encrypted messages until they implement support for it.",
   "E2E_Enable_description": "Enable option to create encrypted groups and be able to change groups and direct messages to be encrypted",
   "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",
@@ -1944,8 +1950,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",
@@ -2081,6 +2087,7 @@
   "error-invalid-custom-field": "Invalid custom field",
   "error-invalid-custom-field-name": "Invalid custom field name. Use only letters, numbers, hyphens and underscores.",
   "error-invalid-custom-field-value": "Invalid value for {{field}} field",
+  "error-custom-field-not-allowed": "Custom field {{key}} is not allowed",
   "error-invalid-date": "Invalid date provided.",
   "error-invalid-dates": "From date cannot be after To date",
   "error-invalid-description": "Invalid description",
@@ -2278,7 +2285,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).",
@@ -4035,6 +4045,8 @@
   "Omnichannel_Reports_Summary": "Gain insights into your operation and export your metrics.",
   "Omnichannel_max_fallback_forward_depth": "Maximum fallback forward departments depth",
   "Omnichannel_max_fallback_forward_depth_Description": "Maximum number of hops that a room being transfered will do when the target department has a Fallback Forward Department set up. When limit is reached, chat won't be transferred and process will stop. Depending on your configuration, setting a high number may cause performance issues.",
+  "Omnichannel_allow_visitors_to_close_conversation": "Allow visitors to finish conversations",
+  "Omnichannel_allow_visitors_to_close_conversation_Description": "When disabled, visitors won't be able to finish an ongoing conversation either via UI or via API.",
   "On": "On",
   "on-hold-livechat-room": "On Hold Omnichannel Room",
   "on-hold-livechat-room_description": "Permission to on hold omnichannel room",
@@ -4233,7 +4245,6 @@
   "Please_fill_all_the_information": "Please fill all the information",
   "Please_fill_an_email": "Please fill an email",
   "Please_fill_name_and_email": "Please fill name and email",
-  "Please_fill_out_reason_for_report": "Please fill out the reason for the report",
   "Please_select_an_user": "Please select an user",
   "Please_select_enabled_yes_or_no": "Please select an option for Enabled",
   "Please_select_visibility": "Please select a visibility",
@@ -4356,7 +4367,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",
@@ -4384,6 +4395,7 @@
   "Real_Time_Monitoring": "Real-time Monitoring",
   "RealName_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of names",
   "Reason_for_joining": "Reason for joining",
+  "Reason_for_report": "Reason for report",
   "Reason_To_Join": "Reason to Join",
   "Receive_alerts": "Receive alerts",
   "Receive_Group_Mentions": "Receive @all and @here mentions",
@@ -4577,6 +4589,7 @@
   "Robot_Instructions_File_Content": "Robots.txt File Contents",
   "Root": "Root",
   "Required_action": "Required action",
+  "Required_field": "{{field}} required",
   "Default_Referrer_Policy": "Default Referrer Policy",
   "Default_Referrer_Policy_Description": "This controls the 'referrer' header that's sent when requesting embedded media from other servers. For more information, refer to [this link from MDN](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy). Remember, a full page refresh is required for this to take effect",
   "No_feature_to_preview": "No feature to preview",
@@ -5273,7 +5286,6 @@
   "The_channel_name_is_required": "The channel name is required",
   "The_emails_are_being_sent": "The emails are being sent.",
   "The_empty_room__roomName__will_be_removed_automatically": "The empty room <span style=\"font-weight: bold;\">{{roomName}}</span> will be removed automatically.",
-  "The_field_is_required": "The field %s is required.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "The image resize will not work because we can not detect ImageMagick or GraphicsMagick installed on your server.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "The message is a discussion you will not be able to recover the messages!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "The mobile notifications were disabled to all users, go to \"Admin > Push\" to enable the Push Gateway again",
@@ -5841,6 +5853,8 @@
   "view-joined-room": "View Joined Room",
   "view-joined-room_description": "Permission to view the currently joined channels",
   "view-l-room": "View Omnichannel Rooms",
+  "create-livechat-contact": "Create Omnichannel contacts",
+  "update-livechat-contact": "Update Omnichannel contacts",
   "view-l-room_description": "Permission to view Omnichannel rooms",
   "view-livechat-analytics": "View Omnichannel Analytics",
   "onboarding.page.awaitingConfirmation.subtitle": "We have sent you an email to {{emailAddress}} with a confirmation link. Please verify that the security code below matches the one in the email.",
@@ -6532,5 +6546,9 @@
   "Sidebar_Sections_Order_Description": "Select the categories in your preferred order",
   "Incoming_Calls": "Incoming calls",
   "Advanced_settings": "Advanced settings",
-  "Security_and_permissions": "Security and permissions"
+  "Security_and_permissions": "Security and permissions",
+  "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/eo.i18n.json b/packages/i18n/src/locales/eo.i18n.json
index 1558424c9445..907767a7f7da 100644
--- a/packages/i18n/src/locales/eo.i18n.json
+++ b/packages/i18n/src/locales/eo.i18n.json
@@ -2366,8 +2366,7 @@
   "Thank_you_for_your_feedback": "Dankon pro viaj sugestoj",
   "The_application_name_is_required": "La aplika nomo estas postulita",
   "The_channel_name_is_required": "La kanala nomo estas postulita",
-  "The_emails_are_being_sent": "La retpoŝtoj estas senditaj.",
-  "The_field_is_required": "La kampo%s estas postulita.",
+  "The_emails_are_being_sent": "La retpoŝtoj estas senditaj.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "La regrandigo de bildoj ne funkcios ĉar ni ne povas detekti ImageMagick aŭ GraphicsMagick instalitan sur via servilo.",
   "The_redirectUri_is_required": "La redirectUri estas postulita",
   "The_server_will_restart_in_s_seconds": "La servilo rekomencos en%s sekundoj",
diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json
index a276a3c51690..4a690dd7a4b2 100644
--- a/packages/i18n/src/locales/es.i18n.json
+++ b/packages/i18n/src/locales/es.i18n.json
@@ -4109,8 +4109,7 @@
   "The_application_name_is_required": "El nombre de la aplicación es obligatorio",
   "The_channel_name_is_required": "El nombre del canal es obligatorio",
   "The_emails_are_being_sent": "Los correos electrónicos se están enviando.",
-  "The_empty_room__roomName__will_be_removed_automatically": "La sala vacía <span style=\"font-weight: bold;\">{{roomName}}</span> se eliminará automáticamente.",
-  "The_field_is_required": "El campo %s es obligatorio.",
+  "The_empty_room__roomName__will_be_removed_automatically": "La sala vacía <span style=\"font-weight: bold;\">{{roomName}}</span> se eliminará automáticamente.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "El ajuste de tamaño de las imágenes no funcionará porque no detectamos ImageMagick o GraphicsMagick instalados en tu servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "El mensaje es una discusión, así que no podrás recuperar los mensajes",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Las notificaciones móviles se han deshabilitado para todos los usuarios. Ve a \"Administración\" > \"Push\" para habilitar puerta de enlace push nuevamente",
diff --git a/packages/i18n/src/locales/fa.i18n.json b/packages/i18n/src/locales/fa.i18n.json
index c4850a7d30eb..b14bc31d7733 100644
--- a/packages/i18n/src/locales/fa.i18n.json
+++ b/packages/i18n/src/locales/fa.i18n.json
@@ -2702,7 +2702,6 @@
   "The_application_name_is_required": "نام نرم افزار مورد نیاز است",
   "The_channel_name_is_required": "نام کانال نیاز است",
   "The_emails_are_being_sent": "ایمیل در حال ارسال.",
-  "The_field_is_required": "زمینه به %s مورد نیاز است.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "تغییر اندازه تصویر به کار نخواهد کرد زیرا ما نمی توانیم تشخیص ImageMagick را یا GraphicsMagick بر روی سرور خود نصب شده است.",
   "The_redirectUri_is_required": "redirectUri مورد نیاز است",
   "The_server_will_restart_in_s_seconds": "سرور در %s ثانیه راه اندازی مجدد خواهد",
diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json
index 17b5f65eab31..26ba8019aeb1 100644
--- a/packages/i18n/src/locales/fi.i18n.json
+++ b/packages/i18n/src/locales/fi.i18n.json
@@ -4727,8 +4727,7 @@
   "The_application_will_be_able_to": "<1>{{appName}}</1> voi:",
   "The_channel_name_is_required": "Kanavan nimi on pakollinen",
   "The_emails_are_being_sent": "Sähköpostiviestejä lähetetään.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Tyhjä huone <span style=\"font-weight: bold;\">{{roomName}}</span> poistetaan automaattisesti.",
-  "The_field_is_required": "Kenttä %s on pakollinen.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Tyhjä huone <span style=\"font-weight: bold;\">{{roomName}}</span> poistetaan automaattisesti.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Kuvien koon muuttaminen ei toimi, koska ImageMagickia tai GraphicsMagickia ei havaittu asennettuna palvelimessa.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Viesti on keskustelu, et voi palauttaa näitä viestejä!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobiili-ilmoitukset oli poistettu käytöstä kaikilta käyttäjiltä. Ota Push Gateway uudelleen käyttöön kohdassa \"Admin > Push\"",
diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json
index 84d33eaf5330..80e4504d2085 100644
--- a/packages/i18n/src/locales/fr.i18n.json
+++ b/packages/i18n/src/locales/fr.i18n.json
@@ -4121,8 +4121,7 @@
   "The_application_name_is_required": "Le nom de l'application est requis",
   "The_channel_name_is_required": "Le nom du canal est obligatoire",
   "The_emails_are_being_sent": "Les e-mails sont en cours d'envoi.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Le salon vide <span style=\"font-weight: bold;\">{{roomName}}</span> sera supprimé automatiquement.",
-  "The_field_is_required": "Le champ %s est requis.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Le salon vide <span style=\"font-weight: bold;\">{{roomName}}</span> sera supprimé automatiquement.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Le redimensionnement de l'image ne fonctionnera pas car nous n'avons pas trouvé ImageMagick ou GraphicsMagick installé sur votre serveur.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Le message est une discussion, vous ne pourrez pas récupérer les messages.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Les notifications mobiles ont été désactivées pour tous les utilisateurs, accédez à \"Admin > Push\" pour réactiver la passerelle Push",
diff --git a/packages/i18n/src/locales/he.i18n.json b/packages/i18n/src/locales/he.i18n.json
index 33a4b920b4b2..499e2ca41d2d 100644
--- a/packages/i18n/src/locales/he.i18n.json
+++ b/packages/i18n/src/locales/he.i18n.json
@@ -1304,8 +1304,7 @@
   "Thank_you_for_your_feedback": "תודה לך על המשוב",
   "The_application_name_is_required": "שם האפליקציה נדרש",
   "The_channel_name_is_required": "שם הערוץ נדרש",
-  "The_emails_are_being_sent": "האימיילים נשלחים.",
-  "The_field_is_required": "השדה %s הוא חובה.",
+  "The_emails_are_being_sent": "האימיילים נשלחים.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "שינוי גודל התמונה לא יעבוד כי אנחנו לא יכולים לזהות ImageMagick או GraphicsMagick מותקן על השרת שלך.",
   "The_redirectUri_is_required": "RedirectUri נדרש",
   "The_server_will_restart_in_s_seconds": "השרת יפעיל את עצמו מחדש בעוד ",
diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json
index 1049d8495d86..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": "यह सुविधा प्रशासन सेटिंग्स (एडमिन -> वीडियो कॉन्फ्रेंस) से सक्षम होने के लिए उपरोक्त चयनित कॉल प्रदाता पर निर्भर करती है।",
@@ -4010,7 +4009,6 @@
   "Please_fill_all_the_information": "कृपया सारी जानकारी भरें",
   "Please_fill_an_email": "कृपया एक ईमेल भरें",
   "Please_fill_name_and_email": "कृपया नाम और ईमेल भरें",
-  "Please_fill_out_reason_for_report": "कृपया रिपोर्ट का कारण भरें",
   "Please_select_an_user": "कृपया एक उपयोगकर्ता चुनें",
   "Please_select_enabled_yes_or_no": "कृपया सक्षम के लिए एक विकल्प चुनें",
   "Please_select_visibility": "कृपया एक दृश्यता चुनें",
@@ -4129,7 +4127,6 @@
   "Queue_Time": "कतार समय",
   "Queue_management": "कतार प्रबंधन",
   "Quick_reactions": "त्वरित प्रतिक्रियाएँ",
-  "Quick_reactions_description": "जब आपका माउस संदेश पर होता है तो सबसे अधिक उपयोग की जाने वाली तीन प्रतिक्रियाओं तक आसान पहुंच मिलती है",
   "quote": "उद्धरण",
   "Quote": "उद्धरण",
   "Random": "Random",
@@ -4989,7 +4986,6 @@
   "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_field_is_required": "फ़ील्ड %s आवश्यक है.",
   "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": "मोबाइल सूचनाएं सभी उपयोगकर्ताओं के लिए अक्षम कर दी गई थीं, पुश गेटवे को फिर से सक्षम करने के लिए \"एडमिन > पुश\" पर जाएं",
@@ -6136,4 +6132,4 @@
   "Unlimited_seats": "असीमित सीटें",
   "Unlimited_MACs": "असीमित एमएसी",
   "Unlimited_seats_MACs": "असीमित सीटें और एमएसी"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/hr.i18n.json b/packages/i18n/src/locales/hr.i18n.json
index 84c4295d5201..c9547b1042e9 100644
--- a/packages/i18n/src/locales/hr.i18n.json
+++ b/packages/i18n/src/locales/hr.i18n.json
@@ -2501,7 +2501,6 @@
   "The_application_name_is_required": "Naziv aplikacije je potreban",
   "The_channel_name_is_required": "Ime sobe je potrebno",
   "The_emails_are_being_sent": "E-mailovi su poslani.",
-  "The_field_is_required": "Polje %s je traženo.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Promjena veličine slike neće raditi, jer ne možemo provjeriti da je ImageMagick ili GraphicsMagick instaliran na vašem poslužitelju.",
   "The_redirectUri_is_required": "RedirectUri je potrebno",
   "The_server_will_restart_in_s_seconds": "Poslužitelj će se ponovno pokrenuti u %s sekundi",
diff --git a/packages/i18n/src/locales/hu.i18n.json b/packages/i18n/src/locales/hu.i18n.json
index f7f85536c183..a281e3b2c64b 100644
--- a/packages/i18n/src/locales/hu.i18n.json
+++ b/packages/i18n/src/locales/hu.i18n.json
@@ -4540,8 +4540,7 @@
   "The_application_name_is_required": "Az alkalmazás neve kötelező",
   "The_channel_name_is_required": "A csatorna neve kötelező",
   "The_emails_are_being_sent": "Az e-mailek elküldésre kerültek.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Az üres <span style=\"font-weight: bold;\">{{roomName}}</span> szoba automatikusan el lesz távolítva.",
-  "The_field_is_required": "A(z) %s mező kötelező.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Az üres <span style=\"font-weight: bold;\">{{roomName}}</span> szoba automatikusan el lesz távolítva.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "A kép átméretezése nem fog működni, mert nem észlelhető a kiszolgálóra telepített ImageMagick vagy GraphicsMagick program.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Az üzenet egy megbeszélés, nem lesz képes helyreállítani az üzeneteket!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "A mobil értesítések le lettek tiltva az összes felhasználó számára. Menjen az „Adminisztráció → Leküldés” menüponthoz a leküldéses átjáró újbóli engedélyezéséhez.",
diff --git a/packages/i18n/src/locales/id.i18n.json b/packages/i18n/src/locales/id.i18n.json
index 1abc2fadd68c..6eb8dd75ec6e 100644
--- a/packages/i18n/src/locales/id.i18n.json
+++ b/packages/i18n/src/locales/id.i18n.json
@@ -2374,7 +2374,6 @@
   "The_application_name_is_required": "Nama aplikasi diperlukan",
   "The_channel_name_is_required": "Nama channel diperlukan",
   "The_emails_are_being_sent": "Email telah dikirim.",
-  "The_field_is_required": "Kolom %s wajib diisi",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Gambar resize tidak akan bekerja karena kita tidak dapat mendeteksi ImageMagick atau GraphicsMagick diinstal pada server Anda.",
   "The_redirectUri_is_required": "The redirectUri diperlukan",
   "The_server_will_restart_in_s_seconds": "server akan restart%s detik",
diff --git a/packages/i18n/src/locales/it.i18n.json b/packages/i18n/src/locales/it.i18n.json
index 160dbe3cf40e..f4bbf05e2faf 100644
--- a/packages/i18n/src/locales/it.i18n.json
+++ b/packages/i18n/src/locales/it.i18n.json
@@ -2920,8 +2920,7 @@
   "Thank_you_for_your_feedback": "Grazie per il tuo feedback",
   "The_application_name_is_required": "Il nome dell'applicazione è richiesta",
   "The_channel_name_is_required": "Il nome del canale è richiesto",
-  "The_emails_are_being_sent": "Le email verranno inviate.",
-  "The_field_is_required": "Il campo %s è richiesto.",
+  "The_emails_are_being_sent": "Le email verranno inviate.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Il ridimensionamento dell'immagine non funzionerà se non rileva ImageMagick or GraphicsMagick installato sul tuo server.",
   "The_redirectUri_is_required": "Il redirectUri é richiesto",
   "The_server_will_restart_in_s_seconds": "Il server si riavvierà in %s secondi",
diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json
index 982f9495d914..dcdf00bf7ed6 100644
--- a/packages/i18n/src/locales/ja.i18n.json
+++ b/packages/i18n/src/locales/ja.i18n.json
@@ -4070,8 +4070,7 @@
   "The_application_name_is_required": "アプリケーション名は必須です",
   "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_field_is_required": "%s 項目は、必須です。",
+  "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またはGraphicsMagickを検出できないため、画像のサイズ変更が機能しません。",
   "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": "すべてのユーザーに対してモバイル通知が無効になりました。［管理］>［プッシュ］に移動して、プッシュゲートウェイを再度有効にしてください",
diff --git a/packages/i18n/src/locales/ka-GE.i18n.json b/packages/i18n/src/locales/ka-GE.i18n.json
index 3c550632cc4c..8f2098ff495f 100644
--- a/packages/i18n/src/locales/ka-GE.i18n.json
+++ b/packages/i18n/src/locales/ka-GE.i18n.json
@@ -3165,7 +3165,6 @@
   "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_field_is_required": "ველი %s აუცილებელია.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "სურათის ზომის შეცვლა არ იმუშავებს, რადგან ჩვენ ვერ ვპოულობთ თქვენს სერვერზე დაყენებულ ImageMagick ან GraphicsMagick-ს.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "შეტყობინება არის განხილვა და თქვენ ვერ შეძლებთ შეტყობინებების აღდგენას",
   "The_redirectUri_is_required": "გადამისამართების ლინკია საჭირო",
diff --git a/packages/i18n/src/locales/km.i18n.json b/packages/i18n/src/locales/km.i18n.json
index 997ee66a00e7..8927c7f3335b 100644
--- a/packages/i18n/src/locales/km.i18n.json
+++ b/packages/i18n/src/locales/km.i18n.json
@@ -2691,8 +2691,7 @@
   "Thank_you_for_your_feedback": "សូមអរគុណសម្រាប់មតិរបស់អ្នក",
   "The_application_name_is_required": "ឈ្មោះកម្មវិធីនេះគឺត្រូវបានទាមទារ",
   "The_channel_name_is_required": "ឈ្មោះឆានែលនេះគឺត្រូវបានទាមទារ",
-  "The_emails_are_being_sent": "នេះ​អ៊ីមែល​ត្រូវ​បាន​បញ្ជូន​។",
-  "The_field_is_required": "ចន្លោះ %s ត្រូវ​បំពេញ",
+  "The_emails_are_being_sent": "នេះ​អ៊ីមែល​ត្រូវ​បាន​បញ្ជូន​។",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ប្ដូរទំហំរូបភាពនឹងមិនធ្វើការដោយសារតែយើងមិនអាចរកឃើញ ImageMagick ឬ GraphicsMagick ដែលបានដំឡើងនៅលើម៉ាស៊ីនបម្រើរបស់អ្នក។",
   "The_redirectUri_is_required": "redirectUri នេះគឺត្រូវបានទាមទារ",
   "The_server_will_restart_in_s_seconds": "ម៉ាស៊ីនបម្រើនេះនឹងចាប់ផ្ដើមឡើងវិញនៅក្នុង %s វិនាទី",
diff --git a/packages/i18n/src/locales/ko.i18n.json b/packages/i18n/src/locales/ko.i18n.json
index ad5818ab9f85..5df1f0db78ba 100644
--- a/packages/i18n/src/locales/ko.i18n.json
+++ b/packages/i18n/src/locales/ko.i18n.json
@@ -3470,8 +3470,7 @@
   "The_application_name_is_required": "응용프로그램명이 필요합니다.",
   "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_field_is_required": "%s 필드는 필수 항목입니다.",
+  "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 또는 GraphicMagick이 설치되어 있지 않아 이미지 크기를 재조정할 수 없습니다.",
   "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": "모바일 알림이 모든 사용자에게 사용 중지되었습니다. \"관리자> 푸시\"로 이동하여 푸시 게이트웨이를 다시 사용으로 변경하십시오.",
diff --git a/packages/i18n/src/locales/ku.i18n.json b/packages/i18n/src/locales/ku.i18n.json
index 9b4a4d1aaeb2..a4c5e7108a2f 100644
--- a/packages/i18n/src/locales/ku.i18n.json
+++ b/packages/i18n/src/locales/ku.i18n.json
@@ -2360,8 +2360,7 @@
   "Thank_you_for_your_feedback": "Spas ji bo we Deng xwe",
   "The_application_name_is_required": "Navê sepanê pêwîst e",
   "The_channel_name_is_required": "The name kanala pêwîst e",
-  "The_emails_are_being_sent": "Mailan têne şandin.",
-  "The_field_is_required": "Li qadê %s tê xwestin.",
+  "The_emails_are_being_sent": "Mailan têne şandin.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Mezinahiyê image xebata wê ne ji ber ku em nikarin bi durustî .Pêşîn an GraphicsMagick li ser server te sazkirin.",
   "The_redirectUri_is_required": "The redirectUri pêwîst e",
   "The_server_will_restart_in_s_seconds": "ڕاژەکارەکە هەڵ ئەبێتەوە لە %s چرکەدا",
diff --git a/packages/i18n/src/locales/lo.i18n.json b/packages/i18n/src/locales/lo.i18n.json
index d427b251e863..547e9274a6ff 100644
--- a/packages/i18n/src/locales/lo.i18n.json
+++ b/packages/i18n/src/locales/lo.i18n.json
@@ -2403,8 +2403,7 @@
   "Thank_you_for_your_feedback": "ຂໍ​ຂອບ​ໃຈ​ທ່ານ​ສໍາ​ລັບ​ການ​ຕໍາ​ນິ​ຕິ​ຊົມ​ຂອງ​ທ່ານ​",
   "The_application_name_is_required": "ຊື່ຄໍາຮ້ອງສະຫມັກແມ່ນຈໍາເປັນຕ້ອງ",
   "The_channel_name_is_required": "ຊື່ຊ່ອງທາງການຈໍາເປັນຕ້ອງ",
-  "The_emails_are_being_sent": "ອີເມວໄດ້ຖືກສົ່ງໄປແລ້ວ.",
-  "The_field_is_required": "ພາກສະຫນາມ %s ແມ່ນຕ້ອງການ.",
+  "The_emails_are_being_sent": "ອີເມວໄດ້ຖືກສົ່ງໄປແລ້ວ.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ການ resize ຮູບພາບຈະບໍ່ເຮັດວຽກເພາະວ່າພວກເຮົາບໍ່ສາມາດກວດພົບ ImageMagick ຫຼື GraphicsMagick ການຕິດຕັ້ງໃນເຄື່ອງແມ່ຂ່າຍຂອງທ່ານ.",
   "The_redirectUri_is_required": "The redirectUri ຈໍາເປັນຕ້ອງມີ",
   "The_server_will_restart_in_s_seconds": "ເຄື່ອງແມ່ຂ່າຍຂອງຈະເລີ່ມການເຮັດວຽກໃນ %s ວິນາທີ",
diff --git a/packages/i18n/src/locales/lt.i18n.json b/packages/i18n/src/locales/lt.i18n.json
index 88fb66dc554f..7408a8eeb762 100644
--- a/packages/i18n/src/locales/lt.i18n.json
+++ b/packages/i18n/src/locales/lt.i18n.json
@@ -2421,8 +2421,7 @@
   "Thank_you_for_your_feedback": "Dėkojame už jūsų atsiliepimus",
   "The_application_name_is_required": "Būtina nurodyti programos pavadinimą",
   "The_channel_name_is_required": "Reikalingas kanalo pavadinimas",
-  "The_emails_are_being_sent": "El. Laiškai siunčiami.",
-  "The_field_is_required": "Laukas%s reikalingas.",
+  "The_emails_are_being_sent": "El. Laiškai siunčiami.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Vaizdo dydžio keitimas neveiks, nes negalime nustatyti serverio \"ImageMagick\" ar \"GraphicsMagick\".",
   "The_redirectUri_is_required": "Reikia redirectUri",
   "The_server_will_restart_in_s_seconds": "Serveris bus paleistas iš naujo po%s sekundžių",
diff --git a/packages/i18n/src/locales/lv.i18n.json b/packages/i18n/src/locales/lv.i18n.json
index 544eac3dbeb3..a9e38267b01c 100644
--- a/packages/i18n/src/locales/lv.i18n.json
+++ b/packages/i18n/src/locales/lv.i18n.json
@@ -2375,8 +2375,7 @@
   "Thank_you_for_your_feedback": "Paldies par jūsu atsauksmēm",
   "The_application_name_is_required": "Pieteikuma nosaukums ir nepieciešams",
   "The_channel_name_is_required": "Ir nepieciešams kanāla nosaukums",
-  "The_emails_are_being_sent": "E-pasta ziņojumi tiek nosūtīti.",
-  "The_field_is_required": "Nepieciešams %s lauks.",
+  "The_emails_are_being_sent": "E-pasta ziņojumi tiek nosūtīti.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Attēla izmēru maiņa nestrādās, jo mēs nevaram atrast jūsu serverī uzinstalētu ImageMagick vai GraphicsMagick.",
   "The_redirectUri_is_required": "Nepieciešams RedirectUri ",
   "The_server_will_restart_in_s_seconds": "Serveris restartēsies pēc %s sekundēm",
diff --git a/packages/i18n/src/locales/mn.i18n.json b/packages/i18n/src/locales/mn.i18n.json
index 60e18063b49f..407c86309db8 100644
--- a/packages/i18n/src/locales/mn.i18n.json
+++ b/packages/i18n/src/locales/mn.i18n.json
@@ -2361,8 +2361,7 @@
   "Thank_you_for_your_feedback": "Таны санал хүсэлтэнд баярлалаа",
   "The_application_name_is_required": "Програмын нэр шаардлагатай",
   "The_channel_name_is_required": "Сувгийн нэр шаардлагатай",
-  "The_emails_are_being_sent": "Э-мэйл илгээж байна.",
-  "The_field_is_required": "%s талбар шаардлагатай.",
+  "The_emails_are_being_sent": "Э-мэйл илгээж байна.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ImageMagick эсвэл GraphicsMagick-г сервер дээрээ суулгаж чаддаггүй болохоор зургийн хэмжээг өөрчлөх боломжгүй.",
   "The_redirectUri_is_required": "RedirectUri шаардлагатай",
   "The_server_will_restart_in_s_seconds": "Сервер%s секундын дараа дахин эхлүүлэх болно",
diff --git a/packages/i18n/src/locales/ms-MY.i18n.json b/packages/i18n/src/locales/ms-MY.i18n.json
index 524260560a3f..9e203c69baf3 100644
--- a/packages/i18n/src/locales/ms-MY.i18n.json
+++ b/packages/i18n/src/locales/ms-MY.i18n.json
@@ -2372,8 +2372,7 @@
   "Thank_you_for_your_feedback": "Terima kasih atas maklum balas anda",
   "The_application_name_is_required": "Nama permohonan diperlukan",
   "The_channel_name_is_required": "Nama saluran diperlukan",
-  "The_emails_are_being_sent": "E-mel yang sedang dihantar.",
-  "The_field_is_required": "Medan ini %s diperlukan",
+  "The_emails_are_being_sent": "E-mel yang sedang dihantar.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "The saiz semula imej tidak akan berfungsi kerana kita tidak dapat mengesan ImageMagick atau GraphicsMagick dipasang pada pelayan anda.",
   "The_redirectUri_is_required": "The redirectUri diperlukan",
   "The_server_will_restart_in_s_seconds": "Server akan memulakan semula dalam %s saat",
diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json
index bf7f7ffb780c..9796181ae1bb 100644
--- a/packages/i18n/src/locales/nl.i18n.json
+++ b/packages/i18n/src/locales/nl.i18n.json
@@ -4109,8 +4109,7 @@
   "The_application_name_is_required": "De naam van de applicatie is vereist",
   "The_channel_name_is_required": "De naam van het kanaal is vereist",
   "The_emails_are_being_sent": "De e-mails worden verzonden.",
-  "The_empty_room__roomName__will_be_removed_automatically": "De lege kamer <span style=\"font-weight: bold;\">{{roomName}}</span> wordt automatisch verwijderd.",
-  "The_field_is_required": "Het veld %s is vereist.",
+  "The_empty_room__roomName__will_be_removed_automatically": "De lege kamer <span style=\"font-weight: bold;\">{{roomName}}</span> wordt automatisch verwijderd.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Het wijzigen van de grootte van de afbeelding zal niet werken omdat we ImageMagick of GraphicsMagick niet kunnen detecteren die op uw server zijn geïnstalleerd.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Het bericht is een discussie, u kunt de berichten niet herstellen!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "De mobiele meldingen werden voor alle gebruikers uitgeschakeld, ga naar \"Admin > Push\" om de Push Gateway weer in te schakelen",
diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json
index 5bdbf2fb89cc..a89485a5f6c3 100644
--- a/packages/i18n/src/locales/no.i18n.json
+++ b/packages/i18n/src/locales/no.i18n.json
@@ -3962,8 +3962,7 @@
   "The_application_name_is_required": "Programnavnet kreves",
   "The_application_will_be_able_to": "<1>{{appName}}</1> vil kunne:",
   "The_channel_name_is_required": "Kanalnavnet er påkrevd",
-  "The_emails_are_being_sent": "E-postene blir sendt.",
-  "The_field_is_required": "Feltet%s er påkrevd.",
+  "The_emails_are_being_sent": "E-postene blir sendt.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Bildestørrelsen fungerer ikke fordi vi ikke kan oppdage ImageMagick eller GraphicsMagick installert på serveren din.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meldingen er en diskusjon, du vil ikke kunne gjenopprette meldingene!",
   "The_necessary_browser_permissions_for_location_sharing_are_not_granted": "De nødvendige nettlesertillatelsene for posisjonsdeling ble ikke gitt",
diff --git a/packages/i18n/src/locales/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json
index b7d60c54ee2c..e909624ad4a9 100644
--- a/packages/i18n/src/locales/pl.i18n.json
+++ b/packages/i18n/src/locales/pl.i18n.json
@@ -4543,8 +4543,7 @@
   "The_application_name_is_required": "Wymagana jest nazwa aplikacji",
   "The_channel_name_is_required": "Wymagana jest nazwa pokoju",
   "The_emails_are_being_sent": "Wiadomości e-mail są wysyłane.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Pusty pokój <span style=\"font-weight: bold;\">{{roomName}}</span> zostanie automatycznie usunięty.",
-  "The_field_is_required": "Pole %s jest wymagane.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Pusty pokój <span style=\"font-weight: bold;\">{{roomName}}</span> zostanie automatycznie usunięty.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Zmiana rozmiaru obrazu nie będzie działać, ponieważ nie możemy wykryć zainstalowanego ImageMagick lub GraphicsMagick na serwerze.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Wiadomość jest dyskusją, której nie będziesz w stanie odzyskać!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Powiadomienia mobilne zostały wyłączone dla wszystkich użytkowników, idź do \"Admin>Push\" aby uruchomić ponownie bramę push",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index c1ebbc28ca3b..b2575a190671 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -833,6 +833,7 @@
   "Channels_list": "Lista de canais públicos",
   "Channel_what_is_this_channel_about": "Sobre o que é este canal?",
   "Chart": "Gráfico",
+  "Chats": "Conversas",
   "Chat_button": "Botão da conversa",
   "Chat_close": "Fechar conversa",
   "Chat_closed": "Conversa encerrada",
@@ -1735,6 +1736,7 @@
   "error-invalid-custom-field": "Campo personalizado inválido",
   "error-invalid-custom-field-name": "Nome inválido para o campo personalizado. Use apenas letras, números, hífens e travessão.",
   "error-invalid-custom-field-value": "Valor inválido para o campo {{field}}",
+  "error-custom-field-not-allowed": "O campo personalizado {{key}} não é permitido",
   "error-invalid-date": "Data fornecida inválida",
   "error-invalid-description": "Descrição inválida",
   "error-invalid-domain": "Domínio inválido",
@@ -4221,8 +4223,7 @@
   "The_application_name_is_required": "O nome do aplicativo é obrigatório",
   "The_channel_name_is_required": "O nome do canal é obrigatório",
   "The_emails_are_being_sent": "Os e-mails estão sendo enviados.",
-  "The_empty_room__roomName__will_be_removed_automatically": "A sala vazia <span style=\"font-weight: bold;\">{{roomName}}</span> será removida automaticamente.",
-  "The_field_is_required": "O campo %s é obrigatório.",
+  "The_empty_room__roomName__will_be_removed_automatically": "A sala vazia <span style=\"font-weight: bold;\">{{roomName}}</span> será removida automaticamente.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "O redimensionamento da imagem não vai funcionar porque não conseguimos detectar se o ImageMagick ou GraphicsMagick está instalado no seu servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "A mensagem é uma discussão, você não poderá recuperar as mensagens!",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "As notificações móveis foram desativadas para todos os usuários, vá para  \"Admin > Push\" para ativar o Push Gateway novamente",
@@ -4677,6 +4678,8 @@
   "view-joined-room": "Ver sala incorporada",
   "view-joined-room_description": "Permissão para ver os canais atualmente associados",
   "view-l-room": "Ver salas de omnichannel",
+  "create-livechat-contact": "Criar contatos do omnichannel",
+  "update-livechat-contact": "Atualizar contatos do omnichannel",
   "view-l-room_description": "Permissão para ver salas de omnichannel",
   "view-livechat-analytics": "Ver a análise do omnichannel",
   "onboarding.page.awaitingConfirmation.subtitle": "Enviamos um e-mail para {{emailAddress}} com um link de confirmação. Verifique se o código de segurança abaixo coincide com o do e-mail.",
diff --git a/packages/i18n/src/locales/pt.i18n.json b/packages/i18n/src/locales/pt.i18n.json
index 8f4acc81dbdd..84d840b92a53 100644
--- a/packages/i18n/src/locales/pt.i18n.json
+++ b/packages/i18n/src/locales/pt.i18n.json
@@ -2729,8 +2729,7 @@
   "Thank_you_for_your_feedback": "Obrigado pelo sua opinião",
   "The_application_name_is_required": "O nome da aplicação é obrigatório",
   "The_channel_name_is_required": "O nome do canal é obrigatório",
-  "The_emails_are_being_sent": "Os emails estão a ser enviados.",
-  "The_field_is_required": "O campo %s é obrigatório.",
+  "The_emails_are_being_sent": "Os emails estão a ser enviados.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "O redimensionamento da imagem não vai funcionar porque não conseguimos detectar ImageMagick ou GraphicsMagick instalado no seu servidor.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "A mensagem é uma discussão, não poderá recuperar as mensagens!",
   "The_peer__peer__does_not_exist": "O par <em>{{peer}}</em> não existe.",
diff --git a/packages/i18n/src/locales/ro.i18n.json b/packages/i18n/src/locales/ro.i18n.json
index aefc4d07065f..7266b1883386 100644
--- a/packages/i18n/src/locales/ro.i18n.json
+++ b/packages/i18n/src/locales/ro.i18n.json
@@ -2364,8 +2364,7 @@
   "Thank_you_for_your_feedback": "Vă mulțumim pentru feedback",
   "The_application_name_is_required": "Este nevoie de numele aplicației",
   "The_channel_name_is_required": "Este nevoie de numele canalului",
-  "The_emails_are_being_sent": "E-mail-urile sunt trimise.",
-  "The_field_is_required": "Este nevoie de câmpul %s.",
+  "The_emails_are_being_sent": "E-mail-urile sunt trimise.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Redimensionarea imaginii nu va funcționa, deoarece nu putem detecta ImageMagick sau GraphicsMagick instalat pe server.",
   "The_redirectUri_is_required": "URI de redirectare este necesar",
   "The_server_will_restart_in_s_seconds": "Serverul va reporni în %s secunde",
diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
index 1829f7f2eb08..6edc8030513f 100644
--- a/packages/i18n/src/locales/ru.i18n.json
+++ b/packages/i18n/src/locales/ru.i18n.json
@@ -4294,8 +4294,7 @@
   "The_application_name_is_required": "Требуется название приложения",
   "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_field_is_required": "Поле %s обязательно.",
+  "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 или GraphicsMagick.",
   "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": "Мобильные уведомления были отключены для всех пользователей, перейдите в \"Admin > Push\", чтобы снова включить Push Gateway",
diff --git a/packages/i18n/src/locales/sk-SK.i18n.json b/packages/i18n/src/locales/sk-SK.i18n.json
index f5bc7bfcbc58..d6cf085ad972 100644
--- a/packages/i18n/src/locales/sk-SK.i18n.json
+++ b/packages/i18n/src/locales/sk-SK.i18n.json
@@ -2375,8 +2375,7 @@
   "Thank_you_for_your_feedback": "Ďakujeme vám za vašu spätnú väzbu",
   "The_application_name_is_required": "Názov aplikácie je povinný",
   "The_channel_name_is_required": "Názov kanála je povinný",
-  "The_emails_are_being_sent": "Posielajú sa e-maily.",
-  "The_field_is_required": "Je potrebné pole%s.",
+  "The_emails_are_being_sent": "Posielajú sa e-maily.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Zmena veľkosti obrázka nebude fungovať, pretože na vašom serveri nemôžeme nájsť aplikácie ImageMagick alebo GraphicsMagick.",
   "The_redirectUri_is_required": "Vyžaduje sa presmerovanie",
   "The_server_will_restart_in_s_seconds": "Server sa reštartuje v%s",
diff --git a/packages/i18n/src/locales/sl-SI.i18n.json b/packages/i18n/src/locales/sl-SI.i18n.json
index 668bb94dc2c5..64900b03860d 100644
--- a/packages/i18n/src/locales/sl-SI.i18n.json
+++ b/packages/i18n/src/locales/sl-SI.i18n.json
@@ -2355,8 +2355,7 @@
   "Thank_you_for_your_feedback": "Hvala za vaše mnenje",
   "The_application_name_is_required": "Ime aplikacije je obvezno",
   "The_channel_name_is_required": "Ime kanala je obvezno",
-  "The_emails_are_being_sent": "Pošiljanje e-poštnih sporočil.",
-  "The_field_is_required": "Polje %s je obvezno.",
+  "The_emails_are_being_sent": "Pošiljanje e-poštnih sporočil.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Velikost slike ne bo delovala, ker ne moremo zaznati ImageMagick ali GraphicsMagick, nameščenega na vašem strežniku.",
   "The_redirectUri_is_required": "Preusmeritveni uri (redirectUri) je zahtevan",
   "The_server_will_restart_in_s_seconds": "Strežnik se bo znova zagnal v %s sekundah",
diff --git a/packages/i18n/src/locales/sq.i18n.json b/packages/i18n/src/locales/sq.i18n.json
index 312494da2e8d..c5fb06df9529 100644
--- a/packages/i18n/src/locales/sq.i18n.json
+++ b/packages/i18n/src/locales/sq.i18n.json
@@ -2365,8 +2365,7 @@
   "Thank_you_for_your_feedback": "Faleminderit për komentin tuaj",
   "The_application_name_is_required": "Emri i aplikimit është e nevojshme",
   "The_channel_name_is_required": "Emri kanal është e nevojshme",
-  "The_emails_are_being_sent": "Email janë duke u dërguar.",
-  "The_field_is_required": "Fusha %s është e nevojshme.",
+  "The_emails_are_being_sent": "Email janë duke u dërguar.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Imazhi resize nuk do të funksionojë, sepse ne nuk mund të zbulojë ImageMagick ose GraphicsMagick instaluar në serverin tuaj.",
   "The_redirectUri_is_required": "RedirectUri është e nevojshme",
   "The_server_will_restart_in_s_seconds": "Serveri do të rifillojë në %s sekonda",
diff --git a/packages/i18n/src/locales/sr.i18n.json b/packages/i18n/src/locales/sr.i18n.json
index e26e8bd3862f..d60ff9ce80fe 100644
--- a/packages/i18n/src/locales/sr.i18n.json
+++ b/packages/i18n/src/locales/sr.i18n.json
@@ -2170,8 +2170,7 @@
   "Thank_you_for_your_feedback": "Хвала на повратним информацијама",
   "The_application_name_is_required": "Име апликације је потребно",
   "The_channel_name_is_required": "Име канала је потребно",
-  "The_emails_are_being_sent": "Е-поруке се шаљу.",
-  "The_field_is_required": "је обавезно поље %s.",
+  "The_emails_are_being_sent": "Е-поруке се шаљу.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Ресизе слика неће радити, јер не можемо открити ИмагеМагицк или грапхицсмагицк инсталиран на вашем серверу.",
   "The_redirectUri_is_required": "РедирецтУри је потребна",
   "The_server_will_restart_in_s_seconds": "Сервер ће се поново покренути у %s секунди",
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index 4e436fe6c538..4f091bb77fa5 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -4735,8 +4735,7 @@
   "The_application_will_be_able_to": "<1>{{appName}}</1> kommer att kunna:",
   "The_channel_name_is_required": "Kanalnamnet krävs ",
   "The_emails_are_being_sent": "E-postmeddelandena  skickas.",
-  "The_empty_room__roomName__will_be_removed_automatically": "Det tomma rummet <span style=\"font-weight: bold;\">{{roomName}}</span> tas bort automatiskt.",
-  "The_field_is_required": "Fältet %s krävs.",
+  "The_empty_room__roomName__will_be_removed_automatically": "Det tomma rummet <span style=\"font-weight: bold;\">{{roomName}}</span> tas bort automatiskt.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Det kommer inte att gå att ändra storlek på bilden, eftersom vi inte kan hitta ImageMagick eller GraphicsMagick på din server.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meddelandet är en diskussion. Du kan inte återskapa meddelandena.",
   "The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilaviseringar inaktiverades för alla användare. Gå till \"Administration > Push\" om du vill aktivera en gateway för pushmeddelanden igen",
diff --git a/packages/i18n/src/locales/ta-IN.i18n.json b/packages/i18n/src/locales/ta-IN.i18n.json
index 7a2c562d4fff..c4c941c40d7b 100644
--- a/packages/i18n/src/locales/ta-IN.i18n.json
+++ b/packages/i18n/src/locales/ta-IN.i18n.json
@@ -2366,7 +2366,6 @@
   "The_application_name_is_required": "விண்ணப்ப பெயர் தேவை",
   "The_channel_name_is_required": "சேனல் பெயர் தேவைப்படுகிறது",
   "The_emails_are_being_sent": "மின்னஞ்சல்களை அனுப்பி வைக்கப்படுகின்றனர்.",
-  "The_field_is_required": "துறையில்% கள் தேவை.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "நாங்கள் ImageMagick அல்லது GraphicsMagick உங்கள் சர்வரில் நிறுவப்பட்ட கண்டறிய முடியாது, ஏனெனில் படஅளவை இயங்காது.",
   "The_redirectUri_is_required": "redirecturi தேவை",
   "The_server_will_restart_in_s_seconds": "சர்வர் %s வினாடிகள் மீண்டும் தொடங்கும்",
diff --git a/packages/i18n/src/locales/th-TH.i18n.json b/packages/i18n/src/locales/th-TH.i18n.json
index 7d393a3034fb..520f6ce3a20f 100644
--- a/packages/i18n/src/locales/th-TH.i18n.json
+++ b/packages/i18n/src/locales/th-TH.i18n.json
@@ -2359,8 +2359,7 @@
   "Thank_you_for_your_feedback": "ขอบคุณสำหรับความคิดเห็นของคุณ",
   "The_application_name_is_required": "ต้องระบุชื่อแอ็พพลิเคชัน",
   "The_channel_name_is_required": "ต้องระบุชื่อช่อง",
-  "The_emails_are_being_sent": "กำลังส่งอีเมล",
-  "The_field_is_required": "ต้องระบุฟิลด์%s",
+  "The_emails_are_being_sent": "กำลังส่งอีเมล",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "การปรับขนาดภาพจะไม่ทำงานเนื่องจากเราไม่สามารถตรวจพบ ImageMagick หรือ GraphicsMagick ที่ติดตั้งบนเซิร์ฟเวอร์ของคุณ",
   "The_redirectUri_is_required": "จำเป็นต้องมี redirectUri",
   "The_server_will_restart_in_s_seconds": "เซิร์ฟเวอร์จะรีสตาร์ทเป็น %s วินาที",
diff --git a/packages/i18n/src/locales/tr.i18n.json b/packages/i18n/src/locales/tr.i18n.json
index 59b0c8927e23..c3e879031912 100644
--- a/packages/i18n/src/locales/tr.i18n.json
+++ b/packages/i18n/src/locales/tr.i18n.json
@@ -2801,8 +2801,7 @@
   "Thank_you_for_your_feedback": "Görüşleriniz için teşekkür ederiz",
   "The_application_name_is_required": "Uygulama adı gerekli",
   "The_channel_name_is_required": "Kanal adı gerekli",
-  "The_emails_are_being_sent": "E-postalar gönderiliyor.",
-  "The_field_is_required": "%s alanı gerekli.",
+  "The_emails_are_being_sent": "E-postalar gönderiliyor.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Biz ImageMagick veya GraphicsMagick sunucunuzda yüklü algılayamaz çünkü resim boyutlandırmak çalışmaz.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Bu ileti bir tartışma olduğu için iletileri geri getiremeyeceksiniz!",
   "The_peer__peer__does_not_exist": "<em>{{peer}}</em> adında bir eş yok.",
diff --git a/packages/i18n/src/locales/ug.i18n.json b/packages/i18n/src/locales/ug.i18n.json
index 78c3650e0038..b576cd5102cd 100644
--- a/packages/i18n/src/locales/ug.i18n.json
+++ b/packages/i18n/src/locales/ug.i18n.json
@@ -1045,8 +1045,7 @@
   "Thank_you_for_your_feedback": "سىزنىڭ ئىنكاسىڭىزگە كۆپتىن كۆپ رەھمەت",
   "The_application_name_is_required": "ئەپنىڭ ئىسمىنى چوقۇم تولدۇرىسىز",
   "The_channel_name_is_required": "قانالنىڭ ئىسمىنى چوقۇم تولدۇرۇڭ",
-  "The_emails_are_being_sent": "ئىلخەت يوللاندى",
-  "The_field_is_required": "چوقۇم تولدۇرۇڭ%sخەت بۆلىكى",
+  "The_emails_are_being_sent": "ئىلخەت يوللاندى",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "تاپالمىدۇق.GraphicsMagickنى ياكىImageMagick رەسىمنىڭ چوڭ كىچىكلىكىنى ئۆزگەرتكىلى بولمىدى، چۈنكى بىز مۇلازىمتېردا قاچىلىنىپ بولغان",
   "The_redirectUri_is_required": "چوقۇم تولدۇرۇڭURIسەكرەپ يۆتكەلگەن",
   "The_server_will_restart_in_s_seconds": "سېكۇنتتىن كېيىن قايتىدىن قوزغىتىلىدۇ %s مۇلازىمىتېر",
diff --git a/packages/i18n/src/locales/uk.i18n.json b/packages/i18n/src/locales/uk.i18n.json
index b8e27a4f8c34..eb2b8542d4e3 100644
--- a/packages/i18n/src/locales/uk.i18n.json
+++ b/packages/i18n/src/locales/uk.i18n.json
@@ -2911,8 +2911,7 @@
   "Thank_you_for_your_feedback": "Спасибі за ваш відгук",
   "The_application_name_is_required": "Ім'я програми потрібен",
   "The_channel_name_is_required": "Назва каналу потрібно",
-  "The_emails_are_being_sent": "Електронні листи відправляються.",
-  "The_field_is_required": "Поле %s потрібно.",
+  "The_emails_are_being_sent": "Електронні листи відправляються.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Зміни розміру зображення не буде працювати, тому що ми не можемо виявити ImageMagick або GraphicsMagick встановлений на вашому сервері.",
   "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Повідомлення - це обговорення яке ви не зможете відновити!",
   "The_redirectUri_is_required": "RedirectUri потрібно",
diff --git a/packages/i18n/src/locales/vi-VN.i18n.json b/packages/i18n/src/locales/vi-VN.i18n.json
index bf073e9c6aee..e4ff1343a079 100644
--- a/packages/i18n/src/locales/vi-VN.i18n.json
+++ b/packages/i18n/src/locales/vi-VN.i18n.json
@@ -2465,8 +2465,7 @@
   "Thank_you_for_your_feedback": "Cảm ơn phản hồi của bạn",
   "The_application_name_is_required": "Tên ứng dụng là bắt buộc",
   "The_channel_name_is_required": "Tên kênh là bắt buộc",
-  "The_emails_are_being_sent": "Các email đang được gửi.",
-  "The_field_is_required": "Trường%s là bắt buộc.",
+  "The_emails_are_being_sent": "Các email đang được gửi.",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Thay đổi kích thước hình ảnh sẽ không hoạt động vì chúng tôi không thể phát hiện ImageMagick hoặc GraphicsMagick được cài đặt trên máy chủ của bạn.",
   "The_redirectUri_is_required": "RedirectUri là bắt buộc",
   "The_server_will_restart_in_s_seconds": "Máy chủ sẽ khởi động lại trong%s giây",
diff --git a/packages/i18n/src/locales/zh-HK.i18n.json b/packages/i18n/src/locales/zh-HK.i18n.json
index e9821173dc0c..2da4905ae336 100644
--- a/packages/i18n/src/locales/zh-HK.i18n.json
+++ b/packages/i18n/src/locales/zh-HK.i18n.json
@@ -2392,8 +2392,7 @@
   "Thank_you_for_your_feedback": "感谢您的反馈意见",
   "The_application_name_is_required": "应用程序名称是必需的",
   "The_channel_name_is_required": "频道名称是必需的",
-  "The_emails_are_being_sent": "电子邮件正在发送。",
-  "The_field_is_required": "字段 %s 必须填写。",
+  "The_emails_are_being_sent": "电子邮件正在发送。",   
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "图像大小调整不起作用，因为我们无法检测到服务器上安装的ImageMagick或GraphicsMagick。",
   "The_redirectUri_is_required": "redirectUri是必需的",
   "The_server_will_restart_in_s_seconds": "服务器将以％s秒为单位重新启动",
diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json
index 741132996be6..7b8dc7495a84 100644
--- a/packages/i18n/src/locales/zh-TW.i18n.json
+++ b/packages/i18n/src/locales/zh-TW.i18n.json
@@ -3896,8 +3896,7 @@
   "The_application_name_is_required": "應用程式名稱是必需的",
   "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_field_is_required": "欄位 %s 必填",
+  "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 或 GraphicsMagick 工具",
   "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": "所有使用者都停用了手機通知，請到“管理>推送”以再次啟用推送閘道",
diff --git a/packages/i18n/src/locales/zh.i18n.json b/packages/i18n/src/locales/zh.i18n.json
index 323da5954332..f3e8c2e0fc9e 100644
--- a/packages/i18n/src/locales/zh.i18n.json
+++ b/packages/i18n/src/locales/zh.i18n.json
@@ -3556,8 +3556,7 @@
   "The_application_name_is_required": "应用名称必填",
   "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_field_is_required": "字段 %s 必填",
+  "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 或 GraphicsMagick 。",
   "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": "所有用户的移动端通知都已禁用。前往 “管理 > 推送” 再次启用推送网关",
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 71a1ba83c2ca..309a0b4d575c 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @rocket.chat/instance-status
 
+## 0.1.8-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.6
+  </details>
+
+## 0.1.8-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.5
+  </details>
+
+## 0.1.8-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.4
+  </details>
+
+## 0.1.8-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.3
+  </details>
+
+## 0.1.8-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.3.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index e95b6ef11489..77d762f46c3e 100644
--- a/packages/instance-status/package.json
+++ b/packages/instance-status/package.json
@@ -1,13 +1,13 @@
 {
 	"name": "@rocket.chat/instance-status",
-	"version": "0.1.7",
+	"version": "0.1.8-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
 		"mongodb": "^4.17.2",
 		"prettier": "~2.8.8",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/jest-presets/package.json b/packages/jest-presets/package.json
index e6c0c9197bce..64a511b3de5c 100644
--- a/packages/jest-presets/package.json
+++ b/packages/jest-presets/package.json
@@ -13,7 +13,7 @@
 		"/server"
 	],
 	"dependencies": {
-		"@swc/core": "~1.7.4",
+		"@swc/core": "~1.7.26",
 		"@swc/jest": "~0.2.36",
 		"@testing-library/jest-dom": "~6.4.8",
 		"@types/jest-axe": "~3.5.9",
@@ -25,12 +25,12 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
-		"@types/identity-obj-proxy": "^3",
-		"@types/jest": "~29.5.12",
-		"@types/uuid": "^9",
+		"@types/identity-obj-proxy": "^3.0.2",
+		"@types/jest": "~29.5.13",
+		"@types/uuid": "^9.0.8",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.4.5"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/jwt/package.json b/packages/jwt/package.json
index a6d989e2c275..7235a916385d 100644
--- a/packages/jwt/package.json
+++ b/packages/jwt/package.json
@@ -4,10 +4,10 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc",
diff --git a/packages/livechat/.storybook/main.ts b/packages/livechat/.storybook/main.ts
index 8809ce6be899..8103755e748d 100644
--- a/packages/livechat/.storybook/main.ts
+++ b/packages/livechat/.storybook/main.ts
@@ -30,7 +30,7 @@ const config: StorybookConfig = {
 			[require.resolve('../src/lib/uiKit')]: require.resolve('./mocks/uiKit.ts'),
 		};
 
-		const isRuleSetRule = (rule: any): rule is RuleSetRule => typeof rule === 'object' && rule.test && rule.use;
+		const isRuleSetRule = (rule: any): rule is RuleSetRule => typeof rule === 'object';
 
 		config.module.rules ??= [];
 
@@ -54,6 +54,15 @@ const config: StorybookConfig = {
 		}
 		urlLoader.test = /\.(webm|wav|m4a|aac|oga)(\?.*)?$/;
 
+		config.module.rules.push({
+			test: /\.mjs$/,
+			include: /node_modules/,
+			type: 'javascript/auto',
+			use: {
+				loader: require.resolve('babel-loader'),
+			},
+		});
+
 		config.module.rules.push({
 			test: /\.scss$/,
 			use: [
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 05ad7808e1b2..5758b87605d7 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,74 @@
 # @rocket.chat/livechat Change Log
 
+## 1.20.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.6
+  </details>
+
+## 1.20.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.5
+  </details>
+
+## 1.20.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.4
+  </details>
+
+## 1.20.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.3
+  </details>
+
+## 1.20.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@11.0.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 814913801dc5..14f077bb49b1 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.19.4",
+	"version": "1.20.0-rc.6",
 	"files": [
 		"/build"
 	],
@@ -25,7 +25,7 @@
 		"typecheck": "tsc -p tsconfig.typecheck.json"
 	},
 	"devDependencies": {
-		"@babel/eslint-parser": "~7.23.3",
+		"@babel/eslint-parser": "~7.23.10",
 		"@babel/preset-env": "~7.22.20",
 		"@babel/preset-typescript": "~7.22.15",
 		"@rocket.chat/core-typings": "workspace:^",
@@ -42,7 +42,7 @@
 		"@types/crypto-js": "~4.1.3",
 		"@types/markdown-it": "^14.0.1",
 		"@types/mini-css-extract-plugin": "~1.4.3",
-		"@types/webpack": "^5.28.4",
+		"@types/webpack": "^5.28.5",
 		"@types/webpack-bundle-analyzer": "^4.6.2",
 		"@types/webpack-dev-server": "~4.7.2",
 		"@types/whatwg-fetch": "~0.0.33",
@@ -57,7 +57,7 @@
 		"eslint": "~8.45.0",
 		"eslint-plugin-import": "~2.26.0",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"file-loader": "^6.2.0",
 		"gh-release": "^3.5.0",
 		"html-webpack-plugin": "^5.5.3",
@@ -85,7 +85,7 @@
 		"stylelint-order": "^5.0.0",
 		"svg-loader": "^0.0.2",
 		"terser-webpack-plugin": "~4.2.3",
-		"typescript": "~5.3.3",
+		"typescript": "~5.5.4",
 		"url-loader": "^4.1.1",
 		"webpack": "^5.89.0",
 		"webpack-bundle-analyzer": "^4.9.1",
@@ -102,7 +102,7 @@
 		"@rocket.chat/random": "workspace:~",
 		"@rocket.chat/sdk": "^1.0.0-alpha.42",
 		"@rocket.chat/ui-kit": "workspace:~",
-		"css-vars-ponyfill": "^2.4.8",
+		"css-vars-ponyfill": "^2.4.9",
 		"date-fns": "^2.15.0",
 		"emoji-mart": "^3.0.1",
 		"history": "~5.3.0",
@@ -116,8 +116,8 @@
 		"query-string": "^7.1.3",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
-		"storybook-dark-mode": "~3.0.1",
-		"whatwg-fetch": "^3.6.19"
+		"storybook-dark-mode": "~3.0.3",
+		"whatwg-fetch": "^3.6.20"
 	},
 	"browserslist": [
 		"last 2 versions",
diff --git a/packages/livechat/src/lib/main.js b/packages/livechat/src/lib/main.js
index ad93dc184dd9..499cda913b95 100644
--- a/packages/livechat/src/lib/main.js
+++ b/packages/livechat/src/lib/main.js
@@ -90,41 +90,38 @@ export const getUnreadMessages = () => {
 	const { messages, user, lastReadMessageId } = store.state;
 
 	const renderedMessages = messages.filter((message) => canRenderMessage(message));
+
 	const lastReadMessageIndex = lastReadMessageId
 		? renderedMessages.findIndex((item) => item._id === lastReadMessageId)
-		: renderedMessages
-				.slice()
-				.reverse()
-				.findIndex((item) => item.u._id === user?._id);
-
-	if (lastReadMessageIndex !== -1) {
-		const unreadMessages = renderedMessages.slice(lastReadMessageIndex + 1).filter((message) => message.u._id !== user?._id);
-
-		return unreadMessages;
-	}
+		: renderedMessages.findLastIndex((item) => item.u._id === user?._id);
 
-	return [];
+	if (lastReadMessageIndex === -1) return 0;
+	return renderedMessages.slice(lastReadMessageIndex + 1).filter((message) => message.u._id !== user?._id).length;
 };
 
 export const processUnread = async () => {
+	const unreadMessages = getUnreadMessages();
+	if (unreadMessages <= 0) {
+		await store.setState({ unread: 0 });
+		return;
+	}
+
 	const shouldMarkUnread = shouldMarkAsUnread();
-	if (shouldMarkUnread) {
-		const unreadMessages = getUnreadMessages();
-
-		if (unreadMessages.length > 0) {
-			const { alerts } = store.state;
-			const lastReadMessage = getLastReadMessage();
-			const alertMessage = i18next.t('count_new_messages_since_since', {
-				count: unreadMessages.length,
-				val: new Date(lastReadMessage.ts),
-				formatParams: {
-					val: { month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' },
-				},
-			});
-
-			const alert = { id: constants.unreadMessagesAlertId, children: alertMessage, success: true, timeout: 0 };
-			const newAlerts = alerts.filter((item) => item.id !== constants.unreadMessagesAlertId);
-			await store.setState({ alerts: (newAlerts.push(alert), newAlerts), unread: unreadMessages.length });
-		}
+	if (!shouldMarkUnread) {
+		return;
 	}
+
+	const { alerts } = store.state;
+	const lastReadMessage = getLastReadMessage();
+	const alertMessage = i18next.t('count_new_messages_since_since', {
+		count: unreadMessages,
+		val: new Date(lastReadMessage.ts),
+		formatParams: {
+			val: { month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' },
+		},
+	});
+	const alert = { id: constants.unreadMessagesAlertId, children: alertMessage, success: true, timeout: 0 };
+	const newAlerts = alerts.filter((item) => item.id !== constants.unreadMessagesAlertId);
+
+	await store.setState({ alerts: (newAlerts.push(alert), newAlerts), unread: unreadMessages });
 };
diff --git a/packages/livechat/src/routes/Chat/connector.tsx b/packages/livechat/src/routes/Chat/connector.tsx
index 36e574b246b1..3c72f9ae88cf 100644
--- a/packages/livechat/src/routes/Chat/connector.tsx
+++ b/packages/livechat/src/routes/Chat/connector.tsx
@@ -22,6 +22,7 @@ export const ChatConnector: FunctionalComponent<{ path: string; default: boolean
 				nameFieldRegistrationForm,
 				emailFieldRegistrationForm,
 				limitTextLength,
+				visitorsCanCloseChat,
 			},
 			messages: { conversationFinishedMessage },
 			theme: { title = '' } = {},
@@ -94,6 +95,7 @@ export const ChatConnector: FunctionalComponent<{ path: string; default: boolean
 			ongoingCall={ongoingCall}
 			messageListPosition={messageListPosition}
 			theme={theme}
+			visitorsCanCloseChat={visitorsCanCloseChat}
 		/>
 	);
 };
diff --git a/packages/livechat/src/routes/Chat/container.js b/packages/livechat/src/routes/Chat/container.js
index 19172cc7fe5a..43ff281c6472 100644
--- a/packages/livechat/src/routes/Chat/container.js
+++ b/packages/livechat/src/routes/Chat/container.js
@@ -288,8 +288,8 @@ class ChatContainer extends Component {
 	};
 
 	canFinishChat = () => {
-		const { room, connecting } = this.props;
-		return room !== undefined || connecting;
+		const { room, connecting, visitorsCanCloseChat } = this.props;
+		return visitorsCanCloseChat && (room !== undefined || connecting);
 	};
 
 	canRemoveUserData = () => {
diff --git a/packages/livechat/src/store/index.tsx b/packages/livechat/src/store/index.tsx
index f8629ce693cc..e7d4b8caae17 100644
--- a/packages/livechat/src/store/index.tsx
+++ b/packages/livechat/src/store/index.tsx
@@ -59,6 +59,7 @@ export type StoreState = {
 			hideWatermark?: boolean;
 			livechatLogo?: { url: string };
 			transcript?: boolean;
+			visitorsCanCloseChat?: boolean;
 		};
 		online?: boolean;
 		departments: Department[];
diff --git a/packages/log-format/package.json b/packages/log-format/package.json
index b43a3954a96f..a999c7d884f0 100644
--- a/packages/log-format/package.json
+++ b/packages/log-format/package.json
@@ -4,9 +4,9 @@
 	"private": true,
 	"devDependencies": {
 		"@types/chalk": "^2.2.0",
-		"@types/ejson": "^2.2.1",
+		"@types/ejson": "^2.2.2",
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/logger/package.json b/packages/logger/package.json
index aae996f35139..d073ebddbf49 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/message-parser/CHANGELOG.md b/packages/message-parser/CHANGELOG.md
index a00ffd3db882..0655d17fe0cb 100644
--- a/packages/message-parser/CHANGELOG.md
+++ b/packages/message-parser/CHANGELOG.md
@@ -1,5 +1,11 @@
 # 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
diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index c566e6b2c5c7..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.30",
+  "version": "0.31.31-rc.0",
   "author": {
     "name": "Rocket.Chat",
     "url": "https://rocket.chat/"
@@ -48,29 +48,29 @@
     "docs": "typedoc"
   },
   "devDependencies": {
-    "@babel/core": "~7.21.4",
-    "@babel/eslint-parser": "~7.21.3",
-    "@babel/preset-env": "~7.21.4",
+    "@babel/core": "~7.21.8",
+    "@babel/eslint-parser": "~7.21.8",
+    "@babel/preset-env": "~7.21.5",
     "@rocket.chat/eslint-config": "workspace:^",
     "@rocket.chat/jest-presets": "workspace:~",
     "@rocket.chat/peggy-loader": "workspace:~",
     "@rocket.chat/prettier-config": "~0.31.25",
-    "@types/jest": "~29.5.12",
-    "@types/node": "~14.18.42",
+    "@types/jest": "~29.5.13",
+    "@types/node": "~14.18.63",
     "@typescript-eslint/parser": "~5.58.0",
-    "babel-loader": "~9.1.2",
+    "babel-loader": "~9.1.3",
     "eslint": "~8.45.0",
     "jest": "~29.7.0",
     "npm-run-all": "^4.1.5",
     "peggy": "3.0.2",
-    "prettier": "~2.8.7",
+    "prettier": "~2.8.8",
     "prettier-plugin-pegjs": "~0.5.4",
     "rimraf": "^3.0.2",
-    "ts-loader": "~9.4.2",
-    "typedoc": "~0.24.1",
-    "typescript": "~5.3.3",
+    "ts-loader": "~9.4.4",
+    "typedoc": "~0.24.8",
+    "typescript": "~5.5.4",
     "webpack": "~5.78.0",
-    "webpack-cli": "~5.0.1"
+    "webpack-cli": "~5.0.2"
   },
   "dependencies": {
     "tldts": "~5.7.112"
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 d2d1f412fae8..c55acfa8cd32 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",
@@ -14,10 +14,10 @@
 		"@rocket.chat/ui-contexts": "workspace:*",
 		"@storybook/react": "~6.5.16",
 		"@tanstack/react-query": "^4.16.1",
-		"@types/use-sync-external-store": "^0.0.5",
+		"@types/use-sync-external-store": "^0.0.6",
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"peerDependencies": {
 		"@tanstack/react-query": "*",
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 4ae90df8e0c8..8622fef80d33 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,78 @@
 # @rocket.chat/model-typings
 
+## 0.8.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  </details>
+
+## 0.8.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  </details>
+
+## 0.8.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  </details>
+
+## 0.8.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  </details>
+
+## 0.8.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 011fa9339812..aac550df73f7 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,12 +1,12 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.7.1",
+	"version": "0.8.0-rc.6",
 	"private": true,
 	"devDependencies": {
-		"@types/node-rsa": "^1.1.3",
+		"@types/node-rsa": "^1.1.4",
 		"eslint": "~8.45.0",
 		"mongodb": "^4.17.2",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/model-typings/src/index.ts b/packages/model-typings/src/index.ts
index 61ad5d1f5c55..83def2bd19b2 100644
--- a/packages/model-typings/src/index.ts
+++ b/packages/model-typings/src/index.ts
@@ -21,6 +21,7 @@ export * from './models/IInvitesModel';
 export * from './models/IImportDataModel';
 export * from './models/ILivechatAgentActivityModel';
 export * from './models/ILivechatBusinessHoursModel';
+export * from './models/ILivechatContactsModel';
 export * from './models/ILivechatCustomFieldModel';
 export * from './models/ILivechatDepartmentAgentsModel';
 export * from './models/ILivechatDepartmentModel';
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/ILivechatContactsModel.ts b/packages/model-typings/src/models/ILivechatContactsModel.ts
new file mode 100644
index 000000000000..f94216830884
--- /dev/null
+++ b/packages/model-typings/src/models/ILivechatContactsModel.ts
@@ -0,0 +1,7 @@
+import type { ILivechatContact } from '@rocket.chat/core-typings';
+
+import type { IBaseModel } from './IBaseModel';
+
+export interface ILivechatContactsModel extends IBaseModel<ILivechatContact> {
+	updateContact(contactId: string, data: Partial<ILivechatContact>): Promise<ILivechatContact>;
+}
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 57a03631c1f0..91802f836719 100644
--- a/packages/model-typings/src/models/IRoomsModel.ts
+++ b/packages/model-typings/src/models/IRoomsModel.ts
@@ -112,8 +112,6 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 
 	findByBroadcast(options?: FindOptions<IRoom>): FindCursor<IRoom>;
 
-	findByActiveLivestream(options?: FindOptions<IRoom>): FindCursor<IRoom>;
-
 	setAsFederated(roomId: IRoom['_id']): Promise<UpdateResult>;
 
 	setRoomTypeById(roomId: IRoom['_id'], roomType: IRoom['t']): Promise<UpdateResult>;
@@ -176,7 +174,6 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 	setLastMessagePinned(roomId: string, pinnedBy: unknown, pinned?: boolean, pinnedAt?: Date): Promise<UpdateResult>;
 	setLastMessageAsRead(roomId: string): Promise<UpdateResult>;
 	setDescriptionById(roomId: string, description: string): Promise<UpdateResult>;
-	setStreamingOptionsById(roomId: string, streamingOptions: IRoom['streamingOptions']): Promise<UpdateResult>;
 	setReadOnlyById(roomId: string, readOnly: NonNullable<IRoom['ro']>): Promise<UpdateResult>;
 	setDmReadOnlyByUserId(
 		roomId: string,
@@ -285,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 8a3f24035b14..2414fd691ddb 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,72 @@
 # @rocket.chat/models
 
+## 0.3.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.6
+  </details>
+
+## 0.3.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.5
+  </details>
+
+## 0.3.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.4
+  </details>
+
+## 0.3.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.3
+  </details>
+
+## 0.3.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.8.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/models/package.json b/packages/models/package.json
index 6ff93a6c8e05..132d80fea828 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,13 +1,13 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.2.4",
+	"version": "0.3.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "^29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
 		"@rocket.chat/model-typings": "workspace:~"
diff --git a/packages/models/src/index.ts b/packages/models/src/index.ts
index 655a94923feb..eb357ed293ef 100644
--- a/packages/models/src/index.ts
+++ b/packages/models/src/index.ts
@@ -20,6 +20,7 @@ import type {
 	IImportDataModel,
 	ILivechatAgentActivityModel,
 	ILivechatBusinessHoursModel,
+	ILivechatContactsModel,
 	ILivechatCustomFieldModel,
 	ILivechatDepartmentAgentsModel,
 	ILivechatDepartmentModel,
@@ -117,6 +118,7 @@ export const Integrations = proxify<IIntegrationsModel>('IIntegrationsModel');
 export const Invites = proxify<IInvitesModel>('IInvitesModel');
 export const LivechatAgentActivity = proxify<ILivechatAgentActivityModel>('ILivechatAgentActivityModel');
 export const LivechatBusinessHours = proxify<ILivechatBusinessHoursModel>('ILivechatBusinessHoursModel');
+export const LivechatContacts = proxify<ILivechatContactsModel>('ILivechatContactsModel');
 export const LivechatCustomField = proxify<ILivechatCustomFieldModel>('ILivechatCustomFieldModel');
 export const LivechatDepartmentAgents = proxify<ILivechatDepartmentAgentsModel>('ILivechatDepartmentAgentsModel');
 export const LivechatDepartment = proxify<ILivechatDepartmentModel>('ILivechatDepartmentModel');
diff --git a/packages/node-poplib/package.json b/packages/node-poplib/package.json
index a232d6b4c476..1d0c4c462e46 100644
--- a/packages/node-poplib/package.json
+++ b/packages/node-poplib/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"main": "./src/index.js",
 	"typings": "./dist/index.d.ts"
diff --git a/packages/password-policies/package.json b/packages/password-policies/package.json
index d53ffa1f5249..6bfb0d6100f1 100644
--- a/packages/password-policies/package.json
+++ b/packages/password-policies/package.json
@@ -4,10 +4,10 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc",
diff --git a/packages/password-policies/tsconfig.json b/packages/password-policies/tsconfig.json
index f0a66c843c50..e2be47cf5499 100644
--- a/packages/password-policies/tsconfig.json
+++ b/packages/password-policies/tsconfig.json
@@ -2,8 +2,7 @@
 	"extends": "../../tsconfig.base.client.json",
 	"compilerOptions": {
 		"rootDir": "./src",
-		"outDir": "./dist",
-		"module": "commonjs"
+		"outDir": "./dist"
 	},
 	"include": ["./src/**/*"]
 }
diff --git a/packages/patch-injection/package.json b/packages/patch-injection/package.json
index 99f676bff831..2ac35749c481 100644
--- a/packages/patch-injection/package.json
+++ b/packages/patch-injection/package.json
@@ -4,10 +4,10 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc",
diff --git a/packages/peggy-loader/CHANGELOG.md b/packages/peggy-loader/CHANGELOG.md
index 8fdec959414f..6985a0b2c912 100644
--- a/packages/peggy-loader/CHANGELOG.md
+++ b/packages/peggy-loader/CHANGELOG.md
@@ -1,5 +1,10 @@
 # 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
diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json
index fab7c3c8f15a..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.26",
+  "version": "0.31.27-rc.0",
   "description": "Peggy loader for webpack",
   "keywords": [
     "peggy",
@@ -44,13 +44,13 @@
   "devDependencies": {
     "@rocket.chat/eslint-config": "workspace:~",
     "@rocket.chat/prettier-config": "~0.31.25",
-    "@types/node": "~14.18.42",
+    "@types/node": "~14.18.63",
     "eslint": "~8.45.0",
     "npm-run-all": "^4.1.5",
     "peggy": "3.0.2",
-    "prettier": "~2.8.7",
+    "prettier": "~2.8.8",
     "rimraf": "^3.0.2",
-    "typescript": "~5.3.3",
+    "typescript": "~5.5.4",
     "webpack": "~5.78.0"
   },
   "volta": {
diff --git a/packages/random/package.json b/packages/random/package.json
index 72fc8c5c566a..498e218338d9 100644
--- a/packages/random/package.json
+++ b/packages/random/package.json
@@ -23,7 +23,7 @@
 		"@typescript-eslint/parser": "~5.60.1",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/release-action/package.json b/packages/release-action/package.json
index 0d17e4fb4221..0851b8b43fca 100644
--- a/packages/release-action/package.json
+++ b/packages/release-action/package.json
@@ -10,8 +10,8 @@
 	"main": "dist/index.js",
 	"packageManager": "yarn@3.5.1",
 	"devDependencies": {
-		"@types/node": "^16.18.60",
-		"typescript": "~5.3.3"
+		"@types/node": "^16.18.108",
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
 		"@actions/core": "^1.10.1",
diff --git a/packages/release-changelog/package.json b/packages/release-changelog/package.json
index 9e48d015b321..222f7f20355a 100644
--- a/packages/release-changelog/package.json
+++ b/packages/release-changelog/package.json
@@ -12,10 +12,10 @@
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@types/node": "^14.18.63",
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
 		"dataloader": "^1.4.0",
-		"node-fetch": "^2"
+		"node-fetch": "^2.7.0"
 	}
 }
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 0fde816d5729..04cf749f9096 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,83 @@
 # @rocket.chat/rest-typings
 
+## 6.13.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  </details>
+
+## 6.13.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  </details>
+
+## 6.13.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  </details>
+
+## 6.13.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  </details>
+
+## 6.13.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 5817b2b515a7..a9bea2c87e43 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,13 +1,13 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.12.1",
+	"version": "6.13.0-rc.6",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"mongodb": "^4.17.2",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc",
@@ -23,7 +23,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.45.0-alpha.866",
+		"@rocket.chat/apps-engine": "1.46.0",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
diff --git a/packages/rest-typings/src/v1/omnichannel.ts b/packages/rest-typings/src/v1/omnichannel.ts
index b8519bf8fe02..b494e5d0e5a9 100644
--- a/packages/rest-typings/src/v1/omnichannel.ts
+++ b/packages/rest-typings/src/v1/omnichannel.ts
@@ -27,6 +27,7 @@ import type {
 	ReportWithUnmatchingElements,
 	SMSProviderResponse,
 	ILivechatTriggerActionResponse,
+	ILivechatContact,
 } from '@rocket.chat/core-typings';
 import { ILivechatAgentStatus } from '@rocket.chat/core-typings';
 import Ajv from 'ajv';
@@ -575,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 = {
@@ -644,6 +646,15 @@ const POSTLivechatDepartmentSchema = {
 			},
 			nullable: true,
 		},
+		departmentUnit: {
+			type: 'object',
+			properties: {
+				_id: {
+					type: 'string',
+				},
+			},
+			additionalProperties: false,
+		},
 	},
 	required: ['department'],
 	additionalProperties: false,
@@ -1211,6 +1222,113 @@ const POSTOmnichannelContactSchema = {
 
 export const isPOSTOmnichannelContactProps = ajv.compile<POSTOmnichannelContactProps>(POSTOmnichannelContactSchema);
 
+type POSTOmnichannelContactsProps = {
+	name: string;
+	emails: string[];
+	phones: string[];
+	customFields?: Record<string, unknown>;
+	contactManager?: string;
+};
+
+const POSTOmnichannelContactsSchema = {
+	type: 'object',
+	properties: {
+		name: {
+			type: 'string',
+		},
+		emails: {
+			type: 'array',
+			items: {
+				type: 'string',
+			},
+			uniqueItems: true,
+		},
+		phones: {
+			type: 'array',
+			items: {
+				type: 'string',
+			},
+			uniqueItems: true,
+		},
+		customFields: {
+			type: 'object',
+			nullable: true,
+		},
+		contactManager: {
+			type: 'string',
+			nullable: true,
+		},
+	},
+	required: ['name', 'emails', 'phones'],
+	additionalProperties: false,
+};
+
+export const isPOSTOmnichannelContactsProps = ajv.compile<POSTOmnichannelContactsProps>(POSTOmnichannelContactsSchema);
+
+type POSTUpdateOmnichannelContactsProps = {
+	contactId: string;
+	name?: string;
+	emails?: string[];
+	phones?: string[];
+	customFields?: Record<string, unknown>;
+	contactManager?: string;
+};
+
+const POSTUpdateOmnichannelContactsSchema = {
+	type: 'object',
+	properties: {
+		contactId: {
+			type: 'string',
+		},
+		name: {
+			type: 'string',
+		},
+		emails: {
+			type: 'array',
+			items: {
+				type: 'string',
+			},
+			uniqueItems: true,
+			nullable: true,
+		},
+		phones: {
+			type: 'array',
+			items: {
+				type: 'string',
+			},
+			uniqueItems: true,
+			nullable: true,
+		},
+		customFields: {
+			type: 'object',
+			nullable: true,
+		},
+		contactManager: {
+			type: 'string',
+			nullable: true,
+		},
+	},
+	required: ['contactId'],
+	additionalProperties: false,
+};
+
+export const isPOSTUpdateOmnichannelContactsProps = ajv.compile<POSTUpdateOmnichannelContactsProps>(POSTUpdateOmnichannelContactsSchema);
+
+type GETOmnichannelContactsProps = { contactId: string };
+
+const GETOmnichannelContactsSchema = {
+	type: 'object',
+	properties: {
+		contactId: {
+			type: 'string',
+		},
+	},
+	required: ['contactId'],
+	additionalProperties: false,
+};
+
+export const isGETOmnichannelContactsProps = ajv.compile<GETOmnichannelContactsProps>(GETOmnichannelContactsSchema);
+
 type GETOmnichannelContactProps = { contactId: string };
 
 const GETOmnichannelContactSchema = {
@@ -3649,6 +3767,16 @@ export type OmnichannelEndpoints = {
 		GET: (params: GETOmnichannelContactProps) => { contact: ILivechatVisitor | null };
 	};
 
+	'/v1/omnichannel/contacts': {
+		POST: (params: POSTOmnichannelContactsProps) => { contactId: string };
+	};
+	'/v1/omnichannel/contacts.update': {
+		POST: (params: POSTUpdateOmnichannelContactsProps) => { contact: ILivechatContact };
+	};
+	'/v1/omnichannel/contacts.get': {
+		GET: (params: GETOmnichannelContactsProps) => { contact: ILivechatContact | null };
+	};
+
 	'/v1/omnichannel/contact.search': {
 		GET: (params: GETOmnichannelContactSearchProps) => { contact: ILivechatVisitor | null };
 	};
diff --git a/packages/rest-typings/src/v1/rooms.ts b/packages/rest-typings/src/v1/rooms.ts
index 2172b5663afc..16debe87e44c 100644
--- a/packages/rest-typings/src/v1/rooms.ts
+++ b/packages/rest-typings/src/v1/rooms.ts
@@ -1,4 +1,4 @@
-import type { IMessage, IRoom, IUser, RoomAdminFieldsType, IUpload, IE2EEMessage } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, IUser, RoomAdminFieldsType, IUpload, IE2EEMessage, ITeam } from '@rocket.chat/core-typings';
 
 import type { PaginatedRequest } from '../helpers/PaginatedRequest';
 import type { PaginatedResult } from '../helpers/PaginatedResult';
@@ -626,6 +626,8 @@ export type RoomsEndpoints = {
 	'/v1/rooms.info': {
 		GET: (params: RoomsInfoProps) => {
 			room: IRoom | undefined;
+			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/server-cloud-communication/package.json b/packages/server-cloud-communication/package.json
index 8c970687ab8b..35e67a2c0638 100644
--- a/packages/server-cloud-communication/package.json
+++ b/packages/server-cloud-communication/package.json
@@ -5,7 +5,7 @@
 	"devDependencies": {
 		"@rocket.chat/license": "workspace:^",
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/server-fetch/package.json b/packages/server-fetch/package.json
index c98b4ba99e54..e09b20d1aa42 100644
--- a/packages/server-fetch/package.json
+++ b/packages/server-fetch/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
@@ -21,7 +21,7 @@
 		"extends": "../../package.json"
 	},
 	"dependencies": {
-		"@types/proxy-from-env": "^1.0.3",
+		"@types/proxy-from-env": "^1.0.4",
 		"http-proxy-agent": "^5.0.0",
 		"https-proxy-agent": "^5.0.1",
 		"node-fetch": "2.3.0",
diff --git a/packages/sha256/package.json b/packages/sha256/package.json
index 6d10f5b80d65..fb9e0d0d7f26 100644
--- a/packages/sha256/package.json
+++ b/packages/sha256/package.json
@@ -22,7 +22,7 @@
 		"@typescript-eslint/parser": "~5.60.1",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/tools/package.json b/packages/tools/package.json
index d1301efb7055..bb38a8c5ae4f 100644
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@@ -4,10 +4,10 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
@@ -24,6 +24,6 @@
 		"/dist"
 	],
 	"dependencies": {
-		"moment-timezone": "^0.5.43"
+		"moment-timezone": "^0.5.45"
 	}
 }
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 8c6aa8a5674c..2da271f261f1 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,71 @@
 # @rocket.chat/ui-avatar
 
+## 7.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  </details>
+
+## 7.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  </details>
+
+## 7.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  </details>
+
+## 7.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  </details>
+
+## 7.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 047d59aef489..2305da31a50a 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,21 +1,20 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "6.0.1",
+	"version": "7.0.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
-		"@rocket.chat/fuselage": "^0.57.1",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/ui-contexts": "workspace:^",
-		"@types/babel__core": "~7.20.3",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-storybook": "~0.6.15",
 		"eslint-plugin-testing-library": "~5.11.1",
 		"react": "^17.0.2",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
@@ -31,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "10.0.1",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index f18e81b029f1..f855fe63a07b 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,77 @@
 # @rocket.chat/ui-client
 
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/ui-avatar@7.0.0-rc.5
+  </details>
+
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/ui-avatar@7.0.0-rc.4
+  </details>
+
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/ui-avatar@7.0.0-rc.3
+  </details>
+
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/ui-avatar@7.0.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index e353242c849a..8638a3e707b1 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,16 +1,17 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "10.0.1",
+	"version": "11.0.0-rc.5",
 	"private": true,
 	"devDependencies": {
 		"@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.57.1",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/mock-providers": "workspace:^",
+		"@rocket.chat/ui-avatar": "workspace:~",
 		"@rocket.chat/ui-contexts": "workspace:~",
 		"@storybook/addon-actions": "~6.5.16",
 		"@storybook/addon-docs": "~6.5.16",
@@ -22,22 +23,21 @@
 		"@storybook/manager-webpack4": "~6.5.16",
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "~0.0.13",
-		"@testing-library/react": "~16.0.0",
-		"@types/babel__core": "~7.20.3",
-		"@types/jest": "~29.5.12",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
+		"@testing-library/react": "~16.0.1",
+		"@types/jest": "~29.5.13",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-storybook": "~0.6.15",
 		"eslint-plugin-testing-library": "~5.11.1",
 		"jest": "~29.7.0",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
 		"react-hook-form": "~7.45.4",
-		"typescript": "~5.3.3"
+		"typescript": "~5.5.4"
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc -p tsconfig.build.json",
@@ -60,8 +60,10 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-contexts": "10.0.1",
-		"react": "~17.0.2"
+		"@rocket.chat/ui-avatar": "*",
+		"@rocket.chat/ui-contexts": "*",
+		"react": "*",
+		"react-i18next": "*"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/ui-client/src/components/AnchorPortal.spec.tsx b/packages/ui-client/src/components/AnchorPortal.spec.tsx
new file mode 100644
index 000000000000..309322c002b3
--- /dev/null
+++ b/packages/ui-client/src/components/AnchorPortal.spec.tsx
@@ -0,0 +1,45 @@
+import { render, screen } from '@testing-library/react';
+
+import AnchorPortal from './AnchorPortal';
+
+it('should render children', () => {
+	render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example' />} />, { legacyRoot: true });
+
+	expect(screen.getByRole('presentation', { name: 'example' })).toBeInTheDocument();
+});
+
+it('should not recreate the anchor element', () => {
+	render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example A' />} />, { legacyRoot: true });
+	const anchorA = document.getElementById('test-anchor');
+
+	render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example B' />} />, { legacyRoot: true });
+	const anchorB = document.getElementById('test-anchor');
+
+	expect(anchorA).toBe(anchorB);
+	expect(screen.getByRole('presentation', { name: 'example A' })).toBeInTheDocument();
+	expect(screen.getByRole('presentation', { name: 'example B' })).toBeInTheDocument();
+});
+
+it('should remove the anchor element when unmounted', () => {
+	const { unmount } = render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example' />} />, {
+		legacyRoot: true,
+	});
+	expect(document.getElementById('test-anchor')).toBeInTheDocument();
+
+	unmount();
+	expect(document.getElementById('test-anchor')).not.toBeInTheDocument();
+});
+
+it('should not remove the anchor element after unmounting if there are other portals with the same id', () => {
+	const { unmount } = render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example' />} />, {
+		legacyRoot: true,
+	});
+	expect(document.getElementById('test-anchor')).toBeInTheDocument();
+
+	render(<AnchorPortal id='test-anchor' children={<div role='presentation' aria-label='example' />} />, {
+		legacyRoot: true,
+	});
+	unmount();
+
+	expect(document.getElementById('test-anchor')).toBeInTheDocument();
+});
diff --git a/packages/ui-client/src/components/AnchorPortal.tsx b/packages/ui-client/src/components/AnchorPortal.tsx
new file mode 100644
index 000000000000..c0d01122c2cf
--- /dev/null
+++ b/packages/ui-client/src/components/AnchorPortal.tsx
@@ -0,0 +1,25 @@
+import { ReactNode, useLayoutEffect } from 'react';
+import { createPortal } from 'react-dom';
+
+import { ensureAnchorElement, refAnchorElement, unrefAnchorElement } from '../helpers/anchors';
+
+export type AnchorPortalProps = {
+	id: string;
+	children: ReactNode;
+};
+
+const AnchorPortal = ({ id, children }: AnchorPortalProps) => {
+	const anchorElement = ensureAnchorElement(id);
+
+	useLayoutEffect(() => {
+		refAnchorElement(anchorElement);
+
+		return () => {
+			unrefAnchorElement(anchorElement);
+		};
+	}, [anchorElement]);
+
+	return <>{createPortal(children, anchorElement)}</>;
+};
+
+export default AnchorPortal;
diff --git a/packages/ui-client/src/components/CustomFieldsForm.tsx b/packages/ui-client/src/components/CustomFieldsForm.tsx
index 3a9c66014e4d..76cfc44fe010 100644
--- a/packages/ui-client/src/components/CustomFieldsForm.tsx
+++ b/packages/ui-client/src/components/CustomFieldsForm.tsx
@@ -52,7 +52,7 @@ const CustomField = <T extends FieldValues>({
 		(error: RHFFieldError) => {
 			switch (error?.type) {
 				case 'required':
-					return t('The_field_is_required', label || name);
+					return t('Required_field', { field: label || name });
 				case 'minLength':
 					return t('Min_length_is', props?.minLength);
 				case 'maxLength':
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/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx b/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
similarity index 55%
rename from apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
rename to packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
index 95d7d2d12353..eece30cc7280 100644
--- a/apps/meteor/client/views/account/featurePreview/AccountFeaturePreviewBadge.tsx
+++ b/packages/ui-client/src/components/FeaturePreview/FeaturePreviewBadge.tsx
@@ -1,11 +1,11 @@
 import { Badge } from '@rocket.chat/fuselage';
-import { useFeaturePreviewList } from '@rocket.chat/ui-client';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import React from 'react';
 
-const AccountFeaturePreviewBadge = () => {
+import { usePreferenceFeaturePreviewList } from '../../hooks/usePreferenceFeaturePreviewList';
+
+const FeaturePreviewBadge = () => {
 	const t = useTranslation();
-	const { unseenFeatures } = useFeaturePreviewList();
+	const { unseenFeatures } = usePreferenceFeaturePreviewList();
 
 	if (!unseenFeatures) {
 		return null;
@@ -18,4 +18,4 @@ const AccountFeaturePreviewBadge = () => {
 	);
 };
 
-export default AccountFeaturePreviewBadge;
+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/apps/meteor/client/components/GenericMenu/GenericMenu.spec.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
similarity index 98%
rename from apps/meteor/client/components/GenericMenu/GenericMenu.spec.tsx
rename to packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
index 530bd1404dc7..bdd7f5fbda18 100644
--- a/apps/meteor/client/components/GenericMenu/GenericMenu.spec.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.spec.tsx
@@ -1,6 +1,5 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import React from 'react';
 
 import GenericMenu from './GenericMenu';
 
diff --git a/apps/meteor/client/components/GenericMenu/GenericMenu.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
similarity index 97%
rename from apps/meteor/client/components/GenericMenu/GenericMenu.tsx
rename to packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
index 294a98770523..448aea15db4f 100644
--- a/apps/meteor/client/components/GenericMenu/GenericMenu.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenu.tsx
@@ -1,7 +1,6 @@
 import { IconButton, MenuItem, MenuSection, MenuV2 } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import type { ComponentProps, ReactNode } from 'react';
-import React from 'react';
+import { type ComponentProps, type ReactNode } from 'react';
 
 import type { GenericMenuItemProps } from './GenericMenuItem';
 import GenericMenuItem from './GenericMenuItem';
@@ -13,6 +12,7 @@ type GenericMenuCommonProps = {
 	disabled?: boolean;
 	callbackAction?: () => void;
 };
+
 type GenericMenuConditionalProps =
 	| {
 			sections?: {
diff --git a/apps/meteor/client/components/GenericMenu/GenericMenuItem.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
similarity index 97%
rename from apps/meteor/client/components/GenericMenu/GenericMenuItem.tsx
rename to packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
index c01a64d708a0..41576a2a40a6 100644
--- a/apps/meteor/client/components/GenericMenu/GenericMenuItem.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
@@ -1,6 +1,5 @@
 import { MenuItemColumn, MenuItemContent, MenuItemIcon, MenuItemInput } from '@rocket.chat/fuselage';
 import type { ComponentProps, MouseEvent, ReactNode } from 'react';
-import React from 'react';
 
 export type GenericMenuItemProps = {
 	id: string;
diff --git a/apps/meteor/client/components/GenericMenu/hooks/useHandleMenuAction.tsx b/packages/ui-client/src/components/GenericMenu/hooks/useHandleMenuAction.tsx
similarity index 81%
rename from apps/meteor/client/components/GenericMenu/hooks/useHandleMenuAction.tsx
rename to packages/ui-client/src/components/GenericMenu/hooks/useHandleMenuAction.tsx
index dd1115765194..fb423643b7c6 100644
--- a/apps/meteor/client/components/GenericMenu/hooks/useHandleMenuAction.tsx
+++ b/packages/ui-client/src/components/GenericMenu/hooks/useHandleMenuAction.tsx
@@ -2,12 +2,11 @@ import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 
 import type { GenericMenuItemProps } from '../GenericMenuItem';
 
-export const useHandleMenuAction = (items: GenericMenuItemProps[], callbackAction?: () => void) => {
-	return useEffectEvent((id) => {
+export const useHandleMenuAction = (items: GenericMenuItemProps[], callbackAction?: () => void) =>
+	useEffectEvent((id) => {
 		const item = items.find((item) => item.id === id && !!item.onClick);
 		if (item) {
 			item.onClick?.();
 			callbackAction?.();
 		}
 	});
-};
diff --git a/packages/ui-client/src/components/GenericMenu/index.ts b/packages/ui-client/src/components/GenericMenu/index.ts
new file mode 100644
index 000000000000..a0753e281481
--- /dev/null
+++ b/packages/ui-client/src/components/GenericMenu/index.ts
@@ -0,0 +1,3 @@
+export { default as GenericMenu } from './GenericMenu';
+export { default as GenericMenuItem, GenericMenuItemProps } from './GenericMenuItem';
+export { useHandleMenuAction } from './hooks/useHandleMenuAction';
diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.stories.tsx b/packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.stories.tsx
similarity index 94%
rename from apps/meteor/client/components/UserAutoComplete/UserAutoComplete.stories.tsx
rename to packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.stories.tsx
index 757c10b35b86..b9baa3174dda 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.stories.tsx
+++ b/packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.stories.tsx
@@ -1,5 +1,4 @@
 import type { ComponentMeta, ComponentStory } from '@storybook/react';
-import React from 'react';
 
 import UserAutoComplete from '.';
 
diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx b/packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.tsx
similarity index 97%
rename from apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
rename to packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.tsx
index 3f61f421035c..72a8eecec4d0 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
+++ b/packages/ui-client/src/components/UserAutoComplete/UserAutoComplete.tsx
@@ -4,7 +4,7 @@ import { UserAvatar } from '@rocket.chat/ui-avatar';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ComponentProps, ReactElement } from 'react';
-import React, { memo, useMemo, useState } from 'react';
+import { memo, useMemo, useState } from 'react';
 
 const query = (
 	term = '',
diff --git a/apps/meteor/client/components/UserAutoComplete/index.ts b/packages/ui-client/src/components/UserAutoComplete/index.ts
similarity index 100%
rename from apps/meteor/client/components/UserAutoComplete/index.ts
rename to packages/ui-client/src/components/UserAutoComplete/index.ts
diff --git a/packages/ui-client/src/components/index.ts b/packages/ui-client/src/components/index.ts
index c98eace56f13..7308c8e75431 100644
--- a/packages/ui-client/src/components/index.ts
+++ b/packages/ui-client/src/components/index.ts
@@ -1,3 +1,4 @@
+export { default as AnchorPortal, AnchorPortalProps } from './AnchorPortal';
 export * from './EmojiPicker';
 export * from './ExternalLink';
 export * from './DotLeader';
@@ -10,5 +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/helpers/anchors.ts b/packages/ui-client/src/helpers/anchors.ts
new file mode 100644
index 000000000000..6cbc6d454846
--- /dev/null
+++ b/packages/ui-client/src/helpers/anchors.ts
@@ -0,0 +1,32 @@
+export const ensureAnchorElement = (id: string): HTMLElement => {
+	const existingAnchor = document.getElementById(id);
+	if (existingAnchor) return existingAnchor;
+
+	const newAnchor = document.createElement('div');
+	newAnchor.id = id;
+	document.body.appendChild(newAnchor);
+	return newAnchor;
+};
+
+const getAnchorRefCount = (anchorElement: HTMLElement): number => {
+	const { refCount } = anchorElement.dataset;
+	if (refCount) return parseInt(refCount, 10);
+	return 0;
+};
+
+const setAnchorRefCount = (anchorElement: HTMLElement, refCount: number): void => {
+	anchorElement.dataset.refCount = String(refCount);
+};
+
+export const refAnchorElement = (anchorElement: HTMLElement): void => {
+	setAnchorRefCount(anchorElement, getAnchorRefCount(anchorElement) + 1);
+};
+
+export const unrefAnchorElement = (anchorElement: HTMLElement): void => {
+	const refCount = getAnchorRefCount(anchorElement) - 1;
+	setAnchorRefCount(anchorElement, refCount);
+
+	if (refCount <= 0) {
+		document.body.removeChild(anchorElement);
+	}
+};
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 4e79eebbd13a..08bda4ff81ff 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
@@ -1,12 +1,12 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useUserPreference, useSetting } from '@rocket.chat/ui-contexts';
 
 export type FeaturesAvailable =
 	| 'quickReactions'
 	| 'navigationBar'
 	| 'enable-timestamp-message-parser'
 	| 'contextualbarResizable'
-	| 'newNavigation';
+	| 'newNavigation'
+	| 'sidepanelNavigation';
 
 export type FeaturePreviewProps = {
 	name: FeaturesAvailable;
@@ -16,8 +16,14 @@ export type FeaturePreviewProps = {
 	imageUrl?: string;
 	value: boolean;
 	enabled: boolean;
+	disabled?: boolean;
+	enableQuery?: {
+		name: FeaturesAvailable;
+		value: boolean;
+	};
 };
 
+// TODO: Move the features preview array to another directory to be accessed from both BE and FE.
 export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 	{
 		name: 'quickReactions',
@@ -41,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,
 	},
@@ -49,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,
 	},
@@ -57,29 +65,47 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 		i18n: 'New_navigation',
 		description: 'New_navigation_description',
 		group: 'Navigation',
+		imageUrl: 'images/featurePreview/enhanced-navigation.png',
 		value: false,
 		enabled: true,
 	},
+	{
+		name: 'sidepanelNavigation',
+		i18n: 'Sidepanel_navigation',
+		description: 'Sidepanel_navigation_description',
+		group: 'Navigation',
+		value: false,
+		enabled: true,
+		enableQuery: {
+			name: 'newNavigation',
+			value: true,
+		},
+	},
 ];
 
 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 9e575aed8478..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.57.1",
+    "@rocket.chat/fuselage": "^0.59.1",
     "@rocket.chat/icons": "~0.38.0",
     "@storybook/addon-actions": "~6.5.16",
     "@storybook/addon-docs": "~6.5.16",
@@ -28,17 +28,16 @@
     "@storybook/manager-webpack4": "~6.5.16",
     "@storybook/react": "~6.5.16",
     "@storybook/testing-library": "~0.0.13",
-    "@types/babel__core": "~7.20.3",
-    "@types/react": "~17.0.69",
-    "@types/react-dom": "~17.0.22",
+    "@types/react": "~17.0.80",
+    "@types/react-dom": "~17.0.25",
     "eslint": "~8.45.0",
     "eslint-plugin-react": "~7.32.2",
-    "eslint-plugin-react-hooks": "~4.6.0",
+    "eslint-plugin-react-hooks": "~4.6.2",
     "eslint-plugin-storybook": "~0.6.15",
     "react": "~17.0.2",
-    "react-docgen-typescript-plugin": "~1.0.5",
+    "react-docgen-typescript-plugin": "~1.0.8",
     "react-dom": "~17.0.2",
-    "typescript": "~5.3.3"
+    "typescript": "~5.5.4"
   },
   "peerDependencies": {
     "@react-aria/toolbar": "*",
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index fe429e751642..c32490e954b2 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,84 @@
 # @rocket.chat/ui-contexts
 
+## 11.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.6
+  - @rocket.chat/rest-typings@6.13.0-rc.6
+  - @rocket.chat/ddp-client@0.3.8-rc.6
+  </details>
+
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.5
+  - @rocket.chat/rest-typings@6.13.0-rc.5
+  - @rocket.chat/ddp-client@0.3.8-rc.5
+  </details>
+
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.4
+  - @rocket.chat/rest-typings@6.13.0-rc.4
+  - @rocket.chat/ddp-client@0.3.8-rc.4
+  </details>
+
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.3
+  - @rocket.chat/rest-typings@6.13.0-rc.3
+  - @rocket.chat/ddp-client@0.3.8-rc.3
+  </details>
+
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.13.0-rc.2
+  - @rocket.chat/rest-typings@6.13.0-rc.2
+  - @rocket.chat/ddp-client@0.3.8-rc.2
+  </details>
+
+## 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
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 180a945c020f..d047df089b67 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.1",
+	"version": "11.0.0-rc.6",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
@@ -9,15 +9,15 @@
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/i18n": "workspace:~",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@types/react": "~17.0.69",
-		"@types/react-dom": "~17.0.22",
-		"@types/use-sync-external-store": "^0.0.5",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
+		"@types/use-sync-external-store": "^0.0.6",
 		"eslint": "~8.45.0",
-		"eslint-plugin-react-hooks": "^4.6.0",
+		"eslint-plugin-react-hooks": "^4.6.2",
 		"mongodb": "^4.17.2",
 		"react": "~17.0.2",
-		"typescript": "~5.3.3",
-		"use-sync-external-store": "^1.2.0"
+		"typescript": "~5.5.4",
+		"use-sync-external-store": "^1.2.2"
 	},
 	"peerDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/ui-contexts/src/DeviceContext.ts b/packages/ui-contexts/src/DeviceContext.ts
index 483f03707f95..5bbda60cfcd5 100644
--- a/packages/ui-contexts/src/DeviceContext.ts
+++ b/packages/ui-contexts/src/DeviceContext.ts
@@ -6,10 +6,6 @@ export type Device = {
 	type: string;
 };
 
-export interface IExperimentalHTMLAudioElement extends HTMLAudioElement {
-	setSinkId: (sinkId: string) => void;
-}
-
 type EnabledDeviceContextValue = {
 	enabled: true;
 	availableAudioOutputDevices: Device[];
@@ -18,7 +14,7 @@ type EnabledDeviceContextValue = {
 	selectedAudioOutputDevice?: Device;
 	selectedAudioInputDevice?: Device;
 	// selectedVideoInputDevice?: Device;
-	setAudioOutputDevice: (data: { outputDevice: Device; HTMLAudioElement: IExperimentalHTMLAudioElement }) => void;
+	setAudioOutputDevice: (data: { outputDevice: Device; HTMLAudioElement: HTMLAudioElement }) => void;
 	setAudioInputDevice: (device: Device) => void;
 	// setVideoInputDevice: (device: Device) => void;
 };
diff --git a/packages/ui-contexts/src/hooks/useEndpoint.ts b/packages/ui-contexts/src/hooks/useEndpoint.ts
index a0b7c977f2c6..3d29917c63e2 100644
--- a/packages/ui-contexts/src/hooks/useEndpoint.ts
+++ b/packages/ui-contexts/src/hooks/useEndpoint.ts
@@ -14,7 +14,7 @@ export type EndpointFunction<TMethod extends Method, TPathPattern extends PathPa
 export function useEndpoint<TMethod extends Method, TPathPattern extends PathPattern>(
 	method: TMethod,
 	pathPattern: TPathPattern,
-	...[keys]: undefined extends UrlParams<TPathPattern> ? [keys?: UrlParams<TPathPattern>] : [keys: UrlParams<TPathPattern>]
+	...[keys]: NoInfer<undefined extends UrlParams<TPathPattern> ? [keys?: UrlParams<TPathPattern>] : [keys: UrlParams<TPathPattern>]>
 ): EndpointFunction<TMethod, TPathPattern> {
 	const { callEndpoint } = useContext(ServerContext);
 	const keysRef = useRef(keys);
diff --git a/packages/ui-contexts/src/hooks/useSetOutputMediaDevice.ts b/packages/ui-contexts/src/hooks/useSetOutputMediaDevice.ts
index 7a68d7b10e0d..c3d6b9425876 100644
--- a/packages/ui-contexts/src/hooks/useSetOutputMediaDevice.ts
+++ b/packages/ui-contexts/src/hooks/useSetOutputMediaDevice.ts
@@ -1,17 +1,11 @@
 import { useContext } from 'react';
 
-import type { Device, IExperimentalHTMLAudioElement } from '../DeviceContext';
+import type { Device } from '../DeviceContext';
 import { DeviceContext, isDeviceContextEnabled } from '../DeviceContext';
 
 // This allows different places to set the output device by providing a HTMLAudioElement
 
-type setOutputMediaDevice = ({
-	outputDevice,
-	HTMLAudioElement,
-}: {
-	outputDevice: Device;
-	HTMLAudioElement: IExperimentalHTMLAudioElement;
-}) => void;
+type setOutputMediaDevice = ({ outputDevice, HTMLAudioElement }: { outputDevice: Device; HTMLAudioElement: HTMLAudioElement }) => void;
 
 export const useSetOutputMediaDevice = (): setOutputMediaDevice => {
 	const context = useContext(DeviceContext);
diff --git a/packages/ui-contexts/src/index.ts b/packages/ui-contexts/src/index.ts
index e021eb840aa0..313710bbfd4e 100644
--- a/packages/ui-contexts/src/index.ts
+++ b/packages/ui-contexts/src/index.ts
@@ -14,7 +14,7 @@ export { ToastMessagesContext, ToastMessagesContextValue } from './ToastMessages
 export { TooltipContext, TooltipContextValue } from './TooltipContext';
 export { TranslationContext, TranslationContextValue } from './TranslationContext';
 export { UserContext, UserContextValue } from './UserContext';
-export { DeviceContext, Device, IExperimentalHTMLAudioElement, DeviceContextValue } from './DeviceContext';
+export { DeviceContext, Device, DeviceContextValue } from './DeviceContext';
 export { ActionManagerContext, IActionManager } from './ActionManagerContext';
 
 export { useAbsoluteUrl } from './hooks/useAbsoluteUrl';
diff --git a/packages/ui-contexts/src/types/SubscriptionWithRoom.ts b/packages/ui-contexts/src/types/SubscriptionWithRoom.ts
index 908df94f0202..09f37886846c 100644
--- a/packages/ui-contexts/src/types/SubscriptionWithRoom.ts
+++ b/packages/ui-contexts/src/types/SubscriptionWithRoom.ts
@@ -9,7 +9,6 @@ export type SubscriptionWithRoom = ISubscription &
 		| 'announcement'
 		| 'avatarETag'
 		| 'lastMessage'
-		| 'streamingOptions'
 		| 'uids'
 		| 'usernames'
 		| 'usersCount'
diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json
index 28eade795907..ae50fbc17168 100644
--- a/packages/ui-kit/package.json
+++ b/packages/ui-kit/package.json
@@ -35,28 +35,28 @@
 		"test": "jest"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.21.4",
-		"@babel/eslint-parser": "~7.23.3",
+		"@babel/core": "~7.21.8",
+		"@babel/eslint-parser": "~7.23.10",
 		"@babel/plugin-transform-runtime": "~7.21.4",
-		"@babel/preset-env": "~7.21.4",
+		"@babel/preset-env": "~7.21.5",
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
-		"babel-loader": "~9.1.2",
+		"@types/jest": "~29.5.13",
+		"babel-loader": "~9.1.3",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"npm-run-all": "~4.1.5",
 		"prettier": "~2.8.8",
 		"rimraf": "~3.0.2",
-		"ts-jest": "~29.1.1",
-		"ts-loader": "~9.4.2",
-		"ts-node": "~10.9.1",
-		"ts-patch": "~3.0.2",
-		"typescript": "~5.3.3"
+		"ts-jest": "~29.1.5",
+		"ts-loader": "~9.4.4",
+		"ts-node": "~10.9.2",
+		"ts-patch": "~3.2.1",
+		"typescript": "~5.5.4"
 	},
 	"dependencies": {
-		"typia": "~5.3.3"
+		"typia": "~6.9.0"
 	},
 	"peerDependencies": {
 		"@rocket.chat/icons": "*"
diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md
index 46936bc366cf..331f679638f3 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,79 @@
 # @rocket.chat/ui-video-conf
 
+## 11.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  - @rocket.chat/ui-avatar@7.0.0-rc.6
+  </details>
+
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  - @rocket.chat/ui-avatar@7.0.0-rc.5
+  </details>
+
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  - @rocket.chat/ui-avatar@7.0.0-rc.4
+  </details>
+
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  - @rocket.chat/ui-avatar@7.0.0-rc.3
+  </details>
+
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  - @rocket.chat/ui-avatar@7.0.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 68cc0e679087..bb0ea409c157 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.1",
+	"version": "11.0.0-rc.6",
 	"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.57.1",
+		"@rocket.chat/fuselage": "^0.59.1",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "~0.38.0",
 		"@rocket.chat/jest-presets": "workspace:~",
@@ -22,17 +22,16 @@
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "~0.0.13",
 		"@storybook/testing-react": "~1.3.0",
-		"@types/babel__core": "~7.20.3",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.13",
 		"@types/jest-axe": "~3.5.9",
 		"eslint": "~8.45.0",
 		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.0",
+		"eslint-plugin-react-hooks": "~4.6.2",
 		"eslint-plugin-storybook": "~0.6.15",
 		"jest": "~29.7.0",
 		"jest-axe": "~9.0.0",
-		"react-docgen-typescript-plugin": "~1.0.5",
-		"typescript": "~5.3.3"
+		"react-docgen-typescript-plugin": "~1.0.8",
+		"typescript": "~5.5.4"
 	},
 	"peerDependencies": {
 		"@rocket.chat/css-in-js": "*",
@@ -40,8 +39,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "6.0.1",
-		"@rocket.chat/ui-contexts": "10.0.1",
+		"@rocket.chat/ui-avatar": "7.0.0-rc.6",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
 		"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 73164cdb6722..6c32d8f6d5a4 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @rocket.chat/web-ui-registration
 
+## 11.0.0-rc.6
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.6
+  </details>
+
+## 11.0.0-rc.5
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.5
+  </details>
+
+## 11.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.4
+  </details>
+
+## 11.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.3
+  </details>
+
+## 11.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@11.0.0-rc.2
+  </details>
+
+## 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
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 618603e021b5..2b921a18f4b6 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.1",
+	"version": "11.0.0-rc.6",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -21,7 +21,7 @@
 		"@babel/preset-react": "~7.22.15",
 		"@babel/preset-typescript": "~7.22.15",
 		"@rocket.chat/i18n": "workspace:~",
-		"@rocket.chat/layout": "~0.31.26",
+		"@rocket.chat/layout": "~0.31.27",
 		"@rocket.chat/mock-providers": "workspace:~",
 		"@rocket.chat/tools": "workspace:~",
 		"@rocket.chat/ui-client": "workspace:^",
@@ -34,20 +34,20 @@
 		"@storybook/react": "~6.5.16",
 		"@storybook/testing-library": "^0.2.2",
 		"@tanstack/react-query": "^4.16.1",
-		"@testing-library/react": "~16.0.0",
-		"@types/react": "~17.0.69",
+		"@testing-library/react": "~16.0.1",
+		"@types/react": "~17.0.80",
 		"babel-loader": "~8.3.0",
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
-		"storybook-dark-mode": "~3.0.1",
-		"typescript": "~5.3.3"
+		"storybook-dark-mode": "~3.0.3",
+		"typescript": "~5.5.4"
 	},
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "10.0.1",
+		"@rocket.chat/ui-contexts": "11.0.0-rc.6",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/packages/web-ui-registration/src/LoginForm.tsx b/packages/web-ui-registration/src/LoginForm.tsx
index d63886091fa0..6e28a443be63 100644
--- a/packages/web-ui-registration/src/LoginForm.tsx
+++ b/packages/web-ui-registration/src/LoginForm.tsx
@@ -162,7 +162,7 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
 								<FieldRow>
 									<TextInput
 										{...register('usernameOrEmail', {
-											required: t('registration.component.form.requiredField'),
+											required: t('Required_field', { field: t('registration.component.form.emailOrUsername') }),
 										})}
 										placeholder={usernameOrEmailPlaceholder || t('registration.component.form.emailPlaceholder')}
 										error={errors.usernameOrEmail?.message}
@@ -184,7 +184,7 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
 								<FieldRow>
 									<PasswordInput
 										{...register('password', {
-											required: t('registration.component.form.requiredField'),
+											required: t('Required_field', { field: t('registration.component.form.password') }),
 										})}
 										placeholder={passwordPlaceholder}
 										error={errors.password?.message}
diff --git a/packages/web-ui-registration/src/RegisterForm.tsx b/packages/web-ui-registration/src/RegisterForm.tsx
index 311593d8e9b7..ce7cb700d5c6 100644
--- a/packages/web-ui-registration/src/RegisterForm.tsx
+++ b/packages/web-ui-registration/src/RegisterForm.tsx
@@ -148,7 +148,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 						<FieldRow>
 							<TextInput
 								{...register('name', {
-									required: requireNameForRegister ? t('registration.component.form.requiredField') : false,
+									required: requireNameForRegister ? t('Required_field', { field: t('registration.component.form.name') }) : false,
 								})}
 								error={errors?.name?.message}
 								aria-required={requireNameForRegister}
@@ -171,7 +171,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 						<FieldRow>
 							<TextInput
 								{...register('email', {
-									required: t('registration.component.form.requiredField'),
+									required: t('Required_field', { field: t('registration.component.form.email') }),
 									pattern: {
 										value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
 										message: t('registration.component.form.invalidEmail'),
@@ -198,7 +198,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 						<FieldRow>
 							<TextInput
 								{...register('username', {
-									required: t('registration.component.form.requiredField'),
+									required: t('Required_field', { field: t('registration.component.form.username') }),
 								})}
 								error={errors?.username?.message}
 								aria-required='true'
@@ -221,7 +221,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 						<FieldRow>
 							<PasswordInput
 								{...register('password', {
-									required: t('registration.component.form.requiredField'),
+									required: t('Required_field', { field: t('registration.component.form.password') }),
 									validate: () => (!passwordIsValid ? t('Password_must_meet_the_complexity_requirements') : true),
 								})}
 								error={errors.password?.message}
@@ -247,7 +247,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 							<FieldRow>
 								<PasswordInput
 									{...register('passwordConfirmation', {
-										required: t('registration.component.form.requiredField'),
+										required: t('Required_field', { field: t('registration.component.form.confirmPassword') }),
 										deps: ['password'],
 										validate: (val: string) => (watch('password') === val ? true : t('registration.component.form.invalidConfirmPass')),
 									})}
@@ -275,7 +275,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
 							<FieldRow>
 								<TextAreaInput
 									{...register('reason', {
-										required: t('registration.component.form.requiredField'),
+										required: t('Required_field', { field: t('registration.component.form.reasonToJoin') }),
 									})}
 									error={errors?.reason?.message}
 									aria-required='true'
diff --git a/packages/web-ui-registration/src/ResetPasswordForm.tsx b/packages/web-ui-registration/src/ResetPasswordForm.tsx
index ae771c4494f7..9a807934d48c 100644
--- a/packages/web-ui-registration/src/ResetPasswordForm.tsx
+++ b/packages/web-ui-registration/src/ResetPasswordForm.tsx
@@ -56,7 +56,7 @@ export const ResetPasswordForm = ({ setLoginRoute }: { setLoginRoute: DispatchLo
 						<FieldRow>
 							<TextInput
 								{...register('email', {
-									required: t('registration.component.form.requiredField'),
+									required: t('Required_field', { field: t('registration.component.form.email') }),
 									pattern: {
 										value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
 										message: t('registration.page.resetPassword.errors.invalidEmail'),
diff --git a/turbo.json b/turbo.json
index 7ce868eb3707..0ae903f9250d 100644
--- a/turbo.json
+++ b/turbo.json
@@ -2,6 +2,14 @@
 	"$schema": "https://turborepo.org/schema.json",
 	"globalDependencies": ["tsconfig.base.json", "tsconfig.base.server.json", "tsconfig.base.client.json"],
 	"tasks": {
+		"build-preview": {
+			"dependsOn": ["^build"],
+			"outputs": ["storybook-static/**", ".storybook/**", "dist/**"]
+		},
+		".:build-preview-move": {
+			"dependsOn": ["^build-preview"],
+			"cache": false
+		},
 		"build": {
 			"dependsOn": ["^build"],
 			"outputs": ["dist/**"]
diff --git a/yarn.lock b/yarn.lock
index 430ef4b66e99..026299547a0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1039,7 +1039,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:~7.21.4":
+"@babel/core@npm:~7.21.8":
   version: 7.21.8
   resolution: "@babel/core@npm:7.21.8"
   dependencies:
@@ -1062,7 +1062,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/eslint-parser@npm:~7.21.3":
+"@babel/eslint-parser@npm:~7.21.8":
   version: 7.21.8
   resolution: "@babel/eslint-parser@npm:7.21.8"
   dependencies:
@@ -1076,9 +1076,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/eslint-parser@npm:~7.23.3":
-  version: 7.23.3
-  resolution: "@babel/eslint-parser@npm:7.23.3"
+"@babel/eslint-parser@npm:~7.23.10":
+  version: 7.23.10
+  resolution: "@babel/eslint-parser@npm:7.23.10"
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals": 5.1.1-v1
     eslint-visitor-keys: ^2.1.0
@@ -1086,7 +1086,7 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.11.0
     eslint: ^7.5.0 || ^8.0.0
-  checksum: 9573daebe21af5123c302c307be80cacf1c2bf236a9497068a14726d3944ef55e1282519d0ccf51882dfc369359a3442299c98cb22a419e209924db39d4030fd
+  checksum: 81249edee14f95720044f393b5b0a681a230ac2bde3d656b0c55b1cec4c5cb99ce0584ef6acd2e5413acc7905daee1b2e1db8e3fab18a3a74c508098a584ec9a
   languageName: node
   linkType: hard
 
@@ -2733,7 +2733,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:~7.21.4":
+"@babel/preset-env@npm:~7.21.5":
   version: 7.21.5
   resolution: "@babel/preset-env@npm:7.21.5"
   dependencies:
@@ -2937,7 +2937,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
   version: 7.24.4
   resolution: "@babel/runtime@npm:7.24.4"
   dependencies:
@@ -4692,13 +4692,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kaciras/deasync@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@kaciras/deasync@npm:1.0.3"
+"@kaciras/deasync@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "@kaciras/deasync@npm:1.0.4"
   dependencies:
-    follow-redirects: ^1.15.2
-    tar-fs: ^2.1.1
-  checksum: 6986db099e8676ae2c21d1122db9f60dd5b74dd4ec06eb164c7ded0f512d037146f82cd3dee189d2863b1c6064f17d33b273edf67b25d3bb71050c5a6fe1aa6b
+    follow-redirects: ^1.15.6
+    tar-fs: ^3.0.5
+  checksum: 4bb358de84731000f3576dff029f89bf6ddf8628c95fd3661c029716a796fc44eb3769445479c3f4a0990f10617caf7902bf07547df76bf239582f565d3855fc
   languageName: node
   linkType: hard
 
@@ -4849,6 +4849,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@meteorjs/crypto-browserify@npm:^3.12.1":
+  version: 3.12.1
+  resolution: "@meteorjs/crypto-browserify@npm:3.12.1"
+  dependencies:
+    browserify-cipher: ^1.0.1
+    browserify-sign: ^4.2.3
+    create-ecdh: ^4.0.4
+    create-hash: ^1.2.0
+    create-hmac: ^1.1.7
+    diffie-hellman: ^5.0.3
+    hash-base: ~3.0.4
+    inherits: ^2.0.4
+    pbkdf2: ^3.1.2
+    public-encrypt: ^4.0.3
+    randombytes: ^2.1.0
+    randomfill: ^1.0.4
+  checksum: 0e7b3528273d057587a28d5aba644638da966e0d641c9211b16327efa2ce1e69f769d1bfb385cf974eb36e2fd96e81e2a4d75ec4f43bf230df0c4326ed9cdd9e
+  languageName: node
+  linkType: hard
+
 "@mongodb-js/saslprep@npm:^1.1.0":
   version: 1.1.0
   resolution: "@mongodb-js/saslprep@npm:1.1.0"
@@ -8415,25 +8435,25 @@ __metadata:
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@rocket.chat/tools": "workspace:^"
-    "@types/bcrypt": ^5.0.1
-    "@types/gc-stats": ^1.4.2
+    "@types/bcrypt": ^5.0.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     bcrypt: ^5.0.1
     ejson: ^2.2.3
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
-    typescript: ~5.3.3
+    ts-node: ^10.9.2
+    typescript: ~5.5.4
     uuid: ^9.0.1
   languageName: unknown
   linkType: soft
@@ -8443,7 +8463,7 @@ __metadata:
   resolution: "@rocket.chat/account-utils@workspace:packages/account-utils"
   dependencies:
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8451,15 +8471,15 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/agenda@workspace:packages/agenda"
   dependencies:
-    "@types/debug": ^4.1.10
+    "@types/debug": ^4.1.12
     cron: ~1.8.2
     date.js: ~0.3.3
     debug: ~4.1.1
     eslint: ~8.45.0
     human-interval: ^2.0.1
-    moment-timezone: ~0.5.43
+    moment-timezone: ~0.5.45
     mongodb: ^4.17.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8470,8 +8490,8 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/jest": ~29.5.12
-    "@types/strict-uri-encode": ^2.0.1
+    "@types/jest": ~29.5.13
+    "@types/strict-uri-encode": ^2.0.2
     eslint: ~8.45.0
     filter-obj: ^3.0.0
     jest: ~29.7.0
@@ -8479,13 +8499,13 @@ __metadata:
     query-string: ^7.1.3
     split-on-first: ^3.0.0
     strict-uri-encode: ^2.0.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/apps-engine@npm:1.45.0-alpha.866":
-  version: 1.45.0-alpha.866
-  resolution: "@rocket.chat/apps-engine@npm:1.45.0-alpha.866"
+"@rocket.chat/apps-engine@npm:1.46.0":
+  version: 1.46.0
+  resolution: "@rocket.chat/apps-engine@npm:1.46.0"
   dependencies:
     "@msgpack/msgpack": 3.0.0-beta2
     adm-zip: ^0.5.9
@@ -8501,7 +8521,7 @@ __metadata:
     uuid: ~8.3.2
   peerDependencies:
     "@rocket.chat/ui-kit": "*"
-  checksum: 04abb4f712fcca206c6791322b52e2a3d97f3db06f606cd1f58fdda4e63d2123d7004bb445ad7582c52808c3ec4433d465d8855e24f3ab2f8457dafa6b017c5b
+  checksum: 0b4f0c6d00c666a78c488e5940639523e5d22500cbe2d687adc4b532b221be0e4bb9c4f011730077d8f8a06e252ea8e1d78c90d56f2517a5cf5d36d4376bed1e
   languageName: node
   linkType: hard
 
@@ -8509,11 +8529,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/apps@workspace:packages/apps"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8529,23 +8549,23 @@ __metadata:
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
-    "@types/gc-stats": ^1.4.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     ejson: ^2.2.3
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
-    typescript: ~5.3.3
+    ts-node: ^10.9.2
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8561,7 +8581,7 @@ __metadata:
     "@typescript-eslint/parser": ~5.60.1
     eslint: ~8.45.0
     jest: ~29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8571,7 +8591,7 @@ __metadata:
   dependencies:
     cheerio: 1.0.0-rc.10
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8582,7 +8602,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/icons": ~0.38.0
@@ -8591,17 +8611,15 @@ __metadata:
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/babel__core": ^7.20.3
-    "@types/babel__preset-env": ^7.9.4
-    "@types/fibers": ^3.1.3
-    "@types/jest": ~29.5.12
+    "@types/fibers": ^3.1.4
+    "@types/jest": ~29.5.13
     babel-jest: ^29.5.0
     eslint: ~8.45.0
     fibers: ^5.0.3
     jest: ~29.7.0
     mongodb: ^4.17.2
     prettier: ~2.8.8
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8609,7 +8627,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/core-typings@workspace:packages/core-typings"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/message-parser": "workspace:^"
@@ -8618,7 +8636,7 @@ __metadata:
     eslint: ~8.45.0
     mongodb: ^4.17.2
     prettier: ~2.8.8
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8632,7 +8650,7 @@ __metadata:
     "@rocket.chat/random": "workspace:^"
     eslint: ~8.45.0
     mongodb: ^4.17.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8666,12 +8684,12 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:~"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/jest": ~29.5.12
-    "@types/ws": ^8.5.8
+    "@types/jest": ~29.5.13
+    "@types/ws": ^8.5.12
     eslint: ~8.45.0
     jest: ~29.7.0
     jest-websocket-mock: ~2.5.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     ws: ^8.13.0
   peerDependencies:
     "@rocket.chat/emitter": "*"
@@ -8682,7 +8700,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:~"
@@ -8694,33 +8712,33 @@ __metadata:
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
-    "@types/ejson": ^2.2.1
-    "@types/gc-stats": ^1.4.2
+    "@types/ejson": ^2.2.2
+    "@types/gc-stats": ^1.4.3
     "@types/meteor": ^2.9.8
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     "@types/sharp": ^0.30.5
     "@types/uuid": ^8.3.4
-    "@types/ws": ^8.5.8
+    "@types/ws": ^8.5.12
     colorette: ^1.4.0
     ejson: ^2.2.3
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     jaeger-client: ^3.19.0
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     pino-pretty: ^7.6.1
     polka: ^0.5.2
     sharp: ^0.32.6
-    ts-node: ^10.9.1
-    typescript: ~5.3.3
-    underscore: ^1.13.6
+    ts-node: ^10.9.2
+    typescript: ~5.5.4
+    underscore: ^1.13.7
     uuid: ^7.0.3
     ws: ^8.8.1
   languageName: unknown
@@ -8738,8 +8756,8 @@ __metadata:
   resolution: "@rocket.chat/eslint-config@workspace:packages/eslint-config"
   dependencies:
     "@babel/core": ^7.20.7
-    "@babel/eslint-parser": ~7.23.3
-    "@types/eslint": ~8.44.6
+    "@babel/eslint-parser": ~7.23.10
+    "@types/eslint": ~8.44.9
     "@types/prettier": ^2.6.3
     "@typescript-eslint/eslint-plugin": ~5.60.1
     "@typescript-eslint/parser": ~5.60.1
@@ -8759,7 +8777,7 @@ __metadata:
   resolution: "@rocket.chat/favicon@workspace:packages/favicon"
   dependencies:
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -8880,10 +8898,10 @@ __metadata:
     "@babel/preset-env": ~7.22.20
     "@babel/preset-react": ~7.22.15
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/gazzodown": "workspace:^"
@@ -8904,12 +8922,10 @@ __metadata:
     "@storybook/source-loader": ~6.5.16
     "@storybook/theming": ~6.5.16
     "@tanstack/react-query": ^4.16.1
-    "@testing-library/react": ~16.0.0
+    "@testing-library/react": ~16.0.1
     "@testing-library/user-event": ~14.5.2
-    "@types/babel__core": ^7.20.3
-    "@types/babel__preset-env": ^7.9.4
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
     babel-loader: ~8.2.5
     cross-env: ^7.0.3
     eslint: ~8.45.0
@@ -8918,13 +8934,13 @@ __metadata:
     normalize.css: ^8.0.1
     npm-run-all: ^4.1.5
     prettier: ~2.8.8
-    react-docgen-typescript-plugin: ~1.0.5
+    react-docgen-typescript-plugin: ~1.0.8
     react-dom: ^17.0.2
-    react-i18next: ^14.1.0
+    react-i18next: ~13.2.2
     rimraf: ^3.0.2
-    storybook-dark-mode: ~3.0.1
+    storybook-dark-mode: ~3.0.3
     tslib: ^2.5.3
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/apps-engine": "*"
     "@rocket.chat/eslint-config": 0.7.0
@@ -8934,19 +8950,19 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0
-    "@rocket.chat/ui-contexts": 10.0.0
-    "@rocket.chat/ui-kit": 0.36.1
-    "@rocket.chat/ui-video-conf": 10.0.0
+    "@rocket.chat/ui-avatar": 7.0.0-rc.5
+    "@rocket.chat/ui-contexts": 11.0.0-rc.5
+    "@rocket.chat/ui-kit": "*"
+    "@rocket.chat/ui-video-conf": 11.0.0-rc.5
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/fuselage@npm:^0.57.1":
-  version: 0.57.1
-  resolution: "@rocket.chat/fuselage@npm:0.57.1"
+"@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
@@ -8964,7 +8980,7 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-virtuoso: 1.2.4
-  checksum: ed40c4e9ec6f6294e0e7c7a3912ae7c9eca026455506f3f1983483010d3d0c41169f9e38d173e5e63ed0e9824979edd607dda3c881202bf797a97b5b76e83a34
+  checksum: 6ecceaefe8b2c6b9fe0ba3b6e19360f5d46af9697e7c97af16cce6c9eea2cb79255f38ccffdbc4766b4104c079281b4980fe7c924cd62fe5d2d341581fdf4f62
   languageName: node
   linkType: hard
 
@@ -8975,7 +8991,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-tokens": ^0.33.1
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
@@ -8991,12 +9007,12 @@ __metadata:
     "@storybook/manager-webpack4": ~6.5.16
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ~0.0.13
-    "@testing-library/react": ~16.0.0
+    "@testing-library/react": ~16.0.1
     "@types/dompurify": ^3.0.5
-    "@types/jest": ~29.5.12
-    "@types/katex": ~0.16.5
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@types/jest": ~29.5.13
+    "@types/katex": ~0.16.7
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
     "@typescript-eslint/eslint-plugin": ~5.60.1
     "@typescript-eslint/parser": ~5.60.1
     babel-loader: ^8.3.0
@@ -9005,26 +9021,26 @@ __metadata:
     eslint: ~8.45.0
     eslint-plugin-anti-trojan-source: ~1.1.1
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     highlight.js: ^11.5.1
     identity-obj-proxy: ^3.0.0
     jest: ~29.7.0
-    katex: ~0.16.9
+    katex: ~0.16.11
     outdent: ^0.8.0
-    react-docgen-typescript-plugin: ~1.0.5
+    react-docgen-typescript-plugin: ~1.0.8
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
     "@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": 10.0.0
-    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-client": 11.0.0-rc.5
+    "@rocket.chat/ui-contexts": 11.0.0-rc.5
     katex: "*"
     react: "*"
   languageName: unknown
@@ -9038,7 +9054,7 @@ __metadata:
     eslint: ~8.45.0
     jest: ~29.7.0
     tsup: ^6.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9058,7 +9074,7 @@ __metadata:
     eslint: ~8.45.0
     mongodb: ^4.17.2
     prettier: ~2.8.8
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9067,20 +9083,20 @@ __metadata:
   resolution: "@rocket.chat/jest-presets@workspace:packages/jest-presets"
   dependencies:
     "@rocket.chat/eslint-config": "workspace:~"
-    "@swc/core": ~1.7.4
+    "@swc/core": ~1.7.26
     "@swc/jest": ~0.2.36
     "@testing-library/jest-dom": ~6.4.8
-    "@types/identity-obj-proxy": ^3
-    "@types/jest": ~29.5.12
+    "@types/identity-obj-proxy": ^3.0.2
+    "@types/jest": ~29.5.13
     "@types/jest-axe": ~3.5.9
-    "@types/uuid": ^9
+    "@types/uuid": ^9.0.8
     eslint: ~8.45.0
     identity-obj-proxy: ~3.0.0
     jest: ~29.7.0
     jest-axe: ~9.0.0
     jest-environment-jsdom: ~29.7.0
     jest-environment-node: ~29.7.0
-    typescript: ~5.4.5
+    typescript: ~5.5.4
     uuid: ~9.0.1
   languageName: unknown
   linkType: soft
@@ -9090,23 +9106,23 @@ __metadata:
   resolution: "@rocket.chat/jwt@workspace:packages/jwt"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ~29.7.0
     jose: ^4.14.4
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/layout@npm:~0.31.26":
-  version: 0.31.26
-  resolution: "@rocket.chat/layout@npm:0.31.26"
+"@rocket.chat/layout@npm:~0.31.27":
+  version: 0.31.27
+  resolution: "@rocket.chat/layout@npm:0.31.27"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
     react: 17.0.2
     react-dom: 17.0.2
     react-i18next: ~11.15.4
-  checksum: 473b3ce43f7e5c495bbbfb54c628a1da9fda672fee0aeef74a25690a462b243982749bb1ba6933130381aea8aae61fb9aed6b45d6c3ec370c7555e1ac69930ce
+  checksum: 5bf14cc2c85947c5773b9dbaeb7b79f36b770c80673f7eb5aaded80a3f8a7ebcbfb67c8d8c2f4731c630737784b375bd775cc53941f4ce8dd1b9d1a327449b02
   languageName: node
   linkType: hard
 
@@ -9118,14 +9134,14 @@ __metadata:
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/jwt": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
-    "@types/bcrypt": ^5.0.1
-    "@types/jest": ~29.5.12
-    "@types/ws": ^8.5.8
+    "@types/bcrypt": ^5.0.2
+    "@types/jest": ~29.5.13
+    "@types/ws": ^8.5.12
     bcrypt: ^5.0.1
     eslint: ~8.45.0
     jest: ~29.7.0
     jest-websocket-mock: ~2.5.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9133,7 +9149,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/livechat@workspace:packages/livechat"
   dependencies:
-    "@babel/eslint-parser": ~7.23.3
+    "@babel/eslint-parser": ~7.23.10
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
     "@rocket.chat/core-typings": "workspace:^"
@@ -9155,7 +9171,7 @@ __metadata:
     "@types/crypto-js": ~4.1.3
     "@types/markdown-it": ^14.0.1
     "@types/mini-css-extract-plugin": ~1.4.3
-    "@types/webpack": ^5.28.4
+    "@types/webpack": ^5.28.5
     "@types/webpack-bundle-analyzer": ^4.6.2
     "@types/webpack-dev-server": ~4.7.2
     "@types/whatwg-fetch": ~0.0.33
@@ -9165,7 +9181,7 @@ __metadata:
     babel-loader: ^8.3.0
     cross-env: ^7.0.3
     css-loader: ^4.3.0
-    css-vars-ponyfill: ^2.4.8
+    css-vars-ponyfill: ^2.4.9
     cssnano: ^4.1.11
     date-fns: ^2.15.0
     desvg-loader: ^0.1.0
@@ -9173,7 +9189,7 @@ __metadata:
     eslint: ~8.45.0
     eslint-plugin-import: ~2.26.0
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     file-loader: ^6.2.0
     gh-release: ^3.5.0
     history: ~5.3.0
@@ -9207,19 +9223,19 @@ __metadata:
     sass: ~1.62.1
     sass-loader: ~10.4.1
     serve: ^11.3.2
-    storybook-dark-mode: ~3.0.1
+    storybook-dark-mode: ~3.0.3
     style-loader: ^1.2.1
     stylelint: ^14.9.1
     stylelint-order: ^5.0.0
     svg-loader: ^0.0.2
     terser-webpack-plugin: ~4.2.3
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     url-loader: ^4.1.1
     webpack: ^5.89.0
     webpack-bundle-analyzer: ^4.9.1
     webpack-cli: ^5.1.4
     webpack-dev-server: ~4.13.3
-    whatwg-fetch: ^3.6.19
+    whatwg-fetch: ^3.6.20
   peerDependencies:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/logo": "*"
@@ -9231,11 +9247,11 @@ __metadata:
   resolution: "@rocket.chat/log-format@workspace:packages/log-format"
   dependencies:
     "@types/chalk": ^2.2.0
-    "@types/ejson": ^2.2.1
+    "@types/ejson": ^2.2.2
     chalk: ^4.0.0
     ejson: ^2.2.3
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9246,7 +9262,7 @@ __metadata:
     "@rocket.chat/emitter": ~0.31.25
     eslint: ~8.45.0
     pino: ^8.15.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9274,30 +9290,30 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/message-parser@workspace:packages/message-parser"
   dependencies:
-    "@babel/core": ~7.21.4
-    "@babel/eslint-parser": ~7.21.3
-    "@babel/preset-env": ~7.21.4
+    "@babel/core": ~7.21.8
+    "@babel/eslint-parser": ~7.21.8
+    "@babel/preset-env": ~7.21.5
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/peggy-loader": "workspace:~"
     "@rocket.chat/prettier-config": ~0.31.25
-    "@types/jest": ~29.5.12
-    "@types/node": ~14.18.42
+    "@types/jest": ~29.5.13
+    "@types/node": ~14.18.63
     "@typescript-eslint/parser": ~5.58.0
-    babel-loader: ~9.1.2
+    babel-loader: ~9.1.3
     eslint: ~8.45.0
     jest: ~29.7.0
     npm-run-all: ^4.1.5
     peggy: 3.0.2
-    prettier: ~2.8.7
+    prettier: ~2.8.8
     prettier-plugin-pegjs: ~0.5.4
     rimraf: ^3.0.2
     tldts: ~5.7.112
-    ts-loader: ~9.4.2
-    typedoc: ~0.24.1
-    typescript: ~5.3.3
+    ts-loader: ~9.4.4
+    typedoc: ~0.24.8
+    typescript: ~5.5.4
     webpack: ~5.78.0
-    webpack-cli: ~5.0.1
+    webpack-cli: ~5.0.2
   languageName: unknown
   linkType: soft
 
@@ -9307,7 +9323,7 @@ __metadata:
   dependencies:
     "@axe-core/playwright": ^4.7.3
     "@babel/core": ~7.22.20
-    "@babel/eslint-parser": ~7.23.3
+    "@babel/eslint-parser": ~7.23.10
     "@babel/plugin-proposal-nullish-coalescing-operator": ~7.18.6
     "@babel/plugin-proposal-optional-chaining": ~7.21.0
     "@babel/preset-env": ~7.22.20
@@ -9318,7 +9334,7 @@ __metadata:
     "@bugsnag/plugin-react": ~7.19.0
     "@faker-js/faker": ~8.0.2
     "@google-cloud/storage": ^6.11.0
-    "@kaciras/deasync": ^1.0.3
+    "@kaciras/deasync": ^1.0.4
     "@nivo/bar": 0.84.0
     "@nivo/core": 0.84.0
     "@nivo/heatmap": 0.84.0
@@ -9332,7 +9348,7 @@ __metadata:
     "@rocket.chat/agenda": "workspace:^"
     "@rocket.chat/api-client": "workspace:^"
     "@rocket.chat/apps": "workspace:^"
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/base64": "workspace:^"
     "@rocket.chat/cas-validate": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
@@ -9344,7 +9360,7 @@ __metadata:
     "@rocket.chat/favicon": "workspace:^"
     "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2
     "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3
-    "@rocket.chat/fuselage": ^0.57.1
+    "@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
@@ -9356,7 +9372,7 @@ __metadata:
     "@rocket.chat/instance-status": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/jwt": "workspace:^"
-    "@rocket.chat/layout": ~0.31.26
+    "@rocket.chat/layout": ~0.31.27
     "@rocket.chat/license": "workspace:^"
     "@rocket.chat/livechat": "workspace:^"
     "@rocket.chat/log-format": "workspace:^"
@@ -9402,87 +9418,87 @@ __metadata:
     "@storybook/testing-library": 0.0.13
     "@tanstack/react-query": ^4.16.1
     "@tanstack/react-query-devtools": ^4.19.1
-    "@testing-library/react": ~16.0.0
+    "@testing-library/react": ~16.0.1
     "@testing-library/user-event": ~14.5.2
-    "@types/adm-zip": ^0.5.3
+    "@types/adm-zip": ^0.5.5
     "@types/archiver": ^5.3.4
-    "@types/bad-words": ^3.0.2
-    "@types/bcrypt": ^5.0.1
-    "@types/body-parser": ^1.19.4
-    "@types/busboy": ^1.5.2
-    "@types/chai": ~4.3.16
-    "@types/chai-as-promised": ^7.1.7
-    "@types/chai-datetime": 0.0.38
-    "@types/chai-dom": 1.11.2
-    "@types/chai-spies": ~1.0.5
-    "@types/codemirror": ^5.60.12
-    "@types/cookie": ^0.5.3
-    "@types/cookie-parser": ^1.4.5
-    "@types/cors": ^2.8.15
-    "@types/cssom": ^0.4.2
+    "@types/bad-words": ^3.0.3
+    "@types/bcrypt": ^5.0.2
+    "@types/body-parser": ^1.19.5
+    "@types/busboy": ^1.5.4
+    "@types/chai": ~4.3.19
+    "@types/chai-as-promised": ^7.1.8
+    "@types/chai-datetime": 0.0.39
+    "@types/chai-dom": 1.11.3
+    "@types/chai-spies": ~1.0.6
+    "@types/codemirror": ^5.60.15
+    "@types/cookie": ^0.5.4
+    "@types/cookie-parser": ^1.4.7
+    "@types/cors": ^2.8.17
+    "@types/cssom": ^0.4.3
     "@types/dompurify": ^2.3.3
-    "@types/ejson": ^2.2.1
-    "@types/express": ^4.17.20
+    "@types/ejson": ^2.2.2
+    "@types/express": ^4.17.21
     "@types/express-rate-limit": ^5.1.3
-    "@types/fibers": ^3.1.3
-    "@types/google-libphonenumber": ^7.4.29
-    "@types/gravatar": ^1.8.5
+    "@types/fibers": ^3.1.4
+    "@types/google-libphonenumber": ^7.4.30
+    "@types/gravatar": ^1.8.6
     "@types/he": ^1.1.2
-    "@types/i18next-sprintf-postprocessor": ^0.2.2
-    "@types/imap": ^0.8.39
-    "@types/jest": ~29.5.12
+    "@types/i18next-sprintf-postprocessor": ^0.2.3
+    "@types/imap": ^0.8.40
+    "@types/jest": ~29.5.13
     "@types/jsdom": ^16.2.15
-    "@types/jsdom-global": ^3.0.6
-    "@types/jsrsasign": ^10.5.11
+    "@types/jsdom-global": ^3.0.7
+    "@types/jsrsasign": ^10.5.14
     "@types/katex": ^0.14.0
-    "@types/later": ^1.2.8
+    "@types/later": ^1.2.9
     "@types/ldapjs": ^2.2.5
-    "@types/less": ~3.0.5
+    "@types/less": ~3.0.6
     "@types/lodash": ^4.14.200
     "@types/lodash.clonedeep": ^4.5.9
-    "@types/lodash.debounce": ^4.0.8
-    "@types/lodash.get": ^4.4.8
-    "@types/mailparser": ^3.4.3
+    "@types/lodash.debounce": ^4.0.9
+    "@types/lodash.get": ^4.4.9
+    "@types/mailparser": ^3.4.4
     "@types/marked": ^4.0.8
     "@types/meteor": ^2.9.8
-    "@types/meteor-collection-hooks": ^0.8.8
+    "@types/meteor-collection-hooks": ^0.8.9
     "@types/mkdirp": ^1.0.2
     "@types/mocha": "github:whitecolor/mocha-types"
     "@types/moment-timezone": ^0.5.30
     "@types/node": ^14.18.63
-    "@types/node-gcm": ^1.0.3
-    "@types/node-rsa": ^1.1.3
-    "@types/nodemailer": ^6.4.13
-    "@types/oauth2-server": ^3.0.15
-    "@types/object-path": ^0.11.3
-    "@types/parseurl": ^1.3.2
-    "@types/prometheus-gc-stats": ^0.6.3
-    "@types/proxy-from-env": ^1.0.3
-    "@types/proxyquire": ^1.3.30
-    "@types/psl": ^1.1.2
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
-    "@types/rewire": ^2.5.29
+    "@types/node-gcm": ^1.0.5
+    "@types/node-rsa": ^1.1.4
+    "@types/nodemailer": ^6.4.15
+    "@types/oauth2-server": ^3.0.17
+    "@types/object-path": ^0.11.4
+    "@types/parseurl": ^1.3.3
+    "@types/prometheus-gc-stats": ^0.6.4
+    "@types/proxy-from-env": ^1.0.4
+    "@types/proxyquire": ^1.3.31
+    "@types/psl": ^1.1.3
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
+    "@types/rewire": ^2.5.30
     "@types/sanitize-html": ^2.9.3
     "@types/semver": ^7.3.10
     "@types/sharp": ^0.30.5
     "@types/sinon": ^10.0.20
-    "@types/speakeasy": ^2.0.9
-    "@types/strict-uri-encode": ^2.0.1
+    "@types/speakeasy": ^2.0.10
+    "@types/strict-uri-encode": ^2.0.2
     "@types/string-strip-html": ^5.0.1
-    "@types/supertest": ^2.0.15
-    "@types/supports-color": ~7.2.0
-    "@types/textarea-caret": ^3.0.2
-    "@types/ua-parser-js": ^0.7.38
-    "@types/use-subscription": ^1.0.1
-    "@types/use-sync-external-store": ^0.0.5
+    "@types/supertest": ^2.0.16
+    "@types/supports-color": ~7.2.1
+    "@types/textarea-caret": ^3.0.3
+    "@types/ua-parser-js": ^0.7.39
+    "@types/use-subscription": ^1.0.2
+    "@types/use-sync-external-store": ^0.0.6
     "@types/uuid": ^8.3.4
-    "@types/xml-crypto": ~1.4.4
-    "@types/xml-encryption": ~1.2.3
+    "@types/xml-crypto": ~1.4.6
+    "@types/xml-encryption": ~1.2.4
     "@typescript-eslint/eslint-plugin": ~5.60.1
     "@typescript-eslint/parser": ~5.60.1
     "@xmldom/xmldom": ^0.8.10
-    adm-zip: 0.5.10
+    adm-zip: 0.5.16
     ajv: ^8.11.0
     ajv-formats: ~2.1.1
     apn: 2.2.0
@@ -9497,19 +9513,19 @@ __metadata:
     babel-plugin-istanbul: ^6.1.1
     bad-words: ^3.0.4
     bcrypt: ^5.0.1
-    body-parser: 1.20.2
+    body-parser: 1.20.3
     bson: ^4.6.4
     busboy: ^1.6.0
     bytebuffer: 5.0.1
     chai: ^4.3.10
-    chai-as-promised: ^7.1.1
-    chai-datetime: ^1.8.0
+    chai-as-promised: ^7.1.2
+    chai-datetime: ^1.8.1
     chai-dom: ^1.11.0
     chai-spies: ~1.0.0
     chalk: ^4.0.0
     change-case: ^4.1.2
     chart.js: ^3.8.0
-    codemirror: ^5.65.15
+    codemirror: ^5.65.17
     colorette: ^2.0.20
     colors: ^1.4.0
     connect: ^3.7.0
@@ -9518,12 +9534,12 @@ __metadata:
     cors: ^2.8.5
     cron: ~1.8.2
     cross-env: ^7.0.3
-    css-vars-ponyfill: ^2.4.8
+    css-vars-ponyfill: ^2.4.9
     csv-parse: ^5.2.0
     date-fns: ^2.28.0
     date.js: ~0.3.3
     debug: ~4.1.1
-    docker-compose: ^0.24.3
+    docker-compose: ^0.24.8
     dompurify: ^2.3.8
     ejson: ^2.2.3
     emailreplyparser: ^0.0.5
@@ -9538,7 +9554,7 @@ __metadata:
     eslint-plugin-playwright: ~0.15.3
     eslint-plugin-prettier: ~4.2.1
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-testing-library: ~6.2.2
     eslint-plugin-you-dont-need-lodash-underscore: ~6.12.0
     eventemitter3: ^4.0.7
@@ -9553,7 +9569,7 @@ __metadata:
     filenamify: ^4.3.0
     filesize: 9.0.11
     generate-password: ^1.7.1
-    google-libphonenumber: ^3.2.33
+    google-libphonenumber: ^3.2.38
     gravatar: ^1.8.2
     he: ^1.2.0
     highlight.js: ^11.6.0
@@ -9575,7 +9591,7 @@ __metadata:
     jsdom-global: ^3.0.2
     jsrsasign: ^10.5.24
     juice: ^8.0.0
-    katex: ~0.16.9
+    katex: ~0.16.11
     ldap-escape: ^2.0.6
     ldapjs: ^2.3.3
     limax: ^3.0.0
@@ -9586,14 +9602,14 @@ __metadata:
     mailparser: ^3.4.0
     marked: ^4.2.5
     mem: ^8.1.1
-    meteor-node-stubs: ^1.2.5
+    meteor-node-stubs: ^1.2.10
     mime-db: ^1.52.0
     mime-type: ^4.0.0
     mkdirp: ^1.0.4
     mocha: ^9.2.2
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     moment: ^2.29.4
-    moment-timezone: ^0.5.43
+    moment-timezone: ^0.5.45
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     nats: ^2.6.1
@@ -9612,8 +9628,8 @@ __metadata:
     pdfjs-dist: ^2.13.216
     pino: ^8.15.0
     pino-pretty: ^7.6.1
-    playwright-qase-reporter: ^1.2.1
-    postcss: ~8.4.31
+    playwright-qase-reporter: ^1.2.2
+    postcss: ~8.4.45
     postcss-custom-properties: ^11.0.0
     postcss-easy-import: ^3.0.0
     postcss-load-config: ^3.1.4
@@ -9630,10 +9646,10 @@ __metadata:
     query-string: ^7.1.3
     queue-fifo: ^0.2.6
     rc-scrollbars: ^1.1.6
-    re-resizable: ^6.9.9
+    re-resizable: ^6.9.18
     react: ~17.0.2
     react-aria: ~3.23.1
-    react-docgen-typescript-plugin: ^1.0.5
+    react-docgen-typescript-plugin: ^1.0.8
     react-dom: ~17.0.2
     react-error-boundary: ^3.1.4
     react-hook-form: ~7.45.4
@@ -9651,7 +9667,7 @@ __metadata:
     sodium-plus: ^0.9.0
     source-map: ^0.7.4
     speakeasy: ^2.0.0
-    stream-buffers: ^3.0.2
+    stream-buffers: ^3.0.3
     strict-uri-encode: ^2.0.0
     string-strip-html: ^7.0.3
     stylelint: ^14.9.1
@@ -9664,21 +9680,21 @@ __metadata:
     template-file: ^6.0.1
     textarea-caret: ^3.1.0
     tinykeys: ^1.4.0
-    ts-node: ^10.9.1
+    ts-node: ^10.9.2
     turndown: ^7.1.2
     twilio: ^3.76.1
     twit: ^2.2.11
-    typescript: ~5.3.3
-    typia: ^5.3.3
-    ua-parser-js: ^1.0.37
-    underscore: ^1.13.6
+    typescript: ~5.5.4
+    typia: ~6.9.0
+    ua-parser-js: ^1.0.38
+    underscore: ^1.13.7
     universal-perf-hooks: ^1.0.1
     url-polyfill: ^1.1.12
     use-subscription: ~1.6.0
-    use-sync-external-store: ^1.2.0
+    use-sync-external-store: ^1.2.2
     uuid: ^8.3.2
     vm2: ^3.9.19
-    webdav: ^4.11.3
+    webdav: ^4.11.4
     xml-crypto: ~3.1.0
     xml-encryption: ~3.0.2
     xml2js: ~0.5.0
@@ -9696,12 +9712,12 @@ __metadata:
     "@rocket.chat/ui-contexts": "workspace:*"
     "@storybook/react": ~6.5.16
     "@tanstack/react-query": ^4.16.1
-    "@types/use-sync-external-store": ^0.0.5
+    "@types/use-sync-external-store": ^0.0.6
     eslint: ~8.45.0
     i18next: ~23.4.9
     react: ~17.0.2
     react-i18next: ~13.2.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     use-sync-external-store: ~1.2.2
   peerDependencies:
     "@tanstack/react-query": "*"
@@ -9714,10 +9730,10 @@ __metadata:
   resolution: "@rocket.chat/model-typings@workspace:packages/model-typings"
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
-    "@types/node-rsa": ^1.1.3
+    "@types/node-rsa": ^1.1.4
     eslint: ~8.45.0
     mongodb: ^4.17.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9727,10 +9743,10 @@ __metadata:
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/model-typings": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ^29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9759,7 +9775,7 @@ __metadata:
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@rocket.chat/tools": "workspace:^"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     "@types/node": ^14.18.63
     date-fns: ^2.28.0
     ejson: ^2.2.3
@@ -9769,11 +9785,11 @@ __metadata:
     fibers: ^5.0.3
     jest: ~29.7.0
     mem: ^8.1.1
-    moment-timezone: ^0.5.43
+    moment-timezone: ^0.5.45
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     pino: ^8.15.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9792,26 +9808,26 @@ __metadata:
     "@rocket.chat/omnichannel-services": "workspace:^"
     "@rocket.chat/pdf-worker": "workspace:^"
     "@rocket.chat/tools": "workspace:^"
-    "@types/gc-stats": ^1.4.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     ejson: ^2.2.3
     emoji-toolkit: ^7.0.1
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
-    moment-timezone: ^0.5.43
+    moleculer: ^0.14.34
+    moment-timezone: ^0.5.45
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
-    typescript: ~5.3.3
+    ts-node: ^10.9.2
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9841,10 +9857,10 @@ __metadata:
   resolution: "@rocket.chat/password-policies@workspace:packages/password-policies"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ~29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9853,10 +9869,10 @@ __metadata:
   resolution: "@rocket.chat/patch-injection@workspace:packages/patch-injection"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ~29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9870,20 +9886,20 @@ __metadata:
     "@rocket.chat/jest-presets": "workspace:~"
     "@storybook/addon-essentials": ~6.5.16
     "@storybook/react": ~6.5.16
-    "@testing-library/react": ~16.0.0
-    "@types/emojione": ^2.2.8
-    "@types/jest": ~29.5.12
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@testing-library/react": ~16.0.1
+    "@types/emojione": ^2.2.9
+    "@types/jest": ~29.5.13
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
     emoji-assets: ^7.0.1
     emoji-toolkit: ^7.0.1
     eslint: ~8.45.0
     jest: ~29.7.0
     moment: ^2.29.4
-    moment-timezone: ^0.5.43
+    moment-timezone: ^0.5.45
     react: ~18.3.1
     react-dom: ~18.3.1
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9893,13 +9909,13 @@ __metadata:
   dependencies:
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/prettier-config": ~0.31.25
-    "@types/node": ~14.18.42
+    "@types/node": ~14.18.63
     eslint: ~8.45.0
     npm-run-all: ^4.1.5
     peggy: 3.0.2
-    prettier: ~2.8.7
+    prettier: ~2.8.8
     rimraf: ^3.0.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     webpack: ~5.78.0
   peerDependencies:
     peggy: "*"
@@ -9912,7 +9928,7 @@ __metadata:
   resolution: "@rocket.chat/poplib@workspace:packages/node-poplib"
   dependencies:
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9928,23 +9944,23 @@ __metadata:
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/presence": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
-    "@types/gc-stats": ^1.4.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     ejson: ^2.2.3
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
-    typescript: ~5.3.3
+    ts-node: ^10.9.2
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9955,7 +9971,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
@@ -9966,7 +9982,7 @@ __metadata:
     eslint: ~8.45.0
     jest: ~29.7.0
     mongodb: ^4.17.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -9992,26 +10008,26 @@ __metadata:
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
-    "@types/gc-stats": ^1.4.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     ejson: ^2.2.3
     emoji-toolkit: ^7.0.1
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
-    moment-timezone: ^0.5.43
+    moleculer: ^0.14.34
+    moment-timezone: ^0.5.45
     mongo-message-queue: ^1.0.0
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
-    typescript: ~5.3.3
+    ts-node: ^10.9.2
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10027,7 +10043,7 @@ __metadata:
     "@typescript-eslint/parser": ~5.60.1
     eslint: ~8.45.0
     jest: ~29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10040,13 +10056,13 @@ __metadata:
     "@actions/github": ^5.1.1
     "@octokit/plugin-throttling": ^6.0.0
     "@rocket.chat/eslint-config": "workspace:^"
-    "@types/node": ^16.18.60
+    "@types/node": ^16.18.108
     eslint: ~8.45.0
     mdast-util-to-string: 2.0.0
     remark-parse: 9.0.0
     remark-stringify: 9.0.1
     semver: ^7.5.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
     unified: 9.2.2
   languageName: unknown
   linkType: soft
@@ -10060,8 +10076,8 @@ __metadata:
     "@types/node": ^14.18.63
     dataloader: ^1.4.0
     eslint: ~8.45.0
-    node-fetch: ^2
-    typescript: ~5.3.3
+    node-fetch: ^2.7.0
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10069,18 +10085,18 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     ajv: ^8.11.0
     ajv-formats: ^2.1.1
     eslint: ~8.45.0
     jest: ~29.7.0
     mongodb: ^4.17.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10103,7 +10119,7 @@ __metadata:
   dependencies:
     "@rocket.chat/license": "workspace:^"
     eslint: ~8.45.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10111,13 +10127,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/server-fetch@workspace:packages/server-fetch"
   dependencies:
-    "@types/proxy-from-env": ^1.0.3
+    "@types/proxy-from-env": ^1.0.4
     eslint: ~8.45.0
     http-proxy-agent: ^5.0.0
     https-proxy-agent: ^5.0.1
     node-fetch: 2.3.0
     proxy-from-env: ^1.1.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10133,7 +10149,7 @@ __metadata:
     "@typescript-eslint/parser": ~5.60.1
     eslint: ~8.45.0
     jest: ~29.7.0
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10150,24 +10166,24 @@ __metadata:
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
-    "@types/bcrypt": ^5.0.1
-    "@types/gc-stats": ^1.4.2
+    "@types/bcrypt": ^5.0.2
+    "@types/gc-stats": ^1.4.3
     "@types/node": ^14.18.63
-    "@types/polka": ^0.5.6
+    "@types/polka": ^0.5.7
     ejson: ^2.2.3
     eslint: ~8.45.0
     event-loop-stats: ^1.4.1
     eventemitter3: ^4.0.7
     fibers: ^5.0.3
-    gc-stats: ^1.4.0
+    gc-stats: ^1.4.1
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.4.0
     pino: ^8.15.0
     polka: ^0.5.2
-    ts-node: ^10.9.1
-    typescript: ~5.3.3
+    ts-node: ^10.9.2
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
@@ -10203,34 +10219,33 @@ __metadata:
   resolution: "@rocket.chat/tools@workspace:packages/tools"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     eslint: ~8.45.0
     jest: ~29.7.0
-    moment-timezone: ^0.5.43
-    typescript: ~5.3.3
+    moment-timezone: ^0.5.45
+    typescript: ~5.5.4
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/ui-avatar@workspace:^, @rocket.chat/ui-avatar@workspace:packages/ui-avatar":
+"@rocket.chat/ui-avatar@workspace:^, @rocket.chat/ui-avatar@workspace:packages/ui-avatar, @rocket.chat/ui-avatar@workspace:~":
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar"
   dependencies:
     "@babel/core": ~7.22.20
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/ui-contexts": "workspace:^"
-    "@types/babel__core": ~7.20.3
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
     eslint: ~8.45.0
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     eslint-plugin-testing-library: ~5.11.1
     react: ^17.0.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-contexts": 11.0.0-rc.5
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10242,11 +10257,12 @@ __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.57.1
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/mock-providers": "workspace:^"
+    "@rocket.chat/ui-avatar": "workspace:~"
     "@rocket.chat/ui-contexts": "workspace:~"
     "@storybook/addon-actions": ~6.5.16
     "@storybook/addon-docs": ~6.5.16
@@ -10258,30 +10274,31 @@ __metadata:
     "@storybook/manager-webpack4": ~6.5.16
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ~0.0.13
-    "@testing-library/react": ~16.0.0
-    "@types/babel__core": ~7.20.3
-    "@types/jest": ~29.5.12
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@testing-library/react": ~16.0.1
+    "@types/jest": ~29.5.13
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
     eslint: ~8.45.0
     eslint-plugin-anti-trojan-source: ~1.1.1
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     eslint-plugin-testing-library: ~5.11.1
     jest: ~29.7.0
     react: ^17.0.2
     react-dom: ^17.0.2
     react-hook-form: ~7.45.4
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@react-aria/toolbar": "*"
     "@rocket.chat/css-in-js": "*"
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 10.0.0
-    react: ~17.0.2
+    "@rocket.chat/ui-avatar": "*"
+    "@rocket.chat/ui-contexts": "*"
+    react: "*"
+    react-i18next: "*"
   languageName: unknown
   linkType: soft
 
@@ -10292,7 +10309,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@react-aria/toolbar": ^3.0.0-beta.1
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/icons": ~0.38.0
     "@storybook/addon-actions": ~6.5.16
     "@storybook/addon-docs": ~6.5.16
@@ -10301,17 +10318,16 @@ __metadata:
     "@storybook/manager-webpack4": ~6.5.16
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ~0.0.13
-    "@types/babel__core": ~7.20.3
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
     eslint: ~8.45.0
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     react: ~17.0.2
-    react-docgen-typescript-plugin: ~1.0.5
+    react-docgen-typescript-plugin: ~1.0.8
     react-dom: ~17.0.2
-    typescript: ~5.3.3
+    typescript: ~5.5.4
   peerDependencies:
     "@react-aria/toolbar": "*"
     "@rocket.chat/fuselage": "*"
@@ -10332,15 +10348,15 @@ __metadata:
     "@rocket.chat/i18n": "workspace:~"
     "@rocket.chat/password-policies": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/react": ~17.0.69
-    "@types/react-dom": ~17.0.22
-    "@types/use-sync-external-store": ^0.0.5
+    "@types/react": ~17.0.80
+    "@types/react-dom": ~17.0.25
+    "@types/use-sync-external-store": ^0.0.6
     eslint: ~8.45.0
-    eslint-plugin-react-hooks: ^4.6.0
+    eslint-plugin-react-hooks: ^4.6.2
     mongodb: ^4.17.2
     react: ~17.0.2
-    typescript: ~5.3.3
-    use-sync-external-store: ^1.2.0
+    typescript: ~5.5.4
+    use-sync-external-store: ^1.2.2
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:^"
@@ -10357,26 +10373,26 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-kit@workspace:packages/ui-kit"
   dependencies:
-    "@babel/core": ~7.21.4
-    "@babel/eslint-parser": ~7.23.3
+    "@babel/core": ~7.21.8
+    "@babel/eslint-parser": ~7.23.10
     "@babel/plugin-transform-runtime": ~7.21.4
-    "@babel/preset-env": ~7.21.4
+    "@babel/preset-env": ~7.21.5
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": ~29.5.12
-    babel-loader: ~9.1.2
+    "@types/jest": ~29.5.13
+    babel-loader: ~9.1.3
     eslint: ~8.45.0
     jest: ~29.7.0
     npm-run-all: ~4.1.5
     prettier: ~2.8.8
     rimraf: ~3.0.2
-    ts-jest: ~29.1.1
-    ts-loader: ~9.4.2
-    ts-node: ~10.9.1
-    ts-patch: ~3.0.2
-    typescript: ~5.3.3
-    typia: ~5.3.3
+    ts-jest: ~29.1.5
+    ts-loader: ~9.4.4
+    ts-node: ~10.9.2
+    ts-patch: ~3.2.1
+    typescript: ~5.5.4
+    typia: ~6.9.0
   peerDependencies:
     "@rocket.chat/icons": "*"
   languageName: unknown
@@ -10387,19 +10403,19 @@ __metadata:
   resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming"
   dependencies:
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.57.1
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/ui-contexts": "workspace:~"
-    "@types/react": ~17.0.69
+    "@types/react": ~17.0.80
     eslint: ~8.45.0
     eslint-plugin-anti-trojan-source: ~1.1.1
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-testing-library: ^5.11.1
     react: ~17.0.2
-    react-docgen-typescript-plugin: ~1.0.5
-    typescript: ~5.3.3
+    react-docgen-typescript-plugin: ~1.0.8
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/css-in-js": "*"
     "@rocket.chat/fuselage": "*"
@@ -10417,7 +10433,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.57.1
+    "@rocket.chat/fuselage": ^0.59.1
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ~0.38.0
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10433,40 +10449,40 @@ __metadata:
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ~0.0.13
     "@storybook/testing-react": ~1.3.0
-    "@types/babel__core": ~7.20.3
-    "@types/jest": ~29.5.12
+    "@types/jest": ~29.5.13
     "@types/jest-axe": ~3.5.9
     eslint: ~8.45.0
     eslint-plugin-react: ~7.32.2
-    eslint-plugin-react-hooks: ~4.6.0
+    eslint-plugin-react-hooks: ~4.6.2
     eslint-plugin-storybook: ~0.6.15
     jest: ~29.7.0
     jest-axe: ~9.0.0
-    react-docgen-typescript-plugin: ~1.0.5
-    typescript: ~5.3.3
+    react-docgen-typescript-plugin: ~1.0.8
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/css-in-js": "*"
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 6.0.0
-    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-avatar": 7.0.0-rc.5
+    "@rocket.chat/ui-contexts": 11.0.0-rc.5
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/uikit-playground@workspace:packages/uikit-playground":
+"@rocket.chat/uikit-playground@workspace:apps/uikit-playground":
   version: 0.0.0-use.local
-  resolution: "@rocket.chat/uikit-playground@workspace:packages/uikit-playground"
+  resolution: "@rocket.chat/uikit-playground@workspace:apps/uikit-playground"
   dependencies:
     "@codemirror/lang-javascript": ^6.1.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.57.1
+    "@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
@@ -10477,17 +10493,17 @@ __metadata:
     "@rocket.chat/styled": ~0.31.25
     "@rocket.chat/ui-avatar": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:~"
-    "@types/react": ~17.0.69
-    "@types/react-beautiful-dnd": ^13.1.6
-    "@types/react-dom": ~17.0.22
-    "@types/use-subscription": ^1.0.1
+    "@types/react": ~17.0.80
+    "@types/react-beautiful-dnd": ^13.1.8
+    "@types/react-dom": ~17.0.25
+    "@types/use-subscription": ^1.0.2
     "@typescript-eslint/eslint-plugin": ~5.60.1
     "@typescript-eslint/parser": ~5.60.1
     "@vitejs/plugin-react": ^4.0.0
     codemirror: ^6.0.1
     eslint: ~8.45.0
-    eslint-plugin-react-hooks: ^4.6.0
-    eslint-plugin-react-refresh: ^0.4.4
+    eslint-plugin-react-hooks: ^4.6.2
+    eslint-plugin-react-refresh: ^0.4.11
     eslint4b-prebuilt: ^6.7.2
     moment: ^2.29.4
     rc-scrollbars: ^1.1.6
@@ -10498,8 +10514,8 @@ __metadata:
     react-split-pane: ^0.1.92
     react-virtuoso: ^4.7.1
     reactflow: ^11.7.2
-    typescript: ~5.3.3
-    use-subscription: ^1.8.0
+    typescript: ~5.5.4
+    use-subscription: ^1.8.2
     vite: ^4.3.9
   languageName: unknown
   linkType: soft
@@ -10513,7 +10529,7 @@ __metadata:
     "@babel/preset-react": ~7.22.15
     "@babel/preset-typescript": ~7.22.15
     "@rocket.chat/i18n": "workspace:~"
-    "@rocket.chat/layout": ~0.31.26
+    "@rocket.chat/layout": ~0.31.27
     "@rocket.chat/mock-providers": "workspace:~"
     "@rocket.chat/tools": "workspace:~"
     "@rocket.chat/ui-client": "workspace:^"
@@ -10526,19 +10542,19 @@ __metadata:
     "@storybook/react": ~6.5.16
     "@storybook/testing-library": ^0.2.2
     "@tanstack/react-query": ^4.16.1
-    "@testing-library/react": ~16.0.0
-    "@types/react": ~17.0.69
+    "@testing-library/react": ~16.0.1
+    "@types/react": ~17.0.80
     babel-loader: ~8.3.0
     eslint: ~8.45.0
     react: ~17.0.2
     react-hook-form: ~7.45.4
     react-i18next: ~13.2.2
-    storybook-dark-mode: ~3.0.1
-    typescript: ~5.3.3
+    storybook-dark-mode: ~3.0.3
+    typescript: ~5.5.4
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 10.0.0
+    "@rocket.chat/ui-contexts": 11.0.0-rc.5
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"
@@ -10546,6 +10562,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@samchon/openapi@npm:^0.4.6":
+  version: 0.4.9
+  resolution: "@samchon/openapi@npm:0.4.9"
+  checksum: a6fd35db27ebf3223c4793bd9a6669fc0e48ccbe522fa8eb26519073b897fb774cd652777e8d7d414bc19bf47ae03be227dfc2b65e2e1a5869c9723c5adad2e0
+  languageName: node
+  linkType: hard
+
 "@selderee/plugin-htmlparser2@npm:^0.6.0":
   version: 0.6.0
   resolution: "@selderee/plugin-htmlparser2@npm:0.6.0"
@@ -11257,24 +11280,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/api@npm:^7.0.0":
-  version: 7.3.2
-  resolution: "@storybook/api@npm:7.3.2"
-  dependencies:
-    "@storybook/client-logger": 7.3.2
-    "@storybook/manager-api": 7.3.2
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    react:
-      optional: true
-    react-dom:
-      optional: true
-  checksum: dfe5f976256fc74c82548ca35f7052b82ca87a21d44e8554c0913ecc8f5d0e0d317a57b0308057473c3b8efa95428590d4350c9c4d1ef7f7c02ee8c7c2d2e8ee
-  languageName: node
-  linkType: hard
-
 "@storybook/builder-webpack4@npm:6.5.16, @storybook/builder-webpack4@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/builder-webpack4@npm:6.5.16"
@@ -11441,6 +11446,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/channels@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/channels@npm:7.6.20"
+  dependencies:
+    "@storybook/client-logger": 7.6.20
+    "@storybook/core-events": 7.6.20
+    "@storybook/global": ^5.0.0
+    qs: ^6.10.0
+    telejson: ^7.2.0
+    tiny-invariant: ^1.3.1
+  checksum: e600949b77b8ae2c865eab8e2f4022893843932c76f9f49f2ef6d8a8f62114f979d38fe93fed2d8899fa892bb1dcd353c81e292515a7bd8fbc944629939574b0
+  languageName: node
+  linkType: hard
+
 "@storybook/client-api@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/client-api@npm:6.5.16"
@@ -11491,6 +11510,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/client-logger@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/client-logger@npm:7.6.20"
+  dependencies:
+    "@storybook/global": ^5.0.0
+  checksum: 98bf603df918a74bc5b34f344ba70356d8e2b889d8a5cbfb7a03c23dcf409029800319e5d3e0ff7e95545a2d4a989a53c2097eb7a36de808d287d466d4d92573
+  languageName: node
+  linkType: hard
+
 "@storybook/components@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/components@npm:6.5.16"
@@ -11647,6 +11675,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/core-events@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/core-events@npm:7.6.20"
+  dependencies:
+    ts-dedent: ^2.0.0
+  checksum: 284f4df326200dc0bdfc74472dccab3bbed38cf8515baebe467830b562f9ace06fb6e5640b155b4ae462288b9f3257233c6b5212fcb9b2d3024f9e4d08d28457
+  languageName: node
+  linkType: hard
+
 "@storybook/core-server@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/core-server@npm:6.5.16"
@@ -11794,6 +11831,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/csf@npm:^0.1.2":
+  version: 0.1.11
+  resolution: "@storybook/csf@npm:0.1.11"
+  dependencies:
+    type-fest: ^2.19.0
+  checksum: ba2a265f62ad82a2853b069f77e974efe31bed263a640ca1dd8e6d7e194022018a67ad4a2587ae928f33ae45aaf6ffedd5925ba3fcf3fe5b7996667a918e22eb
+  languageName: node
+  linkType: hard
+
 "@storybook/docs-tools@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/docs-tools@npm:6.5.16"
@@ -11865,6 +11911,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/manager-api@npm:^7.0.0":
+  version: 7.6.20
+  resolution: "@storybook/manager-api@npm:7.6.20"
+  dependencies:
+    "@storybook/channels": 7.6.20
+    "@storybook/client-logger": 7.6.20
+    "@storybook/core-events": 7.6.20
+    "@storybook/csf": ^0.1.2
+    "@storybook/global": ^5.0.0
+    "@storybook/router": 7.6.20
+    "@storybook/theming": 7.6.20
+    "@storybook/types": 7.6.20
+    dequal: ^2.0.2
+    lodash: ^4.17.21
+    memoizerific: ^1.11.3
+    store2: ^2.14.2
+    telejson: ^7.2.0
+    ts-dedent: ^2.0.0
+  checksum: 01a35e757b0e673570a6868fa64b9a3a258011b6c16afe6e0164ae8406896eeaf53d9a069db6862cbd4b10b64546f0c78ed96872c036a02869b2f530603e9dec
+  languageName: node
+  linkType: hard
+
 "@storybook/manager-webpack4@npm:6.5.16, @storybook/manager-webpack4@npm:~6.5.16":
   version: 6.5.16
   resolution: "@storybook/manager-webpack4@npm:6.5.16"
@@ -12212,6 +12280,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/router@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/router@npm:7.6.20"
+  dependencies:
+    "@storybook/client-logger": 7.6.20
+    memoizerific: ^1.11.3
+    qs: ^6.10.0
+  checksum: 67af15f4144e674dcd957fc8ae2ed6e7cbd3845c8fb1343760ec67bebf04eeb54b7088db701208c976026641373dc2287f6908dbc7e3d96da9a1c910054ba942
+  languageName: node
+  linkType: hard
+
 "@storybook/semver@npm:^7.3.2":
   version: 7.3.2
   resolution: "@storybook/semver@npm:7.3.2"
@@ -12360,6 +12439,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/theming@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/theming@npm:7.6.20"
+  dependencies:
+    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0
+    "@storybook/client-logger": 7.6.20
+    "@storybook/global": ^5.0.0
+    memoizerific: ^1.11.3
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 2c3cbac759d300fb471acf4e01514f7728c48533c6e24c37b0351d9f0fcc9240dbdcf50067a81c3ff73b27a1da4227debb55a48ab2920368099871d1f49252ea
+  languageName: node
+  linkType: hard
+
 "@storybook/types@npm:7.3.2":
   version: 7.3.2
   resolution: "@storybook/types@npm:7.3.2"
@@ -12372,6 +12466,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/types@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/types@npm:7.6.20"
+  dependencies:
+    "@storybook/channels": 7.6.20
+    "@types/babel__core": ^7.0.0
+    "@types/express": ^4.7.0
+    file-system-cache: 2.3.0
+  checksum: 1e0ae196c63ace6a9a0f06a42c7294cfc840665d1ff7ae6d9fd2466ed3d78387672951aa7a9064a719384938c57d8eb25c8089657710d95c546344fbc28d8df6
+  languageName: node
+  linkType: hard
+
 "@storybook/ui@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/ui@npm:6.5.16"
@@ -12397,90 +12503,90 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-darwin-arm64@npm:1.7.4"
+"@swc/core-darwin-arm64@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-darwin-arm64@npm:1.7.26"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-darwin-x64@npm:1.7.4"
+"@swc/core-darwin-x64@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-darwin-x64@npm:1.7.26"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.4"
+"@swc/core-linux-arm-gnueabihf@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.26"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.4"
+"@swc/core-linux-arm64-gnu@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.26"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-linux-arm64-musl@npm:1.7.4"
+"@swc/core-linux-arm64-musl@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-linux-arm64-musl@npm:1.7.26"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-linux-x64-gnu@npm:1.7.4"
+"@swc/core-linux-x64-gnu@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-linux-x64-gnu@npm:1.7.26"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-linux-x64-musl@npm:1.7.4"
+"@swc/core-linux-x64-musl@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-linux-x64-musl@npm:1.7.26"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.4"
+"@swc/core-win32-arm64-msvc@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.26"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.4"
+"@swc/core-win32-ia32-msvc@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.26"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core-win32-x64-msvc@npm:1.7.4"
+"@swc/core-win32-x64-msvc@npm:1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core-win32-x64-msvc@npm:1.7.26"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:~1.7.4":
-  version: 1.7.4
-  resolution: "@swc/core@npm:1.7.4"
-  dependencies:
-    "@swc/core-darwin-arm64": 1.7.4
-    "@swc/core-darwin-x64": 1.7.4
-    "@swc/core-linux-arm-gnueabihf": 1.7.4
-    "@swc/core-linux-arm64-gnu": 1.7.4
-    "@swc/core-linux-arm64-musl": 1.7.4
-    "@swc/core-linux-x64-gnu": 1.7.4
-    "@swc/core-linux-x64-musl": 1.7.4
-    "@swc/core-win32-arm64-msvc": 1.7.4
-    "@swc/core-win32-ia32-msvc": 1.7.4
-    "@swc/core-win32-x64-msvc": 1.7.4
+"@swc/core@npm:~1.7.26":
+  version: 1.7.26
+  resolution: "@swc/core@npm:1.7.26"
+  dependencies:
+    "@swc/core-darwin-arm64": 1.7.26
+    "@swc/core-darwin-x64": 1.7.26
+    "@swc/core-linux-arm-gnueabihf": 1.7.26
+    "@swc/core-linux-arm64-gnu": 1.7.26
+    "@swc/core-linux-arm64-musl": 1.7.26
+    "@swc/core-linux-x64-gnu": 1.7.26
+    "@swc/core-linux-x64-musl": 1.7.26
+    "@swc/core-win32-arm64-msvc": 1.7.26
+    "@swc/core-win32-ia32-msvc": 1.7.26
+    "@swc/core-win32-x64-msvc": 1.7.26
     "@swc/counter": ^0.1.3
     "@swc/types": ^0.1.12
   peerDependencies:
@@ -12509,7 +12615,7 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: 1b2231fcb6a2a63171e34e80f0d43cd459d259b0a2fa269a129456291dc11b95a716aed60f61e5fcafd039a217916ece375876b02d125d88cdc7927382805e55
+  checksum: 8249f2af001f2b5b312ccace4e3a8575bf286bb0f67f029eb58ef8b144f73e37f766800859161ef87c0993e586055238c000ab17dddf9d3760edcfa63ffd22e6
   languageName: node
   linkType: hard
 
@@ -12658,9 +12764,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/react@npm:~16.0.0":
-  version: 16.0.0
-  resolution: "@testing-library/react@npm:16.0.0"
+"@testing-library/react@npm:~16.0.1":
+  version: 16.0.1
+  resolution: "@testing-library/react@npm:16.0.1"
   dependencies:
     "@babel/runtime": ^7.12.5
   peerDependencies:
@@ -12674,7 +12780,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 45a35f0b5f34b5a7f4dcefdd3f1d202d5421692e5cc7a491c9bc71e6ed9dd5872a182b80b4dfefb4a56d9c1df35e50f6fa2917bcf657cc26b4bc0d2259df0027
+  checksum: 1837db473ea018cf2b5d0cbfffb7a30d0d759e5a7f23aad431441c77bcc3d2533250cd003a61878fd908267df47404cedcb5914f12d79e413002c659652b37fd
   languageName: node
   linkType: hard
 
@@ -12754,12 +12860,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/adm-zip@npm:^0.5.3":
-  version: 0.5.3
-  resolution: "@types/adm-zip@npm:0.5.3"
+"@types/adm-zip@npm:^0.5.5":
+  version: 0.5.5
+  resolution: "@types/adm-zip@npm:0.5.5"
   dependencies:
     "@types/node": "*"
-  checksum: 995e21441cc6fe180f12ebf4e722bc6dbde0f9c765e57353018a0969a27cf15542c3f5451bfa1a82b958d5ed5e371fb3cbe55f934076dae22d8bf6a259a536bf
+  checksum: 808c25b8a1c2e1c594cf9b1514e7953105cf96e19e38aa7dc109ff2537bda7345b950ef1f4e54a6e824e5503e29d24b0ff6d0aa1ff9bd4afb79ef0ef2df9ebab
   languageName: node
   linkType: hard
 
@@ -12779,7 +12885,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.20.3, @types/babel__core@npm:~7.20.3":
+"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14":
   version: 7.20.3
   resolution: "@types/babel__core@npm:7.20.3"
   dependencies:
@@ -12801,13 +12907,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__preset-env@npm:^7.9.4":
-  version: 7.9.4
-  resolution: "@types/babel__preset-env@npm:7.9.4"
-  checksum: a4580b541d4fe7bdf9ecb9695cb90827f96c75e5c807e6fcf6cbca3beeb9106019dc322b2d08de03025d57c6f3f1431d80eb3ea6d9416e90bc8ee15460efa27d
-  languageName: node
-  linkType: hard
-
 "@types/babel__template@npm:*":
   version: 7.4.1
   resolution: "@types/babel__template@npm:7.4.1"
@@ -12827,23 +12926,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/bad-words@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@types/bad-words@npm:3.0.2"
-  checksum: aa40d10364b73deb5617c0b53d5a782841ddd173e6cc68bc41d48c2c95c63ac81d23e2cabeb3d686cb7d655512353ac1866135203305b820d4c60859635ba9d3
+"@types/bad-words@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@types/bad-words@npm:3.0.3"
+  checksum: 220729e6888b523477e3b1ca431b2fd01d816e9dbdd309c8a68b7a1a64ce02ed13ec44fe83bf83872f559d19b9180d4103b5f4179b7d4b1dd497306a46cb3c1d
   languageName: node
   linkType: hard
 
-"@types/bcrypt@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@types/bcrypt@npm:5.0.1"
+"@types/bcrypt@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@types/bcrypt@npm:5.0.2"
   dependencies:
     "@types/node": "*"
-  checksum: 2419ad2e7601b2c306ce2bd8bd8d911770f1abdea780efd4e61e9329b757e47c80fbd73fc52a925a371de47247ce92f04d11bdf24b8b44754ea0ba18d06d2202
+  checksum: b1f97532ffe6079cb57a464f28b5b37a30bc9620f43469e1f27ab9c979c8a114be5b667e7b115a5556fd5be463b65968da9bb32573c6faf74fecf6e565d8974b
   languageName: node
   linkType: hard
 
-"@types/body-parser@npm:*, @types/body-parser@npm:^1.19.4":
+"@types/body-parser@npm:*":
   version: 1.19.4
   resolution: "@types/body-parser@npm:1.19.4"
   dependencies:
@@ -12853,6 +12952,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/body-parser@npm:^1.19.5":
+  version: 1.19.5
+  resolution: "@types/body-parser@npm:1.19.5"
+  dependencies:
+    "@types/connect": "*"
+    "@types/node": "*"
+  checksum: 1e251118c4b2f61029cc43b0dc028495f2d1957fe8ee49a707fb940f86a9bd2f9754230805598278fe99958b49e9b7e66eec8ef6a50ab5c1f6b93e1ba2aaba82
+  languageName: node
+  linkType: hard
+
 "@types/bonjour@npm:^3.5.9":
   version: 3.5.10
   resolution: "@types/bonjour@npm:3.5.10"
@@ -12862,58 +12971,65 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/busboy@npm:^1.5.2":
-  version: 1.5.2
-  resolution: "@types/busboy@npm:1.5.2"
+"@types/busboy@npm:^1.5.4":
+  version: 1.5.4
+  resolution: "@types/busboy@npm:1.5.4"
   dependencies:
     "@types/node": "*"
-  checksum: d2cfa334e06ce0fbeb31bdac7b4ba051b85e508f4f46d016e55488a717c626e19285f0e2fae40d0183d0f676dd162ab9216613799f83d40430e1996fba4bfb2f
+  checksum: 56444ed1223d5c8f6340128561c25bf7d6567494f507d386241de2ed6e22f9a69de7f536d71502c2f0897f81be7e8253455522ddd791db7e3eb769db7eae9e92
   languageName: node
   linkType: hard
 
-"@types/chai-as-promised@npm:^7.1.7":
-  version: 7.1.7
-  resolution: "@types/chai-as-promised@npm:7.1.7"
+"@types/chai-as-promised@npm:^7.1.8":
+  version: 7.1.8
+  resolution: "@types/chai-as-promised@npm:7.1.8"
   dependencies:
     "@types/chai": "*"
-  checksum: 59199afbd91289588648e263d7f32f7d72fa9c0075f3c17b1e760e10fdc1a310c2170a392b0d17d96cfff2c51daca72839eed6d80142f9230c9784b8e08ba676
+  checksum: f0e5eab451b91bc1e289ed89519faf6591932e8a28d2ec9bbe95826eb73d28fe43713633e0c18706f3baa560a7d97e7c7c20dc53ce639e5d75bac46b2a50bf21
   languageName: node
   linkType: hard
 
-"@types/chai-datetime@npm:0.0.38":
-  version: 0.0.38
-  resolution: "@types/chai-datetime@npm:0.0.38"
+"@types/chai-datetime@npm:0.0.39":
+  version: 0.0.39
+  resolution: "@types/chai-datetime@npm:0.0.39"
   dependencies:
     "@types/chai": "*"
-  checksum: 2c0269e91a282ef71fe5603a94b6df4c3b784e3ded25f380ed91c0d91c26d08ac33da6bde903bc9bddfec4636455378c26810947a989ef87fe37078213e350ca
+  checksum: fc5266f839f7005b34d04d4e3f67b232ec86eb50291cf4769f4875bc81a21afd8c9a51547da71f7903e2124379019b83bfc400a1b6315c719888dedb678c760b
   languageName: node
   linkType: hard
 
-"@types/chai-dom@npm:1.11.2":
-  version: 1.11.2
-  resolution: "@types/chai-dom@npm:1.11.2"
+"@types/chai-dom@npm:1.11.3":
+  version: 1.11.3
+  resolution: "@types/chai-dom@npm:1.11.3"
   dependencies:
     "@types/chai": "*"
-  checksum: d59a90bf2b497797178d3a5bd17f242caaf6ee098563142fdc765a6c12786f94bc0a9b8e4023de37ef8c803198ce9562823651610b02c80f1e21a29f2ece80fd
+  checksum: 274afd91062b54fb56c95fc2c919d0d6d2f6b2c608f5849d27227a72f99d33ccf01b3fd59e3282e2c9626b8eba4e45d4266a742f61bb2ff506ddbfba0892d0c9
   languageName: node
   linkType: hard
 
-"@types/chai-spies@npm:~1.0.5":
-  version: 1.0.5
-  resolution: "@types/chai-spies@npm:1.0.5"
+"@types/chai-spies@npm:~1.0.6":
+  version: 1.0.6
+  resolution: "@types/chai-spies@npm:1.0.6"
   dependencies:
     "@types/chai": "*"
-  checksum: d8009e0e4bf78fdce4a6824d43a2e206ddc0c07e3869f5d55ed7a7476c5623f77d0a5f444148ce7a0b9d9f47592fe3f0c6652952e6a0f514d8603cbb2e587cd4
+  checksum: 2f4e1fd3ed4f317b6f445a4516612b2a40e25c86cf60ba093ce3569012d612d0fc05c96d69223221c26fad60d0f3af75f7c2bb1858e48b209e8da8f0a1d5fccd
   languageName: node
   linkType: hard
 
-"@types/chai@npm:*, @types/chai@npm:~4.3.16":
+"@types/chai@npm:*":
   version: 4.3.16
   resolution: "@types/chai@npm:4.3.16"
   checksum: bb5f52d1b70534ed8b4bf74bd248add003ffe1156303802ea367331607c06b494da885ffbc2b674a66b4f90c9ee88759790a5f243879f6759f124f22328f5e95
   languageName: node
   linkType: hard
 
+"@types/chai@npm:~4.3.19":
+  version: 4.3.19
+  resolution: "@types/chai@npm:4.3.19"
+  checksum: abd4d3239735054f3b6e8163e45bc6495f66469729fbcf4784c9f2b82361a6845d45ab9c518818c78eafa46d015e3a72306e9949d1333e10d7eaedf426af4261
+  languageName: node
+  linkType: hard
+
 "@types/chalk@npm:^2.2.0":
   version: 2.2.0
   resolution: "@types/chalk@npm:2.2.0"
@@ -12923,21 +13039,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/chart.js@npm:^2.9.39":
-  version: 2.9.39
-  resolution: "@types/chart.js@npm:2.9.39"
+"@types/chart.js@npm:^2.9.41":
+  version: 2.9.41
+  resolution: "@types/chart.js@npm:2.9.41"
   dependencies:
     moment: ^2.10.2
-  checksum: c19cab03143db9cabc9c7277b77a974634baa9a9554dc95a7d2996091ac88ca9d98718e701446932a4cf0b8f3c2862ad0d3f232e1deb6a9bdf72d9ef5342582d
+  checksum: 7c6b29c837d35edaa371e05850e10468d6690dec1128f247b108c3cd15903c80cafb158a3cbd6a90beb0a9e1e33b12759251e1e63d6cbfa5995a0c5dc0df58b1
   languageName: node
   linkType: hard
 
-"@types/codemirror@npm:^5.60.12":
-  version: 5.60.12
-  resolution: "@types/codemirror@npm:5.60.12"
+"@types/codemirror@npm:^5.60.15":
+  version: 5.60.15
+  resolution: "@types/codemirror@npm:5.60.15"
   dependencies:
     "@types/tern": "*"
-  checksum: dff22f32ea42ccd3f9bfcf408631f94a11ffb4614ff4fa8cc55adf7da6e7ba96650533b8dd27d037242747bdaa85141e93520f84409db7bc394862a174a10e1e
+  checksum: cfad3f569de48fba3efa44fdfeba77933e231486a52cc80cff7ce6eeeed5b447a5bc2b11e2226bc00ccee332c661e53e35a15cf14eb835f434a6a402d9462f5f
   languageName: node
   linkType: hard
 
@@ -12960,19 +13076,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/cookie-parser@npm:^1.4.5":
-  version: 1.4.5
-  resolution: "@types/cookie-parser@npm:1.4.5"
+"@types/cookie-parser@npm:^1.4.7":
+  version: 1.4.7
+  resolution: "@types/cookie-parser@npm:1.4.7"
   dependencies:
     "@types/express": "*"
-  checksum: 45855721706d6a57bb0441db11fb59db407414ea83a0000a0df80d19230447cc3bcc43c436397bfb8998ec78db222265fa8083456b00c5b5054a0c03d06f0086
+  checksum: 7b87c59420598e686a57e240be6e0db53967c3c8814be9326bf86609ee2fc39c4b3b9f2263e1deba43526090121d1df88684b64c19f7b494a80a4437caf3d40b
   languageName: node
   linkType: hard
 
-"@types/cookie@npm:^0.5.3":
-  version: 0.5.3
-  resolution: "@types/cookie@npm:0.5.3"
-  checksum: b785618f6b2fdceb6a20a17e1dfe99651b1e5c2c079f486de76dfb21b508f09d91913755e4a6dbdfe628882ea32466bb2e9318b114ce34efa5e624356494fcab
+"@types/cookie@npm:^0.5.4":
+  version: 0.5.4
+  resolution: "@types/cookie@npm:0.5.4"
+  checksum: bd9603ce5e9bcbe1c2c9fabe3d1b1da131f1db10a7fa0077b17eb06d59bf4a6192fbb890597e8e2295067a078aaf8299bc662bfe993e8c2d1ecd62f859317ece
   languageName: node
   linkType: hard
 
@@ -12983,12 +13099,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/cors@npm:^2.8.15":
-  version: 2.8.15
-  resolution: "@types/cors@npm:2.8.15"
+"@types/cors@npm:^2.8.17":
+  version: 2.8.17
+  resolution: "@types/cors@npm:2.8.17"
   dependencies:
     "@types/node": "*"
-  checksum: ef7b0aba4c6a4c1fe9d459bd471ebaa891a75319682c9248daa17720003d1d0d2c59de4bdb6868630596ade9b7c3c949e652d6141b14c6fe4387ffcc520d0f3f
+  checksum: 469bd85e29a35977099a3745c78e489916011169a664e97c4c3d6538143b0a16e4cc72b05b407dc008df3892ed7bf595f9b7c0f1f4680e169565ee9d64966bde
   languageName: node
   linkType: hard
 
@@ -12999,10 +13115,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/cssom@npm:^0.4.2":
-  version: 0.4.2
-  resolution: "@types/cssom@npm:0.4.2"
-  checksum: 4bcc54245b8c09c832c21465f60af412a5c2446ae5c17ab1a874dd87a9488e43951f8027594cc0eaf99d4e9a7c061882f017552a13f0a94ac25db9ac92fea837
+"@types/cssom@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@types/cssom@npm:0.4.3"
+  checksum: 3a04921a41fd353e3484962ed705385847b5aeb740988d7c773691417673d01b7cf79d0093fd2b57515d86a0e3ad76dc804b63def8be48ae6f1fdcebd2ab4cd9
   languageName: node
   linkType: hard
 
@@ -13359,12 +13475,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/debug@npm:^4.1.10":
-  version: 4.1.10
-  resolution: "@types/debug@npm:4.1.10"
+"@types/debug@npm:^4.1.12":
+  version: 4.1.12
+  resolution: "@types/debug@npm:4.1.12"
   dependencies:
     "@types/ms": "*"
-  checksum: 938f79c5b610f851da9c67ecd8641a09b33ce9cb38fe4c9f4d20ee743d6bccb5d8e9a833a4cd23e0684a316622af67a0634fa706baea5a01f5219961d1976314
+  checksum: 47876a852de8240bfdaf7481357af2b88cb660d30c72e73789abf00c499d6bc7cd5e52f41c915d1b9cd8ec9fef5b05688d7b7aef17f7f272c2d04679508d1053
   languageName: node
   linkType: hard
 
@@ -13386,17 +13502,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ejson@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "@types/ejson@npm:2.2.1"
-  checksum: 8a0e6e9d50a9b33cdb645e7fdaca5fccb5a0687be0918eaeb06c9c7f21bb8b5757881de77c9d19d84bf16e6949c10b23d098954990aef7bd26257d471f4c008f
+"@types/ejson@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "@types/ejson@npm:2.2.2"
+  checksum: 3f2eb25d98f93821156b071e647bca626563900ecb34bb81cdba33721ee7d046bb66db7d6de664312b9480821821a1d177cf5e146dc1f10adcf43cbd2e387bbe
   languageName: node
   linkType: hard
 
-"@types/emojione@npm:^2.2.8":
-  version: 2.2.8
-  resolution: "@types/emojione@npm:2.2.8"
-  checksum: 3342fd3fbcbc7e7429c7a23330f559d0f41f4fcba5a699035fddb53efba8c7c5ed3af54024011643aa338792d8fd963768766877bc115e093bef193a391abb05
+"@types/emojione@npm:^2.2.9":
+  version: 2.2.9
+  resolution: "@types/emojione@npm:2.2.9"
+  checksum: ec16f96f8d9886dc3f82bd8aa3ee34f320069771d9a82d01c3c20da9c0c13c7b07347eff2912b914caf3416e3cedea4b963ecc3331c23d743270c975a91ff4d4
   languageName: node
   linkType: hard
 
@@ -13410,7 +13526,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:*, @types/eslint@npm:~8.44.6":
+"@types/eslint@npm:*":
   version: 8.44.6
   resolution: "@types/eslint@npm:8.44.6"
   dependencies:
@@ -13420,6 +13536,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/eslint@npm:~8.44.9":
+  version: 8.44.9
+  resolution: "@types/eslint@npm:8.44.9"
+  dependencies:
+    "@types/estree": "*"
+    "@types/json-schema": "*"
+  checksum: 6f8889e94e67a5e43c15f5a2530798f864ace08c270bfb3f153cb705da4e30a80e0e9a0fc05317c8642c8dda909d528968172089eb4d52aca9f212761df25d90
+  languageName: node
+  linkType: hard
+
 "@types/estree@npm:*, @types/estree@npm:^1.0.0":
   version: 1.0.1
   resolution: "@types/estree@npm:1.0.1"
@@ -13455,7 +13581,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/express@npm:*, @types/express@npm:^4.16.1, @types/express@npm:^4.17.13, @types/express@npm:^4.17.20, @types/express@npm:^4.17.8, @types/express@npm:^4.7.0":
+"@types/express@npm:*, @types/express@npm:^4.16.1, @types/express@npm:^4.17.13, @types/express@npm:^4.17.8, @types/express@npm:^4.7.0":
   version: 4.17.20
   resolution: "@types/express@npm:4.17.20"
   dependencies:
@@ -13479,19 +13605,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/fibers@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "@types/fibers@npm:3.1.3"
-  checksum: c4511eecea1c4e73a4b4310ff5152bb43477dfbd7c19ea8614de5ce6d604c6bd629b4552bdbc06fbd593215c684d06aee4e6d8e6681b4ab019f2b8a03838de79
+"@types/fibers@npm:^3.1.4":
+  version: 3.1.4
+  resolution: "@types/fibers@npm:3.1.4"
+  checksum: 36bb70198fb5b7f99b010c006ad0e77d473061cf03d4f63f1842040b7ecb62e8800041c9509b927ec59a1d5ac374d5e7c86b2fe0de2a9813f1538ab0248e5dea
   languageName: node
   linkType: hard
 
-"@types/gc-stats@npm:^1.4.2":
-  version: 1.4.2
-  resolution: "@types/gc-stats@npm:1.4.2"
+"@types/gc-stats@npm:^1.4.3":
+  version: 1.4.3
+  resolution: "@types/gc-stats@npm:1.4.3"
   dependencies:
     "@types/node": "*"
-  checksum: 4039f699b497595c3ac30f221f72d798e12a764093ab5df05cec25cd501fe806005daec10c25737d2b08449772bc318ac720f01fe73d13fdb33168429e25483f
+  checksum: 983ad3841a1f62a1014e4c0becf81d258f07dc44849598079168df6f4ea293eb8abef7896b6847b9dd68e61b4628525279950b3bb4a75c045b8d461cbaaef3e9
   languageName: node
   linkType: hard
 
@@ -13512,10 +13638,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/google-libphonenumber@npm:^7.4.29":
-  version: 7.4.29
-  resolution: "@types/google-libphonenumber@npm:7.4.29"
-  checksum: 63b1d03ab6dcd877c1249251d73c54777f6b6cbd13f6b3107c8fcef70d19f8e3a768555942735318da86fa6c50ea0dcfc82d521d4defc9e9dfc1e67b4746ab96
+"@types/google-libphonenumber@npm:^7.4.30":
+  version: 7.4.30
+  resolution: "@types/google-libphonenumber@npm:7.4.30"
+  checksum: 09270ed030076a0e69965ad5bad564e672a110e1e83c9092f6d264c3e0355921631521cb9afd022018a51cddfd19ba52d0421f4682d7b68b836dbb52537320de
   languageName: node
   linkType: hard
 
@@ -13528,10 +13654,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/gravatar@npm:^1.8.5":
-  version: 1.8.5
-  resolution: "@types/gravatar@npm:1.8.5"
-  checksum: a4a5e9010e5f2caff27f360cd4e0acf4e3276be3fdf8cc4a38baed8b9ca14d187b6b5c1d30d4d3abe326b0aecf30d1b47111ea543c8f6caf8bce9a8bb147c090
+"@types/gravatar@npm:^1.8.6":
+  version: 1.8.6
+  resolution: "@types/gravatar@npm:1.8.6"
+  checksum: b690f2816321358e8528fe0b731e5c50905ed2c4859327156a87b717a59b45363a2f2c1398c3a9015fa45b17d71d86b1e828fd3df542d13ba946745d9a26094e
   languageName: node
   linkType: hard
 
@@ -13584,28 +13710,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/i18next-sprintf-postprocessor@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "@types/i18next-sprintf-postprocessor@npm:0.2.2"
+"@types/i18next-sprintf-postprocessor@npm:^0.2.3":
+  version: 0.2.3
+  resolution: "@types/i18next-sprintf-postprocessor@npm:0.2.3"
   dependencies:
     i18next: ">=17.0.11"
-  checksum: 1029c5f896e453534a128013f9ee8a0873a2e03b82a18a530842d06618c3dd1b1f3adf0491efa3f7efd86d19c61b23af60df5c0f36306ed298a20d6d895db95e
+  checksum: d647c6bb75e2e038ee82d2e5bac762c0254d4fe31232f2fba5f35945779e8509cfa687746219280e2a126e33a647fd459641e8353cf922ddcd2a4e528a1234ba
   languageName: node
   linkType: hard
 
-"@types/identity-obj-proxy@npm:^3":
+"@types/identity-obj-proxy@npm:^3.0.2":
   version: 3.0.2
   resolution: "@types/identity-obj-proxy@npm:3.0.2"
   checksum: 77387ee587657ab24f12a1dee5c0e1386358d5c38cda5cac78bc5049340cb358e009f6254de3bbdee6a08e46f13b1552cd47a0bbd3e7a53ff469bf58a04ec6e9
   languageName: node
   linkType: hard
 
-"@types/imap@npm:^0.8.39":
-  version: 0.8.39
-  resolution: "@types/imap@npm:0.8.39"
+"@types/imap@npm:^0.8.40":
+  version: 0.8.40
+  resolution: "@types/imap@npm:0.8.40"
   dependencies:
     "@types/node": "*"
-  checksum: 403a0810dc24f035d1762d9ebc1cf548448bdbe565ab6062d2a1d1be2afd4f8ef1483723d4077c0e0e2312a39a27f393a513a40515589149c0617aa984946ae5
+  checksum: 5bd33aeeca13bd3403f685048c7c8e136502dc3f5703d732748b488193c96b79295b0901ff1dd72a5cc6b826fc33572bf7376cd6533194797903f9d58cfa8e6d
   languageName: node
   linkType: hard
 
@@ -13669,7 +13795,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:*, @types/jest@npm:~29.5.12":
+"@types/jest@npm:*":
   version: 29.5.12
   resolution: "@types/jest@npm:29.5.12"
   dependencies:
@@ -13679,6 +13805,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/jest@npm:~29.5.13":
+  version: 29.5.13
+  resolution: "@types/jest@npm:29.5.13"
+  dependencies:
+    expect: ^29.0.0
+    pretty-format: ^29.0.0
+  checksum: 875ac23c2398cdcf22aa56c6ba24560f11d2afda226d4fa23936322dde6202f9fdbd2b91602af51c27ecba223d9fc3c1e33c9df7e47b3bf0e2aefc6baf13ce53
+  languageName: node
+  linkType: hard
+
 "@types/jquery@npm:*":
   version: 3.5.14
   resolution: "@types/jquery@npm:3.5.14"
@@ -13688,19 +13824,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/js-yaml@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "@types/js-yaml@npm:4.0.8"
-  checksum: a5a77a5a1eac7e7fb667156c251c2b947ca4ddfdda570726369dd50bd5b2b1d0da2d0fb4273d1b10aa1782406d7b3da8923d957df4fb89dbfa1db06f43297de2
+"@types/js-yaml@npm:^4.0.9":
+  version: 4.0.9
+  resolution: "@types/js-yaml@npm:4.0.9"
+  checksum: e5e5e49b5789a29fdb1f7d204f82de11cb9e8f6cb24ab064c616da5d6e1b3ccfbf95aa5d1498a9fbd3b9e745564e69b4a20b6c530b5a8bbb2d4eb830cda9bc69
   languageName: node
   linkType: hard
 
-"@types/jsdom-global@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "@types/jsdom-global@npm:3.0.6"
+"@types/jsdom-global@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@types/jsdom-global@npm:3.0.7"
   dependencies:
     "@types/jsdom": "*"
-  checksum: cb216d588d6abc583615706bbc8beab6265d7afec8e51cadea06f84dd5ba4508e583c500556b2c273d7569c80af9cd68dce19ab6042cd881567aa0fe10261cd1
+  checksum: 7b6e58419b56c69fc1b1ef4df8180f19bf171eaa06d1dcc073e87f4cdeb172538b1b2fc16bc783e9521a7630787bad3d0607f4ac66730e5b27525eb73656b86f
   languageName: node
   linkType: hard
 
@@ -13749,10 +13885,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jsrsasign@npm:^10.5.11":
-  version: 10.5.11
-  resolution: "@types/jsrsasign@npm:10.5.11"
-  checksum: c18b52af99ffb831fd84738356a49e94407e732f0a88f0f6db1e1fd55c06a47d2bab23a9e17b3b21af50fbf5f4d115e13fbe2796357204b18072929bd7b4bd5c
+"@types/jsrsasign@npm:^10.5.14":
+  version: 10.5.14
+  resolution: "@types/jsrsasign@npm:10.5.14"
+  checksum: 04e48fa2a225b6108eb6399a2485ed597fabe4dbd6cf02309abfca9da3e6028697d0fb20e4399b1ef340d7f1a70ace70746aa156ca0c2785663cb2e15797e653
   languageName: node
   linkType: hard
 
@@ -13763,10 +13899,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/katex@npm:~0.16.5":
-  version: 0.16.5
-  resolution: "@types/katex@npm:0.16.5"
-  checksum: a1ce22cd87acd9b32891931f2bc4355c3540cc0a423e161a2e5b040d3e50812cb85ce1fd09f23d42324b19f9da30ded6b1807114f215624f670d79bb46c47cc8
+"@types/katex@npm:~0.16.7":
+  version: 0.16.7
+  resolution: "@types/katex@npm:0.16.7"
+  checksum: 4fd15d93553be97c02c064e16be18d7ccbabf66ec72a9dc7fd5bfa47f0c7581da2f942f693c7cb59499de4c843c2189796e49c9647d336cbd52b777b6722a95a
   languageName: node
   linkType: hard
 
@@ -13779,10 +13915,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/later@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "@types/later@npm:1.2.8"
-  checksum: b89b391e6dc6721955b04c01b81a3e38b4ac3d4f40ebcf35bc34d694c46a81c387c028760b3fc1441b9852c46298dfd562708f61504aba65983d2484b99d6420
+"@types/later@npm:^1.2.9":
+  version: 1.2.9
+  resolution: "@types/later@npm:1.2.9"
+  checksum: dc0db51bfbeb0caa4528e10725728349824dbe1ddbce6acd5258370bde586bb6ee67880d543e7e8dbb178c4001ba6db2e71cddfbcbdd7a1c523d49fbb26b61fb
   languageName: node
   linkType: hard
 
@@ -13795,10 +13931,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/less@npm:~3.0.5":
-  version: 3.0.5
-  resolution: "@types/less@npm:3.0.5"
-  checksum: 72d04c7877a63ef8a49e22a2aaf2e595aec41b4fcbbb48603e4d3a3d1e2d903edea6654db00bba52148ea4101a904e866b410599088b41935aa4c0733d25ef3c
+"@types/less@npm:~3.0.6":
+  version: 3.0.6
+  resolution: "@types/less@npm:3.0.6"
+  checksum: f1e5a7b7da6c0e65e0881a563d71287243f8cdeee1abb3e72ed9d449b4fb5421deee9b3bbd3bff856f17870563c2fc8cc4674c1f77632a73a9d713200dd7505a
   languageName: node
   linkType: hard
 
@@ -13818,21 +13954,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash.debounce@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "@types/lodash.debounce@npm:4.0.8"
+"@types/lodash.debounce@npm:^4.0.9":
+  version: 4.0.9
+  resolution: "@types/lodash.debounce@npm:4.0.9"
   dependencies:
     "@types/lodash": "*"
-  checksum: 63f195cb053ca390135a9aca62bb60fa149ca81838519871506b60760ff4113333709becb8e4147707eaa3d916dab7eff66b0588caf4ce508cabda9bee9c5b60
+  checksum: 8183a152e01928e3b97ca773f6ae6038b8695e76493ba8bf6b743ec143948a62294fbc9d49fa4a78b52265b3ba4892ef57534e0c13d04aa0f111671b5a944feb
   languageName: node
   linkType: hard
 
-"@types/lodash.get@npm:^4.4.8":
-  version: 4.4.8
-  resolution: "@types/lodash.get@npm:4.4.8"
+"@types/lodash.get@npm:^4.4.9":
+  version: 4.4.9
+  resolution: "@types/lodash.get@npm:4.4.9"
   dependencies:
     "@types/lodash": "*"
-  checksum: fea09c12f098e5cbdc16510e8319a7f0dd4d0af49a5e6622ae4f0dcd4893f1b2c44a5d22f452d73443f50b85c8461f3fe2370c19b8d9051686265bbb0aae0ffa
+  checksum: d7e071d267e3d1bab58db14b6ce63fc51ca3c9c9697d3548cd5c0f16c08a7ce2188cff75dff1858b5623c3bd070836857211ebef4f364c53b82e31f3190fe0b4
   languageName: node
   linkType: hard
 
@@ -13843,13 +13979,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/mailparser@npm:^3.4.3":
-  version: 3.4.3
-  resolution: "@types/mailparser@npm:3.4.3"
+"@types/mailparser@npm:^3.4.4":
+  version: 3.4.4
+  resolution: "@types/mailparser@npm:3.4.4"
   dependencies:
     "@types/node": "*"
     iconv-lite: ^0.6.3
-  checksum: 9374b713311b523b66429a7b509e90229dd001029e87d901ab6c756e1856eb2a8427012c016ad70ac45b39056eba1334e568f85ce9f329f5dd147986a897b691
+  checksum: c8bdb579d66756042b75c3763dd8b7b2fab6657d7e7d33504bb65bbbe6fa220b8da2ae67918dd821716c3229d8803bedffb00f2314a8946da1856396187c646a
   languageName: node
   linkType: hard
 
@@ -13886,12 +14022,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/meteor-collection-hooks@npm:^0.8.8":
-  version: 0.8.8
-  resolution: "@types/meteor-collection-hooks@npm:0.8.8"
+"@types/meteor-collection-hooks@npm:^0.8.9":
+  version: 0.8.9
+  resolution: "@types/meteor-collection-hooks@npm:0.8.9"
   dependencies:
     meteor-typings: ^1.3.1
-  checksum: bf0afc8531c836f3f7ead4aa0f8be3f69257af7a62397924a50533a20837b21b16c307777bb4fe52dc2e26753ba7269d0df6133ba6f1dad27d4075fea38a05f9
+  checksum: 7b12838587a6d411e3c44c682532cd43a4db99d4b11164867a2831a45593d2c637fb7feeede661b05eb6a63d8fa48228c0b5a0cb61e556c291e4d06f9f457892
   languageName: node
   linkType: hard
 
@@ -13991,19 +14127,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-gcm@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@types/node-gcm@npm:1.0.3"
-  checksum: 232e3d401f381fe9312343efb920892a7aa2f63457e00608ff2c3f0d1bff4a3707affe9a9e484ffead39272cfba0d1791901b7e937420233455dd047d63a4587
+"@types/node-gcm@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@types/node-gcm@npm:1.0.5"
+  checksum: 5448aa9de99b23700a2cc243483ed08bffd988a91d7431ed193dfbb55fc5c087c58310f728992a83f0e653b9edf9220434b62a0fabc5c7f417067ca805c1f92c
   languageName: node
   linkType: hard
 
-"@types/node-rsa@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "@types/node-rsa@npm:1.1.3"
+"@types/node-rsa@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "@types/node-rsa@npm:1.1.4"
   dependencies:
     "@types/node": "*"
-  checksum: 03606729a96722623e316b1728d45ba452e008e01e886127d1d964221119dd4196be724ec062fc81be5beb28ce8e5fcc9c55109275cdae60545ddc293b89e77d
+  checksum: cd607463b7954dd0eda390e0710fa5fdc1a26e716baefd77134f54893ed57bfbf1906f3a354f43f89174aa37ac6f05fa450b708e516a4a8fa643e0d2f8e26106
   languageName: node
   linkType: hard
 
@@ -14023,21 +14159,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^14.0.10 || ^16.0.0, @types/node@npm:^14.14.20 || ^16.0.0, @types/node@npm:^16.18.60":
+"@types/node@npm:^14.0.10 || ^16.0.0, @types/node@npm:^14.14.20 || ^16.0.0":
   version: 16.18.60
   resolution: "@types/node@npm:16.18.60"
   checksum: aa0c81c3f20e663584bf17a5968e54c419277af7982ef41f9d83edd1b7ab4c8af2583a3c8a9e1cf659c6307e6f787e1be20522855121371f5a46d1d54f8a70e3
   languageName: node
   linkType: hard
 
-"@types/node@npm:^14.0.26, @types/node@npm:^14.14.37, @types/node@npm:^14.18.63, @types/node@npm:~14.18.42":
+"@types/node@npm:^14.0.26, @types/node@npm:^14.14.37, @types/node@npm:^14.18.63, @types/node@npm:~14.18.63":
   version: 14.18.63
   resolution: "@types/node@npm:14.18.63"
   checksum: be909061a54931778c71c49dc562586c32f909c4b6197e3d71e6dac726d8bd9fccb9f599c0df99f52742b68153712b5097c0f00cac4e279fa894b0ea6719a8fd
   languageName: node
   linkType: hard
 
-"@types/nodemailer@npm:*, @types/nodemailer@npm:^6.4.13":
+"@types/node@npm:^16.18.108":
+  version: 16.18.108
+  resolution: "@types/node@npm:16.18.108"
+  checksum: 5029ce7b0d247690360f2698da4fe765ef5cd5e2409b63b3a45e90bbf7bbaaf3497e769336fb7725be04a221d6e934e3a4616ec7fc205812943def3ea9d70862
+  languageName: node
+  linkType: hard
+
+"@types/nodemailer@npm:*":
   version: 6.4.13
   resolution: "@types/nodemailer@npm:6.4.13"
   dependencies:
@@ -14046,6 +14189,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/nodemailer@npm:^6.4.15":
+  version: 6.4.15
+  resolution: "@types/nodemailer@npm:6.4.15"
+  dependencies:
+    "@types/node": "*"
+  checksum: f6f9a2f8a669703ecc3ca6359c12345b16f6b2e5691b93c406b9af7de639c02092ec00133526e6fecd8c60d884890a7cd0f967d8e64bedab46d5c3d8be0882d7
+  languageName: node
+  linkType: hard
+
 "@types/normalize-package-data@npm:^2.4.0":
   version: 2.4.1
   resolution: "@types/normalize-package-data@npm:2.4.1"
@@ -14060,19 +14212,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/oauth2-server@npm:^3.0.15":
-  version: 3.0.15
-  resolution: "@types/oauth2-server@npm:3.0.15"
+"@types/oauth2-server@npm:^3.0.17":
+  version: 3.0.17
+  resolution: "@types/oauth2-server@npm:3.0.17"
   dependencies:
     "@types/express": "*"
-  checksum: b6c73ec0ba3a83e7a9cc1bf0e75fd640a76bcf57742642775abf950d851478a686e3f54ad8e24a09772e1dd89ed953742418c76ebb7df12b97b68f1cb94dae80
+  checksum: f45224356b9a3736b86f3ed1a8873f7f535e10b22af06bc7d34eefd96af4f5db83ed4b618b0103566828fe279e8bed2ee304f6644a31bd127470a5a49398ca49
   languageName: node
   linkType: hard
 
-"@types/object-path@npm:^0.11.3":
-  version: 0.11.3
-  resolution: "@types/object-path@npm:0.11.3"
-  checksum: 9c2f1ec11d9d15df1682ab1483c0f51cac3ff8c3a951662a50d15fd48824fc43a052041503d0761790a29a4100e33989eb519889948c3592d0bf6bde59d3ec79
+"@types/object-path@npm:^0.11.4":
+  version: 0.11.4
+  resolution: "@types/object-path@npm:0.11.4"
+  checksum: 7f1f5cb18b651d21e7861da176d8f87526c936ed949a8126a2692195cbe65734ed1a1a22c06a24a54afe1890483a3d6b074b402ebfca7a7567c1c287b588f563
   languageName: node
   linkType: hard
 
@@ -14104,24 +14256,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/parseurl@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "@types/parseurl@npm:1.3.2"
+"@types/parseurl@npm:^1.3.3":
+  version: 1.3.3
+  resolution: "@types/parseurl@npm:1.3.3"
   dependencies:
     "@types/node": "*"
-  checksum: bfe0ad3222a957a1d8d21a5378a61a3ce21f0ce45ddfdd98fc727207b4bd3caf590d2a448c39d08774949e485a5f5f08429f6025a6b0123456a8a7fb9270ddb2
+  checksum: 2ea8d3b9615850fce3dd208f980aaca2c82c6cb20e033ee5705adbc773ea167fc57ee72045ba521fef0f6ad292fddaf91e398dad9edec10b9829621a8556446f
   languageName: node
   linkType: hard
 
-"@types/polka@npm:^0.5.6":
-  version: 0.5.6
-  resolution: "@types/polka@npm:0.5.6"
+"@types/polka@npm:^0.5.7":
+  version: 0.5.7
+  resolution: "@types/polka@npm:0.5.7"
   dependencies:
     "@types/express": "*"
     "@types/express-serve-static-core": "*"
     "@types/node": "*"
     "@types/trouter": "*"
-  checksum: e956629526782b722fe134a93e159774d13d58a66796f5b6f763b04cd5c426439a8556962e1da8e8a61574ed1ad6239ffbef28cd8c03b4f8828a9a4b03189dde
+  checksum: ec9bd7ae06b6cd49c972cd3af750c29dd6de28bf2aaf7e710ef2eec839636ee6efe8cf354008b80f9a865675cb3cedc60aab1bf9737bf4f5835d1c527b4f64c8
   languageName: node
   linkType: hard
 
@@ -14139,10 +14291,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prometheus-gc-stats@npm:^0.6.3":
-  version: 0.6.3
-  resolution: "@types/prometheus-gc-stats@npm:0.6.3"
-  checksum: b8ad00f21c2d7f19819b0d82b778f4919847e44f1f74a570fb52386fa7c5250af3a5e2eef5b8aa69cbf7fd8cc68f31f91bd7a002ce5b3722bb971da31af543a0
+"@types/prometheus-gc-stats@npm:^0.6.4":
+  version: 0.6.4
+  resolution: "@types/prometheus-gc-stats@npm:0.6.4"
+  checksum: 31d9c6a26c55829aa57c05ef602897926b5a068655b9e9850de92a7b7106a9c5e7971d96dc95d082817303899781cd98a319cd05699bc1ef5e9932456c23fd2a
   languageName: node
   linkType: hard
 
@@ -14160,26 +14312,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/proxy-from-env@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@types/proxy-from-env@npm:1.0.3"
+"@types/proxy-from-env@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "@types/proxy-from-env@npm:1.0.4"
   dependencies:
     "@types/node": "*"
-  checksum: 3661687ae4bd90b9c41e504d3e3124b1ccd7d39d5877a7930fc3630989e37bde4e6b9055ea719d4b85c400a872bee02336ee5e187380f075cec021a4aebced44
+  checksum: cfa34200e6ddb19c78957c2c661212c8eee1f7dbc1931e918909300b47cc0336023c2a526972c494cb5409010fd35edba37bd795893796cc50e1efabd34e3969
   languageName: node
   linkType: hard
 
-"@types/proxyquire@npm:^1.3.30":
-  version: 1.3.30
-  resolution: "@types/proxyquire@npm:1.3.30"
-  checksum: e247d0afdb59aae942313112ca6429b0cbe410b0a858796c63e16ea945b3a7686f0660a03c685d79f10ed807051f645a763e13aa72d3725aeea74fd40901fdad
+"@types/proxyquire@npm:^1.3.31":
+  version: 1.3.31
+  resolution: "@types/proxyquire@npm:1.3.31"
+  checksum: 945024495fc991f6152686795ac6f2f2d0f571834e67fa41c1e84877eeb1a321a24ab8ff67fc5152d9227f5b39f6254213dced15deaf80ed7443059c2257e072
   languageName: node
   linkType: hard
 
-"@types/psl@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@types/psl@npm:1.1.2"
-  checksum: fc0a7ae56ca53157035226d964f5a37749187804c07787d25a3f8e0235130c277b52d027139d1a7058d7826014a8019d68d46e2719b0404ac8545d39d41fc43a
+"@types/psl@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "@types/psl@npm:1.1.3"
+  checksum: adc24b5f0a2569563367437cbdcbb63c780e798360a4c21470043acda2adad56e510c9f357be36f297974d68534821febc38652709e5d712ac2cdd62f9a6777a
   languageName: node
   linkType: hard
 
@@ -14204,21 +14356,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-beautiful-dnd@npm:^13.1.6":
-  version: 13.1.6
-  resolution: "@types/react-beautiful-dnd@npm:13.1.6"
+"@types/react-beautiful-dnd@npm:^13.1.8":
+  version: 13.1.8
+  resolution: "@types/react-beautiful-dnd@npm:13.1.8"
   dependencies:
     "@types/react": "*"
-  checksum: 437c315cac4455fd0085150d5d163330e523e965193f642f45edf34eb56098e68a6f956d90ecb11abfcb03ce34177e5445c1489da46353ee5a6a6306414fb936
+  checksum: f71c64ba7e2e1f8480e772b45268856d2bf99adf90d12dd5f31486075dfd3e33a0b0922969851c660f01aa9593aa38b38e17ee9038eb866af9ec4327be903cb9
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:~17.0.22":
-  version: 17.0.22
-  resolution: "@types/react-dom@npm:17.0.22"
+"@types/react-dom@npm:~17.0.25":
+  version: 17.0.25
+  resolution: "@types/react-dom@npm:17.0.25"
   dependencies:
     "@types/react": ^17
-  checksum: 3c24331c0a2211370968befaad107598ee4f796c08e9b0de0b0126ee598a7c51f7bf4e0e7d9a76522a3b60d91f091d46131d136bcbe49aeb6ec3b8480dff03f9
+  checksum: d1e582682478e0848c8d54ea3e89d02047bac6d916266b85ce63731b06987575919653ea7159d98fda47ade3362b8c4d5796831549564b83088e7aa9ce8b60ed
   languageName: node
   linkType: hard
 
@@ -14243,7 +14395,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*, @types/react@npm:^17, @types/react@npm:~17.0.69":
+"@types/react@npm:*, @types/react@npm:^17":
   version: 17.0.69
   resolution: "@types/react@npm:17.0.69"
   dependencies:
@@ -14254,6 +14406,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/react@npm:~17.0.80":
+  version: 17.0.80
+  resolution: "@types/react@npm:17.0.80"
+  dependencies:
+    "@types/prop-types": "*"
+    "@types/scheduler": ^0.16
+    csstype: ^3.0.2
+  checksum: 1c27bfc42305d77ef0da55f8f6d4c4a3471aa02b294fcf29ea0f2cfb0bf02892e5a0a3bc7559fa4a5ba50697b2e31076cb5aa5987f69cfc2e880f6426edb8bdf
+  languageName: node
+  linkType: hard
+
 "@types/readdir-glob@npm:*":
   version: 1.1.1
   resolution: "@types/readdir-glob@npm:1.1.1"
@@ -14279,10 +14442,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/rewire@npm:^2.5.29":
-  version: 2.5.29
-  resolution: "@types/rewire@npm:2.5.29"
-  checksum: 2ad2f1134fe7c350fc88f0a9cc17eb49377f1a61776cde10b62bae0f5956dedd97adbb8da0e3ca8ddfb7034699a89fe2f9dc31af35f11727c4b38c8a089877c3
+"@types/rewire@npm:^2.5.30":
+  version: 2.5.30
+  resolution: "@types/rewire@npm:2.5.30"
+  checksum: 75f756ee068ad7f8aac697dc80f0007afa8c837e7aa211fd95ba7eeea8905043b20439e9b1c8326be77643159580aeebc49a464e626b0837ee188bd8a05dfe84
   languageName: node
   linkType: hard
 
@@ -14302,6 +14465,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/scheduler@npm:^0.16":
+  version: 0.16.8
+  resolution: "@types/scheduler@npm:0.16.8"
+  checksum: 6c091b096daa490093bf30dd7947cd28e5b2cd612ec93448432b33f724b162587fed9309a0acc104d97b69b1d49a0f3fc755a62282054d62975d53d7fd13472d
+  languageName: node
+  linkType: hard
+
 "@types/semver@npm:^7.3.10, @types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0":
   version: 7.5.4
   resolution: "@types/semver@npm:7.5.4"
@@ -14386,12 +14556,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/speakeasy@npm:^2.0.9":
-  version: 2.0.9
-  resolution: "@types/speakeasy@npm:2.0.9"
+"@types/speakeasy@npm:^2.0.10":
+  version: 2.0.10
+  resolution: "@types/speakeasy@npm:2.0.10"
   dependencies:
     "@types/node": "*"
-  checksum: 4f3d2217f96625c481f9220a5d16a776c7003d9025fafe728f91f07ba815ac2233db4df85cf4a721b5e042a478f793eee6e4e54c397288f3a39e3f04aa8375ac
+  checksum: 672c757a7662895a0d9eea5ecc8309b75c3925f00f0af4e7133fd3e475f3fdb1289d95ae6cf7fbab024f149703d999891b17771cc221db4e9a24c70ab1b04319
   languageName: node
   linkType: hard
 
@@ -14411,10 +14581,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/strict-uri-encode@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@types/strict-uri-encode@npm:2.0.1"
-  checksum: 63d62f43d20583428d112f6a9de5a444f31f8e314a8c57b9a59523f99ae3152e41e2e39ff0fb0404171135402d2226aba21a5db64de0d0d385ec8c11d5a0f4ce
+"@types/strict-uri-encode@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@types/strict-uri-encode@npm:2.0.2"
+  checksum: e395868cc1cd49537be56d2f43b417ddc11559f807d5e1402d180870d0e2872fbe4d35765de1bbec76b939faf77cfdb13aec715d9946f6675e17073169a70dcd
   languageName: node
   linkType: hard
 
@@ -14437,16 +14607,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/supertest@npm:^2.0.15":
-  version: 2.0.15
-  resolution: "@types/supertest@npm:2.0.15"
+"@types/supertest@npm:^2.0.16":
+  version: 2.0.16
+  resolution: "@types/supertest@npm:2.0.16"
   dependencies:
     "@types/superagent": "*"
-  checksum: 89c1983662f0ab20969b3a6c44344397fd222d0f78b282619aabbe817f7c88a64210fd2b8b8f075ea22a27084e30ebc287bc5105619cbbf9af7f008e77f6eb93
+  checksum: 2fc998ea698e0467cdbe3bea0ebce2027ea3a45a13e51a6cecb0435f44b486faecf99c34d8702d2d7fe033e6e09fdd2b374af52ecc8d0c69a1deec66b8c0dd52
   languageName: node
   linkType: hard
 
-"@types/supports-color@npm:~7.2.0":
+"@types/supports-color@npm:~7.2.1":
   version: 7.2.1
   resolution: "@types/supports-color@npm:7.2.1"
   checksum: abf7d9348deadf5386cf5faec062a4132e647a179584f52cace87435248f520be73c58ac28618cf5684e6b0ed6bb635d5a975cc71ff613af7db2d5648557ef45
@@ -14469,10 +14639,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/textarea-caret@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@types/textarea-caret@npm:3.0.2"
-  checksum: 6989477fa7be544cb84ffbb3302d5c4c2632e7900e0fcc12adf9bd78f4d0ebbf38db9392cb39c8fa791aba935013e1b14aeb1c222f328a67de6202f945331e73
+"@types/textarea-caret@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@types/textarea-caret@npm:3.0.3"
+  checksum: 61d4b08391c28f8b37236e65946457819460de1749b860a852c01cfb1093ab2ceb3fe11b54f788e7c024cb580d26984b9285438139f3cb3bb333150955413a8e
   languageName: node
   linkType: hard
 
@@ -14504,10 +14674,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ua-parser-js@npm:^0.7.38":
-  version: 0.7.38
-  resolution: "@types/ua-parser-js@npm:0.7.38"
-  checksum: 8a44887f7c782ed4c59c4d9cb254674f2ff41d8f653da0c2bd6d4ace79cc3de1ce5648b77f906e337fb97328e1114583e54c3b8882d194e1b8cb281f407a1ef7
+"@types/ua-parser-js@npm:^0.7.39":
+  version: 0.7.39
+  resolution: "@types/ua-parser-js@npm:0.7.39"
+  checksum: 81046605eb2815b098228743b7dfde887cc8990369f2ad56e71f1400b4cef5078481c7ca91ca3dddf2e8d4e183fe93224bfdeee13bfe034a1e62d55cfbac9e26
   languageName: node
   linkType: hard
 
@@ -14534,17 +14704,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/use-subscription@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@types/use-subscription@npm:1.0.1"
-  checksum: f9e3535d40dbcd606e7ef306120c52a78b9da7a94ebe0b56af8f8326984588b2db12fbc841e2b2d719728810816afa9c7d64b40a849048186a4308e2f3ff0339
+"@types/use-subscription@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@types/use-subscription@npm:1.0.2"
+  checksum: e547d8ffdf8410c985c271a30903cd754687a6514a67192378213590f707a0f516e0c11930cba10bd7e98dc4f7917e066b3b8d37a622d02b6fcf3c5df530e467
   languageName: node
   linkType: hard
 
-"@types/use-sync-external-store@npm:^0.0.5":
-  version: 0.0.5
-  resolution: "@types/use-sync-external-store@npm:0.0.5"
-  checksum: 96a22fa059d8a6d0fe0b03e5157eb22f599ab1cc58b9441617dec4be6d8586260fcf9041912ab90e92d9c6ea6dfec5c758bae6418552aa687fc7e0bb904e68bc
+"@types/use-sync-external-store@npm:^0.0.6":
+  version: 0.0.6
+  resolution: "@types/use-sync-external-store@npm:0.0.6"
+  checksum: a95ce330668501ad9b1c5b7f2b14872ad201e552a0e567787b8f1588b22c7040c7c3d80f142cbb9f92d13c4ea41c46af57a20f2af4edf27f224d352abcfe4049
   languageName: node
   linkType: hard
 
@@ -14555,7 +14725,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^9":
+"@types/uuid@npm:^9.0.8":
   version: 9.0.8
   resolution: "@types/uuid@npm:9.0.8"
   checksum: b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275
@@ -14621,14 +14791,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/webpack@npm:^5.28.4":
-  version: 5.28.4
-  resolution: "@types/webpack@npm:5.28.4"
+"@types/webpack@npm:^5.28.5":
+  version: 5.28.5
+  resolution: "@types/webpack@npm:5.28.5"
   dependencies:
     "@types/node": "*"
     tapable: ^2.2.0
     webpack: ^5
-  checksum: 7a08e31096a05c77bb49b3830f85f2e340090fa2b19dbe4681c7eab92e49db85bdbbe7b374df7d7aa38549922ff3252f43a00d4c5c2f9fe0c2a198cdb5ddde7e
+  checksum: 14359d9ccecef7ef1ea271c00baec5337213c7fda63a34c61b9e519505b3928d0807cdbb5b1172d1994e1179920b89c57eaf2cbf64599958b67cd70720ac2a9b
   languageName: node
   linkType: hard
 
@@ -14667,7 +14837,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ws@npm:^8.5.1, @types/ws@npm:^8.5.5, @types/ws@npm:^8.5.8":
+"@types/ws@npm:^8.5.1, @types/ws@npm:^8.5.5":
   version: 8.5.8
   resolution: "@types/ws@npm:8.5.8"
   dependencies:
@@ -14676,22 +14846,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/xml-crypto@npm:~1.4.4":
-  version: 1.4.4
-  resolution: "@types/xml-crypto@npm:1.4.4"
+"@types/ws@npm:^8.5.12":
+  version: 8.5.12
+  resolution: "@types/ws@npm:8.5.12"
+  dependencies:
+    "@types/node": "*"
+  checksum: ddefb6ad1671f70ce73b38a5f47f471d4d493864fca7c51f002a86e5993d031294201c5dced6d5018fb8905ad46888d65c7f20dd54fc165910b69f42fba9a6d0
+  languageName: node
+  linkType: hard
+
+"@types/xml-crypto@npm:~1.4.6":
+  version: 1.4.6
+  resolution: "@types/xml-crypto@npm:1.4.6"
   dependencies:
     "@types/node": "*"
     xpath: 0.0.27
-  checksum: c19616b531b26d7f3fafee6165d7be42969bfa2ef7184f501c489c80515d483425fb97e55ae816d91cf2f92e765e81f0a7cfc97c5dedb46f829edb677b154a55
+  checksum: e53516a2f5e4e018e164eb1cb9fc922294b9a339624e567c1c00a2b1496e9f86826210473e62ceb0b45949638c9d149da088b3598f6b3acd86e933f0a2b23f2c
   languageName: node
   linkType: hard
 
-"@types/xml-encryption@npm:~1.2.3":
-  version: 1.2.3
-  resolution: "@types/xml-encryption@npm:1.2.3"
+"@types/xml-encryption@npm:~1.2.4":
+  version: 1.2.4
+  resolution: "@types/xml-encryption@npm:1.2.4"
   dependencies:
     "@types/node": "*"
-  checksum: 1f678c5cb7378702dd1bfbbe1ec3b4dd62d7b8350c225866df109d60c8c7c4e39b20d32193ead175b1c68944ce22ffcae470685371e6257bf0bfe45f7f366aec
+  checksum: 1ef957dfb47cf55b12e114755e271a2343f73eb4c59ab6c68b0b7d1b8111d7e1bd8d2bfe0601d2aea09be83c66355bc77fc59f9b71aeff9bb9e15371bcfef5d3
   languageName: node
   linkType: hard
 
@@ -16395,6 +16574,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"asn1.js@npm:^4.10.1":
+  version: 4.10.1
+  resolution: "asn1.js@npm:4.10.1"
+  dependencies:
+    bn.js: ^4.0.0
+    inherits: ^2.0.1
+    minimalistic-assert: ^1.0.0
+  checksum: 9289a1a55401238755e3142511d7b8f6fc32f08c86ff68bd7100da8b6c186179dd6b14234fba2f7f6099afcd6758a816708485efe44bc5b2a6ec87d9ceeddbb5
+  languageName: node
+  linkType: hard
+
 "asn1.js@npm:^5.2.0":
   version: 5.4.1
   resolution: "asn1.js@npm:5.4.1"
@@ -16433,15 +16623,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"assert@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "assert@npm:2.0.0"
+"assert@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "assert@npm:2.1.0"
   dependencies:
-    es6-object-assign: ^1.1.0
-    is-nan: ^1.2.1
-    object-is: ^1.0.1
-    util: ^0.12.0
-  checksum: bb91f181a86d10588ee16c5e09c280f9811373974c29974cbe401987ea34e966699d7989a812b0e19377b511ea0bc627f5905647ce569311824848ede382cae8
+    call-bind: ^1.0.2
+    is-nan: ^1.3.2
+    object-is: ^1.1.5
+    object.assign: ^4.1.4
+    util: ^0.12.5
+  checksum: 1ed1cabba9abe55f4109b3f7292b4e4f3cf2953aad8dc148c0b3c3bd676675c31b1abb32ef563b7d5a19d1715bf90d1e5f09fad2a4ee655199468902da80f7c2
   languageName: node
   linkType: hard
 
@@ -16770,6 +16961,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"b4a@npm:^1.6.6":
+  version: 1.6.6
+  resolution: "b4a@npm:1.6.6"
+  checksum: c46a27e3ac9c84426ae728f0fc46a6ae7703a7bc03e771fa0bef4827fd7cf3bb976d1a3d5afff54606248372ab8fdf595bd0114406690edf37f14d120630cf7f
+  languageName: node
+  linkType: hard
+
 "babel-jest@npm:^29.0.3, babel-jest@npm:^29.5.0, babel-jest@npm:^29.7.0":
   version: 29.7.0
   resolution: "babel-jest@npm:29.7.0"
@@ -16817,7 +17015,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-loader@npm:~9.1.2":
+"babel-loader@npm:~9.1.3":
   version: 9.1.3
   resolution: "babel-loader@npm:9.1.3"
   dependencies:
@@ -17104,6 +17302,50 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bare-events@npm:^2.0.0, bare-events@npm:^2.2.0":
+  version: 2.4.2
+  resolution: "bare-events@npm:2.4.2"
+  checksum: 6cd2b10dd32a3410787e120c091b6082fbc2df0c45ed723a7ae51d0e2f55d2a4037e1daff21dae90b671d36582f9f8d50df337875c281d10adb60df81b8cd861
+  languageName: node
+  linkType: hard
+
+"bare-fs@npm:^2.1.1":
+  version: 2.3.5
+  resolution: "bare-fs@npm:2.3.5"
+  dependencies:
+    bare-events: ^2.0.0
+    bare-path: ^2.0.0
+    bare-stream: ^2.0.0
+  checksum: 071b1dff94a213eaf0b41693953959bf10af2deade597a56ff206a5d833579d56bc8530aa4614bb88bf39fd6d52f2404f7c36af4695109ffa756a13837ac3d91
+  languageName: node
+  linkType: hard
+
+"bare-os@npm:^2.1.0":
+  version: 2.4.4
+  resolution: "bare-os@npm:2.4.4"
+  checksum: e90088a7dc0307c020350a28df8ec5564cae5a4b7a213d8509d70831d7064308e2ed31de801b68f474cb004ad3a0a66bd28c38374d270484d9025ee71af20396
+  languageName: node
+  linkType: hard
+
+"bare-path@npm:^2.0.0, bare-path@npm:^2.1.0":
+  version: 2.1.3
+  resolution: "bare-path@npm:2.1.3"
+  dependencies:
+    bare-os: ^2.1.0
+  checksum: 20301aeb05b735852a396515464908e51e896922c3bb353ef2a09ff54e81ced94e6ad857bb0a36d2ce659c42bd43dd5c3d5643edd8faaf910ee9950c4e137b88
+  languageName: node
+  linkType: hard
+
+"bare-stream@npm:^2.0.0":
+  version: 2.3.0
+  resolution: "bare-stream@npm:2.3.0"
+  dependencies:
+    b4a: ^1.6.6
+    streamx: ^2.20.0
+  checksum: 17de9dbd5a6d70863b6e55f0acdfe1cb5d2b05f22d87e79986372cc796095eb4882a868ee6ba3dc543243085d27f618b4b81ef2bf384bc1c690dd3a557b6e30d
+  languageName: node
+  linkType: hard
+
 "base-64@npm:^1.0.0":
   version: 1.0.0
   resolution: "base-64@npm:1.0.0"
@@ -17415,6 +17657,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bn.js@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "bn.js@npm:5.2.1"
+  checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3
+  languageName: node
+  linkType: hard
+
 "bodec@npm:^0.1.0":
   version: 0.1.0
   resolution: "bodec@npm:0.1.0"
@@ -17442,7 +17691,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.2, body-parser@npm:^1.19.0, body-parser@npm:^1.20.2":
+"body-parser@npm:1.20.3, body-parser@npm:^1.20.3":
+  version: 1.20.3
+  resolution: "body-parser@npm:1.20.3"
+  dependencies:
+    bytes: 3.1.2
+    content-type: ~1.0.5
+    debug: 2.6.9
+    depd: 2.0.0
+    destroy: 1.2.0
+    http-errors: 2.0.0
+    iconv-lite: 0.4.24
+    on-finished: 2.4.1
+    qs: 6.13.0
+    raw-body: 2.5.2
+    type-is: ~1.6.18
+    unpipe: 1.0.0
+  checksum: 1a35c59a6be8d852b00946330141c4f142c6af0f970faa87f10ad74f1ee7118078056706a05ae3093c54dabca9cd3770fa62a170a85801da1a4324f04381167d
+  languageName: node
+  linkType: hard
+
+"body-parser@npm:^1.19.0":
   version: 1.20.2
   resolution: "body-parser@npm:1.20.2"
   dependencies:
@@ -17643,7 +17912,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4":
+"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4, browserify-aes@npm:^1.2.0":
   version: 1.2.0
   resolution: "browserify-aes@npm:1.2.0"
   dependencies:
@@ -17657,7 +17926,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserify-cipher@npm:^1.0.0":
+"browserify-cipher@npm:^1.0.0, browserify-cipher@npm:^1.0.1":
   version: 1.0.1
   resolution: "browserify-cipher@npm:1.0.1"
   dependencies:
@@ -17680,7 +17949,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1":
+"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1, browserify-rsa@npm:^4.1.0":
   version: 4.1.0
   resolution: "browserify-rsa@npm:4.1.0"
   dependencies:
@@ -17707,6 +17976,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browserify-sign@npm:^4.2.3":
+  version: 4.2.3
+  resolution: "browserify-sign@npm:4.2.3"
+  dependencies:
+    bn.js: ^5.2.1
+    browserify-rsa: ^4.1.0
+    create-hash: ^1.2.0
+    create-hmac: ^1.1.7
+    elliptic: ^6.5.5
+    hash-base: ~3.0
+    inherits: ^2.0.4
+    parse-asn1: ^5.1.7
+    readable-stream: ^2.3.8
+    safe-buffer: ^5.2.1
+  checksum: 403a8061d229ae31266670345b4a7c00051266761d2c9bbeb68b1a9bcb05f68143b16110cf23a171a5d6716396a1f41296282b3e73eeec0a1871c77f0ff4ee6b
+  languageName: node
+  linkType: hard
+
 "browserify-zlib@npm:^0.2.0":
   version: 0.2.0
   resolution: "browserify-zlib@npm:0.2.0"
@@ -18286,23 +18573,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chai-as-promised@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "chai-as-promised@npm:7.1.1"
+"chai-as-promised@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "chai-as-promised@npm:7.1.2"
   dependencies:
     check-error: ^1.0.2
   peerDependencies:
-    chai: ">= 2.1.2 < 5"
-  checksum: 7262868a5b51a12af4e432838ddf97a893109266a505808e1868ba63a12de7ee1166e9d43b5c501a190c377c1b11ecb9ff8e093c89f097ad96c397e8ec0f8d6a
+    chai: ">= 2.1.2 < 6"
+  checksum: 671ee980054eb23a523875c1d22929a2ac05d89b5428e1fd12800f54fc69baf41014667b87e2368e2355ee2a3140d3e3d7d5a1f8638b07cfefd7fe38a149e3f6
   languageName: node
   linkType: hard
 
-"chai-datetime@npm:^1.8.0":
-  version: 1.8.0
-  resolution: "chai-datetime@npm:1.8.0"
+"chai-datetime@npm:^1.8.1":
+  version: 1.8.1
+  resolution: "chai-datetime@npm:1.8.1"
   dependencies:
     chai: ">1.9.0"
-  checksum: 37752addc6de4134117342609be85292dcd21cc0ec40b9ed2415c06d75c3a3b4a6d39fe6a675229a973f374abcaf5d2b9ea4c0d88d75508d1ddc641b509aafb0
+  checksum: 29d3320a18c5e809e198cc7ed20ebf053eef4081f64a43e91eb388dafe8ad6f3d560fde478d9f599f35be75a95fb33ed40ff22aa9f05f3c047b1b7df2176cb24
   languageName: node
   linkType: hard
 
@@ -18924,10 +19211,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"codemirror@npm:^5.65.15":
-  version: 5.65.15
-  resolution: "codemirror@npm:5.65.15"
-  checksum: 30e0cff9bfb2265b94fa6766e13975cb71db228e114d6d8cdcc160b495e32b0ff921ac09959715e3fef30a48c5a9d0655ffd0ff6c5fe7024656add438bb2b058
+"codemirror@npm:^5.65.17":
+  version: 5.65.17
+  resolution: "codemirror@npm:5.65.17"
+  checksum: 8bc853524c6416826364d776b012f488b3f4736899e5c8026062f43927e09de773051dd1b34e8cfd25642d7e358679ca5b113f0034fdd6a295f4193b04f8c528
   languageName: node
   linkType: hard
 
@@ -19594,7 +19881,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"create-ecdh@npm:^4.0.0":
+"create-ecdh@npm:^4.0.0, create-ecdh@npm:^4.0.4":
   version: 4.0.4
   resolution: "create-ecdh@npm:4.0.4"
   dependencies:
@@ -19768,7 +20055,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crypto-browserify@npm:^3.11.0, crypto-browserify@npm:^3.12.0":
+"crypto-browserify@npm:^3.11.0":
   version: 3.12.0
   resolution: "crypto-browserify@npm:3.12.0"
   dependencies:
@@ -19951,13 +20238,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-vars-ponyfill@npm:^2.4.8":
-  version: 2.4.8
-  resolution: "css-vars-ponyfill@npm:2.4.8"
+"css-vars-ponyfill@npm:^2.4.9":
+  version: 2.4.9
+  resolution: "css-vars-ponyfill@npm:2.4.9"
   dependencies:
     balanced-match: ^1.0.2
     get-css-data: ^2.0.2
-  checksum: ea2e270455d039d4b9a34e7a9c0264052c0c9d832538123afce7766cfe833b7c149406d5d984a406ad401d9b7e0115fdbac029321214d49ebe88cd743d055899
+  checksum: 0535b54e42ddd9aa7fcda42db98e828c3cab58ffa6d69325d3fe794d3ec3f9bd6f03bdc870a183890a7e6f1fe2b2ef85b1e13431724a0703bb047c98ee083ffc
   languageName: node
   linkType: hard
 
@@ -21128,7 +21415,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diffie-hellman@npm:^5.0.0":
+"diffie-hellman@npm:^5.0.0, diffie-hellman@npm:^5.0.3":
   version: 5.0.3
   resolution: "diffie-hellman@npm:5.0.3"
   dependencies:
@@ -21180,12 +21467,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"docker-compose@npm:^0.24.3":
-  version: 0.24.3
-  resolution: "docker-compose@npm:0.24.3"
+"docker-compose@npm:^0.24.8":
+  version: 0.24.8
+  resolution: "docker-compose@npm:0.24.8"
   dependencies:
     yaml: ^2.2.2
-  checksum: b2149eafb6e0a37ff4595044fe63d2fac23483afab06bca71cece78df4bae6f796b0a123854957addda77cc0559f205bc03cf3984ced816161e30e7f247d88e7
+  checksum: 48f3564c46490f1f51899a144deb546b61450a76bffddb378379ac7702aa34b055e0237e0dc77507df94d7ad6f1f7daeeac27730230bce9aafe2e35efeda6b45
   languageName: node
   linkType: hard
 
@@ -21287,10 +21574,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domain-browser@npm:^4.22.0":
-  version: 4.22.0
-  resolution: "domain-browser@npm:4.22.0"
-  checksum: e7ce1c19073e17dec35cfde050a3ddaac437d3ba8b870adabf9d5682e665eab3084df05de432dedf25b34303f0a2c71ac30f1cdba61b1aea018047b10de3d988
+"domain-browser@npm:^4.23.0":
+  version: 4.23.0
+  resolution: "domain-browser@npm:4.23.0"
+  checksum: 95b772f5fa88300240694380e06e03868573acdf86ca392a58c78602d6536dca2097ad2469a1500bd23a1329b09992de846e0b66c364cbf5711a7fee3ee5dac9
   languageName: node
   linkType: hard
 
@@ -21375,9 +21662,9 @@ __metadata:
   linkType: hard
 
 "dompurify@npm:^3.1.6":
-  version: 3.1.6
-  resolution: "dompurify@npm:3.1.6"
-  checksum: cc4fc4ccd9261fbceb2a1627a985c70af231274a26ddd3f643fd0616a0a44099bd9e4480940ce3655612063be4a1fe9f5e9309967526f8c0a99f931602323866
+  version: 3.1.7
+  resolution: "dompurify@npm:3.1.7"
+  checksum: 0a9b811bbc94f3dba60cf6486962362b0f1a5b4ab789f5e1cbd4749b6ba1a1fad190a677a962dc8850ce28764424765fe425e9d6508e4e93ba648ef15d54bc24
   languageName: node
   linkType: hard
 
@@ -21604,7 +21891,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"elliptic@npm:^6.5.3, elliptic@npm:^6.5.4":
+"elliptic@npm:^6.5.3":
   version: 6.5.4
   resolution: "elliptic@npm:6.5.4"
   dependencies:
@@ -21619,6 +21906,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"elliptic@npm:^6.5.5, elliptic@npm:^6.5.7":
+  version: 6.5.7
+  resolution: "elliptic@npm:6.5.7"
+  dependencies:
+    bn.js: ^4.11.9
+    brorand: ^1.1.0
+    hash.js: ^1.0.0
+    hmac-drbg: ^1.0.1
+    inherits: ^2.0.4
+    minimalistic-assert: ^1.0.1
+    minimalistic-crypto-utils: ^1.0.1
+  checksum: af0ffddffdbc2fea4eeec74388cd73e62ed5a0eac6711568fb28071566319785df529c968b0bf1250ba4bc628e074b2d64c54a633e034aa6f0c6b152ceb49ab8
+  languageName: node
+  linkType: hard
+
 "email-validator@npm:^2.0.4":
   version: 2.0.4
   resolution: "email-validator@npm:2.0.4"
@@ -22087,13 +22389,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es6-object-assign@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "es6-object-assign@npm:1.1.0"
-  checksum: 8d4fdf63484d78b5c64cacc2c2e1165bc7b6a64b739d2a9db6a4dc8641d99cc9efb433cdd4dc3d3d6b00bfa6ce959694e4665e3255190339945c5f33b692b5d8
-  languageName: node
-  linkType: hard
-
 "es6-shim@npm:^0.35.5":
   version: 0.35.6
   resolution: "es6-shim@npm:0.35.6"
@@ -22485,21 +22780,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-hooks@npm:^4.6.0, eslint-plugin-react-hooks@npm:~4.6.0":
-  version: 4.6.0
-  resolution: "eslint-plugin-react-hooks@npm:4.6.0"
+"eslint-plugin-react-hooks@npm:^4.6.2, eslint-plugin-react-hooks@npm:~4.6.2":
+  version: 4.6.2
+  resolution: "eslint-plugin-react-hooks@npm:4.6.2"
   peerDependencies:
     eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
-  checksum: 23001801f14c1d16bf0a837ca7970d9dd94e7b560384b41db378b49b6e32dc43d6e2790de1bd737a652a86f81a08d6a91f402525061b47719328f586a57e86c3
+  checksum: 395c433610f59577cfcf3f2e42bcb130436c8a0b3777ac64f441d88c5275f4fcfc89094cedab270f2822daf29af1079151a7a6579a8e9ea8cee66540ba0384c4
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-refresh@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "eslint-plugin-react-refresh@npm:0.4.4"
+"eslint-plugin-react-refresh@npm:^0.4.11":
+  version: 0.4.11
+  resolution: "eslint-plugin-react-refresh@npm:0.4.11"
   peerDependencies:
     eslint: ">=7"
-  checksum: 6b93f43cef5f69c18751db3267ce6cc7cb88f07061df28fc12401be56d93f37134f2a794c760f51cd5f84c5e81d81b003ef761ca76e7674646808b82884aa356
+  checksum: 55c9efb14c3dadf6422bb96af8a561d3f1385f1dc68e7ca9d388cc4adc69907644e1bb509ecfbb033a8ec19ea326beb99577c82d4a2530000809d897b08bf3d4
   languageName: node
   linkType: hard
 
@@ -23264,7 +23559,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-fifo@npm:^1.1.0, fast-fifo@npm:^1.2.0":
+"fast-fifo@npm:^1.1.0, fast-fifo@npm:^1.2.0, fast-fifo@npm:^1.3.2":
   version: 1.3.2
   resolution: "fast-fifo@npm:1.3.2"
   checksum: 6bfcba3e4df5af7be3332703b69a7898a8ed7020837ec4395bb341bd96cc3a6d86c3f6071dd98da289618cf2234c70d84b2a6f09a33dd6f988b1ff60d8e54275
@@ -23396,10 +23691,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fastest-validator@npm:^1.17.0":
-  version: 1.17.0
-  resolution: "fastest-validator@npm:1.17.0"
-  checksum: 0a6240f6dc7b544b3aadf9367410ecd64590dbfe505e6a24c339df954dd216f3a714d64a224abeef531d0a40dc348efe6cdbf59372d28954ac450cc0b212e0ec
+"fastest-validator@npm:^1.19.0":
+  version: 1.19.0
+  resolution: "fastest-validator@npm:1.19.0"
+  checksum: 93a52bcfb9cd3e6117de3ce4c975d182d9870496f2bddc2a71a53d5894ad536c21c62497f120c8d5e396b2312070b8c03acbefdfca32c081d524618ac2ee01a8
   languageName: node
   linkType: hard
 
@@ -23919,7 +24214,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.10.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.2":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.10.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9":
   version: 1.15.4
   resolution: "follow-redirects@npm:1.15.4"
   peerDependenciesMeta:
@@ -23929,6 +24224,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"follow-redirects@npm:^1.15.6":
+  version: 1.15.9
+  resolution: "follow-redirects@npm:1.15.9"
+  peerDependenciesMeta:
+    debug:
+      optional: true
+  checksum: 859e2bacc7a54506f2bf9aacb10d165df78c8c1b0ceb8023f966621b233717dab56e8d08baadc3ad3b9db58af290413d585c999694b7c146aaf2616340c3d2a6
+  languageName: node
+  linkType: hard
+
 "fontkit@npm:^2.0.2":
   version: 2.0.2
   resolution: "fontkit@npm:2.0.2"
@@ -24391,6 +24696,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"gc-stats@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "gc-stats@npm:1.4.1"
+  dependencies:
+    nan: ^2.18.0
+    node-gyp: latest
+    node-gyp-build: ^4.8.0
+  checksum: 81d9bfc884f1cdfcb4683d940eb52a0379cafba11ec2b993946463b6ca30350dcc77e8c62694b7d1ac81f71477f25a72d865181aa1e87368eb79500ebfbdfce0
+  languageName: node
+  linkType: hard
+
 "gcp-metadata@npm:^5.0.0":
   version: 5.0.0
   resolution: "gcp-metadata@npm:5.0.0"
@@ -24935,10 +25251,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"google-libphonenumber@npm:^3.2.33":
-  version: 3.2.33
-  resolution: "google-libphonenumber@npm:3.2.33"
-  checksum: d029c19c7278ac9acb446028c2e304df16341732905a0cf8a105ab595cb19c01456fd57d76e48a3220038044d8ce361edc539eea2bfd924ea36fb28178cf7dbe
+"google-libphonenumber@npm:^3.2.38":
+  version: 3.2.38
+  resolution: "google-libphonenumber@npm:3.2.38"
+  checksum: 5e30ced0399b3803e61d41c0f7a69e289baf0912568381a0f2f0a5f0e5d3403dd8a26dd758ecb52e56337d83f45865fb36c0d7bfec255868286f05cc03a6b920
   languageName: node
   linkType: hard
 
@@ -25306,6 +25622,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hash-base@npm:~3.0, hash-base@npm:~3.0.4":
+  version: 3.0.4
+  resolution: "hash-base@npm:3.0.4"
+  dependencies:
+    inherits: ^2.0.1
+    safe-buffer: ^5.0.1
+  checksum: 878465a0dfcc33cce195c2804135352c590d6d10980adc91a9005fd377e77f2011256c2b7cfce472e3f2e92d561d1bf3228d2da06348a9017ce9a258b3b49764
+  languageName: node
+  linkType: hard
+
 "hash.js@npm:^1.0.0, hash.js@npm:^1.0.3, hash.js@npm:^1.1.7":
   version: 1.1.7
   resolution: "hash.js@npm:1.1.7"
@@ -26631,13 +26957,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ipaddr.js@npm:^2.0.1, ipaddr.js@npm:^2.1.0":
+"ipaddr.js@npm:^2.0.1":
   version: 2.1.0
   resolution: "ipaddr.js@npm:2.1.0"
   checksum: 807a054f2bd720c4d97ee479d6c9e865c233bea21f139fb8dabd5a35c4226d2621c42e07b4ad94ff3f82add926a607d8d9d37c625ad0319f0e08f9f2bd1968e2
   languageName: node
   linkType: hard
 
+"ipaddr.js@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "ipaddr.js@npm:2.2.0"
+  checksum: 770ba8451fd9bf78015e8edac0d5abd7a708cbf75f9429ca9147a9d2f3a2d60767cd5de2aab2b1e13ca6e4445bdeff42bf12ef6f151c07a5c6cf8a44328e2859
+  languageName: node
+  linkType: hard
+
 "is-absolute-url@npm:^2.0.0":
   version: 2.1.0
   resolution: "is-absolute-url@npm:2.1.0"
@@ -27135,7 +27468,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-nan@npm:^1.2.1":
+"is-nan@npm:^1.3.2":
   version: 1.3.2
   resolution: "is-nan@npm:1.3.2"
   dependencies:
@@ -28867,14 +29200,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"katex@npm:~0.16.9":
-  version: 0.16.9
-  resolution: "katex@npm:0.16.9"
+"katex@npm:~0.16.11":
+  version: 0.16.11
+  resolution: "katex@npm:0.16.11"
   dependencies:
     commander: ^8.3.0
   bin:
     katex: cli.js
-  checksum: 861194dfd4d86505e657f688fb73048d46ac498edafce71199502a35b03c0ecc35ba930c631be79c4a09d90a0d23476673cd52f6bc367c7a161854d64005fa95
+  checksum: 49d9340705f4922ee22aacedad45664971449e5ca65e42a70228961336c8d4746c37c3c719bcc2114b6ad21182800c7d3d8bea28fe6f951fc45fe7e8322ea3bd
   languageName: node
   linkType: hard
 
@@ -30341,35 +30674,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"meteor-node-stubs@npm:^1.2.5":
-  version: 1.2.5
-  resolution: "meteor-node-stubs@npm:1.2.5"
+"meteor-node-stubs@npm:^1.2.10":
+  version: 1.2.10
+  resolution: "meteor-node-stubs@npm:1.2.10"
   dependencies:
-    assert: ^2.0.0
+    "@meteorjs/crypto-browserify": ^3.12.1
+    assert: ^2.1.0
     browserify-zlib: ^0.2.0
     buffer: ^5.7.1
     console-browserify: ^1.2.0
     constants-browserify: ^1.0.0
-    crypto-browserify: ^3.12.0
-    domain-browser: ^4.22.0
-    elliptic: ^6.5.4
+    domain-browser: ^4.23.0
+    elliptic: ^6.5.7
     events: ^3.3.0
     https-browserify: ^1.0.0
     os-browserify: ^0.3.0
-    path-browserify: ^1.0.0
+    path-browserify: ^1.0.1
     process: ^0.11.10
     punycode: ^1.4.1
     querystring-es3: ^0.2.1
-    readable-stream: ^3.6.0
+    readable-stream: ^3.6.2
     stream-browserify: ^3.0.0
     stream-http: ^3.2.0
     string_decoder: ^1.3.0
     timers-browserify: ^2.0.12
     tty-browserify: 0.0.1
-    url: ^0.11.0
-    util: ^0.12.4
+    url: ^0.11.4
+    util: ^0.12.5
     vm-browserify: ^1.1.2
-  checksum: 2529bce377342b2c01f97c397fe89490fce0149ecb37dba1b18d2f865753a25addea2c16dd212afcaa6b9aa01abec52c90721b65653d15ff59708d5bd9adef15
+  checksum: ce0e49991b2afba48dea0c5699bebb40502d8e775a486d4dca0f004432063ab56ceae2c4d22d8448d669edcb9cfcd7cb82e7a351b301b59f563ef4067daedf7c
   languageName: node
   linkType: hard
 
@@ -30901,15 +31234,104 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moleculer@npm:^0.14.31":
-  version: 0.14.31
-  resolution: "moleculer@npm:0.14.31"
+"moleculer@npm:0.14.34":
+  version: 0.14.34
+  resolution: "moleculer@npm:0.14.34"
+  dependencies:
+    args: ^5.0.3
+    eventemitter2: ^6.4.9
+    fastest-validator: ^1.19.0
+    glob: ^7.2.0
+    ipaddr.js: ^2.2.0
+    kleur: ^4.1.5
+    lodash: ^4.17.21
+    lru-cache: ^6.0.0
+    node-fetch: ^2.6.7
+    recursive-watch: ^1.1.4
+  peerDependencies:
+    amqplib: ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0
+    avsc: ^5.0.0
+    bunyan: ^1.0.0
+    cbor-x: ^0.8.3 || ^0.9.0 || ^1.2.0
+    dd-trace: ^0.33.0 || ^0.34.0 || ^0.35.0 || ^0.36.0 || >=1.0.0 <1.6.0
+    debug: ^4.0.0
+    etcd3: ^1.0.0
+    ioredis: ^4.0.0 || ^5.0.0
+    jaeger-client: ^3.0.0
+    kafka-node: ^5.0.0
+    log4js: ^6.0.0
+    mqtt: ^4.0.0 || ^5.0.0
+    msgpack5: ^5.0.0 || ^6.0.0
+    nats: ^1.0.0 || ^2.0.0
+    node-nats-streaming: ^0.0.51 || ^0.2.0 || ^0.3.0
+    notepack.io: ^2.0.0 || ^3.0.0
+    pino: ^6.0.0 || ^7.0.0 || ^8.0.0
+    protobufjs: ^6.0.0 || ^7.0.0
+    redlock: ^4.0.0
+    rhea-promise: ^1.0.0 || ^2.0.0
+    thrift: ^0.12.0 || ^0.16.0
+    winston: ^3.0.0
+  peerDependenciesMeta:
+    amqplib:
+      optional: true
+    avsc:
+      optional: true
+    bunyan:
+      optional: true
+    cbor-x:
+      optional: true
+    dd-trace:
+      optional: true
+    debug:
+      optional: true
+    etcd3:
+      optional: true
+    ioredis:
+      optional: true
+    jaeger-client:
+      optional: true
+    kafka-node:
+      optional: true
+    log4js:
+      optional: true
+    mqtt:
+      optional: true
+    msgpack5:
+      optional: true
+    nats:
+      optional: true
+    node-nats-streaming:
+      optional: true
+    notepack.io:
+      optional: true
+    pino:
+      optional: true
+    protobufjs:
+      optional: true
+    redlock:
+      optional: true
+    rhea-promise:
+      optional: true
+    thrift:
+      optional: true
+    winston:
+      optional: true
+  bin:
+    moleculer-runner: bin/moleculer-runner.js
+    moleculer-runner-esm: bin/moleculer-runner.mjs
+  checksum: 2f20a28d4796be8b5837ee963e2323ab13dc30064f0c9126dcc04b2969586a1b43c92d875349dc9cc0b36170d8dd640ddf843d022c6b6c803bc84216ec4fa7d9
+  languageName: node
+  linkType: hard
+
+"moleculer@patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch::locator=rocket.chat%40workspace%3A.":
+  version: 0.14.34
+  resolution: "moleculer@patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch::version=0.14.34&hash=e1c8f3&locator=rocket.chat%40workspace%3A."
   dependencies:
     args: ^5.0.3
     eventemitter2: ^6.4.9
-    fastest-validator: ^1.17.0
+    fastest-validator: ^1.19.0
     glob: ^7.2.0
-    ipaddr.js: ^2.1.0
+    ipaddr.js: ^2.2.0
     kleur: ^4.1.5
     lodash: ^4.17.21
     lru-cache: ^6.0.0
@@ -30927,7 +31349,7 @@ __metadata:
     jaeger-client: ^3.0.0
     kafka-node: ^5.0.0
     log4js: ^6.0.0
-    mqtt: ^4.0.0
+    mqtt: ^4.0.0 || ^5.0.0
     msgpack5: ^5.0.0 || ^6.0.0
     nats: ^1.0.0 || ^2.0.0
     node-nats-streaming: ^0.0.51 || ^0.2.0 || ^0.3.0
@@ -30986,11 +31408,11 @@ __metadata:
   bin:
     moleculer-runner: bin/moleculer-runner.js
     moleculer-runner-esm: bin/moleculer-runner.mjs
-  checksum: 4d6d05f98e2174b708de8c946901a4a3a1de411505f43909216a9d2ff93820e6eec7edd44b45c99ab04c6c312304a63a346288e181fead48558763fb4ec69c24
+  checksum: a5aea2d8fd0cb1b79a64bd67e3e0ebe1d023f66bf268391124968866ca48d305853b9635e92b5e64420ed4bc4625e50a70d505255eede839d4bab1734aa7db91
   languageName: node
   linkType: hard
 
-"moment-timezone@npm:*, moment-timezone@npm:^0.5.43, moment-timezone@npm:^0.5.x, moment-timezone@npm:~0.5.43":
+"moment-timezone@npm:*, moment-timezone@npm:^0.5.x":
   version: 0.5.43
   resolution: "moment-timezone@npm:0.5.43"
   dependencies:
@@ -30999,6 +31421,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"moment-timezone@npm:^0.5.45, moment-timezone@npm:~0.5.45":
+  version: 0.5.45
+  resolution: "moment-timezone@npm:0.5.45"
+  dependencies:
+    moment: ^2.29.4
+  checksum: a22e9f983fbe1a01757ce30685bce92e3f6efa692eb682afd47b82da3ff960b3c8c2c3883ec6715c124bc985a342b57cba1f6ba25a1c8b4c7ad766db3cd5e1d0
+  languageName: node
+  linkType: hard
+
 "moment@npm:^2.10.2, moment@npm:^2.29.1, moment@npm:^2.29.4":
   version: 2.29.4
   resolution: "moment@npm:2.29.4"
@@ -31179,6 +31610,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nan@npm:^2.18.0":
+  version: 2.20.0
+  resolution: "nan@npm:2.20.0"
+  dependencies:
+    node-gyp: latest
+  checksum: eb09286e6c238a3582db4d88c875db73e9b5ab35f60306090acd2f3acae21696c9b653368b4a0e32abcef64ee304a923d6223acaddd16169e5eaaf5c508fb533
+  languageName: node
+  linkType: hard
+
 "nanoid@npm:3.3.1":
   version: 3.3.1
   resolution: "nanoid@npm:3.3.1"
@@ -31197,6 +31637,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nanoid@npm:^3.3.7":
+  version: 3.3.7
+  resolution: "nanoid@npm:3.3.7"
+  bin:
+    nanoid: bin/nanoid.cjs
+  checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2
+  languageName: node
+  linkType: hard
+
 "nanomatch@npm:^1.2.9":
   version: 1.2.13
   resolution: "nanomatch@npm:1.2.13"
@@ -31455,7 +31904,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:^2, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.11, node-fetch@npm:^2.6.7":
+"node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.11, node-fetch@npm:^2.6.7, node-fetch@npm:^2.7.0":
   version: 2.7.0
   resolution: "node-fetch@npm:2.7.0"
   dependencies:
@@ -31505,6 +31954,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-gyp-build@npm:^4.8.0":
+  version: 4.8.2
+  resolution: "node-gyp-build@npm:4.8.2"
+  bin:
+    node-gyp-build: bin.js
+    node-gyp-build-optional: optional.js
+    node-gyp-build-test: build-test.js
+  checksum: 1a57bba8c4c193f808bd8ad1484d4ebdd8106dd9f04a3e82554dc716e3a2d87d7e369e9503c145e0e6a7e2c663fec0d8aaf52bd8156342ec7fc388195f37824e
+  languageName: node
+  linkType: hard
+
 "node-gyp@npm:^9.4.1":
   version: 9.4.1
   resolution: "node-gyp@npm:9.4.1"
@@ -32031,7 +32491,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-is@npm:^1.0.1, object-is@npm:^1.1.5":
+"object-is@npm:^1.1.5":
   version: 1.1.6
   resolution: "object-is@npm:1.1.6"
   dependencies:
@@ -32777,6 +33237,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-asn1@npm:^5.1.7":
+  version: 5.1.7
+  resolution: "parse-asn1@npm:5.1.7"
+  dependencies:
+    asn1.js: ^4.10.1
+    browserify-aes: ^1.2.0
+    evp_bytestokey: ^1.0.3
+    hash-base: ~3.0
+    pbkdf2: ^3.1.2
+    safe-buffer: ^5.2.1
+  checksum: 93c7194c1ed63a13e0b212d854b5213ad1aca0ace41c66b311e97cca0519cf9240f79435a0306a3b412c257f0ea3f1953fd0d9549419a0952c9e995ab361fd6c
+  languageName: node
+  linkType: hard
+
 "parse-entities@npm:^2.0.0":
   version: 2.0.0
   resolution: "parse-entities@npm:2.0.0"
@@ -32902,7 +33376,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-browserify@npm:^1.0.0, path-browserify@npm:^1.0.1":
+"path-browserify@npm:^1.0.1":
   version: 1.0.1
   resolution: "path-browserify@npm:1.0.1"
   checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699
@@ -33099,7 +33573,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pbkdf2@npm:^3.0.3":
+"pbkdf2@npm:^3.0.3, pbkdf2@npm:^3.1.2":
   version: 3.1.2
   resolution: "pbkdf2@npm:3.1.2"
   dependencies:
@@ -33174,6 +33648,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"picocolors@npm:^1.0.1":
+  version: 1.1.0
+  resolution: "picocolors@npm:1.1.0"
+  checksum: a64d653d3a188119ff45781dfcdaeedd7625583f45280aea33fcb032c7a0d3959f2368f9b192ad5e8aade75b74dbd954ffe3106c158509a45e4c18ab379a2acd
+  languageName: node
+  linkType: hard
+
 "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3, picomatch@npm:^2.3.0, picomatch@npm:^2.3.1":
   version: 2.3.1
   resolution: "picomatch@npm:2.3.1"
@@ -33368,14 +33849,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-qase-reporter@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "playwright-qase-reporter@npm:1.2.1"
+"playwright-qase-reporter@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "playwright-qase-reporter@npm:1.2.2"
   dependencies:
     chalk: ^4.1.0
     form-data: ^3.0.0
     qaseio: ^2.0.2
-  checksum: 8b4d2f5902a8d655b781e9dd6898d5d2f25739033f1fda2b600b07ac3fc7680f9a1ee917a969b7315f4f05211e36f1a6699155f9ead05a435afa695932bde9fa
+  checksum: c2d7c5e990357b5cc029d51179ca2af7b61fb7d871eeea05e78300749e7829ca5dd9eef00820ec45422b5036a06a3fa383c76b1dda052aadd490fdd66d6ffe15
   languageName: node
   linkType: hard
 
@@ -34266,7 +34747,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.23, postcss@npm:~8.4.31":
+"postcss@npm:^8.2.15, postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.23":
   version: 8.4.31
   resolution: "postcss@npm:8.4.31"
   dependencies:
@@ -34277,6 +34758,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss@npm:~8.4.45":
+  version: 8.4.45
+  resolution: "postcss@npm:8.4.45"
+  dependencies:
+    nanoid: ^3.3.7
+    picocolors: ^1.0.1
+    source-map-js: ^1.2.0
+  checksum: 3223cdad4a9392c0b334ee3ee7e4e8041c631cb6160609cef83c18d2b2580e931dd8068ab13cc6000c1a254d57492ac6c38717efc397c5dcc9756d06bc9c44f3
+  languageName: node
+  linkType: hard
+
 "postis@npm:^2.2.0":
   version: 2.2.0
   resolution: "postis@npm:2.2.0"
@@ -34410,7 +34902,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.7.1, prettier@npm:^2.8.4, prettier@npm:~2.8.7, prettier@npm:~2.8.8":
+"prettier@npm:^2.7.1, prettier@npm:^2.8.4, prettier@npm:~2.8.8":
   version: 2.8.8
   resolution: "prettier@npm:2.8.8"
   bin:
@@ -34735,7 +35227,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"public-encrypt@npm:^4.0.0":
+"public-encrypt@npm:^4.0.0, public-encrypt@npm:^4.0.3":
   version: 4.0.3
   resolution: "public-encrypt@npm:4.0.3"
   dependencies:
@@ -34845,6 +35337,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"qs@npm:6.13.0, qs@npm:^6.12.3":
+  version: 6.13.0
+  resolution: "qs@npm:6.13.0"
+  dependencies:
+    side-channel: ^1.0.6
+  checksum: e9404dc0fc2849245107108ce9ec2766cde3be1b271de0bf1021d049dc5b98d1a2901e67b431ac5509f865420a7ed80b7acb3980099fe1c118a1c5d2e1432ad8
+  languageName: node
+  linkType: hard
+
 "qs@npm:6.9.3":
   version: 6.9.3
   resolution: "qs@npm:6.9.3"
@@ -35029,7 +35530,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"randomfill@npm:^1.0.3":
+"randomfill@npm:^1.0.3, randomfill@npm:^1.0.4":
   version: 1.0.4
   resolution: "randomfill@npm:1.0.4"
   dependencies:
@@ -35189,13 +35690,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"re-resizable@npm:^6.9.9":
-  version: 6.9.9
-  resolution: "re-resizable@npm:6.9.9"
+"re-resizable@npm:^6.9.18":
+  version: 6.9.18
+  resolution: "re-resizable@npm:6.9.18"
   peerDependencies:
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
-  checksum: a2c8bfe86646fb02d5c9c624b1da26f9e6a5e2f552cd96ce4db690588bee6b21177065ce8e98646c6ca0b1a9c4ce233824b75eb346800d8248ac8a87b40f1b28
+  checksum: 46ef26f45d4bf37f4db0d0758fdc0a1b97b29398ac0e8404c556118e15b5df7f47dba2acd60f9e4a9cc66ed536b9566c71d7fc0d2f9bf939609a3016da30704d
   languageName: node
   linkType: hard
 
@@ -35262,21 +35763,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-docgen-typescript-plugin@npm:^1.0.5, react-docgen-typescript-plugin@npm:~1.0.5":
-  version: 1.0.5
-  resolution: "react-docgen-typescript-plugin@npm:1.0.5"
+"react-docgen-typescript-plugin@npm:^1.0.8, react-docgen-typescript-plugin@npm:~1.0.8":
+  version: 1.0.8
+  resolution: "react-docgen-typescript-plugin@npm:1.0.8"
   dependencies:
     debug: ^4.1.1
-    endent: ^2.0.1
     find-cache-dir: ^3.3.1
     flat-cache: ^3.0.4
     micromatch: ^4.0.2
     react-docgen-typescript: ^2.2.2
-    tslib: ^2.0.0
+    tslib: ^2.6.2
   peerDependencies:
     typescript: ">= 4.x"
     webpack: ">= 4"
-  checksum: 0f83d33c7b6dc82fef34ee820c94485c374d853774c5c26b04754ba3674fe4db2c7fc210b30fa0ca77c5033633553c12742aab6305a7f16cd263c70fedf27589
+  checksum: c4fe1ae821be97270de370257747ec4f927f8ee291599f0e67b8bb13ba343da79894ac84a2836af428f877e88d1d96edbef6ee808ed23ecdb4b230fe4f268f1e
   languageName: node
   linkType: hard
 
@@ -35391,24 +35891,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-i18next@npm:^14.1.0":
-  version: 14.1.0
-  resolution: "react-i18next@npm:14.1.0"
-  dependencies:
-    "@babel/runtime": ^7.23.9
-    html-parse-stringify: ^3.0.1
-  peerDependencies:
-    i18next: ">= 23.2.3"
-    react: ">= 16.8.0"
-  peerDependenciesMeta:
-    react-dom:
-      optional: true
-    react-native:
-      optional: true
-  checksum: 96fbc4b0919b9f0c639f9f3eb35eecac528174aa97e3b1af469cfdbff4b34e40ae8969c26c0b737691a5fa9b56bb13093524cfca79b93cbd58f1319530da31b2
-  languageName: node
-  linkType: hard
-
 "react-i18next@npm:~13.2.2":
   version: 13.2.2
   resolution: "react-i18next@npm:13.2.2"
@@ -35876,6 +36358,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readable-stream@npm:^2.3.8":
+  version: 2.3.8
+  resolution: "readable-stream@npm:2.3.8"
+  dependencies:
+    core-util-is: ~1.0.0
+    inherits: ~2.0.3
+    isarray: ~1.0.0
+    process-nextick-args: ~2.0.0
+    safe-buffer: ~5.1.1
+    string_decoder: ~1.1.1
+    util-deprecate: ~1.0.1
+  checksum: 65645467038704f0c8aaf026a72fbb588a9e2ef7a75cd57a01702ee9db1c4a1e4b03aaad36861a6a0926546a74d174149c8c207527963e0c2d3eee2f37678a42
+  languageName: node
+  linkType: hard
+
 "readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0":
   version: 3.6.0
   resolution: "readable-stream@npm:3.6.0"
@@ -35887,6 +36384,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readable-stream@npm:^3.6.2":
+  version: 3.6.2
+  resolution: "readable-stream@npm:3.6.2"
+  dependencies:
+    inherits: ^2.0.3
+    string_decoder: ^1.1.1
+    util-deprecate: ^1.0.1
+  checksum: bdcbe6c22e846b6af075e32cf8f4751c2576238c5043169a1c221c92ee2878458a816a4ea33f4c67623c0b6827c8a400409bfb3cf0bf3381392d0b1dfb52ac8d
+  languageName: node
+  linkType: hard
+
 "readable-stream@npm:^4.0.0":
   version: 4.1.0
   resolution: "readable-stream@npm:4.1.0"
@@ -36713,11 +37221,11 @@ __metadata:
   resolution: "rocket.chat@workspace:."
   dependencies:
     "@changesets/cli": ^2.26.2
-    "@types/chart.js": ^2.9.39
-    "@types/js-yaml": ^4.0.8
+    "@types/chart.js": ^2.9.41
+    "@types/js-yaml": ^4.0.9
     node-gyp: ^9.4.1
     ts-node: ^10.9.2
-    turbo: latest
+    turbo: ^2.1.2
   languageName: unknown
   linkType: soft
 
@@ -36725,7 +37233,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services"
   dependencies:
-    "@rocket.chat/apps-engine": 1.45.0-alpha.866
+    "@rocket.chat/apps-engine": 1.46.0
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": ~0.31.25
@@ -36736,16 +37244,16 @@ __metadata:
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": ~0.31.25
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/cookie": ^0.5.3
-    "@types/cookie-parser": ^1.4.5
-    "@types/ejson": ^2.2.1
-    "@types/express": ^4.17.20
-    "@types/fibers": ^3.1.3
+    "@types/cookie": ^0.5.4
+    "@types/cookie-parser": ^1.4.7
+    "@types/ejson": ^2.2.2
+    "@types/express": ^4.17.21
+    "@types/fibers": ^3.1.4
     "@types/node": ^14.18.63
-    "@types/ws": ^8.5.8
+    "@types/ws": ^8.5.12
     ajv: ^8.11.0
     bcrypt: ^5.0.1
-    body-parser: ^1.20.2
+    body-parser: ^1.20.3
     colorette: ^2.0.20
     cookie: ^0.5.0
     cookie-parser: ^1.4.6
@@ -36755,7 +37263,7 @@ __metadata:
     fibers: ^5.0.3
     jaeger-client: ^3.19.0
     mem: ^8.1.1
-    moleculer: ^0.14.31
+    moleculer: ^0.14.34
     mongodb: ^4.17.2
     nats: ^2.6.1
     npm-run-all: ^4.1.5
@@ -36764,8 +37272,8 @@ __metadata:
     pm2: ^5.2.0
     sodium-native: ^3.3.0
     sodium-plus: ^0.9.0
-    ts-node: ^10.9.1
-    typescript: ~5.3.3
+    ts-node: ^10.9.2
+    typescript: ~5.5.4
     uuid: ^8.3.2
     ws: ^8.8.1
   languageName: unknown
@@ -37231,7 +37739,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.2, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4":
+"semver@npm:^7.2, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4":
   version: 7.5.4
   resolution: "semver@npm:7.5.4"
   dependencies:
@@ -37605,6 +38113,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"side-channel@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "side-channel@npm:1.0.6"
+  dependencies:
+    call-bind: ^1.0.7
+    es-errors: ^1.3.0
+    get-intrinsic: ^1.2.4
+    object-inspect: ^1.13.1
+  checksum: bfc1afc1827d712271453e91b7cd3878ac0efd767495fd4e594c4c2afaa7963b7b510e249572bfd54b0527e66e4a12b61b80c061389e129755f34c493aad9b97
+  languageName: node
+  linkType: hard
+
 "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
@@ -37920,6 +38440,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map-js@npm:^1.2.0":
+  version: 1.2.1
+  resolution: "source-map-js@npm:1.2.1"
+  checksum: 4eb0cd997cdf228bc253bcaff9340afeb706176e64868ecd20efbe6efea931465f43955612346d6b7318789e5265bdc419bc7669c1cebe3db0eb255f57efa76b
+  languageName: node
+  linkType: hard
+
 "source-map-resolve@npm:^0.5.0":
   version: 0.5.3
   resolution: "source-map-resolve@npm:0.5.3"
@@ -38334,15 +38861,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"storybook-dark-mode@npm:~3.0.1":
-  version: 3.0.1
-  resolution: "storybook-dark-mode@npm:3.0.1"
+"storybook-dark-mode@npm:~3.0.3":
+  version: 3.0.3
+  resolution: "storybook-dark-mode@npm:3.0.3"
   dependencies:
     "@storybook/addons": ^7.0.0
-    "@storybook/api": ^7.0.0
     "@storybook/components": ^7.0.0
     "@storybook/core-events": ^7.0.0
     "@storybook/global": ^5.0.0
+    "@storybook/manager-api": ^7.0.0
     "@storybook/theming": ^7.0.0
     fast-deep-equal: ^3.1.3
     memoizerific: ^1.11.3
@@ -38354,7 +38881,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: d04213c92e8a4af0035e80eb02b75b8da725ba7b1ecbfe050eb04cb4018d91394f08c8fe7c1b106c971b2047ef5a1ba776e78050ae1f6d7563cdfdba5e701a29
+  checksum: 7db89470168e9d15f36c44554ddb80b5aeac7276664904adc7b2d1f1913a4a514b86769eb80d4fcc43070e75d4e79a53b2467e51d628298e2e35e3c47c30bc7f
   languageName: node
   linkType: hard
 
@@ -38378,10 +38905,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stream-buffers@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "stream-buffers@npm:3.0.2"
-  checksum: b09fdeea606e3113ebd0e07010ed0cf038608fa396130add9e45deaff5cc3ba845dc25c31ad24f8341f85907846344cb7c85f75ea52c6572e2ac646e9b6072d0
+"stream-buffers@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "stream-buffers@npm:3.0.3"
+  checksum: 3f0bdc4b1fd3ff370cef5a2103dd930b8981d42d97741eeb087a660771e27f0fc35fa8a351bb36e15bbbbce0eea00fefed60d6cdff4c6c3f527580529f183807
   languageName: node
   linkType: hard
 
@@ -38471,6 +38998,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"streamx@npm:^2.20.0":
+  version: 2.20.1
+  resolution: "streamx@npm:2.20.1"
+  dependencies:
+    bare-events: ^2.2.0
+    fast-fifo: ^1.3.2
+    queue-tick: ^1.0.1
+    text-decoder: ^1.1.0
+  dependenciesMeta:
+    bare-events:
+      optional: true
+  checksum: 48605ddd3abdd86d2e3ee945ec7c9317f36abb5303347a8fff6e4c7926a72c33ec7ac86b50734ccd1cf65602b6a38e247966e8199b24e5a7485d9cec8f5327bd
+  languageName: node
+  linkType: hard
+
 "strict-uri-encode@npm:^1.0.0":
   version: 1.1.0
   resolution: "strict-uri-encode@npm:1.1.0"
@@ -39244,7 +39786,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar-fs@npm:^2.0.0, tar-fs@npm:^2.1.1":
+"tar-fs@npm:^2.0.0":
   version: 2.1.1
   resolution: "tar-fs@npm:2.1.1"
   dependencies:
@@ -39267,6 +39809,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tar-fs@npm:^3.0.5":
+  version: 3.0.6
+  resolution: "tar-fs@npm:3.0.6"
+  dependencies:
+    bare-fs: ^2.1.1
+    bare-path: ^2.1.0
+    pump: ^3.0.0
+    tar-stream: ^3.1.5
+  dependenciesMeta:
+    bare-fs:
+      optional: true
+    bare-path:
+      optional: true
+  checksum: b4fa09c70f75caf05bf5cf87369cd2862f1ac5fb75c4ddf9d25d55999f7736a94b58ad679d384196cba837c5f5ff14086e060fafccef5474a16e2d3058ffa488
+  languageName: node
+  linkType: hard
+
 "tar-stream@npm:^1.5.2, tar-stream@npm:^1.6.2":
   version: 1.6.2
   resolution: "tar-stream@npm:1.6.2"
@@ -39382,6 +39941,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"telejson@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "telejson@npm:7.2.0"
+  dependencies:
+    memoizerific: ^1.11.3
+  checksum: 55a3380c9ff3c5ad84581bb6bda28fc33c6b7c4a0c466894637da687639b8db0d21b0ff4c1bc1a7a92ae6b70662549d09e7b9e8b1ec334b2ef93078762ecdfb9
+  languageName: node
+  linkType: hard
+
 "temp-dir@npm:^1.0.0":
   version: 1.0.0
   resolution: "temp-dir@npm:1.0.0"
@@ -39537,6 +40105,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"text-decoder@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "text-decoder@npm:1.2.0"
+  dependencies:
+    b4a: ^1.6.4
+  checksum: 9f4c23900b42153af0e4a902577eba37cb70cd1d5b187732b81c74c705d3206952cf1dcecf97537794374f55aac6c547ac3860f1facc9560007ca9a06b0e309d
+  languageName: node
+  linkType: hard
+
 "text-hex@npm:1.0.x":
   version: 1.0.0
   resolution: "text-hex@npm:1.0.0"
@@ -39989,7 +40566,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-jest@npm:~29.1.1":
+"ts-jest@npm:~29.1.5":
   version: 29.1.5
   resolution: "ts-jest@npm:29.1.5"
   dependencies:
@@ -40025,7 +40602,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-loader@npm:~9.4.2":
+"ts-loader@npm:~9.4.4":
   version: 9.4.4
   resolution: "ts-loader@npm:9.4.4"
   dependencies:
@@ -40040,7 +40617,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-node@npm:^10.9.1, ts-node@npm:^10.9.2, ts-node@npm:~10.9.1":
+"ts-node@npm:^10.9.2, ts-node@npm:~10.9.2":
   version: 10.9.2
   resolution: "ts-node@npm:10.9.2"
   dependencies:
@@ -40078,20 +40655,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-patch@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "ts-patch@npm:3.0.2"
+"ts-patch@npm:~3.2.1":
+  version: 3.2.1
+  resolution: "ts-patch@npm:3.2.1"
   dependencies:
     chalk: ^4.1.2
     global-prefix: ^3.0.0
     minimist: ^1.2.8
     resolve: ^1.22.2
-    semver: ^7.3.8
+    semver: ^7.5.4
     strip-ansi: ^6.0.1
   bin:
     ts-patch: bin/ts-patch.js
     tspc: bin/tspc.js
-  checksum: 09cdc54bf517b11d4b0de64515e9a0d7e71e238d6065b3c02a04280dc2683143cd810a9065046228571af0865a7d876a4a852ff9a909cb2cae8fe33b41e4eb81
+  checksum: 8da4472dcd67b561a6299b54e30ab96181598edb90a97bc8dbe0066b28d706ec7402fee73496d25a281e2c4c94cb8e86d3b1592b1ca7591ea0b6cb48617ed19c
   languageName: node
   linkType: hard
 
@@ -40145,6 +40722,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.6.2":
+  version: 2.7.0
+  resolution: "tslib@npm:2.7.0"
+  checksum: 1606d5c89f88d466889def78653f3aab0f88692e80bb2066d090ca6112ae250ec1cfa9dbfaab0d17b60da15a4186e8ec4d893801c67896b277c17374e36e1d28
+  languageName: node
+  linkType: hard
+
 "tsscmp@npm:^1.0.6":
   version: 1.0.6
   resolution: "tsscmp@npm:1.0.6"
@@ -40253,58 +40837,58 @@ __metadata:
   languageName: node
   linkType: hard
 
-"turbo-darwin-64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-darwin-64@npm:2.0.11"
+"turbo-darwin-64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-darwin-64@npm:2.1.2"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-darwin-arm64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-darwin-arm64@npm:2.0.11"
+"turbo-darwin-arm64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-darwin-arm64@npm:2.1.2"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-linux-64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-linux-64@npm:2.0.11"
+"turbo-linux-64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-linux-64@npm:2.1.2"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-linux-arm64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-linux-arm64@npm:2.0.11"
+"turbo-linux-arm64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-linux-arm64@npm:2.1.2"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-windows-64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-windows-64@npm:2.0.11"
+"turbo-windows-64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-windows-64@npm:2.1.2"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-windows-arm64@npm:2.0.11":
-  version: 2.0.11
-  resolution: "turbo-windows-arm64@npm:2.0.11"
+"turbo-windows-arm64@npm:2.1.2":
+  version: 2.1.2
+  resolution: "turbo-windows-arm64@npm:2.1.2"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo@npm:latest":
-  version: 2.0.11
-  resolution: "turbo@npm:2.0.11"
-  dependencies:
-    turbo-darwin-64: 2.0.11
-    turbo-darwin-arm64: 2.0.11
-    turbo-linux-64: 2.0.11
-    turbo-linux-arm64: 2.0.11
-    turbo-windows-64: 2.0.11
-    turbo-windows-arm64: 2.0.11
+"turbo@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "turbo@npm:2.1.2"
+  dependencies:
+    turbo-darwin-64: 2.1.2
+    turbo-darwin-arm64: 2.1.2
+    turbo-linux-64: 2.1.2
+    turbo-linux-arm64: 2.1.2
+    turbo-windows-64: 2.1.2
+    turbo-windows-arm64: 2.1.2
   dependenciesMeta:
     turbo-darwin-64:
       optional: true
@@ -40320,7 +40904,7 @@ __metadata:
       optional: true
   bin:
     turbo: bin/turbo
-  checksum: a2fcb17b2549102dcd912799319a5c31cbabc3fcb76241bac1d2231ee4e1911789cd4e6b4eb050f9e8548ef89143ee77be59eb35b1843cf12b42f136ef176a0c
+  checksum: ee3d12a69fa512d30b325369c49a490cd2112547a59aca7bd3c9407b12bd9bd9ffd682e801c1e2e5711669c155ef06b0a090b0bbffa84fd60ddc5df0a1c855e6
   languageName: node
   linkType: hard
 
@@ -40559,7 +41143,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typedoc@npm:~0.24.1":
+"typedoc@npm:~0.24.8":
   version: 0.24.8
   resolution: "typedoc@npm:0.24.8"
   dependencies:
@@ -40575,82 +41159,64 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:~5.3.3":
-  version: 5.3.3
-  resolution: "typescript@npm:5.3.3"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2
-  languageName: node
-  linkType: hard
-
-"typescript@npm:~5.4.5":
-  version: 5.4.5
-  resolution: "typescript@npm:5.4.5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 53c879c6fa1e3bcb194b274d4501ba1985894b2c2692fa079db03c5a5a7140587a1e04e1ba03184605d35f439b40192d9e138eb3279ca8eee313c081c8bcd9b0
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@~5.3.3#~builtin<compat/typescript>":
-  version: 5.3.3
-  resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin<compat/typescript>::version=5.3.3&hash=85af82"
+"typescript@npm:~5.5.4":
+  version: 5.5.4
+  resolution: "typescript@npm:5.5.4"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610
+  checksum: b309040f3a1cd91c68a5a58af6b9fdd4e849b8c42d837b2c2e73f9a4f96a98c4f1ed398a9aab576ee0a4748f5690cf594e6b99dbe61de7839da748c41e6d6ca8
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@~5.4.5#~builtin<compat/typescript>":
-  version: 5.4.5
-  resolution: "typescript@patch:typescript@npm%3A5.4.5#~builtin<compat/typescript>::version=5.4.5&hash=85af82"
+"typescript@patch:typescript@~5.5.4#~builtin<compat/typescript>":
+  version: 5.5.4
+  resolution: "typescript@patch:typescript@npm%3A5.5.4#~builtin<compat/typescript>::version=5.5.4&hash=85af82"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 2373c693f3b328f3b2387c3efafe6d257b057a142f9a79291854b14ff4d5367d3d730810aee981726b677ae0fd8329b23309da3b6aaab8263dbdccf1da07a3ba
+  checksum: fc52962f31a5bcb716d4213bef516885e4f01f30cea797a831205fc9ef12b405a40561c40eae3127ab85ba1548e7df49df2bcdee6b84a94bfbe3a0d7eff16b14
   languageName: node
   linkType: hard
 
-"typia@npm:5.3.3, typia@npm:^5.3.3":
-  version: 5.3.3
-  resolution: "typia@npm:5.3.3"
+"typia@npm:6.9.0":
+  version: 6.9.0
+  resolution: "typia@npm:6.9.0"
   dependencies:
+    "@samchon/openapi": ^0.4.6
     commander: ^10.0.0
     comment-json: ^4.2.3
     inquirer: ^8.2.5
     randexp: ^0.5.3
   peerDependencies:
-    typescript: ">=4.8.0 <5.4.0"
+    typescript: ">=4.8.0 <5.6.0"
   bin:
     typia: lib/executable/typia.js
-  checksum: 6e6c9f4c1382deda6ee91fb42f0adbfa57c5b73541a2e411474108d1deac9dd2f590fbbe48399c0357064a6298b5ab17324aa521195cf8e470057171ce868a64
+  checksum: 1d5ab0d331ff29b84914f5c8c5655fe3b1d17fae45ac3a76d30690de8414e8c45a27c189662896730c3211a436373e8c2eb3fc55d2eeb6ac8d15a1f50218a2e9
   languageName: node
   linkType: hard
 
-"typia@patch:typia@npm%3A5.3.3#./.yarn/patches/typia-npm-5.3.3-21d3e18463.patch::locator=rocket.chat%40workspace%3A.":
-  version: 5.3.3
-  resolution: "typia@patch:typia@npm%3A5.3.3#./.yarn/patches/typia-npm-5.3.3-21d3e18463.patch::version=5.3.3&hash=777cd5&locator=rocket.chat%40workspace%3A."
+"typia@patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch::locator=rocket.chat%40workspace%3A.":
+  version: 6.9.0
+  resolution: "typia@patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch::version=6.9.0&hash=71fcee&locator=rocket.chat%40workspace%3A."
   dependencies:
+    "@samchon/openapi": ^0.4.6
     commander: ^10.0.0
     comment-json: ^4.2.3
     inquirer: ^8.2.5
     randexp: ^0.5.3
   peerDependencies:
-    typescript: ">=4.8.0 <5.4.0"
+    typescript: ">=4.8.0 <5.6.0"
   bin:
     typia: lib/executable/typia.js
-  checksum: 256a670f6d3265135090a493c9519cd97466444188766ce9f4e434d2bfe29ec88c3a4ac3ac39938921e116873694ac526136957cbed5710109525d4d0d2425da
+  checksum: d87f150a526959f92ac9bafe7ad88121e69a2807c7aeb01a625cb845e0614fb09c54bbdbd68d0c90bce37072c2da5e153daa2ccd1f5ff7ca92eca4b5edf9e8a9
   languageName: node
   linkType: hard
 
-"ua-parser-js@npm:^1.0.37":
-  version: 1.0.37
-  resolution: "ua-parser-js@npm:1.0.37"
-  checksum: 4d481c720d523366d7762dc8a46a1b58967d979aacf786f9ceceb1cd767de069f64a4bdffb63956294f1c0696eb465ddb950f28ba90571709e33521b4bd75e07
+"ua-parser-js@npm:^1.0.38":
+  version: 1.0.38
+  resolution: "ua-parser-js@npm:1.0.38"
+  checksum: d0772b22b027338d806ab17d1ac2896ee7485bdf9217c526028159f3cd6bb10272bb18f6196d2f94dde83e3b36dc9d2533daf08a414764f6f4f1844842383838
   languageName: node
   linkType: hard
 
@@ -40699,10 +41265,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"underscore@npm:^1.13.6":
-  version: 1.13.6
-  resolution: "underscore@npm:1.13.6"
-  checksum: d5cedd14a9d0d91dd38c1ce6169e4455bb931f0aaf354108e47bd46d3f2da7464d49b2171a5cf786d61963204a42d01ea1332a903b7342ad428deaafaf70ec36
+"underscore@npm:^1.13.7":
+  version: 1.13.7
+  resolution: "underscore@npm:1.13.7"
+  checksum: 174b011af29e4fbe2c70eb2baa8bfab0d0336cf2f5654f364484967bc6264a86224d0134b9176e4235c8cceae00d11839f0fd4824268de04b11c78aca1241684
   languageName: node
   linkType: hard
 
@@ -41207,6 +41773,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"url@npm:^0.11.4":
+  version: 0.11.4
+  resolution: "url@npm:0.11.4"
+  dependencies:
+    punycode: ^1.4.1
+    qs: ^6.12.3
+  checksum: c25e587723d343d5d4248892393bfa5039ded9c2c07095a9d005bc64b7cb8956d623c0d8da8d1a28f71986a7a8d80fc2e9f9cf84235e48fa435a5cb4451062c6
+  languageName: node
+  linkType: hard
+
 "use-callback-ref@npm:^1.3.0":
   version: 1.3.0
   resolution: "use-callback-ref@npm:1.3.0"
@@ -41266,14 +41842,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-subscription@npm:^1.8.0":
-  version: 1.8.0
-  resolution: "use-subscription@npm:1.8.0"
+"use-subscription@npm:^1.8.2":
+  version: 1.8.2
+  resolution: "use-subscription@npm:1.8.2"
   dependencies:
-    use-sync-external-store: ^1.2.0
+    use-sync-external-store: ^1.2.2
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: beac1f0ff14fe23fd6ae9c34681258936729f343bf6532bbce36caa8f4c1019ff380783e35b4aeb7f3faaec1a83af242d7833bf7e660816d24555dbdd2c934da
+  checksum: 6b17f92a75405a4e6015d7762b459a43435f34d0bb9a72e512e305d6d3a61bd170e6666c3a62c2c3c7af1b7ba0b45c5a597b7eeea54c46e1cabf8ef0f971d44e
   languageName: node
   linkType: hard
 
@@ -41295,7 +41871,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-sync-external-store@npm:^1.2.0, use-sync-external-store@npm:~1.2.0, use-sync-external-store@npm:~1.2.2":
+"use-sync-external-store@npm:^1.2.0, use-sync-external-store@npm:^1.2.2, use-sync-external-store@npm:~1.2.0, use-sync-external-store@npm:~1.2.2":
   version: 1.2.2
   resolution: "use-sync-external-store@npm:1.2.2"
   peerDependencies:
@@ -41393,7 +41969,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"util@npm:^0.12.0, util@npm:^0.12.4":
+"util@npm:^0.12.4, util@npm:^0.12.5":
   version: 0.12.5
   resolution: "util@npm:0.12.5"
   dependencies:
@@ -41831,9 +42407,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webdav@npm:^4.11.3":
-  version: 4.11.3
-  resolution: "webdav@npm:4.11.3"
+"webdav@npm:^4.11.4":
+  version: 4.11.4
+  resolution: "webdav@npm:4.11.4"
   dependencies:
     axios: ^0.27.2
     base-64: ^1.0.0
@@ -41848,7 +42424,7 @@ __metadata:
     path-posix: ^1.0.0
     url-join: ^4.0.1
     url-parse: ^1.5.10
-  checksum: e5bfc66149088cd857c23a3a549650d7483dd5615cf1c4b6251a5b290a4ad8fef4975bfd99fca2d5842a0eaadc056bc0044e37893e0ad5447e6ce2e2dbd81da5
+  checksum: 941a8f239d483cc283b893132675746461fe42b0932afe81ee2cad36065aeb657d722813a34966f6c6f6e95e7058453a7869e238ae1e1d1d29df9a28508dee27
   languageName: node
   linkType: hard
 
@@ -41946,7 +42522,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-cli@npm:~5.0.1":
+"webpack-cli@npm:~5.0.2":
   version: 5.0.2
   resolution: "webpack-cli@npm:5.0.2"
   dependencies:
@@ -42340,10 +42916,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-fetch@npm:^3.6.19":
-  version: 3.6.19
-  resolution: "whatwg-fetch@npm:3.6.19"
-  checksum: 2896bc9ca867ea514392c73e2a272f65d5c4916248fe0837a9df5b1b92f247047bc76cf7c29c28a01ac6c5fb4314021d2718958c8a08292a96d56f72b2f56806
+"whatwg-fetch@npm:^3.6.20":
+  version: 3.6.20
+  resolution: "whatwg-fetch@npm:3.6.20"
+  checksum: c58851ea2c4efe5c2235f13450f426824cf0253c1d45da28f45900290ae602a20aff2ab43346f16ec58917d5562e159cd691efa368354b2e82918c2146a519c5
   languageName: node
   linkType: hard