From 23d873cda351c2aded6eac7e933ed9e02b71cda8 Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Tue, 4 Apr 2023 15:39:18 -0400
Subject: [PATCH 001/103] Ensure feedback options are not submitting in their
 translated forms.

---
 .../delete_workspace/delete_feedback.tsx      | 48 ++++++++++++-------
 .../components/feedback_modal/feedback.tsx    | 24 ++++++----
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_feedback.tsx b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_feedback.tsx
index 4b103160cf..e6d9825ed5 100644
--- a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_feedback.tsx
+++ b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_feedback.tsx
@@ -6,7 +6,7 @@ import React from 'react';
 import {injectIntl, WrappedComponentProps} from 'react-intl';
 
 import {Feedback} from '@mattermost/types/cloud';
-import FeedbackModal from 'components/feedback_modal/feedback';
+import FeedbackModal, {FeedbackOption} from 'components/feedback_modal/feedback';
 
 type Props = {
     onSubmit: (deleteFeedback: Feedback) => void;
@@ -28,23 +28,35 @@ const DeleteFeedbackModal = (props: Props) => {
         defaultMessage: 'Delete Workspace',
     });
 
-    const deleteFeedbackOptions = [
-        props.intl.formatMessage({
-            id: 'feedback.deleteWorkspace.feedbackNoValue',
-            defaultMessage: 'No longer found value',
-        }),
-        props.intl.formatMessage({
-            id: 'feedback.deleteWorkspace.feedbackMoving',
-            defaultMessage: 'Moving to a different solution',
-        }),
-        props.intl.formatMessage({
-            id: 'feedback.deleteWorkspace.feedbackMistake',
-            defaultMessage: 'Created a workspace by mistake',
-        }),
-        props.intl.formatMessage({
-            id: 'feedback.deleteWorkspace.feedbackHosting',
-            defaultMessage: 'Moving to hosting my own Mattermost instance (self-hosted)',
-        }),
+    const deleteFeedbackOptions: FeedbackOption[] = [
+        {
+            translatedMessage: props.intl.formatMessage({
+                id: 'feedback.deleteWorkspace.feedbackNoValue',
+                defaultMessage: 'No longer found value',
+            }),
+            submissionValue: 'No longer found value',
+        },
+        {
+            translatedMessage: props.intl.formatMessage({
+                id: 'feedback.deleteWorkspace.feedbackMoving',
+                defaultMessage: 'Moving to a different solution',
+            }),
+            submissionValue: 'Moving to a different solution',
+        },
+        {
+            translatedMessage: props.intl.formatMessage({
+                id: 'feedback.deleteWorkspace.feedbackMistake',
+                defaultMessage: 'Created a workspace by mistake',
+            }),
+            submissionValue: 'Created a workspace by mistake',
+        },
+        {
+            translatedMessage: props.intl.formatMessage({
+                id: 'feedback.deleteWorkspace.feedbackHosting',
+                defaultMessage: 'Moving to hosting my own Mattermost instance (self-hosted)',
+            }),
+            submissionValue: 'Moving to hosting my own Mattermost instance (self-hosted)',
+        }
     ];
 
     return (
diff --git a/webapp/channels/src/components/feedback_modal/feedback.tsx b/webapp/channels/src/components/feedback_modal/feedback.tsx
index af8daaac91..7609b88240 100644
--- a/webapp/channels/src/components/feedback_modal/feedback.tsx
+++ b/webapp/channels/src/components/feedback_modal/feedback.tsx
@@ -14,19 +14,25 @@ import RadioButtonGroup from 'components/common/radio_group';
 import {ModalIdentifiers} from 'utils/constants';
 
 import './feedback.scss';
+import {string} from 'yargs';
+
+export interface FeedbackOption {
+    translatedMessage: string;
+    submissionValue: string;
+};
 
 type Props = {
     onSubmit: (deleteFeedback: Feedback) => void;
     title: string;
     submitText: string;
-    feedbackOptions: string[];
+    feedbackOptions: FeedbackOption[];
     freeformTextPlaceholder: string;
 } & WrappedComponentProps
 
 function FeedbackModal(props: Props) {
     const maxFreeFormTextLength = 500;
-    const optionOther = props.intl.formatMessage({id: 'feedback.other', defaultMessage: 'Other'});
-    const feedbackModalOptions: string[] = [
+    const optionOther = {translatedMessage: props.intl.formatMessage({id: 'feedback.other', defaultMessage: 'Other'}), submissionValue: 'Other'};
+    const feedbackModalOptions: FeedbackOption[] = [
         ...props.feedbackOptions,
         optionOther,
     ];
@@ -34,9 +40,9 @@ function FeedbackModal(props: Props) {
     const [reason, setReason] = useState('');
     const [comments, setComments] = useState('');
     const reasonNotSelected = reason === '';
-    const reasonOther = reason === optionOther;
+    const reasonOther = reason === optionOther.submissionValue;
     const commentsNotProvided = comments.trim() === '';
-    const submitDisabled = reasonNotSelected || (reason === optionOther && commentsNotProvided);
+    const submitDisabled = reasonNotSelected || (reasonOther && commentsNotProvided);
 
     const dispatch = useDispatch();
 
@@ -71,15 +77,15 @@ function FeedbackModal(props: Props) {
                 testId='FeedbackModalRadioGroup'
                 values={feedbackModalOptions.map((option) => {
                     return {
-                        value: option,
-                        key: option,
-                        testId: option,
+                        value: option.submissionValue,
+                        key: option.translatedMessage,
+                        testId: option.submissionValue,
                     };
                 })}
                 value={reason}
                 onChange={(e) => setReason(e.target.value)}
             />
-            {reason === optionOther &&
+            {reasonOther &&
                 <>
                     <textarea
                         data-testid={'FeedbackModal__TextInput'}

From f717d686ff18bf5ce59a20341c1e71fcdc96ffda Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Tue, 4 Apr 2023 16:47:22 -0400
Subject: [PATCH 002/103] lint.

---
 .../admin_console/billing/delete_workspace/delete_feedback.tsx | 2 +-
 webapp/channels/src/components/feedback_modal/feedback.tsx     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_feedback.tsx b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_feedback.tsx
index e6d9825ed5..25c73d3b73 100644
--- a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_feedback.tsx
+++ b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_feedback.tsx
@@ -56,7 +56,7 @@ const DeleteFeedbackModal = (props: Props) => {
                 defaultMessage: 'Moving to hosting my own Mattermost instance (self-hosted)',
             }),
             submissionValue: 'Moving to hosting my own Mattermost instance (self-hosted)',
-        }
+        },
     ];
 
     return (
diff --git a/webapp/channels/src/components/feedback_modal/feedback.tsx b/webapp/channels/src/components/feedback_modal/feedback.tsx
index 7609b88240..3f612017be 100644
--- a/webapp/channels/src/components/feedback_modal/feedback.tsx
+++ b/webapp/channels/src/components/feedback_modal/feedback.tsx
@@ -14,12 +14,11 @@ import RadioButtonGroup from 'components/common/radio_group';
 import {ModalIdentifiers} from 'utils/constants';
 
 import './feedback.scss';
-import {string} from 'yargs';
 
 export interface FeedbackOption {
     translatedMessage: string;
     submissionValue: string;
-};
+}
 
 type Props = {
     onSubmit: (deleteFeedback: Feedback) => void;

From cbdb4bd6fed0ed4c420f53dc7685ba600a6ce18c Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Tue, 4 Apr 2023 17:12:09 -0400
Subject: [PATCH 003/103] Update options for downgrade feedback.

---
 .../feedback_modal/downgrade_feedback.tsx     | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx b/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx
index 65174c147f..f87b84397b 100644
--- a/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx
+++ b/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx
@@ -6,7 +6,7 @@ import React from 'react';
 import {injectIntl, WrappedComponentProps} from 'react-intl';
 
 import {Feedback} from '@mattermost/types/cloud';
-import FeedbackModal from 'components/feedback_modal/feedback';
+import FeedbackModal, {FeedbackOption} from 'components/feedback_modal/feedback';
 
 type Props = {
     onSubmit: (downgradeFeedback: Feedback) => void;
@@ -28,23 +28,35 @@ const DowngradeFeedbackModal = (props: Props) => {
         defaultMessage: 'Downgrade',
     });
 
-    const downgradeFeedbackOptions = [
-        props.intl.formatMessage({
-            id: 'feedback.downgradeWorkspace.technicalIssues',
-            defaultMessage: 'Experienced technical issues',
-        }),
-        props.intl.formatMessage({
-            id: 'feedback.downgradeWorkspace.noLongerNeeded',
-            defaultMessage: 'No longer need Cloud Professional features',
-        }),
-        props.intl.formatMessage({
-            id: 'feedback.downgradeWorkspace.exploringOptions',
-            defaultMessage: 'Exploring other solutions',
-        }),
-        props.intl.formatMessage({
-            id: 'feedback.downgradeWorkspace.tooExpensive',
-            defaultMessage: 'Too expensive',
-        }),
+    const downgradeFeedbackOptions: FeedbackOption[] = [
+        {
+            translatedMessage: props.intl.formatMessage({
+                id: 'feedback.downgradeWorkspace.technicalIssues',
+                defaultMessage: 'Experienced technical issues',
+            }),
+            submissionValue: 'Experienced technical issues',
+        },
+        {
+            translatedMessage: props.intl.formatMessage({
+                id: 'feedback.downgradeWorkspace.noLongerNeeded',
+                defaultMessage: 'No longer need Cloud Professional features',
+            }),
+            submissionValue: 'No longer need Cloud Professional features',
+        },
+        {
+            translatedMessage: props.intl.formatMessage({
+                id: 'feedback.downgradeWorkspace.exploringOptions',
+                defaultMessage: 'Exploring other solutions',
+            }),
+            submissionValue: 'Exploring other solutions',
+        },
+        {
+            translatedMessage: props.intl.formatMessage({
+                id: 'feedback.downgradeWorkspace.tooExpensive',
+                defaultMessage: 'Too expensive',
+            }),
+            submissionValue: 'Too expensive',
+        }
     ];
 
     return (

From 5292655dbb2e89bb6caf47c0ceaadd5783182592 Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Tue, 4 Apr 2023 17:23:13 -0400
Subject: [PATCH 004/103] lint.

---
 .../src/components/feedback_modal/downgrade_feedback.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx b/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx
index f87b84397b..9b0fa90739 100644
--- a/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx
+++ b/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx
@@ -56,7 +56,7 @@ const DowngradeFeedbackModal = (props: Props) => {
                 defaultMessage: 'Too expensive',
             }),
             submissionValue: 'Too expensive',
-        }
+        },
     ];
 
     return (

From f46ee233f073c5c7217f4fee12b99a71993826f1 Mon Sep 17 00:00:00 2001
From: Caleb Roseland <caleb@calebroseland.com>
Date: Mon, 10 Apr 2023 22:34:52 +0200
Subject: [PATCH 005/103] Translated using Weblate (Malayalam)

Currently translated at 11.9% (72 of 605 strings)

Translation: mattermost-languages-shipped/mattermost-playbooks-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-playbooks-webapp-monorepo/ml/

Translated using Weblate (Georgian)

Currently translated at 25.7% (117 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/ka/
---
 webapp/boards/i18n/ka.json    | 236 +++++++++++++++++-----------------
 webapp/playbooks/i18n/ml.json |   2 +-
 2 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/webapp/boards/i18n/ka.json b/webapp/boards/i18n/ka.json
index 5623cbd56e..fa0ef0b53d 100644
--- a/webapp/boards/i18n/ka.json
+++ b/webapp/boards/i18n/ka.json
@@ -1,120 +1,120 @@
 {
-  "AppBar.Tooltip": "დაკავშირებული დაფების გადართვა",
-  "BoardComponent.add-a-group": "+ ჯგუფის დამატება",
-  "BoardComponent.delete": "წაშლა",
-  "BoardComponent.hidden-columns": "დამალული სვეტები",
-  "BoardComponent.hide": "დამალვა",
-  "BoardComponent.new": "+ ახალი",
-  "BoardComponent.no-property": "არ არის {Property}",
-  "BoardComponent.no-property-title": "ცარიელი {property} საკუთრების მქონე ელემენტები აქ წავა. ამ სვეტის წაშლა შეუძლებელია.",
-  "BoardComponent.show": "ჩვენება",
-  "BoardMember.schemeAdmin": "ადმინისტრატორი",
-  "BoardMember.schemeCommenter": "კომენტატორი",
-  "BoardMember.schemeEditor": "რედაქტორი",
-  "BoardMember.schemeNone": "არცერთი",
-  "BoardMember.schemeViewer": "მაყურებელი",
-  "BoardMember.unlinkChannel": "კავშირის გაუქმება",
-  "BoardPage.newVersion": "დაფების ახალი ვერსია ხელმისაწვდომია, დააწკაპუნეთ აქ გადასატვირთად.",
-  "BoardPage.syncFailed": "დაფა შეიძლება წაშლილია ან გაუქმებულია წვდომა.",
-  "BoardTemplateSelector.add-template": "ახალი შაბლონი",
-  "BoardTemplateSelector.create-empty-board": "შექმენით ცარიელი დაფა",
-  "BoardTemplateSelector.delete-template": "წაშლა",
-  "BoardTemplateSelector.description": "დაამატეთ დაფა გვერდითა ზოლში ქვემოთ განსაზღვრული რომელიმე შაბლონის გამოყენებით ან დაიწყეთ ნულიდან.",
-  "BoardTemplateSelector.edit-template": "რედაქტირება",
-  "BoardTemplateSelector.plugin.no-content-description": "დაამატეთ დაფა გვერდითა ზოლში ქვემოთ განსაზღვრული რომელიმე შაბლონის გამოყენებით ან დაიწყეთ ნულიდან.",
-  "BoardTemplateSelector.plugin.no-content-title": "შექმენით დაფა",
-  "BoardTemplateSelector.title": "შექმენით დაფა",
-  "BoardTemplateSelector.use-this-template": "გამოიყენეთ ეს შაბლონი",
-  "BoardsSwitcher.Title": "დაფების ძებნა",
-  "BoardsUnfurl.Limited": "დამატებითი დეტალები დამალულია ბარათის დაარქივების გამო",
-  "BoardsUnfurl.Remainder": "+{remainder} მეტი",
-  "BoardsUnfurl.Updated": "განახლებული {time}",
-  "Calculations.Options.average.displayName": "საშუალო",
-  "Calculations.Options.average.label": "საშუალო",
-  "Calculations.Options.count.displayName": "დათვლა",
-  "Calculations.Options.count.label": "დათვლა",
-  "Calculations.Options.countChecked.displayName": "შემოწმებული",
-  "Calculations.Options.countChecked.label": "რაოდენობა შემოწმებულია",
-  "Calculations.Options.countUnchecked.displayName": "შეუმოწმებელი",
-  "Calculations.Options.countUnchecked.label": "რაოდენობა შეუმოწმებელია",
-  "Calculations.Options.countUniqueValue.displayName": "უნიკალური",
-  "Calculations.Options.countUniqueValue.label": "უნიკალური ღირებულების დათვლა",
-  "Calculations.Options.countValue.displayName": "ღირებულებები",
-  "Calculations.Options.countValue.label": "დათვალეთ მნიშვნელობა",
-  "Calculations.Options.dateRange.displayName": "დიაპაზონი",
-  "Calculations.Options.dateRange.label": "დიაპაზონი",
-  "Calculations.Options.earliest.displayName": "ყველაზე ადრეული",
-  "Calculations.Options.earliest.label": "ყველაზე ადრეული",
-  "Calculations.Options.latest.displayName": "უახლესი",
-  "Calculations.Options.latest.label": "უახლესი",
-  "Calculations.Options.max.displayName": "მაქსიმალური",
-  "Calculations.Options.max.label": "მაქსიმალური",
-  "Calculations.Options.median.displayName": "საშუალო",
-  "Calculations.Options.median.label": "საშუალო",
-  "Calculations.Options.min.displayName": "მინიმალური",
-  "Calculations.Options.min.label": "მინიმალური",
-  "Calculations.Options.none.displayName": "გამოთვლა",
-  "Calculations.Options.none.label": "გამოთვლა",
-  "Calculations.Options.percentChecked.displayName": "შემოწმებული",
-  "Calculations.Options.percentChecked.label": "პროცენტი შემოწმებულია",
-  "Calculations.Options.percentUnchecked.displayName": "შეუმოწმებელი",
-  "Calculations.Options.percentUnchecked.label": "პროცენტი შეუმოწმებელია",
-  "Calculations.Options.range.displayName": "დიაპაზონი",
-  "Calculations.Options.range.label": "დიაპაზონი",
-  "Calculations.Options.sum.displayName": "ჯამი",
-  "Calculations.Options.sum.label": "ჯამი",
-  "CalendarCard.untitled": "უსათაურო",
-  "CardActionsMenu.copiedLink": "დაკოპირებულია!",
-  "CardActionsMenu.copyLink": "Ბმულის კოპირება",
-  "CardActionsMenu.delete": "წაშლა",
-  "CardActionsMenu.duplicate": "დუბლიკატი",
-  "CardBadges.title-checkboxes": "მოსანიშნი ველები",
-  "CardBadges.title-comments": "კომენტარები",
-  "CardBadges.title-description": "ამ ბარათს აქვს აღწერა",
-  "CardDetail.Follow": "გაყოლა",
-  "CardDetail.Following": "მომდევნო",
-  "CardDetail.add-content": "დაამატეთ შინაარსი",
-  "CardDetail.add-icon": "ხატულის დამატება",
-  "CardDetail.add-property": "+ დაამატეთ Property",
-  "CardDetail.addCardText": "ბარათის ტექსტის დამატება",
-  "CardDetail.limited-body": "ბარათის ტექსტის დამატება განაახლეთ ჩვენს პროფესიონალურ ან საწარმოს გეგმაში დაარქივებული ბარათების სანახავად, თითო დაფაზე ულიმიტო ნახვები, ულიმიტო ბარათები და სხვა.",
-  "CardDetail.limited-button": "განახლება",
-  "CardDetail.limited-title": "ეს ბარათი დამალულია",
-  "CardDetail.moveContent": "ბარათის შინაარსის გადატანა",
-  "CardDetail.new-comment-placeholder": "კომენტარის დამატება...",
-  "CardDetailProperty.confirm-delete-heading": "დაადასტურეთ Property-ის წაშლა",
-  "CardDetailProperty.confirm-delete-subtext": "დარწმუნებული ხართ, რომ გსურთ წაშალოთ Property „{propertyName}“? მისი წაშლა წაშლის Property-ის ამ დაფის ყველა ბარათიდან.",
-  "CardDetailProperty.confirm-property-name-change-subtext": "დარწმუნებული ხართ, რომ გსურთ შეცვალოთ თვისება „{propertyName}“ {customText}? ეს გავლენას მოახდენს მნიშვნელობა(ებ)ზე {numOfCards} ბარათ(ებ)ში ამ დაფაზე და შეიძლება გამოიწვიოს მონაცემთა დაკარგვა.",
-  "CardDetailProperty.confirm-property-type-change": "დაადასტურეთ Property-ის ტიპის ცვლილება",
-  "CardDetailProperty.delete-action-button": "წაშლა",
-  "CardDetailProperty.property-change-action-button": "Property-ის შეცვლა",
-  "CardDetailProperty.property-changed": "Property წარმატებით შეიცვალა!",
-  "CardDetailProperty.property-deleted": "{propertyName} წარმატებით წაიშალა!",
-  "CardDetailProperty.property-name-change-subtext": "აკრიფეთ „{oldPropType}“-დან „{newPropType}“-მდე",
-  "CardDetial.limited-link": "შეიტყვეთ მეტი ჩვენი გეგმების შესახებ.",
-  "CardDialog.delete-confirmation-dialog-button-text": "წაშლა",
-  "CardDialog.delete-confirmation-dialog-heading": "დაადასტურეთ ბარათის წაშლა!",
-  "CardDialog.editing-template": "თქვენ არედაქტირებთ შაბლონს.",
-  "CardDialog.nocard": "ეს ბარათი არ არსებობს ან მიუწვდომელია.",
-  "Categories.CreateCategoryDialog.CancelText": "გაუქმება",
-  "Categories.CreateCategoryDialog.CreateText": "Შექმნა",
-  "Categories.CreateCategoryDialog.Placeholder": "მიეცით სახელი თქვენს კატეგორიას",
-  "Categories.CreateCategoryDialog.UpdateText": "განახლება",
-  "CenterPanel.Login": "შესვლა",
-  "CenterPanel.Share": "გაზიარება",
-  "ColorOption.selectColor": "აირჩიეთ {color} ფერი",
-  "Comment.delete": "წაშლა",
-  "CommentsList.send": "გაგზავნა",
-  "ConfirmationDialog.cancel-action": "გაუქმება",
-  "ConfirmationDialog.confirm-action": "დადასტურება",
-  "ContentBlock.Delete": "წაშლა",
-  "ContentBlock.DeleteAction": "წაშლა",
-  "ContentBlock.addElement": "დაამატეთ {type}",
-  "ContentBlock.checkbox": "მონიშვნის ველი",
-  "ContentBlock.divider": "გამყოფი",
-  "ContentBlock.editCardCheckbox": "მონიშნული-მონიშვნის ველი",
-  "ContentBlock.editCardCheckboxText": "ბარათის ტექსტის რედაქტირება",
-  "ContentBlock.editCardText": "ბარათის ტექსტის რედაქტირება",
-  "ContentBlock.editText": "ტექსტის რედაქტირება...",
-  "ContentBlock.image": "გამოსახულება"
+    "AppBar.Tooltip": "დაკავშირებული დაფების გადართვა",
+    "BoardComponent.add-a-group": "+ ჯგუფის დამატება",
+    "BoardComponent.delete": "წაშლა",
+    "BoardComponent.hidden-columns": "დამალული სვეტები",
+    "BoardComponent.hide": "დამალვა",
+    "BoardComponent.new": "+ ახალი",
+    "BoardComponent.no-property": "არ არის {property}",
+    "BoardComponent.no-property-title": "ცარიელი {property} საკუთრების მქონე ელემენტები აქ წავა. ამ სვეტის წაშლა შეუძლებელია.",
+    "BoardComponent.show": "ჩვენება",
+    "BoardMember.schemeAdmin": "ადმინისტრატორი",
+    "BoardMember.schemeCommenter": "კომენტატორი",
+    "BoardMember.schemeEditor": "რედაქტორი",
+    "BoardMember.schemeNone": "არცერთი",
+    "BoardMember.schemeViewer": "მაყურებელი",
+    "BoardMember.unlinkChannel": "კავშირის გაუქმება",
+    "BoardPage.newVersion": "დაფების ახალი ვერსია ხელმისაწვდომია, დააწკაპუნეთ აქ გადასატვირთად.",
+    "BoardPage.syncFailed": "დაფა შეიძლება წაშლილია ან გაუქმებულია წვდომა.",
+    "BoardTemplateSelector.add-template": "ახალი შაბლონი",
+    "BoardTemplateSelector.create-empty-board": "შექმენით ცარიელი დაფა",
+    "BoardTemplateSelector.delete-template": "წაშლა",
+    "BoardTemplateSelector.description": "დაამატეთ დაფა გვერდითა ზოლში ქვემოთ განსაზღვრული რომელიმე შაბლონის გამოყენებით ან დაიწყეთ ნულიდან.",
+    "BoardTemplateSelector.edit-template": "რედაქტირება",
+    "BoardTemplateSelector.plugin.no-content-description": "დაამატეთ დაფა გვერდითა ზოლში ქვემოთ განსაზღვრული რომელიმე შაბლონის გამოყენებით ან დაიწყეთ ნულიდან.",
+    "BoardTemplateSelector.plugin.no-content-title": "შექმენით დაფა",
+    "BoardTemplateSelector.title": "შექმენით დაფა",
+    "BoardTemplateSelector.use-this-template": "გამოიყენეთ ეს შაბლონი",
+    "BoardsSwitcher.Title": "დაფების ძებნა",
+    "BoardsUnfurl.Limited": "დამატებითი დეტალები დამალულია ბარათის დაარქივების გამო",
+    "BoardsUnfurl.Remainder": "+{remainder} მეტი",
+    "BoardsUnfurl.Updated": "განახლებული {time}",
+    "Calculations.Options.average.displayName": "საშუალო",
+    "Calculations.Options.average.label": "საშუალო",
+    "Calculations.Options.count.displayName": "დათვლა",
+    "Calculations.Options.count.label": "დათვლა",
+    "Calculations.Options.countChecked.displayName": "შემოწმებული",
+    "Calculations.Options.countChecked.label": "რაოდენობა შემოწმებულია",
+    "Calculations.Options.countUnchecked.displayName": "შეუმოწმებელი",
+    "Calculations.Options.countUnchecked.label": "რაოდენობა შეუმოწმებელია",
+    "Calculations.Options.countUniqueValue.displayName": "უნიკალური",
+    "Calculations.Options.countUniqueValue.label": "უნიკალური ღირებულების დათვლა",
+    "Calculations.Options.countValue.displayName": "ღირებულებები",
+    "Calculations.Options.countValue.label": "დათვალეთ მნიშვნელობა",
+    "Calculations.Options.dateRange.displayName": "დიაპაზონი",
+    "Calculations.Options.dateRange.label": "დიაპაზონი",
+    "Calculations.Options.earliest.displayName": "ყველაზე ადრეული",
+    "Calculations.Options.earliest.label": "ყველაზე ადრეული",
+    "Calculations.Options.latest.displayName": "უახლესი",
+    "Calculations.Options.latest.label": "უახლესი",
+    "Calculations.Options.max.displayName": "მაქსიმალური",
+    "Calculations.Options.max.label": "მაქსიმალური",
+    "Calculations.Options.median.displayName": "საშუალო",
+    "Calculations.Options.median.label": "საშუალო",
+    "Calculations.Options.min.displayName": "მინიმალური",
+    "Calculations.Options.min.label": "მინიმალური",
+    "Calculations.Options.none.displayName": "გამოთვლა",
+    "Calculations.Options.none.label": "გამოთვლა",
+    "Calculations.Options.percentChecked.displayName": "შემოწმებული",
+    "Calculations.Options.percentChecked.label": "პროცენტი შემოწმებულია",
+    "Calculations.Options.percentUnchecked.displayName": "შეუმოწმებელი",
+    "Calculations.Options.percentUnchecked.label": "პროცენტი შეუმოწმებელია",
+    "Calculations.Options.range.displayName": "დიაპაზონი",
+    "Calculations.Options.range.label": "დიაპაზონი",
+    "Calculations.Options.sum.displayName": "ჯამი",
+    "Calculations.Options.sum.label": "ჯამი",
+    "CalendarCard.untitled": "უსათაურო",
+    "CardActionsMenu.copiedLink": "დაკოპირებულია!",
+    "CardActionsMenu.copyLink": "Ბმულის კოპირება",
+    "CardActionsMenu.delete": "წაშლა",
+    "CardActionsMenu.duplicate": "დუბლიკატი",
+    "CardBadges.title-checkboxes": "მოსანიშნი ველები",
+    "CardBadges.title-comments": "კომენტარები",
+    "CardBadges.title-description": "ამ ბარათს აქვს აღწერა",
+    "CardDetail.Follow": "გაყოლა",
+    "CardDetail.Following": "მომდევნო",
+    "CardDetail.add-content": "დაამატეთ შინაარსი",
+    "CardDetail.add-icon": "ხატულის დამატება",
+    "CardDetail.add-property": "+ დაამატეთ Property",
+    "CardDetail.addCardText": "ბარათის ტექსტის დამატება",
+    "CardDetail.limited-body": "ბარათის ტექსტის დამატება განაახლეთ ჩვენს პროფესიონალურ ან საწარმოს გეგმაში დაარქივებული ბარათების სანახავად, თითო დაფაზე ულიმიტო ნახვები, ულიმიტო ბარათები და სხვა.",
+    "CardDetail.limited-button": "განახლება",
+    "CardDetail.limited-title": "ეს ბარათი დამალულია",
+    "CardDetail.moveContent": "ბარათის შინაარსის გადატანა",
+    "CardDetail.new-comment-placeholder": "კომენტარის დამატება...",
+    "CardDetailProperty.confirm-delete-heading": "დაადასტურეთ Property-ის წაშლა",
+    "CardDetailProperty.confirm-delete-subtext": "დარწმუნებული ხართ, რომ გსურთ წაშალოთ Property „{propertyName}“? მისი წაშლა წაშლის Property-ის ამ დაფის ყველა ბარათიდან.",
+    "CardDetailProperty.confirm-property-name-change-subtext": "დარწმუნებული ხართ, რომ გსურთ შეცვალოთ თვისება „{propertyName}“ {customText}? ეს გავლენას მოახდენს მნიშვნელობა(ებ)ზე {numOfCards} ბარათ(ებ)ში ამ დაფაზე და შეიძლება გამოიწვიოს მონაცემთა დაკარგვა.",
+    "CardDetailProperty.confirm-property-type-change": "დაადასტურეთ Property-ის ტიპის ცვლილება",
+    "CardDetailProperty.delete-action-button": "წაშლა",
+    "CardDetailProperty.property-change-action-button": "Property-ის შეცვლა",
+    "CardDetailProperty.property-changed": "Property წარმატებით შეიცვალა!",
+    "CardDetailProperty.property-deleted": "{propertyName} წარმატებით წაიშალა!",
+    "CardDetailProperty.property-name-change-subtext": "აკრიფეთ „{oldPropType}“-დან „{newPropType}“-მდე",
+    "CardDetial.limited-link": "შეიტყვეთ მეტი ჩვენი გეგმების შესახებ.",
+    "CardDialog.delete-confirmation-dialog-button-text": "წაშლა",
+    "CardDialog.delete-confirmation-dialog-heading": "დაადასტურეთ ბარათის წაშლა!",
+    "CardDialog.editing-template": "თქვენ არედაქტირებთ შაბლონს.",
+    "CardDialog.nocard": "ეს ბარათი არ არსებობს ან მიუწვდომელია.",
+    "Categories.CreateCategoryDialog.CancelText": "გაუქმება",
+    "Categories.CreateCategoryDialog.CreateText": "Შექმნა",
+    "Categories.CreateCategoryDialog.Placeholder": "მიეცით სახელი თქვენს კატეგორიას",
+    "Categories.CreateCategoryDialog.UpdateText": "განახლება",
+    "CenterPanel.Login": "შესვლა",
+    "CenterPanel.Share": "გაზიარება",
+    "ColorOption.selectColor": "აირჩიეთ {color} ფერი",
+    "Comment.delete": "წაშლა",
+    "CommentsList.send": "გაგზავნა",
+    "ConfirmationDialog.cancel-action": "გაუქმება",
+    "ConfirmationDialog.confirm-action": "დადასტურება",
+    "ContentBlock.Delete": "წაშლა",
+    "ContentBlock.DeleteAction": "წაშლა",
+    "ContentBlock.addElement": "დაამატეთ {type}",
+    "ContentBlock.checkbox": "მონიშვნის ველი",
+    "ContentBlock.divider": "გამყოფი",
+    "ContentBlock.editCardCheckbox": "მონიშნული-მონიშვნის ველი",
+    "ContentBlock.editCardCheckboxText": "ბარათის ტექსტის რედაქტირება",
+    "ContentBlock.editCardText": "ბარათის ტექსტის რედაქტირება",
+    "ContentBlock.editText": "ტექსტის რედაქტირება...",
+    "ContentBlock.image": "გამოსახულება"
 }
diff --git a/webapp/playbooks/i18n/ml.json b/webapp/playbooks/i18n/ml.json
index 934c8ab9cc..6741704a6d 100644
--- a/webapp/playbooks/i18n/ml.json
+++ b/webapp/playbooks/i18n/ml.json
@@ -53,7 +53,7 @@
     "15jbT0": "നിങ്ങളുടെ ടൈംലൈനിലേക്ക് കൂടുതൽ ചേർക്കുക",
     "0wJ7N+": "കര്‍ത്തവ്യം",
     "0oLj/t": "വികസിപ്പിക്കുക",
-    "4Hrh5B": "{പേര്} {സംഗ്രഹം} എന്നതിൽ നിന്ന് സ്റ്റാറ്റസ് മാറ്റി",
+    "4Hrh5B": "{name} {summary} എന്നതിൽ നിന്ന് സ്റ്റാറ്റസ് മാറ്റി",
     "2PNrBQ": "നിങ്ങളുടെ പ്ലേബുക്ക് റണ്ണിന്റെ ചാനൽ എക്‌സ്‌പോർട്ടുചെയ്‌ത് പിന്നീടുള്ള വിശകലനത്തിനായി സംരക്ഷിക്കുക.",
     "0HT+Ib": "ആർക്കൈവ് ചെയ്തു",
     "+ZIXOR": "ചാനൽ ആക്സസ്",

From dd12d5ebd4bbe6dcbbfc24397f8cceb314867bed Mon Sep 17 00:00:00 2001
From: exbu <meharmsen@me.com>
Date: Mon, 10 Apr 2023 22:34:53 +0200
Subject: [PATCH 006/103] Translated using Weblate (Dutch)

Currently translated at 98.8% (5707 of 5773 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/nl/

Translated using Weblate (Dutch)

Currently translated at 97.1% (2462 of 2534 strings)

Translation: mattermost-languages-shipped/mattermost-server-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server-monorepo/nl/
---
 server/i18n/nl.json              | 40 ++++++++++++++++++++++++++++++++
 webapp/channels/src/i18n/nl.json |  4 ++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/server/i18n/nl.json b/server/i18n/nl.json
index 95097c7095..2e19d757c6 100644
--- a/server/i18n/nl.json
+++ b/server/i18n/nl.json
@@ -9829,5 +9829,45 @@
   {
     "id": "api.templates.license_up_for_renewal_contact_sales",
     "translation": "Contacteer de verkoopsafdeling"
+  },
+  {
+    "id": "app.user.digest.tasks.due_today",
+    "translation": "Vandaag te voldoen"
+  },
+  {
+    "id": "app.user.digest.tasks.all_tasks_command",
+    "translation": "Gebruik `/playbook todo` om al je taken te zien."
+  },
+  {
+    "id": "app.user.digest.runs_in_progress.zero_in_progress",
+    "translation": "Je hebt momenteel 0 runs lopen."
+  },
+  {
+    "id": "app.user.digest.runs_in_progress.heading",
+    "translation": "Runs in uitvoering"
+  },
+  {
+    "id": "app.user.digest.overdue_status_updates.zero_overdue",
+    "translation": "Je hebt 0 runs achterstand."
+  },
+  {
+    "id": "app.user.digest.overdue_status_updates.heading",
+    "translation": "Achterstallige statusupdates"
+  },
+  {
+    "id": "app.command.execute.error",
+    "translation": "Kan commando niet uitvoeren."
+  },
+  {
+    "id": "api.server.cws.subscribe_to_newsletter.app_error",
+    "translation": "CWS-server kan zich niet abonneren op nieuwsbrief."
+  },
+  {
+    "id": "api.server.cws.needs_enterprise_edition",
+    "translation": "Dienst alleen beschikbaar in Mattermost Enterprise editie"
+  },
+  {
+    "id": "api.license.request-trial.bad-request.business-email",
+    "translation": "Ongeldig zakelijk e-mailadres voor proefperiode"
   }
 ]
diff --git a/webapp/channels/src/i18n/nl.json b/webapp/channels/src/i18n/nl.json
index d03afbd377..80de3cf29b 100644
--- a/webapp/channels/src/i18n/nl.json
+++ b/webapp/channels/src/i18n/nl.json
@@ -8,7 +8,7 @@
   "about.enterpriseEditionLearn": "Meer informatie over de Enterprise-Editie op ",
   "about.enterpriseEditionSst": "Sterk vertrouwelijke berichtenservice voor bedrijven",
   "about.enterpriseEditionSt": "Moderne communicatie achter jouw eigen firewall.",
-  "about.enterpriseEditione1": "Enterprise-Editie",
+  "about.enterpriseEditione1": "Enterprise-editie",
   "about.hash": "Compilatiehash:",
   "about.hashee": "EE Compilatiehash:",
   "about.licensed": "Licentie verleend aan:",
@@ -4687,6 +4687,7 @@
   "self_hosted_signup.cta": "Upgraden",
   "self_hosted_signup.disclaimer": "Ik heb de <a>abonnementsvoorwaarden voorEnterprise Edition</a> gelezen en ga ermee akkoord",
   "self_hosted_signup.error_invalid_number": "Voer een geldig aantal zetels in",
+  "self_hosted_signup.error_min_seats": "Jouw werkruimte heeft momenteel {num} gebruikers",
   "self_hosted_signup.failed_export.subtitle": "Wij controleren de zaken aan onze kant en nemen binnen 3 dagen contact met jou op zodra jouuw licentie is goedgekeurd. In de tussentijd kan je gerust de gratis versie van ons product blijven gebruiken.",
   "self_hosted_signup.failed_export.title": "Jouw transactie wordt bekeken",
   "self_hosted_signup.license_applied": "Jouw {planName} licentie is nu toegepast. {planName} functies zijn nu beschikbaar en klaar voor gebruik.",
@@ -4699,7 +4700,6 @@
   "self_hosted_signup.purchase_in_progress.by_self_restart": "Als je denkt dat dit een vergissing is, start jouw aankoop opnieuw.",
   "self_hosted_signup.purchase_in_progress.reset": "Aankoop opnieuw starten",
   "self_hosted_signup.purchase_in_progress.title": "Aankoop in uitvoering",
-  "self_hosted_signup.error_min_seats": "Jouw werkruimte heeft momenteel {num} gebruikers",
   "self_hosted_signup.retry": "Probeer opnieuw",
   "self_hosted_signup.screening_description": "Wij controleren de zaken aan onze kant en nemen binnen 3 dagen contact met jou op zodra jouuw licentie is goedgekeurd. In de tussentijd kan je gerust de gratis versie van ons product blijven gebruiken.",
   "self_hosted_signup.screening_title": "Jouw transactie wordt bekeken",

From 75fb1dcc3778d9c3af5db90c96642b5b96ffb7bd Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 10 Apr 2023 22:34:53 +0200
Subject: [PATCH 007/103] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/
---
 webapp/channels/src/i18n/pt-BR.json | 1 -
 webapp/channels/src/i18n/zh-CN.json | 2 --
 2 files changed, 3 deletions(-)

diff --git a/webapp/channels/src/i18n/pt-BR.json b/webapp/channels/src/i18n/pt-BR.json
index 2a8b6fee5a..ea70f5062a 100644
--- a/webapp/channels/src/i18n/pt-BR.json
+++ b/webapp/channels/src/i18n/pt-BR.json
@@ -247,7 +247,6 @@
   "admin.billing.history.date": "Data",
   "admin.billing.history.description": "Descrição",
   "admin.billing.history.noBillingHistory": "No futuro, é aqui que seu histórico de faturamento será exibido.",
-  "admin.billing.history.onPremUsers": "{num} usuários",
   "admin.billing.history.pageInfo": "{startRecord} - {endRecord} de {totalRecords}",
   "admin.billing.history.paid": "Pago",
   "admin.billing.history.paymentFailed": "Pagamento falhou",
diff --git a/webapp/channels/src/i18n/zh-CN.json b/webapp/channels/src/i18n/zh-CN.json
index 4aaf9b2f93..f7186532d2 100644
--- a/webapp/channels/src/i18n/zh-CN.json
+++ b/webapp/channels/src/i18n/zh-CN.json
@@ -411,8 +411,6 @@
   "admin.billing.subscriptions.billing_summary.lastInvoice.taxes": "税",
   "admin.billing.subscriptions.billing_summary.lastInvoice.title": "最后发票",
   "admin.billing.subscriptions.billing_summary.lastInvoice.total": "总计",
-  "admin.billing.subscriptions.billing_summary.lastInvoice.userCount": " x {users} 用户",
-  "admin.billing.subscriptions.billing_summary.lastInvoice.userCountPartial": "{users} 用户",
   "admin.billing.subscriptions.billing_summary.lastInvoice.viewInvoice": "查看发票",
   "admin.billing.subscriptions.billing_summary.lastInvoice.whatArePartialCharges": "什么是部分费用？",
   "admin.billing.subscriptions.billing_summary.lastInvoice.whatArePartialCharges.message": "在一个月的整个时间内未启用的用户将按比例按月计费。",

From cb8cf58dc6e718ec5b76667acefcfe00ae8c9e80 Mon Sep 17 00:00:00 2001
From: Matthew Williams <Matthew.Williams@outlook.com.au>
Date: Mon, 10 Apr 2023 22:34:54 +0200
Subject: [PATCH 008/103] Translated using Weblate (English (Australia))

Currently translated at 99.9% (5771 of 5773 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/en_AU/

Translated using Weblate (English (Australia))

Currently translated at 99.9% (2533 of 2534 strings)

Translation: mattermost-languages-shipped/mattermost-server-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server-monorepo/en_AU/
---
 server/i18n/en_AU.json              | 332 ++++++++++++++++++++++++++++
 webapp/channels/src/i18n/en_AU.json |  75 ++++++-
 2 files changed, 398 insertions(+), 9 deletions(-)

diff --git a/server/i18n/en_AU.json b/server/i18n/en_AU.json
index 8a71e91c0d..c1c5da8290 100644
--- a/server/i18n/en_AU.json
+++ b/server/i18n/en_AU.json
@@ -9837,5 +9837,337 @@
   {
     "id": "api.templates.license_up_for_renewal_contact_sales",
     "translation": "Contact Sales"
+  },
+  {
+    "id": "worktemplate.product_teams.sprint_planning.integration",
+    "translation": "Increase productivity in your channel by integrating your most commonly used tools such as Zoom. These will be downloaded for you."
+  },
+  {
+    "id": "worktemplate.product_teams.sprint_planning.channel",
+    "translation": "Chat with your team in a channel that connects easily with your boards and integrations."
+  },
+  {
+    "id": "worktemplate.product_teams.sprint_planning.board",
+    "translation": "Track your team's progress toward weekly goals with sprint breakdowns, prioritisation, owner assignment and comments."
+  },
+  {
+    "id": "worktemplate.product_teams.product_roadmap.channel",
+    "translation": "Chat with your team about your customers' feedback, prioritisation and get aligned on progress together."
+  },
+  {
+    "id": "worktemplate.product_teams.product_roadmap.board",
+    "translation": "Use the Product Roadmap board to manage user feedback, assign resources, view deliverables in a calendar view and prioritise issues."
+  },
+  {
+    "id": "worktemplate.product_teams.goals_and_okrs.integration",
+    "translation": "Increase productivity in your channel by integrating your most commonly used tools such as Zoom to facilitate easy collaboration. These will be downloaded for you."
+  },
+  {
+    "id": "worktemplate.product_teams.goals_and_okrs.channel",
+    "translation": "Chat about your goals and progress with your team, async or real-time and stay up to date with changes in a single channel."
+  },
+  {
+    "id": "worktemplate.product_teams.goals_and_okrs.board",
+    "translation": "Track your team's progress toward organisational goals with the Goals and OKR board. Keep meetings on track with the Meeting Agenda board."
+  },
+  {
+    "id": "worktemplate.product_teams.feature_release.description.board",
+    "translation": "Keep meetings on track with the Meeting Agenda board. Manage your workload with the Project Tasks board."
+  },
+  {
+    "id": "worktemplate.product_teams.bug_bash.playbook",
+    "translation": "Use checklists to assign testing areas and automated tasks to run a comprehensive bug bash process. Use a retrospective to review your process and improve it for next time."
+  },
+  {
+    "id": "worktemplate.product_teams.bug_bash.integration",
+    "translation": "Increase productivity in your channel by integrating your most commonly used tools such as Jira to track your bug bash progress. These will be downloaded for you."
+  },
+  {
+    "id": "worktemplate.product_teams.bug_bash.channel",
+    "translation": "Plan and manage bug reports and resolutions in a single channel that’s easily accessible to your team and organisation."
+  },
+  {
+    "id": "worktemplate.leadership.goals_and_okrs.integration",
+    "translation": "Increase productivity in your channel by integrating your most commonly used tools such as Zoom to facilitate easy collaboration. These will be downloaded for you."
+  },
+  {
+    "id": "worktemplate.leadership.goals_and_okrs.channel",
+    "translation": "Chat about your goals and progress with your team, async or real-time and stay up to date with changes in a single channel."
+  },
+  {
+    "id": "worktemplate.leadership.goals_and_okrs.board",
+    "translation": "Track your team's progress toward organisational goals with the Goals and OKR board. Keep meetings on track with the Meeting Agenda board."
+  },
+  {
+    "id": "worktemplate.devops.product_release.playbook",
+    "translation": "Create repeatable workflows that are easy to follow and implement so product releases are reliable and on time."
+  },
+  {
+    "id": "worktemplate.devops.product_release.channel",
+    "translation": "Chat with your team about daily milestones, any blockers and changes to deliverables, easily and quickly."
+  },
+  {
+    "id": "worktemplate.devops.product_release.board",
+    "translation": "Use the Product Release board to support your release timeframe and process, ensuring everyone knows which tasks are due."
+  },
+  {
+    "id": "worktemplate.devops.incident_resolution.description.playbook",
+    "translation": "Use checklists and automation to bring in key team members and share how your incident is tracking toward resolution."
+  },
+  {
+    "id": "worktemplate.devops.incident_resolution.description.channel",
+    "translation": "Chat with your team about priorities, add stakeholders, provide updates and work toward a resolution in a single channel."
+  },
+  {
+    "id": "worktemplate.devops.incident_resolution.description.board",
+    "translation": "Use the Incident Resolution board to support repeatable processes and assign defined tasks across the team."
+  },
+  {
+    "id": "worktemplate.companywide.goals_and_okrs.integration",
+    "translation": "Increase productivity in your channel by integrating your most commonly used tools such as Zoom to facilitate easy collaboration. These will be downloaded for you."
+  },
+  {
+    "id": "worktemplate.companywide.goals_and_okrs.channel",
+    "translation": "Chat about your goals and progress with your team, async or real-time and stay up to date with changes in a single channel."
+  },
+  {
+    "id": "worktemplate.companywide.goals_and_okrs.board",
+    "translation": "Track your team's progress toward organisational goals with the Goals and OKR board. Keep meetings on track with the Meeting Agenda board."
+  },
+  {
+    "id": "worktemplate.companywide.create_project.integration",
+    "translation": "Increase productivity in your channel by integrating your most commonly used tools. These will be downloaded for you."
+  },
+  {
+    "id": "worktemplate.companywide.create_project.channel",
+    "translation": "Chat with your team about your new project and decide how you’re going to structure it in a collaborative channel."
+  },
+  {
+    "id": "worktemplate.companywide.create_project.board",
+    "translation": "Use a Kanban board to define and track your project tasks and progress."
+  },
+  {
+    "id": "model.license_record.is_valid.bytes.app_error",
+    "translation": "Invalid value for bytes when uploading a licence."
+  },
+  {
+    "id": "app.user.run.update_status.title",
+    "translation": "Status update"
+  },
+  {
+    "id": "app.user.run.update_status.submit_label",
+    "translation": "Update status"
+  },
+  {
+    "id": "app.user.run.update_status.reminder_for_next_update",
+    "translation": "Reminder for next update"
+  },
+  {
+    "id": "app.user.run.update_status.num_channel",
+    "translation": {
+      "one": "Provide an update to the stakeholders. This post will be broadcasted to {{.Count}} channel.",
+      "other": "Provide an update to the stakeholders. This post will be broadcasted to {{.Count}} channels."
+    }
+  },
+  {
+    "id": "app.user.run.update_status.finish_run.placeholder",
+    "translation": "Also mark the run as finished"
+  },
+  {
+    "id": "app.user.run.update_status.finish_run",
+    "translation": "Finish run"
+  },
+  {
+    "id": "app.user.run.update_status.change_since_last_update",
+    "translation": "Change since last update"
+  },
+  {
+    "id": "app.user.run.status_enable",
+    "translation": "@{{.Username}} enabled the status updates for [{{.RunName}}]({{.RunURL}})"
+  },
+  {
+    "id": "app.user.run.status_disable",
+    "translation": "@{{.Username}} disabled the status updates for [{{.RunName}}]({{.RunURL}})"
+  },
+  {
+    "id": "app.user.run.request_update",
+    "translation": "@here — @{{.Name}} requested a status update for [{{.RunName}}]({{.RunURL}}). \n"
+  },
+  {
+    "id": "app.user.run.request_join_channel",
+    "translation": "@{{.Name}} is a run participant and wants join this channel. Any member of the channel can invite them.\n"
+  },
+  {
+    "id": "app.user.run.confirm_finish.title",
+    "translation": "Confirm finish run"
+  },
+  {
+    "id": "app.user.run.confirm_finish.submit_label",
+    "translation": "Finish run"
+  },
+  {
+    "id": "app.user.run.confirm_finish.num_outstanding",
+    "translation": {
+      "one": "There is **{{.Count}} outstanding task**. Are you sure you want to finish the run *{{.RunName}}* for all participants?",
+      "other": "There are **{{.Count}} outstanding tasks**. Are you sure you want to finish the run *{{.RunName}}* for all participants?"
+    }
+  },
+  {
+    "id": "app.user.run.add_to_timeline.title",
+    "translation": "Add to run timeline"
+  },
+  {
+    "id": "app.user.run.add_to_timeline.summary.placeholder",
+    "translation": "Short summary shown in the timeline"
+  },
+  {
+    "id": "app.user.run.add_to_timeline.summary.help",
+    "translation": "Max 64 characters"
+  },
+  {
+    "id": "app.user.run.add_to_timeline.summary",
+    "translation": "Summary"
+  },
+  {
+    "id": "app.user.run.add_to_timeline.submit_label",
+    "translation": "Add to run timeline"
+  },
+  {
+    "id": "app.user.run.add_to_timeline.playbook_run",
+    "translation": "Playbook Run"
+  },
+  {
+    "id": "app.user.run.add_checklist_item.title",
+    "translation": "Add new task"
+  },
+  {
+    "id": "app.user.run.add_checklist_item.submit_label",
+    "translation": "Add task"
+  },
+  {
+    "id": "app.user.run.add_checklist_item.name",
+    "translation": "Name"
+  },
+  {
+    "id": "app.user.run.add_checklist_item.description",
+    "translation": "Description"
+  },
+  {
+    "id": "app.user.new_run.title",
+    "translation": "Run playbook"
+  },
+  {
+    "id": "app.user.new_run.submit_label",
+    "translation": "Start run"
+  },
+  {
+    "id": "app.user.new_run.run_name",
+    "translation": "Run name"
+  },
+  {
+    "id": "app.user.new_run.playbook",
+    "translation": "Playbook"
+  },
+  {
+    "id": "app.user.new_run.intro",
+    "translation": "**Owner** {{.Username}}"
+  },
+  {
+    "id": "app.user.digest.tasks.zero_assigned",
+    "translation": "You have 0 assigned tasks."
+  },
+  {
+    "id": "app.user.digest.tasks.num_assigned_due_until_today",
+    "translation": {
+      "one": "You have {{.Count}} assigned task that is now due:",
+      "other": "You have {{.Count}} assigned tasks that are now due:"
+    }
+  },
+  {
+    "id": "app.user.digest.tasks.num_assigned",
+    "translation": {
+      "one": "You have {{.Count}} assigned task:",
+      "other": "You have {{.Count}} total assigned tasks:"
+    }
+  },
+  {
+    "id": "app.user.digest.tasks.heading",
+    "translation": "Your assigned tasks"
+  },
+  {
+    "id": "app.user.digest.tasks.due_yesterday",
+    "translation": "Due yesterday"
+  },
+  {
+    "id": "app.user.digest.tasks.due_x_days_ago",
+    "translation": "Due {{.Count}} days ago"
+  },
+  {
+    "id": "app.user.digest.tasks.due_today",
+    "translation": "Due today"
+  },
+  {
+    "id": "app.user.digest.tasks.due_in_x_days",
+    "translation": {
+      "one": "Due in {{.Count}} day",
+      "other": "Due in {{.Count}} days"
+    }
+  },
+  {
+    "id": "app.user.digest.tasks.due_after_today",
+    "translation": {
+      "one": "You have **{{.Count}} assigned task due after today**.",
+      "other": "You have **{{.Count}} assigned tasks due after today**."
+    }
+  },
+  {
+    "id": "app.user.digest.tasks.all_tasks_command",
+    "translation": "Please use `/playbook todo` to see all your tasks."
+  },
+  {
+    "id": "app.user.digest.runs_in_progress.zero_in_progress",
+    "translation": "You have 0 runs currently in progress."
+  },
+  {
+    "id": "app.user.digest.runs_in_progress.num_in_progress",
+    "translation": {
+      "one": "You have {{.Count}} run currently in progress:",
+      "other": "You have {{.Count}} runs currently in progress:"
+    }
+  },
+  {
+    "id": "app.user.digest.runs_in_progress.heading",
+    "translation": "Runs in Progress"
+  },
+  {
+    "id": "app.user.digest.overdue_status_updates.zero_overdue",
+    "translation": "You have 0 runs overdue."
+  },
+  {
+    "id": "app.user.digest.overdue_status_updates.num_overdue",
+    "translation": {
+      "one": "You have {{.Count}} run overdue for a status update:",
+      "other": "You have {{.Count}} runs overdue for a status update:"
+    }
+  },
+  {
+    "id": "app.user.digest.overdue_status_updates.heading",
+    "translation": "Overdue Status Updates"
+  },
+  {
+    "id": "app.oauth.remove_auth_data_by_client_id.app_error",
+    "translation": "Unable to remove OAuth data."
+  },
+  {
+    "id": "app.command.execute.error",
+    "translation": "Unable to execute command."
+  },
+  {
+    "id": "api.server.cws.subscribe_to_newsletter.app_error",
+    "translation": "CWS Server failed to subscribe to newsletter."
+  },
+  {
+    "id": "api.license.request-trial.bad-request.business-email",
+    "translation": "Invalid business email for trial"
   }
 ]
diff --git a/webapp/channels/src/i18n/en_AU.json b/webapp/channels/src/i18n/en_AU.json
index de9bcd1f1c..a3005616a0 100644
--- a/webapp/channels/src/i18n/en_AU.json
+++ b/webapp/channels/src/i18n/en_AU.json
@@ -272,12 +272,12 @@
   "admin.billing.history.paid": "Paid",
   "admin.billing.history.paymentFailed": "Payment failed",
   "admin.billing.history.pending": "Pending",
+  "admin.billing.history.seatsAndRates": "{fullSeats} seats at full rate, {partialSeats} seats with partial charges",
   "admin.billing.history.seeHowBillingWorks": "See how billing works",
   "admin.billing.history.status": "Status",
   "admin.billing.history.title": "Billing History",
   "admin.billing.history.total": "Total",
   "admin.billing.history.transactions": "Transactions",
-  "admin.billing.history.seatsAndRates": "{fullSeats} seats at full rate, {partialSeats} seats with partial charges",
   "admin.billing.payment_info.add": "Add a Credit Card",
   "admin.billing.payment_info.billingAddress": "Billing Address",
   "admin.billing.payment_info.cardBrandAndDigits": "{brand} ending in {digits}",
@@ -311,6 +311,7 @@
   "admin.billing.subscription.cloudTrialBadge.daysLeftOnTrial": "{daysLeftOnTrial} trial days left",
   "admin.billing.subscription.cloudYearlyBadge": "Annual",
   "admin.billing.subscription.complianceScreenFailed.button": "Continue with Cloud Free",
+  "admin.billing.subscription.complianceScreenFailed.subtitle": "You will be notified within 3 days if your Cloud subscription upgrade is approved. In the meantime, please feel free to continue using the free version of Mattermost.",
   "admin.billing.subscription.complianceScreenFailed.title": "Your transaction is being reviewed",
   "admin.billing.subscription.complianceScreenShippingSameAsBilling": "My postal address is the same as my billing address",
   "admin.billing.subscription.constCloudCard.contactSupport": "Contact support",
@@ -410,12 +411,12 @@
   "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "Paid",
   "admin.billing.subscriptions.billing_summary.lastInvoice.partialCharges": "Partial charges",
   "admin.billing.subscriptions.billing_summary.lastInvoice.pending": "Pending",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCount": " x {seats} seats",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCountPartial": "{seats} seats",
   "admin.billing.subscriptions.billing_summary.lastInvoice.seeBillingHistory": "See Billing History",
   "admin.billing.subscriptions.billing_summary.lastInvoice.taxes": "Taxes",
   "admin.billing.subscriptions.billing_summary.lastInvoice.title": "Last Invoice",
   "admin.billing.subscriptions.billing_summary.lastInvoice.total": "Total",
-  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCount": " x {seats} seats",
-  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCountPartial": "{seats} seats",
   "admin.billing.subscriptions.billing_summary.lastInvoice.viewInvoice": "View Invoice",
   "admin.billing.subscriptions.billing_summary.lastInvoice.whatArePartialCharges": "What are partial charges?",
   "admin.billing.subscriptions.billing_summary.lastInvoice.whatArePartialCharges.message": "Users who have not been enabled for the full duration of the month are charged at a prorated monthly rate.",
@@ -431,6 +432,7 @@
   "admin.billing.trueUpReview.button_share": "Share to Mattermost",
   "admin.billing.trueUpReview.docsLinkCTA": "Learn more about true-up.",
   "admin.billing.trueUpReview.due_date": "Due ",
+  "admin.billing.trueUpReview.share_data_for_review": "Share your system statistics with Mattermost for your quarterly true-up review. {link}",
   "admin.billing.trueUpReview.submit.thanks_for_sharing": "Thanks for sharing data needed for your true-up review.",
   "admin.billing.trueUpReview.submit_error": "There was an issue sending your True Up Review. Please try again.",
   "admin.billing.trueUpReview.submit_success": "Success!",
@@ -1337,6 +1339,7 @@
   "admin.license.title": "Edition and Licence",
   "admin.license.trial-request.accept-terms": "By clicking <strong>Start trial</strong>, I agree to the <linkEvaluation>Mattermost Software and Services Licence Agreement</linkEvaluation>, <linkPrivacy>Privacy Policy</linkPrivacy> and receiving product emails.",
   "admin.license.trial-request.embargoed": "We were unable to process the request due to limitations for embargoed countries. <link>Learn more in our documentation</link>, or reach out to legal@mattermost.com for questions around export limitations.",
+  "admin.license.trial-request.embargoed.button": "Close",
   "admin.license.trial-request.startTrial": "Start trial",
   "admin.license.trial-request.title": "Experience Mattermost Enterprise Edition for free for the next 30 days. No obligation to buy or credit card required. ",
   "admin.license.trialCard.contactSales": "Contact sales",
@@ -1986,6 +1989,8 @@
   "admin.requestButton.requestFailure": "Test Failure: {error}",
   "admin.requestButton.requestSuccess": "Test Successful",
   "admin.reset_email.cancel": "Cancel",
+  "admin.reset_email.currentPassword": "Current Password",
+  "admin.reset_email.missing_current_password": "Please enter your current password.",
   "admin.reset_email.newEmail": "New Email",
   "admin.reset_email.reset": "Reset",
   "admin.reset_email.titleReset": "Update Email",
@@ -2558,6 +2563,9 @@
   "admin.webserverModeUncompressed": "Uncompressed",
   "admin.webserverModeUncompressedDescription": "The Mattermost server will serve static files uncompressed.",
   "admin_settings.save_unsaved_changes": "Please save unsaved changes first",
+  "air_gapped_modal.close": "Close",
+  "air_gapped_modal.description": "To start your trial, please visit {link} and request a trial key.",
+  "air_gapped_modal.title": "Request a trial key",
   "alert_banner.tooltipCloseBtn": "Close",
   "analytics.chart.loading": "Loading...",
   "analytics.chart.meaningful": "Not enough data for a meaningful representation.",
@@ -2643,6 +2651,7 @@
   "app.channel.post_update_channel_purpose_message.removed": "{username} removed the channel purpose (was: {old})",
   "app.channel.post_update_channel_purpose_message.updated_from": "{username} updated the channel purpose from: {old} to: {new}",
   "app.channel.post_update_channel_purpose_message.updated_to": "{username} updated the channel purpose to: {new}",
+  "app_bar.marketplace": "App Marketplace",
   "apps.error": "Error: {error}",
   "apps.error.command.field_missing": "Required fields missing: `{fieldName}`.",
   "apps.error.command.same_channel": "Channel repeated for field `{fieldName}`: `{option}`.",
@@ -3431,6 +3440,9 @@
   "filtered_user_list.userStatus": "User Status:",
   "flag_post.flag": "Save",
   "flag_post.unflag": "Remove from Saved",
+  "footer_pagination.count": "Showing {startCount, number}-{endCount, number} of {total, number}",
+  "footer_pagination.next": "Next",
+  "footer_pagination.prev": "Previous",
   "forward_post_button.label": "Forward",
   "forward_post_modal.button.cancel": "Cancel",
   "forward_post_modal.button.forward": "Forward",
@@ -4075,7 +4087,8 @@
   "mark_all_threads_as_read_modal.title": "Mark all your threads as read?",
   "marketplace_command.disabled": "The marketplace is disabled. Please contact your System Administrator for details.",
   "marketplace_command.no_permission": "You do not have the appropriate permissions to access the marketplace.",
-  "marketplace_modal.install_plugins": "Install Plugins",
+  "marketplace_modal.app_error": "Error connecting to the marketplace server. Please check your settings in the <linkConsole>System Console</linkConsole>.",
+  "marketplace_modal.install_plugins": "Install plugins",
   "marketplace_modal.installing": "Installing...",
   "marketplace_modal.list.configure": "Configure",
   "marketplace_modal.list.configure.plugin": "Configure {plugin}",
@@ -4092,12 +4105,13 @@
   "marketplace_modal.list.update_confirmation.message.warning_major_version": "This update may contain breaking changes.",
   "marketplace_modal.list.update_confirmation.message.warning_major_version_with_release_notes": "This update may contain breaking changes. Consult the [release notes](!{releaseNotesUrl}) before upgrading.",
   "marketplace_modal.list.update_confirmation.title": "Confirm Plugin Update",
-  "marketplace_modal.no_plugins": "There are no plugins available at this time.",
+  "marketplace_modal.no_plugins": "No plugins found",
   "marketplace_modal.no_plugins_installed": "You do not have any plugins installed.",
-  "marketplace_modal.search": "Search Marketplace",
+  "marketplace_modal.search": "Search marketplace",
   "marketplace_modal.tabs.all_listing": "All",
-  "marketplace_modal.tabs.installed_listing": "Installed",
-  "marketplace_modal.title": "Marketplace",
+  "marketplace_modal.tabs.installed_listing": "Installed ({count})",
+  "marketplace_modal.title": "App Marketplace",
+  "marketplace_modal_list.no_plugins_filter": "No results for '\\{filter}'\\",
   "members_popover.button.message": "message",
   "menu.cloudFree.enterpriseTrialDescription": "Your trial is active until {trialEndDay}. Discover the top Enterprise features. <openModalLink>Learn more</openModalLink>",
   "menu.cloudFree.enterpriseTrialTitle": "Enterprise Trial",
@@ -4150,6 +4164,9 @@
   "modal.manual_status.title_ooo": "Your Status is Set to 'Out of Office'",
   "more.details": "More details",
   "more_channels.create": "Create Channel",
+  "more_channels.createClick": "Click 'Create New Channel' to make a new one",
+  "more_channels.join": "Join",
+  "more_channels.joining": "Joining...",
   "more_channels.next": "Next",
   "more_channels.noMore": "No more channels to join",
   "more_channels.prev": "Previous",
@@ -4217,7 +4234,7 @@
   "navbar_dropdown.logout": "Log Out",
   "navbar_dropdown.manageGroups": "Manage Groups",
   "navbar_dropdown.manageMembers": "Manage Members",
-  "navbar_dropdown.marketplace": "Marketplace",
+  "navbar_dropdown.marketplace": "App Marketplace",
   "navbar_dropdown.menuAriaLabel": "main menu",
   "navbar_dropdown.nativeApps": "Download Apps",
   "navbar_dropdown.profileSettings": "Profile",
@@ -4237,6 +4254,9 @@
   "navbar_dropdown.viewMembers": "View Members",
   "newChannelWithBoard.tutorialTip.description": "The board you just created can be quickly accessed by clicking on the Boards icon in the App bar. You can view the boards linked to this channel in the right-hand sidebar and opening one in the expanded view.",
   "newChannelWithBoard.tutorialTip.title": "Access linked boards from the App Bar",
+  "newsletter_optin.checkmark.text": "I would like to receive Mattermost security updates via newsletter. Data <a>Terms and Conditions</a> apply",
+  "newsletter_optin.desc": "Sign up at <a>{link}</a>.",
+  "newsletter_optin.title": "Interested in receiving Mattermost security updates via newsletter?",
   "next_steps_view.welcomeToMattermost": "Welcome to Mattermost",
   "no_results.channel_files.subtitle": "Files posted in this channel will show here.",
   "no_results.channel_files.title": "No files yet",
@@ -4275,6 +4295,7 @@
   "onboardingTask.checklist.downloads": "Now that you’re familiar with Mattermost, <link>download the apps.</link>",
   "onboardingTask.checklist.higher_security_features": "Are you interested in our higher-security features?",
   "onboardingTask.checklist.main_subtitle": "Let's get up and running.",
+  "onboardingTask.checklist.no_thanks": "No thanks",
   "onboardingTask.checklist.start_enterprise_now": "Start your free Enterprise trial now!",
   "onboardingTask.checklist.task_complete_your_profile": "Complete your profile",
   "onboardingTask.checklist.task_create_from_work_template": "Create from a template",
@@ -4362,6 +4383,7 @@
   "payment_form.no_billing_address": "No billing address added",
   "payment_form.no_credit_card": "No credit card added",
   "payment_form.saved_payment_method": "Saved Payment Method",
+  "payment_form.shipping_address": "Shipping Address",
   "payment_form.zipcode": "Post Code",
   "pending_post_actions.cancel": "Cancel",
   "pending_post_actions.retry": "Retry",
@@ -4377,6 +4399,14 @@
   "plan.self_serve": "Self-serve",
   "pluggable.errorOccurred": "An error occurred in the {pluginId} plugin.",
   "pluggable.errorRefresh": "Refresh?",
+  "pluggable_rhs.tourtip.boards.access": "Access your linked boards from the Boards icon on the right hand App bar.",
+  "pluggable_rhs.tourtip.boards.click": "Click into boards from this right panel.",
+  "pluggable_rhs.tourtip.boards.review": "Review board updates from your channels.",
+  "pluggable_rhs.tourtip.boards.title": "Access your {count} linked {num, plural, one {board} other {boards}}!",
+  "pluggable_rhs.tourtip.playbooks.access": "Access your linked playbooks from the Playbooks icon on the right hand App bar.",
+  "pluggable_rhs.tourtip.playbooks.click": "Click into playbooks from this right panel.",
+  "pluggable_rhs.tourtip.playbooks.review": "Review playbook updates from your channels.",
+  "pluggable_rhs.tourtip.playbooks.title": "Access your {count} linked {num, plural, one {playbook} other {playbooks}}.",
   "post.ariaLabel.attachment": ", 1 attachment",
   "post.ariaLabel.attachmentMultiple": ", {attachmentCount} attachments",
   "post.ariaLabel.message": "At {time} {date}, {authorName} wrote, {message}",
@@ -4386,6 +4416,8 @@
   "post.ariaLabel.reaction": ", 1 reaction",
   "post.ariaLabel.reactionMultiple": ", {reactionCount} reactions",
   "post.ariaLabel.replyMessage": "At {time} {date}, {authorName} replied, {message}",
+  "post.reminder.acknowledgement": "You will be reminded at {reminderTime}, {reminderDate} about this message from {username}: {permaLink}",
+  "post.reminder.systemBot": "Hi there, here's your reminder about this message from {username}: {permaLink}",
   "post_body.check_for_out_of_channel_groups_mentions.message": "did not get notified by this mention because they are not in the channel. They cannot be added to the channel because they are not a member of the linked groups. To add them to this channel, they must be added to the linked groups.",
   "post_body.check_for_out_of_channel_mentions.link.and": " and ",
   "post_body.check_for_out_of_channel_mentions.link.private": "add them to this private channel",
@@ -4426,6 +4458,13 @@
   "post_info.message.visible.compact": " (Only visible to you)",
   "post_info.permalink": "Copy Link",
   "post_info.pin": "Pin to Channel",
+  "post_info.post_reminder.menu": "Remind",
+  "post_info.post_reminder.sub_menu.custom": "Custom",
+  "post_info.post_reminder.sub_menu.header": "Set a reminder for:",
+  "post_info.post_reminder.sub_menu.one_hour": "1 hour",
+  "post_info.post_reminder.sub_menu.thirty_minutes": "30 minutes",
+  "post_info.post_reminder.sub_menu.tomorrow": "Tomorrow",
+  "post_info.post_reminder.sub_menu.two_hours": "2 hours",
   "post_info.reply": "Reply",
   "post_info.submenu.icon": "submenu icon",
   "post_info.submenu.mobile": "mobile submenu",
@@ -4454,6 +4493,9 @@
   "post_priority.requested_ack.description": "An acknowledgement button will appear with your message",
   "post_priority.requested_ack.text": "Request acknowledgement",
   "post_priority.you.acknowledge": "(you)",
+  "post_reminder.custom_time_picker_modal.header": "Set a reminder",
+  "post_reminder.custom_time_picker_modal.submit_button": "Set reminder",
+  "post_reminder_custom_time_picker_modal.defaultMsg": "Set a reminder",
   "postlist.toast.history": "Viewing message history",
   "postlist.toast.newMessages": "{count, number} new {count, plural, one {message} other {messages}}",
   "postlist.toast.newMessagesSince": "{count, number} new {count, plural, one {message} other {messages}} {isToday, select, true {} other {since}} {date}",
@@ -4843,6 +4885,8 @@
   "sidebar.types.favorites": "FAVOURITES",
   "sidebar.types.unreads": "UNREADS",
   "sidebar.unreads": "More unreads",
+  "sidebar_left.addChannelsCta": "Add channels",
+  "sidebar_left.add_channel_cta_dropdown.dropdownAriaLabel": "Add Channel Dropdown",
   "sidebar_left.add_channel_dropdown.browseChannels": "Browse channels",
   "sidebar_left.add_channel_dropdown.browseOrCreateChannels": "Browse or create channels",
   "sidebar_left.add_channel_dropdown.createCategory": "Create new category",
@@ -4891,6 +4935,7 @@
   "sidebar_left.sidebar_channel_menu.unfavoriteChannel": "Unfavourite",
   "sidebar_left.sidebar_channel_menu.unmuteChannel": "Unmute Channel",
   "sidebar_left.sidebar_channel_menu.unmuteConversation": "Unmute Conversation",
+  "sidebar_left.sidebar_channel_navigator.addChannelsCta": "Add channels",
   "sidebar_left.sidebar_channel_navigator.inviteUsers": "Invite Users",
   "sidebar_right_menu.console": "System Console",
   "sidebar_right_menu.flagged": "Saved Posts",
@@ -4942,6 +4987,17 @@
   "start_trial.modal_btn.start_free_trial": "Start a free 30-day trial",
   "start_trial.tutorialTip.desc": "Explore our most requested premium features. Determine user access with Guest Accounts, automate compliance reports, and send secure ID-only mobile push notifications.",
   "start_trial.tutorialTip.title": "Try our premium features for free",
+  "start_trial_form.company_name": "Company Name",
+  "start_trial_form.company_size": "Company Size",
+  "start_trial_form.disclaimer": "By selecting Start trial, I agree to the <agreement>Mattermost Software Evaluation Agreement</agreement>, <privacypolicy>Privacy Policy</privacypolicy>, and receiving product emails.",
+  "start_trial_form.email": "Business Email",
+  "start_trial_form.invalid_business_email": "Please enter a valid business email address.",
+  "start_trial_form.modal_btn.start": "Start trial",
+  "start_trial_form.modal_title": "Start Trial",
+  "start_trial_form.name": "Name",
+  "start_trial_form_modal.failureModal.subtitle": "An error occurred while processing your trial request.",
+  "start_trial_form_modal.failureModal.subtitle2": "Please try again or contact support.",
+  "start_trial_form_modal.failureModal.title": "Please try again",
   "status_dropdown.dnd_sub_menu_header": "Disable notifications until:",
   "status_dropdown.dnd_sub_menu_item.custom": "Custom",
   "status_dropdown.dnd_sub_menu_item.one_hour": "1 hour",
@@ -5625,6 +5681,7 @@
   "welcome_post_renderer.user_message.first_paragraph": "Mattermost is an open source platform for secure communication, collaboration and orchestration of work across tools and teams.",
   "welcome_post_renderer.user_message.second_paragraph": "Here is a list of commands to help you get familiar with the platform.",
   "welcome_post_renderer.user_message.title": "Welcome to Mattermost! :rocket:",
+  "widget.input.clear": "Clear",
   "widget.input.required": "This field is required",
   "widget.passwordInput.createPassword": "Choose a Password",
   "widget.passwordInput.password": "Password",

From 6a1243373a15321d46b378dbc383c1717bc9a88a Mon Sep 17 00:00:00 2001
From: Kaya Zeren <kayazeren@gmail.com>
Date: Mon, 10 Apr 2023 22:34:54 +0200
Subject: [PATCH 009/103] Translated using Weblate (Turkish)

Currently translated at 100.0% (5773 of 5773 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 97.4% (5623 of 5773 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (2534 of 2534 strings)

Translation: mattermost-languages-shipped/mattermost-server-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (454 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/tr/
---
 server/i18n/tr.json              | 346 +++++++++++-
 webapp/boards/i18n/tr.json       | 920 +++++++++++++++----------------
 webapp/channels/src/i18n/tr.json | 233 +++++++-
 3 files changed, 1011 insertions(+), 488 deletions(-)

diff --git a/server/i18n/tr.json b/server/i18n/tr.json
index 218846ffc4..fd34c87165 100644
--- a/server/i18n/tr.json
+++ b/server/i18n/tr.json
@@ -1505,7 +1505,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
-    "translation": "\nKanallar eklendi:\n"
+    "translation": "\nEklenen kanallar:\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
@@ -1521,7 +1521,7 @@
   },
   {
     "id": "api.slackimport.slack_add_users.created",
-    "translation": "\nKullanıcılar eklendi:\n"
+    "translation": "\nEklenen kullanıcılar:\n"
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
@@ -9508,7 +9508,7 @@
   },
   {
     "id": "worktemplate.category.product_teams",
-    "translation": "Ürün takımları"
+    "translation": "Ürün"
   },
   {
     "id": "model.draft.is_valid.user_id.app_error",
@@ -9833,5 +9833,345 @@
   {
     "id": "api.command_templates.desc",
     "translation": "Kalıptan oluştur penceresini aç"
+  },
+  {
+    "id": "worktemplate.product_teams.sprint_planning.board",
+    "translation": "Acil sorunlar, önceliklendirme, sahip atama ve yorumlarla ekibinizin haftalık hedeflere doğru ilerlemesini izleyin."
+  },
+  {
+    "id": "worktemplate.product_teams.sprint_planning.integration",
+    "translation": "Zoom gibi sık kullandığınız araçlar ile bütünleştirerek kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir."
+  },
+  {
+    "id": "worktemplate.product_teams.sprint_planning.channel",
+    "translation": "Panolarınız ve bütünleştirmelerinizle kolayca bağlantı kuran bir kanalda ekibinizle sohbet edin."
+  },
+  {
+    "id": "worktemplate.product_teams.product_roadmap.channel",
+    "translation": "Müşterilerinizin geri bildirimleri ve önceliklendirme hakkında ekibinizle sohbet ederek birlikte ilerleme kaydedin."
+  },
+  {
+    "id": "worktemplate.product_teams.product_roadmap.board",
+    "translation": "Kullanıcı geri bildirimlerini yönetmek, kaynak atamak, çıktıları takvimde görüntülemek ve sorunları önceliklendirmek için ürün yol haritası panosunu kullanın."
+  },
+  {
+    "id": "worktemplate.product_teams.goals_and_okrs.integration",
+    "translation": "İşbirliğini kolaylaştırmak için Zoom gibi sık kullandığınız araçları bütünleştirin ve kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir."
+  },
+  {
+    "id": "worktemplate.product_teams.goals_and_okrs.channel",
+    "translation": "Hedefleriniz ve ilerlemeniz hakkında ekibinizle farklı zamanlarda ya da gerçek zamanlı olarak sohbet edin ve değişiklikleri tek bir kanaldan izleyerek güncel kalın."
+  },
+  {
+    "id": "worktemplate.product_teams.goals_and_okrs.board",
+    "translation": "Amaçlar ve anahtar sonuçlar (OKR) panosu ile ekibinizin kurumsal hedeflere doğru ilerlemesini izleyin. Toplantı gündemi panosu ile toplantıları izleyin."
+  },
+  {
+    "id": "worktemplate.product_teams.feature_release.description.playbook",
+    "translation": "Özellik geliştirme sürecinizi destekleyen görev kontrol listeleri ve otomasyon ile işlevsel ekipler arasında işbirliğini artırın. İşiniz bittiğinde bir geçmiş değerlendirmesi yaparak ve süreci bir sonraki sürümünüz için iyileştirin."
+  },
+  {
+    "id": "worktemplate.product_teams.feature_release.description.integration",
+    "translation": "Özellikleri yayınlamak için GitHub gibi sık kullandığınız araçları bütünleştirin ve kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir."
+  },
+  {
+    "id": "worktemplate.product_teams.feature_release.description.channel",
+    "translation": "Panolarınıza, senaryolarınıza ve diğer bütünleştirmelere kolayca bağlanan bir kanalda sürüm engelleyicileri ve değişiklikler hakkında ekibinizle sohbet edin."
+  },
+  {
+    "id": "worktemplate.product_teams.feature_release.description.board",
+    "translation": "Toplantı gündemi panosu ile toplantıları izleyin. Proje görevleri panosu ile iş yükünüzü yönetin."
+  },
+  {
+    "id": "worktemplate.product_teams.bug_bash.playbook",
+    "translation": "Kapsamlı bir hata ayıklama süreci yürütmek için deneme alanları ve otomatik görevler atamak üzere kontrol listeleri kullanın. Sürecinizi gözden geçirmek ve gelecek sefer daha iyi olmasını sağlamak için bir geçmiş değerlendirmesi yapın."
+  },
+  {
+    "id": "worktemplate.product_teams.bug_bash.integration",
+    "translation": "Hata ayıklama işlerinizi kolaylaştırmak için Jira gibi sık kullandığınız araçları bütünleştirin ve kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir."
+  },
+  {
+    "id": "worktemplate.product_teams.bug_bash.channel",
+    "translation": "Hata raporlarını ve çözümlerini ekibinizin ve kuruluşunuzun kolayca erişebileceği tek bir kanalda planlayın ve yönetin."
+  },
+  {
+    "id": "worktemplate.leadership.goals_and_okrs.integration",
+    "translation": "İşbirliğini kolaylaştırmak için Zoom gibi sık kullandığınız araçları bütünleştirin ve kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir."
+  },
+  {
+    "id": "worktemplate.leadership.goals_and_okrs.channel",
+    "translation": "Hedefleriniz ve ilerlemeniz hakkında ekibinizle farklı zamanlarda ya da gerçek zamanlı olarak sohbet edin ve değişiklikleri tek bir kanaldan izleyerek güncel kalın."
+  },
+  {
+    "id": "worktemplate.leadership.goals_and_okrs.board",
+    "translation": "Amaçlar ve anahtar sonuçlar (OKR) panosu ile ekibinizin kurumsal hedeflere doğru ilerlemesini izleyin. Toplantı gündemi panosu ile toplantıları izleyin."
+  },
+  {
+    "id": "worktemplate.devops.product_release.playbook",
+    "translation": "Ürün çıkışlarının güvenilir ve zamanında olması için izlenmesi ve uygulanması kolay, yinelenebilir iş akışları oluşturun."
+  },
+  {
+    "id": "worktemplate.devops.product_release.channel",
+    "translation": "Ekibinizle günlük kilometre taşları, engeller ve çıktılardaki değişiklikler hakkında kolay ve hızlı bir şekilde sohbet edin."
+  },
+  {
+    "id": "worktemplate.devops.product_release.board",
+    "translation": "Sürüm zaman çerçevenizi ve sürecinizi desteklemek için ürün çıkarma panosunu kullanın ve herkesin hangi görevlerin bitiş zamanının geldiğini bilmesini sağlayın."
+  },
+  {
+    "id": "worktemplate.devops.incident_resolution.description.playbook",
+    "translation": "Kilit ekip üyelerini bir araya getirmek için kontrol listeleri ve otomasyon kullanarak olayın çözüme doğru ilerlemesini paylaşın."
+  },
+  {
+    "id": "worktemplate.devops.incident_resolution.description.channel",
+    "translation": "Ekibinizle tek bir kanal kullanarak öncelikler hakkında sohbet edin, paydaşlar ekleyin, güncellemeler yayınlayın ve çözüm için çalışın."
+  },
+  {
+    "id": "worktemplate.devops.incident_resolution.description.board",
+    "translation": "Yinelenebilen süreçleri desteklemek ve ekip genelinde tanımlanmış görevler atamak için olay çözümleme panosunu kullanın."
+  },
+  {
+    "id": "worktemplate.companywide.goals_and_okrs.integration",
+    "translation": "İşbirliğini kolaylaştırmak için Zoom gibi sık kullandığınız araçları bütünleştirin ve kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir."
+  },
+  {
+    "id": "worktemplate.companywide.goals_and_okrs.channel",
+    "translation": "Hedefleriniz ve ilerlemeniz hakkında ekibinizle farklı zamanlarda ya da gerçek zamanlı olarak sohbet edin ve değişiklikleri tek bir kanaldan izleyerek güncel kalın."
+  },
+  {
+    "id": "worktemplate.companywide.goals_and_okrs.board",
+    "translation": "Amaçlar ve anahtar sonuçlar (OKR) panosu ile ekibinizin kurumsal hedeflere doğru ilerlemesini izleyin. Toplantı gündemi panosu ile toplantıları izleyin."
+  },
+  {
+    "id": "model.license_record.is_valid.bytes.app_error",
+    "translation": "Bir lisans yüklenirken bayt değeri geçersiz."
+  },
+  {
+    "id": "worktemplate.companywide.create_project.integration",
+    "translation": "Sık kullandığınız araçlar ile bütünleştirerek kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir."
+  },
+  {
+    "id": "worktemplate.companywide.create_project.channel",
+    "translation": "Ekibinizle yeni projeniz üzerine sohbet edin ve işbirlikli bir kanalda projeyi nasıl yapılandıracağınıza karar verin."
+  },
+  {
+    "id": "worktemplate.companywide.create_project.board",
+    "translation": "Proje görevlerinizi ve ilerlemenizi tanımlamak ve izlemek için bir Kanban panosu kullanın."
+  },
+  {
+    "id": "app.user.run.update_status.title",
+    "translation": "Durum güncellemesi"
+  },
+  {
+    "id": "app.user.run.update_status.submit_label",
+    "translation": "Durumu güncelle"
+  },
+  {
+    "id": "app.user.run.update_status.reminder_for_next_update",
+    "translation": "Sonraki güncelleme anımsatıcısı"
+  },
+  {
+    "id": "app.user.run.update_status.num_channel",
+    "translation": {
+      "one": "Paydaşlara bir güncelleme duyurun. Bu gönderi {{.Count}} kanalında yayınlanacak.",
+      "other": "Paydaşlara bir güncelleme duyurun. Bu gönderi {{.Count}} kanalında yayınlanacak."
+    }
+  },
+  {
+    "id": "app.user.run.update_status.finish_run.placeholder",
+    "translation": "Ayrıca oyunu da tamamlanmış olarak işaretle"
+  },
+  {
+    "id": "app.user.run.update_status.finish_run",
+    "translation": "Oyunu tamamla"
+  },
+  {
+    "id": "app.user.run.update_status.change_since_last_update",
+    "translation": "Son güncellemeden sonraki değişiklik"
+  },
+  {
+    "id": "app.user.run.status_enable",
+    "translation": "@{{.Username}}, [{{.RunName}}]({{.RunURL}}) için durum güncellemelerini etkinleştirdi"
+  },
+  {
+    "id": "app.user.run.status_disable",
+    "translation": "@{{.Username}}, [{{.RunName}}]({{.RunURL}}) için durum güncellemelerini devre dışı bıraktı"
+  },
+  {
+    "id": "app.user.run.request_update",
+    "translation": "@here — @{{.Name}}, [{{.RunName}}]({{.RunURL}}) için bir durum güncellemesi istedi. \n"
+  },
+  {
+    "id": "app.user.run.request_join_channel",
+    "translation": "@{{.Name}} bir oyun katılımcısı ve bu kanala katılmak istiyor. Kanalın herhangi bir üyesi onu çağırabilir.\n"
+  },
+  {
+    "id": "app.user.run.confirm_finish.title",
+    "translation": "Oyunu tamamlamayı onayla"
+  },
+  {
+    "id": "app.user.run.confirm_finish.submit_label",
+    "translation": "Oyunu tamamla"
+  },
+  {
+    "id": "app.user.run.confirm_finish.num_outstanding",
+    "translation": {
+      "one": "Bekleyen **{{.Count}} görev** var. *{{.RunName}}* oyununu tüm katılımcılar için tamamlamak istediğinize emin misiniz?",
+      "other": "Bekleyen **{{.Count}} görev** var. *{{.RunName}}* oyununu tüm katılımcılar için tamamlamak istediğinize emin misiniz?"
+    }
+  },
+  {
+    "id": "app.user.run.add_to_timeline.title",
+    "translation": "Oyun zaman akışına ekle"
+  },
+  {
+    "id": "app.user.run.add_to_timeline.summary.placeholder",
+    "translation": "Zaman akışında görüntülenecek kısa açıklama"
+  },
+  {
+    "id": "app.user.run.add_to_timeline.summary.help",
+    "translation": "En fazla 64 karakter"
+  },
+  {
+    "id": "app.user.run.add_to_timeline.summary",
+    "translation": "Özet"
+  },
+  {
+    "id": "app.user.run.add_to_timeline.submit_label",
+    "translation": "Oyun zaman akışına ekle"
+  },
+  {
+    "id": "app.user.run.add_to_timeline.playbook_run",
+    "translation": "Senaryo oyunu"
+  },
+  {
+    "id": "app.user.run.add_checklist_item.title",
+    "translation": "Yeni görev ekle"
+  },
+  {
+    "id": "app.user.run.add_checklist_item.submit_label",
+    "translation": "Görev ekle"
+  },
+  {
+    "id": "app.user.run.add_checklist_item.name",
+    "translation": "Ad"
+  },
+  {
+    "id": "app.user.run.add_checklist_item.description",
+    "translation": "Açıklama"
+  },
+  {
+    "id": "app.user.new_run.title",
+    "translation": "Senaryoyu oyna"
+  },
+  {
+    "id": "app.user.new_run.submit_label",
+    "translation": "Oyunu başlat"
+  },
+  {
+    "id": "app.user.new_run.run_name",
+    "translation": "Oyun adı"
+  },
+  {
+    "id": "app.user.new_run.playbook",
+    "translation": "Senaryo"
+  },
+  {
+    "id": "app.user.new_run.intro",
+    "translation": "**Sahibi** {{.Username}}"
+  },
+  {
+    "id": "app.user.digest.tasks.zero_assigned",
+    "translation": "Size atanmış bir görev yok."
+  },
+  {
+    "id": "app.user.digest.tasks.num_assigned_due_until_today",
+    "translation": {
+      "one": "Süresi dolmuş {{.Count}} atanmış göreviniz var:",
+      "other": "Süresi dolmuş {{.Count}} atanmış göreviniz var:"
+    }
+  },
+  {
+    "id": "app.user.digest.tasks.num_assigned",
+    "translation": {
+      "one": "{{.Count}} atanmış göreviniz var:",
+      "other": "{{.Count}} atanmış göreviniz var:"
+    }
+  },
+  {
+    "id": "app.user.digest.tasks.heading",
+    "translation": "Atanmış görevleriniz"
+  },
+  {
+    "id": "app.user.digest.tasks.due_yesterday",
+    "translation": "Süresi dün doldu"
+  },
+  {
+    "id": "app.user.digest.tasks.due_x_days_ago",
+    "translation": "Süresi {{.Count}} gün önce doldu"
+  },
+  {
+    "id": "app.user.digest.tasks.due_today",
+    "translation": "Süresi bugün dolacak"
+  },
+  {
+    "id": "app.user.digest.tasks.due_in_x_days",
+    "translation": {
+      "one": "{{.Count}} gün içinde süresi dolacak",
+      "other": "{{.Count}} gün içinde süresi dolacak"
+    }
+  },
+  {
+    "id": "app.user.digest.tasks.due_after_today",
+    "translation": {
+      "one": "Bugünden sonra süresi dolacak **{{.Count}} göreviniz var**.",
+      "other": "Bugünden sonra süresi dolacak **{{.Count}} göreviniz var**."
+    }
+  },
+  {
+    "id": "app.user.digest.tasks.all_tasks_command",
+    "translation": "Tüm görevlerinizi görüntülemek için `/playbook todo` kullanın."
+  },
+  {
+    "id": "app.user.digest.runs_in_progress.zero_in_progress",
+    "translation": "Süren bir oyununuz yok."
+  },
+  {
+    "id": "app.user.digest.runs_in_progress.num_in_progress",
+    "translation": {
+      "one": "Süren {{.Count}} oyununuz var:",
+      "other": "Süren {{.Count}} oyununuz var:"
+    }
+  },
+  {
+    "id": "app.user.digest.runs_in_progress.heading",
+    "translation": "Süren oyunlar"
+  },
+  {
+    "id": "app.user.digest.overdue_status_updates.zero_overdue",
+    "translation": "Gecikmiş bir oyununuz yok."
+  },
+  {
+    "id": "app.user.digest.overdue_status_updates.num_overdue",
+    "translation": {
+      "one": "Bir durum güncellemesi için {{.Count}} oyun gecikmeniz var:",
+      "other": "Bir durum güncellemesi için {{.Count}} oyun gecikmeniz var:"
+    }
+  },
+  {
+    "id": "app.user.digest.overdue_status_updates.heading",
+    "translation": "Gecikmiş durum güncellemeleri"
+  },
+  {
+    "id": "app.command.execute.error",
+    "translation": "Komut yürütülemedi."
+  },
+  {
+    "id": "api.server.cws.subscribe_to_newsletter.app_error",
+    "translation": "CWS sunucusu duyurulara abone olamadı."
+  },
+  {
+    "id": "api.license.request-trial.bad-request.business-email",
+    "translation": "Deneme için iş e-postası geçersiz"
   }
 ]
diff --git a/webapp/boards/i18n/tr.json b/webapp/boards/i18n/tr.json
index 0c9614a803..948676da4a 100644
--- a/webapp/boards/i18n/tr.json
+++ b/webapp/boards/i18n/tr.json
@@ -1,462 +1,462 @@
 {
-  "AdminBadge.SystemAdmin": "Yönetici",
-  "AdminBadge.TeamAdmin": "Takım yöneticisi",
-  "AppBar.Tooltip": "Bağlantılı panoları aç/kapat",
-  "Attachment.Attachment-title": "Ek dosya",
-  "AttachmentBlock.DeleteAction": "sil",
-  "AttachmentBlock.addElement": "{type} ekle",
-  "AttachmentBlock.delete": "Ek dosya silindi.",
-  "AttachmentBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
-  "AttachmentBlock.upload": "Ek dosya yükleniyor.",
-  "AttachmentBlock.uploadSuccess": "Ek dosya yüklendi.",
-  "AttachmentElement.delete-confirmation-dialog-button-text": "Sil",
-  "AttachmentElement.download": "İndir",
-  "AttachmentElement.upload-percentage": "Yükleniyor...(%{uploadPercent})",
-  "BoardComponent.add-a-group": "+ Grup ekle",
-  "BoardComponent.delete": "Sil",
-  "BoardComponent.hidden-columns": "Gizli sütunlar",
-  "BoardComponent.hide": "Gizle",
-  "BoardComponent.new": "+ Yeni",
-  "BoardComponent.no-property": "{property} yok",
-  "BoardComponent.no-property-title": "{property} alanı boş olan ögeler buraya atanır. Bu sütun silinemez.",
-  "BoardComponent.show": "Görüntüle",
-  "BoardMember.schemeAdmin": "Yönetici",
-  "BoardMember.schemeCommenter": "Yorumcu",
-  "BoardMember.schemeEditor": "Düzenleyici",
-  "BoardMember.schemeNone": "Yok",
-  "BoardMember.schemeViewer": "Görüntüleyici",
-  "BoardMember.unlinkChannel": "Bağlantıyı kaldır",
-  "BoardPage.newVersion": "Yeni bir pano sürümü yayınlanmış. Yeniden yüklemek için buraya tıklayın.",
-  "BoardPage.syncFailed": "Pano silinmiş ya da erişim izni geri alınmış olabilir.",
-  "BoardTemplateSelector.add-template": "Yeni kalıp ekle",
-  "BoardTemplateSelector.create-empty-board": "Boş bir pano ekle",
-  "BoardTemplateSelector.delete-template": "Sil",
-  "BoardTemplateSelector.description": "Kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
-  "BoardTemplateSelector.edit-template": "Düzenle",
-  "BoardTemplateSelector.plugin.no-content-description": "Aşağıdaki kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
-  "BoardTemplateSelector.plugin.no-content-title": "Bir pano ekleyin",
-  "BoardTemplateSelector.title": "Bir pano ekle",
-  "BoardTemplateSelector.use-this-template": "Bu kalıp kullanılsın",
-  "BoardsSwitcher.Title": "Pano arama",
-  "BoardsUnfurl.Limited": "Kart arşivlendiğinden ek bilgiler gizleniyor",
-  "BoardsUnfurl.Remainder": "+{remainder} diğer",
-  "BoardsUnfurl.Updated": "Güncellenme: {time}",
-  "Calculations.Options.average.displayName": "Ortalama",
-  "Calculations.Options.average.label": "Ortalama",
-  "Calculations.Options.count.displayName": "Sayı",
-  "Calculations.Options.count.label": "Sayı",
-  "Calculations.Options.countChecked.displayName": "İşaretlenmiş",
-  "Calculations.Options.countChecked.label": "İşaretlenmiş sayısı",
-  "Calculations.Options.countUnchecked.displayName": "İşaretlenmemiş",
-  "Calculations.Options.countUnchecked.label": "İşaretlenmemiş sayısı",
-  "Calculations.Options.countUniqueValue.displayName": "Eşsiz",
-  "Calculations.Options.countUniqueValue.label": "Eşsiz değer sayısı",
-  "Calculations.Options.countValue.displayName": "Değer",
-  "Calculations.Options.countValue.label": "Değer sayısı",
-  "Calculations.Options.dateRange.displayName": "Aralık",
-  "Calculations.Options.dateRange.label": "Aralık",
-  "Calculations.Options.earliest.displayName": "En erken",
-  "Calculations.Options.earliest.label": "En erken",
-  "Calculations.Options.latest.displayName": "En geç",
-  "Calculations.Options.latest.label": "En geç",
-  "Calculations.Options.max.displayName": "En fazla",
-  "Calculations.Options.max.label": "En fazla",
-  "Calculations.Options.median.displayName": "Orta değer",
-  "Calculations.Options.median.label": "Orta değer",
-  "Calculations.Options.min.displayName": "En az",
-  "Calculations.Options.min.label": "En az",
-  "Calculations.Options.none.displayName": "Hesapla",
-  "Calculations.Options.none.label": "Yok",
-  "Calculations.Options.percentChecked.displayName": "İşaretlenmiş",
-  "Calculations.Options.percentChecked.label": "İşaretlenmiş yüzdesi",
-  "Calculations.Options.percentUnchecked.displayName": "İşaretlenmemiş",
-  "Calculations.Options.percentUnchecked.label": "İşaretlenmemiş yüzdesi",
-  "Calculations.Options.range.displayName": "Aralık",
-  "Calculations.Options.range.label": "Aralık",
-  "Calculations.Options.sum.displayName": "Toplam",
-  "Calculations.Options.sum.label": "Toplam",
-  "CalendarCard.untitled": "Adlandırılmamış",
-  "CardActionsMenu.copiedLink": "Kopyalandı!",
-  "CardActionsMenu.copyLink": "Bağlantıyı kopyala",
-  "CardActionsMenu.delete": "Sil",
-  "CardActionsMenu.duplicate": "Kopyala",
-  "CardBadges.title-checkboxes": "İşaret kutuları",
-  "CardBadges.title-comments": "Yorumlar",
-  "CardBadges.title-description": "Bu kartın bir açıklaması var",
-  "CardDetail.Attach": "Dosya ekle",
-  "CardDetail.Follow": "İzle",
-  "CardDetail.Following": "İzleniyor",
-  "CardDetail.add-content": "İçerik ekle",
-  "CardDetail.add-icon": "Simge ekle",
-  "CardDetail.add-property": "+ Bir özellik ekle",
-  "CardDetail.addCardText": "kart metni ekle",
-  "CardDetail.limited-body": "Professional ya da Enterprise tarifesine geçin.",
-  "CardDetail.limited-button": "Üst tarifeye geç",
-  "CardDetail.limited-title": "Bu kart gizli",
-  "CardDetail.moveContent": "Kart içeriğini taşı",
-  "CardDetail.new-comment-placeholder": "Bir yorum ekle...",
-  "CardDetailProperty.confirm-delete-heading": "Özelliği silmeyi onaylayın",
-  "CardDetailProperty.confirm-delete-subtext": "\"{propertyName}\" özelliğini silmek istediğinize emin misiniz? Bu işlem özelliği panodaki tüm kartlardan siler.",
-  "CardDetailProperty.confirm-property-name-change-subtext": "\"{propertyName}\" {customText} özelliğini değiştirmek istediğinize emin misiniz? Bu işlem bu panodaki {numOfCards} kartı etkiler ve veri kaybına yol açabilir.",
-  "CardDetailProperty.confirm-property-type-change": "Özellik türü değişimini onaylayın",
-  "CardDetailProperty.delete-action-button": "Sil",
-  "CardDetailProperty.property-change-action-button": "Özelliği değiştir",
-  "CardDetailProperty.property-changed": "Özellik değiştirildi!",
-  "CardDetailProperty.property-deleted": "{propertyName} silindi!",
-  "CardDetailProperty.property-name-change-subtext": "\"{oldPropType}\" türünden \"{newPropType}\" türüne",
-  "CardDetial.limited-link": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
-  "CardDialog.delete-confirmation-dialog-attachment": "Ek dosyanın silinmesini onaylayın",
-  "CardDialog.delete-confirmation-dialog-button-text": "Sil",
-  "CardDialog.delete-confirmation-dialog-heading": "Kartı silmeyi onaylayın",
-  "CardDialog.editing-template": "Bir kalıbı düzenliyorsunuz.",
-  "CardDialog.nocard": "Bu kart bulunamadı ya da erişilebilir değil.",
-  "Categories.CreateCategoryDialog.CancelText": "İptal",
-  "Categories.CreateCategoryDialog.CreateText": "Ekle",
-  "Categories.CreateCategoryDialog.Placeholder": "Kategorinize bir ad verin",
-  "Categories.CreateCategoryDialog.UpdateText": "Güncelle",
-  "CenterPanel.Login": "Oturum aç",
-  "CenterPanel.Share": "Paylaş",
-  "ChannelIntro.CreateBoard": "Bir pano ekle",
-  "ColorOption.selectColor": "{color} rengi seçin",
-  "Comment.delete": "Sil",
-  "CommentsList.send": "Gönder",
-  "ConfirmPerson.empty": "Boş",
-  "ConfirmPerson.search": "Arama...",
-  "ConfirmationDialog.cancel-action": "İptal",
-  "ConfirmationDialog.confirm-action": "Onayla",
-  "ContentBlock.Delete": "Sil",
-  "ContentBlock.DeleteAction": "sil",
-  "ContentBlock.addElement": "{type} ekle",
-  "ContentBlock.checkbox": "işaret kutusu",
-  "ContentBlock.divider": "ayıraç",
-  "ContentBlock.editCardCheckbox": "değiştirilmiş işaret kutusu",
-  "ContentBlock.editCardCheckboxText": "kart metnini düzenle",
-  "ContentBlock.editCardText": "kart metnini düzenle",
-  "ContentBlock.editText": "Metni düzenle...",
-  "ContentBlock.image": "görsel",
-  "ContentBlock.insertAbove": "Üste ekle",
-  "ContentBlock.moveBlock": "kart içeriğini taşı",
-  "ContentBlock.moveDown": "Alta taşı",
-  "ContentBlock.moveUp": "Üste taşı",
-  "ContentBlock.text": "metin",
-  "DateFilter.empty": "Boş",
-  "DateRange.clear": "Temizle",
-  "DateRange.empty": "Boş",
-  "DateRange.endDate": "Bitiş tarihi",
-  "DateRange.today": "Bugün",
-  "DeleteBoardDialog.confirm-cancel": "İptal",
-  "DeleteBoardDialog.confirm-delete": "Sil",
-  "DeleteBoardDialog.confirm-info": "“{boardTitle}” panosunu silmek istediğinize emin misiniz? Silme işlemi bu panodaki tüm kartları siler.",
-  "DeleteBoardDialog.confirm-info-template": "“{boardTitle}” pano kalıbını silmek istediğinize emin misiniz?",
-  "DeleteBoardDialog.confirm-tite": "Panoyu silmeyi onayla",
-  "DeleteBoardDialog.confirm-tite-template": "Pano kalıbını silmeyi onayla",
-  "Dialog.closeDialog": "Pencereyi kapat",
-  "EditableDayPicker.today": "Bugün",
-  "Error.mobileweb": "Mobil web desteği şu anda erken beta aşamasındadır. Tüm işlevler kullanılamıyor olabilir.",
-  "Error.websocket-closed": "Websoket bağlantısı kesildi. Bu sorun sürerse, sunucu ya da web vekil sunucu yapılandırmanızı denetleyin.",
-  "Filter.contains": "şunu içeren",
-  "Filter.ends-with": "şununla biten",
-  "Filter.includes": "şunu içeren",
-  "Filter.is": "şu olan",
-  "Filter.is-after": "şundan sonra",
-  "Filter.is-before": "şundan önce",
-  "Filter.is-empty": "boş olan",
-  "Filter.is-not-empty": "boş olmayan",
-  "Filter.is-not-set": "şuna ayarlanmamış olan",
-  "Filter.is-set": "şuna ayarlanmış olan",
-  "Filter.isafter": "şundan sonra",
-  "Filter.isbefore": "şundan önce",
-  "Filter.not-contains": "şunu içermeyen",
-  "Filter.not-ends-with": "şununla bitmeyen",
-  "Filter.not-includes": "şunu içermeyen",
-  "Filter.not-starts-with": "şununla başlamayan",
-  "Filter.starts-with": "şununla başlayan",
-  "FilterByText.placeholder": "metni süz",
-  "FilterComponent.add-filter": "+ Süzgeç ekle",
-  "FilterComponent.delete": "Sil",
-  "FilterValue.empty": "(boş)",
-  "FindBoardsDialog.IntroText": "Pano arama",
-  "FindBoardsDialog.NoResultsFor": "\"{searchQuery}\" için bir sonuç bulunamadı",
-  "FindBoardsDialog.NoResultsSubtext": "Yazımı denetleyin ya da başka bir arama yapmayı deneyin.",
-  "FindBoardsDialog.SubTitle": "Bulmak istediğiniz pano adını yazmaya başlayın. Gezinmek için <b>YUKAR/AŞAĞI</b>, seçmek için <b>ENTER</b>, vazgeçmek için <b>ESC</b> tuşlarını kullanın",
-  "FindBoardsDialog.Title": "Pano arama",
-  "GroupBy.hideEmptyGroups": "{count} boş grubu gizle",
-  "GroupBy.showHiddenGroups": "{count} gizli grubu görüntüle",
-  "GroupBy.ungroup": "Gruplamayı kaldır",
-  "HideBoard.MenuOption": "Panoyu gizle",
-  "KanbanCard.untitled": "Adlandırılmamış",
-  "MentionSuggestion.is-not-board-member": "(pano üyesi değil)",
-  "Mutator.new-board-from-template": "kalıptan yeni pano",
-  "Mutator.new-card-from-template": "kalıptan yeni kart oluştur",
-  "Mutator.new-template-from-card": "karttan yeni kalıp oluştur",
-  "OnboardingTour.AddComments.Body": "Sorunlar hakkında yorum yapabilir ve Mattermost kullanıcılarının dikkatini çekmek için @anabilirsiniz.",
-  "OnboardingTour.AddComments.Title": "Yorum yap",
-  "OnboardingTour.AddDescription.Body": "Takım arkadaşlarınızın kartın ne ile ilgili olduğunu anlaması için kartınıza bir açıklama ekleyin.",
-  "OnboardingTour.AddDescription.Title": "Açıklama ekle",
-  "OnboardingTour.AddProperties.Body": "Daha güçlü kılmak için kartlara çeşitli özellikler ekleyin.",
-  "OnboardingTour.AddProperties.Title": "Özellikler ekle",
-  "OnboardingTour.AddView.Body": "Farklı görünümler kullanarak panonuzu düzenleyecek yeni bir görünüm oluşturmak için buraya gidin.",
-  "OnboardingTour.AddView.Title": "Yeni bir görünüm ekle",
-  "OnboardingTour.CopyLink.Body": "Kartlarınızı takım arkadaşlarınızla paylaşmak için bağlantıyı kopyalayıp bir kanala, doğrudan iletiye veya grup iletisine yapıştırın.",
-  "OnboardingTour.CopyLink.Title": "Bağlantıyı kopyala",
-  "OnboardingTour.OpenACard.Body": "Panoların işinizi düzenlemenize yardımcı olabileceği güçlü yolları keşfetmek için bir kart açın.",
-  "OnboardingTour.OpenACard.Title": "Bir kart açın",
-  "OnboardingTour.ShareBoard.Body": "Panonuzu içeride, ekibiniz ile paylaşabilir ya da kuruluşunuzun dışında herkese açık olarak yayınlayabilirsiniz.",
-  "OnboardingTour.ShareBoard.Title": "Panoyu paylaş",
-  "PersonProperty.board-members": "Pano üyeleri",
-  "PersonProperty.me": "Benim",
-  "PersonProperty.non-board-members": "Pano üyesi olmayanlar",
-  "PropertyMenu.Delete": "Sil",
-  "PropertyMenu.changeType": "Özellik türünü değiştir",
-  "PropertyMenu.selectType": "Özellik türünü seçin",
-  "PropertyMenu.typeTitle": "Tür",
-  "PropertyType.Checkbox": "İşaret kutusu",
-  "PropertyType.CreatedBy": "Oluşturan",
-  "PropertyType.CreatedTime": "Oluşturulma zamanı",
-  "PropertyType.Date": "Tarih",
-  "PropertyType.Email": "E-posta",
-  "PropertyType.MultiPerson": "Çok kişi",
-  "PropertyType.MultiSelect": "Çoklu seçim",
-  "PropertyType.Number": "Sayı",
-  "PropertyType.Person": "Kişi",
-  "PropertyType.Phone": "Telefon",
-  "PropertyType.Select": "Seçin",
-  "PropertyType.Text": "Metin",
-  "PropertyType.Unknown": "Bilinmiyor",
-  "PropertyType.UpdatedBy": "Son güncelleyen",
-  "PropertyType.UpdatedTime": "Son güncelleme zamanı",
-  "PropertyType.Url": "Adres",
-  "PropertyValueElement.empty": "Boş",
-  "RegistrationLink.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
-  "RegistrationLink.copiedLink": "Kopyalandı!",
-  "RegistrationLink.copyLink": "Bağlantıyı kopyala",
-  "RegistrationLink.description": "Başkalarının hesap ekleyebilmesi için bu bağlantıyı paylaş:",
-  "RegistrationLink.regenerateToken": "Kodu yeniden oluştur",
-  "RegistrationLink.tokenRegenerated": "Kayıt bağlantısı yeniden oluşturuldu",
-  "ShareBoard.PublishDescription": "Web üzerinde herkese açık olarak \"salt okunur\" bir bağlantı yayınlayın ve paylaşın.",
-  "ShareBoard.PublishTitle": "Web üzerinde yayınla",
-  "ShareBoard.ShareInternal": "İçeride paylaş",
-  "ShareBoard.ShareInternalDescription": "İzni olan kullanıcılar bu bağlantıyı kullanabilecek.",
-  "ShareBoard.Title": "Panoyu paylaş",
-  "ShareBoard.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
-  "ShareBoard.copiedLink": "Kopyalandı!",
-  "ShareBoard.copyLink": "Bağlantıyı kopyala",
-  "ShareBoard.regenerate": "Kodu yeniden oluştur",
-  "ShareBoard.searchPlaceholder": "Kişi ve kanal arama",
-  "ShareBoard.teamPermissionsText": "{teamName} takımındaki herkes",
-  "ShareBoard.tokenRegenrated": "Kod yeniden oluşturuldu",
-  "ShareBoard.userPermissionsRemoveMemberText": "Üyelikten çıkar",
-  "ShareBoard.userPermissionsYouText": "(Siz)",
-  "ShareTemplate.Title": "Kalıbı paylaş",
-  "ShareTemplate.searchPlaceholder": "Kişi arama",
-  "Sidebar.about": "Focalboard hakkında",
-  "Sidebar.add-board": "+ Pano ekle",
-  "Sidebar.changePassword": "Parola değiştir",
-  "Sidebar.delete-board": "Panoyu sil",
-  "Sidebar.duplicate-board": "Panoyu kopyala",
-  "Sidebar.export-archive": "Arşivi dışa aktar",
-  "Sidebar.import": "İçe aktar",
-  "Sidebar.import-archive": "Arşivi içe aktar",
-  "Sidebar.invite-users": "Kullanıcıları çağır",
-  "Sidebar.logout": "Oturumu kapat",
-  "Sidebar.new-category.badge": "Yeni",
-  "Sidebar.new-category.drag-boards-cta": "Panoları sürükleyip buraya bırakın...",
-  "Sidebar.no-boards-in-category": "İçeride bir pano yok",
-  "Sidebar.product-tour": "Tanıtım turu",
-  "Sidebar.random-icons": "Rastgele simgeler",
-  "Sidebar.set-language": "Dili ayarla",
-  "Sidebar.set-theme": "Temayı ayarla",
-  "Sidebar.settings": "Ayarlar",
-  "Sidebar.template-from-board": "Panodan yeni kalıp",
-  "Sidebar.untitled-board": "(Adlandırılmamış pano)",
-  "Sidebar.untitled-view": "(Adlandırılmamış görünüm)",
-  "SidebarCategories.BlocksMenu.Move": "Şuraya taşı...",
-  "SidebarCategories.CategoryMenu.CreateNew": "Yeni kategori ekle",
-  "SidebarCategories.CategoryMenu.Delete": "Kategoriyi sił",
-  "SidebarCategories.CategoryMenu.DeleteModal.Body": "<b>{categoryName}</b> içindeki panolar Panolar kategorisine taşınacak. Herhangi bir panodan çıkarılmayacaksınız.",
-  "SidebarCategories.CategoryMenu.DeleteModal.Title": "Bu kategori silinsin mi?",
-  "SidebarCategories.CategoryMenu.Update": "Kategoriyi yeniden adlandır",
-  "SidebarTour.ManageCategories.Body": "Özel kategoriler oluşturun ve yönetin. Kategoriler kullanıcıya özeldir, bu nedenle bir panoyu kendi kategorinize taşımanız aynı panoyu kullanan diğer üyeleri etkilemez.",
-  "SidebarTour.ManageCategories.Title": "Kategori yönetimi",
-  "SidebarTour.SearchForBoards.Body": "Panoları hızlıca aramak ve yan çubuğunuza eklemek için pano değiştiriciyi (Cmd/Ctrl + K) açın.",
-  "SidebarTour.SearchForBoards.Title": "Pano arama",
-  "SidebarTour.SidebarCategories.Body": "Tüm panolarınızı artık yeni yan çubuğunuz altında bulabilirsiniz. Artık çalışma alanları arasında geçiş yapmanıza gerek yok. Önceki çalışma alanlarınıza göre eklenmiş tek seferlik özel kategoriler, 7.2 sürümüne güncellemenizin bir parçası olarak otomatik şekilde eklenmiş olabilir. Bunları isteğinize göre kaldırabilir ya da düzenleyebilirsiniz.",
-  "SidebarTour.SidebarCategories.Link": "Ayrıntılı bilgi alın",
-  "SidebarTour.SidebarCategories.Title": "Yan çubuk kategorileri",
-  "SiteStats.total_boards": "Toplam pano",
-  "SiteStats.total_cards": "Toplam kart",
-  "TableComponent.add-icon": "Simge ekle",
-  "TableComponent.name": "Ad",
-  "TableComponent.plus-new": "+ Yeni",
-  "TableHeaderMenu.delete": "Sil",
-  "TableHeaderMenu.duplicate": "Kopya oluştur",
-  "TableHeaderMenu.hide": "Gizle",
-  "TableHeaderMenu.insert-left": "Sola ekle",
-  "TableHeaderMenu.insert-right": "Sağa ekle",
-  "TableHeaderMenu.sort-ascending": "Artan sıralama",
-  "TableHeaderMenu.sort-descending": "Azalan sıralama",
-  "TableRow.DuplicateCard": "kartı kopyala",
-  "TableRow.MoreOption": "Diğer işlemler",
-  "TableRow.open": "Aç",
-  "TopBar.give-feedback": "Geri bildirimde bulunun",
-  "URLProperty.copiedLink": "Kopyalandı!",
-  "URLProperty.copy": "Kopyala",
-  "URLProperty.edit": "Düzenle",
-  "UndoRedoHotKeys.canRedo": "Yinele",
-  "UndoRedoHotKeys.canRedo-with-description": "{description} yinele",
-  "UndoRedoHotKeys.canUndo": "Geri al",
-  "UndoRedoHotKeys.canUndo-with-description": "{description} geri al",
-  "UndoRedoHotKeys.cannotRedo": "Yinelenecek bir işlem yok",
-  "UndoRedoHotKeys.cannotUndo": "Geri alınacak bir işlem yok",
-  "ValueSelector.noOptions": "Herhangi bir seçenek yok. İlk seçeneği eklemek için yazmaya başlayın!",
-  "ValueSelector.valueSelector": "Değer seçici",
-  "ValueSelectorLabel.openMenu": "Menüyü aç",
-  "VersionMessage.help": "Bu sürümdeki yeniliklere bakın.",
-  "VersionMessage.learn-more": "Ayrıntılı bilgi alın",
-  "View.AddView": "Görünüm ekle",
-  "View.Board": "Pano",
-  "View.DeleteView": "Görünümü sil",
-  "View.DuplicateView": "Görünümü kopyala",
-  "View.Gallery": "Galeri",
-  "View.NewBoardTitle": "Pano görünümü",
-  "View.NewCalendarTitle": "Takvim görünümü",
-  "View.NewGalleryTitle": "Galeri görünümü",
-  "View.NewTableTitle": "Tablo görünümü",
-  "View.NewTemplateDefaultTitle": "Adlandırılmamış kalıp",
-  "View.NewTemplateTitle": "Adlandırılmamış",
-  "View.Table": "Tablo",
-  "ViewHeader.add-template": "Yeni kalıp",
-  "ViewHeader.delete-template": "Sil",
-  "ViewHeader.display-by": "Görünüm: {property}",
-  "ViewHeader.edit-template": "Düzenle",
-  "ViewHeader.empty-card": "Boş kart",
-  "ViewHeader.export-board-archive": "Pano arşivini dışa aktar",
-  "ViewHeader.export-complete": "Dışa aktarıldı!",
-  "ViewHeader.export-csv": "CSV olarak dışa aktar",
-  "ViewHeader.export-failed": "Dışa aktarılamadı!",
-  "ViewHeader.filter": "Süz",
-  "ViewHeader.group-by": "Grupla: {property}",
-  "ViewHeader.new": "Yeni",
-  "ViewHeader.properties": "Özellikler",
-  "ViewHeader.properties-menu": "Özellikler menüsü",
-  "ViewHeader.search-text": "Kart arama",
-  "ViewHeader.select-a-template": "Bir kalıp seçin",
-  "ViewHeader.set-default-template": "Varsayılan olarak ata",
-  "ViewHeader.sort": "Sırala",
-  "ViewHeader.untitled": "Adlandırılmamış",
-  "ViewHeader.view-header-menu": "Başlık menüsünü görüntüle",
-  "ViewHeader.view-menu": "Menüyü görüntüle",
-  "ViewLimitDialog.Heading": "Bir panoyu görüntüleme sınırına ulaşıldı",
-  "ViewLimitDialog.PrimaryButton.Title.Admin": "Üst tarifeye geç",
-  "ViewLimitDialog.PrimaryButton.Title.RegularUser": "Yöneticiyi bilgilendir",
-  "ViewLimitDialog.Subtext.Admin": "Professional ya da Enterprise tarifemize geçin.",
-  "ViewLimitDialog.Subtext.Admin.PricingPageLink": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
-  "ViewLimitDialog.Subtext.RegularUser": "Yöneticinizi Professional ya da Enterprise tarifesine geçmesi hakkında bilgilendirin.",
-  "ViewLimitDialog.UpgradeImg.AltText": "üst tarifeye geçiş görseli",
-  "ViewLimitDialog.notifyAdmin.Success": "Yöneticiniz bilgilendirildi",
-  "ViewTitle.hide-description": "açıklamayı gizle",
-  "ViewTitle.pick-icon": "Simge seçin",
-  "ViewTitle.random-icon": "Rastgele",
-  "ViewTitle.remove-icon": "Simgeyi kaldır",
-  "ViewTitle.show-description": "açıklamayı görüntüle",
-  "ViewTitle.untitled-board": "Adlandırılmamış pano",
-  "WelcomePage.Description": "Pano, alışılmış Kanban panosu görünümünde takımların işleri tanımlamasını, düzenlemesini, izlemesi ve yönetmesini sağlayan bir proje yönetimi aracıdır.",
-  "WelcomePage.Explore.Button": "Tura çıkın",
-  "WelcomePage.Heading": "Panolara hoş geldiniz",
-  "WelcomePage.NoThanks.Text": "Hayır teşekkürler, kendim anlayacağım",
-  "WelcomePage.StartUsingIt.Text": "Kullanmaya başlayın",
-  "Workspace.editing-board-template": "Bir pano kalıbını düzenliyorsunuz.",
-  "badge.guest": "Konuk",
-  "boardPage.confirm-join-button": "Katıl",
-  "boardPage.confirm-join-text": "Bir özel kanala, pano yöneticisi tarafından açıkça eklenmeden katılmak üzeresiniz. Bu özel kanala katılmak istediğinize emin misiniz?",
-  "boardPage.confirm-join-title": "Özel kanala katıl",
-  "boardSelector.confirm-link-board": "Panoyu kanala bağla",
-  "boardSelector.confirm-link-board-button": "Evet, panoyu bağla",
-  "boardSelector.confirm-link-board-subtext": "\"{boardName}\" panosunu kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır. Bir pano ile bir kanalın bağlantısını istediğiniz zaman kaldırabilirsiniz.",
-  "boardSelector.confirm-link-board-subtext-with-other-channel": "\"{boardName}\" panosunu bir kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konukl üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
-  "boardSelector.create-a-board": "Bir pano ekle",
-  "boardSelector.link": "Bağlantı",
-  "boardSelector.search-for-boards": "Pano arama",
-  "boardSelector.title": "Panoları bağla",
-  "boardSelector.unlink": "Bağlantıyı kaldır",
-  "calendar.month": "Ay",
-  "calendar.today": "Bugün",
-  "calendar.week": "Hafta",
-  "centerPanel.undefined": "{propertyName} yok",
-  "centerPanel.unknown-user": "Kullanıcı bilinmiyor",
-  "cloudMessage.learn-more": "Ayrıntılı bilgi alın",
-  "createImageBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
-  "default-properties.badges": "Yorumlar ve açıklama",
-  "default-properties.title": "Başlık",
-  "error.back-to-home": "Girişe dön",
-  "error.back-to-team": "Takıma dön",
-  "error.board-not-found": "Pano bulunamadı.",
-  "error.go-login": "Oturum aç",
-  "error.invalid-read-only-board": "Bu panoya erişme izniniz yok. Panolara erişmek için oturum açın.",
-  "error.not-logged-in": "Oturumunuzun süresi dolmuş ya da oturum açmamışsınız. Panolara erişmek için yeniden oturum açın.",
-  "error.page.title": "Bir şeyler ters gitti",
-  "error.team-undefined": "Geçerli bir takım değil.",
-  "error.unknown": "Bir sorun çıktı.",
-  "generic.previous": "Önceki",
-  "guest-no-board.subtitle": "Henüz bu takımdaki herhangi bir panoya erişme izniniz yok. Lütfen biri sizi bir panoya ekleyene kadar bekleyin.",
-  "guest-no-board.title": "Henüz bir pano yok",
-  "imagePaste.upload-failed": "Dosya boyutu sınırı aşıldığından bazı dosyalar yüklenemedi.",
-  "limitedCard.title": "Kartlar gizli",
-  "login.log-in-button": "Oturum aç",
-  "login.log-in-title": "Oturum açın",
-  "login.register-button": "ya da hesabınız yoksa bir hesap açın",
-  "new_channel_modal.create_board.empty_board_description": "Yeni boş bir pano oluştur",
-  "new_channel_modal.create_board.empty_board_title": "Boş pano",
-  "new_channel_modal.create_board.select_template_placeholder": "Bir kalıp seçin",
-  "new_channel_modal.create_board.title": "Bu kanal için bir pano oluştur",
-  "notification-box-card-limit-reached.close-tooltip": "10 gün için sustur",
-  "notification-box-card-limit-reached.contact-link": "yöneticinizi bilgilendirin",
-  "notification-box-card-limit-reached.link": "Ücretli bir tarifeye geçin",
-  "notification-box-card-limit-reached.title": "panoda {cards} kart gizli",
-  "notification-box-cards-hidden.title": "Bu işlem başka bir kartı gizledi",
-  "notification-box.card-limit-reached.not-admin.text": "Arşivlenmiş kartlara erişmek için {contactLink} ile görüşerek ücretli bir tarifeye geçmesini isteyin.",
-  "notification-box.card-limit-reached.text": "Kart sınırına ulaşıldı. Eski kartları görüntülemek için {link}",
-  "person.add-user-to-board": "{username} kullanıcısını panoya ekle",
-  "person.add-user-to-board-confirm-button": "Panoya ekle",
-  "person.add-user-to-board-permissions": "İzinler",
-  "person.add-user-to-board-question": "{username} kullanıcısını panoya eklemek ister misiniz?",
-  "person.add-user-to-board-warning": "{username} panonun bir üyesi değil ve pano ile ilgili herhangi bir bildirim almayacak.",
-  "register.login-button": "ya da bir hesabınız varsa oturum açın",
-  "register.signup-title": "Hesap açın",
-  "rhs-board-non-admin-msg": "Panonun yöneticilerinden değilsiniz",
-  "rhs-boards.add": "Ekle",
-  "rhs-boards.dm": "Dİ",
-  "rhs-boards.gm": "Gİ",
-  "rhs-boards.header.dm": "bu doğrudan ileti",
-  "rhs-boards.header.gm": "bu grup iletisi",
-  "rhs-boards.last-update-at": "Son güncelleme: {datetime}",
-  "rhs-boards.link-boards-to-channel": "Panoları {channelName} kanalına bağla",
-  "rhs-boards.linked-boards": "Bağlı panolar",
-  "rhs-boards.no-boards-linked-to-channel": "Henüz {channelName} kanalına bağlanmış bir pano yok",
-  "rhs-boards.no-boards-linked-to-channel-description": "Panolar, takımlar arasındaki çalışmaları tanımlamak, organize etmek, izlemek ve yönetmek için kullanılabilen kandan panosuna benzer bir proje yönetimi aracıdır.",
-  "rhs-boards.unlink-board": "Panonun bağlantısını kaldır",
-  "rhs-boards.unlink-board1": "Pano bağlantısını kaldır",
-  "rhs-channel-boards-header.title": "Panolar",
-  "share-board.publish": "Yayınla",
-  "share-board.share": "Paylaş",
-  "shareBoard.channels-select-group": "Kanallar",
-  "shareBoard.confirm-change-team-role.body": "Bu panoda izinleri \"{role}\" rolünden daha aşağıda olan herkes <b>{role} rolüne yükseltilecek</b>. Panonunen düşük rolünü değiştirmek istediğinize emin misiniz?",
-  "shareBoard.confirm-change-team-role.confirmBtnText": "Panonun en düşük rolünü değiştir",
-  "shareBoard.confirm-change-team-role.title": "Panonun en düşük rolünü değiştir",
-  "shareBoard.confirm-link-channel": "Panoyu kanala bağla",
-  "shareBoard.confirm-link-channel-button": "Kanalı bağla",
-  "shareBoard.confirm-link-channel-button-with-other-channel": "Eski bağlantıyı kes ve bu kanala bağla",
-  "shareBoard.confirm-link-channel-subtext": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.",
-  "shareBoard.confirm-link-channel-subtext-with-other-channel": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
-  "shareBoard.confirm-unlink.body": "Bir kanalın bir pano ile bağlantısını kaldırdığınızda, kanalın tüm üyeleri (var olan ve yeni), kendilerine özel olarak izin verilmedikçe, panoya erişimi kaybeder.",
-  "shareBoard.confirm-unlink.confirmBtnText": "Kanalın bağlantısını kaldır",
-  "shareBoard.confirm-unlink.title": "Kanalın pano ile bağlantısı kaldır",
-  "shareBoard.lastAdmin": "Panoların en az bir yöneticisi olmalıdır",
-  "shareBoard.members-select-group": "Üyeler",
-  "shareBoard.unknown-channel-display-name": "Kanal bilinmiyor",
-  "tutorial_tip.finish_tour": "Tamam",
-  "tutorial_tip.got_it": "Anladım",
-  "tutorial_tip.ok": "Sonraki",
-  "tutorial_tip.out": "Bu ipuçları görüntülenmesin.",
-  "tutorial_tip.seen": "Daha önce gördünüz mü?"
+    "AdminBadge.SystemAdmin": "Yönetici",
+    "AdminBadge.TeamAdmin": "Takım yöneticisi",
+    "AppBar.Tooltip": "Bağlantılı panoları aç/kapat",
+    "Attachment.Attachment-title": "Ek dosya",
+    "AttachmentBlock.DeleteAction": "sil",
+    "AttachmentBlock.addElement": "{type} ekle",
+    "AttachmentBlock.delete": "Ek dosya silindi.",
+    "AttachmentBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
+    "AttachmentBlock.upload": "Ek dosya yükleniyor.",
+    "AttachmentBlock.uploadSuccess": "Ek dosya yüklendi.",
+    "AttachmentElement.delete-confirmation-dialog-button-text": "Sil",
+    "AttachmentElement.download": "İndir",
+    "AttachmentElement.upload-percentage": "Yükleniyor...(%{uploadPercent})",
+    "BoardComponent.add-a-group": "+ Grup ekle",
+    "BoardComponent.delete": "Sil",
+    "BoardComponent.hidden-columns": "Gizli sütunlar",
+    "BoardComponent.hide": "Gizle",
+    "BoardComponent.new": "+ Yeni",
+    "BoardComponent.no-property": "{property} yok",
+    "BoardComponent.no-property-title": "{property} alanı boş olan ögeler buraya atanır. Bu sütun silinemez.",
+    "BoardComponent.show": "Görüntüle",
+    "BoardMember.schemeAdmin": "Yönetici",
+    "BoardMember.schemeCommenter": "Yorumcu",
+    "BoardMember.schemeEditor": "Düzenleyici",
+    "BoardMember.schemeNone": "Yok",
+    "BoardMember.schemeViewer": "Görüntüleyici",
+    "BoardMember.unlinkChannel": "Bağlantıyı kaldır",
+    "BoardPage.newVersion": "Yeni bir pano sürümü yayınlanmış. Yeniden yüklemek için buraya tıklayın.",
+    "BoardPage.syncFailed": "Pano silinmiş ya da erişim izni geri alınmış olabilir.",
+    "BoardTemplateSelector.add-template": "Yeni kalıp ekle",
+    "BoardTemplateSelector.create-empty-board": "Boş bir pano ekle",
+    "BoardTemplateSelector.delete-template": "Sil",
+    "BoardTemplateSelector.description": "Kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
+    "BoardTemplateSelector.edit-template": "Düzenle",
+    "BoardTemplateSelector.plugin.no-content-description": "Aşağıdaki kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
+    "BoardTemplateSelector.plugin.no-content-title": "Bir pano ekleyin",
+    "BoardTemplateSelector.title": "Bir pano ekle",
+    "BoardTemplateSelector.use-this-template": "Bu kalıp kullanılsın",
+    "BoardsSwitcher.Title": "Pano arama",
+    "BoardsUnfurl.Limited": "Kart arşivlendiğinden ek bilgiler gizleniyor",
+    "BoardsUnfurl.Remainder": "+{remainder} diğer",
+    "BoardsUnfurl.Updated": "Güncellenme: {time}",
+    "Calculations.Options.average.displayName": "Ortalama",
+    "Calculations.Options.average.label": "Ortalama",
+    "Calculations.Options.count.displayName": "Sayı",
+    "Calculations.Options.count.label": "Sayı",
+    "Calculations.Options.countChecked.displayName": "İşaretlenmiş",
+    "Calculations.Options.countChecked.label": "İşaretlenmiş sayısı",
+    "Calculations.Options.countUnchecked.displayName": "İşaretlenmemiş",
+    "Calculations.Options.countUnchecked.label": "İşaretlenmemiş sayısı",
+    "Calculations.Options.countUniqueValue.displayName": "Eşsiz",
+    "Calculations.Options.countUniqueValue.label": "Eşsiz değer sayısı",
+    "Calculations.Options.countValue.displayName": "Değer",
+    "Calculations.Options.countValue.label": "Değer sayısı",
+    "Calculations.Options.dateRange.displayName": "Aralık",
+    "Calculations.Options.dateRange.label": "Aralık",
+    "Calculations.Options.earliest.displayName": "En erken",
+    "Calculations.Options.earliest.label": "En erken",
+    "Calculations.Options.latest.displayName": "En geç",
+    "Calculations.Options.latest.label": "En geç",
+    "Calculations.Options.max.displayName": "En fazla",
+    "Calculations.Options.max.label": "En fazla",
+    "Calculations.Options.median.displayName": "Orta değer",
+    "Calculations.Options.median.label": "Orta değer",
+    "Calculations.Options.min.displayName": "En az",
+    "Calculations.Options.min.label": "En az",
+    "Calculations.Options.none.displayName": "Hesapla",
+    "Calculations.Options.none.label": "Yok",
+    "Calculations.Options.percentChecked.displayName": "İşaretlenmiş",
+    "Calculations.Options.percentChecked.label": "İşaretlenmiş yüzdesi",
+    "Calculations.Options.percentUnchecked.displayName": "İşaretlenmemiş",
+    "Calculations.Options.percentUnchecked.label": "İşaretlenmemiş yüzdesi",
+    "Calculations.Options.range.displayName": "Aralık",
+    "Calculations.Options.range.label": "Aralık",
+    "Calculations.Options.sum.displayName": "Toplam",
+    "Calculations.Options.sum.label": "Toplam",
+    "CalendarCard.untitled": "Adlandırılmamış",
+    "CardActionsMenu.copiedLink": "Kopyalandı!",
+    "CardActionsMenu.copyLink": "Bağlantıyı kopyala",
+    "CardActionsMenu.delete": "Sil",
+    "CardActionsMenu.duplicate": "Kopyala",
+    "CardBadges.title-checkboxes": "İşaret kutuları",
+    "CardBadges.title-comments": "Yorumlar",
+    "CardBadges.title-description": "Bu kartın bir açıklaması var",
+    "CardDetail.Attach": "Dosya ekle",
+    "CardDetail.Follow": "İzle",
+    "CardDetail.Following": "İzleniyor",
+    "CardDetail.add-content": "İçerik ekle",
+    "CardDetail.add-icon": "Simge ekle",
+    "CardDetail.add-property": "+ Bir özellik ekle",
+    "CardDetail.addCardText": "kart metni ekle",
+    "CardDetail.limited-body": "Professional ya da Enterprise tarifesine geçin.",
+    "CardDetail.limited-button": "Üst tarifeye geç",
+    "CardDetail.limited-title": "Bu kart gizli",
+    "CardDetail.moveContent": "Kart içeriğini taşı",
+    "CardDetail.new-comment-placeholder": "Bir yorum ekle...",
+    "CardDetailProperty.confirm-delete-heading": "Özelliği silmeyi onaylayın",
+    "CardDetailProperty.confirm-delete-subtext": "\"{propertyName}\" özelliğini silmek istediğinize emin misiniz? Bu işlem özelliği panodaki tüm kartlardan siler.",
+    "CardDetailProperty.confirm-property-name-change-subtext": "\"{propertyName}\" {customText} özelliğini değiştirmek istediğinize emin misiniz? Bu işlem bu panodaki {numOfCards} kartı etkiler ve veri kaybına yol açabilir.",
+    "CardDetailProperty.confirm-property-type-change": "Özellik türü değişimini onaylayın",
+    "CardDetailProperty.delete-action-button": "Sil",
+    "CardDetailProperty.property-change-action-button": "Özelliği değiştir",
+    "CardDetailProperty.property-changed": "Özellik değiştirildi!",
+    "CardDetailProperty.property-deleted": "{propertyName} silindi!",
+    "CardDetailProperty.property-name-change-subtext": "\"{oldPropType}\" türünden \"{newPropType}\" türüne",
+    "CardDetial.limited-link": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
+    "CardDialog.delete-confirmation-dialog-attachment": "Ek dosyanın silinmesini onaylayın",
+    "CardDialog.delete-confirmation-dialog-button-text": "Sil",
+    "CardDialog.delete-confirmation-dialog-heading": "Kartı silmeyi onaylayın",
+    "CardDialog.editing-template": "Bir kalıbı düzenliyorsunuz.",
+    "CardDialog.nocard": "Bu kart bulunamadı ya da erişilebilir değil.",
+    "Categories.CreateCategoryDialog.CancelText": "İptal",
+    "Categories.CreateCategoryDialog.CreateText": "Ekle",
+    "Categories.CreateCategoryDialog.Placeholder": "Kategorinize bir ad verin",
+    "Categories.CreateCategoryDialog.UpdateText": "Güncelle",
+    "CenterPanel.Login": "Oturum aç",
+    "CenterPanel.Share": "Paylaş",
+    "ChannelIntro.CreateBoard": "Bir pano ekle",
+    "ColorOption.selectColor": "{color} rengi seçin",
+    "Comment.delete": "Sil",
+    "CommentsList.send": "Gönder",
+    "ConfirmPerson.empty": "Boş",
+    "ConfirmPerson.search": "Arama...",
+    "ConfirmationDialog.cancel-action": "İptal",
+    "ConfirmationDialog.confirm-action": "Onayla",
+    "ContentBlock.Delete": "Sil",
+    "ContentBlock.DeleteAction": "sil",
+    "ContentBlock.addElement": "{type} ekle",
+    "ContentBlock.checkbox": "işaret kutusu",
+    "ContentBlock.divider": "ayıraç",
+    "ContentBlock.editCardCheckbox": "değiştirilmiş işaret kutusu",
+    "ContentBlock.editCardCheckboxText": "kart metnini düzenle",
+    "ContentBlock.editCardText": "kart metnini düzenle",
+    "ContentBlock.editText": "Metni düzenle...",
+    "ContentBlock.image": "görsel",
+    "ContentBlock.insertAbove": "Üste ekle",
+    "ContentBlock.moveBlock": "kart içeriğini taşı",
+    "ContentBlock.moveDown": "Alta taşı",
+    "ContentBlock.moveUp": "Üste taşı",
+    "ContentBlock.text": "metin",
+    "DateFilter.empty": "Boş",
+    "DateRange.clear": "Temizle",
+    "DateRange.empty": "Boş",
+    "DateRange.endDate": "Bitiş tarihi",
+    "DateRange.today": "Bugün",
+    "DeleteBoardDialog.confirm-cancel": "İptal",
+    "DeleteBoardDialog.confirm-delete": "Sil",
+    "DeleteBoardDialog.confirm-info": "“{boardTitle}” panosunu silmek istediğinize emin misiniz? Silme işlemi bu panodaki tüm kartları siler.",
+    "DeleteBoardDialog.confirm-info-template": "“{boardTitle}” pano kalıbını silmek istediğinize emin misiniz?",
+    "DeleteBoardDialog.confirm-tite": "Panoyu silmeyi onayla",
+    "DeleteBoardDialog.confirm-tite-template": "Pano kalıbını silmeyi onayla",
+    "Dialog.closeDialog": "Pencereyi kapat",
+    "EditableDayPicker.today": "Bugün",
+    "Error.mobileweb": "Mobil web desteği şu anda erken beta aşamasındadır. Tüm işlevler kullanılamıyor olabilir.",
+    "Error.websocket-closed": "Websoket bağlantısı kesildi. Bu sorun sürerse, sunucu ya da web vekil sunucu yapılandırmanızı denetleyin.",
+    "Filter.contains": "şunu içeren",
+    "Filter.ends-with": "şununla biten",
+    "Filter.includes": "şunu içeren",
+    "Filter.is": "şu olan",
+    "Filter.is-after": "şundan sonra",
+    "Filter.is-before": "şundan önce",
+    "Filter.is-empty": "boş olan",
+    "Filter.is-not-empty": "boş olmayan",
+    "Filter.is-not-set": "şuna ayarlanmamış olan",
+    "Filter.is-set": "şuna ayarlanmış olan",
+    "Filter.isafter": "şundan sonra",
+    "Filter.isbefore": "şundan önce",
+    "Filter.not-contains": "şunu içermeyen",
+    "Filter.not-ends-with": "şununla bitmeyen",
+    "Filter.not-includes": "şunu içermeyen",
+    "Filter.not-starts-with": "şununla başlamayan",
+    "Filter.starts-with": "şununla başlayan",
+    "FilterByText.placeholder": "metni süz",
+    "FilterComponent.add-filter": "+ Süzgeç ekle",
+    "FilterComponent.delete": "Sil",
+    "FilterValue.empty": "(boş)",
+    "FindBoardsDialog.IntroText": "Pano arama",
+    "FindBoardsDialog.NoResultsFor": "\"{searchQuery}\" için bir sonuç bulunamadı",
+    "FindBoardsDialog.NoResultsSubtext": "Yazımı denetleyin ya da başka bir arama yapmayı deneyin.",
+    "FindBoardsDialog.SubTitle": "Bulmak istediğiniz pano adını yazmaya başlayın. Gezinmek için <b>YUKAR/AŞAĞI</b>, seçmek için <b>ENTER</b>, vazgeçmek için <b>ESC</b> tuşlarını kullanın",
+    "FindBoardsDialog.Title": "Pano arama",
+    "GroupBy.hideEmptyGroups": "{count} boş grubu gizle",
+    "GroupBy.showHiddenGroups": "{count} gizli grubu görüntüle",
+    "GroupBy.ungroup": "Gruplamayı kaldır",
+    "HideBoard.MenuOption": "Panoyu gizle",
+    "KanbanCard.untitled": "Adlandırılmamış",
+    "MentionSuggestion.is-not-board-member": "(pano üyesi değil)",
+    "Mutator.new-board-from-template": "kalıptan yeni pano",
+    "Mutator.new-card-from-template": "kalıptan yeni kart oluştur",
+    "Mutator.new-template-from-card": "karttan yeni kalıp oluştur",
+    "OnboardingTour.AddComments.Body": "Sorunlar hakkında yorum yapabilir ve Mattermost kullanıcılarının dikkatini çekmek için @anabilirsiniz.",
+    "OnboardingTour.AddComments.Title": "Yorum yap",
+    "OnboardingTour.AddDescription.Body": "Takım arkadaşlarınızın kartın ne ile ilgili olduğunu anlaması için kartınıza bir açıklama ekleyin.",
+    "OnboardingTour.AddDescription.Title": "Açıklama ekle",
+    "OnboardingTour.AddProperties.Body": "Daha güçlü kılmak için kartlara çeşitli özellikler ekleyin.",
+    "OnboardingTour.AddProperties.Title": "Özellikler ekle",
+    "OnboardingTour.AddView.Body": "Farklı görünümler kullanarak panonuzu düzenleyecek yeni bir görünüm oluşturmak için buraya gidin.",
+    "OnboardingTour.AddView.Title": "Yeni bir görünüm ekle",
+    "OnboardingTour.CopyLink.Body": "Kartlarınızı takım arkadaşlarınızla paylaşmak için bağlantıyı kopyalayıp bir kanala, doğrudan iletiye veya grup iletisine yapıştırın.",
+    "OnboardingTour.CopyLink.Title": "Bağlantıyı kopyala",
+    "OnboardingTour.OpenACard.Body": "Panoların işinizi düzenlemenize yardımcı olabileceği güçlü yolları keşfetmek için bir kart açın.",
+    "OnboardingTour.OpenACard.Title": "Bir kart açın",
+    "OnboardingTour.ShareBoard.Body": "Panonuzu içeride, ekibiniz ile paylaşabilir ya da kuruluşunuzun dışında herkese açık olarak yayınlayabilirsiniz.",
+    "OnboardingTour.ShareBoard.Title": "Panoyu paylaş",
+    "PersonProperty.board-members": "Pano üyeleri",
+    "PersonProperty.me": "Benim",
+    "PersonProperty.non-board-members": "Pano üyesi olmayanlar",
+    "PropertyMenu.Delete": "Sil",
+    "PropertyMenu.changeType": "Özellik türünü değiştir",
+    "PropertyMenu.selectType": "Özellik türünü seçin",
+    "PropertyMenu.typeTitle": "Tür",
+    "PropertyType.Checkbox": "İşaret kutusu",
+    "PropertyType.CreatedBy": "Oluşturan",
+    "PropertyType.CreatedTime": "Oluşturulma zamanı",
+    "PropertyType.Date": "Tarih",
+    "PropertyType.Email": "E-posta",
+    "PropertyType.MultiPerson": "Çok kişi",
+    "PropertyType.MultiSelect": "Çoklu seçim",
+    "PropertyType.Number": "Sayı",
+    "PropertyType.Person": "Kişi",
+    "PropertyType.Phone": "Telefon",
+    "PropertyType.Select": "Seçin",
+    "PropertyType.Text": "Metin",
+    "PropertyType.Unknown": "Bilinmiyor",
+    "PropertyType.UpdatedBy": "Son güncelleyen",
+    "PropertyType.UpdatedTime": "Son güncelleme zamanı",
+    "PropertyType.Url": "Adres",
+    "PropertyValueElement.empty": "Boş",
+    "RegistrationLink.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
+    "RegistrationLink.copiedLink": "Kopyalandı!",
+    "RegistrationLink.copyLink": "Bağlantıyı kopyala",
+    "RegistrationLink.description": "Başkalarının hesap ekleyebilmesi için bu bağlantıyı paylaş:",
+    "RegistrationLink.regenerateToken": "Kodu yeniden oluştur",
+    "RegistrationLink.tokenRegenerated": "Kayıt bağlantısı yeniden oluşturuldu",
+    "ShareBoard.PublishDescription": "Web üzerinde herkese açık olarak \"salt okunur\" bir bağlantı yayınlayın ve paylaşın.",
+    "ShareBoard.PublishTitle": "Web üzerinde yayınla",
+    "ShareBoard.ShareInternal": "İçeride paylaş",
+    "ShareBoard.ShareInternalDescription": "İzni olan kullanıcılar bu bağlantıyı kullanabilecek.",
+    "ShareBoard.Title": "Panoyu paylaş",
+    "ShareBoard.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
+    "ShareBoard.copiedLink": "Kopyalandı!",
+    "ShareBoard.copyLink": "Bağlantıyı kopyala",
+    "ShareBoard.regenerate": "Kodu yeniden oluştur",
+    "ShareBoard.searchPlaceholder": "Kişi ve kanal arama",
+    "ShareBoard.teamPermissionsText": "{teamName} takımındaki herkes",
+    "ShareBoard.tokenRegenrated": "Kod yeniden oluşturuldu",
+    "ShareBoard.userPermissionsRemoveMemberText": "Üyelikten çıkar",
+    "ShareBoard.userPermissionsYouText": "(Siz)",
+    "ShareTemplate.Title": "Kalıbı paylaş",
+    "ShareTemplate.searchPlaceholder": "Kişi arama",
+    "Sidebar.about": "Focalboard hakkında",
+    "Sidebar.add-board": "+ Pano ekle",
+    "Sidebar.changePassword": "Parola değiştir",
+    "Sidebar.delete-board": "Panoyu sil",
+    "Sidebar.duplicate-board": "Panoyu kopyala",
+    "Sidebar.export-archive": "Arşivi dışa aktar",
+    "Sidebar.import": "İçe aktar",
+    "Sidebar.import-archive": "Arşivi içe aktar",
+    "Sidebar.invite-users": "Kullanıcıları çağır",
+    "Sidebar.logout": "Oturumu kapat",
+    "Sidebar.new-category.badge": "Yeni",
+    "Sidebar.new-category.drag-boards-cta": "Panoları sürükleyip buraya bırakın...",
+    "Sidebar.no-boards-in-category": "İçeride bir pano yok",
+    "Sidebar.product-tour": "Tanıtım turu",
+    "Sidebar.random-icons": "Rastgele simgeler",
+    "Sidebar.set-language": "Dili ayarla",
+    "Sidebar.set-theme": "Temayı ayarla",
+    "Sidebar.settings": "Ayarlar",
+    "Sidebar.template-from-board": "Panodan yeni kalıp",
+    "Sidebar.untitled-board": "(Adlandırılmamış pano)",
+    "Sidebar.untitled-view": "(Adlandırılmamış görünüm)",
+    "SidebarCategories.BlocksMenu.Move": "Şuraya taşı...",
+    "SidebarCategories.CategoryMenu.CreateNew": "Yeni kategori ekle",
+    "SidebarCategories.CategoryMenu.Delete": "Kategoriyi sił",
+    "SidebarCategories.CategoryMenu.DeleteModal.Body": "<b>{categoryName}</b> içindeki panolar Panolar kategorisine taşınacak. Herhangi bir panodan çıkarılmayacaksınız.",
+    "SidebarCategories.CategoryMenu.DeleteModal.Title": "Bu kategori silinsin mi?",
+    "SidebarCategories.CategoryMenu.Update": "Kategoriyi yeniden adlandır",
+    "SidebarTour.ManageCategories.Body": "Özel kategoriler oluşturun ve yönetin. Kategoriler kullanıcıya özeldir, bu nedenle bir panoyu kendi kategorinize taşımanız aynı panoyu kullanan diğer üyeleri etkilemez.",
+    "SidebarTour.ManageCategories.Title": "Kategori yönetimi",
+    "SidebarTour.SearchForBoards.Body": "Panoları hızlıca aramak ve yan çubuğunuza eklemek için pano değiştiriciyi (Cmd/Ctrl + K) açın.",
+    "SidebarTour.SearchForBoards.Title": "Pano arama",
+    "SidebarTour.SidebarCategories.Body": "Tüm panolarınızı artık yeni yan çubuğunuz altında bulabilirsiniz. Artık çalışma alanları arasında geçiş yapmanıza gerek yok. Önceki çalışma alanlarınıza göre eklenmiş tek seferlik özel kategoriler, 7.2 sürümüne güncellemenizin bir parçası olarak otomatik şekilde eklenmiş olabilir. Bunları isteğinize göre kaldırabilir ya da düzenleyebilirsiniz.",
+    "SidebarTour.SidebarCategories.Link": "Ayrıntılı bilgi alın",
+    "SidebarTour.SidebarCategories.Title": "Yan çubuk kategorileri",
+    "SiteStats.total_boards": "Toplam pano",
+    "SiteStats.total_cards": "Toplam kart",
+    "TableComponent.add-icon": "Simge ekle",
+    "TableComponent.name": "Ad",
+    "TableComponent.plus-new": "+ Yeni",
+    "TableHeaderMenu.delete": "Sil",
+    "TableHeaderMenu.duplicate": "Kopya oluştur",
+    "TableHeaderMenu.hide": "Gizle",
+    "TableHeaderMenu.insert-left": "Sola ekle",
+    "TableHeaderMenu.insert-right": "Sağa ekle",
+    "TableHeaderMenu.sort-ascending": "Artan sıralama",
+    "TableHeaderMenu.sort-descending": "Azalan sıralama",
+    "TableRow.DuplicateCard": "kartı kopyala",
+    "TableRow.MoreOption": "Diğer işlemler",
+    "TableRow.open": "Aç",
+    "TopBar.give-feedback": "Geri bildirimde bulunun",
+    "URLProperty.copiedLink": "Kopyalandı!",
+    "URLProperty.copy": "Kopyala",
+    "URLProperty.edit": "Düzenle",
+    "UndoRedoHotKeys.canRedo": "Yinele",
+    "UndoRedoHotKeys.canRedo-with-description": "{description} yinele",
+    "UndoRedoHotKeys.canUndo": "Geri al",
+    "UndoRedoHotKeys.canUndo-with-description": "{description} geri al",
+    "UndoRedoHotKeys.cannotRedo": "Yinelenecek bir işlem yok",
+    "UndoRedoHotKeys.cannotUndo": "Geri alınacak bir işlem yok",
+    "ValueSelector.noOptions": "Herhangi bir seçenek yok. İlk seçeneği eklemek için yazmaya başlayın!",
+    "ValueSelector.valueSelector": "Değer seçici",
+    "ValueSelectorLabel.openMenu": "Menüyü aç",
+    "VersionMessage.help": "Bu sürümdeki yeniliklere bakın.",
+    "VersionMessage.learn-more": "Ayrıntılı bilgi alın",
+    "View.AddView": "Görünüm ekle",
+    "View.Board": "Pano",
+    "View.DeleteView": "Görünümü sil",
+    "View.DuplicateView": "Görünümü kopyala",
+    "View.Gallery": "Galeri",
+    "View.NewBoardTitle": "Pano görünümü",
+    "View.NewCalendarTitle": "Takvim görünümü",
+    "View.NewGalleryTitle": "Galeri görünümü",
+    "View.NewTableTitle": "Tablo görünümü",
+    "View.NewTemplateDefaultTitle": "Adlandırılmamış kalıp",
+    "View.NewTemplateTitle": "Adlandırılmamış",
+    "View.Table": "Tablo",
+    "ViewHeader.add-template": "Yeni kalıp",
+    "ViewHeader.delete-template": "Sil",
+    "ViewHeader.display-by": "Görünüm: {property}",
+    "ViewHeader.edit-template": "Düzenle",
+    "ViewHeader.empty-card": "Boş kart",
+    "ViewHeader.export-board-archive": "Pano arşivini dışa aktar",
+    "ViewHeader.export-complete": "Dışa aktarıldı!",
+    "ViewHeader.export-csv": "CSV olarak dışa aktar",
+    "ViewHeader.export-failed": "Dışa aktarılamadı!",
+    "ViewHeader.filter": "Süz",
+    "ViewHeader.group-by": "Grupla: {property}",
+    "ViewHeader.new": "Yeni",
+    "ViewHeader.properties": "Özellikler",
+    "ViewHeader.properties-menu": "Özellikler menüsü",
+    "ViewHeader.search-text": "Kart arama",
+    "ViewHeader.select-a-template": "Bir kalıp seçin",
+    "ViewHeader.set-default-template": "Varsayılan olarak ata",
+    "ViewHeader.sort": "Sırala",
+    "ViewHeader.untitled": "Adlandırılmamış",
+    "ViewHeader.view-header-menu": "Başlık menüsünü görüntüle",
+    "ViewHeader.view-menu": "Menüyü görüntüle",
+    "ViewLimitDialog.Heading": "Bir panoyu görüntüleme sınırına ulaşıldı",
+    "ViewLimitDialog.PrimaryButton.Title.Admin": "Üst tarifeye geç",
+    "ViewLimitDialog.PrimaryButton.Title.RegularUser": "Yöneticiyi bilgilendir",
+    "ViewLimitDialog.Subtext.Admin": "Professional ya da Enterprise tarifemize geçin.",
+    "ViewLimitDialog.Subtext.Admin.PricingPageLink": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
+    "ViewLimitDialog.Subtext.RegularUser": "Yöneticinizi Professional ya da Enterprise tarifesine geçmesi hakkında bilgilendirin.",
+    "ViewLimitDialog.UpgradeImg.AltText": "üst tarifeye geçiş görseli",
+    "ViewLimitDialog.notifyAdmin.Success": "Yöneticiniz bilgilendirildi",
+    "ViewTitle.hide-description": "açıklamayı gizle",
+    "ViewTitle.pick-icon": "Simge seçin",
+    "ViewTitle.random-icon": "Rastgele",
+    "ViewTitle.remove-icon": "Simgeyi kaldır",
+    "ViewTitle.show-description": "açıklamayı görüntüle",
+    "ViewTitle.untitled-board": "Adlandırılmamış pano",
+    "WelcomePage.Description": "Pano, alışılmış Kanban panosu görünümünde takımların işleri tanımlamasını, düzenlemesini, izlemesi ve yönetmesini sağlayan bir proje yönetimi aracıdır.",
+    "WelcomePage.Explore.Button": "Tura çıkın",
+    "WelcomePage.Heading": "Panolara hoş geldiniz",
+    "WelcomePage.NoThanks.Text": "Hayır teşekkürler, kendim anlayacağım",
+    "WelcomePage.StartUsingIt.Text": "Kullanmaya başlayın",
+    "Workspace.editing-board-template": "Bir pano kalıbını düzenliyorsunuz.",
+    "badge.guest": "Konuk",
+    "boardPage.confirm-join-button": "Katıl",
+    "boardPage.confirm-join-text": "Bir özel kanala, pano yöneticisi tarafından açıkça eklenmeden katılmak üzeresiniz. Bu özel kanala katılmak istediğinize emin misiniz?",
+    "boardPage.confirm-join-title": "Özel kanala katıl",
+    "boardSelector.confirm-link-board": "Panoyu kanala bağla",
+    "boardSelector.confirm-link-board-button": "Evet, panoyu bağla",
+    "boardSelector.confirm-link-board-subtext": "\"{boardName}\" panosunu kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır. Bir pano ile bir kanalın bağlantısını istediğiniz zaman kaldırabilirsiniz.",
+    "boardSelector.confirm-link-board-subtext-with-other-channel": "\"{boardName}\" panosunu bir kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konukl üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
+    "boardSelector.create-a-board": "Bir pano ekle",
+    "boardSelector.link": "Bağlantı",
+    "boardSelector.search-for-boards": "Pano arama",
+    "boardSelector.title": "Panoları bağla",
+    "boardSelector.unlink": "Bağlantıyı kaldır",
+    "calendar.month": "Ay",
+    "calendar.today": "Bugün",
+    "calendar.week": "Hafta",
+    "centerPanel.undefined": "{propertyName} yok",
+    "centerPanel.unknown-user": "Kullanıcı bilinmiyor",
+    "cloudMessage.learn-more": "Ayrıntılı bilgi alın",
+    "createImageBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
+    "default-properties.badges": "Yorumlar ve açıklama",
+    "default-properties.title": "Başlık",
+    "error.back-to-home": "Girişe dön",
+    "error.back-to-team": "Takıma dön",
+    "error.board-not-found": "Pano bulunamadı.",
+    "error.go-login": "Oturum aç",
+    "error.invalid-read-only-board": "Bu panoya erişme izniniz yok. Panolara erişmek için oturum açın.",
+    "error.not-logged-in": "Oturumunuzun süresi dolmuş ya da oturum açmamışsınız. Panolara erişmek için yeniden oturum açın.",
+    "error.page.title": "Bir şeyler ters gitti",
+    "error.team-undefined": "Geçerli bir takım değil.",
+    "error.unknown": "Bir sorun çıktı.",
+    "generic.previous": "Önceki",
+    "guest-no-board.subtitle": "Henüz bu takımdaki herhangi bir panoya erişme izniniz yok. Lütfen biri sizi bir panoya ekleyene kadar bekleyin.",
+    "guest-no-board.title": "Henüz bir pano yok",
+    "imagePaste.upload-failed": "Dosya boyutu sınırı aşıldığından bazı dosyalar yüklenemedi.",
+    "limitedCard.title": "Kartlar gizli",
+    "login.log-in-button": "Oturum aç",
+    "login.log-in-title": "Oturum açın",
+    "login.register-button": "ya da hesabınız yoksa bir hesap açın",
+    "new_channel_modal.create_board.empty_board_description": "Yeni boş bir pano oluştur",
+    "new_channel_modal.create_board.empty_board_title": "Boş pano",
+    "new_channel_modal.create_board.select_template_placeholder": "Bir kalıp seçin",
+    "new_channel_modal.create_board.title": "Bu kanal için bir pano oluştur",
+    "notification-box-card-limit-reached.close-tooltip": "10 gün için sustur",
+    "notification-box-card-limit-reached.contact-link": "yöneticinizi bilgilendirin",
+    "notification-box-card-limit-reached.link": "Ücretli bir tarifeye geçin",
+    "notification-box-card-limit-reached.title": "panoda {cards} kart gizli",
+    "notification-box-cards-hidden.title": "Bu işlem başka bir kartı gizledi",
+    "notification-box.card-limit-reached.not-admin.text": "Arşivlenmiş kartlara erişmek için {contactLink} ile görüşerek ücretli bir tarifeye geçmesini isteyin.",
+    "notification-box.card-limit-reached.text": "Kart sınırına ulaşıldı. Eski kartları görüntülemek için {link}",
+    "person.add-user-to-board": "{username} kullanıcısını panoya ekle",
+    "person.add-user-to-board-confirm-button": "Panoya ekle",
+    "person.add-user-to-board-permissions": "İzinler",
+    "person.add-user-to-board-question": "{username} kullanıcısını panoya eklemek ister misiniz?",
+    "person.add-user-to-board-warning": "{username} panonun bir üyesi değil ve pano ile ilgili herhangi bir bildirim almayacak.",
+    "register.login-button": "ya da bir hesabınız varsa oturum açın",
+    "register.signup-title": "Hesap açın",
+    "rhs-board-non-admin-msg": "Panonun yöneticilerinden değilsiniz",
+    "rhs-boards.add": "Ekle",
+    "rhs-boards.dm": "Dİ",
+    "rhs-boards.gm": "Gİ",
+    "rhs-boards.header.dm": "bu doğrudan ileti",
+    "rhs-boards.header.gm": "bu grup iletisi",
+    "rhs-boards.last-update-at": "Son güncelleme: {datetime}",
+    "rhs-boards.link-boards-to-channel": "Panoları {channelName} kanalına bağla",
+    "rhs-boards.linked-boards": "Bağlı panolar",
+    "rhs-boards.no-boards-linked-to-channel": "Henüz {channelName} kanalına bağlanmış bir pano yok",
+    "rhs-boards.no-boards-linked-to-channel-description": "Panolar, takımlar arasındaki çalışmaları tanımlamak, organize etmek, izlemek ve yönetmek için kullanılabilen kandan panosuna benzer bir proje yönetimi aracıdır.",
+    "rhs-boards.unlink-board": "Panonun bağlantısını kaldır",
+    "rhs-boards.unlink-board1": "Pano bağlantısını kaldır",
+    "rhs-channel-boards-header.title": "Panolar",
+    "share-board.publish": "Yayınla",
+    "share-board.share": "Paylaş",
+    "shareBoard.channels-select-group": "Kanallar",
+    "shareBoard.confirm-change-team-role.body": "Bu panoda izinleri \"{role}\" rolünden daha aşağıda olan herkes <b>{role} rolüne yükseltilecek</b>. Panonunen düşük rolünü değiştirmek istediğinize emin misiniz?",
+    "shareBoard.confirm-change-team-role.confirmBtnText": "Panonun en düşük rolünü değiştir",
+    "shareBoard.confirm-change-team-role.title": "Panonun en düşük rolünü değiştir",
+    "shareBoard.confirm-link-channel": "Panoyu kanala bağla",
+    "shareBoard.confirm-link-channel-button": "Kanalı bağla",
+    "shareBoard.confirm-link-channel-button-with-other-channel": "Eski bağlantıyı kes ve bu kanala bağla",
+    "shareBoard.confirm-link-channel-subtext": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.",
+    "shareBoard.confirm-link-channel-subtext-with-other-channel": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
+    "shareBoard.confirm-unlink.body": "Bir kanalın bir pano ile bağlantısını kaldırdığınızda, kanalın tüm üyeleri (var olan ve yeni), kendilerine özel olarak izin verilmedikçe, panoya erişimi kaybeder.",
+    "shareBoard.confirm-unlink.confirmBtnText": "Kanalın bağlantısını kaldır",
+    "shareBoard.confirm-unlink.title": "Kanalın pano ile bağlantısı kaldır",
+    "shareBoard.lastAdmin": "Panoların en az bir yöneticisi olmalıdır",
+    "shareBoard.members-select-group": "Üyeler",
+    "shareBoard.unknown-channel-display-name": "Kanal bilinmiyor",
+    "tutorial_tip.finish_tour": "Tamam",
+    "tutorial_tip.got_it": "Anladım",
+    "tutorial_tip.ok": "Sonraki",
+    "tutorial_tip.out": "Bu ipuçları görüntülenmesin.",
+    "tutorial_tip.seen": "Daha önce gördünüz mü?"
 }
diff --git a/webapp/channels/src/i18n/tr.json b/webapp/channels/src/i18n/tr.json
index a5b8b0537a..a442629a8d 100644
--- a/webapp/channels/src/i18n/tr.json
+++ b/webapp/channels/src/i18n/tr.json
@@ -254,14 +254,25 @@
   "admin.billing.company_info_edit.sameAsBillingAddress": "Fatura adresi ile aynı",
   "admin.billing.company_info_edit.save": "Bilgileri kaydet",
   "admin.billing.company_info_edit.title": "Kuruluş bilgilerini düzenle",
+  "admin.billing.deleteWorkspace.failureModal.buttonText": "Yeniden dene",
+  "admin.billing.deleteWorkspace.failureModal.subtitle": "Çalışma alanınız silinirken bir sorun çıktı. Lütfen yeniden deneyin ya da destek ekibiyle görüşün.",
+  "admin.billing.deleteWorkspace.failureModal.title": "Çalışma alanı silinemedi",
+  "admin.billing.deleteWorkspace.progressModal.title": "Çalışma alanınız siliniyor",
+  "admin.billing.deleteWorkspace.resultModal.ContactSupport": "Destek ekibi ile görüşün",
+  "admin.billing.deleteWorkspace.successModal.subtitle": "Çalışma alanınız silindi. Müşterimiz olduğunuz için teşekkür ederiz.",
+  "admin.billing.deleteWorkspace.successModal.title": "Çalışma alanınız silindi",
   "admin.billing.history.allPaymentsShowHere": "Tüm faturalanınız burada görüntülenir",
   "admin.billing.history.date": "Tarih",
   "admin.billing.history.description": "Açıklama",
+  "admin.billing.history.fractionalAndRatedSeats": "{fractionalSeats} koltuk ölçüldü. {fullSeats} tam ücretli koltuk, {partialSeats} bir kısmı ücretli koltuk",
+  "admin.billing.history.fractionalSeats": "{fractionalUsers} koltuk",
   "admin.billing.history.noBillingHistory": "Gelecekte, fatura geçmişiniz burada görüntülenecek.",
+  "admin.billing.history.onPremSeats": "{num} koltuk",
   "admin.billing.history.pageInfo": "{startRecord} - {endRecord} / {totalRecords}",
   "admin.billing.history.paid": "Ödendi",
   "admin.billing.history.paymentFailed": "Ödenmedi",
   "admin.billing.history.pending": "Bekliyor",
+  "admin.billing.history.seatsAndRates": "{fullUsers} tam ücretli koltuk, {partialUsers} bir kısmı ücretli koltuk",
   "admin.billing.history.seeHowBillingWorks": "Faturalama hakkında bilgi alın",
   "admin.billing.history.status": "Durum",
   "admin.billing.history.title": "Faturalama geçmişi",
@@ -288,6 +299,7 @@
   "admin.billing.purchaseModal.savedPaymentDetailsTitle": "Kaydedilmiş ödeme bilgileriniz",
   "admin.billing.subscription.LearnMore": "Ayrıntılı bilgi alın",
   "admin.billing.subscription.billedFrom": "Fatura dönemi başlangıcınız: {beginDate}",
+  "admin.billing.subscription.byClickingYouAgree": "{buttonContent} üzerine tıklayarak, <linkAgreement>{legalText}</linkAgreement> metnini kabul etmiş olursunuz",
   "admin.billing.subscription.cancelSubscriptionSection.contactUs": "Bizimle görüşün",
   "admin.billing.subscription.cancelSubscriptionSection.description": "Şu anda bir çalışma alanı yalnızca bir müşteri hizmetleri temsilcisi ile görüşerek silinebilir.",
   "admin.billing.subscription.cancelSubscriptionSection.title": "Aboneliğinizi iptal edin",
@@ -298,10 +310,24 @@
   "admin.billing.subscription.cloudTrial.subscribeButton": "Üst tarifeye geç",
   "admin.billing.subscription.cloudTrialBadge.daysLeftOnTrial": "Ücretsiz deneme için {daysLeftOnTrial} gün kaldı",
   "admin.billing.subscription.cloudYearlyBadge": "Yıllık",
+  "admin.billing.subscription.complianceScreenFailed.button": "Cloud Free ile ilerle",
+  "admin.billing.subscription.complianceScreenFailed.subtitle": "Kontrollerimizi yapacağız ve Cloud aboneliğinizin yükseltilmesini onaylandıktan sonra 3 gün içinde size geri döneceğiz. Bu arada, lütfen ürünümüzün ücretsiz sürümünü kullanmayı sürdürmekten çekinmeyin.",
+  "admin.billing.subscription.complianceScreenFailed.title": "İşleminiz inceleniyor",
+  "admin.billing.subscription.complianceScreenShippingSameAsBilling": "Gönderim adresim fatura adresimle aynı",
   "admin.billing.subscription.constCloudCard.contactSupport": "Destek ekibi ile görüşün",
   "admin.billing.subscription.creditCardExpired": "Kredi kartınızın kullanma süresi bitmiş. Sorun çıkmaması için ödeme bilgilerinizi güncelleyin.",
   "admin.billing.subscription.creditCardHasExpired": "Kredi kartınızın kullanma süresi bitmiş",
   "admin.billing.subscription.creditCardHasExpired.description": "Lütfen sorun çıkmaması için <link>ödeme bilgilerinizi güncelleyin</link>.",
+  "admin.billing.subscription.deleteWorkspaceModal.cancelButton": "Aboneliği sürdür",
+  "admin.billing.subscription.deleteWorkspaceModal.deleteButton": "Çalışma alanını sil",
+  "admin.billing.subscription.deleteWorkspaceModal.downgradeButton": "Free tarifesine indir",
+  "admin.billing.subscription.deleteWorkspaceModal.title": "Silmek istediğinize emin misiniz?",
+  "admin.billing.subscription.deleteWorkspaceModal.usage": "Ücretli Mattermost {sku} aboneliğinizin bir parçası olarak şunu elde ettiniz ",
+  "admin.billing.subscription.deleteWorkspaceModal.usageDetails": "{messageCount} ileti ve {fileSize} dosya",
+  "admin.billing.subscription.deleteWorkspaceModal.warning": "Çalışma alanınızı silmek kalıcı bir işlemdir. Silme işleminin ardından, yukarıdakilerin tümünü kurtarılamayacak şekilde kaybedersiniz. Free sürümüne geçerseniz bu bilgileri kaybetmezsiniz.",
+  "admin.billing.subscription.deleteWorkspaceSection.delete": "Çalışma alanını sil",
+  "admin.billing.subscription.deleteWorkspaceSection.description": "{workspaceLink} kalıcı olarak silinir ve geri alınamaz.",
+  "admin.billing.subscription.deleteWorkspaceSection.title": "Çalışma alanınızı silin",
   "admin.billing.subscription.downgradedSuccess": "{productName} tarifesine abone oldunuz",
   "admin.billing.subscription.downgrading": "Çalışma alanınız alt tarifeye geçiriliyor",
   "admin.billing.subscription.featuresAvailable": "{productName} özellikleri açıldı ve kullanıma hazır.",
@@ -370,6 +396,7 @@
   "admin.billing.subscription.providePaymentDetails": "Ödeme bilgilerinizi yazın",
   "admin.billing.subscription.returnToTeam": "{team} takımına geri dön",
   "admin.billing.subscription.stateprovince": "İl/Bölge",
+  "admin.billing.subscription.switchedToAnnual.title": "Yıllık {selectedProductName} aboneliğine geçtiniz",
   "admin.billing.subscription.title": "Abonelik",
   "admin.billing.subscription.updatePaymentInfo": "Ödeme bilgilerini güncelle",
   "admin.billing.subscription.upgradedSuccess": "{productName} tarifesine geçtiniz",
@@ -384,6 +411,8 @@
   "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "Ödendi",
   "admin.billing.subscriptions.billing_summary.lastInvoice.partialCharges": "Kısmi ödemeler",
   "admin.billing.subscriptions.billing_summary.lastInvoice.pending": "Bekliyor",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCount": " x {seats} koltuk",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCountPartial": "{seats} koltuk",
   "admin.billing.subscriptions.billing_summary.lastInvoice.seeBillingHistory": "Faturalama geçmişine bakın",
   "admin.billing.subscriptions.billing_summary.lastInvoice.taxes": "Vergiler",
   "admin.billing.subscriptions.billing_summary.lastInvoice.title": "Son fatura",
@@ -1151,7 +1180,7 @@
   "admin.jobTable.headerExtraInfo": "Ayrıntılar",
   "admin.jobTable.headerFiles": "Dosyalar",
   "admin.jobTable.headerFinishAt": "Bitiş zamanı",
-  "admin.jobTable.headerRunTime": "Başlangıç zamanı",
+  "admin.jobTable.headerRunTime": "Çalışma süresi",
   "admin.jobTable.headerStatus": "Durum",
   "admin.jobTable.jobId": "Görev kodu: ",
   "admin.jobTable.lastActivityAt": "Son işlem: ",
@@ -1310,6 +1339,7 @@
   "admin.license.title": "Paket ve lisans",
   "admin.license.trial-request.accept-terms": "<strong>Denemeyi başlat</strong> üzerine tıklayarak, <linkEvaluation>Mattermost yazılım değerlendirme sözleşmesi</linkEvaluation> ve <linkPrivacy>kişisel verilerin gizliliği ilkesini</linkPrivacy> metinlerini ve ürün ile ilgili e-postaları almayı kabul ediyorum.",
   "admin.license.trial-request.embargoed": "Ambargo altındaki ülkelere uygulanan kısıtlamalar nedeniyle istek işlenemedi.<link>Belgeler bölümünden ayrıntılı bilgi alabilir</link> ya da ihracat sınırlamaları ile ilgili sorularınız için legal@mattermost.com adresine yazabilirsiniz.",
+  "admin.license.trial-request.embargoed.button": "Kapat",
   "admin.license.trial-request.startTrial": "Denemeyi başlat",
   "admin.license.trial-request.title": "Mattermost Enterprise paketi özelliklerini gelecek 30 gün süreyle ücretsiz olarak deneyebilirsiniz. Herhangi bir taahhüt ya da kredi kartı bilgileri vermeniz gerekmez. ",
   "admin.license.trialCard.contactSales": "Satış ekibi ile görüşün",
@@ -1329,6 +1359,7 @@
   "admin.license.upload-modal.file": "Dosya",
   "admin.license.upload-modal.subtitle": "Bu sunucuyu üst tarifeye geçirmek için bir Mattermost Enterprise paketi lisans anahtarı yükleyin. ",
   "admin.license.upload-modal.successfulUpgrade": "Üst tarifeye geçildi!",
+  "admin.license.upload-modal.successfulUpgradeText": "{licensedUsersNum, number} koltuk için {skuName} tarifesine yükselttiniz. {startsAt} ile {expiresAt} tarihleri arasında geçerli olacak. ",
   "admin.license.upload-modal.title": "Bir lisans anahtarı yükleyin",
   "admin.license.uploadFile": "Dosya yükle",
   "admin.license.warn.renew": "Yenile",
@@ -1353,7 +1384,17 @@
   "admin.log.locationPlaceholder": "Dosya konumunu yazın",
   "admin.log.locationTitle": "Günlüğü kayıtları dosyası klasörü:",
   "admin.log.logLevel": "Günlük kayıtlarının düzeyi",
+  "admin.logs.Alllevels": "Tüm düzeyler",
+  "admin.logs.Debug": "Hata ayıklama",
+  "admin.logs.Error": "Hata",
+  "admin.logs.Info": "Bilgiler",
+  "admin.logs.ReloadLogs": "Günlükleri yeniden yükle",
+  "admin.logs.Warn": "Uyar",
   "admin.logs.bannerDesc": "Kullanıcıları kullanıcı kodu ya da erişim koduna göre aramak için Kullanıcı yönetimi > Kullanıcılar bölümüne giderek arama süzgecine kodu yapıştırın.",
+  "admin.logs.caller": "Arayan",
+  "admin.logs.fullEvent": "Tam günlük olayı",
+  "admin.logs.options": "Seçenekler",
+  "admin.logs.showErrors": "Son {n} hatayı görüntüle",
   "admin.logs.title": "Sunucu günlükleri",
   "admin.manage_roles.additionalRoles": "Hesap için ek izinleri ayarlayın. <link>Rol ve izinler hakkında ayrıntılı bilgi alın</link>.",
   "admin.manage_roles.allowUserAccessTokens": "Bu hesaba <link>kişisel erişim kodları</link> üretme izni verin.",
@@ -1437,6 +1478,8 @@
   "admin.openid.off": "Bir OpenID hizmet sağlayıcısı ile oturum açılmasına izin verilmesin.",
   "admin.openid.office365": "Office 365",
   "admin.openid.select": "Hizmet sağlayıcıyı seçin:",
+  "admin.openid_custom_feature_discovery.copy": "Apple, Okta, OneLogin ve benzer OIDC özellik kümesini destekleyen bir hizmet ile kimlik doğrulama ve tek oturum açma (SSO) işlemleri için OpenID Connect kullanın.",
+  "admin.openid_custom_feature_discovery.title": "Mattermost Professional ile OpenID Connect bütünleştirmesini kullanın",
   "admin.openid_feature_discovery.copy": "Google, Office 365, Apple, Okta, OneLogin ve benzer OIDC özellik kümesini destekleyen bir hizmet ile kimlik doğrulama ve tek oturum açma (SSO) işlemleri için OpenID Connect kullanın.",
   "admin.openid_feature_discovery.title": "Mattermost Professional ile OpenID Connect bütünleştirmesini kullanın",
   "admin.password.lowercase": "En az bir küçük harf",
@@ -1491,7 +1534,7 @@
   "admin.permissions.group.reactions.description": "İleti tepkileri ekleyebilir ve silebilir.",
   "admin.permissions.group.reactions.name": "İleti tepkileri verebilsin",
   "admin.permissions.group.runs.description": "Oyun yönetimi.",
-  "admin.permissions.group.runs.name": "Çalıştırma yönetimi",
+  "admin.permissions.group.runs.name": "Oyunları yönetme",
   "admin.permissions.group.send_invites.description": "Takım üyeleri ekleyebilir, e-posta çağrısı gönderebilir ve takıma çağırma bağlantısı paylaşabilir.",
   "admin.permissions.group.send_invites.name": "Takım üyeleri ekleyebilsin",
   "admin.permissions.group.teams.description": "Takım ekleyebilir ve üyeleri yönetebilir.",
@@ -1615,7 +1658,7 @@
   "admin.permissions.permission.revoke_user_access_token.description": "Kullanıcı erişim kodunu geri alabilir",
   "admin.permissions.permission.revoke_user_access_token.name": "Kullanıcı erişim kodunu geri alabilsin",
   "admin.permissions.permission.run_create.description": "Senaryoları oyna.",
-  "admin.permissions.permission.run_create.name": "Çalıştırma oluştur",
+  "admin.permissions.permission.run_create.name": "Oyunlar oluşturma",
   "admin.permissions.permission.upload_file.description": "Dosya yükleyebilir",
   "admin.permissions.permission.upload_file.name": "Dosya yükleyebilsin",
   "admin.permissions.permission.use_channel_mentions.description": "Kanal üyelerini @all, @channel ve @here ile anabilir",
@@ -1946,6 +1989,8 @@
   "admin.requestButton.requestFailure": "Sınama başarısız: {error}",
   "admin.requestButton.requestSuccess": "Sınama başarılı",
   "admin.reset_email.cancel": "İptal",
+  "admin.reset_email.currentPassword": "Geçerli parola",
+  "admin.reset_email.missing_current_password": "Lütfen geçerli parolanızı yazın.",
   "admin.reset_email.newEmail": "Yeni e-posta",
   "admin.reset_email.reset": "Sıfırla",
   "admin.reset_email.titleReset": "E-posta adresini güncelle",
@@ -2060,6 +2105,11 @@
   "admin.saml_feature_discovery.title": "Mattermost Professional, SAML bütünleştirmesi",
   "admin.saving": "Yapılandırma kaydediliyor...",
   "admin.security.password": "Parola",
+  "admin.server_logs.CopyLog": "Günlüğü kopyala",
+  "admin.server_logs.DataCopied": "Veriler kopyalandı",
+  "admin.server_logs.Export": "Dışa aktar",
+  "admin.server_logs.Exported": "Dışa aktarıldı",
+  "admin.server_logs.LogEvent": "Günlük olayı",
   "admin.service.CorsDebugLabel": "Kaynaklar arası istekler hata ayıklaması:",
   "admin.service.attemptDescription": "Bir kullanıcının kilitlenmeden ve e-posta ile parolasını sıfırlaması istenilmeden önce deneyebileceği oturum açma girişimi sayısı.",
   "admin.service.attemptExample": "Örnek: \"10\"",
@@ -2077,7 +2127,7 @@
   "admin.service.corsExposedHeadersTitle": "Kaynaklar arası isteklerin açıktaki üst bilgileri:",
   "admin.service.corsHeadersEx": "X-Üst-Bilgilerim",
   "admin.service.corsTitle": "Şuradan gelen kaynaklar arası istekler alınsın:",
-  "admin.service.developerDesc": "Bu seçenek etkinleştirildiğinde, JavaScript hataları kullanıcı arayüzünün üst bölümünde mor bir çubuk içinde görüntülenir. Üretim ortamında kullanılması önerilmez. ",
+  "admin.service.developerDesc": "Bu seçenek etkinleştirildiğinde, JavaScript hataları kullanıcı arayüzünün üst bölümünde mor bir çubuk içinde görüntülenir. Üretim ortamında kullanılması önerilmez.",
   "admin.service.developerTitle": "Geliştirici kipi kullanılsın: ",
   "admin.service.disableBotOwnerDeactivatedTitle": "Sahibi devre dışı bırakılan bot hesapları devre dışı bırakılsın:",
   "admin.service.disableBotWhenOwnerIsDeactivated": "Bir kullanıcı devre dışı bırakıldığında bu kullanıcı tarafından yönetilen tüm bot hesapları devre dışı bırakılır. Bot hesaplarını [Bütünleştirmeler > Bot hesapları]({siteURL}/_redirect/integrations/bots) bölümünden yeniden etkinleştirebilirsiniz.",
@@ -2513,6 +2563,9 @@
   "admin.webserverModeUncompressed": "Sıkıştırılmamış",
   "admin.webserverModeUncompressedDescription": "Mattermost sunucusu durağan dosyaları sıkıştırılmamış olarak sunar.",
   "admin_settings.save_unsaved_changes": "Lütfen önce yapılmış değişiklikleri kaydedin",
+  "air_gapped_modal.close": "Kapat",
+  "air_gapped_modal.description": "Denemenizi başlatmak için {link} adresini açarak bir deneme anahtarı isteyin.",
+  "air_gapped_modal.title": "Bir deneme anahtarı isteyin",
   "alert_banner.tooltipCloseBtn": "Kapat",
   "analytics.chart.loading": "Yükleniyor...",
   "analytics.chart.meaningful": "Anlamlı bir gösterim için veriler yeterli değil.",
@@ -2526,6 +2579,7 @@
   "analytics.system.postTypes": "İletiler, dosyalar ve hashtaglar",
   "analytics.system.privateGroups": "Özel kanallar",
   "analytics.system.publicChannels": "Herkese açık kanallar",
+  "analytics.system.seatsPurchased": "Ücreti ödenmiş koltuk sayısı",
   "analytics.system.skippedIntensiveQueries": "En iyi başarımı elde etmek için bazı istatistikler devre dışı bırakılmıştır. Bu istatistikleri <link>config.json içinden etkinleştirebilirsiniz</link>.",
   "analytics.system.textPosts": "Yalnızca metin içeren iletiler",
   "analytics.system.title": "Sistem istatistikleri",
@@ -2545,6 +2599,7 @@
   "analytics.team.activeUsers": "İleti yazmış etkin kullanıcılar",
   "analytics.team.newlyCreated": "Yeni eklenen kullanıcılar",
   "analytics.team.noTeams": "Bu sunucuda istatistikleri görüntülenebilecek bir takım yok.",
+  "analytics.team.overageUsersSeats": "Bu, ücreti ödenmiş koltuk sayısını aşıyor",
   "analytics.team.privateGroups": "Özel kanallar",
   "analytics.team.publicChannels": "Herkese açık kanallar",
   "analytics.team.recentUsers": "Son etkin kullanıcılar",
@@ -2596,6 +2651,7 @@
   "app.channel.post_update_channel_purpose_message.removed": "{username} kanal amacını kaldırdı (önceki: {old})",
   "app.channel.post_update_channel_purpose_message.updated_from": "{username}, {old} eski kanal amacını {new} olarak değiştirdi",
   "app.channel.post_update_channel_purpose_message.updated_to": "{username} kanal amacını {new} olarak güncelledi",
+  "app_bar.marketplace": "Uygulama mağazası",
   "apps.error": "Hata: {error}",
   "apps.error.command.field_missing": "Zorunlu alan eksik: `{fieldName}`.",
   "apps.error.command.same_channel": "`{fieldName}`alanında kanal yineleniyor: `{option}`.",
@@ -2711,6 +2767,8 @@
   "authorize.app": "**{appName}** uygulaması temel bilgilerinize erişip değiştirebilecek.",
   "authorize.deny": "Reddet",
   "authorize.title": "**{appName}** uygulamasının **Mattermost** kullanıcı hesabınızla bağlantı kurmasına izin verin",
+  "autoShowLinkedBoard.tutorialTip.description": "Kanban panoları ve tabloları yardımıyla görevleri yönetin, acil işleri planlayın, işleri ayaküstü dağıtın.",
+  "autoShowLinkedBoard.tutorialTip.title": "Kanban panolarını kanallarla ilişkilendirin",
   "avatars.overflowUnnamedOnly": "{overflowUnnamedCount, plural, =1 {bir diğer} other {# diğer}}",
   "avatars.overflowUsers": "{overflowUnnamedCount, plural, =0 {{names}} =1 {{names} ve bir diğer} other {{names} ve # diğer}}",
   "backstage_list.search": "Arama",
@@ -2989,6 +3047,7 @@
   "cloud_delinquency.cc_modal.card.totalOwed": "Toplam borç",
   "cloud_delinquency.cc_modal.card.viewBreakdown": "Dağılımı görüntüle",
   "cloud_delinquency.cc_modal.disclaimer": "Aboneliğinizi yeniden etkinleştirdiğinizde, ödenmemiş toplam tutar hemen faturalandırılır. Faturanız, faturalama döneminin sonunda etkin kullanıcı sayısına göre hesaplanır. {seeHowBillingWorks}",
+  "cloud_delinquency.cc_modal.disclaimer_with_upgrade_info": "Aboneliğinizi yeniden etkinleştirdiğinizde, ödenmemiş toplam tutar hemen faturalanır. Ayrıca {users} kullanıcılarından oluşan etkin kullanıcı sayınıza bağlı olarak 1 yıllık abonelik için de {cost} faturalanır. {seeHowBillingWorks}",
   "cloud_delinquency.modal.re_activate_plan": "{planName} tarifesini yeniden etkinleştir",
   "cloud_delinquency.modal.stay_on_freemium": "Mattermost Free tarifesinde kal",
   "cloud_delinquency.modal.stay_on_freemium_close": "Kapat",
@@ -3109,7 +3168,7 @@
   "create_team.team_url.charLength": "Ad {min} ile {max} karakterden oluşabilir",
   "create_team.team_url.creatingTeam": "Takım ekleniyor...",
   "create_team.team_url.finish": "Bitti",
-  "create_team.team_url.hint1": "Kısa ve kolay hatırlanır olması iyidir",
+  "create_team.team_url.hint1": "Kısa ve kolay anımsanabilir olması iyidir",
   "create_team.team_url.hint2": "Küçük harf, rakam ve tire karakterlerini kullanabilirsiniz",
   "create_team.team_url.hint3": "Bir harf ile başlamalıdır ve tire ile bitemez",
   "create_team.team_url.regex": "Yalnızca küçük harf, rakam ve tire kullanın. Bir harf ile başlamalı ve tire ile bitmemelidir.",
@@ -3168,6 +3227,7 @@
   "delete_post.post": "İleti",
   "delete_post.question": "Bu {term} ögesini silmek istediğinize emin misiniz?",
   "delete_post.warning": "Bu iletiye {count, number} {count, plural, one {yorum} other {yorum}} yapılmış.",
+  "delete_success_modal.button_text": "mattermost.com sitesine git",
   "demote_to_user_modal.demote": "Rolü indir",
   "demote_to_user_modal.desc": "Bu işlem {username} hesabını konuk rolüne indirecek. Kullanıcı yalnızca herkese açık kanallara katılabilecek ve şu anda üyesi olduğu kanalların dışındaki kullanıcılar ile etkileşimde bulunamayacak. {username} kullanıcısını konuk rolüne indirmek istediğinize emin misiniz?",
   "demote_to_user_modal.title": "{username} kullanıcısını konuk rolüne indir",
@@ -3333,6 +3393,22 @@
   "feature_restricted_modal.agreement": "<highlight>{trialLength} günlük ücretsiz deneme</highlight> süresini başlatarak, <linkEvaluation>Mattermost yazılım değerlendirme sözleşmesi</linkEvaluation> ve <linkPrivacy>Gizlilik ilkesi</linkPrivacy> metinleri ile ürün tanıtımı e-postalarını almayı kabul ediyorum.",
   "feature_restricted_modal.button.notify": "Yöneticiyi bilgilendir",
   "feature_restricted_modal.button.plans": "Tarifeleri görüntüle",
+  "feedback.cancelButton.text": "İptal",
+  "feedback.deleteWorkspace.feedbackHosting": "Kendi Mattermost kopyamı barındırmaya geçiyorum (self-hosted)",
+  "feedback.deleteWorkspace.feedbackMistake": "Yanlışlıkla bir çalışma alanı oluşturdum",
+  "feedback.deleteWorkspace.feedbackMoving": "Farklı bir çözüm kullanmaya geçiyorum",
+  "feedback.deleteWorkspace.feedbackNoValue": "Artık değdiğini düşünmüyorum",
+  "feedback.deleteWorkspace.feedbackPlaceholder": "Lütfen neden sildiğinizi bize iletin",
+  "feedback.deleteWorkspace.feedbackTitle": "Lütfen silme nedeninizi paylaşın",
+  "feedback.deleteWorkspace.submitText": "Çalışma alanını sil",
+  "feedback.downgradeWorkspace.downgrade": "Alt tarifeye geç",
+  "feedback.downgradeWorkspace.exploringOptions": "Başka çözümleri değerlendiriyorum",
+  "feedback.downgradeWorkspace.feedbackTitle": "Lütfen alt tarifeye geçme nedeninizi açıklayın",
+  "feedback.downgradeWorkspace.noLongerNeeded": "Cloud Professional özelliklerine artık gerek duymuyorum",
+  "feedback.downgradeWorkspace.technicalIssues": "Teknik sorunlar yaşadım",
+  "feedback.downgradeWorkspace.tellUsWhy": "Lütfen bize alt tarifeye geçme nedeninizi iletin",
+  "feedback.downgradeWorkspace.tooExpensive": "Çok pahalı",
+  "feedback.other": "Diğer",
   "file_attachment.thumbnail": "dosya küçük görseli",
   "file_info_preview.size": "Boyut ",
   "file_info_preview.type": "Dosya türü ",
@@ -3344,7 +3420,7 @@
   "file_search_result_item.more_actions": "Diğer işlemler",
   "file_search_result_item.open_in_channel": "Kanalda aç",
   "file_upload.disabled": "Dosya ekleme devre dışı bırakılmış.",
-  "file_upload.drag_folder": "Klasörler yüklenemez. Lütfen tüm dosyaları ayrı ayrı sürükleyip bırakın.",
+  "file_upload.drag_folder": "Klasörler yüklenemedi. Lütfen tüm dosyaları tek tek sürükleyip bırakın.",
   "file_upload.fileAbove": "{max} MB boyutundan büyük dosyalar yüklenemez: {filename}",
   "file_upload.filesAbove": "{max} MB boyutundan büyük dosyalar yüklenemez: {filenames}",
   "file_upload.generic_error": "Dosyalarınız yüklenirken bir sorun çıktı.",
@@ -3364,6 +3440,9 @@
   "filtered_user_list.userStatus": "Kullanıcı durumu:",
   "flag_post.flag": "Kaydet",
   "flag_post.unflag": "Kaydedilmişlerden kaldır",
+  "footer_pagination.count": "{startCount, number}-{endCount, number} / {total, number} gösteriliyor",
+  "footer_pagination.next": "Sonraki",
+  "footer_pagination.prev": "Önceki",
   "forward_post_button.label": "İlet",
   "forward_post_modal.button.cancel": "İptal",
   "forward_post_modal.button.forward": "İlet",
@@ -3485,7 +3564,7 @@
   "get_app.openingLink": "Bağlantı Mattermost içinde açılıyor...",
   "get_app.openingLinkWhiteLabel": "Bağlantı {appName} ile açılıyor...",
   "get_app.redirectedInMoments": "Kısa süre içinde yönlendirileceksiniz.",
-  "get_app.rememberMyPreference": "Bilgilerim hatırlansın",
+  "get_app.rememberMyPreference": "Seçimim anımsansın",
   "get_app.systemDialogMessage": "Masaüstü uygulamasında görüntüle",
   "get_app.systemDialogMessageMobile": "Uygulamada görüntüle",
   "get_link.clipboard": " Bağlantı kopyalandı",
@@ -3708,14 +3787,14 @@
   "insights.topDMs.totalMessages": "Toplam ileti",
   "insights.topDMs.user": "Kullanıcı",
   "insights.topPlaybooks.lastRun": "Son kullanılma: {relativeTime}",
-  "insights.topPlaybooks.mySubTitle": "En çok kullandığım senaryolar",
+  "insights.topPlaybooks.mySubTitle": "En çok oynadığım senaryolar",
   "insights.topPlaybooks.myTitle": "Önde gelen senaryolarım",
-  "insights.topPlaybooks.subTitle": "En çok kullanılan senaryolar",
+  "insights.topPlaybooks.subTitle": "En çok oynanan senaryolar",
   "insights.topPlaybooks.title": "Önde gelen senaryolar",
-  "insights.topPlaybooks.totalRuns": "{total} kullanım",
-  "insights.topPlaybooksTable.participants": "Toplam kullanım",
+  "insights.topPlaybooks.totalRuns": "{total} oynanma",
+  "insights.topPlaybooksTable.participants": "Toplam oynanma",
   "insights.topPlaybooksTable.playbook": "Senaryo",
-  "insights.topPlaybooksTable.updates": "Son kullanılma",
+  "insights.topPlaybooksTable.updates": "Son oynanma",
   "insights.topReactions.empty": "Bu bilgileri oluşturmak için yeterli veri yok",
   "insights.topReactions.mySubTitle": "Sık verdiğim tepkiler",
   "insights.topReactions.myTitle": "Sık verdiğim tepkiler",
@@ -4008,10 +4087,13 @@
   "mark_all_threads_as_read_modal.title": "Tüm konularınız okunmuş olarak işaretlensin mi?",
   "marketplace_command.disabled": "Mağaza devre dışı bırakılmış. Lütfen ayrıntılı bilgi almak için sistem yöneticiniz ile görüşün.",
   "marketplace_command.no_permission": "Mağazaya erişmek için yeterli izinleriniz yok.",
+  "marketplace_modal.app_error": "Mağaza sunucusu ile bağlantı kurulurken sorun çıktı. Lütfen <linkConsole>Sistem konsolu</linkConsole> üzerinden ayarlarınızı denetleyin.",
   "marketplace_modal.install_plugins": "Uygulama ekleri kur",
   "marketplace_modal.installing": "Kuruluyor...",
   "marketplace_modal.list.configure": "Yapılandır",
+  "marketplace_modal.list.configure.plugin": "{plugin} yapılandırması",
   "marketplace_modal.list.install": "Kur",
+  "marketplace_modal.list.install.plugin": "{plugin} kurulumu",
   "marketplace_modal.list.installed": "Kurulu",
   "marketplace_modal.list.try_again": "Yeniden dene",
   "marketplace_modal.list.update": "Güncelle",
@@ -4023,12 +4105,13 @@
   "marketplace_modal.list.update_confirmation.message.warning_major_version": "Bu güncellemede sistemin çalışmasını olumsuz etkileyebilecek değişiklikler olabilir.",
   "marketplace_modal.list.update_confirmation.message.warning_major_version_with_release_notes": "Bu güncellemede sistemin çalışmasını olumsuz etkileyebilecek değişiklikler olabilir. Güncellemeyi yapmadan önce yapılan değişiklikler hakkında ayrıntılı bilgi almak için [yayım notları](!{releaseNotesUrl}) bölümüne bakın.",
   "marketplace_modal.list.update_confirmation.title": "Uygulama eki güncellemesini onayla",
-  "marketplace_modal.no_plugins": "Şu anda kullanılabilecek bir uygulama eki yok.",
-  "marketplace_modal.no_plugins_installed": "Henüz bir uygulama eki kurulmamış.",
+  "marketplace_modal.no_plugins": "Şu anda kullanılabilecek bir uygulama eki yok",
+  "marketplace_modal.no_plugins_installed": "Henüz bir uygulama eki kurulmamış",
   "marketplace_modal.search": "Mağazada arama",
   "marketplace_modal.tabs.all_listing": "Tümü",
-  "marketplace_modal.tabs.installed_listing": "Kurulu",
-  "marketplace_modal.title": "Mağaza",
+  "marketplace_modal.tabs.installed_listing": "Kurulu ({count})",
+  "marketplace_modal.title": "Uygulama mağazası",
+  "marketplace_modal_list.no_plugins_filter": "\"{filter}\" için bir sonuç bulunamadı",
   "members_popover.button.message": "ileti",
   "menu.cloudFree.enterpriseTrialDescription": "{trialEndDay} tarihine kadar deneyebilirsiniz. En üst Enterprise sürüm özelliklerimizi keşfedin. <openModalLink>Ayrıntılı bilgi alın</openModalLink>",
   "menu.cloudFree.enterpriseTrialTitle": "Enterprise denemesi",
@@ -4081,6 +4164,9 @@
   "modal.manual_status.title_ooo": "Durumunuz \"Ofis dışında\" olarak değiştirildi",
   "more.details": "Ayrıntılı bilgi",
   "more_channels.create": "Kanal ekle",
+  "more_channels.createClick": "Yeni bir kanal eklemek için 'Yeni kanal ekle' üzerine tıklayın",
+  "more_channels.join": "Katıl",
+  "more_channels.joining": "Katılınıyor...",
   "more_channels.next": "Sonraki",
   "more_channels.noMore": "Katılabileceğiniz başka bir kanal yok",
   "more_channels.prev": "Önceki",
@@ -4148,7 +4234,7 @@
   "navbar_dropdown.logout": "Oturumu kapat",
   "navbar_dropdown.manageGroups": "Grup yönetimi",
   "navbar_dropdown.manageMembers": "Üye yönetimi",
-  "navbar_dropdown.marketplace": "Mağaza",
+  "navbar_dropdown.marketplace": "Uygulama mağazası",
   "navbar_dropdown.menuAriaLabel": "ana menü",
   "navbar_dropdown.nativeApps": "Uygulamaları indir",
   "navbar_dropdown.profileSettings": "Profil",
@@ -4168,6 +4254,9 @@
   "navbar_dropdown.viewMembers": "Üyeleri görüntüle",
   "newChannelWithBoard.tutorialTip.description": "Yeni oluşturduğunuz panoya uygulama çubuğundaki Panolar simgesine tıklayarak hızlı bir şekilde erişebilirsiniz. Bu kanal ile ilişkilendirilmiş panoları sağ taraftaki yan çubukta görebilir ve birini tam görünümde açabilirsiniz.",
   "newChannelWithBoard.tutorialTip.title": "İlişkilendirilmiş panolara uygulama çubuğundan erişin",
+  "newsletter_optin.checkmark.text": "Mattermost güvenlik güncellemelerini duyuru olarak almak istiyorum. Veriler için <a>Hükümler ve Koşullar</a> uygulanır",
+  "newsletter_optin.desc": "<a>{link}</a> ile hesap açın.",
+  "newsletter_optin.title": "Mattermost güvenlik güncellemelerini duyurular ile almak ister misiniz?",
   "next_steps_view.welcomeToMattermost": "Mattermost uygulamasına hoş geldiniz",
   "no_results.channel_files.subtitle": "Bu kanala eklenmiş dosyalar burada görüntülenir.",
   "no_results.channel_files.title": "Henüz bir dosya yok",
@@ -4206,9 +4295,10 @@
   "onboardingTask.checklist.downloads": "Kurulum tamamlandı. <link>Uygulamalarımızı indirebilirsiniz</link>",
   "onboardingTask.checklist.higher_security_features": "Daha yüksek güvenlik özellikleri ile ilgilenir misiniz?",
   "onboardingTask.checklist.main_subtitle": "Haydi çalışmaya başlayalım.",
+  "onboardingTask.checklist.no_thanks": "Hayır, teşekkürler",
   "onboardingTask.checklist.start_enterprise_now": "Ücretsiz Enterprise sürüm denemenizi başlatın!",
   "onboardingTask.checklist.task_complete_your_profile": "Profilinizi tamamlayın.",
-  "onboardingTask.checklist.task_create_from_work_template": "Bir kalıptan oluşturun. Panolar ve senaryolar ile bir kanal kurun.",
+  "onboardingTask.checklist.task_create_from_work_template": "Kalıptan oluştur",
   "onboardingTask.checklist.task_download_mm_apps": "Masaüstü ve mobil uygulamaları indirin.",
   "onboardingTask.checklist.task_explore_other_tools_in_platform": "Platformdaki diğer araçları keşfedin.",
   "onboardingTask.checklist.task_invite_team_members": "Çalışma alanına takım üyeleri çağırın.",
@@ -4253,7 +4343,7 @@
   "onboarding_wizard.plugins.subtitle": "(neredeyse bitti)",
   "onboarding_wizard.plugins.title": "Mattermost uygulamasına hoş geldiniz!",
   "onboarding_wizard.plugins.todo": "Yapılacak işler",
-  "onboarding_wizard.plugins.todo.tooltip": "Yapılacak işler listenizi izleyebileceğiniz ve günlük hatırlatıcılar alabileceğiniz bir uygulama eki",
+  "onboarding_wizard.plugins.todo.tooltip": "Yapılacak işler listenizi izleyebileceğiniz ve günlük anımsatıcılar alabileceğiniz bir uygulama eki",
   "onboarding_wizard.plugins.zoom": "Zoom",
   "onboarding_wizard.plugins.zoom.tooltip": "Mattermost üzerinde tek tıkla sesli ve görüntülü Zoom görüşmeleri başlatın",
   "onboarding_wizard.skip": "Şimdilik atla",
@@ -4293,6 +4383,7 @@
   "payment_form.no_billing_address": "Henüz bir fatura adresi eklenmemiş",
   "payment_form.no_credit_card": "Henüz bir kredi kartı eklenmemiş",
   "payment_form.saved_payment_method": "Kaydedilmiş ödeme yöntemi",
+  "payment_form.shipping_address": "Gönderim adresi",
   "payment_form.zipcode": "Posta kodu",
   "pending_post_actions.cancel": "İptal",
   "pending_post_actions.retry": "Yeniden dene",
@@ -4308,6 +4399,14 @@
   "plan.self_serve": "Kendi barındırılan",
   "pluggable.errorOccurred": "{pluginId} uygulama ekinde bir sorun çıktı.",
   "pluggable.errorRefresh": "Yenilensin mi?",
+  "pluggable_rhs.tourtip.boards.access": "İlişkili panolarınıza sağdaki uygulama çubuğunda bulunan Panolar simgesiyle erişebilirsiniz.",
+  "pluggable_rhs.tourtip.boards.click": "Bu sağ panodan Panolar üzerine tıklayın.",
+  "pluggable_rhs.tourtip.boards.review": "Kanallarınızdan gelen pano güncellemelerini inceleyin.",
+  "pluggable_rhs.tourtip.boards.title": "İlişkili {count} {num, plural, one {panonuza} other {panonuza}} erişin!",
+  "pluggable_rhs.tourtip.playbooks.access": "İlişkili senaryolarınıza sağdaki uygulama çubuğunda bulunan Senaryolar simgesiyle erişebilirsiniz.",
+  "pluggable_rhs.tourtip.playbooks.click": "Bu sağ panodan Senaryolar üzerine tıklayın.",
+  "pluggable_rhs.tourtip.playbooks.review": "Kanallarınızdan gelen senaryo güncellemelerini inceleyin.",
+  "pluggable_rhs.tourtip.playbooks.title": "İlişkili {count} {num, plural, one {senaryonuza} other {senaryonuza}} erişin.",
   "post.ariaLabel.attachment": ", 1 ek dosya",
   "post.ariaLabel.attachmentMultiple": ", {attachmentCount} ek dosya",
   "post.ariaLabel.message": "{time} {date} zamanında, {authorName} tarafından, {message} iletisi yazıldı",
@@ -4317,6 +4416,8 @@
   "post.ariaLabel.reaction": ", 1 tepki",
   "post.ariaLabel.reactionMultiple": ", {reactionCount} tepki",
   "post.ariaLabel.replyMessage": "{time} {date} zamanında, {authorName} tarafından, {message} yanıtı verildi",
+  "post.reminder.acknowledgement": "{username}: {permaLink} iletisi {reminderTime}, {reminderDate} zamanında anımsatılacak",
+  "post.reminder.systemBot": "Merhaba. {username}: {permaLink} iletisi ile ilgili anımsatmanız",
   "post_body.check_for_out_of_channel_groups_mentions.message": "kanalda bulunmadıkları için bu anma nedeniyle bildirim gönderilmeyecek. İlişkilendirilmiş grupların üyesi olmadıklarından bu kanala eklenemezler. Onları bu kanala eklemek için ilişkilendirilmiş gruplara eklenmeleri gerekir.",
   "post_body.check_for_out_of_channel_mentions.link.and": " ve ",
   "post_body.check_for_out_of_channel_mentions.link.private": "bu özel kanala eklemek ister misiniz",
@@ -4343,6 +4444,11 @@
   "post_info.del": "Sil",
   "post_info.dot_menu.tooltip.more_actions": "Diğer",
   "post_info.edit": "Düzenle",
+  "post_info.edit.aria_label": "Eski bir iletiyi geri yüklemek için seçin.",
+  "post_info.edit.current_version": "Geçerli sürüm",
+  "post_info.edit.restore": "Bu sürümü geri yükle",
+  "post_info.edit.restore_question": "Bu sürüm geri yüklensin mi?",
+  "post_info.edit.undo": "Geri al",
   "post_info.info.view_additional_info": "Ek bilgileri görüntüle",
   "post_info.marketplace": "Uygulama mağazası",
   "post_info.menuAriaLabel": "Ek seçenekler gönder",
@@ -4352,6 +4458,13 @@
   "post_info.message.visible.compact": " (Yalnızca siz görebilirsiniz)",
   "post_info.permalink": "Bağlantıyı kopyala",
   "post_info.pin": "Kanala sabitle",
+  "post_info.post_reminder.menu": "Anımsat",
+  "post_info.post_reminder.sub_menu.custom": "Özel",
+  "post_info.post_reminder.sub_menu.header": "Şu zamana anımsatıcı ayarla:",
+  "post_info.post_reminder.sub_menu.one_hour": "1 saat",
+  "post_info.post_reminder.sub_menu.thirty_minutes": "30 dakika",
+  "post_info.post_reminder.sub_menu.tomorrow": "Yarın",
+  "post_info.post_reminder.sub_menu.two_hours": "2 saat",
   "post_info.reply": "Yanıtla",
   "post_info.submenu.icon": "alt menü simgesi",
   "post_info.submenu.mobile": "mobil alt menü",
@@ -4362,6 +4475,7 @@
   "post_info.unread": "Okunmamış olarak işaretle",
   "post_message_preview.channel": "Yalnızca ~{channel} içindeki kullanıcılara görüntülenir",
   "post_message_view.edited": "Düzenlendi",
+  "post_message_view.view_post_edit_history": "Geçmişi görüntülemek için tıklayın",
   "post_pre_header.flagged": "Kaydedilmiş",
   "post_pre_header.pinned": "Sabitlenmiş",
   "post_priority.acknowledgements.title": "Onaylar",
@@ -4379,6 +4493,9 @@
   "post_priority.requested_ack.description": "İletinizde bir onay düğmesi görüntülenecek",
   "post_priority.requested_ack.text": "Onay istensin",
   "post_priority.you.acknowledge": "(siz)",
+  "post_reminder.custom_time_picker_modal.header": "Anımsatıcı ayarla",
+  "post_reminder.custom_time_picker_modal.submit_button": "Anımsatıcı ayarla",
+  "post_reminder_custom_time_picker_modal.defaultMsg": "Anımsatıcı ayarla",
   "postlist.toast.history": "İleti geçmişi görüntüleniyor",
   "postlist.toast.newMessages": "{count, number} yeni {count, plural, one {ileti} other {ileti}}",
   "postlist.toast.newMessagesSince": "{count, number} {count, plural, one {yeni ileti} other {yeni ileti}} {isToday, select, true {} other {Başlangıç}} {date}",
@@ -4388,7 +4505,12 @@
   "postlist.toast.searchHint": "İpucu: Bu kanalda arama yapmak için {searchShortcut} kullanın",
   "posts_view.loadMore": "Diğer iletileri yükle",
   "posts_view.newMsg": "Yeni iletiler",
-  "postypes.custom_open_pricing_modal_post_renderer.and": "ve ",
+  "postypes.custom_open_plugin_install_post_rendered.app_installation_request_text": "Şu uygulama kurulumu isteklerini aldınız:",
+  "postypes.custom_open_plugin_install_post_rendered.plugin_instructions": "<pluginApp></pluginApp> ya da tüm uygulama eklerini görüntülemek için <marketplaceLink>Mağazaya</marketplaceLink> bakın.",
+  "postypes.custom_open_plugin_install_post_rendered.plugin_request": "{pluginRequests} uygulamasının kurulmasını istedi.",
+  "postypes.custom_open_plugin_install_post_rendered.plugins_installed": "{pluginName} kuruldu.",
+  "postypes.custom_open_plugin_install_post_rendered.plugins_instructions": "Uygulamaları kurun ya da tüm uygulama eklerini görüntülemek için <marketplaceLink>Mağazaya</marketplaceLink> bakın.",
+  "postypes.custom_open_pricing_modal_post_renderer.and": "ve",
   "postypes.custom_open_pricing_modal_post_renderer.availableOn": " - {feature} ile kullanılabilir",
   "postypes.custom_open_pricing_modal_post_renderer.downgradeNotfication": "{userRequests} çalışma alanını ücretli bir tarifeye geri döndürme isteğinde bulundu",
   "postypes.custom_open_pricing_modal_post_renderer.learn_trial": "Deneme hakkında ayrıntılı bilgi alın",
@@ -4445,15 +4567,19 @@
   "pricing_modal.extra_briefing.professional.ssoadLdap": "AD/LDAP, Google, O365 ve OpenID ile tek oturum açma desteği",
   "pricing_modal.lookingForCloudOption": "Bir bulut seçeneği mi arıyorsunuz?",
   "pricing_modal.lookingToSelfHost": "Kendiniz mi barındırmak istiyorsunuz?",
+  "pricing_modal.noitfy_cta.request": "Yöneticiden yükseltmesini isteyin",
+  "pricing_modal.noitfy_cta.request_success": "İstek gönderildi",
   "pricing_modal.or": "ya da",
   "pricing_modal.planDisclaimer.free": "Bu tarifede veri kısıtlaması bulunuyor.",
   "pricing_modal.planLabel.currentPlan": "GEÇERLİ TARİFE",
+  "pricing_modal.planLabel.currentPlanMonthly": "ŞU ANDA AYLIK OLARAK FATURALANIYOR",
   "pricing_modal.planLabel.mostPopular": "EN BEĞENİLEN",
   "pricing_modal.planSummary.enterprise": "Büyük ekipler için yönetim, güvenlik ve uygunluk",
   "pricing_modal.planSummary.free": "Küçük ekipler için verimlilik artışı",
   "pricing_modal.planSummary.professional": "Büyük ekipler için yönetim, güvenlik ve uygunluk",
   "pricing_modal.plan_label_trialDays": "DENEMENİN BİTMESİNE {days} GÜN KALDI",
   "pricing_modal.price.freeForever": "Sonsuza dek ücretsiz",
+  "pricing_modal.rate.seatPerMonth": "USD koltuk/ay {br}<b>(yıllık faturalanır)</b>",
   "pricing_modal.reviewDeploymentOptions": "Dağıtım seçeneklerini gözden geçirin",
   "pricing_modal.start_trial.disclaimer": "<span>30 günlük ücretsiz denemeyi başlat</span> üzerine tıklayarak, <linkAgreement>Mattermost yazılım ve hizmet lisans sözleşmesi</linkAgreement>, <linkPrivacy>Kişisel verilerin gizliliği ilkesi</linkPrivacy> metinlerini ve ürün ile ilgili e-postaları almayı kabul ediyorum.",
   "pricing_modal.subtitle": "Başlamak için bir tarife seçin",
@@ -4565,6 +4691,7 @@
   "search_header.title2": "Son anmalar",
   "search_header.title3": "Kaydedilmiş iletiler",
   "search_header.title5": "Ek bilgiler",
+  "search_header.title_edit.history": "Düzenleme geçmişi",
   "search_item.channelArchived": "Arşivlenmiş",
   "search_item.direct": "Doğrudan ileti ({username} ile)",
   "search_item.file_tag.direct_message": "Doğrudan ileti",
@@ -4589,10 +4716,13 @@
   "self_hosted_signup.contact_sales": "Satış ekibi ile görüşün",
   "self_hosted_signup.cta": "Yükselt",
   "self_hosted_signup.disclaimer": "<a>Enterprise Edition abonelik koşullarını</a> okudum ve kabul ediyorum",
-  "self_hosted_signup.error_invalid_number": "Geçerli bir koltuk lisansı sayısı yazın",
+  "self_hosted_signup.error_invalid_number": "Geçerli bir koltuk sayısı yazın",
+  "self_hosted_signup.error_max_seats": " yalnızca {num} koltuğa kadar lisans satın alınabilir",
+  "self_hosted_signup.error_min_seats": "Çalışma alanınızda şu anda {num} kullanıcı var",
   "self_hosted_signup.failed_export.subtitle": "Kontrollerimizi yapacağız ve lisansınızı onaylandıktan sonra 3 gün içinde size geri döneceğiz. Bu arada, lütfen ürünümüzün ücretsiz sürümünü kullanmayı sürdürmekten çekinmeyin.",
   "self_hosted_signup.failed_export.title": "İşleminiz inceleniyor",
   "self_hosted_signup.license_applied": "{planName} lisansınız etkinleştirildi. {planName} özelliklerini kullanabilirsiniz.",
+  "self_hosted_signup.line_item_subtotal": "{num} koltuk × 12 ay.",
   "self_hosted_signup.organization": "Kuruluş adı",
   "self_hosted_signup.progress_step.applying_license": "{planName} lisansınız Mattermost kopyanıza uygulanıyor",
   "self_hosted_signup.progress_step.submitting_payment": "Ödeme bilgileri gönderiliyor",
@@ -4602,10 +4732,10 @@
   "self_hosted_signup.purchase_in_progress.by_self_restart": "Bir hata olduğunu düşünüyorsanız, satın alma işleminizi yeniden başlatın.",
   "self_hosted_signup.purchase_in_progress.reset": "Satın almayı yeniden başlat",
   "self_hosted_signup.purchase_in_progress.title": "Satın alma işlemi sürüyor",
-  "self_hosted_signup.error_min_seats": "Çalışma alanınızda şu anda {num} kullanıcı var",
   "self_hosted_signup.retry": "Yeniden dene",
   "self_hosted_signup.screening_description": "Kontrollerimizi yapacağız ve lisansınızı onaylandıktan sonra 3 gün içinde size geri döneceğiz. Bu arada, lütfen ürünümüzün ücretsiz sürümünü kullanmayı sürdürmekten çekinmeyin.",
   "self_hosted_signup.screening_title": "İşleminiz inceleniyor",
+  "self_hosted_signup.seats": "Koltuk sayısı",
   "self_hosted_signup.signup_consequences": "Faturanız bugün kesilecek. Lisansınız otomatik olarak etkinleştirilecek. <a>Faturalamanın nasıl işlediğine bakın.</a>",
   "self_hosted_signup.total": "Toplam",
   "setting_item_max.cancel": "İptal",
@@ -4755,6 +4885,8 @@
   "sidebar.types.favorites": "BEĞENDİKLERİM",
   "sidebar.types.unreads": "OKUNMAMIŞLAR",
   "sidebar.unreads": "Diğer okunmamışlar",
+  "sidebar_left.addChannelsCta": "Kanallar ekle",
+  "sidebar_left.add_channel_cta_dropdown.dropdownAriaLabel": "Kanal açılan kutusu ekle",
   "sidebar_left.add_channel_dropdown.browseChannels": "Kanallara göz at",
   "sidebar_left.add_channel_dropdown.browseOrCreateChannels": "Kanallara göz at ya da kanal ekle",
   "sidebar_left.add_channel_dropdown.createCategory": "Yeni kategori ekle",
@@ -4763,7 +4895,7 @@
   "sidebar_left.add_channel_dropdown.invitePeople": "Kişileri çağır",
   "sidebar_left.add_channel_dropdown.invitePeopleExtraText": "Takıma kişiler ekleyin",
   "sidebar_left.add_channel_dropdown.work_template": "Kalıptan oluştur",
-  "sidebar_left.add_channel_dropdown.work_template_extra": "İlişkili panolar ve senaryolar ile bir kanal kurun",
+  "sidebar_left.add_channel_dropdown.work_template_extra": "Kanalları, panoları ve senaryoları ilişkilendirin",
   "sidebar_left.channel_filter.filterByUnread": "Okunmamışlara göre süz",
   "sidebar_left.channel_filter.filterUnreadAria": "okunmamışlar süzgeci",
   "sidebar_left.channel_filter.showAllChannels": "Tüm kanalları görüntüle",
@@ -4803,6 +4935,7 @@
   "sidebar_left.sidebar_channel_menu.unfavoriteChannel": "Beğendiklerimden çıkar",
   "sidebar_left.sidebar_channel_menu.unmuteChannel": "Kanal bildirimlerini aç",
   "sidebar_left.sidebar_channel_menu.unmuteConversation": "Görüşme bildirimlerini aç",
+  "sidebar_left.sidebar_channel_navigator.addChannelsCta": "Kanallar ekle",
   "sidebar_left.sidebar_channel_navigator.inviteUsers": "Kullanıcılar çağırın",
   "sidebar_right_menu.console": "Sistem panosu",
   "sidebar_right_menu.flagged": "Kaydedilmiş iletiler",
@@ -4854,6 +4987,18 @@
   "start_trial.modal_btn.start_free_trial": "30 günlük ücretsiz denemeyi başlat",
   "start_trial.tutorialTip.desc": "En çok istenilen ücretli özelliklerimizi keşfedin. Konuk hesapları ile kullanıcı erişimini sınırlayın, uyumluluk raporlarını otomatikleştirin ve yalnızca kimliğe özel güvenli mobil anında iletileri gönderin.",
   "start_trial.tutorialTip.title": "Ücretli özelliklerimizi ücretsiz olarak deneyin",
+  "start_trial_form.company_name": "Kuruluş adı",
+  "start_trial_form.company_size": "Kuruluş büyüklüğü",
+  "start_trial_form.disclaimer": "Denemeyi başlat üzerine tıklayarak, <agreement>Mattermost yazılım değerlendirme sözleşmesi</agreement> ve <privacypolicy>Kişisel verilerin gizliliği ilkesi</privacypolicy> metinleri ile ürün tanıtımı e-postalarını almayı kabul ediyorum.",
+  "start_trial_form.email": "İş e-posta adresi",
+  "start_trial_form.invalid_business_email": "Lütfen geçerli bir iş e-posta adresi yazın.",
+  "start_trial_form.modal_body": "Hızlıca deneme deneyiminizi ayarlamamıza yardımcı olacak birkaç şey",
+  "start_trial_form.modal_btn.start": "Denemeyi başlat",
+  "start_trial_form.modal_title": "Denemeyi başlat",
+  "start_trial_form.name": "Ad",
+  "start_trial_form_modal.failureModal.subtitle": "Deneme isteğiniz işlenirken bir sorun çıktı.",
+  "start_trial_form_modal.failureModal.subtitle2": "Lütfen yeniden deneyin ya da destek ekibiyle görüşün.",
+  "start_trial_form_modal.failureModal.title": "Lütfen yeniden deneyin",
   "status_dropdown.dnd_sub_menu_header": "Bildirimler şu zamana kadar kapatılsın:",
   "status_dropdown.dnd_sub_menu_item.custom": "Özel",
   "status_dropdown.dnd_sub_menu_item.one_hour": "1 saat",
@@ -4882,6 +5027,7 @@
   "suggestion.archive": "Arşivlenmiş kanallar",
   "suggestion.commands": "Komutlar",
   "suggestion.emoji": "Emoji",
+  "suggestion.group.members": "{member_count} {member_count, plural, one {üye} other {üye}}",
   "suggestion.mention.all": "Bu kanaldaki herkese bildirilir",
   "suggestion.mention.channel": "Bu kanaldaki herkese bildirilir",
   "suggestion.mention.channels": "Kanallarım",
@@ -4914,6 +5060,10 @@
   "system_users_list.count": "{count, number} {count, plural, one {kullanıcı} other {kullanıcı}}",
   "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {kullanıcı} other {kullanıcı}} / {total, number}",
   "system_users_list.countSearch": "{count, number} {count, plural, one {kullanıcı} other {kullanıcı}} / {total, number}",
+  "tag.default.beta": "BETA",
+  "tag.default.bot": "BOT",
+  "tag.default.guest": "KONUK",
+  "tag.default.new": "YENİ",
   "team.button.ariaLabel": "{teamName} takımı",
   "team.button.mentions.ariaLabel": "{teamName} takımı, {mentionCount} anma",
   "team.button.name_undefined": "Bu takımın bir adı yok",
@@ -4946,6 +5096,7 @@
   "team_settings_modal.generalTab": "Genel",
   "team_settings_modal.title": "Takım ayarları",
   "team_sidebar.join": "Katılabileceğiniz diğer takımlar",
+  "templates_command.disabled": "Kalıplar devre dışı bırakılmış. Lütfen ayrıntılı bilgi almak için sistem yöneticiniz ile görüşün.",
   "terms_of_service.agreeButton": "Onaylıyorum",
   "terms_of_service.api_error": "İstek yerine getirilemedi. Sorun sürerse sistem yöneticiniz ile görüşün.",
   "terms_of_service.disagreeButton": "Onaylamıyorum",
@@ -5089,6 +5240,8 @@
   "user.settings.advance.sendTitle.mac": "⌘+ENTER ile ileti gönderme",
   "user.settings.advance.startFromLeftOff": "Kaldığım yerden başlayayım",
   "user.settings.advance.startFromNewest": "En yeni iletiden başlayayım",
+  "user.settings.advance.syncDrafts.Desc": "Bu seçenek etkinleştirildiğinde, ileti taslakları sunucu ile eşitlenir. Böylece taslaklara herhangi bir aygıttan erişilebilir. Devre dışı bırakıldığında, ileti taslakları yalnızca oluşturuldukları aygıt üzerine yerel olarak kaydedilir.",
+  "user.settings.advance.syncDrafts.Title": "İleti taslakları sunucu ile eşitlensin",
   "user.settings.advance.title": "Gelişmiş ayarlar",
   "user.settings.advance.unreadScrollPositionDesc": "Okunmamış bir kanalı görüntülerken kaydırma konumunu seçin. Kanallar, görüntülendiğinde her zaman okunmuş olarak işaretlenir.",
   "user.settings.advance.unreadScrollPositionTitle": "Okunmamış bir kanalı görüntülerken kaydırma konumu",
@@ -5224,7 +5377,7 @@
   "user.settings.general.uploadImage": "Bir görsel yüklemek için 'Düzenle' üzerine tıklayın.",
   "user.settings.general.username": "Kullanıcı adı",
   "user.settings.general.usernameGroupNameUniqueness": "Bu kullanıcı adı var olan bir grup adıyla çakışıyor.",
-  "user.settings.general.usernameInfo": "Takım arkadaşlarınız tarafından kolay anlaşılıp hatırlanabilecek bir şey seçin.",
+  "user.settings.general.usernameInfo": "Takım arkadaşlarınız tarafından kolay anlaşılıp anımsanabilecek bir şey seçin.",
   "user.settings.general.usernameReserved": "Bu kullanıcı adı ayrılmış, lütfen başka bir ad seçin.",
   "user.settings.general.usernameRestrictions": "Kullanıcı adı bir harf ile başlamalı ve {min} ile {max} arasında küçük harf, rakam ve '.', '-', '_' simgelerini içermelidir.",
   "user.settings.general.validEmail": "Lütfen geçerli bir e-posta adresi yazın",
@@ -5427,7 +5580,7 @@
   "user.settings.tokens.description_mobile": "<linkTokens>Kişisel erişim kodları</linkTokens> oturum kodlarına benzer ve bütünleştirmeler tarafından <linkAPI>REST API üzerinden kimlik doğrulaması yapmak için kullanılabilir</linkAPI>. Masaüstünüzden yeni kodlar oluşturun.",
   "user.settings.tokens.id": "Erişim kodu: ",
   "user.settings.tokens.name": "Kod açıklaması: ",
-  "user.settings.tokens.nameHelp": "Ne amaçla kullandığınızı hatırlatacak bir kod açıklaması yazın.",
+  "user.settings.tokens.nameHelp": "Ne amaçla kullandığınızı anımsatacak bir kod açıklaması yazın.",
   "user.settings.tokens.nameRequired": "Lütfen bir açıklama yazın.",
   "user.settings.tokens.save": "Kaydet",
   "user.settings.tokens.title": "Kişisel erişim kodları",
@@ -5478,10 +5631,12 @@
   "user_profile.account.post_was_created": "Bu ileti bir bütünleştirme formu ile gönderilmiş",
   "user_profile.add_user_to_channel": "Kanala ekle",
   "user_profile.add_user_to_channel.icon": "Kanala kullanıcı ekle simgesi",
+  "user_profile.call.userBusy": "{user} başka bir çağrıda",
   "user_profile.custom_status": "Durum",
   "user_profile.custom_status.set_status": "Bir durum ayarlayın",
   "user_profile.send.dm": "İleti",
   "user_profile.send.dm.icon": "İleti gönderme simgesi",
+  "user_profile.send.dm.yourself": "Kendinize ileti gönderin",
   "version_bar.new": "Yeni bir Mattermost sürümü yayınlanmış.",
   "version_bar.refresh": "Uygulamayı yenile",
   "view_image.loading": "Yükleniyor ",
@@ -5527,6 +5682,7 @@
   "welcome_post_renderer.user_message.first_paragraph": "Mattermost, araçlar ve ekipler arasında güvenli iletişim, işbirliği ve iş düzeni sağlayan açık kaynaklı bir platformdur.",
   "welcome_post_renderer.user_message.second_paragraph": "Platformu tanımaya başlamak için kullanabileceğiniz komutların listesi.",
   "welcome_post_renderer.user_message.title": "Mattermost uygulamasına hoş geldiniz! :rocket:",
+  "widget.input.clear": "Temizle",
   "widget.input.required": "Bu alanın doldurulması zorunludur",
   "widget.passwordInput.createPassword": "Parolanızı yazın",
   "widget.passwordInput.password": "Parola",
@@ -5535,6 +5691,33 @@
   "widgets.users_emails_input.loading": "Yükleniyor",
   "widgets.users_emails_input.no_user_found_matching": "**{text}** ile eşleşen kimse bulunamadı. Çağırmak için e-posta adreslerini yazın.",
   "widgets.users_emails_input.valid_email": "**{email}** ekle",
+  "work_templates.customize.modal_cancel_button": "Geri",
+  "work_templates.customize.modal_create_button": "Ekle",
+  "work_templates.customize.modal_title": "{useCase} için bir ad verin",
+  "work_templates.customize.name_description": "Bu seçenek, sizin ve başkalarının proje ögelerini bulmasına yardımcı olur. Daha sonra da değiştirebilirsiniz.",
+  "work_templates.customize.name_input_placeholder": "örneğin Web app, Growth, vb.",
+  "work_templates.customize.name_label_all": "Kanalınızı, panonuzu ve senaryonuzu adlandırın",
+  "work_templates.customize.name_label_channels_boards": "Kanalınızı ve panonuzu adlandırın",
+  "work_templates.customize.name_label_channels_playbooks": "Kanalınızı ve senaryonuzu adlandırın",
+  "work_templates.customize.private_playbook_license_issue": "Gizli senaryolar Enterprise lisansı ile kullanılabilir.",
+  "work_templates.customize.visibility_title": "Buna kimler erişebilmeli?",
+  "work_templates.menu.modal_title": "Kalıptan oluştur",
+  "work_templates.menu.quick_use": "Hızlı kullanım",
+  "work_templates.menu.template_title": "KALIP",
+  "work_templates.menu.usecase_boards_count": "{boardsCount, plural, =1 {# pano} other {# pano}}",
+  "work_templates.menu.usecase_channels_count": "{channelsCount, plural, =1 {# kanal} other {# kanal}}",
+  "work_templates.menu.usecase_playbooks_count": "{playbooksCount, plural, =1 {# senaryo} other {# senaryo}}",
+  "work_templates.preview.accordion_title_boards": "Panolar",
+  "work_templates.preview.accordion_title_channels": "Kanallar",
+  "work_templates.preview.accordion_title_playbooks": "Senaryolar",
+  "work_templates.preview.integrations.admin_install.multiple_plugin": "Bütünleştirmeler yönetici tarafından kurulana kadar eklenmeyecek.",
+  "work_templates.preview.integrations.admin_install.notify": "Bütünleştirmeleri kurması için yöneticiyi bilgilendirin",
+  "work_templates.preview.integrations.admin_install.single_plugin": "{plugin} yönetici tarafından kurulana kadar eklenmeyecek.",
+  "work_templates.preview.modal_cancel_button": "Geri",
+  "work_templates.preview.modal_next_button": "Sonraki",
+  "work_templates.preview.modal_title": "{useCase} ön izlemesi",
+  "work_templates.preview.section.included": "İçindekiler",
+  "work_templates.preview.what_you_get": "Şunları alacaksınız:",
   "workspace_limits.archived_file.archived": "Bu dosya arşivlenmiş",
   "workspace_limits.archived_file.archived_compact": "(arşivlenmiş)",
   "workspace_limits.archived_file.tooltip_description": "Çalışma alanınızın boyutu {storageLimit} dosya depolama alanı sınırına ulaştı. Bunu yeniden görüntüleyebilmek için ücretli bir tarifeye geçin",

From 5e3dab37306b42b77e62755cfcde3887fee4bae3 Mon Sep 17 00:00:00 2001
From: Sajjad Jazini <s.jazini@vatanmail.ir>
Date: Mon, 10 Apr 2023 22:34:55 +0200
Subject: [PATCH 010/103] Translated using Weblate (Persian)

Currently translated at 26.8% (122 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/fa/
---
 webapp/boards/i18n/fa.json | 244 ++++++++++++++++++-------------------
 1 file changed, 122 insertions(+), 122 deletions(-)

diff --git a/webapp/boards/i18n/fa.json b/webapp/boards/i18n/fa.json
index d49f74c6b2..302c5163a3 100644
--- a/webapp/boards/i18n/fa.json
+++ b/webapp/boards/i18n/fa.json
@@ -1,124 +1,124 @@
 {
-  "AppBar.Tooltip": "تغییر وضعیت تخته‌های مرتبط",
-  "Attachment.Attachment-title": "ضمیمه",
-  "AttachmentBlock.DeleteAction": "حذف",
-  "AttachmentBlock.addElement": "افزودن {type}",
-  "AttachmentBlock.delete": "ضمیمه حذف شد.",
-  "AttachmentBlock.failed": "به دلیل محدودیت حجم، این پرونده نمی‌تواند بارگذاری شود.",
-  "AttachmentBlock.upload": "بارگذاری ضمیمه.",
-  "AttachmentBlock.uploadSuccess": "ضمیمه بارگذاری شد.",
-  "AttachmentElement.delete-confirmation-dialog-button-text": "حذف",
-  "AttachmentElement.download": "بارگیری",
-  "AttachmentElement.upload-percentage": "بارگذاری...({uploadPercent}%)",
-  "BoardComponent.add-a-group": "+ افزودن گروه",
-  "BoardComponent.delete": "حذف",
-  "BoardComponent.hidden-columns": "ستون های مخفی",
-  "BoardComponent.hide": "مخفی",
-  "BoardComponent.new": "+ جدید",
-  "BoardComponent.no-property": "بدون {property}",
-  "BoardComponent.no-property-title": "موارد با {property} خالی اینجا نمایش داده میشوند. این ستون قابل حذف نیست.",
-  "BoardComponent.show": "نمایش",
-  "BoardMember.schemeAdmin": "مدیر",
-  "BoardMember.schemeEditor": "ویرایشگر",
-  "BoardMember.schemeNone": "هیچکدام",
-  "BoardMember.schemeViewer": "بیننده",
-  "BoardPage.newVersion": "نسخه جدیدی از برنامه Boards موجود است، برای بارگیری مجدد اینجا را کلیک کنید.",
-  "BoardPage.syncFailed": "تابلو ممکن است حذف شود یا دسترسی آن لغو شود.",
-  "BoardTemplateSelector.add-template": "ایجاد قالب جدید",
-  "BoardTemplateSelector.create-empty-board": "ایجاد تابلو خالی",
-  "BoardTemplateSelector.delete-template": "حذف",
-  "BoardTemplateSelector.description": "با استفاده از الگوهای زیر، یک تابلو به نوار کناری اضافه کنید یا از اول شروع کنید.",
-  "BoardTemplateSelector.edit-template": "ویرایش",
-  "BoardTemplateSelector.plugin.no-content-description": "با استفاده از الگوهای زیر، یک تابلو به نوار کناری اضافه کنید یا از اول شروع کنید.",
-  "BoardTemplateSelector.plugin.no-content-title": "ایجاد یک تابلو",
-  "BoardTemplateSelector.title": "ایجاد یک تابلو",
-  "BoardTemplateSelector.use-this-template": "از این قالب استفاده کنید",
-  "BoardsSwitcher.Title": "جستجوی تابلوها",
-  "BoardsUnfurl.Remainder": "+{remainder} بیشتر",
-  "BoardsUnfurl.Updated": "به روز شد {time}",
-  "Calculations.Options.average.displayName": "میانگین",
-  "Calculations.Options.average.label": "میانگین",
-  "Calculations.Options.count.displayName": "تعداد",
-  "Calculations.Options.count.label": "تعداد",
-  "Calculations.Options.countChecked.displayName": "نشان‌دار",
-  "Calculations.Options.countChecked.label": "تعداد نشان‌دارها",
-  "Calculations.Options.countUnchecked.displayName": "بی‌نشان",
-  "Calculations.Options.countUnchecked.label": "تعداد نشان‌دارها",
-  "Calculations.Options.countUniqueValue.displayName": "یکتا",
-  "Calculations.Options.countUniqueValue.label": "تعداد مقادیر یکتا",
-  "Calculations.Options.countValue.displayName": "مقادیر",
-  "Calculations.Options.countValue.label": "تعداد مقادیر",
-  "Calculations.Options.dateRange.displayName": "دامنه",
-  "Calculations.Options.dateRange.label": "دامنه",
-  "Calculations.Options.earliest.displayName": "اولین",
-  "Calculations.Options.earliest.label": "اولین",
-  "Calculations.Options.latest.displayName": "آخرین",
-  "Calculations.Options.latest.label": "آخرین",
-  "Calculations.Options.max.displayName": "حداکثر",
-  "Calculations.Options.max.label": "حداکثر",
-  "Calculations.Options.median.displayName": "میانه",
-  "Calculations.Options.median.label": "میانه",
-  "Calculations.Options.min.displayName": "حداقل",
-  "Calculations.Options.min.label": "حداقل",
-  "Calculations.Options.none.displayName": "محاسبه",
-  "Calculations.Options.none.label": "هیچ یک",
-  "Calculations.Options.percentChecked.displayName": "بررسی شد",
-  "Calculations.Options.percentChecked.label": "درصد انتخاب‌شده‌ها",
-  "Calculations.Options.percentUnchecked.displayName": "بدون علامت",
-  "Calculations.Options.percentUnchecked.label": "درصد بی‌نشان",
-  "Calculations.Options.range.displayName": "بازه",
-  "Calculations.Options.range.label": "بازه",
-  "Calculations.Options.sum.displayName": "جمع",
-  "Calculations.Options.sum.label": "جمع",
-  "CardBadges.title-checkboxes": "چک باکس ها",
-  "CardBadges.title-comments": "نظرات",
-  "CardBadges.title-description": "این کارت دارای توضیحات است",
-  "CardDetail.Follow": "دنبال کردن",
-  "CardDetail.Following": "ذیل",
-  "CardDetail.add-content": "محتوا اضافه کنید",
-  "CardDetail.add-icon": "اضافه کردن نماد",
-  "CardDetail.add-property": "+ اضافه کردن یک ویژگی",
-  "CardDetail.addCardText": "متن کارت را اضافه کنید",
-  "CardDetail.moveContent": "انتقال محتوای کارت",
-  "CardDetail.new-comment-placeholder": "افزودن نظر...",
-  "CardDetailProperty.confirm-delete-heading": "تایید حذف ویژگی",
-  "CardDetailProperty.confirm-delete-subtext": "آیا مطمئن هستید که می خواهید ویژگی \"{propertyName}\" را حذف کنید؟ با حذف آن، اموال از تمام کارت های موجود در این تابلو حذف می شود.",
-  "CardDetailProperty.confirm-property-name-change-subtext": "آیا مطمئن هستید که می خواهید ویژگی \"{propertyName}\" {customText} را تغییر دهید؟ این روی مقدار(های) کارت(های) {numOfCards} در این برد تأثیر می گذارد و می تواند منجر به از دست رفتن داده شود.",
-  "CardDetailProperty.confirm-property-type-change": "تایید تغییر نوع ویژگی",
-  "CardDetailProperty.delete-action-button": "حذف",
-  "CardDetailProperty.property-change-action-button": "تغییر ویژگی",
-  "CardDetailProperty.property-changed": "تغییر ویژگی با موفقیت!",
-  "CardDetailProperty.property-deleted": "{propertyName} با موفقیت حذف شد!",
-  "CardDetailProperty.property-name-change-subtext": "از \"{oldPropType}\" به \"{newPropType}\" تایپ کنید",
-  "CardDialog.delete-confirmation-dialog-button-text": "حذف",
-  "CardDialog.delete-confirmation-dialog-heading": "تایید حذف کارت",
-  "CardDialog.editing-template": "شما در حال ویرایش یک الگو هستید.",
-  "CardDialog.nocard": "این کارت وجود ندارد یا غیرقابل دسترسی است.",
-  "Categories.CreateCategoryDialog.CancelText": "لغو کنید",
-  "Categories.CreateCategoryDialog.CreateText": "ايجاد كردن",
-  "Categories.CreateCategoryDialog.Placeholder": "دسته خود را نام ببرید",
-  "Categories.CreateCategoryDialog.UpdateText": "به روز رسانی",
-  "CenterPanel.Login": "وارد شدن",
-  "CenterPanel.Share": "اشتراک گذاری",
-  "ColorOption.selectColor": "رنگ {color} را انتخاب کنید",
-  "Comment.delete": "حذف",
-  "CommentsList.send": "ارسال",
-  "ConfirmationDialog.cancel-action": "لغو کنید",
-  "ConfirmationDialog.confirm-action": "تایید",
-  "ContentBlock.Delete": "حذف",
-  "ContentBlock.DeleteAction": "حذف",
-  "GroupBy.hideEmptyGroups": "پنهان‌کردن {count} گروه خالی",
-  "GroupBy.showHiddenGroups": "نمایش {count} گروه پنهان‌شده",
-  "ViewHeader.view-menu": "نمایش فهرست",
-  "ViewLimitDialog.Heading": "محدودیت تعداد نما برای تخته رسید",
-  "ViewLimitDialog.PrimaryButton.Title.Admin": "ارتقا",
-  "ViewLimitDialog.UpgradeImg.AltText": "ارتقا عکس",
-  "ViewLimitDialog.notifyAdmin.Success": "مدیر شما مطلع شد",
-  "ViewTitle.hide-description": "پنهان کردن توضیحات",
-  "ViewTitle.pick-icon": "انتخاب تصویرک",
-  "ViewTitle.random-icon": "تصادفی",
-  "ViewTitle.remove-icon": "پاک‌کردن تصویرک",
-  "ViewTitle.show-description": "نمایش توضیحات",
-  "ViewTitle.untitled-board": "تخته بدون عنوان",
-  "badge.guest": "مهمان"
+    "AppBar.Tooltip": "تغییر وضعیت تابلوهای مرتبط",
+    "Attachment.Attachment-title": "ضمیمه",
+    "AttachmentBlock.DeleteAction": "حذف",
+    "AttachmentBlock.addElement": "افزودن {type}",
+    "AttachmentBlock.delete": "ضمیمه حذف شد.",
+    "AttachmentBlock.failed": "به دلیل محدودیت حجم، این پرونده نمی‌تواند بارگذاری شود.",
+    "AttachmentBlock.upload": "بارگذاری ضمیمه.",
+    "AttachmentBlock.uploadSuccess": "ضمیمه بارگذاری شد.",
+    "AttachmentElement.delete-confirmation-dialog-button-text": "حذف",
+    "AttachmentElement.download": "بارگیری",
+    "AttachmentElement.upload-percentage": "بارگذاری...({uploadPercent}%)",
+    "BoardComponent.add-a-group": "+ افزودن گروه",
+    "BoardComponent.delete": "حذف",
+    "BoardComponent.hidden-columns": "ستون های مخفی",
+    "BoardComponent.hide": "مخفی",
+    "BoardComponent.new": "+ جدید",
+    "BoardComponent.no-property": "بدون {property}",
+    "BoardComponent.no-property-title": "موارد با {property} خالی اینجا نمایش داده میشوند. این ستون قابل حذف نیست.",
+    "BoardComponent.show": "نمایش",
+    "BoardMember.schemeAdmin": "مدیر",
+    "BoardMember.schemeEditor": "ویرایشگر",
+    "BoardMember.schemeNone": "هیچکدام",
+    "BoardMember.schemeViewer": "بیننده",
+    "BoardPage.newVersion": "نسخه جدیدی از برنامه Boards موجود است، برای بارگیری مجدد اینجا را کلیک کنید.",
+    "BoardPage.syncFailed": "تابلو ممکن است حذف شود یا دسترسی آن لغو شود.",
+    "BoardTemplateSelector.add-template": "ایجاد قالب جدید",
+    "BoardTemplateSelector.create-empty-board": "ایجاد تابلو خالی",
+    "BoardTemplateSelector.delete-template": "حذف",
+    "BoardTemplateSelector.description": "با استفاده از الگوهای زیر، یک تابلو به نوار کناری اضافه کنید یا از اول شروع کنید.",
+    "BoardTemplateSelector.edit-template": "ویرایش",
+    "BoardTemplateSelector.plugin.no-content-description": "با استفاده از الگوهای زیر، یک تابلو به نوار کناری اضافه کنید یا از اول شروع کنید.",
+    "BoardTemplateSelector.plugin.no-content-title": "ایجاد یک تابلو",
+    "BoardTemplateSelector.title": "ایجاد یک تابلو",
+    "BoardTemplateSelector.use-this-template": "از این قالب استفاده کنید",
+    "BoardsSwitcher.Title": "جستجوی تابلوها",
+    "BoardsUnfurl.Remainder": "+{remainder} بیشتر",
+    "BoardsUnfurl.Updated": "به روز شد {time}",
+    "Calculations.Options.average.displayName": "میانگین",
+    "Calculations.Options.average.label": "میانگین",
+    "Calculations.Options.count.displayName": "تعداد",
+    "Calculations.Options.count.label": "تعداد",
+    "Calculations.Options.countChecked.displayName": "نشان‌دار",
+    "Calculations.Options.countChecked.label": "تعداد نشان‌دارها",
+    "Calculations.Options.countUnchecked.displayName": "بی‌نشان",
+    "Calculations.Options.countUnchecked.label": "تعداد نشان‌دارها",
+    "Calculations.Options.countUniqueValue.displayName": "یکتا",
+    "Calculations.Options.countUniqueValue.label": "تعداد مقادیر یکتا",
+    "Calculations.Options.countValue.displayName": "مقادیر",
+    "Calculations.Options.countValue.label": "تعداد مقادیر",
+    "Calculations.Options.dateRange.displayName": "دامنه",
+    "Calculations.Options.dateRange.label": "دامنه",
+    "Calculations.Options.earliest.displayName": "اولین",
+    "Calculations.Options.earliest.label": "اولین",
+    "Calculations.Options.latest.displayName": "آخرین",
+    "Calculations.Options.latest.label": "آخرین",
+    "Calculations.Options.max.displayName": "حداکثر",
+    "Calculations.Options.max.label": "حداکثر",
+    "Calculations.Options.median.displayName": "میانه",
+    "Calculations.Options.median.label": "میانه",
+    "Calculations.Options.min.displayName": "حداقل",
+    "Calculations.Options.min.label": "حداقل",
+    "Calculations.Options.none.displayName": "محاسبه",
+    "Calculations.Options.none.label": "هیچ یک",
+    "Calculations.Options.percentChecked.displayName": "بررسی شد",
+    "Calculations.Options.percentChecked.label": "درصد انتخاب‌شده‌ها",
+    "Calculations.Options.percentUnchecked.displayName": "بدون علامت",
+    "Calculations.Options.percentUnchecked.label": "درصد بی‌نشان",
+    "Calculations.Options.range.displayName": "بازه",
+    "Calculations.Options.range.label": "بازه",
+    "Calculations.Options.sum.displayName": "جمع",
+    "Calculations.Options.sum.label": "جمع",
+    "CardBadges.title-checkboxes": "چک باکس ها",
+    "CardBadges.title-comments": "نظرات",
+    "CardBadges.title-description": "این کارت دارای توضیحات است",
+    "CardDetail.Follow": "دنبال کردن",
+    "CardDetail.Following": "ذیل",
+    "CardDetail.add-content": "محتوا اضافه کنید",
+    "CardDetail.add-icon": "اضافه کردن نماد",
+    "CardDetail.add-property": "+ اضافه کردن یک ویژگی",
+    "CardDetail.addCardText": "متن کارت را اضافه کنید",
+    "CardDetail.moveContent": "انتقال محتوای کارت",
+    "CardDetail.new-comment-placeholder": "افزودن نظر...",
+    "CardDetailProperty.confirm-delete-heading": "تایید حذف ویژگی",
+    "CardDetailProperty.confirm-delete-subtext": "آیا مطمئن هستید که می خواهید ویژگی \"{propertyName}\" را حذف کنید؟ با حذف آن، اموال از تمام کارت های موجود در این تابلو حذف می شود.",
+    "CardDetailProperty.confirm-property-name-change-subtext": "آیا مطمئن هستید که می خواهید ویژگی \"{propertyName}\" {customText} را تغییر دهید؟ این روی مقدار(های) کارت(های) {numOfCards} در این برد تأثیر می گذارد و می تواند منجر به از دست رفتن داده شود.",
+    "CardDetailProperty.confirm-property-type-change": "تایید تغییر نوع ویژگی",
+    "CardDetailProperty.delete-action-button": "حذف",
+    "CardDetailProperty.property-change-action-button": "تغییر ویژگی",
+    "CardDetailProperty.property-changed": "تغییر ویژگی با موفقیت!",
+    "CardDetailProperty.property-deleted": "{propertyName} با موفقیت حذف شد!",
+    "CardDetailProperty.property-name-change-subtext": "از \"{oldPropType}\" به \"{newPropType}\" تایپ کنید",
+    "CardDialog.delete-confirmation-dialog-button-text": "حذف",
+    "CardDialog.delete-confirmation-dialog-heading": "تایید حذف کارت",
+    "CardDialog.editing-template": "شما در حال ویرایش یک الگو هستید.",
+    "CardDialog.nocard": "این کارت وجود ندارد یا غیرقابل دسترسی است.",
+    "Categories.CreateCategoryDialog.CancelText": "لغو کنید",
+    "Categories.CreateCategoryDialog.CreateText": "ايجاد كردن",
+    "Categories.CreateCategoryDialog.Placeholder": "دسته خود را نام ببرید",
+    "Categories.CreateCategoryDialog.UpdateText": "به روز رسانی",
+    "CenterPanel.Login": "وارد شدن",
+    "CenterPanel.Share": "اشتراک گذاری",
+    "ColorOption.selectColor": "رنگ {color} را انتخاب کنید",
+    "Comment.delete": "حذف",
+    "CommentsList.send": "ارسال",
+    "ConfirmationDialog.cancel-action": "لغو کنید",
+    "ConfirmationDialog.confirm-action": "تایید",
+    "ContentBlock.Delete": "حذف",
+    "ContentBlock.DeleteAction": "حذف",
+    "GroupBy.hideEmptyGroups": "پنهان‌کردن {count} گروه خالی",
+    "GroupBy.showHiddenGroups": "نمایش {count} گروه پنهان‌شده",
+    "ViewHeader.view-menu": "نمایش فهرست",
+    "ViewLimitDialog.Heading": "محدودیت تعداد نما برای تخته رسید",
+    "ViewLimitDialog.PrimaryButton.Title.Admin": "ارتقا",
+    "ViewLimitDialog.UpgradeImg.AltText": "ارتقا عکس",
+    "ViewLimitDialog.notifyAdmin.Success": "مدیر شما مطلع شد",
+    "ViewTitle.hide-description": "پنهان کردن توضیحات",
+    "ViewTitle.pick-icon": "انتخاب تصویرک",
+    "ViewTitle.random-icon": "تصادفی",
+    "ViewTitle.remove-icon": "پاک‌کردن تصویرک",
+    "ViewTitle.show-description": "نمایش توضیحات",
+    "ViewTitle.untitled-board": "تخته بدون عنوان",
+    "badge.guest": "مهمان"
 }

From e64887c21a7bf1ef5ea0c6c4c66f0a5e6d813002 Mon Sep 17 00:00:00 2001
From: jprusch <rs@schaeferbarthold.de>
Date: Mon, 10 Apr 2023 22:34:55 +0200
Subject: [PATCH 011/103] Translated using Weblate (German)

Currently translated at 100.0% (5777 of 5777 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/de/
---
 webapp/channels/src/i18n/de.json | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/webapp/channels/src/i18n/de.json b/webapp/channels/src/i18n/de.json
index 4654115f50..5dac2f372b 100644
--- a/webapp/channels/src/i18n/de.json
+++ b/webapp/channels/src/i18n/de.json
@@ -264,11 +264,15 @@
   "admin.billing.history.allPaymentsShowHere": "Alle deine Rechnungen werden hier angezeigt",
   "admin.billing.history.date": "Datum",
   "admin.billing.history.description": "Beschreibung",
+  "admin.billing.history.fractionalAndRatedSeats": "{fractionalSeats} kostenpflichtige Sitze, {fullSeats} Sitze mit voller Berechnung, {partialSeats} Sitze mit Teilberechnung",
+  "admin.billing.history.fractionalSeats": "{fractionalUsers} Sitze",
   "admin.billing.history.noBillingHistory": "Hier wird in Zukunft deine Abrechnungshistorie angezeigt.",
+  "admin.billing.history.onPremSeats": "{num} Sitze",
   "admin.billing.history.pageInfo": "{startRecord} - {endRecord} von {totalRecords}",
   "admin.billing.history.paid": "Bezahlt",
   "admin.billing.history.paymentFailed": "Zahlungsvorgang fehlgeschlagen",
   "admin.billing.history.pending": "Ausstehend",
+  "admin.billing.history.seatsAndRates": "{fullUsers} Sitze mit voller Berechnung, {partialUsers} Sitz mit Teilberechnung",
   "admin.billing.history.seeHowBillingWorks": "Mehr Informationen zum Bezahlen",
   "admin.billing.history.status": "Status",
   "admin.billing.history.title": "Abrechnungshistorie",
@@ -407,6 +411,8 @@
   "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "Bezahlt",
   "admin.billing.subscriptions.billing_summary.lastInvoice.partialCharges": "Teilweise verrechnet",
   "admin.billing.subscriptions.billing_summary.lastInvoice.pending": "Ausstehend",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCount": " x {seats} Sitze",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCountPartial": "{seats} Sitze",
   "admin.billing.subscriptions.billing_summary.lastInvoice.seeBillingHistory": "Siehe Abrechnungsverlauf",
   "admin.billing.subscriptions.billing_summary.lastInvoice.taxes": "Steuern",
   "admin.billing.subscriptions.billing_summary.lastInvoice.title": "Letzte Rechnung",
@@ -1353,6 +1359,7 @@
   "admin.license.upload-modal.file": "Datei",
   "admin.license.upload-modal.subtitle": "Lade eine Lizenzschlüssel für die Mattermost Enterprise Edition hoch, um den Server zu aktualisieren. ",
   "admin.license.upload-modal.successfulUpgrade": "Erfolgreiche Aktualisierung!",
+  "admin.license.upload-modal.successfulUpgradeText": "Du hast auf den {skuName} Plan für {licensedUsersNum, number} Sitze aktualisiert. Diese Änderung ist aktiv vom {startsAt} bis zum {expiresAt}. ",
   "admin.license.upload-modal.title": "Lizenzschlüssel hochladen",
   "admin.license.uploadFile": "Datei hochladen",
   "admin.license.warn.renew": "Erneuern",
@@ -2572,6 +2579,7 @@
   "analytics.system.postTypes": "Nachrichten, Dateien und Hashtags",
   "analytics.system.privateGroups": "Private Kanäle",
   "analytics.system.publicChannels": "Öffentliche Kanäle",
+  "analytics.system.seatsPurchased": "Lizensierte Sitze",
   "analytics.system.skippedIntensiveQueries": "Um die Performance zu maximieren, sind einige Statistiken deaktiviert. Du kannst sie in der <link>config.json reaktivieren</link>.",
   "analytics.system.textPosts": "Nur-Text Beiträge",
   "analytics.system.title": "Systemstatistiken",
@@ -2591,6 +2599,7 @@
   "analytics.team.activeUsers": "Aktive Benutzer mit Beiträgen",
   "analytics.team.newlyCreated": "Neu erstellte Benutzer",
   "analytics.team.noTeams": "Auf diesem Server gibt es keine Teams, für die Statistiken eingesehen werden können.",
+  "analytics.team.overageUsersSeats": "Dies übersteigt die Zahl der bezahlten Sitze",
   "analytics.team.privateGroups": "Private Kanäle",
   "analytics.team.publicChannels": "Öffentliche Kanäle",
   "analytics.team.recentUsers": "Zuletzt aktive Benutzer",
@@ -4159,7 +4168,7 @@
   "more_channels.join": "Beitreten",
   "more_channels.joining": "Beitreten...",
   "more_channels.next": "Weiter",
-  "more_channels.noMore": "Keine Ergebnisse für \"{text}\"",
+  "more_channels.noMore": "Keine weiteren Kanäle zum beitreten",
   "more_channels.prev": "Zurück",
   "more_channels.show_archived_channels": "Anzeigen: Archivierte Kanäle",
   "more_channels.show_public_channels": "Anzeigen: Öffentliche Kanäle",
@@ -4245,6 +4254,9 @@
   "navbar_dropdown.viewMembers": "Zeige Mitglieder",
   "newChannelWithBoard.tutorialTip.description": "Auf das soeben erstellte Board kannst du schnell zugreifen, indem du auf das Symbol Boards in der App-Leiste klickst. Du kannst die Boards, die mit diesem Kanal verknüpft sind, in der rechten Seitenleiste anzeigen und eines in der Vollansicht öffnen.",
   "newChannelWithBoard.tutorialTip.title": "Zugriff auf verknüpfte Boards über die App-Leiste",
+  "newsletter_optin.checkmark.text": "Ich möchte die Sicherheitsupdates von Mattermost per Newsletter erhalten. <a> Es gelten die Allgemeinen Geschäftsbedingungen und Datenschutzrichtlinien</a>",
+  "newsletter_optin.desc": "Melde dich unter <a>{link}</a> an.",
+  "newsletter_optin.title": "Bist du daran interessiert, Mattermost-Sicherheitsupdates per Newsletter zu erhalten?",
   "next_steps_view.welcomeToMattermost": "Willkommen bei Mattermost",
   "no_results.channel_files.subtitle": "Dateien, die in diesem Kanal gepostet wurden, werden hier angezeigt.",
   "no_results.channel_files.title": "Noch keine Dateien",
@@ -4567,6 +4579,7 @@
   "pricing_modal.planSummary.professional": "Skalierbare Lösungen für wachsende Teams",
   "pricing_modal.plan_label_trialDays": "{days} TAGE, DIE IM TEST VERBLEIBEN",
   "pricing_modal.price.freeForever": "Kostenlos für immer",
+  "pricing_modal.rate.seatPerMonth": "USD pro Sitz/Monat {br}<b>(jährliche Abrechnung)</b>",
   "pricing_modal.reviewDeploymentOptions": "Prüfe deine Bereitstellungsoptionen",
   "pricing_modal.start_trial.disclaimer": "Durch Auswahl von <span>30 Tage lang kostenlos testen,</span> stimme ich dem <linkAgreement>Mattermost Software und Services License Agreement</linkAgreement>, <linkPrivacy>der Datenschutz-Richtlinie</linkPrivacy> und dem Erhalt von Produkt-E-Mails zu.",
   "pricing_modal.subtitle": "Wähle einen Plan um loszulegen",
@@ -4704,9 +4717,12 @@
   "self_hosted_signup.cta": "Aktualisieren",
   "self_hosted_signup.disclaimer": "Ich habe die <a>Enterprise Edition Abonnementbedingungen gelesen und stimme ihnen zu.</a>",
   "self_hosted_signup.error_invalid_number": "Gib eine gültige Anzahl von Plätzen ein",
+  "self_hosted_signup.error_max_seats": " Der Lizenzkauf unterstützt nur Käufe bis zu {num} Sitzen",
+  "self_hosted_signup.error_min_seats": "Dein Arbeitsbereich hat derzeit {num} Benutzer",
   "self_hosted_signup.failed_export.subtitle": "Wir werden die Dinge von unserer Seite aus überprüfen und uns innerhalb von 3 Tagen bei dir melden, sobald deine Lizenz genehmigt ist. In der Zwischenzeit kannst du gerne die kostenlose Version unseres Produkts weiter nutzen.",
   "self_hosted_signup.failed_export.title": "Deine Transaktion wird überprüft",
   "self_hosted_signup.license_applied": "Deine {planName} Lizenz wurde jetzt angewendet. {planName} Funktionen sind jetzt verfügbar und einsatzbereit.",
+  "self_hosted_signup.line_item_subtotal": "{num} Sitze × 12 Mo.",
   "self_hosted_signup.organization": "Name der Organisation",
   "self_hosted_signup.progress_step.applying_license": "Übertrage deine {planName} Lizenz auf deine Mattermost-Instanz",
   "self_hosted_signup.progress_step.submitting_payment": "Übermittlung von Zahlungsinformationen",
@@ -4716,10 +4732,10 @@
   "self_hosted_signup.purchase_in_progress.by_self_restart": "Wenn du der Meinung bist, dass dies ein Fehler ist, starte den Kauf erneut.",
   "self_hosted_signup.purchase_in_progress.reset": "Kaufvorgang erneut starten",
   "self_hosted_signup.purchase_in_progress.title": "Kauf in Bearbeitung",
-  "self_hosted_signup.error_min_seats": "Dein Arbeitsbereich hat derzeit {num} Benutzer",
   "self_hosted_signup.retry": "Erneut versuchen",
   "self_hosted_signup.screening_description": "Wir werden die Dinge von unserer Seite aus überprüfen und uns innerhalb von 3 Tagen bei dir melden, sobald deine Lizenz genehmigt ist. In der Zwischenzeit kannst du gerne die kostenlose Version unseres Produkts weiter nutzen.",
   "self_hosted_signup.screening_title": "Deine Transaktion wird überprüft",
+  "self_hosted_signup.seats": "Sitze",
   "self_hosted_signup.signup_consequences": "Du erhältst eine Rechnung von heute. Deine Lizenz wird automatisch angewendet. <a>Sieh, wie die Abrechnung funktioniert.</a>",
   "self_hosted_signup.total": "Summe",
   "setting_item_max.cancel": "Abbrechen",
@@ -5683,7 +5699,11 @@
   "work_templates.customize.name_label_all": "Benenne deinen Kanal, Board und Playbook",
   "work_templates.customize.name_label_channels_boards": "Benenne deinen Kanal und Board",
   "work_templates.customize.name_label_channels_playbooks": "Benenne deinen Kanal und Playbook",
+  "work_templates.customize.private_channel_permission_issue": "Du hast keine Berechtigung private Kanäle zu erstellen.",
   "work_templates.customize.private_playbook_license_issue": "Für private Playbooks ist eine Enterprise-Lizenz erforderlich.",
+  "work_templates.customize.private_playbook_permission_issue": "Du hast keine Berechtigung private Playbooks zu erstellen.",
+  "work_templates.customize.public_channel_permission_issue": "Du hast keine Berechtigung öffentliche Kanäle zu erstellen.",
+  "work_templates.customize.public_playbook_permission_issue": "Du hast keine Berechtigung öffentliche Playbooks zu erstellen.",
   "work_templates.customize.visibility_title": "Wer soll Zugang dazu haben?",
   "work_templates.menu.modal_title": "Erstellen aus einer Vorlage",
   "work_templates.menu.quick_use": "Schneller Einsatz",

From 162e5295ea043e788da4696df2c3d810508fbf8e Mon Sep 17 00:00:00 2001
From: Tom De Moor <tom@controlaltdieliet.be>
Date: Mon, 10 Apr 2023 22:34:56 +0200
Subject: [PATCH 012/103] Translated using Weblate (Dutch)

Currently translated at 100.0% (605 of 605 strings)

Translation: mattermost-languages-shipped/mattermost-playbooks-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-playbooks-webapp-monorepo/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (5777 of 5777 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/nl/
---
 webapp/channels/src/i18n/nl.json | 75 +++++++++++++++++++++++++++-----
 webapp/playbooks/i18n/nl.json    | 22 +++++-----
 2 files changed, 75 insertions(+), 22 deletions(-)

diff --git a/webapp/channels/src/i18n/nl.json b/webapp/channels/src/i18n/nl.json
index 80de3cf29b..51711707fc 100644
--- a/webapp/channels/src/i18n/nl.json
+++ b/webapp/channels/src/i18n/nl.json
@@ -264,11 +264,15 @@
   "admin.billing.history.allPaymentsShowHere": "Een overzicht van al je facturen zal hier worden weergegeven",
   "admin.billing.history.date": "Datum",
   "admin.billing.history.description": "Omschrijving",
+  "admin.billing.history.fractionalAndRatedSeats": "{fractionalSeats} beperkte plaatsen , {fullSeats} plaatsen tegen volledig tarief, {partialSeats} plaatsen met gedeeltelijke kosten",
+  "admin.billing.history.fractionalSeats": "{fractionalUsers} gebruikers",
   "admin.billing.history.noBillingHistory": "In de toekomst zal hier je facturatiegeschiedenis getoond worden.",
+  "admin.billing.history.onPremSeats": "{num} gebruikers",
   "admin.billing.history.pageInfo": "{startRecord}-{endRecord} van {totalRecords}",
   "admin.billing.history.paid": "Betaald",
   "admin.billing.history.paymentFailed": "Betaling is mislukt",
   "admin.billing.history.pending": "Versturen",
+  "admin.billing.history.seatsAndRates": "{fullUsers} gebruikers aan een volledig tarief, {partialUsers} gebruikers met verminderd tarief",
   "admin.billing.history.seeHowBillingWorks": "Meer informatie over hoe de facturering werkt",
   "admin.billing.history.status": "Status",
   "admin.billing.history.title": "Facturatiegeschiedenis",
@@ -407,6 +411,8 @@
   "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "Betaald",
   "admin.billing.subscriptions.billing_summary.lastInvoice.partialCharges": "Gedeeltelijke kosten",
   "admin.billing.subscriptions.billing_summary.lastInvoice.pending": "Openstaand",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCount": " x {seats} gebruikers",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCountPartial": "{seats} gebruikers",
   "admin.billing.subscriptions.billing_summary.lastInvoice.seeBillingHistory": "Facturatiegeschiedenis bekijken",
   "admin.billing.subscriptions.billing_summary.lastInvoice.taxes": "Belasting",
   "admin.billing.subscriptions.billing_summary.lastInvoice.title": "Laatste factuur",
@@ -1333,6 +1339,7 @@
   "admin.license.title": "Editie en Licentie",
   "admin.license.trial-request.accept-terms": "Door op <strong>Start trial</strong> te klikken, ga ik akkoord met de <linkEvaluation>Mattermost's software en diensten licentieovereenkomst</linkEvaluation>, <linkPrivacy>privacybeleid</linkPrivacy>, en het ontvangen van productupdates via mail.",
   "admin.license.trial-request.embargoed": "We konden de aanvraag niet verwerken wegens beperkingen voor landen onder embargo. <link>Lees meer in onze documentatie</link>, of neem contact op met legal@mattermost.com voor vragen over exportbeperkingen.",
+  "admin.license.trial-request.embargoed.button": "Sluiten",
   "admin.license.trial-request.startTrial": "Start de proefperiode",
   "admin.license.trial-request.title": "Ervaar Mattermost Enterprise Edition gratis voor de komende 30 dagen. Geen aankoopverplichting of creditcard vereist. ",
   "admin.license.trialCard.contactSales": "Contacteer de verkoopsafdeling",
@@ -1352,6 +1359,7 @@
   "admin.license.upload-modal.file": "Bestand",
   "admin.license.upload-modal.subtitle": "Upload een licentiesleutel voor Mattermost Enterprise Edition om deze server te upgraden. ",
   "admin.license.upload-modal.successfulUpgrade": "Upgrade geslaagd!",
+  "admin.license.upload-modal.successfulUpgradeText": "Je hebt een upgrade naar het {skuName} plan voor {licensedUsersNum, number} gebruikers. Dit is van kracht vanaf {startsAt} tot {expiresAt}. ",
   "admin.license.upload-modal.title": "Licentiesleutel uploaden",
   "admin.license.uploadFile": "Bestand uploaden",
   "admin.license.warn.renew": "Vernieuwen",
@@ -1981,6 +1989,8 @@
   "admin.requestButton.requestFailure": "Fout bij test: {error}",
   "admin.requestButton.requestSuccess": "Test Succesvol",
   "admin.reset_email.cancel": "Annuleren",
+  "admin.reset_email.currentPassword": "Huidig wachtwoord",
+  "admin.reset_email.missing_current_password": "Voer jouw huidig wachtwoord in.",
   "admin.reset_email.newEmail": "Nieuwe E-mail",
   "admin.reset_email.reset": "Opnieuw instellen",
   "admin.reset_email.titleReset": "Wijzig E-mail",
@@ -2553,6 +2563,9 @@
   "admin.webserverModeUncompressed": "Ongecomprimeerd",
   "admin.webserverModeUncompressedDescription": "Mattermost server zal statische bestanden ongecomprimeerd serveren.",
   "admin_settings.save_unsaved_changes": "Sla niet-opgeslagen wijzigingen eerst op",
+  "air_gapped_modal.close": "Sluiten",
+  "air_gapped_modal.description": "Om jouw proefperiode te starten, ga je naar {link} en vraag je een proeflicentie aan.",
+  "air_gapped_modal.title": "Proeflicentie aanvragen",
   "alert_banner.tooltipCloseBtn": "Sluiten",
   "analytics.chart.loading": "Laden...",
   "analytics.chart.meaningful": "Niet genoeg gegevens voor een zinvolle weergave.",
@@ -2566,6 +2579,7 @@
   "analytics.system.postTypes": "Berichten, bestanden en hashtags",
   "analytics.system.privateGroups": "Privé-kanalen",
   "analytics.system.publicChannels": "Publieke kanalen",
+  "analytics.system.seatsPurchased": "Aantal gebruikers binnen je licentie",
   "analytics.system.skippedIntensiveQueries": "Om de prestaties te maximaliseren, zijn sommige statistieken uitgeschakeld. Je kan deze <link>opnieuw inschakelen in config.json</link> .",
   "analytics.system.textPosts": "Berichten met enkel tekst",
   "analytics.system.title": "Systeem-statistieken",
@@ -2585,6 +2599,7 @@
   "analytics.team.activeUsers": "Actieve gebruikers met berichten",
   "analytics.team.newlyCreated": "Nieuw gemaakte gebruikers",
   "analytics.team.noTeams": "Deze server heeft geen teams om statistische gegevens te bekijken.",
+  "analytics.team.overageUsersSeats": "Dit overschrijdt het totale aantal betaalde gebruikers",
   "analytics.team.privateGroups": "Privé-kanalen",
   "analytics.team.publicChannels": "Publieke kanalen",
   "analytics.team.recentUsers": "Recent actieve gebruikers",
@@ -2636,6 +2651,7 @@
   "app.channel.post_update_channel_purpose_message.removed": "{username} verwijderde het kanaal doel (was: {old})",
   "app.channel.post_update_channel_purpose_message.updated_from": "{username} heeft het doel van het kanaal bijgewerkt van: {old} naar: {new}",
   "app.channel.post_update_channel_purpose_message.updated_to": "{username} heeft het kanaaldoel bijgewerkt naar: {new}",
+  "app_bar.marketplace": "App Marktplaats",
   "apps.error": "Fout: {error}",
   "apps.error.command.field_missing": "Verplichte velden ontbreken: `{fieldName}`.",
   "apps.error.command.same_channel": "Kanaal herhaald voor veld `{fieldName}`: `{option}`.",
@@ -3424,6 +3440,9 @@
   "filtered_user_list.userStatus": "Gebruiker Status:",
   "flag_post.flag": "Bewaar",
   "flag_post.unflag": "Verwijder uit Bewaard",
+  "footer_pagination.count": "Toont {startCount, number}-{endCount, number} van {total, number}",
+  "footer_pagination.next": "Volgende",
+  "footer_pagination.prev": "Vorige",
   "forward_post_button.label": "Doorsturen",
   "forward_post_modal.button.cancel": "Annuleren",
   "forward_post_modal.button.forward": "Doorsturen",
@@ -4068,7 +4087,8 @@
   "mark_all_threads_as_read_modal.title": "Al jouw draadjes als gelezen markeren?",
   "marketplace_command.disabled": "De marktplaats is uitgeschakeld. Neem contact op met jouw systeembeheerder voor meer informatie.",
   "marketplace_command.no_permission": "Je hebt niet de juiste rechten om toegang te krijgen tot de marktplaats.",
-  "marketplace_modal.install_plugins": "Installeer Plugins",
+  "marketplace_modal.app_error": "Fout bij het verbinden met de marktplaats-server. Controleer jouw instellingen in de <linkConsole>Systeem Console</linkConsole>.",
+  "marketplace_modal.install_plugins": "Plugins installeren",
   "marketplace_modal.installing": "Bezig met Installeren...",
   "marketplace_modal.list.configure": "Configureren",
   "marketplace_modal.list.configure.plugin": "{plugin} configureren",
@@ -4085,12 +4105,13 @@
   "marketplace_modal.list.update_confirmation.message.warning_major_version": "Deze update kan ingrijpende wijzigingen bevatten.",
   "marketplace_modal.list.update_confirmation.message.warning_major_version_with_release_notes": "Deze update bevat ingrijpende wijzigingen bevatten . Raadpleeg de [release notities](!{releaseNotesUrl}) voordat je upgrade.",
   "marketplace_modal.list.update_confirmation.title": "Bevestig Plugin-update",
-  "marketplace_modal.no_plugins": "Er zijn geen plugins beschikbaar op dit moment.",
-  "marketplace_modal.no_plugins_installed": "Je hebt geen geïnstalleerde plugins.",
+  "marketplace_modal.no_plugins": "Geen plugins gevonden",
+  "marketplace_modal.no_plugins_installed": "Geen geïnstalleerde plugins gevonden",
   "marketplace_modal.search": "Marktplaats doorzoeken",
   "marketplace_modal.tabs.all_listing": "Allen",
-  "marketplace_modal.tabs.installed_listing": "Geïnstalleerd",
-  "marketplace_modal.title": "Marktplaats",
+  "marketplace_modal.tabs.installed_listing": "{count} geïnstalleerd",
+  "marketplace_modal.title": "App Marktplaats",
+  "marketplace_modal_list.no_plugins_filter": "Geen resultaten voor \"{filter}\"",
   "members_popover.button.message": "bericht",
   "menu.cloudFree.enterpriseTrialDescription": "Jouw proefperiode is actief tot {trialEndDay}. Ontdek onze top Enterprise-functies. <openModalLink>Lees meer</openModalLink>",
   "menu.cloudFree.enterpriseTrialTitle": "Enterprise proef",
@@ -4143,12 +4164,15 @@
   "modal.manual_status.title_ooo": "Je status is ingesteld op \"Out of Office\"",
   "more.details": "Meer details",
   "more_channels.create": "Kanaal aanmaken",
+  "more_channels.createClick": "Klik 'Nieuw kanaal maken' om een nieuw kanaal te maken",
+  "more_channels.join": "Deelnemen",
+  "more_channels.joining": "Lid worden...",
   "more_channels.next": "Volgende",
-  "more_channels.noMore": "Geen kanalen beschikbaar waar aan deelgenomen kan worden",
+  "more_channels.noMore": "Geen verdere kanalen meer om bij aan te sluiten",
   "more_channels.prev": "Vorige",
   "more_channels.show_archived_channels": "Weergeven: Gearchiveerde Kanalen",
   "more_channels.show_public_channels": "Weergeven: Publieke kanalen",
-  "more_channels.title": "Meer kanalen",
+  "more_channels.title": "Meer Kanalen",
   "more_channels.view": "Bekijken",
   "more_direct_channels.directchannel.deactivated": "{displayname} - Gedeactiveerd",
   "more_direct_channels.directchannel.you": "{displayname} (jij)",
@@ -4210,7 +4234,7 @@
   "navbar_dropdown.logout": "Afmelden",
   "navbar_dropdown.manageGroups": "Beheer Groepen",
   "navbar_dropdown.manageMembers": "Leden beheren",
-  "navbar_dropdown.marketplace": "Marktplaats",
+  "navbar_dropdown.marketplace": "App Marktplaats",
   "navbar_dropdown.menuAriaLabel": "Hoofdmenu",
   "navbar_dropdown.nativeApps": "Download Apps",
   "navbar_dropdown.profileSettings": "Profiel",
@@ -4230,6 +4254,9 @@
   "navbar_dropdown.viewMembers": "Bekijk leden",
   "newChannelWithBoard.tutorialTip.description": "Het zojuist aangemaakte bord is snel toegankelijk door te klikken op het pictogram Boards in de App-balk. Je kan de borden die aan dit kanaal zijn gekoppeld in de rechterzijbalk bekijken en er een openen in volledige weergave.",
   "newChannelWithBoard.tutorialTip.title": "Toegang tot gekoppelde borden vanuit de App Bar",
+  "newsletter_optin.checkmark.text": "Ik wil graag Mattermost beveiligingsupdates ontvangen via de nieuwsbrief. Gegevens <a>gebruiksvoorwaarden</a> zijn van toepassing",
+  "newsletter_optin.desc": "Schrijf je in op <a>{link}</a>.",
+  "newsletter_optin.title": "Geïnteresseerd in het ontvangen van Mattermost beveiligingsupdates via de nieuwsbrief?",
   "next_steps_view.welcomeToMattermost": "Welkom bij Mattermost",
   "no_results.channel_files.subtitle": "Bestanden geplaatst in dit kanaal worden hier getoond.",
   "no_results.channel_files.title": "Nog geen bestanden",
@@ -4268,9 +4295,10 @@
   "onboardingTask.checklist.downloads": "Nu dat je helemaal klaar bent, <link>download onze apps.</link>",
   "onboardingTask.checklist.higher_security_features": "Geïnteresseerd in onze hogere beveiligingsfuncties?",
   "onboardingTask.checklist.main_subtitle": "Laten we aan de slag gaan.",
+  "onboardingTask.checklist.no_thanks": "Nee, dank je",
   "onboardingTask.checklist.start_enterprise_now": "Start nu je gratis Enterprise-proefperiode!",
   "onboardingTask.checklist.task_complete_your_profile": "Vervolledig jouw profiel",
-  "onboardingTask.checklist.task_create_from_work_template": "Creëer vanuit een sjabloon - zet een kanaal op met gekoppelde borden en playbooks.",
+  "onboardingTask.checklist.task_create_from_work_template": "Vanuit een sjabloon aanmaken",
   "onboardingTask.checklist.task_download_mm_apps": "Download de desktop-en mobiele apps",
   "onboardingTask.checklist.task_explore_other_tools_in_platform": "Ontdek andere toepassingen binnen het platform.",
   "onboardingTask.checklist.task_invite_team_members": "Nodig teamleden uit tot de werkruimte",
@@ -4355,6 +4383,7 @@
   "payment_form.no_billing_address": "Geen facturatieadres toegevoegd",
   "payment_form.no_credit_card": "Geen kredietkaart toegevoegd",
   "payment_form.saved_payment_method": "Betalingsmethode bewaard",
+  "payment_form.shipping_address": "Verzendadres",
   "payment_form.zipcode": "Postcode",
   "pending_post_actions.cancel": "Annuleren",
   "pending_post_actions.retry": "Probeer opnieuw",
@@ -4550,6 +4579,7 @@
   "pricing_modal.planSummary.professional": "Schaalbare oplossingen voor groeiende teams",
   "pricing_modal.plan_label_trialDays": "{days} DAGEN OVER VAN PROEFPERIODE",
   "pricing_modal.price.freeForever": "Voor altijd gratis",
+  "pricing_modal.rate.seatPerMonth": "USD per gebruiker/maand{br}<b>(Jaarlijks gefactureerd)</b>",
   "pricing_modal.reviewDeploymentOptions": "Bekijk de installatiemogelijkheden",
   "pricing_modal.start_trial.disclaimer": "Door <span>Gratis 30 dagen proberen,</span> te selecteren ga ik akkoord met de <a>Mattermost Software Evaluatie Overeenkomst, Privacy Beleid,</a> en het ontvangen van product emails.",
   "pricing_modal.subtitle": "Kies een plan om te beginnen",
@@ -4687,10 +4717,12 @@
   "self_hosted_signup.cta": "Upgraden",
   "self_hosted_signup.disclaimer": "Ik heb de <a>abonnementsvoorwaarden voorEnterprise Edition</a> gelezen en ga ermee akkoord",
   "self_hosted_signup.error_invalid_number": "Voer een geldig aantal zetels in",
+  "self_hosted_signup.error_max_seats": " licentieaankoop ondersteunt alleen aankopen tot {num} gebruikers",
   "self_hosted_signup.error_min_seats": "Jouw werkruimte heeft momenteel {num} gebruikers",
   "self_hosted_signup.failed_export.subtitle": "Wij controleren de zaken aan onze kant en nemen binnen 3 dagen contact met jou op zodra jouuw licentie is goedgekeurd. In de tussentijd kan je gerust de gratis versie van ons product blijven gebruiken.",
   "self_hosted_signup.failed_export.title": "Jouw transactie wordt bekeken",
   "self_hosted_signup.license_applied": "Jouw {planName} licentie is nu toegepast. {planName} functies zijn nu beschikbaar en klaar voor gebruik.",
+  "self_hosted_signup.line_item_subtotal": "{num} gebruikers × 12 maanden.",
   "self_hosted_signup.organization": "Naam organisatie",
   "self_hosted_signup.progress_step.applying_license": "Jouw {planName} licentie toepassen op jouw Mattermost instantie",
   "self_hosted_signup.progress_step.submitting_payment": "Betalingsinformatie indienen",
@@ -4703,6 +4735,7 @@
   "self_hosted_signup.retry": "Probeer opnieuw",
   "self_hosted_signup.screening_description": "Wij controleren de zaken aan onze kant en nemen binnen 3 dagen contact met jou op zodra jouuw licentie is goedgekeurd. In de tussentijd kan je gerust de gratis versie van ons product blijven gebruiken.",
   "self_hosted_signup.screening_title": "Jouw transactie wordt bekeken",
+  "self_hosted_signup.seats": "Gebruikers",
   "self_hosted_signup.signup_consequences": "Je wordt gefactureerd op *today*. Jouw licentie wordt automatisch toegepast. <a>Zie hoe facturering werkt.</a>",
   "self_hosted_signup.total": "Totaal",
   "setting_item_max.cancel": "Annuleren",
@@ -4837,7 +4870,7 @@
   "sidebar.directchannel.you": "{displayname} (jij)",
   "sidebar.menu.item.notSelected": "niet geselecteerd",
   "sidebar.menu.item.selected": "geselecteerd",
-  "sidebar.openDirectMessage": "Open een direct bericht",
+  "sidebar.openDirectMessage": "Een privé-bericht openen",
   "sidebar.show": "Toon",
   "sidebar.sort": "Sorteer",
   "sidebar.sortedByRecencyLabel": "Recente activiteit",
@@ -4852,6 +4885,8 @@
   "sidebar.types.favorites": "FAVORIETEN",
   "sidebar.types.unreads": "ONGELEZEN BERICHTEN",
   "sidebar.unreads": "Meer ongelezen berichten",
+  "sidebar_left.addChannelsCta": "Kanalen toevoegen",
+  "sidebar_left.add_channel_cta_dropdown.dropdownAriaLabel": "Kanaal toevoegen Dropdown",
   "sidebar_left.add_channel_dropdown.browseChannels": "Kanalen doorbladeren",
   "sidebar_left.add_channel_dropdown.browseOrCreateChannels": "Doorblader of maak kanalen",
   "sidebar_left.add_channel_dropdown.createCategory": "Maak een nieuwe categorie",
@@ -4900,6 +4935,7 @@
   "sidebar_left.sidebar_channel_menu.unfavoriteChannel": "Markeren als favoriet ongedaan maken",
   "sidebar_left.sidebar_channel_menu.unmuteChannel": "Kanaal niet langer dempen",
   "sidebar_left.sidebar_channel_menu.unmuteConversation": "Conversatie niet langer dempen",
+  "sidebar_left.sidebar_channel_navigator.addChannelsCta": "Kanalen toevoegen",
   "sidebar_left.sidebar_channel_navigator.inviteUsers": "Gebruikers uitnodigen",
   "sidebar_right_menu.console": "Systeem console",
   "sidebar_right_menu.flagged": "Bewaarde berichten",
@@ -4951,6 +4987,18 @@
   "start_trial.modal_btn.start_free_trial": "Start je gratis 30-dagen proefperiode",
   "start_trial.tutorialTip.desc": "Ontdek onze meest gevraagde premium-functies. Bepaal gebruikerstoegang met gastaccounts, automatiseer nalevingsrapporten en verstuur veilige mobiele pushmeldingen met alleen ID's.",
   "start_trial.tutorialTip.title": "Probeer onze premium-functies gratis",
+  "start_trial_form.company_name": "Bedrijfsnaam",
+  "start_trial_form.company_size": "Bedrijfsgrootte",
+  "start_trial_form.disclaimer": "Door Proefperiode starten te selecteren, ga ik akkoord met de <agreement>Mattermost Software Evaluation Agreement</agreement>, <privacypolicy>Privacy Policy</privacypolicy>, en het ontvangen van product e-mails.",
+  "start_trial_form.email": "Zakelijk e-mailadres",
+  "start_trial_form.invalid_business_email": "Voer een geldig zakelijk e-mailadres in.",
+  "start_trial_form.modal_body": "Een paar kleine puntjes m ons te helpen jouw proefervaring volledig op maat te maken",
+  "start_trial_form.modal_btn.start": "Proefperiode starten",
+  "start_trial_form.modal_title": "Proefperiode starten",
+  "start_trial_form.name": "Naam",
+  "start_trial_form_modal.failureModal.subtitle": "Er was een probleem met de verwerking van jouw verzoek.",
+  "start_trial_form_modal.failureModal.subtitle2": "Probeer het opnieuw of neem contact op met de helpdesk.",
+  "start_trial_form_modal.failureModal.title": "Probeer het opnieuw",
   "status_dropdown.dnd_sub_menu_header": "Meldingen uitschakelen tot:",
   "status_dropdown.dnd_sub_menu_item.custom": "Aangepast",
   "status_dropdown.dnd_sub_menu_item.one_hour": "1 uur",
@@ -5634,6 +5682,7 @@
   "welcome_post_renderer.user_message.first_paragraph": "Mattermost is een open source platform voor veilige communicatie, samenwerking en coördinatie van werk over tools en teams heen.",
   "welcome_post_renderer.user_message.second_paragraph": "Hier is een lijst met commando's die je kan gebruiken om vertrouwd te raken met het platform.",
   "welcome_post_renderer.user_message.title": "Welkom bij Mattermost! :rocket:",
+  "widget.input.clear": "Wissen",
   "widget.input.required": "Dit veld is verplicht",
   "widget.passwordInput.createPassword": "Kies een wachtwoord",
   "widget.passwordInput.password": "Wachtwoord",
@@ -5650,9 +5699,13 @@
   "work_templates.customize.name_label_all": "Geef jouw kanaal, bord en playbook een naam",
   "work_templates.customize.name_label_channels_boards": "Geef je kanaal en bord een naam",
   "work_templates.customize.name_label_channels_playbooks": "Geef jouw kanaal en playbook een naam",
+  "work_templates.customize.private_channel_permission_issue": "Je hebt geen rechten om privé-kanalen aan te maken.",
   "work_templates.customize.private_playbook_license_issue": "Voor private playbooks is een Enterprise-licentie vereist.",
+  "work_templates.customize.private_playbook_permission_issue": "Je hebt geen rechten om privé-playbooks aan te maken.",
+  "work_templates.customize.public_channel_permission_issue": "Je hebt geen rechten om publieke kanalen aan te maken.",
+  "work_templates.customize.public_playbook_permission_issue": "Je hebt geen rechten om publieke playbooks aan te maken.",
   "work_templates.customize.visibility_title": "Wie moet hier toegang toe hebben?",
-  "work_templates.menu.modal_title": "Starten vanuit een sjabloon",
+  "work_templates.menu.modal_title": "Vanuit een sjabloon aanmaken",
   "work_templates.menu.quick_use": "Snel gebruik",
   "work_templates.menu.template_title": "SJABLOON",
   "work_templates.menu.usecase_boards_count": "{boardsCount, plural, =1 {# bord} other {# borden}}",
diff --git a/webapp/playbooks/i18n/nl.json b/webapp/playbooks/i18n/nl.json
index d53856b06a..13c7c7e985 100644
--- a/webapp/playbooks/i18n/nl.json
+++ b/webapp/playbooks/i18n/nl.json
@@ -19,7 +19,7 @@
     "XmUdvV": "Alle statistieken die je nodig hebt",
     "UbTsGY": "Uitvoeringen gestart tussen {start} en {end}",
     "TSSNg/": "TOTAAL UITVOERINGEN gestart per week over de laatste 12 weken",
-    "RoGxij": "Wordt uitgevoerd op {date}",
+    "RoGxij": "Actieve uitvoering op {date}",
     "Q7aZO4": "{numParticipants, plural, =0 {geen actieve deelnemers} =1 {# actieve deelnemer} other {# actieve deelnemers}}",
     "KiXNvz": "Uitvoeren",
     "AF9wda": "Deze update zal worden opgeslagen op de <OverviewLink>overzichtspagina</OverviewLink>{hasBroadcast, select, true { en uitgezonden naar <ChannelsTooltip>{broadcastChannelCount, plural, =1 {een kanaal} other{{broadcastChannelCount, number} kanalen}}</ChannelsTooltip>} other{}}.",
@@ -129,7 +129,7 @@
     "OcpRSQ": "Invoer wissen",
     "OINwWS": "Maak een {isPublic, select, true {publiek} other {privé}} kanaal",
     "N1U/QR": "Status van taak veranderd",
-    "MvEydR": "{name} heeft een status update geplaatst",
+    "MvEydR": "{name} heeft een statusupdate geplaatst",
     "MFpAtm": "{numTasks, number} {numTasks, plural, one {taak} other {taken}}",
     "LmhSmU": "Bevestig wissen invoer",
     "LRFvqz": "Kondig aan in het {oneChannel, plural, one {kanaal} other {kanalen}}",
@@ -349,7 +349,7 @@
     "C6Oghd": "Bewerk samenvatting van de uitvoering",
     "fuDLDJ": "Maak een nieuw kanaal",
     "d4g2r8": "Verwijderd: {timestamp}",
-    "4vuNrq": "{duration} nadat de uitvoering begon",
+    "4vuNrq": "{duration} sinds de uitvoering begon",
     "/gbqA6": "{duration} voordat de uitvoering begon",
     "O8o2lE": "Kanaal toevoegen aan categorie",
     "Mu2aDs": "Iedereen in team (<b>{team}</b>) heeft toegang.",
@@ -388,7 +388,7 @@
     "g0mp+I": "Wanneer je dit omzet naar een privaat playbook, blijven lidmaatschap en uitvoeringsgeschiedenis behouden. Deze verandering is permanent en kan niet ongedaan worden gemaakt. Weet je zeker dat je {playbookTitle} wilt omzetten naar een privaat playbook?",
     "SXJ98n": "Je kan de terugblikrapportage niet meer bewerken nadat je dit hebt gepubliceerd. Wil je de terugblikrapportage publiceren?",
     "R/2lqw": "Kies een sjabloon",
-    "QpUBDr": "{members, plural, =0 {Niemand} =1 {één persoon} other {# mensen}} hebben toegang tot dit playbook.",
+    "QpUBDr": "{members, plural, =0 {Niemand} =1 {één persoon heeft} other {# mensen hebben}} toegang tot dit playbook.",
     "MJ89uW": "Omzetten naar privaat playbook",
     "HLn43R": "Toegang beheren",
     "0Vvpht": "Maak Playbook lid",
@@ -424,7 +424,7 @@
     "OyZnsJ": "per uitvoering",
     "NYTGIb": "Begrepen",
     "NJ9uPu": "Belangrijkste meetwaarden",
-    "MTzF3S": "Weet je zeker dat je het playbook {title} wilt herstellen?",
+    "MTzF3S": "Weet je zeker dat je de playbook {title} wilt herstellen?",
     "LI7YlB": "Voeg details toe over waar deze meetwaarde over gaat en hoe deze ingevuld moet worden. Deze beschrijving zal beschikbaar zijn op de terugblikpagina voor elke uitvoering waar de waarden voor deze meetwaarde zullen worden ingevoerd.",
     "LDYFkN": "Duur (in dd:hh:mm)",
     "JrZ2th": "Meetwaarde toevoegen",
@@ -522,7 +522,7 @@
     "iMjjOH": "Volgende week",
     "aEhjYg": "Doel",
     "MtrTNy": "Morgen",
-    "MbapTE": "{num} {num, plural, =1 {taak} other {taken}} laattijdig",
+    "MbapTE": "{num} {num, plural, =1 {taak} other {taken}} overtijd",
     "I7+d55": "Geef een datum/tijd op (\"over 4 uur\", \"1 mei\"...)",
     "AF7+5o": "Vervaldatum toevoegen",
     "W0aij2": "Toewijzen aan...",
@@ -548,7 +548,7 @@
     "v5/Cox": "Dupliceer checklist",
     "mCrdeS": "Totaal aantal Playbook uotvoeringen",
     "cyR7Kh": "Terug",
-    "XF8rrh": "Kopieer link naar ''{name}''",
+    "XF8rrh": "Copy link to \"{name}\"",
     "MyIJbr": "Inhoud",
     "IxtSML": "Een checklist toevoegen",
     "CwwzAU": "Voeg naam toe van checklist",
@@ -586,7 +586,7 @@
     "3hBelc": "Een terugblik wordt niet verwacht.",
     "yllba1": "Dit gearchiveerde playbook kan niet hernoemd worden.",
     "xEQYo5": "Configureer aangepaste meetwaarden om in te vullen met het terugblikrapport.",
-    "oL7YsP": "Laatst bewerkt {timestamp}",
+    "oL7YsP": "Laatst bijgewerkt {timestamp}",
     "Z2Hfu4": "Voeg een samenvatting van de uitvoering toe",
     "TD8WrM": "Dupliceren is uitgeschakeld voor dit team.",
     "OQplDX": "Elke <duration></duration> wordt een statusupdate verwacht. Nieuwe updates worden geplaatst in <channels>{channelCount, plural, =0 {geen kanalen} one {# kanaal} other {# kanalen}}</channels> and <webhooks>{webhookCount, plural, =0 {geen uitgaande webhooks} one {# uitgaande webhook} other {# uitgaande webhooks}}</webhooks> .",
@@ -679,7 +679,7 @@
     "mttASm": "Verlaten en het niet langer volgen",
     "lpWBJE": "Verlaten en het niet langer volgen bevestingen",
     "hnYSP3": "Wanneer je een uitvoering verlaat en niet langer volgt, wordt deze verwijderd uit de linkerzijbalk. Je kan deze terugvinden door alle uitvoeringen te bekijken.",
-    "XS4umx": "{name} snoozed een status-update",
+    "XS4umx": "{name} snoozde een status-update",
     "5Hzwqs": "Markeren als favoriet",
     "Mjq//Y": "Markeren als favoriet ongedaan maken",
     "AhY0vJ": "Verlaten en niet langer volgen",
@@ -721,7 +721,7 @@
     "jAo8dd": "Statusupdates uitvoeren uitgeschakeld door {name}",
     "cpGAhx": "Weet je zeker dat je statusupdates wilt uitschakelen voor deze uitvoering?",
     "cUCiWw": "Word een deelnemer",
-    "b8Gps8": "Statusupdates uitvoeren ingeschakeld door {name}",
+    "b8Gps8": "Statusupdates van uitvoering ingeschakeld door {name}",
     "WFA0Cg": "Weet je zeker dat je statusupdates wilt inschakelen voor deze uitvoering?",
     "WC+NOj": "Voeg ook mensen toe aan het kanaal gekoppeld aan deze uitvoering",
     "H7IzRB": "Statusupdates uitschakelen",
@@ -729,7 +729,7 @@
     "1prgB2": "Mensen zoeken",
     "1OluNs": "Bevestig het inschakelen van statusupdates",
     "1OVPiC": "Word deelnemer aan de uitvoering. Als deelnemer kan je statusupdates plaatsen, taken toewijzen en voltooien en terugblikken uitvoeren.",
-    "//o1Nu": "Updates uitschakelen",
+    "//o1Nu": "Schakel updates uit",
     "Z18I+c": "Met kanaalacties kan je activiteiten voor dit kanaal automatiseren",
     "Y1EoT/": "Als een deelnemer de uitvoering verlaat",
     "VM75su": "{name} verwijderde {num} deelnemers van de uitvoering",

From 627f952b08b557ffbb28d2b782684e538fcd8fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20Balsevi=C4=8Dius?= <andrius@geocad.lt>
Date: Mon, 10 Apr 2023 22:34:56 +0200
Subject: [PATCH 013/103] Translated using Weblate (Lithuanian)

Currently translated at 100.0% (454 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/lt/
---
 webapp/boards/i18n/lt.json | 457 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 456 insertions(+), 1 deletion(-)

diff --git a/webapp/boards/i18n/lt.json b/webapp/boards/i18n/lt.json
index 0967ef424b..27c6f80214 100644
--- a/webapp/boards/i18n/lt.json
+++ b/webapp/boards/i18n/lt.json
@@ -1 +1,456 @@
-{}
+{
+  "AdminBadge.SystemAdmin": "Administratorius",
+  "AdminBadge.TeamAdmin": "Komandos administratorius",
+  "AppBar.Tooltip": "Perjungti susietas lentas",
+  "Attachment.Attachment-title": "Priedas",
+  "AttachmentBlock.DeleteAction": "Ištrinti",
+  "AttachmentBlock.addElement": "pridėti {type}",
+  "AttachmentBlock.delete": "Priedas ištrintas.",
+  "AttachmentBlock.failed": "Šio failo nepavyko įkelti, nes pasiektas failo dydžio limitas.",
+  "AttachmentBlock.upload": "Priedo įkėlimas.",
+  "AttachmentBlock.uploadSuccess": "Priedas įkeltas.",
+  "AttachmentElement.delete-confirmation-dialog-button-text": "Ištrinti",
+  "AttachmentElement.download": "Parsisiųsti",
+  "AttachmentElement.upload-percentage": "Įkeliama...({uploadPercent}%)",
+  "BoardComponent.add-a-group": "+ Pridėti grupę",
+  "BoardComponent.delete": "Ištrinti",
+  "BoardComponent.hidden-columns": "Paslėpti stulpeliai",
+  "BoardComponent.hide": "Slėpti",
+  "BoardComponent.new": "+ Naujas",
+  "BoardComponent.no-property": "Nėra {property}",
+  "BoardComponent.no-property-title": "Elementai su tuščia nuosavybe {property} pateks čia. Šio stulpelio pašalinti negalima.",
+  "BoardComponent.show": "Rodyti",
+  "BoardMember.schemeAdmin": "Administratorius",
+  "BoardMember.schemeCommenter": "Komentuotojas",
+  "BoardMember.schemeEditor": "Redaktorius",
+  "BoardMember.schemeNone": "Joks",
+  "BoardMember.schemeViewer": "Žiūriklis",
+  "BoardMember.unlinkChannel": "Atsieti",
+  "BoardPage.newVersion": "Yra nauja Boards versija. Spustelėkite čia, kad įkeltumėte iš naujo.",
+  "BoardPage.syncFailed": "Lenta gali būti ištrinta arba jos prieiga gali būti atšaukta.",
+  "BoardTemplateSelector.add-template": "Sukurti naują šabloną",
+  "BoardTemplateSelector.create-empty-board": "Sukurti tuščią lentą",
+  "BoardTemplateSelector.delete-template": "Ištrinti",
+  "BoardTemplateSelector.description": "Pridėkite lentą prie šoninės juostos naudodami bet kurį iš toliau nurodytų šablonų arba pradėkite nuo nulio.",
+  "BoardTemplateSelector.edit-template": "Redaguoti",
+  "BoardTemplateSelector.plugin.no-content-description": "Pridėkite lentą prie šoninės juostos naudodami bet kurį iš toliau nurodytų šablonų arba pradėkite nuo nulio.",
+  "BoardTemplateSelector.plugin.no-content-title": "Sukurti lentą",
+  "BoardTemplateSelector.title": "Sukurti lentą",
+  "BoardTemplateSelector.use-this-template": "Naudoti šį šabloną",
+  "BoardsSwitcher.Title": "Rasti lentas",
+  "BoardsUnfurl.Limited": "Papildoma informacija yra paslėpta, nes kortelė yra archyvuojama",
+  "BoardsUnfurl.Remainder": "+{remainder} dar",
+  "BoardsUnfurl.Updated": "Atnaujinta {time}",
+  "Calculations.Options.average.displayName": "Vidutinis",
+  "Calculations.Options.average.label": "Vidutinis",
+  "Calculations.Options.count.displayName": "Skaičius",
+  "Calculations.Options.count.label": "Skaičius",
+  "Calculations.Options.countChecked.displayName": "Pažymėta",
+  "Calculations.Options.countChecked.label": "Skaičius patikrintas",
+  "Calculations.Options.countUnchecked.displayName": "Nepažymėta",
+  "Calculations.Options.countUnchecked.label": "Skaičiaus žymėjimas panaikintas",
+  "Calculations.Options.countUniqueValue.displayName": "Unikalus",
+  "Calculations.Options.countUniqueValue.label": "Suskaičiuoti unikalias reikšmes",
+  "Calculations.Options.countValue.displayName": "Reikšmės",
+  "Calculations.Options.countValue.label": "Skaičius",
+  "Calculations.Options.dateRange.displayName": "Diapazonas",
+  "Calculations.Options.dateRange.label": "Diapazonas",
+  "Calculations.Options.earliest.displayName": "Anksčiausiai",
+  "Calculations.Options.earliest.label": "Anksčiausiai",
+  "Calculations.Options.latest.displayName": "Naujausias",
+  "Calculations.Options.latest.label": "Naujausias",
+  "Calculations.Options.max.displayName": "Maks.",
+  "Calculations.Options.max.label": "Maks.",
+  "Calculations.Options.median.displayName": "Mediana",
+  "Calculations.Options.median.label": "Mediana",
+  "Calculations.Options.min.displayName": "Min.",
+  "Calculations.Options.min.label": "Min.",
+  "Calculations.Options.none.displayName": "Apskaičiuoti",
+  "Calculations.Options.none.label": "Joks",
+  "Calculations.Options.percentChecked.displayName": "Pažymėta",
+  "Calculations.Options.percentChecked.label": "Patikrinta procentais",
+  "Calculations.Options.percentUnchecked.displayName": "Nepažymėta",
+  "Calculations.Options.percentUnchecked.label": "Nepažymėtas procentas",
+  "Calculations.Options.range.displayName": "Diapazonas",
+  "Calculations.Options.range.label": "Diapazonas",
+  "Calculations.Options.sum.displayName": "Iš viso",
+  "Calculations.Options.sum.label": "Iš viso",
+  "CalendarCard.untitled": "Be pavadinimo",
+  "CardActionsMenu.copiedLink": "Nukopijuota!",
+  "CardActionsMenu.copyLink": "Kopijuoti nuorodą",
+  "CardActionsMenu.delete": "Ištrinti",
+  "CardActionsMenu.duplicate": "Pasikartojantis",
+  "CardBadges.title-checkboxes": "Žymimieji langeliai",
+  "CardBadges.title-comments": "Komentarai",
+  "CardBadges.title-description": "Ši kortelė turi aprašymą",
+  "CardDetail.Attach": "Prisegti",
+  "CardDetail.Follow": "Sekti",
+  "CardDetail.Following": "Sekama",
+  "CardDetail.add-content": "Pridėti turinį",
+  "CardDetail.add-icon": "Pridėti piktogramą",
+  "CardDetail.add-property": "+ Pridėti savybę",
+  "CardDetail.addCardText": "pridėti kortelės tekstą",
+  "CardDetail.limited-body": "Naujovinkite į mūsų Professional arba Enterprise planą.",
+  "CardDetail.limited-button": "Patobulinti",
+  "CardDetail.limited-title": "Ši kortelė paslėpta",
+  "CardDetail.moveContent": "Perkelti kortelės turinį",
+  "CardDetail.new-comment-placeholder": "Pridėti komentarą...",
+  "CardDetailProperty.confirm-delete-heading": "Patvirtinkite nuosavybės ištrynimą",
+  "CardDetailProperty.confirm-delete-subtext": "Ar tikrai norite ištrinti savybę „{propertyName}“? Ją ištrynus, savybė bus ištrinta iš visų šios lentos kortelių.",
+  "CardDetailProperty.confirm-property-name-change-subtext": "Ar tikrai norite pakeisti savybę „{propertyName}“ {customText}? Tai turės įtakos {numOfCards} kortelės reikšmei (-ėms) šioje lentoje ir duomenys gali būti prarasti.",
+  "CardDetailProperty.confirm-property-type-change": "Patvirtinkite nuosavybės tipo pakeitimą",
+  "CardDetailProperty.delete-action-button": "Ištrinti",
+  "CardDetailProperty.property-change-action-button": "Keisti savybę",
+  "CardDetailProperty.property-changed": "Savybė sėkmingai pakeista!",
+  "CardDetailProperty.property-deleted": "{propertyName} sėkmingai ištrinta!",
+  "CardDetailProperty.property-name-change-subtext": "įveskite iš „{oldPropType}“ į „{newPropType}“",
+  "CardDetial.limited-link": "Sužinokite daugiau apie mūsų planus.",
+  "CardDialog.delete-confirmation-dialog-attachment": "Patvirtinkite priedo ištrynimą",
+  "CardDialog.delete-confirmation-dialog-button-text": "Ištrinti",
+  "CardDialog.delete-confirmation-dialog-heading": "Patvirtinkite kortelės ištrynimą",
+  "CardDialog.editing-template": "Jūs redaguojate šabloną.",
+  "CardDialog.nocard": "Šios kortelės nėra arba ji nepasiekiama.",
+  "Categories.CreateCategoryDialog.CancelText": "Atšaukti",
+  "Categories.CreateCategoryDialog.CreateText": "Sukurti",
+  "Categories.CreateCategoryDialog.Placeholder": "Pavadinkite savo kategoriją",
+  "Categories.CreateCategoryDialog.UpdateText": "Atnaujinti",
+  "CenterPanel.Login": "Prisijungti",
+  "CenterPanel.Share": "Bendrinti",
+  "ChannelIntro.CreateBoard": "Sukurti lentą",
+  "ColorOption.selectColor": "Pasirinkti {color} spalvą",
+  "Comment.delete": "Ištrinti",
+  "CommentsList.send": "Siųsti",
+  "ConfirmPerson.empty": "Tuščias",
+  "ConfirmPerson.search": "Ieškoti...",
+  "ConfirmationDialog.cancel-action": "Atšaukti",
+  "ConfirmationDialog.confirm-action": "Patvirtinti",
+  "ContentBlock.Delete": "Ištrinti",
+  "ContentBlock.DeleteAction": "Ištrinti",
+  "ContentBlock.addElement": "pridėti {type}",
+  "ContentBlock.checkbox": "žymimasis langelis",
+  "ContentBlock.divider": "skirtukas",
+  "ContentBlock.editCardCheckbox": "perjungtas žymimasis laukelis",
+  "ContentBlock.editCardCheckboxText": "redaguoti kortelės tekstą",
+  "ContentBlock.editCardText": "redaguoti kortelės tekstą",
+  "ContentBlock.editText": "Keisti tekstą...",
+  "ContentBlock.image": "Paveikslėlis",
+  "ContentBlock.insertAbove": "Įdėti aukščiau",
+  "ContentBlock.moveBlock": "perkelti kortelės turinį",
+  "ContentBlock.moveDown": "Perkelti žemyn",
+  "ContentBlock.moveUp": "Perkelti aukštyn",
+  "ContentBlock.text": "tekstas",
+  "DateFilter.empty": "Tuščias",
+  "DateRange.clear": "Išvalyti",
+  "DateRange.empty": "Tuščias",
+  "DateRange.endDate": "Pabaigos data",
+  "DateRange.today": "Šiandien",
+  "DeleteBoardDialog.confirm-cancel": "Atšaukti",
+  "DeleteBoardDialog.confirm-delete": "Ištrinti",
+  "DeleteBoardDialog.confirm-info": "Ar tikrai norite ištrinti lentą „{boardTitle}“? Ją ištrynus, bus ištrintos visos lentos kortelės.",
+  "DeleteBoardDialog.confirm-info-template": "Ar tikrai norite ištrinti lentos šabloną „{boardTitle}“?",
+  "DeleteBoardDialog.confirm-tite": "Patvirtinkite lentos ištrynimą",
+  "DeleteBoardDialog.confirm-tite-template": "Patvirtinkite lentos šablono ištrynimą",
+  "Dialog.closeDialog": "Uždaryti dialogo langą",
+  "EditableDayPicker.today": "Šiandien",
+  "Error.mobileweb": "Mobiliojo žiniatinklio palaikymas šiuo metu yra ankstyvoje beta versijoje. Gali būti ne visos funkcijos.",
+  "Error.websocket-closed": "Interneto lizdo ryšys uždarytas, ryšys nutrauktas. Jei tai išlieka, patikrinkite savo serverio arba žiniatinklio tarpinio serverio konfigūraciją.",
+  "Filter.contains": "turi",
+  "Filter.ends-with": "baigiasi",
+  "Filter.includes": "apima",
+  "Filter.is": "yra",
+  "Filter.is-after": "yra po",
+  "Filter.is-before": "yra prieš",
+  "Filter.is-empty": "yra tuščias",
+  "Filter.is-not-empty": "nėra tuščias",
+  "Filter.is-not-set": "nėra nustatytas",
+  "Filter.is-set": "yra nustatytas",
+  "Filter.isafter": "yra po",
+  "Filter.isbefore": "yra prieš",
+  "Filter.not-contains": "nėra",
+  "Filter.not-ends-with": "nesibaigia",
+  "Filter.not-includes": "neapima",
+  "Filter.not-starts-with": "neprasideda",
+  "Filter.starts-with": "prasideda",
+  "FilterByText.placeholder": "filtruoti tekstą",
+  "FilterComponent.add-filter": "+ Pridėti filtrą",
+  "FilterComponent.delete": "Ištrinti",
+  "FilterValue.empty": "(tuščia)",
+  "FindBoardsDialog.IntroText": "Ieškoti lentų",
+  "FindBoardsDialog.NoResultsFor": "Nėra rezultatų pagal „{searchQuery}“",
+  "FindBoardsDialog.NoResultsSubtext": "Patikrinkite rašybą arba pabandykite atlikti kitą paiešką.",
+  "FindBoardsDialog.SubTitle": "Įveskite, kad rastumėte lentą. Norėdami naršyti, naudokite <b>AUKŠTYN / ŽEMYN</b>. <b>ENTER</b> , kad pasirinktumėte, <b>ESC</b> , kad atsisakytumėte",
+  "FindBoardsDialog.Title": "Raskite lentas",
+  "GroupBy.hideEmptyGroups": "Slėpti {count} tuščias grupes",
+  "GroupBy.showHiddenGroups": "Rodyti paslėptas grupes: {count}",
+  "GroupBy.ungroup": "Išgrupuoti",
+  "HideBoard.MenuOption": "Paslėpti lentą",
+  "KanbanCard.untitled": "Be pavadinimo",
+  "MentionSuggestion.is-not-board-member": "(ne lentos narys)",
+  "Mutator.new-board-from-template": "nauja lenta pagal šabloną",
+  "Mutator.new-card-from-template": "nauja kortelė pagal šabloną",
+  "Mutator.new-template-from-card": "naujas šablonas pagal kortelę",
+  "OnboardingTour.AddComments.Body": "Galite komentuoti problemas ir net @paminėti kitus Mattermost naudotojus, kad atkreiptumėte jų dėmesį.",
+  "OnboardingTour.AddComments.Title": "Pridėti komentarų",
+  "OnboardingTour.AddDescription.Body": "Pridėkite aprašymą prie savo kortelės, kad komandos draugai žinotų, kam ji skirta.",
+  "OnboardingTour.AddDescription.Title": "Pridėti aprašymą",
+  "OnboardingTour.AddProperties.Body": "Pridėkite prie kortelių įvairių savybių, kad jos būtų dar galingesnės.",
+  "OnboardingTour.AddProperties.Title": "Pridėti savybių",
+  "OnboardingTour.AddView.Body": "Eikite čia, kad sukurtumėte naują rodinį ir galėtumėte tvarkyti lentą naudodami skirtingus išdėstymus.",
+  "OnboardingTour.AddView.Title": "Pridėti naują rodinį",
+  "OnboardingTour.CopyLink.Body": "Galite bendrinti savo korteles su komandos draugais nukopijuodami nuorodą ir įklijuodami ją į kanalą, tiesioginį pranešimą ar grupės pranešimą.",
+  "OnboardingTour.CopyLink.Title": "Kopijuoti nuorodą",
+  "OnboardingTour.OpenACard.Body": "Atidarykite kortelę, kad sužinotumėte, kokiais galingais būdais Boards gali padėti organizuoti darbą.",
+  "OnboardingTour.OpenACard.Title": "Atidaryti kortelę",
+  "OnboardingTour.ShareBoard.Body": "Galite bendrinti lentą viduje, savo komandoje arba paskelbti ją viešai, kad būtų matoma už organizacijos ribų.",
+  "OnboardingTour.ShareBoard.Title": "Bendrinti lentą",
+  "PersonProperty.board-members": "Lentos nariai",
+  "PersonProperty.me": "aš",
+  "PersonProperty.non-board-members": "Ne lentos nariai",
+  "PropertyMenu.Delete": "Ištrinti",
+  "PropertyMenu.changeType": "Pakeisti savybės tipą",
+  "PropertyMenu.selectType": "Pasirinkti savybės tipą",
+  "PropertyMenu.typeTitle": "Tipas",
+  "PropertyType.Checkbox": "Žymimasis langelis",
+  "PropertyType.CreatedBy": "Sukurta",
+  "PropertyType.CreatedTime": "Sukūrimo laikas",
+  "PropertyType.Date": "Data",
+  "PropertyType.Email": "El. paštas",
+  "PropertyType.MultiPerson": "Daugelio žmonių",
+  "PropertyType.MultiSelect": "Keletas pasirinkimų",
+  "PropertyType.Number": "Skaičius",
+  "PropertyType.Person": "Asmuo",
+  "PropertyType.Phone": "Telefonas",
+  "PropertyType.Select": "Pasirinkite",
+  "PropertyType.Text": "Tekstas",
+  "PropertyType.Unknown": "Nežinoma",
+  "PropertyType.UpdatedBy": "Paskutinį kartą atnaujino",
+  "PropertyType.UpdatedTime": "Paskutinio atnaujinimo laikas",
+  "PropertyType.Url": "URL",
+  "PropertyValueElement.empty": "Tuščias",
+  "RegistrationLink.confirmRegenerateToken": "Tai panaikins anksčiau bendrintas nuorodas. Tęsti?",
+  "RegistrationLink.copiedLink": "Nukopijuota!",
+  "RegistrationLink.copyLink": "Kopijuoti nuorodą",
+  "RegistrationLink.description": "Pasidalykite šia nuoroda, kad kiti galėtų susikurti paskyras:",
+  "RegistrationLink.regenerateToken": "Atkurti prieigos raktą",
+  "RegistrationLink.tokenRegenerated": "Registracijos nuoroda sugeneruota iš naujo",
+  "ShareBoard.PublishDescription": "Paskelbti ir bendrinti tik skaitomą nuorodą su visais žiniatinklio naudotojais.",
+  "ShareBoard.PublishTitle": "Paskelbti žiniatinklyje",
+  "ShareBoard.ShareInternal": "Bendrinti viduje",
+  "ShareBoard.ShareInternalDescription": "Leidimus turintys naudotojai galės naudotis šia nuoroda.",
+  "ShareBoard.Title": "Bendrinti lentą",
+  "ShareBoard.confirmRegenerateToken": "Tai panaikins anksčiau bendrintas nuorodas. Tęsti?",
+  "ShareBoard.copiedLink": "Nukopijuota!",
+  "ShareBoard.copyLink": "Kopijuoti nuorodą",
+  "ShareBoard.regenerate": "Atkurti prieigos raktą",
+  "ShareBoard.searchPlaceholder": "Ieškoti žmonių ir kanalų",
+  "ShareBoard.teamPermissionsText": "Visi {teamName} komandos nariai",
+  "ShareBoard.tokenRegenrated": "Prieigos raktas atkurtas",
+  "ShareBoard.userPermissionsRemoveMemberText": "Pašalinti narį",
+  "ShareBoard.userPermissionsYouText": "(Jūs)",
+  "ShareTemplate.Title": "Bendrinti šabloną",
+  "ShareTemplate.searchPlaceholder": "Ieškoti žmonių",
+  "Sidebar.delete-board": "Ištrinti lentą",
+  "Sidebar.duplicate-board": "Pasikartojanti lenta",
+  "Sidebar.export-archive": "Eksportuoti archyvą",
+  "Sidebar.import": "Importuoti",
+  "Sidebar.import-archive": "Importuoti archyvą",
+  "Sidebar.new-category.badge": "Naujas",
+  "Sidebar.new-category.drag-boards-cta": "Vilkite lentas čia...",
+  "Sidebar.no-boards-in-category": "Viduje nėra lentų",
+  "Sidebar.product-tour": "Produkto apžvalga",
+  "Sidebar.random-icons": "Atsitiktinės piktogramos",
+  "Sidebar.set-language": "Nustatyti kalbą",
+  "Sidebar.set-theme": "Nustatyti temą",
+  "Sidebar.settings": "Nustatymai",
+  "Sidebar.template-from-board": "Naujas šablonas pagal lentą",
+  "Sidebar.untitled-board": "(Lenta be pavadinimo)",
+  "Sidebar.untitled-view": "(Rodinys be pavadinimo)",
+  "SidebarCategories.BlocksMenu.Move": "Perkelti į...",
+  "SidebarCategories.CategoryMenu.CreateNew": "Sukurti naują kategoriją",
+  "SidebarCategories.CategoryMenu.Delete": "Ištrinti kategoriją",
+  "SidebarCategories.CategoryMenu.DeleteModal.Body": "<b>{categoryName}</b> lentos bus perkeltos atgal į lentų kategorijas. Jūs nesate pašalintas iš jokių lentų.",
+  "SidebarCategories.CategoryMenu.DeleteModal.Title": "Ištrinti šią kategoriją?",
+  "SidebarCategories.CategoryMenu.Update": "Pervadinti kategoriją",
+  "SidebarTour.ManageCategories.Body": "Kurkite ir tvarkykite pasirinktines kategorijas. Kategorijos priklauso nuo naudotojo, todėl lentos perkėlimas į kategoriją neturės įtakos kitiems nariams, naudojantiems tą pačią lentą.",
+  "SidebarTour.ManageCategories.Title": "Tvarkyti kategorijas",
+  "SidebarTour.SearchForBoards.Body": "Atidarykite lentos perjungiklį (Cmd / Ctrl + K), kad galėtumėte greitai ieškoti ir pridėti lentų šoninėje juostoje.",
+  "SidebarTour.SearchForBoards.Title": "Ieškoti lentų",
+  "SidebarTour.SidebarCategories.Body": "Visos Jūsų lentos dabar sutvarkytos naujoje šoninėje juostoje. Nebereikia perjungti darbo erdvių. Vienkartinės pasirinktinės kategorijos, pagrįstos ankstesnėmis darbo sritimis, gali būti automatiškai sukurtos Jums atnaujinant į 7.2 versiją. Jas galima pašalinti arba redaguoti pagal savo pageidavimus.",
+  "SidebarTour.SidebarCategories.Link": "Sužinoti daugiau",
+  "SidebarTour.SidebarCategories.Title": "Šoninės juostos kategorijos",
+  "SiteStats.total_boards": "Iš viso lentų",
+  "SiteStats.total_cards": "Iš viso kortelių",
+  "TableComponent.add-icon": "Pridėti piktogramą",
+  "TableComponent.name": "Pavadinimas",
+  "TableComponent.plus-new": "+ Naujas",
+  "TableHeaderMenu.delete": "Ištrinti",
+  "TableHeaderMenu.duplicate": "Pasikartojantis",
+  "TableHeaderMenu.hide": "Slėpti",
+  "TableHeaderMenu.insert-left": "Įdėkite kairėje",
+  "TableHeaderMenu.insert-right": "Įdėkite dešinėje",
+  "TableHeaderMenu.sort-ascending": "Rūšiuoti didėjančia tvarka",
+  "TableHeaderMenu.sort-descending": "Rūšiuoti mažėjančia tvarka",
+  "TableRow.DuplicateCard": "kortelės dublikatas",
+  "TableRow.MoreOption": "Daugiau veiksmų",
+  "TableRow.open": "Atverti",
+  "TopBar.give-feedback": "Palikti atsiliepimą",
+  "URLProperty.copiedLink": "Nukopijuota!",
+  "URLProperty.copy": "Kopijuoti",
+  "URLProperty.edit": "Redaguoti",
+  "UndoRedoHotKeys.canRedo": "Grąžinti",
+  "UndoRedoHotKeys.canRedo-with-description": "Perdaryti {description}",
+  "UndoRedoHotKeys.canUndo": "Anuliuoti",
+  "UndoRedoHotKeys.canUndo-with-description": "Anuliuoti {description}",
+  "UndoRedoHotKeys.cannotRedo": "Nėra ką perdaryti",
+  "UndoRedoHotKeys.cannotUndo": "Nėra ką anuliuoti",
+  "ValueSelector.noOptions": "Jokių parinkčių. Pradėkite rašyti, kad pridėtumėte pirmąją!",
+  "ValueSelector.valueSelector": "Reikšmės parinkiklis",
+  "ValueSelectorLabel.openMenu": "Atidaryti meniu",
+  "VersionMessage.help": "Patikrinkite, kas naujo šioje versijoje.",
+  "VersionMessage.learn-more": "Sužinoti daugiau",
+  "View.AddView": "Pridėti rodinį",
+  "View.Board": "Lenta",
+  "View.DeleteView": "Ištrinti rodinį",
+  "View.DuplicateView": "Pasikartojantis rodinys",
+  "View.Gallery": "Galerija",
+  "View.NewBoardTitle": "Lentos rodinys",
+  "View.NewCalendarTitle": "Kalendoriaus rodinys",
+  "View.NewGalleryTitle": "Galerijos vaizdas",
+  "View.NewTableTitle": "Lentelės rodinys",
+  "View.NewTemplateDefaultTitle": "Šablonas be pavadinimo",
+  "View.NewTemplateTitle": "Be pavadinimo",
+  "View.Table": "Lentelė",
+  "ViewHeader.add-template": "Naujas šablonas",
+  "ViewHeader.delete-template": "Ištrinti",
+  "ViewHeader.display-by": "Pateikė: {property}",
+  "ViewHeader.edit-template": "Redaguoti",
+  "ViewHeader.empty-card": "Tuščia kortelė",
+  "ViewHeader.export-board-archive": "Eksportuoti lentos archyvą",
+  "ViewHeader.export-complete": "Eksportas baigtas!",
+  "ViewHeader.export-csv": "Eksportuoti į CSV",
+  "ViewHeader.export-failed": "Eksportuoti nepavyko!",
+  "ViewHeader.filter": "Filtras",
+  "ViewHeader.group-by": "Grupuoti pagal: {property}",
+  "ViewHeader.new": "Naujas",
+  "ViewHeader.properties": "Savybės",
+  "ViewHeader.properties-menu": "Savybių meniu",
+  "ViewHeader.search-text": "Ieškoti kortelių",
+  "ViewHeader.select-a-template": "Pasirinkti šabloną",
+  "ViewHeader.set-default-template": "Nustatyti kaip numatytąjį",
+  "ViewHeader.sort": "Rūšiuoti",
+  "ViewHeader.untitled": "Be pavadinimo",
+  "ViewHeader.view-header-menu": "Žiūrėti antraštės meniu",
+  "ViewHeader.view-menu": "Žiūrėti meniu",
+  "ViewLimitDialog.Heading": "Pasiektas peržiūrų skaičius vienoje lentoje",
+  "ViewLimitDialog.PrimaryButton.Title.Admin": "Patobulinti",
+  "ViewLimitDialog.PrimaryButton.Title.RegularUser": "Pranešti administratoriui",
+  "ViewLimitDialog.Subtext.Admin": "Naujovinkite į mūsų Professional arba Enterprise planą.",
+  "ViewLimitDialog.Subtext.Admin.PricingPageLink": "Sužinokite daugiau apie mūsų planus.",
+  "ViewLimitDialog.Subtext.RegularUser": "Praneškite savo administratoriui, kad jis naujovintų į mūsų Professional arba Enterprise planą.",
+  "ViewLimitDialog.UpgradeImg.AltText": "atnaujinti vaizdą",
+  "ViewLimitDialog.notifyAdmin.Success": "Jūsų administratoriui buvo pranešta",
+  "ViewTitle.hide-description": "slėpti aprašymą",
+  "ViewTitle.pick-icon": "Pasirinkti piktogramą",
+  "ViewTitle.random-icon": "Atsitiktinis",
+  "ViewTitle.remove-icon": "Pašalinti piktogramą",
+  "ViewTitle.show-description": "rodyti aprašymą",
+  "ViewTitle.untitled-board": "Lenta be pavadinimo",
+  "WelcomePage.Description": "„Boards“ yra projektų valdymo įrankis, padedantis apibrėžti, organizuoti, sekti ir valdyti darbą įvairiose komandose, naudojant pažįstamą Kanban lentos vaizdą.",
+  "WelcomePage.Explore.Button": "Apžiūrėti",
+  "WelcomePage.Heading": "Sveiki atvykę į Boards",
+  "WelcomePage.NoThanks.Text": "Ne, ačiū, išsiaiškinsiu pats",
+  "WelcomePage.StartUsingIt.Text": "Pradėkite jį naudoti",
+  "Workspace.editing-board-template": "Redaguojate lentos šabloną.",
+  "badge.guest": "Svečias",
+  "boardPage.confirm-join-button": "Prisijungti",
+  "boardPage.confirm-join-text": "Jūs ketinate prisijungti prie privačios lentos, tačiau lentos administratorius Jūsų nepridėjo. Ar tikrai norite prisijungti prie šios privačios lentos?",
+  "boardPage.confirm-join-title": "Prisijunti prie privačios lentos",
+  "boardSelector.confirm-link-board": "Susieti lentą su kanalu",
+  "boardSelector.confirm-link-board-button": "Taip, susieti lentą",
+  "boardSelector.confirm-link-board-subtext": "Kai susiesite „{boardName}“ su kanalu, visi kanalo nariai (esami ir nauji) galės ją redaguoti. Tai neįtraukia narių, kurie yra svečiai. Galite bet kada atsieti lentą nuo kanalo.",
+  "boardSelector.confirm-link-board-subtext-with-other-channel": "Kai susiesite „{boardName}“ su kanalu, visi kanalo nariai (esami ir nauji) galės ją redaguoti. Tai neįtraukia narių, kurie yra svečiai.{lineBreak} Ši lenta šiuo metu susieta su kitu kanalu. Jis bus atsietas, jei pasirinksite susieti jį čia.",
+  "boardSelector.create-a-board": "Sukurti lentą",
+  "boardSelector.link": "nuoroda",
+  "boardSelector.search-for-boards": "Ieškoti lentų",
+  "boardSelector.title": "Susieti lentas",
+  "boardSelector.unlink": "Atsieti",
+  "calendar.month": "Mėnuo",
+  "calendar.today": "Šiandien",
+  "calendar.week": "Savaitė",
+  "centerPanel.undefined": "Nėra {propertyName}",
+  "centerPanel.unknown-user": "Nežinomas naudotojas",
+  "createImageBlock.failed": "Šio failo nepavyko įkelti, nes pasiektas failo dydžio limitas.",
+  "default-properties.badges": "Komentarai ir aprašymas",
+  "default-properties.title": "Pavadinimas",
+  "error.back-to-home": "Grįžti namo",
+  "error.back-to-team": "Atgal į komandą",
+  "error.board-not-found": "Lenta nerasta.",
+  "error.go-login": "Prisijungti",
+  "error.invalid-read-only-board": "Neturite prieigos prie šios lentos. Prisijunkite, kad pasiektumėte lentas.",
+  "error.not-logged-in": "Jūsų sesija gali būti pasibaigusi arba nesate prisijungę. Prisijunkite dar kartą, kad pasiektumėte lentas.",
+  "error.page.title": "Atsiprašome, kažkas nutiko",
+  "error.team-undefined": "Netinkama komanda.",
+  "error.unknown": "Įvyko klaida.",
+  "generic.previous": "Ankstesnis",
+  "guest-no-board.subtitle": "Dar neturite prieigos prie jokios šios komandos lentos, palaukite, kol kas nors jus įtrauks į bet kurią lentą.",
+  "guest-no-board.title": "Dar nėra jokių lentų",
+  "imagePaste.upload-failed": "Kai kurie failai nebuvo įkelti, nes pasiektas failo dydžio limitas.",
+  "limitedCard.title": "Paslėptos kortelės",
+  "login.log-in-button": "Prisijungti",
+  "login.log-in-title": "Prisijungti",
+  "login.register-button": "arba susikurkite paskyrą, jei jos neturite",
+  "new_channel_modal.create_board.empty_board_description": "Sukurti naują tuščią lentą",
+  "new_channel_modal.create_board.empty_board_title": "Tuščia lenta",
+  "new_channel_modal.create_board.select_template_placeholder": "Pasirinkti šabloną",
+  "new_channel_modal.create_board.title": "Sukurti šio kanalo lentą",
+  "notification-box-card-limit-reached.close-tooltip": "Snausti 10 dienų",
+  "notification-box-card-limit-reached.contact-link": "praneškite savo administratoriui",
+  "notification-box-card-limit-reached.link": "Atnaujinti į mokamą planą",
+  "notification-box-card-limit-reached.title": "{cards} kortelės paslėptos",
+  "notification-box-cards-hidden.title": "Šis veiksmas paslėpė kitą kortelę",
+  "notification-box.card-limit-reached.not-admin.text": "Norėdami pasiekti archyvuotas korteles, galite {contactLink} naujovinti į mokamą planą.",
+  "notification-box.card-limit-reached.text": "Pasiektas kortelių limitas, jei norite peržiūrėti senesnes korteles, {link}",
+  "person.add-user-to-board": "Pridėti {username} prie lentos",
+  "person.add-user-to-board-confirm-button": "Pridėti prie lentos",
+  "person.add-user-to-board-permissions": "Leidimai",
+  "person.add-user-to-board-question": "Ar norite pridėti {username} prie lentos?",
+  "person.add-user-to-board-warning": "{username} nėra lentos narys ir negaus apie tai jokių pranešimų.",
+  "register.login-button": "arba prisijunkite, jei jau turite paskyrą",
+  "register.signup-title": "Prisiregistruokite prie paskyros",
+  "rhs-board-non-admin-msg": "Jūs nesate lentos administratorius",
+  "rhs-boards.add": "Pridėti",
+  "rhs-boards.dm": "AŽ",
+  "rhs-boards.gm": "GŽ",
+  "rhs-boards.header.dm": "ši tiesioginė žinutė",
+  "rhs-boards.header.gm": "ši grupės žinutė",
+  "rhs-boards.last-update-at": "Paskutinį kartą atnaujinta: {datetime}",
+  "rhs-boards.link-boards-to-channel": "Susieti lentas su {channelName}",
+  "rhs-boards.linked-boards": "Susietos lentos",
+  "rhs-boards.no-boards-linked-to-channel": "Su {channelName} dar nėra susietų lentų",
+  "rhs-boards.no-boards-linked-to-channel-description": "„Boards“ yra projektų valdymo įrankis, padedantis apibrėžti, organizuoti, sekti ir valdyti darbą įvairiose komandose, naudojant pažįstamą Kanban lentos vaizdą.",
+  "rhs-boards.unlink-board": "Atsieti lentą",
+  "rhs-boards.unlink-board1": "Atsieti lentą",
+  "rhs-channel-boards-header.title": "Boards",
+  "share-board.publish": "Paskelbti",
+  "share-board.share": "Bendrinti",
+  "shareBoard.channels-select-group": "Kanalai",
+  "shareBoard.confirm-change-team-role.body": "Visi šioje lentoje esantys asmenys, turintys žemesnį nei „{role}“ vaidmenį <b>, dabar bus paaukštinti į {role}</b> . Ar tikrai norite pakeisti minimalų lentos vaidmenį?",
+  "shareBoard.confirm-change-team-role.confirmBtnText": "Pakeiskite minimalų lentos vaidmenį",
+  "shareBoard.confirm-change-team-role.title": "Pakeiskite minimalų lentos vaidmenį",
+  "shareBoard.confirm-link-channel": "Susieti lentą su kanalu",
+  "shareBoard.confirm-link-channel-button": "Susieti kanalą",
+  "shareBoard.confirm-link-channel-button-with-other-channel": "Atsieti ir susieti čia",
+  "shareBoard.confirm-link-channel-subtext": "Kai susiesite kanalą su lenta, visi kanalo nariai (esami ir nauji) galės ją redaguoti. Tai neįtraukia narių, kurie yra svečiai.",
+  "shareBoard.confirm-link-channel-subtext-with-other-channel": "Kai susiesite kanalą su lenta, visi kanalo nariai (esami ir nauji) galės jį redaguoti. Tai neįtraukia narių, kurie yra svečiai.{lineBreak}Ši lenta šiuo metu susieta su kitu kanalu. Jis bus atsietas, jei pasirinksite susieti jį čia.",
+  "shareBoard.confirm-unlink.body": "Kai atsiesite kanalą nuo lentos, visi kanalo nariai (esami ir nauji) praras prieigą prie jo, nebent jiems bus suteiktas atskiras leidimas.",
+  "shareBoard.confirm-unlink.confirmBtnText": "Atsieti kanalą",
+  "shareBoard.confirm-unlink.title": "Atsieti kanalą nuo lentos",
+  "shareBoard.lastAdmin": "Lentose turi būti bent vienas administratorius",
+  "shareBoard.members-select-group": "Nariai",
+  "shareBoard.unknown-channel-display-name": "Nežinomas kanalas",
+  "tutorial_tip.finish_tour": "Atlikta",
+  "tutorial_tip.got_it": "Supratau",
+  "tutorial_tip.ok": "Kitas",
+  "tutorial_tip.out": "Atsisakyti šių patarimų.",
+  "tutorial_tip.seen": "Matėte tai anksčiau?"
+}

From 4e4e4939e1f0c493c946242c0e1add6a27fc8707 Mon Sep 17 00:00:00 2001
From: Caleb Roseland <caleb@calebroseland.com>
Date: Mon, 10 Apr 2023 22:34:57 +0200
Subject: [PATCH 014/103] Translated using Weblate (Georgian)

Currently translated at 25.7% (117 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/ka/

Translated using Weblate (Persian)

Currently translated at 26.8% (122 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/fa/

Translated using Weblate (Turkish)

Currently translated at 100.0% (454 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/tr/
---
 webapp/boards/i18n/fa.json | 244 +++++-----
 webapp/boards/i18n/ka.json | 236 +++++-----
 webapp/boards/i18n/tr.json | 920 ++++++++++++++++++-------------------
 3 files changed, 700 insertions(+), 700 deletions(-)

diff --git a/webapp/boards/i18n/fa.json b/webapp/boards/i18n/fa.json
index 302c5163a3..c875c9456a 100644
--- a/webapp/boards/i18n/fa.json
+++ b/webapp/boards/i18n/fa.json
@@ -1,124 +1,124 @@
 {
-    "AppBar.Tooltip": "تغییر وضعیت تابلوهای مرتبط",
-    "Attachment.Attachment-title": "ضمیمه",
-    "AttachmentBlock.DeleteAction": "حذف",
-    "AttachmentBlock.addElement": "افزودن {type}",
-    "AttachmentBlock.delete": "ضمیمه حذف شد.",
-    "AttachmentBlock.failed": "به دلیل محدودیت حجم، این پرونده نمی‌تواند بارگذاری شود.",
-    "AttachmentBlock.upload": "بارگذاری ضمیمه.",
-    "AttachmentBlock.uploadSuccess": "ضمیمه بارگذاری شد.",
-    "AttachmentElement.delete-confirmation-dialog-button-text": "حذف",
-    "AttachmentElement.download": "بارگیری",
-    "AttachmentElement.upload-percentage": "بارگذاری...({uploadPercent}%)",
-    "BoardComponent.add-a-group": "+ افزودن گروه",
-    "BoardComponent.delete": "حذف",
-    "BoardComponent.hidden-columns": "ستون های مخفی",
-    "BoardComponent.hide": "مخفی",
-    "BoardComponent.new": "+ جدید",
-    "BoardComponent.no-property": "بدون {property}",
-    "BoardComponent.no-property-title": "موارد با {property} خالی اینجا نمایش داده میشوند. این ستون قابل حذف نیست.",
-    "BoardComponent.show": "نمایش",
-    "BoardMember.schemeAdmin": "مدیر",
-    "BoardMember.schemeEditor": "ویرایشگر",
-    "BoardMember.schemeNone": "هیچکدام",
-    "BoardMember.schemeViewer": "بیننده",
-    "BoardPage.newVersion": "نسخه جدیدی از برنامه Boards موجود است، برای بارگیری مجدد اینجا را کلیک کنید.",
-    "BoardPage.syncFailed": "تابلو ممکن است حذف شود یا دسترسی آن لغو شود.",
-    "BoardTemplateSelector.add-template": "ایجاد قالب جدید",
-    "BoardTemplateSelector.create-empty-board": "ایجاد تابلو خالی",
-    "BoardTemplateSelector.delete-template": "حذف",
-    "BoardTemplateSelector.description": "با استفاده از الگوهای زیر، یک تابلو به نوار کناری اضافه کنید یا از اول شروع کنید.",
-    "BoardTemplateSelector.edit-template": "ویرایش",
-    "BoardTemplateSelector.plugin.no-content-description": "با استفاده از الگوهای زیر، یک تابلو به نوار کناری اضافه کنید یا از اول شروع کنید.",
-    "BoardTemplateSelector.plugin.no-content-title": "ایجاد یک تابلو",
-    "BoardTemplateSelector.title": "ایجاد یک تابلو",
-    "BoardTemplateSelector.use-this-template": "از این قالب استفاده کنید",
-    "BoardsSwitcher.Title": "جستجوی تابلوها",
-    "BoardsUnfurl.Remainder": "+{remainder} بیشتر",
-    "BoardsUnfurl.Updated": "به روز شد {time}",
-    "Calculations.Options.average.displayName": "میانگین",
-    "Calculations.Options.average.label": "میانگین",
-    "Calculations.Options.count.displayName": "تعداد",
-    "Calculations.Options.count.label": "تعداد",
-    "Calculations.Options.countChecked.displayName": "نشان‌دار",
-    "Calculations.Options.countChecked.label": "تعداد نشان‌دارها",
-    "Calculations.Options.countUnchecked.displayName": "بی‌نشان",
-    "Calculations.Options.countUnchecked.label": "تعداد نشان‌دارها",
-    "Calculations.Options.countUniqueValue.displayName": "یکتا",
-    "Calculations.Options.countUniqueValue.label": "تعداد مقادیر یکتا",
-    "Calculations.Options.countValue.displayName": "مقادیر",
-    "Calculations.Options.countValue.label": "تعداد مقادیر",
-    "Calculations.Options.dateRange.displayName": "دامنه",
-    "Calculations.Options.dateRange.label": "دامنه",
-    "Calculations.Options.earliest.displayName": "اولین",
-    "Calculations.Options.earliest.label": "اولین",
-    "Calculations.Options.latest.displayName": "آخرین",
-    "Calculations.Options.latest.label": "آخرین",
-    "Calculations.Options.max.displayName": "حداکثر",
-    "Calculations.Options.max.label": "حداکثر",
-    "Calculations.Options.median.displayName": "میانه",
-    "Calculations.Options.median.label": "میانه",
-    "Calculations.Options.min.displayName": "حداقل",
-    "Calculations.Options.min.label": "حداقل",
-    "Calculations.Options.none.displayName": "محاسبه",
-    "Calculations.Options.none.label": "هیچ یک",
-    "Calculations.Options.percentChecked.displayName": "بررسی شد",
-    "Calculations.Options.percentChecked.label": "درصد انتخاب‌شده‌ها",
-    "Calculations.Options.percentUnchecked.displayName": "بدون علامت",
-    "Calculations.Options.percentUnchecked.label": "درصد بی‌نشان",
-    "Calculations.Options.range.displayName": "بازه",
-    "Calculations.Options.range.label": "بازه",
-    "Calculations.Options.sum.displayName": "جمع",
-    "Calculations.Options.sum.label": "جمع",
-    "CardBadges.title-checkboxes": "چک باکس ها",
-    "CardBadges.title-comments": "نظرات",
-    "CardBadges.title-description": "این کارت دارای توضیحات است",
-    "CardDetail.Follow": "دنبال کردن",
-    "CardDetail.Following": "ذیل",
-    "CardDetail.add-content": "محتوا اضافه کنید",
-    "CardDetail.add-icon": "اضافه کردن نماد",
-    "CardDetail.add-property": "+ اضافه کردن یک ویژگی",
-    "CardDetail.addCardText": "متن کارت را اضافه کنید",
-    "CardDetail.moveContent": "انتقال محتوای کارت",
-    "CardDetail.new-comment-placeholder": "افزودن نظر...",
-    "CardDetailProperty.confirm-delete-heading": "تایید حذف ویژگی",
-    "CardDetailProperty.confirm-delete-subtext": "آیا مطمئن هستید که می خواهید ویژگی \"{propertyName}\" را حذف کنید؟ با حذف آن، اموال از تمام کارت های موجود در این تابلو حذف می شود.",
-    "CardDetailProperty.confirm-property-name-change-subtext": "آیا مطمئن هستید که می خواهید ویژگی \"{propertyName}\" {customText} را تغییر دهید؟ این روی مقدار(های) کارت(های) {numOfCards} در این برد تأثیر می گذارد و می تواند منجر به از دست رفتن داده شود.",
-    "CardDetailProperty.confirm-property-type-change": "تایید تغییر نوع ویژگی",
-    "CardDetailProperty.delete-action-button": "حذف",
-    "CardDetailProperty.property-change-action-button": "تغییر ویژگی",
-    "CardDetailProperty.property-changed": "تغییر ویژگی با موفقیت!",
-    "CardDetailProperty.property-deleted": "{propertyName} با موفقیت حذف شد!",
-    "CardDetailProperty.property-name-change-subtext": "از \"{oldPropType}\" به \"{newPropType}\" تایپ کنید",
-    "CardDialog.delete-confirmation-dialog-button-text": "حذف",
-    "CardDialog.delete-confirmation-dialog-heading": "تایید حذف کارت",
-    "CardDialog.editing-template": "شما در حال ویرایش یک الگو هستید.",
-    "CardDialog.nocard": "این کارت وجود ندارد یا غیرقابل دسترسی است.",
-    "Categories.CreateCategoryDialog.CancelText": "لغو کنید",
-    "Categories.CreateCategoryDialog.CreateText": "ايجاد كردن",
-    "Categories.CreateCategoryDialog.Placeholder": "دسته خود را نام ببرید",
-    "Categories.CreateCategoryDialog.UpdateText": "به روز رسانی",
-    "CenterPanel.Login": "وارد شدن",
-    "CenterPanel.Share": "اشتراک گذاری",
-    "ColorOption.selectColor": "رنگ {color} را انتخاب کنید",
-    "Comment.delete": "حذف",
-    "CommentsList.send": "ارسال",
-    "ConfirmationDialog.cancel-action": "لغو کنید",
-    "ConfirmationDialog.confirm-action": "تایید",
-    "ContentBlock.Delete": "حذف",
-    "ContentBlock.DeleteAction": "حذف",
-    "GroupBy.hideEmptyGroups": "پنهان‌کردن {count} گروه خالی",
-    "GroupBy.showHiddenGroups": "نمایش {count} گروه پنهان‌شده",
-    "ViewHeader.view-menu": "نمایش فهرست",
-    "ViewLimitDialog.Heading": "محدودیت تعداد نما برای تخته رسید",
-    "ViewLimitDialog.PrimaryButton.Title.Admin": "ارتقا",
-    "ViewLimitDialog.UpgradeImg.AltText": "ارتقا عکس",
-    "ViewLimitDialog.notifyAdmin.Success": "مدیر شما مطلع شد",
-    "ViewTitle.hide-description": "پنهان کردن توضیحات",
-    "ViewTitle.pick-icon": "انتخاب تصویرک",
-    "ViewTitle.random-icon": "تصادفی",
-    "ViewTitle.remove-icon": "پاک‌کردن تصویرک",
-    "ViewTitle.show-description": "نمایش توضیحات",
-    "ViewTitle.untitled-board": "تخته بدون عنوان",
-    "badge.guest": "مهمان"
+  "AppBar.Tooltip": "تغییر وضعیت تابلوهای مرتبط",
+  "Attachment.Attachment-title": "ضمیمه",
+  "AttachmentBlock.DeleteAction": "حذف",
+  "AttachmentBlock.addElement": "افزودن {type}",
+  "AttachmentBlock.delete": "ضمیمه حذف شد.",
+  "AttachmentBlock.failed": "به دلیل محدودیت حجم، این پرونده نمی‌تواند بارگذاری شود.",
+  "AttachmentBlock.upload": "بارگذاری ضمیمه.",
+  "AttachmentBlock.uploadSuccess": "ضمیمه بارگذاری شد.",
+  "AttachmentElement.delete-confirmation-dialog-button-text": "حذف",
+  "AttachmentElement.download": "بارگیری",
+  "AttachmentElement.upload-percentage": "بارگذاری...({uploadPercent}%)",
+  "BoardComponent.add-a-group": "+ افزودن گروه",
+  "BoardComponent.delete": "حذف",
+  "BoardComponent.hidden-columns": "ستون های مخفی",
+  "BoardComponent.hide": "مخفی",
+  "BoardComponent.new": "+ جدید",
+  "BoardComponent.no-property": "بدون {property}",
+  "BoardComponent.no-property-title": "موارد با {property} خالی اینجا نمایش داده میشوند. این ستون قابل حذف نیست.",
+  "BoardComponent.show": "نمایش",
+  "BoardMember.schemeAdmin": "مدیر",
+  "BoardMember.schemeEditor": "ویرایشگر",
+  "BoardMember.schemeNone": "هیچکدام",
+  "BoardMember.schemeViewer": "بیننده",
+  "BoardPage.newVersion": "نسخه جدیدی از برنامه Boards موجود است، برای بارگیری مجدد اینجا را کلیک کنید.",
+  "BoardPage.syncFailed": "تابلو ممکن است حذف شود یا دسترسی آن لغو شود.",
+  "BoardTemplateSelector.add-template": "ایجاد قالب جدید",
+  "BoardTemplateSelector.create-empty-board": "ایجاد تابلو خالی",
+  "BoardTemplateSelector.delete-template": "حذف",
+  "BoardTemplateSelector.description": "با استفاده از الگوهای زیر، یک تابلو به نوار کناری اضافه کنید یا از اول شروع کنید.",
+  "BoardTemplateSelector.edit-template": "ویرایش",
+  "BoardTemplateSelector.plugin.no-content-description": "با استفاده از الگوهای زیر، یک تابلو به نوار کناری اضافه کنید یا از اول شروع کنید.",
+  "BoardTemplateSelector.plugin.no-content-title": "ایجاد یک تابلو",
+  "BoardTemplateSelector.title": "ایجاد یک تابلو",
+  "BoardTemplateSelector.use-this-template": "از این قالب استفاده کنید",
+  "BoardsSwitcher.Title": "جستجوی تابلوها",
+  "BoardsUnfurl.Remainder": "+{remainder} بیشتر",
+  "BoardsUnfurl.Updated": "به روز شد {time}",
+  "Calculations.Options.average.displayName": "میانگین",
+  "Calculations.Options.average.label": "میانگین",
+  "Calculations.Options.count.displayName": "تعداد",
+  "Calculations.Options.count.label": "تعداد",
+  "Calculations.Options.countChecked.displayName": "نشان‌دار",
+  "Calculations.Options.countChecked.label": "تعداد نشان‌دارها",
+  "Calculations.Options.countUnchecked.displayName": "بی‌نشان",
+  "Calculations.Options.countUnchecked.label": "تعداد نشان‌دارها",
+  "Calculations.Options.countUniqueValue.displayName": "یکتا",
+  "Calculations.Options.countUniqueValue.label": "تعداد مقادیر یکتا",
+  "Calculations.Options.countValue.displayName": "مقادیر",
+  "Calculations.Options.countValue.label": "تعداد مقادیر",
+  "Calculations.Options.dateRange.displayName": "دامنه",
+  "Calculations.Options.dateRange.label": "دامنه",
+  "Calculations.Options.earliest.displayName": "اولین",
+  "Calculations.Options.earliest.label": "اولین",
+  "Calculations.Options.latest.displayName": "آخرین",
+  "Calculations.Options.latest.label": "آخرین",
+  "Calculations.Options.max.displayName": "حداکثر",
+  "Calculations.Options.max.label": "حداکثر",
+  "Calculations.Options.median.displayName": "میانه",
+  "Calculations.Options.median.label": "میانه",
+  "Calculations.Options.min.displayName": "حداقل",
+  "Calculations.Options.min.label": "حداقل",
+  "Calculations.Options.none.displayName": "محاسبه",
+  "Calculations.Options.none.label": "هیچ یک",
+  "Calculations.Options.percentChecked.displayName": "بررسی شد",
+  "Calculations.Options.percentChecked.label": "درصد انتخاب‌شده‌ها",
+  "Calculations.Options.percentUnchecked.displayName": "بدون علامت",
+  "Calculations.Options.percentUnchecked.label": "درصد بی‌نشان",
+  "Calculations.Options.range.displayName": "بازه",
+  "Calculations.Options.range.label": "بازه",
+  "Calculations.Options.sum.displayName": "جمع",
+  "Calculations.Options.sum.label": "جمع",
+  "CardBadges.title-checkboxes": "چک باکس ها",
+  "CardBadges.title-comments": "نظرات",
+  "CardBadges.title-description": "این کارت دارای توضیحات است",
+  "CardDetail.Follow": "دنبال کردن",
+  "CardDetail.Following": "ذیل",
+  "CardDetail.add-content": "محتوا اضافه کنید",
+  "CardDetail.add-icon": "اضافه کردن نماد",
+  "CardDetail.add-property": "+ اضافه کردن یک ویژگی",
+  "CardDetail.addCardText": "متن کارت را اضافه کنید",
+  "CardDetail.moveContent": "انتقال محتوای کارت",
+  "CardDetail.new-comment-placeholder": "افزودن نظر...",
+  "CardDetailProperty.confirm-delete-heading": "تایید حذف ویژگی",
+  "CardDetailProperty.confirm-delete-subtext": "آیا مطمئن هستید که می خواهید ویژگی \"{propertyName}\" را حذف کنید؟ با حذف آن، اموال از تمام کارت های موجود در این تابلو حذف می شود.",
+  "CardDetailProperty.confirm-property-name-change-subtext": "آیا مطمئن هستید که می خواهید ویژگی \"{propertyName}\" {customText} را تغییر دهید؟ این روی مقدار(های) کارت(های) {numOfCards} در این برد تأثیر می گذارد و می تواند منجر به از دست رفتن داده شود.",
+  "CardDetailProperty.confirm-property-type-change": "تایید تغییر نوع ویژگی",
+  "CardDetailProperty.delete-action-button": "حذف",
+  "CardDetailProperty.property-change-action-button": "تغییر ویژگی",
+  "CardDetailProperty.property-changed": "تغییر ویژگی با موفقیت!",
+  "CardDetailProperty.property-deleted": "{propertyName} با موفقیت حذف شد!",
+  "CardDetailProperty.property-name-change-subtext": "از \"{oldPropType}\" به \"{newPropType}\" تایپ کنید",
+  "CardDialog.delete-confirmation-dialog-button-text": "حذف",
+  "CardDialog.delete-confirmation-dialog-heading": "تایید حذف کارت",
+  "CardDialog.editing-template": "شما در حال ویرایش یک الگو هستید.",
+  "CardDialog.nocard": "این کارت وجود ندارد یا غیرقابل دسترسی است.",
+  "Categories.CreateCategoryDialog.CancelText": "لغو کنید",
+  "Categories.CreateCategoryDialog.CreateText": "ايجاد كردن",
+  "Categories.CreateCategoryDialog.Placeholder": "دسته خود را نام ببرید",
+  "Categories.CreateCategoryDialog.UpdateText": "به روز رسانی",
+  "CenterPanel.Login": "وارد شدن",
+  "CenterPanel.Share": "اشتراک گذاری",
+  "ColorOption.selectColor": "رنگ {color} را انتخاب کنید",
+  "Comment.delete": "حذف",
+  "CommentsList.send": "ارسال",
+  "ConfirmationDialog.cancel-action": "لغو کنید",
+  "ConfirmationDialog.confirm-action": "تایید",
+  "ContentBlock.Delete": "حذف",
+  "ContentBlock.DeleteAction": "حذف",
+  "GroupBy.hideEmptyGroups": "پنهان‌کردن {count} گروه خالی",
+  "GroupBy.showHiddenGroups": "نمایش {count} گروه پنهان‌شده",
+  "ViewHeader.view-menu": "نمایش فهرست",
+  "ViewLimitDialog.Heading": "محدودیت تعداد نما برای تخته رسید",
+  "ViewLimitDialog.PrimaryButton.Title.Admin": "ارتقا",
+  "ViewLimitDialog.UpgradeImg.AltText": "ارتقا عکس",
+  "ViewLimitDialog.notifyAdmin.Success": "مدیر شما مطلع شد",
+  "ViewTitle.hide-description": "پنهان کردن توضیحات",
+  "ViewTitle.pick-icon": "انتخاب تصویرک",
+  "ViewTitle.random-icon": "تصادفی",
+  "ViewTitle.remove-icon": "پاک‌کردن تصویرک",
+  "ViewTitle.show-description": "نمایش توضیحات",
+  "ViewTitle.untitled-board": "تخته بدون عنوان",
+  "badge.guest": "مهمان"
 }
diff --git a/webapp/boards/i18n/ka.json b/webapp/boards/i18n/ka.json
index fa0ef0b53d..9d3b5d3553 100644
--- a/webapp/boards/i18n/ka.json
+++ b/webapp/boards/i18n/ka.json
@@ -1,120 +1,120 @@
 {
-    "AppBar.Tooltip": "დაკავშირებული დაფების გადართვა",
-    "BoardComponent.add-a-group": "+ ჯგუფის დამატება",
-    "BoardComponent.delete": "წაშლა",
-    "BoardComponent.hidden-columns": "დამალული სვეტები",
-    "BoardComponent.hide": "დამალვა",
-    "BoardComponent.new": "+ ახალი",
-    "BoardComponent.no-property": "არ არის {property}",
-    "BoardComponent.no-property-title": "ცარიელი {property} საკუთრების მქონე ელემენტები აქ წავა. ამ სვეტის წაშლა შეუძლებელია.",
-    "BoardComponent.show": "ჩვენება",
-    "BoardMember.schemeAdmin": "ადმინისტრატორი",
-    "BoardMember.schemeCommenter": "კომენტატორი",
-    "BoardMember.schemeEditor": "რედაქტორი",
-    "BoardMember.schemeNone": "არცერთი",
-    "BoardMember.schemeViewer": "მაყურებელი",
-    "BoardMember.unlinkChannel": "კავშირის გაუქმება",
-    "BoardPage.newVersion": "დაფების ახალი ვერსია ხელმისაწვდომია, დააწკაპუნეთ აქ გადასატვირთად.",
-    "BoardPage.syncFailed": "დაფა შეიძლება წაშლილია ან გაუქმებულია წვდომა.",
-    "BoardTemplateSelector.add-template": "ახალი შაბლონი",
-    "BoardTemplateSelector.create-empty-board": "შექმენით ცარიელი დაფა",
-    "BoardTemplateSelector.delete-template": "წაშლა",
-    "BoardTemplateSelector.description": "დაამატეთ დაფა გვერდითა ზოლში ქვემოთ განსაზღვრული რომელიმე შაბლონის გამოყენებით ან დაიწყეთ ნულიდან.",
-    "BoardTemplateSelector.edit-template": "რედაქტირება",
-    "BoardTemplateSelector.plugin.no-content-description": "დაამატეთ დაფა გვერდითა ზოლში ქვემოთ განსაზღვრული რომელიმე შაბლონის გამოყენებით ან დაიწყეთ ნულიდან.",
-    "BoardTemplateSelector.plugin.no-content-title": "შექმენით დაფა",
-    "BoardTemplateSelector.title": "შექმენით დაფა",
-    "BoardTemplateSelector.use-this-template": "გამოიყენეთ ეს შაბლონი",
-    "BoardsSwitcher.Title": "დაფების ძებნა",
-    "BoardsUnfurl.Limited": "დამატებითი დეტალები დამალულია ბარათის დაარქივების გამო",
-    "BoardsUnfurl.Remainder": "+{remainder} მეტი",
-    "BoardsUnfurl.Updated": "განახლებული {time}",
-    "Calculations.Options.average.displayName": "საშუალო",
-    "Calculations.Options.average.label": "საშუალო",
-    "Calculations.Options.count.displayName": "დათვლა",
-    "Calculations.Options.count.label": "დათვლა",
-    "Calculations.Options.countChecked.displayName": "შემოწმებული",
-    "Calculations.Options.countChecked.label": "რაოდენობა შემოწმებულია",
-    "Calculations.Options.countUnchecked.displayName": "შეუმოწმებელი",
-    "Calculations.Options.countUnchecked.label": "რაოდენობა შეუმოწმებელია",
-    "Calculations.Options.countUniqueValue.displayName": "უნიკალური",
-    "Calculations.Options.countUniqueValue.label": "უნიკალური ღირებულების დათვლა",
-    "Calculations.Options.countValue.displayName": "ღირებულებები",
-    "Calculations.Options.countValue.label": "დათვალეთ მნიშვნელობა",
-    "Calculations.Options.dateRange.displayName": "დიაპაზონი",
-    "Calculations.Options.dateRange.label": "დიაპაზონი",
-    "Calculations.Options.earliest.displayName": "ყველაზე ადრეული",
-    "Calculations.Options.earliest.label": "ყველაზე ადრეული",
-    "Calculations.Options.latest.displayName": "უახლესი",
-    "Calculations.Options.latest.label": "უახლესი",
-    "Calculations.Options.max.displayName": "მაქსიმალური",
-    "Calculations.Options.max.label": "მაქსიმალური",
-    "Calculations.Options.median.displayName": "საშუალო",
-    "Calculations.Options.median.label": "საშუალო",
-    "Calculations.Options.min.displayName": "მინიმალური",
-    "Calculations.Options.min.label": "მინიმალური",
-    "Calculations.Options.none.displayName": "გამოთვლა",
-    "Calculations.Options.none.label": "გამოთვლა",
-    "Calculations.Options.percentChecked.displayName": "შემოწმებული",
-    "Calculations.Options.percentChecked.label": "პროცენტი შემოწმებულია",
-    "Calculations.Options.percentUnchecked.displayName": "შეუმოწმებელი",
-    "Calculations.Options.percentUnchecked.label": "პროცენტი შეუმოწმებელია",
-    "Calculations.Options.range.displayName": "დიაპაზონი",
-    "Calculations.Options.range.label": "დიაპაზონი",
-    "Calculations.Options.sum.displayName": "ჯამი",
-    "Calculations.Options.sum.label": "ჯამი",
-    "CalendarCard.untitled": "უსათაურო",
-    "CardActionsMenu.copiedLink": "დაკოპირებულია!",
-    "CardActionsMenu.copyLink": "Ბმულის კოპირება",
-    "CardActionsMenu.delete": "წაშლა",
-    "CardActionsMenu.duplicate": "დუბლიკატი",
-    "CardBadges.title-checkboxes": "მოსანიშნი ველები",
-    "CardBadges.title-comments": "კომენტარები",
-    "CardBadges.title-description": "ამ ბარათს აქვს აღწერა",
-    "CardDetail.Follow": "გაყოლა",
-    "CardDetail.Following": "მომდევნო",
-    "CardDetail.add-content": "დაამატეთ შინაარსი",
-    "CardDetail.add-icon": "ხატულის დამატება",
-    "CardDetail.add-property": "+ დაამატეთ Property",
-    "CardDetail.addCardText": "ბარათის ტექსტის დამატება",
-    "CardDetail.limited-body": "ბარათის ტექსტის დამატება განაახლეთ ჩვენს პროფესიონალურ ან საწარმოს გეგმაში დაარქივებული ბარათების სანახავად, თითო დაფაზე ულიმიტო ნახვები, ულიმიტო ბარათები და სხვა.",
-    "CardDetail.limited-button": "განახლება",
-    "CardDetail.limited-title": "ეს ბარათი დამალულია",
-    "CardDetail.moveContent": "ბარათის შინაარსის გადატანა",
-    "CardDetail.new-comment-placeholder": "კომენტარის დამატება...",
-    "CardDetailProperty.confirm-delete-heading": "დაადასტურეთ Property-ის წაშლა",
-    "CardDetailProperty.confirm-delete-subtext": "დარწმუნებული ხართ, რომ გსურთ წაშალოთ Property „{propertyName}“? მისი წაშლა წაშლის Property-ის ამ დაფის ყველა ბარათიდან.",
-    "CardDetailProperty.confirm-property-name-change-subtext": "დარწმუნებული ხართ, რომ გსურთ შეცვალოთ თვისება „{propertyName}“ {customText}? ეს გავლენას მოახდენს მნიშვნელობა(ებ)ზე {numOfCards} ბარათ(ებ)ში ამ დაფაზე და შეიძლება გამოიწვიოს მონაცემთა დაკარგვა.",
-    "CardDetailProperty.confirm-property-type-change": "დაადასტურეთ Property-ის ტიპის ცვლილება",
-    "CardDetailProperty.delete-action-button": "წაშლა",
-    "CardDetailProperty.property-change-action-button": "Property-ის შეცვლა",
-    "CardDetailProperty.property-changed": "Property წარმატებით შეიცვალა!",
-    "CardDetailProperty.property-deleted": "{propertyName} წარმატებით წაიშალა!",
-    "CardDetailProperty.property-name-change-subtext": "აკრიფეთ „{oldPropType}“-დან „{newPropType}“-მდე",
-    "CardDetial.limited-link": "შეიტყვეთ მეტი ჩვენი გეგმების შესახებ.",
-    "CardDialog.delete-confirmation-dialog-button-text": "წაშლა",
-    "CardDialog.delete-confirmation-dialog-heading": "დაადასტურეთ ბარათის წაშლა!",
-    "CardDialog.editing-template": "თქვენ არედაქტირებთ შაბლონს.",
-    "CardDialog.nocard": "ეს ბარათი არ არსებობს ან მიუწვდომელია.",
-    "Categories.CreateCategoryDialog.CancelText": "გაუქმება",
-    "Categories.CreateCategoryDialog.CreateText": "Შექმნა",
-    "Categories.CreateCategoryDialog.Placeholder": "მიეცით სახელი თქვენს კატეგორიას",
-    "Categories.CreateCategoryDialog.UpdateText": "განახლება",
-    "CenterPanel.Login": "შესვლა",
-    "CenterPanel.Share": "გაზიარება",
-    "ColorOption.selectColor": "აირჩიეთ {color} ფერი",
-    "Comment.delete": "წაშლა",
-    "CommentsList.send": "გაგზავნა",
-    "ConfirmationDialog.cancel-action": "გაუქმება",
-    "ConfirmationDialog.confirm-action": "დადასტურება",
-    "ContentBlock.Delete": "წაშლა",
-    "ContentBlock.DeleteAction": "წაშლა",
-    "ContentBlock.addElement": "დაამატეთ {type}",
-    "ContentBlock.checkbox": "მონიშვნის ველი",
-    "ContentBlock.divider": "გამყოფი",
-    "ContentBlock.editCardCheckbox": "მონიშნული-მონიშვნის ველი",
-    "ContentBlock.editCardCheckboxText": "ბარათის ტექსტის რედაქტირება",
-    "ContentBlock.editCardText": "ბარათის ტექსტის რედაქტირება",
-    "ContentBlock.editText": "ტექსტის რედაქტირება...",
-    "ContentBlock.image": "გამოსახულება"
+  "AppBar.Tooltip": "დაკავშირებული დაფების გადართვა",
+  "BoardComponent.add-a-group": "+ ჯგუფის დამატება",
+  "BoardComponent.delete": "წაშლა",
+  "BoardComponent.hidden-columns": "დამალული სვეტები",
+  "BoardComponent.hide": "დამალვა",
+  "BoardComponent.new": "+ ახალი",
+  "BoardComponent.no-property": "არ არის {property}",
+  "BoardComponent.no-property-title": "ცარიელი {property} საკუთრების მქონე ელემენტები აქ წავა. ამ სვეტის წაშლა შეუძლებელია.",
+  "BoardComponent.show": "ჩვენება",
+  "BoardMember.schemeAdmin": "ადმინისტრატორი",
+  "BoardMember.schemeCommenter": "კომენტატორი",
+  "BoardMember.schemeEditor": "რედაქტორი",
+  "BoardMember.schemeNone": "არცერთი",
+  "BoardMember.schemeViewer": "მაყურებელი",
+  "BoardMember.unlinkChannel": "კავშირის გაუქმება",
+  "BoardPage.newVersion": "დაფების ახალი ვერსია ხელმისაწვდომია, დააწკაპუნეთ აქ გადასატვირთად.",
+  "BoardPage.syncFailed": "დაფა შეიძლება წაშლილია ან გაუქმებულია წვდომა.",
+  "BoardTemplateSelector.add-template": "ახალი შაბლონი",
+  "BoardTemplateSelector.create-empty-board": "შექმენით ცარიელი დაფა",
+  "BoardTemplateSelector.delete-template": "წაშლა",
+  "BoardTemplateSelector.description": "დაამატეთ დაფა გვერდითა ზოლში ქვემოთ განსაზღვრული რომელიმე შაბლონის გამოყენებით ან დაიწყეთ ნულიდან.",
+  "BoardTemplateSelector.edit-template": "რედაქტირება",
+  "BoardTemplateSelector.plugin.no-content-description": "დაამატეთ დაფა გვერდითა ზოლში ქვემოთ განსაზღვრული რომელიმე შაბლონის გამოყენებით ან დაიწყეთ ნულიდან.",
+  "BoardTemplateSelector.plugin.no-content-title": "შექმენით დაფა",
+  "BoardTemplateSelector.title": "შექმენით დაფა",
+  "BoardTemplateSelector.use-this-template": "გამოიყენეთ ეს შაბლონი",
+  "BoardsSwitcher.Title": "დაფების ძებნა",
+  "BoardsUnfurl.Limited": "დამატებითი დეტალები დამალულია ბარათის დაარქივების გამო",
+  "BoardsUnfurl.Remainder": "+{remainder} მეტი",
+  "BoardsUnfurl.Updated": "განახლებული {time}",
+  "Calculations.Options.average.displayName": "საშუალო",
+  "Calculations.Options.average.label": "საშუალო",
+  "Calculations.Options.count.displayName": "დათვლა",
+  "Calculations.Options.count.label": "დათვლა",
+  "Calculations.Options.countChecked.displayName": "შემოწმებული",
+  "Calculations.Options.countChecked.label": "რაოდენობა შემოწმებულია",
+  "Calculations.Options.countUnchecked.displayName": "შეუმოწმებელი",
+  "Calculations.Options.countUnchecked.label": "რაოდენობა შეუმოწმებელია",
+  "Calculations.Options.countUniqueValue.displayName": "უნიკალური",
+  "Calculations.Options.countUniqueValue.label": "უნიკალური ღირებულების დათვლა",
+  "Calculations.Options.countValue.displayName": "ღირებულებები",
+  "Calculations.Options.countValue.label": "დათვალეთ მნიშვნელობა",
+  "Calculations.Options.dateRange.displayName": "დიაპაზონი",
+  "Calculations.Options.dateRange.label": "დიაპაზონი",
+  "Calculations.Options.earliest.displayName": "ყველაზე ადრეული",
+  "Calculations.Options.earliest.label": "ყველაზე ადრეული",
+  "Calculations.Options.latest.displayName": "უახლესი",
+  "Calculations.Options.latest.label": "უახლესი",
+  "Calculations.Options.max.displayName": "მაქსიმალური",
+  "Calculations.Options.max.label": "მაქსიმალური",
+  "Calculations.Options.median.displayName": "საშუალო",
+  "Calculations.Options.median.label": "საშუალო",
+  "Calculations.Options.min.displayName": "მინიმალური",
+  "Calculations.Options.min.label": "მინიმალური",
+  "Calculations.Options.none.displayName": "გამოთვლა",
+  "Calculations.Options.none.label": "გამოთვლა",
+  "Calculations.Options.percentChecked.displayName": "შემოწმებული",
+  "Calculations.Options.percentChecked.label": "პროცენტი შემოწმებულია",
+  "Calculations.Options.percentUnchecked.displayName": "შეუმოწმებელი",
+  "Calculations.Options.percentUnchecked.label": "პროცენტი შეუმოწმებელია",
+  "Calculations.Options.range.displayName": "დიაპაზონი",
+  "Calculations.Options.range.label": "დიაპაზონი",
+  "Calculations.Options.sum.displayName": "ჯამი",
+  "Calculations.Options.sum.label": "ჯამი",
+  "CalendarCard.untitled": "უსათაურო",
+  "CardActionsMenu.copiedLink": "დაკოპირებულია!",
+  "CardActionsMenu.copyLink": "Ბმულის კოპირება",
+  "CardActionsMenu.delete": "წაშლა",
+  "CardActionsMenu.duplicate": "დუბლიკატი",
+  "CardBadges.title-checkboxes": "მოსანიშნი ველები",
+  "CardBadges.title-comments": "კომენტარები",
+  "CardBadges.title-description": "ამ ბარათს აქვს აღწერა",
+  "CardDetail.Follow": "გაყოლა",
+  "CardDetail.Following": "მომდევნო",
+  "CardDetail.add-content": "დაამატეთ შინაარსი",
+  "CardDetail.add-icon": "ხატულის დამატება",
+  "CardDetail.add-property": "+ დაამატეთ Property",
+  "CardDetail.addCardText": "ბარათის ტექსტის დამატება",
+  "CardDetail.limited-body": "ბარათის ტექსტის დამატება განაახლეთ ჩვენს პროფესიონალურ ან საწარმოს გეგმაში დაარქივებული ბარათების სანახავად, თითო დაფაზე ულიმიტო ნახვები, ულიმიტო ბარათები და სხვა.",
+  "CardDetail.limited-button": "განახლება",
+  "CardDetail.limited-title": "ეს ბარათი დამალულია",
+  "CardDetail.moveContent": "ბარათის შინაარსის გადატანა",
+  "CardDetail.new-comment-placeholder": "კომენტარის დამატება...",
+  "CardDetailProperty.confirm-delete-heading": "დაადასტურეთ Property-ის წაშლა",
+  "CardDetailProperty.confirm-delete-subtext": "დარწმუნებული ხართ, რომ გსურთ წაშალოთ Property „{propertyName}“? მისი წაშლა წაშლის Property-ის ამ დაფის ყველა ბარათიდან.",
+  "CardDetailProperty.confirm-property-name-change-subtext": "დარწმუნებული ხართ, რომ გსურთ შეცვალოთ თვისება „{propertyName}“ {customText}? ეს გავლენას მოახდენს მნიშვნელობა(ებ)ზე {numOfCards} ბარათ(ებ)ში ამ დაფაზე და შეიძლება გამოიწვიოს მონაცემთა დაკარგვა.",
+  "CardDetailProperty.confirm-property-type-change": "დაადასტურეთ Property-ის ტიპის ცვლილება",
+  "CardDetailProperty.delete-action-button": "წაშლა",
+  "CardDetailProperty.property-change-action-button": "Property-ის შეცვლა",
+  "CardDetailProperty.property-changed": "Property წარმატებით შეიცვალა!",
+  "CardDetailProperty.property-deleted": "{propertyName} წარმატებით წაიშალა!",
+  "CardDetailProperty.property-name-change-subtext": "აკრიფეთ „{oldPropType}“-დან „{newPropType}“-მდე",
+  "CardDetial.limited-link": "შეიტყვეთ მეტი ჩვენი გეგმების შესახებ.",
+  "CardDialog.delete-confirmation-dialog-button-text": "წაშლა",
+  "CardDialog.delete-confirmation-dialog-heading": "დაადასტურეთ ბარათის წაშლა!",
+  "CardDialog.editing-template": "თქვენ არედაქტირებთ შაბლონს.",
+  "CardDialog.nocard": "ეს ბარათი არ არსებობს ან მიუწვდომელია.",
+  "Categories.CreateCategoryDialog.CancelText": "გაუქმება",
+  "Categories.CreateCategoryDialog.CreateText": "Შექმნა",
+  "Categories.CreateCategoryDialog.Placeholder": "მიეცით სახელი თქვენს კატეგორიას",
+  "Categories.CreateCategoryDialog.UpdateText": "განახლება",
+  "CenterPanel.Login": "შესვლა",
+  "CenterPanel.Share": "გაზიარება",
+  "ColorOption.selectColor": "აირჩიეთ {color} ფერი",
+  "Comment.delete": "წაშლა",
+  "CommentsList.send": "გაგზავნა",
+  "ConfirmationDialog.cancel-action": "გაუქმება",
+  "ConfirmationDialog.confirm-action": "დადასტურება",
+  "ContentBlock.Delete": "წაშლა",
+  "ContentBlock.DeleteAction": "წაშლა",
+  "ContentBlock.addElement": "დაამატეთ {type}",
+  "ContentBlock.checkbox": "მონიშვნის ველი",
+  "ContentBlock.divider": "გამყოფი",
+  "ContentBlock.editCardCheckbox": "მონიშნული-მონიშვნის ველი",
+  "ContentBlock.editCardCheckboxText": "ბარათის ტექსტის რედაქტირება",
+  "ContentBlock.editCardText": "ბარათის ტექსტის რედაქტირება",
+  "ContentBlock.editText": "ტექსტის რედაქტირება...",
+  "ContentBlock.image": "გამოსახულება"
 }
diff --git a/webapp/boards/i18n/tr.json b/webapp/boards/i18n/tr.json
index 948676da4a..0c9614a803 100644
--- a/webapp/boards/i18n/tr.json
+++ b/webapp/boards/i18n/tr.json
@@ -1,462 +1,462 @@
 {
-    "AdminBadge.SystemAdmin": "Yönetici",
-    "AdminBadge.TeamAdmin": "Takım yöneticisi",
-    "AppBar.Tooltip": "Bağlantılı panoları aç/kapat",
-    "Attachment.Attachment-title": "Ek dosya",
-    "AttachmentBlock.DeleteAction": "sil",
-    "AttachmentBlock.addElement": "{type} ekle",
-    "AttachmentBlock.delete": "Ek dosya silindi.",
-    "AttachmentBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
-    "AttachmentBlock.upload": "Ek dosya yükleniyor.",
-    "AttachmentBlock.uploadSuccess": "Ek dosya yüklendi.",
-    "AttachmentElement.delete-confirmation-dialog-button-text": "Sil",
-    "AttachmentElement.download": "İndir",
-    "AttachmentElement.upload-percentage": "Yükleniyor...(%{uploadPercent})",
-    "BoardComponent.add-a-group": "+ Grup ekle",
-    "BoardComponent.delete": "Sil",
-    "BoardComponent.hidden-columns": "Gizli sütunlar",
-    "BoardComponent.hide": "Gizle",
-    "BoardComponent.new": "+ Yeni",
-    "BoardComponent.no-property": "{property} yok",
-    "BoardComponent.no-property-title": "{property} alanı boş olan ögeler buraya atanır. Bu sütun silinemez.",
-    "BoardComponent.show": "Görüntüle",
-    "BoardMember.schemeAdmin": "Yönetici",
-    "BoardMember.schemeCommenter": "Yorumcu",
-    "BoardMember.schemeEditor": "Düzenleyici",
-    "BoardMember.schemeNone": "Yok",
-    "BoardMember.schemeViewer": "Görüntüleyici",
-    "BoardMember.unlinkChannel": "Bağlantıyı kaldır",
-    "BoardPage.newVersion": "Yeni bir pano sürümü yayınlanmış. Yeniden yüklemek için buraya tıklayın.",
-    "BoardPage.syncFailed": "Pano silinmiş ya da erişim izni geri alınmış olabilir.",
-    "BoardTemplateSelector.add-template": "Yeni kalıp ekle",
-    "BoardTemplateSelector.create-empty-board": "Boş bir pano ekle",
-    "BoardTemplateSelector.delete-template": "Sil",
-    "BoardTemplateSelector.description": "Kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
-    "BoardTemplateSelector.edit-template": "Düzenle",
-    "BoardTemplateSelector.plugin.no-content-description": "Aşağıdaki kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
-    "BoardTemplateSelector.plugin.no-content-title": "Bir pano ekleyin",
-    "BoardTemplateSelector.title": "Bir pano ekle",
-    "BoardTemplateSelector.use-this-template": "Bu kalıp kullanılsın",
-    "BoardsSwitcher.Title": "Pano arama",
-    "BoardsUnfurl.Limited": "Kart arşivlendiğinden ek bilgiler gizleniyor",
-    "BoardsUnfurl.Remainder": "+{remainder} diğer",
-    "BoardsUnfurl.Updated": "Güncellenme: {time}",
-    "Calculations.Options.average.displayName": "Ortalama",
-    "Calculations.Options.average.label": "Ortalama",
-    "Calculations.Options.count.displayName": "Sayı",
-    "Calculations.Options.count.label": "Sayı",
-    "Calculations.Options.countChecked.displayName": "İşaretlenmiş",
-    "Calculations.Options.countChecked.label": "İşaretlenmiş sayısı",
-    "Calculations.Options.countUnchecked.displayName": "İşaretlenmemiş",
-    "Calculations.Options.countUnchecked.label": "İşaretlenmemiş sayısı",
-    "Calculations.Options.countUniqueValue.displayName": "Eşsiz",
-    "Calculations.Options.countUniqueValue.label": "Eşsiz değer sayısı",
-    "Calculations.Options.countValue.displayName": "Değer",
-    "Calculations.Options.countValue.label": "Değer sayısı",
-    "Calculations.Options.dateRange.displayName": "Aralık",
-    "Calculations.Options.dateRange.label": "Aralık",
-    "Calculations.Options.earliest.displayName": "En erken",
-    "Calculations.Options.earliest.label": "En erken",
-    "Calculations.Options.latest.displayName": "En geç",
-    "Calculations.Options.latest.label": "En geç",
-    "Calculations.Options.max.displayName": "En fazla",
-    "Calculations.Options.max.label": "En fazla",
-    "Calculations.Options.median.displayName": "Orta değer",
-    "Calculations.Options.median.label": "Orta değer",
-    "Calculations.Options.min.displayName": "En az",
-    "Calculations.Options.min.label": "En az",
-    "Calculations.Options.none.displayName": "Hesapla",
-    "Calculations.Options.none.label": "Yok",
-    "Calculations.Options.percentChecked.displayName": "İşaretlenmiş",
-    "Calculations.Options.percentChecked.label": "İşaretlenmiş yüzdesi",
-    "Calculations.Options.percentUnchecked.displayName": "İşaretlenmemiş",
-    "Calculations.Options.percentUnchecked.label": "İşaretlenmemiş yüzdesi",
-    "Calculations.Options.range.displayName": "Aralık",
-    "Calculations.Options.range.label": "Aralık",
-    "Calculations.Options.sum.displayName": "Toplam",
-    "Calculations.Options.sum.label": "Toplam",
-    "CalendarCard.untitled": "Adlandırılmamış",
-    "CardActionsMenu.copiedLink": "Kopyalandı!",
-    "CardActionsMenu.copyLink": "Bağlantıyı kopyala",
-    "CardActionsMenu.delete": "Sil",
-    "CardActionsMenu.duplicate": "Kopyala",
-    "CardBadges.title-checkboxes": "İşaret kutuları",
-    "CardBadges.title-comments": "Yorumlar",
-    "CardBadges.title-description": "Bu kartın bir açıklaması var",
-    "CardDetail.Attach": "Dosya ekle",
-    "CardDetail.Follow": "İzle",
-    "CardDetail.Following": "İzleniyor",
-    "CardDetail.add-content": "İçerik ekle",
-    "CardDetail.add-icon": "Simge ekle",
-    "CardDetail.add-property": "+ Bir özellik ekle",
-    "CardDetail.addCardText": "kart metni ekle",
-    "CardDetail.limited-body": "Professional ya da Enterprise tarifesine geçin.",
-    "CardDetail.limited-button": "Üst tarifeye geç",
-    "CardDetail.limited-title": "Bu kart gizli",
-    "CardDetail.moveContent": "Kart içeriğini taşı",
-    "CardDetail.new-comment-placeholder": "Bir yorum ekle...",
-    "CardDetailProperty.confirm-delete-heading": "Özelliği silmeyi onaylayın",
-    "CardDetailProperty.confirm-delete-subtext": "\"{propertyName}\" özelliğini silmek istediğinize emin misiniz? Bu işlem özelliği panodaki tüm kartlardan siler.",
-    "CardDetailProperty.confirm-property-name-change-subtext": "\"{propertyName}\" {customText} özelliğini değiştirmek istediğinize emin misiniz? Bu işlem bu panodaki {numOfCards} kartı etkiler ve veri kaybına yol açabilir.",
-    "CardDetailProperty.confirm-property-type-change": "Özellik türü değişimini onaylayın",
-    "CardDetailProperty.delete-action-button": "Sil",
-    "CardDetailProperty.property-change-action-button": "Özelliği değiştir",
-    "CardDetailProperty.property-changed": "Özellik değiştirildi!",
-    "CardDetailProperty.property-deleted": "{propertyName} silindi!",
-    "CardDetailProperty.property-name-change-subtext": "\"{oldPropType}\" türünden \"{newPropType}\" türüne",
-    "CardDetial.limited-link": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
-    "CardDialog.delete-confirmation-dialog-attachment": "Ek dosyanın silinmesini onaylayın",
-    "CardDialog.delete-confirmation-dialog-button-text": "Sil",
-    "CardDialog.delete-confirmation-dialog-heading": "Kartı silmeyi onaylayın",
-    "CardDialog.editing-template": "Bir kalıbı düzenliyorsunuz.",
-    "CardDialog.nocard": "Bu kart bulunamadı ya da erişilebilir değil.",
-    "Categories.CreateCategoryDialog.CancelText": "İptal",
-    "Categories.CreateCategoryDialog.CreateText": "Ekle",
-    "Categories.CreateCategoryDialog.Placeholder": "Kategorinize bir ad verin",
-    "Categories.CreateCategoryDialog.UpdateText": "Güncelle",
-    "CenterPanel.Login": "Oturum aç",
-    "CenterPanel.Share": "Paylaş",
-    "ChannelIntro.CreateBoard": "Bir pano ekle",
-    "ColorOption.selectColor": "{color} rengi seçin",
-    "Comment.delete": "Sil",
-    "CommentsList.send": "Gönder",
-    "ConfirmPerson.empty": "Boş",
-    "ConfirmPerson.search": "Arama...",
-    "ConfirmationDialog.cancel-action": "İptal",
-    "ConfirmationDialog.confirm-action": "Onayla",
-    "ContentBlock.Delete": "Sil",
-    "ContentBlock.DeleteAction": "sil",
-    "ContentBlock.addElement": "{type} ekle",
-    "ContentBlock.checkbox": "işaret kutusu",
-    "ContentBlock.divider": "ayıraç",
-    "ContentBlock.editCardCheckbox": "değiştirilmiş işaret kutusu",
-    "ContentBlock.editCardCheckboxText": "kart metnini düzenle",
-    "ContentBlock.editCardText": "kart metnini düzenle",
-    "ContentBlock.editText": "Metni düzenle...",
-    "ContentBlock.image": "görsel",
-    "ContentBlock.insertAbove": "Üste ekle",
-    "ContentBlock.moveBlock": "kart içeriğini taşı",
-    "ContentBlock.moveDown": "Alta taşı",
-    "ContentBlock.moveUp": "Üste taşı",
-    "ContentBlock.text": "metin",
-    "DateFilter.empty": "Boş",
-    "DateRange.clear": "Temizle",
-    "DateRange.empty": "Boş",
-    "DateRange.endDate": "Bitiş tarihi",
-    "DateRange.today": "Bugün",
-    "DeleteBoardDialog.confirm-cancel": "İptal",
-    "DeleteBoardDialog.confirm-delete": "Sil",
-    "DeleteBoardDialog.confirm-info": "“{boardTitle}” panosunu silmek istediğinize emin misiniz? Silme işlemi bu panodaki tüm kartları siler.",
-    "DeleteBoardDialog.confirm-info-template": "“{boardTitle}” pano kalıbını silmek istediğinize emin misiniz?",
-    "DeleteBoardDialog.confirm-tite": "Panoyu silmeyi onayla",
-    "DeleteBoardDialog.confirm-tite-template": "Pano kalıbını silmeyi onayla",
-    "Dialog.closeDialog": "Pencereyi kapat",
-    "EditableDayPicker.today": "Bugün",
-    "Error.mobileweb": "Mobil web desteği şu anda erken beta aşamasındadır. Tüm işlevler kullanılamıyor olabilir.",
-    "Error.websocket-closed": "Websoket bağlantısı kesildi. Bu sorun sürerse, sunucu ya da web vekil sunucu yapılandırmanızı denetleyin.",
-    "Filter.contains": "şunu içeren",
-    "Filter.ends-with": "şununla biten",
-    "Filter.includes": "şunu içeren",
-    "Filter.is": "şu olan",
-    "Filter.is-after": "şundan sonra",
-    "Filter.is-before": "şundan önce",
-    "Filter.is-empty": "boş olan",
-    "Filter.is-not-empty": "boş olmayan",
-    "Filter.is-not-set": "şuna ayarlanmamış olan",
-    "Filter.is-set": "şuna ayarlanmış olan",
-    "Filter.isafter": "şundan sonra",
-    "Filter.isbefore": "şundan önce",
-    "Filter.not-contains": "şunu içermeyen",
-    "Filter.not-ends-with": "şununla bitmeyen",
-    "Filter.not-includes": "şunu içermeyen",
-    "Filter.not-starts-with": "şununla başlamayan",
-    "Filter.starts-with": "şununla başlayan",
-    "FilterByText.placeholder": "metni süz",
-    "FilterComponent.add-filter": "+ Süzgeç ekle",
-    "FilterComponent.delete": "Sil",
-    "FilterValue.empty": "(boş)",
-    "FindBoardsDialog.IntroText": "Pano arama",
-    "FindBoardsDialog.NoResultsFor": "\"{searchQuery}\" için bir sonuç bulunamadı",
-    "FindBoardsDialog.NoResultsSubtext": "Yazımı denetleyin ya da başka bir arama yapmayı deneyin.",
-    "FindBoardsDialog.SubTitle": "Bulmak istediğiniz pano adını yazmaya başlayın. Gezinmek için <b>YUKAR/AŞAĞI</b>, seçmek için <b>ENTER</b>, vazgeçmek için <b>ESC</b> tuşlarını kullanın",
-    "FindBoardsDialog.Title": "Pano arama",
-    "GroupBy.hideEmptyGroups": "{count} boş grubu gizle",
-    "GroupBy.showHiddenGroups": "{count} gizli grubu görüntüle",
-    "GroupBy.ungroup": "Gruplamayı kaldır",
-    "HideBoard.MenuOption": "Panoyu gizle",
-    "KanbanCard.untitled": "Adlandırılmamış",
-    "MentionSuggestion.is-not-board-member": "(pano üyesi değil)",
-    "Mutator.new-board-from-template": "kalıptan yeni pano",
-    "Mutator.new-card-from-template": "kalıptan yeni kart oluştur",
-    "Mutator.new-template-from-card": "karttan yeni kalıp oluştur",
-    "OnboardingTour.AddComments.Body": "Sorunlar hakkında yorum yapabilir ve Mattermost kullanıcılarının dikkatini çekmek için @anabilirsiniz.",
-    "OnboardingTour.AddComments.Title": "Yorum yap",
-    "OnboardingTour.AddDescription.Body": "Takım arkadaşlarınızın kartın ne ile ilgili olduğunu anlaması için kartınıza bir açıklama ekleyin.",
-    "OnboardingTour.AddDescription.Title": "Açıklama ekle",
-    "OnboardingTour.AddProperties.Body": "Daha güçlü kılmak için kartlara çeşitli özellikler ekleyin.",
-    "OnboardingTour.AddProperties.Title": "Özellikler ekle",
-    "OnboardingTour.AddView.Body": "Farklı görünümler kullanarak panonuzu düzenleyecek yeni bir görünüm oluşturmak için buraya gidin.",
-    "OnboardingTour.AddView.Title": "Yeni bir görünüm ekle",
-    "OnboardingTour.CopyLink.Body": "Kartlarınızı takım arkadaşlarınızla paylaşmak için bağlantıyı kopyalayıp bir kanala, doğrudan iletiye veya grup iletisine yapıştırın.",
-    "OnboardingTour.CopyLink.Title": "Bağlantıyı kopyala",
-    "OnboardingTour.OpenACard.Body": "Panoların işinizi düzenlemenize yardımcı olabileceği güçlü yolları keşfetmek için bir kart açın.",
-    "OnboardingTour.OpenACard.Title": "Bir kart açın",
-    "OnboardingTour.ShareBoard.Body": "Panonuzu içeride, ekibiniz ile paylaşabilir ya da kuruluşunuzun dışında herkese açık olarak yayınlayabilirsiniz.",
-    "OnboardingTour.ShareBoard.Title": "Panoyu paylaş",
-    "PersonProperty.board-members": "Pano üyeleri",
-    "PersonProperty.me": "Benim",
-    "PersonProperty.non-board-members": "Pano üyesi olmayanlar",
-    "PropertyMenu.Delete": "Sil",
-    "PropertyMenu.changeType": "Özellik türünü değiştir",
-    "PropertyMenu.selectType": "Özellik türünü seçin",
-    "PropertyMenu.typeTitle": "Tür",
-    "PropertyType.Checkbox": "İşaret kutusu",
-    "PropertyType.CreatedBy": "Oluşturan",
-    "PropertyType.CreatedTime": "Oluşturulma zamanı",
-    "PropertyType.Date": "Tarih",
-    "PropertyType.Email": "E-posta",
-    "PropertyType.MultiPerson": "Çok kişi",
-    "PropertyType.MultiSelect": "Çoklu seçim",
-    "PropertyType.Number": "Sayı",
-    "PropertyType.Person": "Kişi",
-    "PropertyType.Phone": "Telefon",
-    "PropertyType.Select": "Seçin",
-    "PropertyType.Text": "Metin",
-    "PropertyType.Unknown": "Bilinmiyor",
-    "PropertyType.UpdatedBy": "Son güncelleyen",
-    "PropertyType.UpdatedTime": "Son güncelleme zamanı",
-    "PropertyType.Url": "Adres",
-    "PropertyValueElement.empty": "Boş",
-    "RegistrationLink.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
-    "RegistrationLink.copiedLink": "Kopyalandı!",
-    "RegistrationLink.copyLink": "Bağlantıyı kopyala",
-    "RegistrationLink.description": "Başkalarının hesap ekleyebilmesi için bu bağlantıyı paylaş:",
-    "RegistrationLink.regenerateToken": "Kodu yeniden oluştur",
-    "RegistrationLink.tokenRegenerated": "Kayıt bağlantısı yeniden oluşturuldu",
-    "ShareBoard.PublishDescription": "Web üzerinde herkese açık olarak \"salt okunur\" bir bağlantı yayınlayın ve paylaşın.",
-    "ShareBoard.PublishTitle": "Web üzerinde yayınla",
-    "ShareBoard.ShareInternal": "İçeride paylaş",
-    "ShareBoard.ShareInternalDescription": "İzni olan kullanıcılar bu bağlantıyı kullanabilecek.",
-    "ShareBoard.Title": "Panoyu paylaş",
-    "ShareBoard.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
-    "ShareBoard.copiedLink": "Kopyalandı!",
-    "ShareBoard.copyLink": "Bağlantıyı kopyala",
-    "ShareBoard.regenerate": "Kodu yeniden oluştur",
-    "ShareBoard.searchPlaceholder": "Kişi ve kanal arama",
-    "ShareBoard.teamPermissionsText": "{teamName} takımındaki herkes",
-    "ShareBoard.tokenRegenrated": "Kod yeniden oluşturuldu",
-    "ShareBoard.userPermissionsRemoveMemberText": "Üyelikten çıkar",
-    "ShareBoard.userPermissionsYouText": "(Siz)",
-    "ShareTemplate.Title": "Kalıbı paylaş",
-    "ShareTemplate.searchPlaceholder": "Kişi arama",
-    "Sidebar.about": "Focalboard hakkında",
-    "Sidebar.add-board": "+ Pano ekle",
-    "Sidebar.changePassword": "Parola değiştir",
-    "Sidebar.delete-board": "Panoyu sil",
-    "Sidebar.duplicate-board": "Panoyu kopyala",
-    "Sidebar.export-archive": "Arşivi dışa aktar",
-    "Sidebar.import": "İçe aktar",
-    "Sidebar.import-archive": "Arşivi içe aktar",
-    "Sidebar.invite-users": "Kullanıcıları çağır",
-    "Sidebar.logout": "Oturumu kapat",
-    "Sidebar.new-category.badge": "Yeni",
-    "Sidebar.new-category.drag-boards-cta": "Panoları sürükleyip buraya bırakın...",
-    "Sidebar.no-boards-in-category": "İçeride bir pano yok",
-    "Sidebar.product-tour": "Tanıtım turu",
-    "Sidebar.random-icons": "Rastgele simgeler",
-    "Sidebar.set-language": "Dili ayarla",
-    "Sidebar.set-theme": "Temayı ayarla",
-    "Sidebar.settings": "Ayarlar",
-    "Sidebar.template-from-board": "Panodan yeni kalıp",
-    "Sidebar.untitled-board": "(Adlandırılmamış pano)",
-    "Sidebar.untitled-view": "(Adlandırılmamış görünüm)",
-    "SidebarCategories.BlocksMenu.Move": "Şuraya taşı...",
-    "SidebarCategories.CategoryMenu.CreateNew": "Yeni kategori ekle",
-    "SidebarCategories.CategoryMenu.Delete": "Kategoriyi sił",
-    "SidebarCategories.CategoryMenu.DeleteModal.Body": "<b>{categoryName}</b> içindeki panolar Panolar kategorisine taşınacak. Herhangi bir panodan çıkarılmayacaksınız.",
-    "SidebarCategories.CategoryMenu.DeleteModal.Title": "Bu kategori silinsin mi?",
-    "SidebarCategories.CategoryMenu.Update": "Kategoriyi yeniden adlandır",
-    "SidebarTour.ManageCategories.Body": "Özel kategoriler oluşturun ve yönetin. Kategoriler kullanıcıya özeldir, bu nedenle bir panoyu kendi kategorinize taşımanız aynı panoyu kullanan diğer üyeleri etkilemez.",
-    "SidebarTour.ManageCategories.Title": "Kategori yönetimi",
-    "SidebarTour.SearchForBoards.Body": "Panoları hızlıca aramak ve yan çubuğunuza eklemek için pano değiştiriciyi (Cmd/Ctrl + K) açın.",
-    "SidebarTour.SearchForBoards.Title": "Pano arama",
-    "SidebarTour.SidebarCategories.Body": "Tüm panolarınızı artık yeni yan çubuğunuz altında bulabilirsiniz. Artık çalışma alanları arasında geçiş yapmanıza gerek yok. Önceki çalışma alanlarınıza göre eklenmiş tek seferlik özel kategoriler, 7.2 sürümüne güncellemenizin bir parçası olarak otomatik şekilde eklenmiş olabilir. Bunları isteğinize göre kaldırabilir ya da düzenleyebilirsiniz.",
-    "SidebarTour.SidebarCategories.Link": "Ayrıntılı bilgi alın",
-    "SidebarTour.SidebarCategories.Title": "Yan çubuk kategorileri",
-    "SiteStats.total_boards": "Toplam pano",
-    "SiteStats.total_cards": "Toplam kart",
-    "TableComponent.add-icon": "Simge ekle",
-    "TableComponent.name": "Ad",
-    "TableComponent.plus-new": "+ Yeni",
-    "TableHeaderMenu.delete": "Sil",
-    "TableHeaderMenu.duplicate": "Kopya oluştur",
-    "TableHeaderMenu.hide": "Gizle",
-    "TableHeaderMenu.insert-left": "Sola ekle",
-    "TableHeaderMenu.insert-right": "Sağa ekle",
-    "TableHeaderMenu.sort-ascending": "Artan sıralama",
-    "TableHeaderMenu.sort-descending": "Azalan sıralama",
-    "TableRow.DuplicateCard": "kartı kopyala",
-    "TableRow.MoreOption": "Diğer işlemler",
-    "TableRow.open": "Aç",
-    "TopBar.give-feedback": "Geri bildirimde bulunun",
-    "URLProperty.copiedLink": "Kopyalandı!",
-    "URLProperty.copy": "Kopyala",
-    "URLProperty.edit": "Düzenle",
-    "UndoRedoHotKeys.canRedo": "Yinele",
-    "UndoRedoHotKeys.canRedo-with-description": "{description} yinele",
-    "UndoRedoHotKeys.canUndo": "Geri al",
-    "UndoRedoHotKeys.canUndo-with-description": "{description} geri al",
-    "UndoRedoHotKeys.cannotRedo": "Yinelenecek bir işlem yok",
-    "UndoRedoHotKeys.cannotUndo": "Geri alınacak bir işlem yok",
-    "ValueSelector.noOptions": "Herhangi bir seçenek yok. İlk seçeneği eklemek için yazmaya başlayın!",
-    "ValueSelector.valueSelector": "Değer seçici",
-    "ValueSelectorLabel.openMenu": "Menüyü aç",
-    "VersionMessage.help": "Bu sürümdeki yeniliklere bakın.",
-    "VersionMessage.learn-more": "Ayrıntılı bilgi alın",
-    "View.AddView": "Görünüm ekle",
-    "View.Board": "Pano",
-    "View.DeleteView": "Görünümü sil",
-    "View.DuplicateView": "Görünümü kopyala",
-    "View.Gallery": "Galeri",
-    "View.NewBoardTitle": "Pano görünümü",
-    "View.NewCalendarTitle": "Takvim görünümü",
-    "View.NewGalleryTitle": "Galeri görünümü",
-    "View.NewTableTitle": "Tablo görünümü",
-    "View.NewTemplateDefaultTitle": "Adlandırılmamış kalıp",
-    "View.NewTemplateTitle": "Adlandırılmamış",
-    "View.Table": "Tablo",
-    "ViewHeader.add-template": "Yeni kalıp",
-    "ViewHeader.delete-template": "Sil",
-    "ViewHeader.display-by": "Görünüm: {property}",
-    "ViewHeader.edit-template": "Düzenle",
-    "ViewHeader.empty-card": "Boş kart",
-    "ViewHeader.export-board-archive": "Pano arşivini dışa aktar",
-    "ViewHeader.export-complete": "Dışa aktarıldı!",
-    "ViewHeader.export-csv": "CSV olarak dışa aktar",
-    "ViewHeader.export-failed": "Dışa aktarılamadı!",
-    "ViewHeader.filter": "Süz",
-    "ViewHeader.group-by": "Grupla: {property}",
-    "ViewHeader.new": "Yeni",
-    "ViewHeader.properties": "Özellikler",
-    "ViewHeader.properties-menu": "Özellikler menüsü",
-    "ViewHeader.search-text": "Kart arama",
-    "ViewHeader.select-a-template": "Bir kalıp seçin",
-    "ViewHeader.set-default-template": "Varsayılan olarak ata",
-    "ViewHeader.sort": "Sırala",
-    "ViewHeader.untitled": "Adlandırılmamış",
-    "ViewHeader.view-header-menu": "Başlık menüsünü görüntüle",
-    "ViewHeader.view-menu": "Menüyü görüntüle",
-    "ViewLimitDialog.Heading": "Bir panoyu görüntüleme sınırına ulaşıldı",
-    "ViewLimitDialog.PrimaryButton.Title.Admin": "Üst tarifeye geç",
-    "ViewLimitDialog.PrimaryButton.Title.RegularUser": "Yöneticiyi bilgilendir",
-    "ViewLimitDialog.Subtext.Admin": "Professional ya da Enterprise tarifemize geçin.",
-    "ViewLimitDialog.Subtext.Admin.PricingPageLink": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
-    "ViewLimitDialog.Subtext.RegularUser": "Yöneticinizi Professional ya da Enterprise tarifesine geçmesi hakkında bilgilendirin.",
-    "ViewLimitDialog.UpgradeImg.AltText": "üst tarifeye geçiş görseli",
-    "ViewLimitDialog.notifyAdmin.Success": "Yöneticiniz bilgilendirildi",
-    "ViewTitle.hide-description": "açıklamayı gizle",
-    "ViewTitle.pick-icon": "Simge seçin",
-    "ViewTitle.random-icon": "Rastgele",
-    "ViewTitle.remove-icon": "Simgeyi kaldır",
-    "ViewTitle.show-description": "açıklamayı görüntüle",
-    "ViewTitle.untitled-board": "Adlandırılmamış pano",
-    "WelcomePage.Description": "Pano, alışılmış Kanban panosu görünümünde takımların işleri tanımlamasını, düzenlemesini, izlemesi ve yönetmesini sağlayan bir proje yönetimi aracıdır.",
-    "WelcomePage.Explore.Button": "Tura çıkın",
-    "WelcomePage.Heading": "Panolara hoş geldiniz",
-    "WelcomePage.NoThanks.Text": "Hayır teşekkürler, kendim anlayacağım",
-    "WelcomePage.StartUsingIt.Text": "Kullanmaya başlayın",
-    "Workspace.editing-board-template": "Bir pano kalıbını düzenliyorsunuz.",
-    "badge.guest": "Konuk",
-    "boardPage.confirm-join-button": "Katıl",
-    "boardPage.confirm-join-text": "Bir özel kanala, pano yöneticisi tarafından açıkça eklenmeden katılmak üzeresiniz. Bu özel kanala katılmak istediğinize emin misiniz?",
-    "boardPage.confirm-join-title": "Özel kanala katıl",
-    "boardSelector.confirm-link-board": "Panoyu kanala bağla",
-    "boardSelector.confirm-link-board-button": "Evet, panoyu bağla",
-    "boardSelector.confirm-link-board-subtext": "\"{boardName}\" panosunu kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır. Bir pano ile bir kanalın bağlantısını istediğiniz zaman kaldırabilirsiniz.",
-    "boardSelector.confirm-link-board-subtext-with-other-channel": "\"{boardName}\" panosunu bir kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konukl üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
-    "boardSelector.create-a-board": "Bir pano ekle",
-    "boardSelector.link": "Bağlantı",
-    "boardSelector.search-for-boards": "Pano arama",
-    "boardSelector.title": "Panoları bağla",
-    "boardSelector.unlink": "Bağlantıyı kaldır",
-    "calendar.month": "Ay",
-    "calendar.today": "Bugün",
-    "calendar.week": "Hafta",
-    "centerPanel.undefined": "{propertyName} yok",
-    "centerPanel.unknown-user": "Kullanıcı bilinmiyor",
-    "cloudMessage.learn-more": "Ayrıntılı bilgi alın",
-    "createImageBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
-    "default-properties.badges": "Yorumlar ve açıklama",
-    "default-properties.title": "Başlık",
-    "error.back-to-home": "Girişe dön",
-    "error.back-to-team": "Takıma dön",
-    "error.board-not-found": "Pano bulunamadı.",
-    "error.go-login": "Oturum aç",
-    "error.invalid-read-only-board": "Bu panoya erişme izniniz yok. Panolara erişmek için oturum açın.",
-    "error.not-logged-in": "Oturumunuzun süresi dolmuş ya da oturum açmamışsınız. Panolara erişmek için yeniden oturum açın.",
-    "error.page.title": "Bir şeyler ters gitti",
-    "error.team-undefined": "Geçerli bir takım değil.",
-    "error.unknown": "Bir sorun çıktı.",
-    "generic.previous": "Önceki",
-    "guest-no-board.subtitle": "Henüz bu takımdaki herhangi bir panoya erişme izniniz yok. Lütfen biri sizi bir panoya ekleyene kadar bekleyin.",
-    "guest-no-board.title": "Henüz bir pano yok",
-    "imagePaste.upload-failed": "Dosya boyutu sınırı aşıldığından bazı dosyalar yüklenemedi.",
-    "limitedCard.title": "Kartlar gizli",
-    "login.log-in-button": "Oturum aç",
-    "login.log-in-title": "Oturum açın",
-    "login.register-button": "ya da hesabınız yoksa bir hesap açın",
-    "new_channel_modal.create_board.empty_board_description": "Yeni boş bir pano oluştur",
-    "new_channel_modal.create_board.empty_board_title": "Boş pano",
-    "new_channel_modal.create_board.select_template_placeholder": "Bir kalıp seçin",
-    "new_channel_modal.create_board.title": "Bu kanal için bir pano oluştur",
-    "notification-box-card-limit-reached.close-tooltip": "10 gün için sustur",
-    "notification-box-card-limit-reached.contact-link": "yöneticinizi bilgilendirin",
-    "notification-box-card-limit-reached.link": "Ücretli bir tarifeye geçin",
-    "notification-box-card-limit-reached.title": "panoda {cards} kart gizli",
-    "notification-box-cards-hidden.title": "Bu işlem başka bir kartı gizledi",
-    "notification-box.card-limit-reached.not-admin.text": "Arşivlenmiş kartlara erişmek için {contactLink} ile görüşerek ücretli bir tarifeye geçmesini isteyin.",
-    "notification-box.card-limit-reached.text": "Kart sınırına ulaşıldı. Eski kartları görüntülemek için {link}",
-    "person.add-user-to-board": "{username} kullanıcısını panoya ekle",
-    "person.add-user-to-board-confirm-button": "Panoya ekle",
-    "person.add-user-to-board-permissions": "İzinler",
-    "person.add-user-to-board-question": "{username} kullanıcısını panoya eklemek ister misiniz?",
-    "person.add-user-to-board-warning": "{username} panonun bir üyesi değil ve pano ile ilgili herhangi bir bildirim almayacak.",
-    "register.login-button": "ya da bir hesabınız varsa oturum açın",
-    "register.signup-title": "Hesap açın",
-    "rhs-board-non-admin-msg": "Panonun yöneticilerinden değilsiniz",
-    "rhs-boards.add": "Ekle",
-    "rhs-boards.dm": "Dİ",
-    "rhs-boards.gm": "Gİ",
-    "rhs-boards.header.dm": "bu doğrudan ileti",
-    "rhs-boards.header.gm": "bu grup iletisi",
-    "rhs-boards.last-update-at": "Son güncelleme: {datetime}",
-    "rhs-boards.link-boards-to-channel": "Panoları {channelName} kanalına bağla",
-    "rhs-boards.linked-boards": "Bağlı panolar",
-    "rhs-boards.no-boards-linked-to-channel": "Henüz {channelName} kanalına bağlanmış bir pano yok",
-    "rhs-boards.no-boards-linked-to-channel-description": "Panolar, takımlar arasındaki çalışmaları tanımlamak, organize etmek, izlemek ve yönetmek için kullanılabilen kandan panosuna benzer bir proje yönetimi aracıdır.",
-    "rhs-boards.unlink-board": "Panonun bağlantısını kaldır",
-    "rhs-boards.unlink-board1": "Pano bağlantısını kaldır",
-    "rhs-channel-boards-header.title": "Panolar",
-    "share-board.publish": "Yayınla",
-    "share-board.share": "Paylaş",
-    "shareBoard.channels-select-group": "Kanallar",
-    "shareBoard.confirm-change-team-role.body": "Bu panoda izinleri \"{role}\" rolünden daha aşağıda olan herkes <b>{role} rolüne yükseltilecek</b>. Panonunen düşük rolünü değiştirmek istediğinize emin misiniz?",
-    "shareBoard.confirm-change-team-role.confirmBtnText": "Panonun en düşük rolünü değiştir",
-    "shareBoard.confirm-change-team-role.title": "Panonun en düşük rolünü değiştir",
-    "shareBoard.confirm-link-channel": "Panoyu kanala bağla",
-    "shareBoard.confirm-link-channel-button": "Kanalı bağla",
-    "shareBoard.confirm-link-channel-button-with-other-channel": "Eski bağlantıyı kes ve bu kanala bağla",
-    "shareBoard.confirm-link-channel-subtext": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.",
-    "shareBoard.confirm-link-channel-subtext-with-other-channel": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
-    "shareBoard.confirm-unlink.body": "Bir kanalın bir pano ile bağlantısını kaldırdığınızda, kanalın tüm üyeleri (var olan ve yeni), kendilerine özel olarak izin verilmedikçe, panoya erişimi kaybeder.",
-    "shareBoard.confirm-unlink.confirmBtnText": "Kanalın bağlantısını kaldır",
-    "shareBoard.confirm-unlink.title": "Kanalın pano ile bağlantısı kaldır",
-    "shareBoard.lastAdmin": "Panoların en az bir yöneticisi olmalıdır",
-    "shareBoard.members-select-group": "Üyeler",
-    "shareBoard.unknown-channel-display-name": "Kanal bilinmiyor",
-    "tutorial_tip.finish_tour": "Tamam",
-    "tutorial_tip.got_it": "Anladım",
-    "tutorial_tip.ok": "Sonraki",
-    "tutorial_tip.out": "Bu ipuçları görüntülenmesin.",
-    "tutorial_tip.seen": "Daha önce gördünüz mü?"
+  "AdminBadge.SystemAdmin": "Yönetici",
+  "AdminBadge.TeamAdmin": "Takım yöneticisi",
+  "AppBar.Tooltip": "Bağlantılı panoları aç/kapat",
+  "Attachment.Attachment-title": "Ek dosya",
+  "AttachmentBlock.DeleteAction": "sil",
+  "AttachmentBlock.addElement": "{type} ekle",
+  "AttachmentBlock.delete": "Ek dosya silindi.",
+  "AttachmentBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
+  "AttachmentBlock.upload": "Ek dosya yükleniyor.",
+  "AttachmentBlock.uploadSuccess": "Ek dosya yüklendi.",
+  "AttachmentElement.delete-confirmation-dialog-button-text": "Sil",
+  "AttachmentElement.download": "İndir",
+  "AttachmentElement.upload-percentage": "Yükleniyor...(%{uploadPercent})",
+  "BoardComponent.add-a-group": "+ Grup ekle",
+  "BoardComponent.delete": "Sil",
+  "BoardComponent.hidden-columns": "Gizli sütunlar",
+  "BoardComponent.hide": "Gizle",
+  "BoardComponent.new": "+ Yeni",
+  "BoardComponent.no-property": "{property} yok",
+  "BoardComponent.no-property-title": "{property} alanı boş olan ögeler buraya atanır. Bu sütun silinemez.",
+  "BoardComponent.show": "Görüntüle",
+  "BoardMember.schemeAdmin": "Yönetici",
+  "BoardMember.schemeCommenter": "Yorumcu",
+  "BoardMember.schemeEditor": "Düzenleyici",
+  "BoardMember.schemeNone": "Yok",
+  "BoardMember.schemeViewer": "Görüntüleyici",
+  "BoardMember.unlinkChannel": "Bağlantıyı kaldır",
+  "BoardPage.newVersion": "Yeni bir pano sürümü yayınlanmış. Yeniden yüklemek için buraya tıklayın.",
+  "BoardPage.syncFailed": "Pano silinmiş ya da erişim izni geri alınmış olabilir.",
+  "BoardTemplateSelector.add-template": "Yeni kalıp ekle",
+  "BoardTemplateSelector.create-empty-board": "Boş bir pano ekle",
+  "BoardTemplateSelector.delete-template": "Sil",
+  "BoardTemplateSelector.description": "Kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
+  "BoardTemplateSelector.edit-template": "Düzenle",
+  "BoardTemplateSelector.plugin.no-content-description": "Aşağıdaki kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
+  "BoardTemplateSelector.plugin.no-content-title": "Bir pano ekleyin",
+  "BoardTemplateSelector.title": "Bir pano ekle",
+  "BoardTemplateSelector.use-this-template": "Bu kalıp kullanılsın",
+  "BoardsSwitcher.Title": "Pano arama",
+  "BoardsUnfurl.Limited": "Kart arşivlendiğinden ek bilgiler gizleniyor",
+  "BoardsUnfurl.Remainder": "+{remainder} diğer",
+  "BoardsUnfurl.Updated": "Güncellenme: {time}",
+  "Calculations.Options.average.displayName": "Ortalama",
+  "Calculations.Options.average.label": "Ortalama",
+  "Calculations.Options.count.displayName": "Sayı",
+  "Calculations.Options.count.label": "Sayı",
+  "Calculations.Options.countChecked.displayName": "İşaretlenmiş",
+  "Calculations.Options.countChecked.label": "İşaretlenmiş sayısı",
+  "Calculations.Options.countUnchecked.displayName": "İşaretlenmemiş",
+  "Calculations.Options.countUnchecked.label": "İşaretlenmemiş sayısı",
+  "Calculations.Options.countUniqueValue.displayName": "Eşsiz",
+  "Calculations.Options.countUniqueValue.label": "Eşsiz değer sayısı",
+  "Calculations.Options.countValue.displayName": "Değer",
+  "Calculations.Options.countValue.label": "Değer sayısı",
+  "Calculations.Options.dateRange.displayName": "Aralık",
+  "Calculations.Options.dateRange.label": "Aralık",
+  "Calculations.Options.earliest.displayName": "En erken",
+  "Calculations.Options.earliest.label": "En erken",
+  "Calculations.Options.latest.displayName": "En geç",
+  "Calculations.Options.latest.label": "En geç",
+  "Calculations.Options.max.displayName": "En fazla",
+  "Calculations.Options.max.label": "En fazla",
+  "Calculations.Options.median.displayName": "Orta değer",
+  "Calculations.Options.median.label": "Orta değer",
+  "Calculations.Options.min.displayName": "En az",
+  "Calculations.Options.min.label": "En az",
+  "Calculations.Options.none.displayName": "Hesapla",
+  "Calculations.Options.none.label": "Yok",
+  "Calculations.Options.percentChecked.displayName": "İşaretlenmiş",
+  "Calculations.Options.percentChecked.label": "İşaretlenmiş yüzdesi",
+  "Calculations.Options.percentUnchecked.displayName": "İşaretlenmemiş",
+  "Calculations.Options.percentUnchecked.label": "İşaretlenmemiş yüzdesi",
+  "Calculations.Options.range.displayName": "Aralık",
+  "Calculations.Options.range.label": "Aralık",
+  "Calculations.Options.sum.displayName": "Toplam",
+  "Calculations.Options.sum.label": "Toplam",
+  "CalendarCard.untitled": "Adlandırılmamış",
+  "CardActionsMenu.copiedLink": "Kopyalandı!",
+  "CardActionsMenu.copyLink": "Bağlantıyı kopyala",
+  "CardActionsMenu.delete": "Sil",
+  "CardActionsMenu.duplicate": "Kopyala",
+  "CardBadges.title-checkboxes": "İşaret kutuları",
+  "CardBadges.title-comments": "Yorumlar",
+  "CardBadges.title-description": "Bu kartın bir açıklaması var",
+  "CardDetail.Attach": "Dosya ekle",
+  "CardDetail.Follow": "İzle",
+  "CardDetail.Following": "İzleniyor",
+  "CardDetail.add-content": "İçerik ekle",
+  "CardDetail.add-icon": "Simge ekle",
+  "CardDetail.add-property": "+ Bir özellik ekle",
+  "CardDetail.addCardText": "kart metni ekle",
+  "CardDetail.limited-body": "Professional ya da Enterprise tarifesine geçin.",
+  "CardDetail.limited-button": "Üst tarifeye geç",
+  "CardDetail.limited-title": "Bu kart gizli",
+  "CardDetail.moveContent": "Kart içeriğini taşı",
+  "CardDetail.new-comment-placeholder": "Bir yorum ekle...",
+  "CardDetailProperty.confirm-delete-heading": "Özelliği silmeyi onaylayın",
+  "CardDetailProperty.confirm-delete-subtext": "\"{propertyName}\" özelliğini silmek istediğinize emin misiniz? Bu işlem özelliği panodaki tüm kartlardan siler.",
+  "CardDetailProperty.confirm-property-name-change-subtext": "\"{propertyName}\" {customText} özelliğini değiştirmek istediğinize emin misiniz? Bu işlem bu panodaki {numOfCards} kartı etkiler ve veri kaybına yol açabilir.",
+  "CardDetailProperty.confirm-property-type-change": "Özellik türü değişimini onaylayın",
+  "CardDetailProperty.delete-action-button": "Sil",
+  "CardDetailProperty.property-change-action-button": "Özelliği değiştir",
+  "CardDetailProperty.property-changed": "Özellik değiştirildi!",
+  "CardDetailProperty.property-deleted": "{propertyName} silindi!",
+  "CardDetailProperty.property-name-change-subtext": "\"{oldPropType}\" türünden \"{newPropType}\" türüne",
+  "CardDetial.limited-link": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
+  "CardDialog.delete-confirmation-dialog-attachment": "Ek dosyanın silinmesini onaylayın",
+  "CardDialog.delete-confirmation-dialog-button-text": "Sil",
+  "CardDialog.delete-confirmation-dialog-heading": "Kartı silmeyi onaylayın",
+  "CardDialog.editing-template": "Bir kalıbı düzenliyorsunuz.",
+  "CardDialog.nocard": "Bu kart bulunamadı ya da erişilebilir değil.",
+  "Categories.CreateCategoryDialog.CancelText": "İptal",
+  "Categories.CreateCategoryDialog.CreateText": "Ekle",
+  "Categories.CreateCategoryDialog.Placeholder": "Kategorinize bir ad verin",
+  "Categories.CreateCategoryDialog.UpdateText": "Güncelle",
+  "CenterPanel.Login": "Oturum aç",
+  "CenterPanel.Share": "Paylaş",
+  "ChannelIntro.CreateBoard": "Bir pano ekle",
+  "ColorOption.selectColor": "{color} rengi seçin",
+  "Comment.delete": "Sil",
+  "CommentsList.send": "Gönder",
+  "ConfirmPerson.empty": "Boş",
+  "ConfirmPerson.search": "Arama...",
+  "ConfirmationDialog.cancel-action": "İptal",
+  "ConfirmationDialog.confirm-action": "Onayla",
+  "ContentBlock.Delete": "Sil",
+  "ContentBlock.DeleteAction": "sil",
+  "ContentBlock.addElement": "{type} ekle",
+  "ContentBlock.checkbox": "işaret kutusu",
+  "ContentBlock.divider": "ayıraç",
+  "ContentBlock.editCardCheckbox": "değiştirilmiş işaret kutusu",
+  "ContentBlock.editCardCheckboxText": "kart metnini düzenle",
+  "ContentBlock.editCardText": "kart metnini düzenle",
+  "ContentBlock.editText": "Metni düzenle...",
+  "ContentBlock.image": "görsel",
+  "ContentBlock.insertAbove": "Üste ekle",
+  "ContentBlock.moveBlock": "kart içeriğini taşı",
+  "ContentBlock.moveDown": "Alta taşı",
+  "ContentBlock.moveUp": "Üste taşı",
+  "ContentBlock.text": "metin",
+  "DateFilter.empty": "Boş",
+  "DateRange.clear": "Temizle",
+  "DateRange.empty": "Boş",
+  "DateRange.endDate": "Bitiş tarihi",
+  "DateRange.today": "Bugün",
+  "DeleteBoardDialog.confirm-cancel": "İptal",
+  "DeleteBoardDialog.confirm-delete": "Sil",
+  "DeleteBoardDialog.confirm-info": "“{boardTitle}” panosunu silmek istediğinize emin misiniz? Silme işlemi bu panodaki tüm kartları siler.",
+  "DeleteBoardDialog.confirm-info-template": "“{boardTitle}” pano kalıbını silmek istediğinize emin misiniz?",
+  "DeleteBoardDialog.confirm-tite": "Panoyu silmeyi onayla",
+  "DeleteBoardDialog.confirm-tite-template": "Pano kalıbını silmeyi onayla",
+  "Dialog.closeDialog": "Pencereyi kapat",
+  "EditableDayPicker.today": "Bugün",
+  "Error.mobileweb": "Mobil web desteği şu anda erken beta aşamasındadır. Tüm işlevler kullanılamıyor olabilir.",
+  "Error.websocket-closed": "Websoket bağlantısı kesildi. Bu sorun sürerse, sunucu ya da web vekil sunucu yapılandırmanızı denetleyin.",
+  "Filter.contains": "şunu içeren",
+  "Filter.ends-with": "şununla biten",
+  "Filter.includes": "şunu içeren",
+  "Filter.is": "şu olan",
+  "Filter.is-after": "şundan sonra",
+  "Filter.is-before": "şundan önce",
+  "Filter.is-empty": "boş olan",
+  "Filter.is-not-empty": "boş olmayan",
+  "Filter.is-not-set": "şuna ayarlanmamış olan",
+  "Filter.is-set": "şuna ayarlanmış olan",
+  "Filter.isafter": "şundan sonra",
+  "Filter.isbefore": "şundan önce",
+  "Filter.not-contains": "şunu içermeyen",
+  "Filter.not-ends-with": "şununla bitmeyen",
+  "Filter.not-includes": "şunu içermeyen",
+  "Filter.not-starts-with": "şununla başlamayan",
+  "Filter.starts-with": "şununla başlayan",
+  "FilterByText.placeholder": "metni süz",
+  "FilterComponent.add-filter": "+ Süzgeç ekle",
+  "FilterComponent.delete": "Sil",
+  "FilterValue.empty": "(boş)",
+  "FindBoardsDialog.IntroText": "Pano arama",
+  "FindBoardsDialog.NoResultsFor": "\"{searchQuery}\" için bir sonuç bulunamadı",
+  "FindBoardsDialog.NoResultsSubtext": "Yazımı denetleyin ya da başka bir arama yapmayı deneyin.",
+  "FindBoardsDialog.SubTitle": "Bulmak istediğiniz pano adını yazmaya başlayın. Gezinmek için <b>YUKAR/AŞAĞI</b>, seçmek için <b>ENTER</b>, vazgeçmek için <b>ESC</b> tuşlarını kullanın",
+  "FindBoardsDialog.Title": "Pano arama",
+  "GroupBy.hideEmptyGroups": "{count} boş grubu gizle",
+  "GroupBy.showHiddenGroups": "{count} gizli grubu görüntüle",
+  "GroupBy.ungroup": "Gruplamayı kaldır",
+  "HideBoard.MenuOption": "Panoyu gizle",
+  "KanbanCard.untitled": "Adlandırılmamış",
+  "MentionSuggestion.is-not-board-member": "(pano üyesi değil)",
+  "Mutator.new-board-from-template": "kalıptan yeni pano",
+  "Mutator.new-card-from-template": "kalıptan yeni kart oluştur",
+  "Mutator.new-template-from-card": "karttan yeni kalıp oluştur",
+  "OnboardingTour.AddComments.Body": "Sorunlar hakkında yorum yapabilir ve Mattermost kullanıcılarının dikkatini çekmek için @anabilirsiniz.",
+  "OnboardingTour.AddComments.Title": "Yorum yap",
+  "OnboardingTour.AddDescription.Body": "Takım arkadaşlarınızın kartın ne ile ilgili olduğunu anlaması için kartınıza bir açıklama ekleyin.",
+  "OnboardingTour.AddDescription.Title": "Açıklama ekle",
+  "OnboardingTour.AddProperties.Body": "Daha güçlü kılmak için kartlara çeşitli özellikler ekleyin.",
+  "OnboardingTour.AddProperties.Title": "Özellikler ekle",
+  "OnboardingTour.AddView.Body": "Farklı görünümler kullanarak panonuzu düzenleyecek yeni bir görünüm oluşturmak için buraya gidin.",
+  "OnboardingTour.AddView.Title": "Yeni bir görünüm ekle",
+  "OnboardingTour.CopyLink.Body": "Kartlarınızı takım arkadaşlarınızla paylaşmak için bağlantıyı kopyalayıp bir kanala, doğrudan iletiye veya grup iletisine yapıştırın.",
+  "OnboardingTour.CopyLink.Title": "Bağlantıyı kopyala",
+  "OnboardingTour.OpenACard.Body": "Panoların işinizi düzenlemenize yardımcı olabileceği güçlü yolları keşfetmek için bir kart açın.",
+  "OnboardingTour.OpenACard.Title": "Bir kart açın",
+  "OnboardingTour.ShareBoard.Body": "Panonuzu içeride, ekibiniz ile paylaşabilir ya da kuruluşunuzun dışında herkese açık olarak yayınlayabilirsiniz.",
+  "OnboardingTour.ShareBoard.Title": "Panoyu paylaş",
+  "PersonProperty.board-members": "Pano üyeleri",
+  "PersonProperty.me": "Benim",
+  "PersonProperty.non-board-members": "Pano üyesi olmayanlar",
+  "PropertyMenu.Delete": "Sil",
+  "PropertyMenu.changeType": "Özellik türünü değiştir",
+  "PropertyMenu.selectType": "Özellik türünü seçin",
+  "PropertyMenu.typeTitle": "Tür",
+  "PropertyType.Checkbox": "İşaret kutusu",
+  "PropertyType.CreatedBy": "Oluşturan",
+  "PropertyType.CreatedTime": "Oluşturulma zamanı",
+  "PropertyType.Date": "Tarih",
+  "PropertyType.Email": "E-posta",
+  "PropertyType.MultiPerson": "Çok kişi",
+  "PropertyType.MultiSelect": "Çoklu seçim",
+  "PropertyType.Number": "Sayı",
+  "PropertyType.Person": "Kişi",
+  "PropertyType.Phone": "Telefon",
+  "PropertyType.Select": "Seçin",
+  "PropertyType.Text": "Metin",
+  "PropertyType.Unknown": "Bilinmiyor",
+  "PropertyType.UpdatedBy": "Son güncelleyen",
+  "PropertyType.UpdatedTime": "Son güncelleme zamanı",
+  "PropertyType.Url": "Adres",
+  "PropertyValueElement.empty": "Boş",
+  "RegistrationLink.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
+  "RegistrationLink.copiedLink": "Kopyalandı!",
+  "RegistrationLink.copyLink": "Bağlantıyı kopyala",
+  "RegistrationLink.description": "Başkalarının hesap ekleyebilmesi için bu bağlantıyı paylaş:",
+  "RegistrationLink.regenerateToken": "Kodu yeniden oluştur",
+  "RegistrationLink.tokenRegenerated": "Kayıt bağlantısı yeniden oluşturuldu",
+  "ShareBoard.PublishDescription": "Web üzerinde herkese açık olarak \"salt okunur\" bir bağlantı yayınlayın ve paylaşın.",
+  "ShareBoard.PublishTitle": "Web üzerinde yayınla",
+  "ShareBoard.ShareInternal": "İçeride paylaş",
+  "ShareBoard.ShareInternalDescription": "İzni olan kullanıcılar bu bağlantıyı kullanabilecek.",
+  "ShareBoard.Title": "Panoyu paylaş",
+  "ShareBoard.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
+  "ShareBoard.copiedLink": "Kopyalandı!",
+  "ShareBoard.copyLink": "Bağlantıyı kopyala",
+  "ShareBoard.regenerate": "Kodu yeniden oluştur",
+  "ShareBoard.searchPlaceholder": "Kişi ve kanal arama",
+  "ShareBoard.teamPermissionsText": "{teamName} takımındaki herkes",
+  "ShareBoard.tokenRegenrated": "Kod yeniden oluşturuldu",
+  "ShareBoard.userPermissionsRemoveMemberText": "Üyelikten çıkar",
+  "ShareBoard.userPermissionsYouText": "(Siz)",
+  "ShareTemplate.Title": "Kalıbı paylaş",
+  "ShareTemplate.searchPlaceholder": "Kişi arama",
+  "Sidebar.about": "Focalboard hakkında",
+  "Sidebar.add-board": "+ Pano ekle",
+  "Sidebar.changePassword": "Parola değiştir",
+  "Sidebar.delete-board": "Panoyu sil",
+  "Sidebar.duplicate-board": "Panoyu kopyala",
+  "Sidebar.export-archive": "Arşivi dışa aktar",
+  "Sidebar.import": "İçe aktar",
+  "Sidebar.import-archive": "Arşivi içe aktar",
+  "Sidebar.invite-users": "Kullanıcıları çağır",
+  "Sidebar.logout": "Oturumu kapat",
+  "Sidebar.new-category.badge": "Yeni",
+  "Sidebar.new-category.drag-boards-cta": "Panoları sürükleyip buraya bırakın...",
+  "Sidebar.no-boards-in-category": "İçeride bir pano yok",
+  "Sidebar.product-tour": "Tanıtım turu",
+  "Sidebar.random-icons": "Rastgele simgeler",
+  "Sidebar.set-language": "Dili ayarla",
+  "Sidebar.set-theme": "Temayı ayarla",
+  "Sidebar.settings": "Ayarlar",
+  "Sidebar.template-from-board": "Panodan yeni kalıp",
+  "Sidebar.untitled-board": "(Adlandırılmamış pano)",
+  "Sidebar.untitled-view": "(Adlandırılmamış görünüm)",
+  "SidebarCategories.BlocksMenu.Move": "Şuraya taşı...",
+  "SidebarCategories.CategoryMenu.CreateNew": "Yeni kategori ekle",
+  "SidebarCategories.CategoryMenu.Delete": "Kategoriyi sił",
+  "SidebarCategories.CategoryMenu.DeleteModal.Body": "<b>{categoryName}</b> içindeki panolar Panolar kategorisine taşınacak. Herhangi bir panodan çıkarılmayacaksınız.",
+  "SidebarCategories.CategoryMenu.DeleteModal.Title": "Bu kategori silinsin mi?",
+  "SidebarCategories.CategoryMenu.Update": "Kategoriyi yeniden adlandır",
+  "SidebarTour.ManageCategories.Body": "Özel kategoriler oluşturun ve yönetin. Kategoriler kullanıcıya özeldir, bu nedenle bir panoyu kendi kategorinize taşımanız aynı panoyu kullanan diğer üyeleri etkilemez.",
+  "SidebarTour.ManageCategories.Title": "Kategori yönetimi",
+  "SidebarTour.SearchForBoards.Body": "Panoları hızlıca aramak ve yan çubuğunuza eklemek için pano değiştiriciyi (Cmd/Ctrl + K) açın.",
+  "SidebarTour.SearchForBoards.Title": "Pano arama",
+  "SidebarTour.SidebarCategories.Body": "Tüm panolarınızı artık yeni yan çubuğunuz altında bulabilirsiniz. Artık çalışma alanları arasında geçiş yapmanıza gerek yok. Önceki çalışma alanlarınıza göre eklenmiş tek seferlik özel kategoriler, 7.2 sürümüne güncellemenizin bir parçası olarak otomatik şekilde eklenmiş olabilir. Bunları isteğinize göre kaldırabilir ya da düzenleyebilirsiniz.",
+  "SidebarTour.SidebarCategories.Link": "Ayrıntılı bilgi alın",
+  "SidebarTour.SidebarCategories.Title": "Yan çubuk kategorileri",
+  "SiteStats.total_boards": "Toplam pano",
+  "SiteStats.total_cards": "Toplam kart",
+  "TableComponent.add-icon": "Simge ekle",
+  "TableComponent.name": "Ad",
+  "TableComponent.plus-new": "+ Yeni",
+  "TableHeaderMenu.delete": "Sil",
+  "TableHeaderMenu.duplicate": "Kopya oluştur",
+  "TableHeaderMenu.hide": "Gizle",
+  "TableHeaderMenu.insert-left": "Sola ekle",
+  "TableHeaderMenu.insert-right": "Sağa ekle",
+  "TableHeaderMenu.sort-ascending": "Artan sıralama",
+  "TableHeaderMenu.sort-descending": "Azalan sıralama",
+  "TableRow.DuplicateCard": "kartı kopyala",
+  "TableRow.MoreOption": "Diğer işlemler",
+  "TableRow.open": "Aç",
+  "TopBar.give-feedback": "Geri bildirimde bulunun",
+  "URLProperty.copiedLink": "Kopyalandı!",
+  "URLProperty.copy": "Kopyala",
+  "URLProperty.edit": "Düzenle",
+  "UndoRedoHotKeys.canRedo": "Yinele",
+  "UndoRedoHotKeys.canRedo-with-description": "{description} yinele",
+  "UndoRedoHotKeys.canUndo": "Geri al",
+  "UndoRedoHotKeys.canUndo-with-description": "{description} geri al",
+  "UndoRedoHotKeys.cannotRedo": "Yinelenecek bir işlem yok",
+  "UndoRedoHotKeys.cannotUndo": "Geri alınacak bir işlem yok",
+  "ValueSelector.noOptions": "Herhangi bir seçenek yok. İlk seçeneği eklemek için yazmaya başlayın!",
+  "ValueSelector.valueSelector": "Değer seçici",
+  "ValueSelectorLabel.openMenu": "Menüyü aç",
+  "VersionMessage.help": "Bu sürümdeki yeniliklere bakın.",
+  "VersionMessage.learn-more": "Ayrıntılı bilgi alın",
+  "View.AddView": "Görünüm ekle",
+  "View.Board": "Pano",
+  "View.DeleteView": "Görünümü sil",
+  "View.DuplicateView": "Görünümü kopyala",
+  "View.Gallery": "Galeri",
+  "View.NewBoardTitle": "Pano görünümü",
+  "View.NewCalendarTitle": "Takvim görünümü",
+  "View.NewGalleryTitle": "Galeri görünümü",
+  "View.NewTableTitle": "Tablo görünümü",
+  "View.NewTemplateDefaultTitle": "Adlandırılmamış kalıp",
+  "View.NewTemplateTitle": "Adlandırılmamış",
+  "View.Table": "Tablo",
+  "ViewHeader.add-template": "Yeni kalıp",
+  "ViewHeader.delete-template": "Sil",
+  "ViewHeader.display-by": "Görünüm: {property}",
+  "ViewHeader.edit-template": "Düzenle",
+  "ViewHeader.empty-card": "Boş kart",
+  "ViewHeader.export-board-archive": "Pano arşivini dışa aktar",
+  "ViewHeader.export-complete": "Dışa aktarıldı!",
+  "ViewHeader.export-csv": "CSV olarak dışa aktar",
+  "ViewHeader.export-failed": "Dışa aktarılamadı!",
+  "ViewHeader.filter": "Süz",
+  "ViewHeader.group-by": "Grupla: {property}",
+  "ViewHeader.new": "Yeni",
+  "ViewHeader.properties": "Özellikler",
+  "ViewHeader.properties-menu": "Özellikler menüsü",
+  "ViewHeader.search-text": "Kart arama",
+  "ViewHeader.select-a-template": "Bir kalıp seçin",
+  "ViewHeader.set-default-template": "Varsayılan olarak ata",
+  "ViewHeader.sort": "Sırala",
+  "ViewHeader.untitled": "Adlandırılmamış",
+  "ViewHeader.view-header-menu": "Başlık menüsünü görüntüle",
+  "ViewHeader.view-menu": "Menüyü görüntüle",
+  "ViewLimitDialog.Heading": "Bir panoyu görüntüleme sınırına ulaşıldı",
+  "ViewLimitDialog.PrimaryButton.Title.Admin": "Üst tarifeye geç",
+  "ViewLimitDialog.PrimaryButton.Title.RegularUser": "Yöneticiyi bilgilendir",
+  "ViewLimitDialog.Subtext.Admin": "Professional ya da Enterprise tarifemize geçin.",
+  "ViewLimitDialog.Subtext.Admin.PricingPageLink": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
+  "ViewLimitDialog.Subtext.RegularUser": "Yöneticinizi Professional ya da Enterprise tarifesine geçmesi hakkında bilgilendirin.",
+  "ViewLimitDialog.UpgradeImg.AltText": "üst tarifeye geçiş görseli",
+  "ViewLimitDialog.notifyAdmin.Success": "Yöneticiniz bilgilendirildi",
+  "ViewTitle.hide-description": "açıklamayı gizle",
+  "ViewTitle.pick-icon": "Simge seçin",
+  "ViewTitle.random-icon": "Rastgele",
+  "ViewTitle.remove-icon": "Simgeyi kaldır",
+  "ViewTitle.show-description": "açıklamayı görüntüle",
+  "ViewTitle.untitled-board": "Adlandırılmamış pano",
+  "WelcomePage.Description": "Pano, alışılmış Kanban panosu görünümünde takımların işleri tanımlamasını, düzenlemesini, izlemesi ve yönetmesini sağlayan bir proje yönetimi aracıdır.",
+  "WelcomePage.Explore.Button": "Tura çıkın",
+  "WelcomePage.Heading": "Panolara hoş geldiniz",
+  "WelcomePage.NoThanks.Text": "Hayır teşekkürler, kendim anlayacağım",
+  "WelcomePage.StartUsingIt.Text": "Kullanmaya başlayın",
+  "Workspace.editing-board-template": "Bir pano kalıbını düzenliyorsunuz.",
+  "badge.guest": "Konuk",
+  "boardPage.confirm-join-button": "Katıl",
+  "boardPage.confirm-join-text": "Bir özel kanala, pano yöneticisi tarafından açıkça eklenmeden katılmak üzeresiniz. Bu özel kanala katılmak istediğinize emin misiniz?",
+  "boardPage.confirm-join-title": "Özel kanala katıl",
+  "boardSelector.confirm-link-board": "Panoyu kanala bağla",
+  "boardSelector.confirm-link-board-button": "Evet, panoyu bağla",
+  "boardSelector.confirm-link-board-subtext": "\"{boardName}\" panosunu kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır. Bir pano ile bir kanalın bağlantısını istediğiniz zaman kaldırabilirsiniz.",
+  "boardSelector.confirm-link-board-subtext-with-other-channel": "\"{boardName}\" panosunu bir kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konukl üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
+  "boardSelector.create-a-board": "Bir pano ekle",
+  "boardSelector.link": "Bağlantı",
+  "boardSelector.search-for-boards": "Pano arama",
+  "boardSelector.title": "Panoları bağla",
+  "boardSelector.unlink": "Bağlantıyı kaldır",
+  "calendar.month": "Ay",
+  "calendar.today": "Bugün",
+  "calendar.week": "Hafta",
+  "centerPanel.undefined": "{propertyName} yok",
+  "centerPanel.unknown-user": "Kullanıcı bilinmiyor",
+  "cloudMessage.learn-more": "Ayrıntılı bilgi alın",
+  "createImageBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
+  "default-properties.badges": "Yorumlar ve açıklama",
+  "default-properties.title": "Başlık",
+  "error.back-to-home": "Girişe dön",
+  "error.back-to-team": "Takıma dön",
+  "error.board-not-found": "Pano bulunamadı.",
+  "error.go-login": "Oturum aç",
+  "error.invalid-read-only-board": "Bu panoya erişme izniniz yok. Panolara erişmek için oturum açın.",
+  "error.not-logged-in": "Oturumunuzun süresi dolmuş ya da oturum açmamışsınız. Panolara erişmek için yeniden oturum açın.",
+  "error.page.title": "Bir şeyler ters gitti",
+  "error.team-undefined": "Geçerli bir takım değil.",
+  "error.unknown": "Bir sorun çıktı.",
+  "generic.previous": "Önceki",
+  "guest-no-board.subtitle": "Henüz bu takımdaki herhangi bir panoya erişme izniniz yok. Lütfen biri sizi bir panoya ekleyene kadar bekleyin.",
+  "guest-no-board.title": "Henüz bir pano yok",
+  "imagePaste.upload-failed": "Dosya boyutu sınırı aşıldığından bazı dosyalar yüklenemedi.",
+  "limitedCard.title": "Kartlar gizli",
+  "login.log-in-button": "Oturum aç",
+  "login.log-in-title": "Oturum açın",
+  "login.register-button": "ya da hesabınız yoksa bir hesap açın",
+  "new_channel_modal.create_board.empty_board_description": "Yeni boş bir pano oluştur",
+  "new_channel_modal.create_board.empty_board_title": "Boş pano",
+  "new_channel_modal.create_board.select_template_placeholder": "Bir kalıp seçin",
+  "new_channel_modal.create_board.title": "Bu kanal için bir pano oluştur",
+  "notification-box-card-limit-reached.close-tooltip": "10 gün için sustur",
+  "notification-box-card-limit-reached.contact-link": "yöneticinizi bilgilendirin",
+  "notification-box-card-limit-reached.link": "Ücretli bir tarifeye geçin",
+  "notification-box-card-limit-reached.title": "panoda {cards} kart gizli",
+  "notification-box-cards-hidden.title": "Bu işlem başka bir kartı gizledi",
+  "notification-box.card-limit-reached.not-admin.text": "Arşivlenmiş kartlara erişmek için {contactLink} ile görüşerek ücretli bir tarifeye geçmesini isteyin.",
+  "notification-box.card-limit-reached.text": "Kart sınırına ulaşıldı. Eski kartları görüntülemek için {link}",
+  "person.add-user-to-board": "{username} kullanıcısını panoya ekle",
+  "person.add-user-to-board-confirm-button": "Panoya ekle",
+  "person.add-user-to-board-permissions": "İzinler",
+  "person.add-user-to-board-question": "{username} kullanıcısını panoya eklemek ister misiniz?",
+  "person.add-user-to-board-warning": "{username} panonun bir üyesi değil ve pano ile ilgili herhangi bir bildirim almayacak.",
+  "register.login-button": "ya da bir hesabınız varsa oturum açın",
+  "register.signup-title": "Hesap açın",
+  "rhs-board-non-admin-msg": "Panonun yöneticilerinden değilsiniz",
+  "rhs-boards.add": "Ekle",
+  "rhs-boards.dm": "Dİ",
+  "rhs-boards.gm": "Gİ",
+  "rhs-boards.header.dm": "bu doğrudan ileti",
+  "rhs-boards.header.gm": "bu grup iletisi",
+  "rhs-boards.last-update-at": "Son güncelleme: {datetime}",
+  "rhs-boards.link-boards-to-channel": "Panoları {channelName} kanalına bağla",
+  "rhs-boards.linked-boards": "Bağlı panolar",
+  "rhs-boards.no-boards-linked-to-channel": "Henüz {channelName} kanalına bağlanmış bir pano yok",
+  "rhs-boards.no-boards-linked-to-channel-description": "Panolar, takımlar arasındaki çalışmaları tanımlamak, organize etmek, izlemek ve yönetmek için kullanılabilen kandan panosuna benzer bir proje yönetimi aracıdır.",
+  "rhs-boards.unlink-board": "Panonun bağlantısını kaldır",
+  "rhs-boards.unlink-board1": "Pano bağlantısını kaldır",
+  "rhs-channel-boards-header.title": "Panolar",
+  "share-board.publish": "Yayınla",
+  "share-board.share": "Paylaş",
+  "shareBoard.channels-select-group": "Kanallar",
+  "shareBoard.confirm-change-team-role.body": "Bu panoda izinleri \"{role}\" rolünden daha aşağıda olan herkes <b>{role} rolüne yükseltilecek</b>. Panonunen düşük rolünü değiştirmek istediğinize emin misiniz?",
+  "shareBoard.confirm-change-team-role.confirmBtnText": "Panonun en düşük rolünü değiştir",
+  "shareBoard.confirm-change-team-role.title": "Panonun en düşük rolünü değiştir",
+  "shareBoard.confirm-link-channel": "Panoyu kanala bağla",
+  "shareBoard.confirm-link-channel-button": "Kanalı bağla",
+  "shareBoard.confirm-link-channel-button-with-other-channel": "Eski bağlantıyı kes ve bu kanala bağla",
+  "shareBoard.confirm-link-channel-subtext": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.",
+  "shareBoard.confirm-link-channel-subtext-with-other-channel": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
+  "shareBoard.confirm-unlink.body": "Bir kanalın bir pano ile bağlantısını kaldırdığınızda, kanalın tüm üyeleri (var olan ve yeni), kendilerine özel olarak izin verilmedikçe, panoya erişimi kaybeder.",
+  "shareBoard.confirm-unlink.confirmBtnText": "Kanalın bağlantısını kaldır",
+  "shareBoard.confirm-unlink.title": "Kanalın pano ile bağlantısı kaldır",
+  "shareBoard.lastAdmin": "Panoların en az bir yöneticisi olmalıdır",
+  "shareBoard.members-select-group": "Üyeler",
+  "shareBoard.unknown-channel-display-name": "Kanal bilinmiyor",
+  "tutorial_tip.finish_tour": "Tamam",
+  "tutorial_tip.got_it": "Anladım",
+  "tutorial_tip.ok": "Sonraki",
+  "tutorial_tip.out": "Bu ipuçları görüntülenmesin.",
+  "tutorial_tip.seen": "Daha önce gördünüz mü?"
 }

From f149bb1f66eaa0e10c8f6abf8535be7ffd69739b Mon Sep 17 00:00:00 2001
From: M-ZubairAhmed <m-zubairahmed@protonmail.com>
Date: Tue, 11 Apr 2023 13:21:21 +0530
Subject: [PATCH 015/103] MM-52003 : Remove unused and deprecated
 "mini-create-react-context" package (#22881)

"mini-create-react-context" is no longer used, and it is also a deprecated package, which was added in boards long back.
---
 webapp/boards/NOTICE.txt   | 26 --------------------------
 webapp/boards/package.json |  1 -
 webapp/package-lock.json   | 25 -------------------------
 3 files changed, 52 deletions(-)

diff --git a/webapp/boards/NOTICE.txt b/webapp/boards/NOTICE.txt
index 1fe6975ff0..acebeb67ec 100644
--- a/webapp/boards/NOTICE.txt
+++ b/webapp/boards/NOTICE.txt
@@ -2982,32 +2982,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 -----
 
-The following software may be included in this product: mini-create-react-context. A copy of the source code may be downloaded from https://github.com/StringEpsilon/mini-create-react-context. This software contains the following license and notice below:
-
-Copyright (c) 2019-present StringEpsilon <StringEpsilon@gmail.com>
-
-Copyright (c) 2017-2019 James Kyle <me@thejameskyle.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------
-
 The following software may be included in this product: mkdirp. A copy of the source code may be downloaded from https://github.com/substack/node-mkdirp.git. This software contains the following license and notice below:
 
 Copyright 2010 James Halliday (mail@substack.net)
diff --git a/webapp/boards/package.json b/webapp/boards/package.json
index bf2a0f36e2..a8d65e7622 100644
--- a/webapp/boards/package.json
+++ b/webapp/boards/package.json
@@ -46,7 +46,6 @@
 		"glob-parent": "6.0.2",
 		"lodash": "^4.17.21",
 		"marked": "4.0.17",
-		"mini-create-react-context": "^0.4.1",
 		"moment": "^2.29.1",
 		"nanoevents": "^5.1.13",
 		"react": "17.0.2",
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index c40ab38041..634d2c1b62 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -49,7 +49,6 @@
         "glob-parent": "6.0.2",
         "lodash": "^4.17.21",
         "marked": "4.0.17",
-        "mini-create-react-context": "^0.4.1",
         "moment": "^2.29.1",
         "nanoevents": "^5.1.13",
         "react": "17.0.2",
@@ -24690,20 +24689,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/mini-create-react-context": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz",
-      "integrity": "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "dependencies": {
-        "@babel/runtime": "^7.12.1",
-        "tiny-warning": "^1.0.3"
-      },
-      "peerDependencies": {
-        "prop-types": "^15.0.0",
-        "react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
-      }
-    },
     "node_modules/mini-css-extract-plugin": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.0.0.tgz",
@@ -44091,7 +44076,6 @@
         "jest-mock": "29.4.3",
         "lodash": "^4.17.21",
         "marked": "4.0.17",
-        "mini-create-react-context": "^0.4.1",
         "moment": "^2.29.1",
         "nanoevents": "^5.1.13",
         "prettier": "^2.6.1",
@@ -55443,15 +55427,6 @@
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "dev": true
     },
-    "mini-create-react-context": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz",
-      "integrity": "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==",
-      "requires": {
-        "@babel/runtime": "^7.12.1",
-        "tiny-warning": "^1.0.3"
-      }
-    },
     "mini-css-extract-plugin": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.0.0.tgz",

From 50aabf6b933bbc776d325a4d177213b20fde67dc Mon Sep 17 00:00:00 2001
From: M-ZubairAhmed <m-zubairahmed@protonmail.com>
Date: Tue, 11 Apr 2023 13:30:29 +0530
Subject: [PATCH 016/103] MM-52008 : Standardise package.json's version across
 all products in webapp (#22876)

The version in package.json was added to display the workspace name in the terminal for playbooks. Additionally, it was ensured that all products now have the same version number, as the release of all products is tied to a single release channel.
---
 webapp/boards/package.json    | 2 +-
 webapp/channels/package.json  | 2 +-
 webapp/package-lock.json      | 5 +++--
 webapp/playbooks/package.json | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/boards/package.json b/webapp/boards/package.json
index a8d65e7622..318e177a43 100644
--- a/webapp/boards/package.json
+++ b/webapp/boards/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "boards",
-	"version": "7.10.0",
+	"version": "7.9.1",
 	"private": true,
 	"description": "",
 	"scripts": {
diff --git a/webapp/channels/package.json b/webapp/channels/package.json
index 090f9bc96a..5156360006 100644
--- a/webapp/channels/package.json
+++ b/webapp/channels/package.json
@@ -3,7 +3,7 @@
   "browser": {
     "./client/web_client.jsx": "./client/browser_web_client.jsx"
   },
-  "version": "7.9.0",
+  "version": "7.9.1",
   "private": true,
   "dependencies": {
     "@floating-ui/react-dom": "1.0.0",
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 634d2c1b62..d4c2bb01ff 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -28,7 +28,7 @@
       }
     },
     "boards": {
-      "version": "7.10.0",
+      "version": "7.9.1",
       "dependencies": {
         "@draft-js-plugins/editor": "^4.1.2",
         "@draft-js-plugins/emoji": "^4.6.0",
@@ -3551,7 +3551,7 @@
     },
     "channels": {
       "name": "mattermost-webapp",
-      "version": "7.9.0",
+      "version": "7.9.1",
       "dependencies": {
         "@floating-ui/react-dom": "1.0.0",
         "@floating-ui/react-dom-interactions": "0.10.3",
@@ -33995,6 +33995,7 @@
       }
     },
     "playbooks": {
+      "version": "7.9.1",
       "dependencies": {
         "@apollo/client": "3.7.3",
         "@floating-ui/react-dom-interactions": "0.6.3",
diff --git a/webapp/playbooks/package.json b/webapp/playbooks/package.json
index 5aa29a61f5..b36df25faa 100644
--- a/webapp/playbooks/package.json
+++ b/webapp/playbooks/package.json
@@ -1,6 +1,7 @@
 {
   "name": "playbooks",
   "private": true,
+  "version": "7.9.1",
   "dependencies": {
     "@apollo/client": "3.7.3",
     "@floating-ui/react-dom-interactions": "0.6.3",

From 5b5ee1160eb6fd8e4be0701d7d86f5c23d700d67 Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Tue, 11 Apr 2023 18:59:10 +0800
Subject: [PATCH 017/103] expect boards product by default in e2e (#22911)

---
 .../channel/new_channel_with_board_spec.js         |  2 --
 e2e-tests/playwright/global_setup.ts               | 14 +-------------
 e2e-tests/playwright/support/constant.ts           |  1 +
 e2e-tests/playwright/support/flag.ts               | 14 +-------------
 e2e-tests/playwright/support/server/client.ts      |  5 +++--
 .../playwright/support/server/default_config.ts    | 11 -----------
 e2e-tests/playwright/support/test_fixture.ts       | 10 +---------
 e2e-tests/playwright/test.config.ts                | 10 ++++++++--
 .../create_empty_board.spec.ts                     |  2 --
 .../tests/visual/boards/board_template.spec.ts     |  2 --
 .../visual/boards/view_untitled_board.spec.ts      |  2 --
 11 files changed, 15 insertions(+), 58 deletions(-)

diff --git a/e2e-tests/cypress/tests/integration/channels/channel/new_channel_with_board_spec.js b/e2e-tests/cypress/tests/integration/channels/channel/new_channel_with_board_spec.js
index 32c3591dd3..e924b17f82 100644
--- a/e2e-tests/cypress/tests/integration/channels/channel/new_channel_with_board_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/channel/new_channel_with_board_spec.js
@@ -22,8 +22,6 @@ describe('New Channel modal with Boards enabled', () => {
             cy.apiLogin(sysadmin);
             cy.visit(`/${testTeam.name}/channels/town-square`);
         });
-
-        cy.shouldHaveFeatureFlag('BoardsProduct', true);
     });
 
     it('MM-T5141 New Channel is created with an associated Board', () => {
diff --git a/e2e-tests/playwright/global_setup.ts b/e2e-tests/playwright/global_setup.ts
index d54d6ded88..53386e351f 100644
--- a/e2e-tests/playwright/global_setup.ts
+++ b/e2e-tests/playwright/global_setup.ts
@@ -5,7 +5,6 @@ import {expect} from '@playwright/test';
 import {UserProfile} from '@mattermost/types/users';
 
 import {Client, createRandomTeam, getAdminClient, getDefaultAdminUser, makeClient} from './support/server';
-import {boardsPluginId, callsPluginId} from './support/constant';
 import {defaultTeam} from './support/util';
 import testConfig from './test.config';
 
@@ -97,26 +96,15 @@ async function printClientInfo(client: Client) {
   - BuildHashEnterprise         = ${config.BuildHashEnterprise}
   - BuildEnterpriseReady        = ${config.BuildEnterpriseReady}
   - FeatureFlagAppsEnabled      = ${config.FeatureFlagAppsEnabled}
-  - FeatureFlagBoardsProduct    = ${config.FeatureFlagBoardsProduct}
   - FeatureFlagCallsEnabled     = ${config.FeatureFlagCallsEnabled}
   - TelemetryId                 = ${config.TelemetryId}`);
 }
 
-function getProductsAsPlugin() {
-    const productsAsPlugin = [callsPluginId];
-
-    if (!testConfig.boardsProductEnabled) {
-        productsAsPlugin.push(boardsPluginId);
-    }
-
-    return productsAsPlugin;
-}
-
 async function ensurePluginsLoaded(client: Client) {
     const pluginStatus = await client.getPluginStatuses();
     const plugins = await client.getPlugins();
 
-    getProductsAsPlugin().forEach(async (pluginId) => {
+    testConfig.ensurePluginsInstalled.forEach(async (pluginId) => {
         const isInstalled = pluginStatus.some((plugin) => plugin.plugin_id === pluginId);
         if (!isInstalled) {
             // eslint-disable-next-line no-console
diff --git a/e2e-tests/playwright/support/constant.ts b/e2e-tests/playwright/support/constant.ts
index e5fd709f4e..35aa9bb5f4 100644
--- a/e2e-tests/playwright/support/constant.ts
+++ b/e2e-tests/playwright/support/constant.ts
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+export const appsPluginId = 'com.mattermost.apps';
 export const boardsPluginId = 'focalboard';
 export const boardsProductId = 'boards';
 export const callsPluginId = 'com.mattermost.calls';
diff --git a/e2e-tests/playwright/support/flag.ts b/e2e-tests/playwright/support/flag.ts
index dfa82775bc..8e9a451c73 100644
--- a/e2e-tests/playwright/support/flag.ts
+++ b/e2e-tests/playwright/support/flag.ts
@@ -5,22 +5,10 @@ import os from 'node:os';
 
 import {expect, test} from '@playwright/test';
 
-import {boardsPluginId, callsPluginId} from './constant';
+import {callsPluginId} from './constant';
 import {getAdminClient} from './server/init';
 import {isSmallScreen} from './util';
 
-export async function shouldHaveBoardsEnabled(enabled = true) {
-    const {adminClient} = await getAdminClient();
-    const config = await adminClient.getConfig();
-
-    const boardsEnabled =
-        (typeof config.FeatureFlags.BoardsProduct === 'boolean' && config.FeatureFlags.BoardsProduct) ||
-        config.PluginSettings.PluginStates[boardsPluginId].Enable;
-
-    const matched = boardsEnabled === enabled;
-    expect(matched, matched ? '' : `Boards expect "${enabled}" but actual "${boardsEnabled}"`).toBeTruthy();
-}
-
 export async function shouldHaveCallsEnabled(enabled = true) {
     const {adminClient} = await getAdminClient();
     const config = await adminClient.getConfig();
diff --git a/e2e-tests/playwright/support/server/client.ts b/e2e-tests/playwright/support/server/client.ts
index 32eb55f448..703275e0d7 100644
--- a/e2e-tests/playwright/support/server/client.ts
+++ b/e2e-tests/playwright/support/server/client.ts
@@ -167,8 +167,9 @@ async function makeClient(userRequest?: UserRequest, useCache = true): Promise<C
 
         const userProfile = await client.login(userRequest.username, userRequest.password);
         const user = {...userProfile, password: userRequest.password};
-        const config = await client.getClientConfigOld();
-        client.setUseBoardsProduct(config.FeatureFlagBoardsProduct === 'true');
+
+        // Manually do until boards as product is consistent in all the codebase.
+        client.setUseBoardsProduct(true);
 
         if (useCache) {
             clients[cacheKey] = {client, user};
diff --git a/e2e-tests/playwright/support/server/default_config.ts b/e2e-tests/playwright/support/server/default_config.ts
index 33d545537b..a82775d783 100644
--- a/e2e-tests/playwright/support/server/default_config.ts
+++ b/e2e-tests/playwright/support/server/default_config.ts
@@ -6,7 +6,6 @@ import merge from 'deepmerge';
 import {
     AdminConfig,
     ExperimentalSettings,
-    FeatureFlags,
     PasswordSettings,
     ServiceSettings,
     TeamSettings,
@@ -23,7 +22,6 @@ export function getOnPremServerConfig(): AdminConfig {
 type TestAdminConfig = {
     ClusterSettings: Partial<ClusterSettings>;
     ExperimentalSettings: Partial<ExperimentalSettings>;
-    FeatureFlags: Partial<FeatureFlags>;
     PasswordSettings: Partial<PasswordSettings>;
     PluginSettings: Partial<PluginSettings>;
     ServiceSettings: Partial<ServiceSettings>;
@@ -40,9 +38,6 @@ const onPremServerConfig = (): Partial<TestAdminConfig> => {
         ExperimentalSettings: {
             EnableAppBar: true,
         },
-        FeatureFlags: {
-            BoardsProduct: testConfig.boardsProductEnabled,
-        },
         PasswordSettings: {
             MinimumLength: 5,
             Lowercase: false,
@@ -57,11 +52,6 @@ const onPremServerConfig = (): Partial<TestAdminConfig> => {
                     defaultenabled: true,
                 },
             },
-            PluginStates: {
-                focalboard: {
-                    Enable: !testConfig.boardsProductEnabled,
-                },
-            },
         },
         ServiceSettings: {
             SiteURL: testConfig.baseURL,
@@ -686,7 +676,6 @@ const defaultServerConfig: AdminConfig = {
         GraphQL: false,
         InsightsEnabled: true,
         CommandPalette: false,
-        BoardsProduct: false,
         SendWelcomePost: true,
         WorkTemplate: false,
         PostPriority: true,
diff --git a/e2e-tests/playwright/support/test_fixture.ts b/e2e-tests/playwright/support/test_fixture.ts
index 8b7949634b..d35435dd7c 100644
--- a/e2e-tests/playwright/support/test_fixture.ts
+++ b/e2e-tests/playwright/support/test_fixture.ts
@@ -1,13 +1,7 @@
 import {test as base, Browser} from '@playwright/test';
 
 import {TestBrowser} from './browser_context';
-import {
-    shouldHaveBoardsEnabled,
-    shouldHaveCallsEnabled,
-    shouldHaveFeatureFlag,
-    shouldSkipInSmallScreen,
-    shouldRunInLinux,
-} from './flag';
+import {shouldHaveCallsEnabled, shouldHaveFeatureFlag, shouldSkipInSmallScreen, shouldRunInLinux} from './flag';
 import {initSetup, getAdminClient} from './server';
 import {hideDynamicChannelsContent, waitForAnimationEnd, waitUntil} from './test_action';
 import {pages} from './ui/pages';
@@ -36,7 +30,6 @@ class PlaywrightExtended {
     readonly testBrowser: TestBrowser;
 
     // ./flag
-    readonly shouldHaveBoardsEnabled;
     readonly shouldHaveCallsEnabled;
     readonly shouldHaveFeatureFlag;
     readonly shouldSkipInSmallScreen;
@@ -62,7 +55,6 @@ class PlaywrightExtended {
         this.testBrowser = new TestBrowser(browser);
 
         // ./flag
-        this.shouldHaveBoardsEnabled = shouldHaveBoardsEnabled;
         this.shouldHaveCallsEnabled = shouldHaveCallsEnabled;
         this.shouldHaveFeatureFlag = shouldHaveFeatureFlag;
         this.shouldSkipInSmallScreen = shouldSkipInSmallScreen;
diff --git a/e2e-tests/playwright/test.config.ts b/e2e-tests/playwright/test.config.ts
index 2d29d2a100..5a370a541e 100644
--- a/e2e-tests/playwright/test.config.ts
+++ b/e2e-tests/playwright/test.config.ts
@@ -3,6 +3,9 @@
 
 import {Page, ViewportSize} from '@playwright/test';
 import * as dotenv from 'dotenv';
+
+import {appsPluginId, callsPluginId} from '@e2e-support/constant';
+
 dotenv.config();
 
 export type TestArgs = {
@@ -17,7 +20,7 @@ export type TestConfig = {
     adminUsername: string;
     adminPassword: string;
     adminEmail: string;
-    boardsProductEnabled: boolean;
+    ensurePluginsInstalled: string[];
     resetBeforeTest: boolean;
     haClusterEnabled: boolean;
     haClusterNodeCount: number;
@@ -41,7 +44,10 @@ const config: TestConfig = {
     adminUsername: process.env.PW_ADMIN_USERNAME || 'sysadmin',
     adminPassword: process.env.PW_ADMIN_PASSWORD || 'Sys@dmin-sample1',
     adminEmail: process.env.PW_ADMIN_EMAIL || 'sysadmin@sample.mattermost.com',
-    boardsProductEnabled: parseBool(process.env.PW_BOARDS_PRODUCT_ENABLED, true),
+    ensurePluginsInstalled:
+        typeof process.env?.PW_ENSURE_PLUGINS_INSTALLED === 'string'
+            ? process.env.PW_ENSURE_PLUGINS_INSTALLED.split(',')
+            : [appsPluginId, callsPluginId],
     haClusterEnabled: parseBool(process.env.PW_HA_CLUSTER_ENABLED, false),
     haClusterNodeCount: parseNumber(process.env.PW_HA_CLUSTER_NODE_COUNT, 2),
     haClusterName: process.env.PW_HA_CLUSTER_NAME || 'mm_dev_cluster',
diff --git a/e2e-tests/playwright/tests/functional/boards/board-creation-and-set-up/create_empty_board.spec.ts b/e2e-tests/playwright/tests/functional/boards/board-creation-and-set-up/create_empty_board.spec.ts
index d4e4c30681..0967d8577c 100644
--- a/e2e-tests/playwright/tests/functional/boards/board-creation-and-set-up/create_empty_board.spec.ts
+++ b/e2e-tests/playwright/tests/functional/boards/board-creation-and-set-up/create_empty_board.spec.ts
@@ -7,8 +7,6 @@ import {shouldSkipInSmallScreen} from '@e2e-support/flag';
 shouldSkipInSmallScreen();
 
 test('MM-T4274 Create an Empty Board', async ({pw, pages}) => {
-    await pw.shouldHaveBoardsEnabled();
-
     // Create and sign in a new user
     const {user} = await pw.initSetup();
 
diff --git a/e2e-tests/playwright/tests/visual/boards/board_template.spec.ts b/e2e-tests/playwright/tests/visual/boards/board_template.spec.ts
index ca130486db..1866840349 100644
--- a/e2e-tests/playwright/tests/visual/boards/board_template.spec.ts
+++ b/e2e-tests/playwright/tests/visual/boards/board_template.spec.ts
@@ -7,8 +7,6 @@ import {shouldSkipInSmallScreen} from '@e2e-support/flag';
 shouldSkipInSmallScreen();
 
 test('Board template', async ({pw, pages, browserName, viewport}, testInfo) => {
-    await pw.shouldHaveBoardsEnabled();
-
     // Create and sign in a new user
     const {user} = await pw.initSetup();
 
diff --git a/e2e-tests/playwright/tests/visual/boards/view_untitled_board.spec.ts b/e2e-tests/playwright/tests/visual/boards/view_untitled_board.spec.ts
index 00645a851b..f5a03b4ba9 100644
--- a/e2e-tests/playwright/tests/visual/boards/view_untitled_board.spec.ts
+++ b/e2e-tests/playwright/tests/visual/boards/view_untitled_board.spec.ts
@@ -7,8 +7,6 @@ import {shouldSkipInSmallScreen} from '@e2e-support/flag';
 shouldSkipInSmallScreen();
 
 test('View untitled board', async ({pw, pages, browserName, viewport}, testInfo) => {
-    await pw.shouldHaveBoardsEnabled();
-
     // Create and sign in a new user
     const {user} = await pw.initSetup();
 

From 646e0fcd411b02b921f255501e3d8f62074cbd5f Mon Sep 17 00:00:00 2001
From: Nick Misasi <nick.misasi@mattermost.com>
Date: Tue, 11 Apr 2023 08:15:03 -0400
Subject: [PATCH 018/103] [MM-51990] Add 3 more options for company size
 dropdown (#22870)

* Add 3 more options for company size dropdown

* translate

* Fix linter
---
 .../components/start_trial_form_modal/index.tsx | 17 +++++++++++++----
 webapp/channels/src/i18n/en.json                |  6 ++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/webapp/channels/src/components/start_trial_form_modal/index.tsx b/webapp/channels/src/components/start_trial_form_modal/index.tsx
index e64ed539a1..13880031c7 100644
--- a/webapp/channels/src/components/start_trial_form_modal/index.tsx
+++ b/webapp/channels/src/components/start_trial_form_modal/index.tsx
@@ -6,7 +6,7 @@ import {useSelector, useDispatch} from 'react-redux';
 import {Modal, Button} from 'react-bootstrap';
 import {FormattedMessage, useIntl} from 'react-intl';
 import classNames from 'classnames';
-
+import {t} from 'utils/i18n';
 import {isModalOpen} from 'selectors/views/modals';
 import {GlobalState} from 'types/store';
 import {closeModal, openModal} from 'actions/views/modals';
@@ -33,8 +33,6 @@ import './start_trial_form_modal.scss';
 import useCWSAvailabilityCheck from 'components/common/hooks/useCWSAvailabilityCheck';
 import AirGappedModal from './air_gapped_modal';
 
-// TODO: Handle embargoed entities explicitly https://mattermost.atlassian.net/browse/MM-51470
-
 const TrialBenefitsModal = makeAsyncComponent('TrialBenefitsModal', React.lazy(() => import('components/trial_benefits_modal/trial_benefits_modal')));
 
 enum TrialLoadStatus {
@@ -44,10 +42,21 @@ enum TrialLoadStatus {
     Failed = 'FAILED'
 }
 
+// Marker functions so i18n-extract doesn't remove strings
+t('ONE_TO_50');
+t('FIFTY_TO_100');
+t('ONE_HUNDRED_TO_500');
+t('FIVE_HUNDRED_TO_1000');
+t('ONE_THOUSAND_TO_2500');
+t('TWO_THOUSAND_FIVE_HUNDRED_AND_UP');
+
 export enum OrgSize {
     ONE_TO_50 = '1-50',
     FIFTY_TO_100 = '51-100',
     ONE_HUNDRED_TO_500 = '101-500',
+    FIVE_HUNDRED_TO_1000 = '501-1000',
+    ONE_THOUSAND_TO_2500 = '1001-2500',
+    TWO_THOUSAND_FIVE_HUNDRED_AND_UP = '2501+',
 }
 
 type Props = {
@@ -209,7 +218,7 @@ function StartTrialFormModal(props: Props): JSX.Element | null {
         }
         return {
             value: orgSize,
-            label: OrgSize[orgSize as unknown as keyof typeof OrgSize],
+            label: formatMessage({id: orgSize, defaultMessage: OrgSize[orgSize as unknown as keyof typeof OrgSize]}),
         };
     };
 
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 46bfe63691..bd5ed43317 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -3409,6 +3409,7 @@
   "feedback.downgradeWorkspace.tellUsWhy": "Please tell us why you are downgrading",
   "feedback.downgradeWorkspace.tooExpensive": "Too expensive",
   "feedback.other": "Other",
+  "FIFTY_TO_100": "51-100",
   "file_attachment.thumbnail": "file thumbnail",
   "file_info_preview.size": "Size ",
   "file_info_preview.type": "File type ",
@@ -3438,6 +3439,7 @@
   "filtered_user_list.search": "Search users",
   "filtered_user_list.team": "Team:",
   "filtered_user_list.userStatus": "User Status:",
+  "FIVE_HUNDRED_TO_1000": "501-1000",
   "flag_post.flag": "Save",
   "flag_post.unflag": "Remove from Saved",
   "footer_pagination.count": "Showing {startCount, number}-{endCount, number} of {total, number}",
@@ -4348,6 +4350,9 @@
   "onboardingTour.Playbooks.title": "Build workflows with Playbooks",
   "onboardingTour.sendMessage.Description": "Start collaborating with others by typing or selecting one of the messages below. You can also drag and drop attachments into the text field or upload them using the paperclip icon.",
   "onboardingTour.sendMessage.title": "Send messages",
+  "ONE_HUNDRED_TO_500": "101-500",
+  "ONE_THOUSAND_TO_2500": "1001-2500",
+  "ONE_TO_50": "1-50",
   "password_form.change": "Change my password",
   "password_form.enter": "Enter a new password for your {siteName} account.",
   "password_form.pwd": "Password",
@@ -5184,6 +5189,7 @@
   "tutorial_tip.ok": "Next",
   "tutorial_tip.out": "Opt out of these tips.",
   "tutorial_tip.seen": "Seen this before? ",
+  "TWO_THOUSAND_FIVE_HUNDRED_AND_UP": "2501-5000",
   "unarchive_channel.cancel": "Cancel",
   "unarchive_channel.confirm": "Confirm UNARCHIVE Channel",
   "unarchive_channel.del": "Unarchive",

From cefb6f04196c98eb7505993650a1cb04a0338572 Mon Sep 17 00:00:00 2001
From: Christopher Poile <cpoile@gmail.com>
Date: Tue, 11 Apr 2023 11:55:17 -0400
Subject: [PATCH 019/103] MM-51461 - Prepackage calls v0.15.0 (#22913)

---
 server/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/Makefile b/server/Makefile
index 87130c4e3e..124b7460e5 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -142,7 +142,7 @@ TEMPLATES_DIR=templates
 PLUGIN_PACKAGES ?= mattermost-plugin-antivirus-v0.1.2
 PLUGIN_PACKAGES += mattermost-plugin-autolink-v1.2.2
 PLUGIN_PACKAGES += mattermost-plugin-aws-SNS-v1.2.0
-PLUGIN_PACKAGES += mattermost-plugin-calls-v0.14.0
+PLUGIN_PACKAGES += mattermost-plugin-calls-v0.15.0
 PLUGIN_PACKAGES += mattermost-plugin-channel-export-v1.0.0
 PLUGIN_PACKAGES += mattermost-plugin-confluence-v1.3.0
 PLUGIN_PACKAGES += mattermost-plugin-custom-attributes-v1.3.1

From bf952e690b6b2c6e5b444103f2b9c5b030cd0e38 Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Tue, 11 Apr 2023 21:40:42 +0530
Subject: [PATCH 020/103] MM-52088: Skip Flaky test (#22910)

https://mattermost.atlassian.net/browse/MM-52088

```release-note
NONE
```
---
 server/channels/app/draft_test.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/channels/app/draft_test.go b/server/channels/app/draft_test.go
index 4b52efd8e9..83c7d090d8 100644
--- a/server/channels/app/draft_test.go
+++ b/server/channels/app/draft_test.go
@@ -278,6 +278,7 @@ func TestGetDraftsForUser(t *testing.T) {
 	assert.Nil(t, createDraftErr2)
 
 	t.Run("get drafts", func(t *testing.T) {
+		t.Skip("MM-52088")
 		draftResp, err := th.App.GetDraftsForUser(user.Id, th.BasicTeam.Id)
 		assert.Nil(t, err)
 

From dd2e325c24d43b1843356809adba0d1365df99cd Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Tue, 11 Apr 2023 12:52:54 -0400
Subject: [PATCH 021/103] Ensure admins can send true up telemetry, even if
 telemetry is disabled.

---
 server/channels/api4/license.go                     | 13 ++++++++-----
 server/channels/einterfaces/cloud.go                |  3 +++
 .../src/components/analytics/true_up_review.tsx     |  4 ----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go
index 9911c241e1..02420a824d 100644
--- a/server/channels/api4/license.go
+++ b/server/channels/api4/license.go
@@ -354,15 +354,18 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) {
 	// Do not send true-up review data if the user has already requested one for the quarter.
 	// And only send a true-up review via as a one-time telemetry request if telemetry is disabled.
 	telemetryEnabled := c.App.Config().LogSettings.EnableDiagnostics
-	if telemetryEnabled != nil && !*telemetryEnabled {
+	if telemetryEnabled != nil && *telemetryEnabled {
 		// Send telemetry data
 		c.App.Srv().GetTelemetryService().SendTelemetry(model.TrueUpReviewTelemetryName, profileMap)
-
-		// Update the review status to reflect the completion.
-		status.Completed = true
-		c.App.Srv().Store().TrueUpReview().Update(status)
+	} else {
+		// Telemetry is disabled, submit true up review profile via CWS.
+		c.App.Cloud().SubmitTrueUpReview(profileMap)
 	}
 
+	// Update the review status to reflect the completion.
+	status.Completed = true
+	c.App.Srv().Store().TrueUpReview().Update(status)
+
 	// Encode to string rather than byte[] otherwise json.Marshal will encode it further.
 	encodedData := b64.StdEncoding.EncodeToString(profileMapJson)
 	responseContent := struct {
diff --git a/server/channels/einterfaces/cloud.go b/server/channels/einterfaces/cloud.go
index 70cdc4676a..1dd2ea65ac 100644
--- a/server/channels/einterfaces/cloud.go
+++ b/server/channels/einterfaces/cloud.go
@@ -48,4 +48,7 @@ type CloudInterface interface {
 
 	SelfServeDeleteWorkspace(userID string, deletionRequest *model.WorkspaceDeletionRequest) error
 	SubscribeToNewsletter(userID string, req *model.SubscribeNewsletterRequest) error
+
+	// Used only for when a customer has telemetry disabled. In this scenario, true up review telemetry will be submitted via CWS.
+	SubmitTrueUpReview(trueUpReviewProfile map[string]any) error
 }
diff --git a/webapp/channels/src/components/analytics/true_up_review.tsx b/webapp/channels/src/components/analytics/true_up_review.tsx
index 5098999d63..c5ce7b38b2 100644
--- a/webapp/channels/src/components/analytics/true_up_review.tsx
+++ b/webapp/channels/src/components/analytics/true_up_review.tsx
@@ -223,10 +223,6 @@ const TrueUpReview: React.FC = () => {
         return null;
     }
 
-    if (telemetryEnabled) {
-        return null;
-    }
-
     pageVisited(TELEMETRY_CATEGORIES.TRUE_UP_REVIEW, 'pageview_true_up_review');
 
     return (

From 33d3c906543aa8513c4b9643844cfc44d5588120 Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Tue, 11 Apr 2023 14:15:56 -0400
Subject: [PATCH 022/103] Add mocks/layers.

---
 plugin/api_timer_layer_generated.go                |  2 +-
 plugin/hooks_timer_layer_generated.go              |  2 +-
 server/channels/api4/license.go                    |  6 +++++-
 server/channels/einterfaces/cloud.go               |  2 +-
 .../channels/einterfaces/mocks/CloudInterface.go   | 14 ++++++++++++++
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/plugin/api_timer_layer_generated.go b/plugin/api_timer_layer_generated.go
index a084188c62..c54c6ac7bb 100644
--- a/plugin/api_timer_layer_generated.go
+++ b/plugin/api_timer_layer_generated.go
@@ -11,8 +11,8 @@ import (
 	"net/http"
 	timePkg "time"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
 	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
 )
 
 type apiTimerLayer struct {
diff --git a/plugin/hooks_timer_layer_generated.go b/plugin/hooks_timer_layer_generated.go
index 6093048d54..87e79ca7e6 100644
--- a/plugin/hooks_timer_layer_generated.go
+++ b/plugin/hooks_timer_layer_generated.go
@@ -11,8 +11,8 @@ import (
 	"net/http"
 	timePkg "time"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
 	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
 )
 
 type hooksTimerLayer struct {
diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go
index 02420a824d..985bada409 100644
--- a/server/channels/api4/license.go
+++ b/server/channels/api4/license.go
@@ -359,7 +359,11 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) {
 		c.App.Srv().GetTelemetryService().SendTelemetry(model.TrueUpReviewTelemetryName, profileMap)
 	} else {
 		// Telemetry is disabled, submit true up review profile via CWS.
-		c.App.Cloud().SubmitTrueUpReview(profileMap)
+		err := c.App.Cloud().SubmitTrueUpReview(c.AppContext.Session().UserId, profileMap)
+		if err != nil {
+			c.SetJSONEncodingError(err)
+			return
+		}
 	}
 
 	// Update the review status to reflect the completion.
diff --git a/server/channels/einterfaces/cloud.go b/server/channels/einterfaces/cloud.go
index 1dd2ea65ac..fc5446cd34 100644
--- a/server/channels/einterfaces/cloud.go
+++ b/server/channels/einterfaces/cloud.go
@@ -50,5 +50,5 @@ type CloudInterface interface {
 	SubscribeToNewsletter(userID string, req *model.SubscribeNewsletterRequest) error
 
 	// Used only for when a customer has telemetry disabled. In this scenario, true up review telemetry will be submitted via CWS.
-	SubmitTrueUpReview(trueUpReviewProfile map[string]any) error
+	SubmitTrueUpReview(userID string, trueUpReviewProfile map[string]any) error
 }
diff --git a/server/channels/einterfaces/mocks/CloudInterface.go b/server/channels/einterfaces/mocks/CloudInterface.go
index f84300dbec..5800844da0 100644
--- a/server/channels/einterfaces/mocks/CloudInterface.go
+++ b/server/channels/einterfaces/mocks/CloudInterface.go
@@ -594,6 +594,20 @@ func (_m *CloudInterface) SelfServeDeleteWorkspace(userID string, deletionReques
 	return r0
 }
 
+// SubmitTrueUpReview provides a mock function with given fields: userID, trueUpReviewProfile
+func (_m *CloudInterface) SubmitTrueUpReview(userID string, trueUpReviewProfile map[string]interface{}) error {
+	ret := _m.Called(userID, trueUpReviewProfile)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(string, map[string]interface{}) error); ok {
+		r0 = rf(userID, trueUpReviewProfile)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
 // SubscribeToNewsletter provides a mock function with given fields: userID, req
 func (_m *CloudInterface) SubscribeToNewsletter(userID string, req *model.SubscribeNewsletterRequest) error {
 	ret := _m.Called(userID, req)

From 7943221c5ae86942385c7a33d032a3ddc7364691 Mon Sep 17 00:00:00 2001
From: Jesse Hallam <jesse.hallam@gmail.com>
Date: Tue, 11 Apr 2023 18:10:27 -0300
Subject: [PATCH 023/103] Deprecate Toolkit CODEOWNERS (#22907)

* Deprecate Toolkit CODEOWNERS

* change code owner to `@mattermost/integrations`

* remove code owner

---------

Co-authored-by: Michael Kochell <6913320+mickmister@users.noreply.github.com>
---
 CODEOWNERS | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 07ee57d26c..b0bd218122 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,9 +1,7 @@
-/plugin/ @mattermost/toolkit
-
 /.github/workflows/channels-ci.yml @mattermost/web-platform
 /webapp/package.json @mattermost/web-platform
 /webapp/channels/package.json @mattermost/web-platform
 /webapp/Makefile @mattermost/web-platform
 /webapp/package-lock.json @mattermost/web-platform
 /webapp/platform/*/package.json @mattermost/web-platform
-/webapp/scripts @mattermost/web-platform
\ No newline at end of file
+/webapp/scripts @mattermost/web-platform

From 2917d5fba778649335eed7d46ed9b5e5abc88101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Andr=C3=A9s=20V=C3=A9lez=20Vidal?=
 <pablovv2012@gmail.com>
Date: Wed, 12 Apr 2023 00:03:27 +0200
Subject: [PATCH 024/103] MM-51970 - double vertical scroll on lhs (#22867)

---
 webapp/channels/src/sass/layout/_sidebar-left.scss | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/webapp/channels/src/sass/layout/_sidebar-left.scss b/webapp/channels/src/sass/layout/_sidebar-left.scss
index 2f5aa4759a..2b95ea5fc3 100644
--- a/webapp/channels/src/sass/layout/_sidebar-left.scss
+++ b/webapp/channels/src/sass/layout/_sidebar-left.scss
@@ -575,18 +575,6 @@ $sidebarOpacityAnimationDuration: 0.15s;
         }
     }
 
-    @media screen and (min-width: 768px) {
-        .SidebarNavContainer {
-            .scrollbar--view {
-                max-width: 240px;
-            }
-        }
-
-        #SidebarContainer .SidebarChannelGroup .SidebarChannelGroupHeader {
-            max-width: 240px;
-        }
-    }
-
     .SidebarCategory_newLabel {
         display: flex;
         width: 32px;
@@ -1027,6 +1015,7 @@ $sidebarOpacityAnimationDuration: 0.15s;
     /* Channels */
     .SidebarChannel {
         display: flex;
+        overflow: hidden;
         height: 32px;
 
         /* height required for transition animation */

From a0530da22b8262109eda96c79582ebf6ac306d4f Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Wed, 12 Apr 2023 00:51:28 +0200
Subject: [PATCH 025/103] event-id -> event_id for consistency (#22775)

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 server/playbooks/server/api/api.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/playbooks/server/api/api.yaml b/server/playbooks/server/api/api.yaml
index 7541ae930d..69e74a44c7 100644
--- a/server/playbooks/server/api/api.yaml
+++ b/server/playbooks/server/api/api.yaml
@@ -1249,7 +1249,7 @@ paths:
         500:
           $ref: "#/components/responses/500"
 
-  /runs/{id}/timeline/{event-id}/:
+  /runs/{id}/timeline/{event_id}/:
     delete:
       summary: Remove a timeline event from the playbook run
       operationId: removeTimelineEvent
@@ -1265,7 +1265,7 @@ paths:
           example: zjy2q2iy2jafl0lo2oddos5xn7
           schema:
             type: string
-        - name: event-id
+        - name: event_id
           in: path
           required: true
           description: ID of the timeline event to be deleted

From 4cc370098ea5cdfe8b1252dae578d0d0167a32af Mon Sep 17 00:00:00 2001
From: Ben Schumacher <ben.schumacher@mattermost.com>
Date: Wed, 12 Apr 2023 01:10:59 +0200
Subject: [PATCH 026/103] [MM-26398] Remove deprecated
 model.CommandArgs.Session (#22815)

---
 model/command_args.go           | 3 ---
 server/channels/api4/command.go | 2 --
 2 files changed, 5 deletions(-)

diff --git a/model/command_args.go b/model/command_args.go
index 9d09656e38..a01b5db87a 100644
--- a/model/command_args.go
+++ b/model/command_args.go
@@ -19,9 +19,6 @@ type CommandArgs struct {
 	T               i18n.TranslateFunc `json:"-"`
 	UserMentions    UserMentionMap     `json:"-"`
 	ChannelMentions ChannelMentionMap  `json:"-"`
-
-	// DO NOT USE Session field is deprecated. MM-26398
-	Session Session `json:"-"`
 }
 
 func (o *CommandArgs) Auditable() map[string]interface{} {
diff --git a/server/channels/api4/command.go b/server/channels/api4/command.go
index baa3735637..5bce4b8169 100644
--- a/server/channels/api4/command.go
+++ b/server/channels/api4/command.go
@@ -353,7 +353,6 @@ func executeCommand(c *Context, w http.ResponseWriter, r *http.Request) {
 	commandArgs.UserId = c.AppContext.Session().UserId
 	commandArgs.T = c.AppContext.T
 	commandArgs.SiteURL = c.GetSiteURLHeader()
-	commandArgs.Session = *c.AppContext.Session()
 
 	response, err := c.App.ExecuteCommand(c.AppContext, &commandArgs)
 	if err != nil {
@@ -424,7 +423,6 @@ func listCommandAutocompleteSuggestions(c *Context, w http.ResponseWriter, r *ht
 		RootId:    query.Get("root_id"),
 		UserId:    c.AppContext.Session().UserId,
 		T:         c.AppContext.T,
-		Session:   *c.AppContext.Session(),
 		SiteURL:   c.GetSiteURLHeader(),
 		Command:   userInput,
 	}

From 0190d7dca8b1b91b719885b7222f0dc71a72d1ac Mon Sep 17 00:00:00 2001
From: Ashish Dhama <16203333+AshishDhama@users.noreply.github.com>
Date: Wed, 12 Apr 2023 12:50:36 +0530
Subject: [PATCH 027/103] [MM-51878]: Migrate billing history unit test to
 testing library (#22900)

* migrate billing history unit test to testing library
---
 .../billing_history.test.tsx.snap             | 37 --------
 .../billing/billing_history.test.tsx          | 92 ++++++++++++-------
 .../admin_console/billing/billing_history.tsx |  6 +-
 .../billing/billing_history_table.tsx         | 10 +-
 4 files changed, 73 insertions(+), 72 deletions(-)
 delete mode 100644 webapp/channels/src/components/admin_console/billing/__snapshots__/billing_history.test.tsx.snap

diff --git a/webapp/channels/src/components/admin_console/billing/__snapshots__/billing_history.test.tsx.snap b/webapp/channels/src/components/admin_console/billing/__snapshots__/billing_history.test.tsx.snap
deleted file mode 100644
index d62de0083b..0000000000
--- a/webapp/channels/src/components/admin_console/billing/__snapshots__/billing_history.test.tsx.snap
+++ /dev/null
@@ -1,37 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`components/admin_console/billing/billing_history should match snapshot 1`] = `
-<ContextProvider
-  value={
-    Object {
-      "store": Object {
-        "clearActions": [Function],
-        "dispatch": [Function],
-        "getActions": [Function],
-        "getState": [Function],
-        "replaceReducer": [Function],
-        "subscribe": [Function],
-      },
-      "subscription": Subscription {
-        "handleChangeWrapper": [Function],
-        "listeners": Object {
-          "notify": [Function],
-        },
-        "onStateChange": [Function],
-        "parentSub": undefined,
-        "store": Object {
-          "clearActions": [Function],
-          "dispatch": [Function],
-          "getActions": [Function],
-          "getState": [Function],
-          "replaceReducer": [Function],
-          "subscribe": [Function],
-        },
-        "unsubscribe": null,
-      },
-    }
-  }
->
-  <BillingHistory />
-</ContextProvider>
-`;
diff --git a/webapp/channels/src/components/admin_console/billing/billing_history.test.tsx b/webapp/channels/src/components/admin_console/billing/billing_history.test.tsx
index 424eb55c2b..34bb1d2a07 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_history.test.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_history.test.tsx
@@ -5,11 +5,9 @@ import React from 'react';
 
 import {Provider} from 'react-redux';
 
-import {shallow} from 'enzyme';
 import {screen} from '@testing-library/react';
 
-import {renderWithIntlAndStore} from 'tests/react_testing_utils';
-import {mountWithIntl} from 'tests/helpers/intl-test-helper';
+import {renderWithIntl, renderWithIntlAndStore} from 'tests/react_testing_utils';
 import mockStore from 'tests/test_store';
 
 import {CloudLinks, HostedCustomerLinks} from 'utils/constants';
@@ -35,7 +33,7 @@ const invoiceA = {
             quantity: 1,
             price_per_unit: 1000,
             description:
-                                    '1 × Cloud Professional (at $10.00 / month)',
+                '1 × Cloud Professional (at $10.00 / month)',
             type: 'onpremise',
             metadata: {},
         },
@@ -59,7 +57,7 @@ const invoiceB = {
             quantity: 1,
             price_per_unit: 1000,
             description:
-                                    'Trial period for Cloud Professional',
+                'Trial period for Cloud Professional',
             type: 'onpremise',
             metadata: {},
         },
@@ -98,13 +96,21 @@ describe('components/admin_console/billing/billing_history', () => {
 
     const store = mockStore(state);
 
-    test('should match snapshot', () => {
-        const wrapper = shallow(
+    test('should match the default state of the component with given props', () => {
+        renderWithIntl(
             <Provider store={store}>
                 <BillingHistory/>
             </Provider>,
         );
-        expect(wrapper).toMatchSnapshot();
+
+        expect(screen.queryByText('Billing History')).toBeInTheDocument();
+        expect(screen.queryByText('Transactions')).toBeInTheDocument();
+        expect(screen.queryByText('All of your invoices will be shown here')).toBeInTheDocument();
+        expect(screen.getByTestId(invoiceA.number)).toHaveTextContent((invoiceA.total / 100.0).toString());
+        expect(screen.getByTestId(invoiceB.number)).toHaveTextContent((invoiceB.total / 100.0).toString());
+
+        expect(screen.getByTestId(invoiceA.id)).toHaveTextContent('Pending');
+        expect(screen.getByTestId(invoiceB.id)).toHaveTextContent('Paid');
     });
 
     test('Billing history section shows template when no invoices have been emitted yet', () => {
@@ -113,42 +119,54 @@ describe('components/admin_console/billing/billing_history', () => {
             entities: {...state.entities, cloud: {invoices: {}, errors: {}}},
         };
         const storeNoBillingHistory = mockStore(noBillingHistoryState);
-        const wrapper = mountWithIntl(
+        renderWithIntl(
             <Provider store={storeNoBillingHistory}>
                 <BillingHistory/>
             </Provider>,
         );
 
-        const legend = wrapper.find(
-            '.BillingHistory__cardHeaderText-bottom span',
-        );
-        expect(legend.text()).toBe(NO_INVOICES_LEGEND);
+        expect(screen.queryByText('Date')).not.toBeInTheDocument();
+        expect(screen.queryByText('Description')).not.toBeInTheDocument();
+        expect(screen.queryByText('Total')).not.toBeInTheDocument();
+        expect(screen.queryByText('Status')).not.toBeInTheDocument();
+
+        expect(screen.queryByTestId(invoiceA.number)).not.toBeInTheDocument();
+        expect(screen.queryByTestId(invoiceB.number)).not.toBeInTheDocument();
+
+        expect(screen.queryByTestId(invoiceA.id)).not.toBeInTheDocument();
+        expect(screen.queryByTestId(invoiceB.id)).not.toBeInTheDocument();
+
+        expect(screen.getByRole('link')).toHaveAttribute('href', 'https://docs.mattermost.com/cloud/cloud-billing/cloud-billing.html?utm_source=mattermost&utm_medium=in-product-cloud&utm_content=billing_history&uid=current_user_id&sid=');
+        expect(screen.getByRole('link')).toHaveTextContent('See how billing works');
+        expect(screen.getByTestId('no-invoices')).toHaveTextContent(NO_INVOICES_LEGEND);
     });
 
     test('Billing history section shows two invoices to download', () => {
-        const wrapper = mountWithIntl(
+        renderWithIntl(
             <Provider store={store}>
                 <BillingHistory/>
             </Provider>,
         );
 
-        const invoiceTableRows = wrapper.find('table.BillingHistory__table tr.BillingHistory__table-row');
+        expect(screen.queryByText('Date')).toBeInTheDocument();
+        expect(screen.queryByText('Description')).toBeInTheDocument();
+        expect(screen.queryByText('Total')).toBeInTheDocument();
+        expect(screen.queryByText('Status')).toBeInTheDocument();
 
-        expect(invoiceTableRows.length).toBe(2);
+        expect(screen.getAllByTestId('billingHistoryTableRow')).toHaveLength(2);
     });
 
     test('Billing history section download button has the target property set as _self so it works well in desktop app', () => {
-        const wrapper = mountWithIntl(
+        renderWithIntl(
             <Provider store={store}>
                 <BillingHistory/>
             </Provider>,
         );
 
-        const invoiceTableRow = wrapper.find('table.BillingHistory__table tr.BillingHistory__table-row').at(0);
-
-        const downloadLink = invoiceTableRow.find('td.BillingHistory__table-invoice a');
-
-        expect(downloadLink.prop('target')).toBe('_self');
+        expect(screen.getByTestId(`billingHistoryLink-${invoiceA.id}`)).toHaveAttribute('target', '_self');
+        expect(screen.getByTestId(`billingHistoryLink-${invoiceB.id}`)).toHaveAttribute('target', '_self');
+        expect(screen.getByTestId(`billingHistoryLink-${invoiceA.id}`)).toHaveAttribute('href', '/api/v4/cloud/subscription/invoices/in_1KNb3DI67GP2qpb4ueaJYBt8/pdf');
+        expect(screen.getByTestId(`billingHistoryLink-${invoiceB.id}`)).toHaveAttribute('href', '/api/v4/cloud/subscription/invoices/in_1KIWNTI67GP2qpb4KjGj1KAy/pdf');
     });
 });
 
@@ -191,30 +209,42 @@ describe('BillingHistory -- self-hosted', () => {
             entities: {...state.entities, hostedCustomer: {invoices: {invoices: {}, invoicesLoaded: true}, errors: {}}},
         };
         const storeNoBillingHistory = mockStore(noBillingHistoryState);
-        const wrapper = mountWithIntl(
+        renderWithIntl(
             <Provider store={storeNoBillingHistory}>
                 <BillingHistory/>
             </Provider>,
         );
 
-        const legend = wrapper.find(
-            '.BillingHistory__cardHeaderText-bottom span',
-        );
-        expect(legend.text()).toBe(NO_INVOICES_LEGEND);
+        expect(screen.queryByText('Date')).not.toBeInTheDocument();
+        expect(screen.queryByText('Description')).not.toBeInTheDocument();
+        expect(screen.queryByText('Total')).not.toBeInTheDocument();
+        expect(screen.queryByText('Status')).not.toBeInTheDocument();
+
+        expect(screen.queryByTestId(invoiceA.number)).not.toBeInTheDocument();
+        expect(screen.queryByTestId(invoiceB.number)).not.toBeInTheDocument();
+
+        expect(screen.queryByTestId(invoiceA.id)).not.toBeInTheDocument();
+        expect(screen.queryByTestId(invoiceB.id)).not.toBeInTheDocument();
+
+        expect(screen.getByRole('link')).toHaveAttribute('href', 'https://docs.mattermost.com/manage/self-hosted-billing.html?utm_source=mattermost&utm_medium=in-product&utm_content=billing_history&uid=current_user_id&sid=');
+        expect(screen.getByRole('link')).toHaveTextContent('See how billing works');
+        expect(screen.getByTestId('no-invoices')).toHaveTextContent(NO_INVOICES_LEGEND);
     });
 
     test('Billing history section shows two invoices to download', () => {
         const store = mockStore(state);
 
-        const wrapper = mountWithIntl(
+        renderWithIntl(
             <Provider store={store}>
                 <BillingHistory/>
             </Provider>,
         );
 
-        const invoiceTableRows = wrapper.find('table.BillingHistory__table tr.BillingHistory__table-row');
-
-        expect(invoiceTableRows.length).toBe(2);
+        expect(screen.queryByText('Date')).toBeInTheDocument();
+        expect(screen.queryByText('Description')).toBeInTheDocument();
+        expect(screen.queryByText('Total')).toBeInTheDocument();
+        expect(screen.queryByText('Status')).toBeInTheDocument();
+        expect(screen.getAllByTestId('billingHistoryTableRow')).toHaveLength(2);
     });
 });
 
diff --git a/webapp/channels/src/components/admin_console/billing/billing_history.tsx b/webapp/channels/src/components/admin_console/billing/billing_history.tsx
index 512cea1e9e..f89bf195c6 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_history.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_history.tsx
@@ -39,6 +39,7 @@ export const NoBillingHistorySection = (props: NoBillingHistorySectionProps) =>
             />
         </div>
         <ExternalLink
+            data-testid='billingHistoryLink'
             location='billing_history'
             href={props.selfHosted ? HostedCustomerLinks.SELF_HOSTED_BILLING : CloudLinks.BILLING_DOCS}
             className='BillingHistory__noHistory-link'
@@ -84,7 +85,10 @@ const BillingHistory = () => {
                                         defaultMessage='Transactions'
                                     />
                                 </div>
-                                <div className='BillingHistory__cardHeaderText-bottom'>
+                                <div
+                                    data-testid='no-invoices'
+                                    className='BillingHistory__cardHeaderText-bottom'
+                                >
                                     <FormattedMessage
                                         id='admin.billing.history.allPaymentsShowHere'
                                         defaultMessage='All of your invoices will be shown here'
diff --git a/webapp/channels/src/components/admin_console/billing/billing_history_table.tsx b/webapp/channels/src/components/admin_console/billing/billing_history_table.tsx
index f568cd21cb..03bbd4c3f7 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_history_table.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_history_table.tsx
@@ -176,7 +176,7 @@ export default function BillingHistoryTable({invoices}: BillingHistoryTableProps
                                     );
                                 }}
                             >
-                                <td>
+                                <td data-testid='billingHistoryTableRow'>
                                     <FormattedDate
                                         value={new Date(invoice.period_start)}
                                         month='2-digit'
@@ -191,7 +191,10 @@ export default function BillingHistoryTable({invoices}: BillingHistoryTableProps
                                         <InvoiceUserCount invoice={invoice}/>
                                     </div>
                                 </td>
-                                <td className='BillingHistory__table-total'>
+                                <td
+                                    data-testid={invoice.number}
+                                    className='BillingHistory__table-total'
+                                >
                                     <FormattedNumber
                                         value={invoice.total / 100.0}
                                         // eslint-disable-next-line react/style-prop-object
@@ -199,9 +202,10 @@ export default function BillingHistoryTable({invoices}: BillingHistoryTableProps
                                         currency='USD'
                                     />
                                 </td>
-                                <td>{getPaymentStatus(invoice.status)}</td>
+                                <td data-testid={invoice.id}>{getPaymentStatus(invoice.status)}</td>
                                 <td className='BillingHistory__table-invoice'>
                                     <a
+                                        data-testid={`billingHistoryLink-${invoice.id}`}
                                         target='_self'
                                         rel='noopener noreferrer'
                                         onClick={(e) => e.stopPropagation()}

From 62d758f485dc7012b8e6777dfe4bce06d16a593c Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Wed, 12 Apr 2023 19:10:03 +0530
Subject: [PATCH 028/103] Do not shutdown DB handle from boards product
 (#22924)

* Do not shutdown DB handle from boards product

```
warn  [2023-04-12 09:16:55.397 +05:30] Failed to save status                         caller="platform/status.go:175" user_id=gt5aricnu7g7xkr4jstfybgmbc error="failed to upsert Status: sql: database is closed"
```

The DB handle is a global object that is finally closed
at a higher layer after all the necessary tasks are finished.
So closing it prematurely, in the boards shutdown phase
is not necessary and can cause failures as observed above.

To fix this, we just remove the shutdown method.

```release-note
NONE
```

* fix tests

```release-note
NONE
```
---
 server/boards/integrationtests/clienttestlib.go | 5 +++++
 server/boards/server/server.go                  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/boards/integrationtests/clienttestlib.go b/server/boards/integrationtests/clienttestlib.go
index ad11791367..10997b0b18 100644
--- a/server/boards/integrationtests/clienttestlib.go
+++ b/server/boards/integrationtests/clienttestlib.go
@@ -388,6 +388,11 @@ func (th *TestHelper) TearDown() {
 		panic(err)
 	}
 
+	err = th.Server.Store().Shutdown()
+	if err != nil {
+		panic(err)
+	}
+
 	os.RemoveAll(th.Server.Config().FilesPath)
 
 	if err := os.Remove(th.Server.Config().DBConfigString); err == nil {
diff --git a/server/boards/server/server.go b/server/boards/server/server.go
index 9a364d25c9..d79f30129b 100644
--- a/server/boards/server/server.go
+++ b/server/boards/server/server.go
@@ -355,7 +355,7 @@ func (s *Server) Shutdown() error {
 
 	defer s.logger.Info("Server.Shutdown")
 
-	return s.store.Shutdown()
+	return nil
 }
 
 func (s *Server) Config() *config.Configuration {

From b00ca20abe144ac7c295cbcf83011e612a016de4 Mon Sep 17 00:00:00 2001
From: Claudio Costa <cstcld91@gmail.com>
Date: Wed, 12 Apr 2023 07:53:03 -0600
Subject: [PATCH 029/103] [MM-50827] Detect content-type if missing in response
 during link metadata generation (#22885)

* Detect content-type if missing in response during link metadata generation

* Initialize buffer only when necessary
---
 server/channels/app/post_metadata.go      | 18 ++++++++++++++++++
 server/channels/app/post_metadata_test.go | 12 ++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/server/channels/app/post_metadata.go b/server/channels/app/post_metadata.go
index 460354eaa5..9048f3c5d3 100644
--- a/server/channels/app/post_metadata.go
+++ b/server/channels/app/post_metadata.go
@@ -4,6 +4,7 @@
 package app
 
 import (
+	"bufio"
 	"bytes"
 	"fmt"
 	"image"
@@ -764,7 +765,24 @@ func cacheLinkMetadata(requestURL string, timestamp int64, og *opengraph.OpenGra
 	platform.LinkCache().SetWithExpiry(strconv.FormatInt(model.GenerateLinkMetadataHash(requestURL, timestamp), 16), metadata, platform.LinkCacheDuration)
 }
 
+// peekContentType peeks at the first 512 bytes of p, and attempts to detect
+// the content type.  Returns empty string if error occurs.
+func peekContentType(p *bufio.Reader) string {
+	byt, err := p.Peek(512)
+	if err != nil && err != bufio.ErrBufferFull && err != io.EOF {
+		return ""
+	}
+	return http.DetectContentType(byt)
+}
+
 func (a *App) parseLinkMetadata(requestURL string, body io.Reader, contentType string) (*opengraph.OpenGraph, *model.PostImage, error) {
+	if contentType == "" {
+		bufRd := bufio.NewReader(body)
+		// If the content-type is missing we try to detect it from the actual data.
+		contentType = peekContentType(bufRd)
+		body = bufRd
+	}
+
 	if contentType == "image/svg+xml" {
 		image := &model.PostImage{
 			Format: "svg",
diff --git a/server/channels/app/post_metadata_test.go b/server/channels/app/post_metadata_test.go
index 8ee5f71d3b..9b3e0602fa 100644
--- a/server/channels/app/post_metadata_test.go
+++ b/server/channels/app/post_metadata_test.go
@@ -2595,6 +2595,18 @@ func TestParseLinkMetadata(t *testing.T) {
 		}, dimensions)
 	})
 
+	t.Run("image with no content-type given", func(t *testing.T) {
+		og, dimensions, err := th.App.parseLinkMetadata(imageURL, makeImageReader(), "")
+		assert.NoError(t, err)
+
+		assert.Nil(t, og)
+		assert.Equal(t, &model.PostImage{
+			Format: "png",
+			Width:  408,
+			Height: 336,
+		}, dimensions)
+	})
+
 	t.Run("malformed image", func(t *testing.T) {
 		og, dimensions, err := th.App.parseLinkMetadata(imageURL, makeOpenGraphReader(), "image/png")
 		assert.Error(t, err)

From 382894b41cff910a7c1babf643e8cd2d0ba46640 Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Wed, 12 Apr 2023 09:56:46 -0400
Subject: [PATCH 030/103] revert change to show true up review when telemetry
 is enabled, always send true up data to CWS for telemetry capture.

---
 server/channels/api4/license.go               | 19 ++++++-------------
 .../components/analytics/true_up_review.tsx   |  4 ++++
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go
index 985bada409..358960272f 100644
--- a/server/channels/api4/license.go
+++ b/server/channels/api4/license.go
@@ -351,19 +351,12 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Do not send true-up review data if the user has already requested one for the quarter.
-	// And only send a true-up review via as a one-time telemetry request if telemetry is disabled.
-	telemetryEnabled := c.App.Config().LogSettings.EnableDiagnostics
-	if telemetryEnabled != nil && *telemetryEnabled {
-		// Send telemetry data
-		c.App.Srv().GetTelemetryService().SendTelemetry(model.TrueUpReviewTelemetryName, profileMap)
-	} else {
-		// Telemetry is disabled, submit true up review profile via CWS.
-		err := c.App.Cloud().SubmitTrueUpReview(c.AppContext.Session().UserId, profileMap)
-		if err != nil {
-			c.SetJSONEncodingError(err)
-			return
-		}
+	// True-up is only enabled when telemetry is disabled. When telemetry is enabled, we already have all the data necessary
+	// for true-up reviews to be completed.
+	err = c.App.Cloud().SubmitTrueUpReview(c.AppContext.Session().UserId, profileMap)
+	if err != nil {
+		c.SetJSONEncodingError(err)
+		return
 	}
 
 	// Update the review status to reflect the completion.
diff --git a/webapp/channels/src/components/analytics/true_up_review.tsx b/webapp/channels/src/components/analytics/true_up_review.tsx
index c5ce7b38b2..5098999d63 100644
--- a/webapp/channels/src/components/analytics/true_up_review.tsx
+++ b/webapp/channels/src/components/analytics/true_up_review.tsx
@@ -223,6 +223,10 @@ const TrueUpReview: React.FC = () => {
         return null;
     }
 
+    if (telemetryEnabled) {
+        return null;
+    }
+
     pageVisited(TELEMETRY_CATEGORIES.TRUE_UP_REVIEW, 'pageview_true_up_review');
 
     return (

From 77e1fbfbc832a96eae76a45ed586b7cf3e31075d Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Wed, 12 Apr 2023 10:12:33 -0400
Subject: [PATCH 031/103] Change error upon failure of true up review
 submission to CWS.

---
 server/channels/api4/license.go | 2 +-
 server/i18n/en.json             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go
index 358960272f..abbdf8bcfb 100644
--- a/server/channels/api4/license.go
+++ b/server/channels/api4/license.go
@@ -355,7 +355,7 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) {
 	// for true-up reviews to be completed.
 	err = c.App.Cloud().SubmitTrueUpReview(c.AppContext.Session().UserId, profileMap)
 	if err != nil {
-		c.SetJSONEncodingError(err)
+		c.Err = model.NewAppError("requestTrueUpReview", "api.license.true_up_review.failed_to_submit", nil, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
diff --git a/server/i18n/en.json b/server/i18n/en.json
index e91fbf2656..d16e605ef0 100644
--- a/server/i18n/en.json
+++ b/server/i18n/en.json
@@ -2089,6 +2089,10 @@
     "id": "api.license.true_up_review.create_error",
     "translation": "Could not create true up status record"
   },
+  {
+    "id": "api.license.true_up_review.failed_to_submit",
+    "translation": "Failed to submit true up review profile to CWS."
+  },
   {
     "id": "api.license.true_up_review.get_status_error",
     "translation": "Could not get true up status records"

From 155e896dcfb152fa2bef06cc316aaab11c160039 Mon Sep 17 00:00:00 2001
From: Allan Guwatudde <guwats10@gmail.com>
Date: Wed, 12 Apr 2023 18:08:37 +0300
Subject: [PATCH 032/103] [MM-51412] - In-product banner to communicate Cloud
 Free deprecation (#22622)

* [MM-51412] - In-product banner to communicate Cloud Free deprecation

* fix lint

* make improvements

* make improvements

* put banners behind feature flag

* cloud free overage case

* add unit tests

* feedback impl

* fix test

* rename and enable feature flag by default

* fix alert banner mode

* read end date from env var

* disable ff by default

* enter cloud free deprecation date

* remove env var

* fix text

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 model/feature_flags.go                        |   3 +
 .../billing/billing_subscriptions/index.tsx   |   2 +
 .../to_paid_plan_nudge_banner.scss            |  28 ++
 .../to_paid_plan_nudge_banner.test.tsx        | 239 +++++++++++++++++
 .../to_paid_plan_nudge_banner.tsx             | 246 ++++++++++++++++++
 .../channels/src/components/alert_banner.tsx  |   3 +
 .../announcement_bar_controller.tsx           |   4 +
 .../announcement_bar.tsx                      |   2 +
 webapp/channels/src/i18n/en.json              |   5 +
 .../src/selectors/entities/preferences.ts     |   4 +
 webapp/channels/src/utils/constants.tsx       |   2 +
 11 files changed, 538 insertions(+)
 create mode 100644 webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.scss
 create mode 100644 webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.test.tsx
 create mode 100644 webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.tsx

diff --git a/model/feature_flags.go b/model/feature_flags.go
index 792ae834e9..f835aab621 100644
--- a/model/feature_flags.go
+++ b/model/feature_flags.go
@@ -75,6 +75,8 @@ type FeatureFlags struct {
 
 	OnboardingTourTips bool
 
+	DeprecateCloudFree bool
+
 	AppsSidebarCategory bool
 }
 
@@ -101,6 +103,7 @@ func (f *FeatureFlags) SetDefaults() {
 	f.ReduceOnBoardingTaskList = false
 	f.ThreadsEverywhere = false
 	f.GlobalDrafts = true
+	f.DeprecateCloudFree = false
 	f.WysiwygEditor = false
 	f.OnboardingAutoShowLinkedBoard = false
 	f.OnboardingTourTips = true
diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/index.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/index.tsx
index ac6bdb6ef1..2f46aeb588 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/index.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/index.tsx
@@ -48,6 +48,7 @@ import {
 import LimitReachedBanner from './limit_reached_banner';
 import CancelSubscription from './cancel_subscription';
 import {ToYearlyNudgeBanner} from './to_yearly_nudge_banner';
+import {ToPaidNudgeBanner} from './to_paid_plan_nudge_banner';
 
 import './billing_subscriptions.scss';
 
@@ -136,6 +137,7 @@ const BillingSubscriptions = () => {
                         />
                         {shouldShowPaymentFailedBanner() && paymentFailedBanner()}
                         {<ToYearlyNudgeBanner/>}
+                        {<ToPaidNudgeBanner/>}
                         {showCreditCardBanner &&
                             isCardExpired &&
                             creditCardExpiredBanner(setShowCreditCardBanner)}
diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.scss b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.scss
new file mode 100644
index 0000000000..f49b2f2ab7
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.scss
@@ -0,0 +1,28 @@
+@import 'utils/mixins';
+
+.ToPaidNudgeBanner {
+    &__actions {
+        padding-top: 12px;
+    }
+
+    &__primary {
+        font-size: 12px;
+
+        @include primary-button;
+
+        &:hover {
+            color: var(--button-color);
+        }
+    }
+
+    &__secondary {
+        margin-left: 4px;
+        font-size: 12px;
+
+        @include tertiary-button;
+
+        &:hover {
+            color: var(--button-bg);
+        }
+    }
+}
diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.test.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.test.tsx
new file mode 100644
index 0000000000..ee783bcaaf
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.test.tsx
@@ -0,0 +1,239 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {screen} from '@testing-library/react';
+
+import {renderWithIntlAndStore} from 'tests/react_testing_utils';
+import {CloudProducts} from 'utils/constants';
+
+import {ToPaidNudgeBanner, ToPaidPlanBannerDismissable} from './to_paid_plan_nudge_banner';
+
+const initialState = {
+    views: {
+        announcementBar: {
+            announcementBarState: {
+                announcementBarCount: 1,
+            },
+        },
+    },
+    entities: {
+        general: {
+            config: {
+                CWSURL: '',
+                FeatureFlagDeprecateCloudFree: 'true',
+            },
+            license: {
+                IsLicensed: 'true',
+                Cloud: 'true',
+            },
+        },
+        users: {
+            currentUserId: 'current_user_id',
+            profiles: {
+                current_user_id: {roles: 'system_user'},
+            },
+        },
+        preferences: {
+            myPreferences: {},
+        },
+        cloud: {},
+    },
+};
+
+describe('ToPaidPlanBannerDismissable', () => {
+    test('should only show for admins on cloud free', () => {
+        const state = JSON.parse(JSON.stringify(initialState));
+        state.entities.users.profiles = {
+            current_user_id: {roles: 'system_admin'},
+        };
+        state.entities.cloud = {
+            subscription: {
+                product_id: 'prod_starter',
+                is_free_trial: 'false',
+                trial_end_at: 1,
+            },
+            products: {
+                prod_starter: {
+                    id: 'prod_starter',
+                    sku: CloudProducts.STARTER,
+                },
+            },
+        };
+
+        renderWithIntlAndStore(<ToPaidPlanBannerDismissable/>, state);
+
+        screen.getByTestId('cloud-free-deprecation-announcement-bar');
+    });
+
+    test('should NOT show for NON admins', () => {
+        const state = JSON.parse(JSON.stringify(initialState));
+        state.entities.users.profiles = {
+            current_user_id: {roles: 'system_user'},
+        };
+        state.entities.cloud = {
+            subscription: {
+                product_id: 'prod_starter',
+                is_free_trial: 'false',
+                trial_end_at: 1,
+            },
+            products: {
+                prod_starter: {
+                    id: 'prod_starter',
+                    sku: CloudProducts.STARTER,
+                },
+            },
+        };
+
+        renderWithIntlAndStore(<ToPaidPlanBannerDismissable/>, state);
+
+        expect(() => screen.getByTestId('cloud-free-deprecation-announcement-bar')).toThrow();
+    });
+
+    test('should NOT show for admins on cloud pro', () => {
+        const state = JSON.parse(JSON.stringify(initialState));
+        state.entities.users.profiles = {
+            current_user_id: {roles: 'system_admin'},
+        };
+        state.entities.cloud = {
+            subscription: {
+                product_id: 'prod_pro',
+                is_free_trial: 'false',
+                trial_end_at: 1,
+            },
+            products: {
+                prod_pro: {
+                    id: 'prod_pro',
+                    sku: CloudProducts.PROFESSIONAL,
+                },
+            },
+        };
+
+        renderWithIntlAndStore(<ToPaidPlanBannerDismissable/>, state);
+
+        expect(() => screen.getByTestId('cloud-free-deprecation-announcement-bar')).toThrow();
+    });
+
+    test('should NOT show for admins on cloud enterprise', () => {
+        const state = JSON.parse(JSON.stringify(initialState));
+        state.entities.users.profiles = {
+            current_user_id: {roles: 'system_admin'},
+        };
+        state.entities.cloud = {
+            subscription: {
+                product_id: 'prod_enterprise',
+                is_free_trial: 'false',
+                trial_end_at: 1,
+            },
+            products: {
+                prod_enterprise: {
+                    id: 'prod_enterprise',
+                    sku: CloudProducts.ENTERPRISE,
+                },
+            },
+        };
+
+        renderWithIntlAndStore(<ToPaidPlanBannerDismissable/>, state);
+
+        expect(() => screen.getByTestId('cloud-free-deprecation-announcement-bar')).toThrow();
+    });
+
+    test('should NOT show for admins when banner was dismissed in preferences', () => {
+        const state = JSON.parse(JSON.stringify(initialState));
+        state.entities.users.profiles = {
+            current_user_id: {roles: 'system_admin'},
+        };
+        state.entities.preferences = {
+            myPreferences: {
+                'to_paid_plan_nudge--nudge_to_paid_plan_snoozed': {
+                    category: 'to_paid_plan_nudge',
+                    name: 'nudge_to_paid_plan_snoozed',
+                    value: '{"range": 0, "show": false}',
+                },
+            },
+        };
+
+        state.entities.cloud = {
+            subscription: {
+                product_id: 'prod_starter',
+                is_free_trial: 'false',
+                trial_end_at: 1,
+            },
+            products: {
+                prod_starter: {
+                    id: 'prod_starter',
+                    sku: CloudProducts.STARTER,
+                },
+            },
+        };
+
+        renderWithIntlAndStore(<ToPaidPlanBannerDismissable/>, state);
+
+        expect(() => screen.getByTestId('cloud-free-deprecation-announcement-bar')).toThrow();
+    });
+});
+
+describe('ToPaidNudgeBanner', () => {
+    test('should show only for cloud free', () => {
+        const state = JSON.parse(JSON.stringify(initialState));
+        state.entities.cloud = {
+            subscription: {
+                product_id: 'prod_starter',
+                is_free_trial: 'false',
+                trial_end_at: 1,
+            },
+            products: {
+                prod_starter: {
+                    id: 'prod_starter',
+                    sku: CloudProducts.STARTER,
+                },
+            },
+        };
+
+        renderWithIntlAndStore(<ToPaidNudgeBanner/>, state);
+
+        screen.getByTestId('cloud-free-deprecation-alert-banner');
+    });
+
+    test('should NOT show for cloud professional', () => {
+        const state = JSON.parse(JSON.stringify(initialState));
+        state.entities.cloud = {
+            subscription: {
+                product_id: 'prod_pro',
+                is_free_trial: 'false',
+                trial_end_at: 1,
+            },
+            products: {
+                prod_pro: {
+                    id: 'prod_pro',
+                    sku: CloudProducts.PROFESSIONAL,
+                },
+            },
+        };
+
+        renderWithIntlAndStore(<ToPaidNudgeBanner/>, state);
+
+        expect(() => screen.getByTestId('cloud-free-deprecation-alert-banner')).toThrow();
+    });
+
+    test('should NOT show for cloud enterprise', () => {
+        const state = JSON.parse(JSON.stringify(initialState));
+        state.entities.cloud = {
+            subscription: {
+                product_id: 'prod_ent',
+                is_free_trial: 'false',
+                trial_end_at: 1,
+            },
+            products: {
+                prod_ent: {
+                    id: 'prod_ent',
+                    sku: CloudProducts.ENTERPRISE,
+                },
+            },
+        };
+
+        renderWithIntlAndStore(<ToPaidNudgeBanner/>, state);
+
+        expect(() => screen.getByTestId('cloud-free-deprecation-alert-banner')).toThrow();
+    });
+});
diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.tsx
new file mode 100644
index 0000000000..06fda8eb9a
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.tsx
@@ -0,0 +1,246 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React, {useEffect} from 'react';
+import {useDispatch, useSelector} from 'react-redux';
+import {useIntl, FormattedMessage} from 'react-intl';
+import moment from 'moment';
+
+import AlertBanner from 'components/alert_banner';
+import useOpenPricingModal from 'components/common/hooks/useOpenPricingModal';
+import useOpenCloudPurchaseModal from 'components/common/hooks/useOpenCloudPurchaseModal';
+import useOpenSalesLink from 'components/common/hooks/useOpenSalesLink';
+import AnnouncementBar from 'components/announcement_bar/default_announcement_bar';
+
+import {getSubscriptionProduct as selectSubscriptionProduct} from 'mattermost-redux/selectors/entities/cloud';
+import {getCurrentUser, isCurrentUserSystemAdmin} from 'mattermost-redux/selectors/entities/users';
+import {savePreferences} from 'mattermost-redux/actions/preferences';
+import {deprecateCloudFree, get as getPreference} from 'mattermost-redux/selectors/entities/preferences';
+
+import {AnnouncementBarTypes, CloudBanners, CloudProducts, Preferences} from 'utils/constants';
+import {t} from 'utils/i18n';
+
+import {GlobalState} from '@mattermost/types/store';
+
+import './to_paid_plan_nudge_banner.scss';
+
+enum DismissShowRange {
+    GreaterThanEqual90 = '>=90',
+    BetweenNinetyAnd60 = '89-61',
+    SixtyTo31 = '60-31',
+    ThirtyTo11 = '30-11',
+    TenTo1 = '10-1',
+    Zero = '0'
+}
+
+const cloudFreeCloseMoment = '20230727';
+
+interface ToPaidPlanDismissPreference {
+
+    // range represents the range for the days to the deprecation of cloud free e.g. in 30 to 10 days to deprecate cloud free
+    // Incase of dismissing the banner, range represents the time (days) period when this banner was dismissed.
+    // This is important because in case the banner was dismissed for a certain period, it helps us know that we should not show it again for that period.
+    range: DismissShowRange;
+    show: boolean;
+}
+
+export const ToPaidPlanBannerDismissable = () => {
+    const dispatch = useDispatch();
+
+    const openPricingModal = useOpenPricingModal();
+
+    const currentUser = useSelector(getCurrentUser);
+    const isAdmin = useSelector(isCurrentUserSystemAdmin);
+    const product = useSelector(selectSubscriptionProduct);
+    const cloudFreeDeprecated = useSelector(deprecateCloudFree);
+    const currentProductStarter = product?.sku === CloudProducts.STARTER;
+
+    const now = moment(Date.now());
+    const cloudFreeEndDate = moment(cloudFreeCloseMoment, 'YYYYMMDD');
+    const daysToCloudFreeEnd = cloudFreeEndDate.diff(now, 'days');
+
+    const snoozePreferenceVal = useSelector((state: GlobalState) => getPreference(state, Preferences.TO_PAID_PLAN_NUDGE, CloudBanners.NUDGE_TO_PAID_PLAN_SNOOZED, '{"range": 0, "show": true}'));
+    const snoozeInfo = JSON.parse(snoozePreferenceVal) as ToPaidPlanDismissPreference;
+    const show = snoozeInfo.show;
+
+    const snoozedForRange = (range: DismissShowRange) => {
+        return snoozeInfo.range === range;
+    };
+
+    useEffect(() => {
+        if (!snoozeInfo.show) {
+            if (daysToCloudFreeEnd >= 90 && !snoozedForRange(DismissShowRange.GreaterThanEqual90)) {
+                showBanner(true);
+            }
+
+            if (daysToCloudFreeEnd < 90 && daysToCloudFreeEnd > 60 && !snoozedForRange(DismissShowRange.BetweenNinetyAnd60)) {
+                showBanner(true);
+            }
+
+            if (daysToCloudFreeEnd <= 60 && daysToCloudFreeEnd > 30 && !snoozedForRange(DismissShowRange.SixtyTo31)) {
+                showBanner(true);
+            }
+
+            if (daysToCloudFreeEnd <= 30 && daysToCloudFreeEnd > 10 && !snoozedForRange(DismissShowRange.ThirtyTo11)) {
+                showBanner(true);
+            }
+
+            if (daysToCloudFreeEnd <= 10) {
+                showBanner(true);
+            }
+        }
+    }, []);
+
+    const showBanner = (show = false) => {
+        let dRange = DismissShowRange.Zero;
+        if (daysToCloudFreeEnd >= 90) {
+            dRange = DismissShowRange.GreaterThanEqual90;
+        }
+
+        if (daysToCloudFreeEnd < 90 && daysToCloudFreeEnd > 60) {
+            dRange = DismissShowRange.BetweenNinetyAnd60;
+        }
+
+        if (daysToCloudFreeEnd <= 60 && daysToCloudFreeEnd > 30) {
+            dRange = DismissShowRange.SixtyTo31;
+        }
+
+        if (daysToCloudFreeEnd <= 30 && daysToCloudFreeEnd > 10) {
+            dRange = DismissShowRange.ThirtyTo11;
+        }
+
+        // ideally this case should not happen because snooze button is not shown when TenTo1 days are remaining
+        if (daysToCloudFreeEnd <= 10 && daysToCloudFreeEnd > 0) {
+            dRange = DismissShowRange.TenTo1;
+        }
+
+        const snoozeInfo: ToPaidPlanDismissPreference = {
+            range: dRange,
+            show,
+        };
+
+        dispatch(savePreferences(currentUser.id, [{
+            category: Preferences.TO_PAID_PLAN_NUDGE,
+            name: CloudBanners.NUDGE_TO_PAID_PLAN_SNOOZED,
+            user_id: currentUser.id,
+            value: JSON.stringify(snoozeInfo),
+        }]));
+    };
+
+    if (!cloudFreeDeprecated) {
+        return null;
+    }
+
+    if (!show) {
+        return null;
+    }
+
+    if (!isAdmin) {
+        return null;
+    }
+
+    if (!currentProductStarter) {
+        return null;
+    }
+
+    let message = {
+        id: 'cloud_billing.nudge_to_paid.announcement_bar',
+        defaultMessage: 'Cloud Free will be deprecated on {date}. To keep your workspace, upgrade to a paid plan',
+        values: {
+            date: moment(cloudFreeCloseMoment, 'YYYYMMDD').format('MMMM DD, YYYY'),
+        },
+    };
+
+    if (daysToCloudFreeEnd < 0) {
+        message = {
+            id: 'cloud_billing.nudge_to_paid.announcement_bar_deprecated',
+            defaultMessage: 'Cloud Free was deprecated. To keep your workspace, upgrade to a paid plan',
+        } as any;
+    }
+
+    const announcementType = (daysToCloudFreeEnd <= 10) ? AnnouncementBarTypes.CRITICAL : AnnouncementBarTypes.ANNOUNCEMENT;
+
+    return (
+        <AnnouncementBar
+            id='cloud-free-deprecation-announcement-bar'
+            type={announcementType}
+            showCloseButton={daysToCloudFreeEnd > 10}
+            onButtonClick={openPricingModal}
+            modalButtonText={t('cloud_billing.nudge_to_paid.view_plans')}
+            modalButtonDefaultText='View plans'
+            message={<FormattedMessage {...message}/>}
+            showLinkAsButton={true}
+            handleClose={showBanner}
+        />
+    );
+};
+
+export const ToPaidNudgeBanner = () => {
+    const {formatMessage} = useIntl();
+
+    const [openSalesLink] = useOpenSalesLink();
+    const openPurchaseModal = useOpenCloudPurchaseModal({});
+
+    const product = useSelector(selectSubscriptionProduct);
+    const cloudFreeDeprecated = useSelector(deprecateCloudFree);
+    const currentProductStarter = product?.sku === CloudProducts.STARTER;
+
+    if (!cloudFreeDeprecated) {
+        return null;
+    }
+
+    if (!currentProductStarter) {
+        return null;
+    }
+
+    const now = moment(Date.now());
+    const cloudFreeEndDate = moment(cloudFreeCloseMoment, 'YYYYMMDD');
+    const daysToCloudFreeEnd = cloudFreeEndDate.diff(now, 'days');
+
+    const title = (
+        <FormattedMessage
+            id='cloud_billing.nudge_to_paid.title'
+            defaultMessage='Upgrade to paid plan to keep your workspace'
+        />
+    );
+
+    const description = (
+        <FormattedMessage
+            id='cloud_billing.nudge_to_paid.description'
+            defaultMessage='Cloud Free will be deprecated in {days} days. Upgrade to a paid plan or contact sales.'
+            values={{days: daysToCloudFreeEnd < 0 ? 0 : daysToCloudFreeEnd}}
+        />
+    );
+
+    const viewPlansAction = (
+        <button
+            onClick={() => openPurchaseModal({trackingLocation: 'to_paid_plan_nudge_banner'})}
+            className='btn ToPaidNudgeBanner__primary'
+        >
+            {formatMessage({id: 'cloud_billing.nudge_to_paid.learn_more', defaultMessage: 'Upgrade'})}
+        </button>
+    );
+
+    const contactSalesAction = (
+        <button
+            onClick={openSalesLink}
+            className='btn ToPaidNudgeBanner__secondary'
+        >
+            {formatMessage({id: 'cloud_billing.nudge_to_paid.contact_sales', defaultMessage: 'Contact sales'})}
+        </button>
+    );
+
+    const bannerMode = (daysToCloudFreeEnd <= 10) ? 'danger' : 'info';
+
+    return (
+        <AlertBanner
+            id='cloud-free-deprecation-alert-banner'
+            mode={bannerMode}
+            title={title}
+            message={description}
+            className='ToYearlyNudgeBanner'
+            actionButtonLeft={viewPlansAction}
+            actionButtonRight={contactSalesAction}
+        />
+    );
+};
diff --git a/webapp/channels/src/components/alert_banner.tsx b/webapp/channels/src/components/alert_banner.tsx
index ebd3adaae8..b091a555ec 100644
--- a/webapp/channels/src/components/alert_banner.tsx
+++ b/webapp/channels/src/components/alert_banner.tsx
@@ -21,6 +21,7 @@ import './alert_banner.scss';
 export type ModeType = 'danger' | 'warning' | 'info' | 'success';
 
 export type AlertBannerProps = {
+    id?: string;
     mode: ModeType;
     title?: React.ReactNode;
     message?: React.ReactNode;
@@ -35,6 +36,7 @@ export type AlertBannerProps = {
 }
 
 const AlertBanner = ({
+    id,
     mode,
     title,
     message,
@@ -70,6 +72,7 @@ const AlertBanner = ({
 
     return (
         <div
+            data-testid={id}
             className={classNames(
                 'AlertBanner',
                 mode,
diff --git a/webapp/channels/src/components/announcement_bar/announcement_bar_controller.tsx b/webapp/channels/src/components/announcement_bar/announcement_bar_controller.tsx
index 4285704544..ea14eaa5b1 100644
--- a/webapp/channels/src/components/announcement_bar/announcement_bar_controller.tsx
+++ b/webapp/channels/src/components/announcement_bar/announcement_bar_controller.tsx
@@ -4,6 +4,7 @@
 import React from 'react';
 
 import {ToYearlyNudgeBannerDismissable} from 'components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner';
+import {ToPaidPlanBannerDismissable} from 'components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner';
 
 import {ClientLicense, ClientConfig, WarnMetricStatus} from '@mattermost/types/config';
 import withGetCloudSubscription from '../common/hocs/cloud/with_get_cloud_subscription';
@@ -72,6 +73,7 @@ class AnnouncementBarController extends React.PureComponent<Props> {
         let cloudDelinquencyAnnouncementBar = null;
         let notifyAdminDowngradeDelinquencyBar = null;
         let toYearlyNudgeBannerDismissable = null;
+        let toPaidPlanNudgeBannerDismissable = null;
         if (this.props.license?.Cloud === 'true') {
             paymentAnnouncementBar = (
                 <PaymentAnnouncementBar/>
@@ -89,6 +91,7 @@ class AnnouncementBarController extends React.PureComponent<Props> {
                 <NotifyAdminDowngradeDelinquencyBar/>
             );
             toYearlyNudgeBannerDismissable = (<ToYearlyNudgeBannerDismissable/>);
+            toPaidPlanNudgeBannerDismissable = (<ToPaidPlanBannerDismissable/>);
         }
 
         let autoStartTrialModal = null;
@@ -108,6 +111,7 @@ class AnnouncementBarController extends React.PureComponent<Props> {
                 {cloudDelinquencyAnnouncementBar}
                 {notifyAdminDowngradeDelinquencyBar}
                 {toYearlyNudgeBannerDismissable}
+                {toPaidPlanNudgeBannerDismissable}
                 {this.props.license?.Cloud !== 'true' && <OverageUsersBanner/>}
                 {autoStartTrialModal}
                 <ShowThreeDaysLeftTrialModal/>
diff --git a/webapp/channels/src/components/announcement_bar/default_announcement_bar/announcement_bar.tsx b/webapp/channels/src/components/announcement_bar/default_announcement_bar/announcement_bar.tsx
index a911ad0561..f93791291a 100644
--- a/webapp/channels/src/components/announcement_bar/default_announcement_bar/announcement_bar.tsx
+++ b/webapp/channels/src/components/announcement_bar/default_announcement_bar/announcement_bar.tsx
@@ -19,6 +19,7 @@ import ToggleModalButton from 'components/toggle_modal_button';
 import {trackEvent} from 'actions/telemetry_actions.jsx';
 
 type Props = {
+    id?: string;
     showCloseButton: boolean;
     color: string;
     textColor: string;
@@ -172,6 +173,7 @@ export default class AnnouncementBar extends React.PureComponent<Props, State> {
                 style={barStyle}
                 // eslint-disable-next-line react/no-unknown-property
                 css={{gridArea: 'announcement'}}
+                data-testid={this.props.id}
             >
                 <OverlayTrigger
                     delayShow={Constants.OVERLAY_TIME_DELAY}
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index bd5ed43317..607a41dfb8 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -3031,6 +3031,11 @@
   "cloud_archived.error.access": "Permalink belongs to a message that has been archived because of {planName} limits. Upgrade to access message again.",
   "cloud_archived.error.title": "Message Archived",
   "cloud_billing_history_modal.title": "Invoice(s)",
+  "cloud_billing.nudge_to_paid.contact_sales": "Contact sales",
+  "cloud_billing.nudge_to_paid.description": "Cloud Free will be deprecated in {days} days. Upgrade to a paid plan or contact sales.",
+  "cloud_billing.nudge_to_paid.learn_more": "Upgrade",
+  "cloud_billing.nudge_to_paid.title": "Upgrade to paid plan to keep your workspace",
+  "cloud_billing.nudge_to_paid.view_plans": "View plans",
   "cloud_billing.nudge_to_yearly.contact_sales": "Contact sales",
   "cloud_billing.nudge_to_yearly.description": "Simplify your billing by switching to an annual subscription.",
   "cloud_billing.nudge_to_yearly.learn_more": "Learn more",
diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/preferences.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/preferences.ts
index fa0149a93c..2ef11c99d3 100644
--- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/preferences.ts
+++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/preferences.ts
@@ -300,6 +300,10 @@ export function onboardingTourTipsEnabled(state: GlobalState): boolean {
     return getFeatureFlagValue(state, 'OnboardingTourTips') === 'true';
 }
 
+export function deprecateCloudFree(state: GlobalState): boolean {
+    return getFeatureFlagValue(state, 'DeprecateCloudFree') === 'true';
+}
+
 export function appsSidebarCategoryEnabled(state: GlobalState): boolean {
     return getFeatureFlagValue(state, 'AppsSidebarCategory') === 'true';
 }
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index d7e4644af2..58627a21ae 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -158,6 +158,7 @@ export const Preferences = {
     NOTIFY_ADMIN_REVOKE_DOWNGRADED_WORKSPACE: 'admin_revoke_downgraded_instance',
     OVERAGE_USERS_BANNER: 'overage_users_banner',
     CLOUD_YEARLY_NUDGE_BANNER: 'cloud_yearly_nudge_banner',
+    TO_PAID_PLAN_NUDGE: 'to_paid_plan_nudge',
 };
 
 // For one off things that have a special, attention-grabbing UI until you interact with them
@@ -726,6 +727,7 @@ export const CloudBanners = {
     UPGRADE_FROM_TRIAL: 'upgrade_from_trial',
     THREE_DAYS_LEFT_TRIAL_MODAL_DISMISSED: 'dismiss_3_days_left_trial_modal',
     NUDGE_TO_YEARLY_BANNER_DISMISSED: 'nudge_to_yearly_banner_dismissed',
+    NUDGE_TO_PAID_PLAN_SNOOZED: 'nudge_to_paid_plan_snoozed',
 };
 
 export const ConfigurationBanners = {

From c3e69e97e47f69f61fb603586091420854d166f1 Mon Sep 17 00:00:00 2001
From: Ashish Dhama <16203333+AshishDhama@users.noreply.github.com>
Date: Wed, 12 Apr 2023 21:39:49 +0530
Subject: [PATCH 033/103] [MM-51445] Replace compass-components icon component
 with compass icons (#22527)

* Replace compass-components icon component with compass-icons
---
 .../activity_and_insights_link.tsx            |   8 +-
 .../app_bar/app_bar_marketplace.tsx           |   9 +-
 .../product_branding.test.tsx.snap            |  15 +--
 .../product_branding.test.tsx                 |   4 -
 .../product_branding/product_branding.tsx     |   9 +-
 .../product_menu_item/product_menu_item.tsx   |  56 +++++-----
 .../product_menu_list.test.tsx.snap           | 105 +++++++-----------
 .../product_menu_list/product_menu_list.tsx   |  52 +++------
 .../post_edited_indicator.tsx                 |   8 +-
 webapp/channels/src/types/store/plugins.ts    |   6 +-
 10 files changed, 103 insertions(+), 169 deletions(-)

diff --git a/webapp/channels/src/components/activity_and_insights/activity_and_insights_link/activity_and_insights_link.tsx b/webapp/channels/src/components/activity_and_insights/activity_and_insights_link/activity_and_insights_link.tsx
index 3f9ff03968..04293386d6 100644
--- a/webapp/channels/src/components/activity_and_insights/activity_and_insights_link/activity_and_insights_link.tsx
+++ b/webapp/channels/src/components/activity_and_insights/activity_and_insights_link/activity_and_insights_link.tsx
@@ -6,8 +6,7 @@ import {Link, useRouteMatch, useLocation, matchPath} from 'react-router-dom';
 import {useIntl} from 'react-intl';
 import {useDispatch, useSelector} from 'react-redux';
 import classNames from 'classnames';
-import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports
-
+import {ChartLineIcon} from '@mattermost/compass-icons/components';
 import {insightsAreEnabled} from 'mattermost-redux/selectors/entities/preferences';
 import {getIsRhsOpen, getRhsState} from 'selectors/rhs';
 
@@ -62,10 +61,7 @@ const ActivityAndInsightsLink = () => {
                     tabIndex={0}
                 >
                     <span className='icon'>
-                        <Icon
-                            size={12}
-                            glyph={'chart-line'}
-                        />
+                        <ChartLineIcon size={14}/>
                     </span>
                     <div className='SidebarChannelLinkLabel_wrapper'>
                         <span className='SidebarChannelLinkLabel sidebar-item__name'>
diff --git a/webapp/channels/src/components/app_bar/app_bar_marketplace.tsx b/webapp/channels/src/components/app_bar/app_bar_marketplace.tsx
index 457a1b83e2..1bbfe5cafe 100644
--- a/webapp/channels/src/components/app_bar/app_bar_marketplace.tsx
+++ b/webapp/channels/src/components/app_bar/app_bar_marketplace.tsx
@@ -5,15 +5,13 @@ import React, {useCallback} from 'react';
 import {useDispatch} from 'react-redux';
 import {useIntl} from 'react-intl';
 import {Tooltip} from 'react-bootstrap';
-
-import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports
-
 import {openModal} from 'actions/views/modals';
 
 import MarketplaceModal from 'components/plugin_marketplace/marketplace_modal';
 import OverlayTrigger from 'components/overlay_trigger';
 
 import {Constants, ModalIdentifiers} from 'utils/constants';
+import {ViewGridPlusOutlineIcon} from '@mattermost/compass-icons/components';
 
 const AppBarMarketplace = () => {
     const {formatMessage} = useIntl();
@@ -48,10 +46,7 @@ const AppBarMarketplace = () => {
                 aria-label={label}
                 onClick={handleOpenMarketplace}
             >
-                <Icon
-                    size={16}
-                    glyph={'view-grid-plus-outline'}
-                />
+                <ViewGridPlusOutlineIcon size={18}/>
             </button>
         </OverlayTrigger>
     );
diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/__snapshots__/product_branding.test.tsx.snap b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/__snapshots__/product_branding.test.tsx.snap
index b0df6be075..8892eb2521 100644
--- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/__snapshots__/product_branding.test.tsx.snap
+++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/__snapshots__/product_branding.test.tsx.snap
@@ -4,9 +4,8 @@ exports[`components/ProductBranding should show correct icon glyph when we are o
 <ProductBrandingContainer
   tabIndex={0}
 >
-  <Icon
-    glyph="product-boards"
-    size={20}
+  <ProductBoardsIcon
+    size={24}
   />
   <Heading
     element="h1"
@@ -22,9 +21,8 @@ exports[`components/ProductBranding should show correct icon glyph when we are o
 <ProductBrandingContainer
   tabIndex={0}
 >
-  <Icon
-    glyph="product-channels"
-    size={20}
+  <ProductChannelsIcon
+    size={24}
   />
   <Heading
     element="h1"
@@ -40,9 +38,8 @@ exports[`components/ProductBranding should show correct icon glyph when we are o
 <ProductBrandingContainer
   tabIndex={0}
 >
-  <Icon
-    glyph="product-playbooks"
-    size={20}
+  <ProductPlaybooksIcon
+    size={24}
   />
   <Heading
     element="h1"
diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.test.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.test.tsx
index e29079c6c4..51912dbceb 100644
--- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.test.tsx
+++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.test.tsx
@@ -3,7 +3,6 @@
 
 import React from 'react';
 import {shallow} from 'enzyme';
-import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports
 
 import {TopLevelProducts} from 'utils/constants';
 
@@ -21,7 +20,6 @@ describe('components/ProductBranding', () => {
             <ProductBranding/>,
         );
 
-        expect(wrapper.find(Icon).prop('glyph')).toEqual('product-channels');
         expect(wrapper).toMatchSnapshot();
     });
 
@@ -32,7 +30,6 @@ describe('components/ProductBranding', () => {
             <ProductBranding/>,
         );
 
-        expect(wrapper.find(Icon).prop('glyph')).toEqual('product-playbooks');
         expect(wrapper).toMatchSnapshot();
     });
 
@@ -44,7 +41,6 @@ describe('components/ProductBranding', () => {
             <ProductBranding/>,
         );
 
-        expect(wrapper.find(Icon).prop('glyph')).toEqual('product-boards');
         expect(wrapper).toMatchSnapshot();
     });
 });
diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.tsx
index 628e26b3d7..c95f8e4f03 100644
--- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.tsx
+++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports
+import glyphMap, {ProductChannelsIcon} from '@mattermost/compass-icons/components';
 import Heading from '@mattermost/compass-components/components/heading'; // eslint-disable-line no-restricted-imports
 
 import {useCurrentProduct} from 'utils/products';
@@ -20,12 +20,11 @@ const ProductBrandingContainer = styled.div`
 const ProductBranding = (): JSX.Element => {
     const currentProduct = useCurrentProduct();
 
+    const Icon = currentProduct?.switcherIcon ? glyphMap[currentProduct.switcherIcon] : ProductChannelsIcon;
+
     return (
         <ProductBrandingContainer tabIndex={0}>
-            <Icon
-                size={20}
-                glyph={currentProduct && typeof currentProduct.switcherIcon === 'string' ? currentProduct.switcherIcon : 'product-channels'}
-            />
+            <Icon size={24}/>
             <Heading
                 element='h1'
                 size={200}
diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_item/product_menu_item.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_item/product_menu_item.tsx
index 99223e409f..fb25f3c3e6 100644
--- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_item/product_menu_item.tsx
+++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_item/product_menu_item.tsx
@@ -7,11 +7,11 @@ import {Link} from 'react-router-dom';
 
 import styled from 'styled-components';
 
-import Icon, {TIconGlyph} from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports
-
+import {IconGlyphTypes} from '@mattermost/compass-icons/IconGlyphs';
+import glyphMap, {CheckIcon} from '@mattermost/compass-icons/components';
 export interface ProductMenuItemProps {
     destination: string;
-    icon: TIconGlyph;
+    icon: IconGlyphTypes;
     text: React.ReactNode;
     active: boolean;
     onClick: () => void;
@@ -46,10 +46,6 @@ const MenuItem = styled(Link)`
     }
 `;
 
-const StyledIcon = styled(Icon)`
-    color: var(--button-bg);
-`;
-
 const MenuItemTextContainer = styled.div`
     margin-left: 8px;
     flex-grow: 1;
@@ -58,27 +54,31 @@ const MenuItemTextContainer = styled.div`
     line-height: 20px;
 `;
 
-const ProductMenuItem = ({icon, destination, text, active, onClick, tourTip, id}: ProductMenuItemProps): JSX.Element => (
-    <MenuItem
-        to={destination}
-        onClick={onClick}
-        id={id}
-    >
-        <StyledIcon
-            size={20}
-            glyph={icon || 'none'}
-        />
-        <MenuItemTextContainer>
-            {text}
-        </MenuItemTextContainer>
-        {active && (
-            <StyledIcon
-                size={16}
-                glyph='check'
+const ProductMenuItem = ({icon, destination, text, active, onClick, tourTip, id}: ProductMenuItemProps): JSX.Element => {
+    const ProductIcon = glyphMap[icon];
+
+    return (
+        <MenuItem
+            to={destination}
+            onClick={onClick}
+            id={id}
+        >
+            <ProductIcon
+                size={24}
+                color={'var(--button-bg)'}
             />
-        )}
-        {tourTip || null}
-    </MenuItem>
-);
+            <MenuItemTextContainer>
+                {text}
+            </MenuItemTextContainer>
+            {active && (
+                <CheckIcon
+                    size={18}
+                    color={'var(--button-bg)'}
+                />
+            )}
+            {tourTip || null}
+        </MenuItem>
+    );
+};
 
 export default ProductMenuItem;
diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/__snapshots__/product_menu_list.test.tsx.snap b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/__snapshots__/product_menu_list.test.tsx.snap
index d9fa569664..06e734c14b 100644
--- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/__snapshots__/product_menu_list.test.tsx.snap
+++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/__snapshots__/product_menu_list.test.tsx.snap
@@ -84,9 +84,8 @@ exports[`components/global/product_switcher_menu should match snapshot with id 1
     >
       <MenuItemLink
         icon={
-          <Icon
-            glyph="application-cog"
-            size={16}
+          <ApplicationCogIcon
+            size={18}
           />
         }
         id="systemConsole"
@@ -101,9 +100,8 @@ exports[`components/global/product_switcher_menu should match snapshot with id 1
     </Connect(SystemPermissionGate)>
     <MenuItemLink
       icon={
-        <Icon
-          glyph="webhook-incoming"
-          size={16}
+        <WebhookIncomingIcon
+          size={18}
         />
       }
       id="integrations"
@@ -127,9 +125,8 @@ exports[`components/global/product_switcher_menu should match snapshot with id 1
       }
       disabled={false}
       icon={
-        <Icon
-          glyph="account-multiple-outline"
-          size={16}
+        <AccountMultipleOutlineIcon
+          size={18}
         />
       }
       id="userGroups"
@@ -154,9 +151,8 @@ exports[`components/global/product_switcher_menu should match snapshot with id 1
         }
         dialogType={[Function]}
         icon={
-          <Icon
-            glyph="view-grid-plus-outline"
-            size={16}
+          <ViewGridPlusOutlineIcon
+            size={18}
           />
         }
         id="marketplaceModal"
@@ -167,9 +163,8 @@ exports[`components/global/product_switcher_menu should match snapshot with id 1
     </Connect(TeamPermissionGate)>
     <MenuItemExternalLink
       icon={
-        <Icon
-          glyph="download-outline"
-          size={16}
+        <DownloadOutlineIcon
+          size={18}
         />
       }
       id="nativeAppLink"
@@ -187,9 +182,8 @@ exports[`components/global/product_switcher_menu should match snapshot with id 1
         }
       }
       icon={
-        <Icon
-          glyph="information-outline"
-          size={16}
+        <InformationOutlineIcon
+          size={18}
         />
       }
       id="about"
@@ -285,9 +279,8 @@ exports[`components/global/product_switcher_menu should match snapshot with most
     >
       <MenuItemLink
         icon={
-          <Icon
-            glyph="application-cog"
-            size={16}
+          <ApplicationCogIcon
+            size={18}
           />
         }
         id="systemConsole"
@@ -302,9 +295,8 @@ exports[`components/global/product_switcher_menu should match snapshot with most
     </Connect(SystemPermissionGate)>
     <MenuItemLink
       icon={
-        <Icon
-          glyph="webhook-incoming"
-          size={16}
+        <WebhookIncomingIcon
+          size={18}
         />
       }
       id="integrations"
@@ -328,9 +320,8 @@ exports[`components/global/product_switcher_menu should match snapshot with most
       }
       disabled={false}
       icon={
-        <Icon
-          glyph="account-multiple-outline"
-          size={16}
+        <AccountMultipleOutlineIcon
+          size={18}
         />
       }
       id="userGroups"
@@ -355,9 +346,8 @@ exports[`components/global/product_switcher_menu should match snapshot with most
         }
         dialogType={[Function]}
         icon={
-          <Icon
-            glyph="view-grid-plus-outline"
-            size={16}
+          <ViewGridPlusOutlineIcon
+            size={18}
           />
         }
         id="marketplaceModal"
@@ -368,9 +358,8 @@ exports[`components/global/product_switcher_menu should match snapshot with most
     </Connect(TeamPermissionGate)>
     <MenuItemExternalLink
       icon={
-        <Icon
-          glyph="download-outline"
-          size={16}
+        <DownloadOutlineIcon
+          size={18}
         />
       }
       id="nativeAppLink"
@@ -388,9 +377,8 @@ exports[`components/global/product_switcher_menu should match snapshot with most
         }
       }
       icon={
-        <Icon
-          glyph="information-outline"
-          size={16}
+        <InformationOutlineIcon
+          size={18}
         />
       }
       id="about"
@@ -419,9 +407,8 @@ exports[`components/global/product_switcher_menu should match userGroups snapsho
   }
   disabled={false}
   icon={
-    <Icon
-      glyph="account-multiple-outline"
-      size={16}
+    <AccountMultipleOutlineIcon
+      size={18}
     />
   }
   id="userGroups"
@@ -449,9 +436,8 @@ exports[`components/global/product_switcher_menu should match userGroups snapsho
   }
   disabled={true}
   icon={
-    <Icon
-      glyph="account-multiple-outline"
-      size={16}
+    <AccountMultipleOutlineIcon
+      size={18}
     />
   }
   id="userGroups"
@@ -492,9 +478,8 @@ exports[`components/global/product_switcher_menu should match userGroups snapsho
   }
   disabled={false}
   icon={
-    <Icon
-      glyph="account-multiple-outline"
-      size={16}
+    <AccountMultipleOutlineIcon
+      size={18}
     />
   }
   id="userGroups"
@@ -606,9 +591,8 @@ exports[`components/global/product_switcher_menu should show integrations should
     >
       <MenuItemLink
         icon={
-          <Icon
-            glyph="application-cog"
-            size={16}
+          <ApplicationCogIcon
+            size={18}
           />
         }
         id="systemConsole"
@@ -623,9 +607,8 @@ exports[`components/global/product_switcher_menu should show integrations should
     </Connect(SystemPermissionGate)>
     <MenuItemLink
       icon={
-        <Icon
-          glyph="webhook-incoming"
-          size={16}
+        <WebhookIncomingIcon
+          size={18}
         />
       }
       id="integrations"
@@ -649,9 +632,8 @@ exports[`components/global/product_switcher_menu should show integrations should
       }
       disabled={false}
       icon={
-        <Icon
-          glyph="account-multiple-outline"
-          size={16}
+        <AccountMultipleOutlineIcon
+          size={18}
         />
       }
       id="userGroups"
@@ -676,9 +658,8 @@ exports[`components/global/product_switcher_menu should show integrations should
         }
         dialogType={[Function]}
         icon={
-          <Icon
-            glyph="view-grid-plus-outline"
-            size={16}
+          <ViewGridPlusOutlineIcon
+            size={18}
           />
         }
         id="marketplaceModal"
@@ -689,9 +670,8 @@ exports[`components/global/product_switcher_menu should show integrations should
     </Connect(TeamPermissionGate)>
     <MenuItemExternalLink
       icon={
-        <Icon
-          glyph="download-outline"
-          size={16}
+        <DownloadOutlineIcon
+          size={18}
         />
       }
       id="nativeAppLink"
@@ -709,9 +689,8 @@ exports[`components/global/product_switcher_menu should show integrations should
         }
       }
       icon={
-        <Icon
-          glyph="information-outline"
-          size={16}
+        <InformationOutlineIcon
+          size={18}
         />
       }
       id="about"
diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/product_menu_list.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/product_menu_list.tsx
index 13804b0b16..6c9cf91f47 100644
--- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/product_menu_list.tsx
+++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/product_menu_list.tsx
@@ -3,8 +3,14 @@
 
 import React, {useEffect} from 'react';
 import {useIntl} from 'react-intl';
-
-import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports
+import {
+    AccountMultipleOutlineIcon,
+    ApplicationCogIcon,
+    DownloadOutlineIcon,
+    InformationOutlineIcon,
+    ViewGridPlusOutlineIcon,
+    WebhookIncomingIcon,
+} from '@mattermost/compass-icons/components';
 
 import {Permissions} from 'mattermost-redux/constants';
 
@@ -128,12 +134,7 @@ const ProductMenuList = (props: Props): JSX.Element | null => {
                                 )}
                             </>
                         )}
-                        icon={
-                            <Icon
-                                size={16}
-                                glyph={'application-cog'}
-                            />
-                        }
+                        icon={<ApplicationCogIcon size={18}/>}
                     />
                 </SystemPermissionGate>
                 <Menu.ItemLink
@@ -141,12 +142,7 @@ const ProductMenuList = (props: Props): JSX.Element | null => {
                     show={isMessaging && showIntegrations}
                     to={'/' + teamName + '/integrations'}
                     text={formatMessage({id: 'navbar_dropdown.integrations', defaultMessage: 'Integrations'})}
-                    icon={
-                        <Icon
-                            size={16}
-                            glyph={'webhook-incoming'}
-                        />
-                    }
+                    icon={<WebhookIncomingIcon size={18}/>}
                 />
                 <Menu.ItemToggleModalRedux
                     id='userGroups'
@@ -157,12 +153,7 @@ const ProductMenuList = (props: Props): JSX.Element | null => {
                         backButtonAction: openGroupsModal,
                     }}
                     text={formatMessage({id: 'navbar_dropdown.userGroups', defaultMessage: 'User Groups'})}
-                    icon={
-                        <Icon
-                            size={16}
-                            glyph={'account-multiple-outline'}
-                        />
-                    }
+                    icon={<AccountMultipleOutlineIcon size={18}/>}
                     disabled={isStarterFree}
                     sibling={(isStarterFree || isFreeTrial) && (
                         <RestrictedIndicator
@@ -215,12 +206,7 @@ const ProductMenuList = (props: Props): JSX.Element | null => {
                         dialogType={MarketplaceModal}
                         dialogProps={{openedFrom: 'product_menu'}}
                         text={formatMessage({id: 'navbar_dropdown.marketplace', defaultMessage: 'App Marketplace'})}
-                        icon={
-                            <Icon
-                                size={16}
-                                glyph='view-grid-plus-outline'
-                            />
-                        }
+                        icon={<ViewGridPlusOutlineIcon size={18}/>}
                     />
                 </TeamPermissionGate>
                 <Menu.ItemExternalLink
@@ -228,24 +214,14 @@ const ProductMenuList = (props: Props): JSX.Element | null => {
                     show={appDownloadLink && !UserAgent.isMobileApp()}
                     url={makeUrlSafe(appDownloadLink)}
                     text={formatMessage({id: 'navbar_dropdown.nativeApps', defaultMessage: 'Download Apps'})}
-                    icon={
-                        <Icon
-                            size={16}
-                            glyph={'download-outline'}
-                        />
-                    }
+                    icon={<DownloadOutlineIcon size={18}/>}
                 />
                 <Menu.ItemToggleModalRedux
                     id='about'
                     modalId={ModalIdentifiers.ABOUT}
                     dialogType={AboutBuildModal}
                     text={formatMessage({id: 'navbar_dropdown.about', defaultMessage: 'About {appTitle}'}, {appTitle: siteName})}
-                    icon={
-                        <Icon
-                            size={16}
-                            glyph={'information-outline'}
-                        />
-                    }
+                    icon={<InformationOutlineIcon size={18}/>}
                 />
             </div>
         </Menu.Group>
diff --git a/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx b/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx
index c4a337fb98..8d6f52bcc4 100644
--- a/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx
+++ b/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx
@@ -3,11 +3,12 @@
 
 import React, {MouseEvent} from 'react';
 import {useIntl} from 'react-intl';
-import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports
 
 import {getDateForTimezone} from 'mattermost-redux/utils/timezone_utils';
 import {isSameDay, isWithinLastWeek, isYesterday} from 'utils/datetime';
 
+import {PencilOutlineIcon} from '@mattermost/compass-icons/components';
+
 import OverlayTrigger from '../../overlay_trigger';
 import Tooltip from '../../tooltip';
 
@@ -87,10 +88,7 @@ const PostEditedIndicator = ({postId, isMilitaryTime, timeZone, editedAt = 0, po
             data-post-id={postId}
             data-edited-at={editedAt}
         >
-            <Icon
-                glyph={'pencil-outline'}
-                size={10}
-            />
+            <PencilOutlineIcon size={12}/>
             {editedText}
         </span>
     );
diff --git a/webapp/channels/src/types/store/plugins.ts b/webapp/channels/src/types/store/plugins.ts
index ba2c17594e..cffffb5fcd 100644
--- a/webapp/channels/src/types/store/plugins.ts
+++ b/webapp/channels/src/types/store/plugins.ts
@@ -2,9 +2,6 @@
 // See LICENSE.txt for license information.
 
 import React from 'react';
-
-import {TIconGlyph} from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports
-
 import {ProductScope} from '@mattermost/types/products';
 
 import {ClientPluginManifest} from '@mattermost/types/plugins';
@@ -13,6 +10,7 @@ import {FileInfo} from '@mattermost/types/files';
 import {Post, PostEmbed} from '@mattermost/types/posts';
 import {IDMappedObjects} from '@mattermost/types/utilities';
 import {TopBoardResponse} from '@mattermost/types/insights';
+import {IconGlyphTypes} from '@mattermost/compass-icons/IconGlyphs';
 
 import {WebSocketClient} from '@mattermost/client';
 
@@ -165,7 +163,7 @@ export type ProductComponent = {
     /**
      * A compass-icon glyph to display as the icon in the product switcher
      */
-    switcherIcon: TIconGlyph;
+    switcherIcon: IconGlyphTypes;
 
     /**
      * A string or React element to display in the product switcher

From eebd57ead11a89a2327ec747b0a09d41afe4a86a Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Wed, 12 Apr 2023 15:06:55 -0400
Subject: [PATCH 034/103] Add ok response code to hopefully fix tests.

---
 server/channels/api4/license.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go
index abbdf8bcfb..a1b7806dbf 100644
--- a/server/channels/api4/license.go
+++ b/server/channels/api4/license.go
@@ -370,6 +370,7 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) {
 	}{Content: encodedData}
 	response, _ := json.Marshal(responseContent)
 
+	w.WriteHeader(http.StatusOK)
 	w.Write(response)
 }
 

From 4aa26488889aec3e152c2dbd73998d8b2336b41f Mon Sep 17 00:00:00 2001
From: Christopher Poile <cpoile@gmail.com>
Date: Wed, 12 Apr 2023 15:15:24 -0400
Subject: [PATCH 035/103] Prepackage calls v0.15.1 (#22936)

---
 server/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/Makefile b/server/Makefile
index 124b7460e5..3271d4d4b9 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -142,7 +142,7 @@ TEMPLATES_DIR=templates
 PLUGIN_PACKAGES ?= mattermost-plugin-antivirus-v0.1.2
 PLUGIN_PACKAGES += mattermost-plugin-autolink-v1.2.2
 PLUGIN_PACKAGES += mattermost-plugin-aws-SNS-v1.2.0
-PLUGIN_PACKAGES += mattermost-plugin-calls-v0.15.0
+PLUGIN_PACKAGES += mattermost-plugin-calls-v0.15.1
 PLUGIN_PACKAGES += mattermost-plugin-channel-export-v1.0.0
 PLUGIN_PACKAGES += mattermost-plugin-confluence-v1.3.0
 PLUGIN_PACKAGES += mattermost-plugin-custom-attributes-v1.3.1

From 3089b8b06d2c4169b09aa08f83274b642e46a424 Mon Sep 17 00:00:00 2001
From: Nick Misasi <nick.misasi@mattermost.com>
Date: Wed, 12 Apr 2023 15:41:53 -0400
Subject: [PATCH 036/103] [MM-51479] Cloud Reverse Trial Banner Updates
 (#22852)

* License public key to test env for mono-repo

* Fix error modal showing on a successful trial request

* Adjustments for new banners

* stashing

* Undo accidental merge

* fixes

* clean up dev stuff, fix style

* Adjust padding on announcement bar button

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 model/feature_flags.go                        |  3 +
 .../cloud_trial_announcement_bar.tsx          | 77 ++++++++++++++-----
 .../cloud_trial_announcement_bar/index.ts     |  3 +
 webapp/channels/src/i18n/en.json              |  3 +
 .../sass/components/_announcement-bar.scss    |  1 +
 webapp/channels/src/utils/constants.tsx       |  2 +-
 6 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/model/feature_flags.go b/model/feature_flags.go
index f835aab621..07bfe6762a 100644
--- a/model/feature_flags.go
+++ b/model/feature_flags.go
@@ -78,6 +78,8 @@ type FeatureFlags struct {
 	DeprecateCloudFree bool
 
 	AppsSidebarCategory bool
+
+	CloudReverseTrial bool
 }
 
 func (f *FeatureFlags) SetDefaults() {
@@ -108,6 +110,7 @@ func (f *FeatureFlags) SetDefaults() {
 	f.OnboardingAutoShowLinkedBoard = false
 	f.OnboardingTourTips = true
 	f.AppsSidebarCategory = false
+	f.CloudReverseTrial = false
 }
 
 func (f *FeatureFlags) Plugins() map[string]string {
diff --git a/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx b/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx
index e9fcd6ba46..8224463d43 100644
--- a/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx
+++ b/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx
@@ -18,6 +18,8 @@ import PricingModal from 'components/pricing_modal';
 
 import {ModalData} from 'types/actions';
 
+import {AlertCircleOutlineIcon, AlertOutlineIcon} from '@mattermost/compass-icons/components';
+
 import {
     Preferences,
     CloudBanners,
@@ -38,6 +40,7 @@ type Props = {
     daysLeftOnTrial: number;
     isCloud: boolean;
     subscription?: Subscription;
+    reverseTrial: boolean;
     actions: {
         savePreferences: (userId: string, preferences: PreferenceType[]) => void;
         getCloudSubscription: () => void;
@@ -132,7 +135,7 @@ class CloudTrialAnnouncementBar extends React.PureComponent<Props> {
             return null;
         }
 
-        const trialMoreThan3DaysMsg = (
+        let trialMoreThan7DaysMsg = (
             <FormattedMessage
                 id='admin.billing.subscription.cloudTrial.moreThan3Days'
                 defaultMessage='Your trial has started! There are {daysLeftOnTrial} days left'
@@ -140,7 +143,26 @@ class CloudTrialAnnouncementBar extends React.PureComponent<Props> {
             />
         );
 
-        const trialLessThan3DaysMsg = (
+        let modalButtonText = t('admin.billing.subscription.cloudTrial.subscribeButton');
+        let modalButtonDefaultText = 'Upgrade Now';
+
+        if (this.props.reverseTrial) {
+            modalButtonText = t('admin.billing.subscription.cloudReverseTrial.subscribeButton');
+            modalButtonDefaultText = 'Review your options';
+        }
+
+        if (this.props.reverseTrial) {
+            const trialEnd = getLocaleDateFromUTC((this.props.subscription?.trial_end_at as number / 1000), 'MMMM Do');
+            trialMoreThan7DaysMsg = (
+                <FormattedMessage
+                    id='admin.billing.subscription.cloudTrial.moreThan3Days'
+                    defaultMessage='Your 30 day Enterprise trial has started! Purchase before {trialEnd} to keep your workspace.'
+                    values={{trialEnd}}
+                />
+            );
+        }
+
+        let trialLessThan7DaysMsg = (
             <FormattedMessage
                 id='admin.billing.subscription.cloudTrial.daysLeftOnTrial'
                 defaultMessage='There are {daysLeftOnTrial} days left on your free trial'
@@ -148,10 +170,20 @@ class CloudTrialAnnouncementBar extends React.PureComponent<Props> {
             />
         );
 
-        const userEndTrialDate = getLocaleDateFromUTC((this.props.subscription?.trial_end_at as number / 1000), 'MMMM Do YYYY');
-        const userEndTrialHour = getLocaleDateFromUTC((this.props.subscription?.trial_end_at as number / 1000), 'HH:mm:ss', this.props.currentUser.timezone?.automaticTimezone as string);
+        if (this.props.reverseTrial) {
+            trialLessThan7DaysMsg = (
+                <FormattedMessage
+                    id='admin.billing.subscription.cloudReverseTrial.daysLeftOnTrial'
+                    defaultMessage='{daysLeftOnTrial} days left on your trial. Purchase a plan or contact sales to keep your workspace.'
+                    values={{daysLeftOnTrial}}
+                />
+            );
+        }
 
-        const trialLastDaysMsg = (
+        const userEndTrialDate = getLocaleDateFromUTC((this.props.subscription?.trial_end_at as number / 1000), 'MMMM Do YYYY');
+        const userEndTrialHour = getLocaleDateFromUTC((this.props.subscription?.trial_end_at as number / 1000), 'HH:mm', this.props.currentUser.timezone?.automaticTimezone as string);
+
+        let trialLastDaysMsg = (
             <FormattedMessage
                 id='admin.billing.subscription.cloudTrial.lastDay'
                 defaultMessage='This is the last day of your free trial. Your access will expire on {userEndTrialDate} at {userEndTrialHour}.'
@@ -159,21 +191,28 @@ class CloudTrialAnnouncementBar extends React.PureComponent<Props> {
             />
         );
 
+        if (this.props.reverseTrial) {
+            trialLastDaysMsg = (
+                <FormattedMessage
+                    id='admin.billing.subscription.cloudReverseTrial.lastDay'
+                    defaultMessage='This is the last day of your trial. Purchase a plan before {userEndTrialHour} or contact sales'
+                    values={{userEndTrialHour}}
+                />
+            );
+        }
+
         let bannerMessage;
         let icon;
-        switch (daysLeftOnTrial) {
-        case TrialPeriodDays.TRIAL_WARNING_THRESHOLD:
-        case TrialPeriodDays.TRIAL_2_DAYS:
-            bannerMessage = trialLessThan3DaysMsg;
-            break;
-        case TrialPeriodDays.TRIAL_1_DAY:
-        case TrialPeriodDays.TRIAL_0_DAYS:
+
+        if (daysLeftOnTrial >= TrialPeriodDays.TRIAL_2_DAYS && daysLeftOnTrial <= TrialPeriodDays.TRIAL_WARNING_THRESHOLD) {
+            bannerMessage = trialLessThan7DaysMsg;
+            icon = <AlertCircleOutlineIcon size={18}/>;
+        } else if (daysLeftOnTrial <= TrialPeriodDays.TRIAL_1_DAY && daysLeftOnTrial >= TrialPeriodDays.TRIAL_0_DAYS) {
             bannerMessage = trialLastDaysMsg;
-            break;
-        default:
-            bannerMessage = trialMoreThan3DaysMsg;
-            icon = <i className='icon-check-outline-circle'/>;
-            break;
+            icon = <AlertOutlineIcon size={18}/>;
+        } else {
+            bannerMessage = trialMoreThan7DaysMsg;
+            icon = <AlertCircleOutlineIcon size={18}/>;
         }
 
         const dismissable = this.isDismissable();
@@ -184,8 +223,8 @@ class CloudTrialAnnouncementBar extends React.PureComponent<Props> {
                 showCloseButton={dismissable}
                 handleClose={this.handleClose}
                 onButtonClick={this.showModal}
-                modalButtonText={t('admin.billing.subscription.cloudTrial.subscribeButton')}
-                modalButtonDefaultText={'Upgrade Now'}
+                modalButtonText={modalButtonText}
+                modalButtonDefaultText={modalButtonDefaultText}
                 message={bannerMessage}
                 showLinkAsButton={true}
                 icon={icon}
diff --git a/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/index.ts b/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/index.ts
index 9b6bbfc443..3d7e4fd871 100644
--- a/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/index.ts
+++ b/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/index.ts
@@ -21,6 +21,7 @@ import {Preferences, TrialPeriodDays} from 'utils/constants';
 import {getRemainingDaysFromFutureTimestamp} from 'utils/utils';
 
 import CloudTrialAnnouncementBar from './cloud_trial_announcement_bar';
+import {getConfig} from 'mattermost-redux/selectors/entities/admin';
 
 function mapStateToProps(state: GlobalState) {
     const getCategory = makeGetCategory();
@@ -29,6 +30,7 @@ function mapStateToProps(state: GlobalState) {
     const isCloud = getLicense(state).Cloud === 'true';
     let isFreeTrial = false;
     let daysLeftOnTrial = 0;
+    const config = getConfig(state);
 
     if (isCloud && subscription?.is_free_trial === 'true') {
         isFreeTrial = true;
@@ -46,6 +48,7 @@ function mapStateToProps(state: GlobalState) {
         isCloud,
         subscription,
         preferences: getCategory(state, Preferences.CLOUD_TRIAL_BANNER),
+        reverseTrial: Boolean(config.FeatureFlags?.CloudReverseTrial),
     };
 }
 
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 607a41dfb8..8d285dd78e 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -304,6 +304,9 @@
   "admin.billing.subscription.cancelSubscriptionSection.description": "At this time, deleting a workspace can only be done with the help of a customer support representative.",
   "admin.billing.subscription.cancelSubscriptionSection.title": "Cancel your subscription",
   "admin.billing.subscription.cloudMonthlyBadge": "Monthly",
+  "admin.billing.subscription.cloudReverseTrial.daysLeftOnTrial": "{daysLeftOnTrial} days left on your trial. Purchase a plan or contact sales to keep your workspace.",
+  "admin.billing.subscription.cloudReverseTrial.lastDay": "This is the last day of your trial. Purchase a plan before {userEndTrialHour} or contact sales",
+  "admin.billing.subscription.cloudReverseTrial.subscribeButton": "Review your options",
   "admin.billing.subscription.cloudTrial.daysLeftOnTrial": "There are {daysLeftOnTrial} days left on your free trial",
   "admin.billing.subscription.cloudTrial.lastDay": "This is the last day of your free trial. Your access will expire on {userEndTrialDate} at {userEndTrialHour}.",
   "admin.billing.subscription.cloudTrial.moreThan3Days": "Your trial has started! There are {daysLeftOnTrial} days left",
diff --git a/webapp/channels/src/sass/components/_announcement-bar.scss b/webapp/channels/src/sass/components/_announcement-bar.scss
index d06163241f..3869282ffb 100644
--- a/webapp/channels/src/sass/components/_announcement-bar.scss
+++ b/webapp/channels/src/sass/components/_announcement-bar.scss
@@ -104,6 +104,7 @@
         height: 24px;
         box-sizing: border-box;
         padding: 4px 8px;
+        padding-top: 2px;
         border: 1px solid #fff;
         margin-left: 8px;
         background-color: inherit !important;
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index 58627a21ae..4bb243003c 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -177,7 +177,7 @@ export const Unique = {
 export const TrialPeriodDays = {
     TRIAL_30_DAYS: 30,
     TRIAL_14_DAYS: 14,
-    TRIAL_WARNING_THRESHOLD: 3,
+    TRIAL_WARNING_THRESHOLD: 7,
     TRIAL_2_DAYS: 2,
     TRIAL_1_DAY: 1,
     TRIAL_0_DAYS: 0,

From 0b731f4330eea1bc643ac8f73d9c8eedc65068bd Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Wed, 12 Apr 2023 16:22:10 -0400
Subject: [PATCH 037/103] fix tests.

---
 server/channels/api4/license_test.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/server/channels/api4/license_test.go b/server/channels/api4/license_test.go
index 08a9e57305..8769fae1fc 100644
--- a/server/channels/api4/license_test.go
+++ b/server/channels/api4/license_test.go
@@ -521,6 +521,14 @@ func TestTrueUpReviewStatus(t *testing.T) {
 	th.App.Srv().SetLicense(model.NewTestLicense())
 
 	t.Run("returns 200 when status retrieved", func(t *testing.T) {
+		cloud := mocks.CloudInterface{}
+
+		cloudImpl := th.App.Srv().Cloud
+		defer func() {
+			th.App.Srv().Cloud = cloudImpl
+		}()
+		th.App.Srv().Cloud = &cloud
+
 		resp, err := th.SystemAdminClient.DoAPIGet("/license/review/status", "")
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, resp.StatusCode)

From 2dafc51be252b6dbea81ab471a2b76716dc7bd20 Mon Sep 17 00:00:00 2001
From: Julien Tant <785518+JulienTant@users.noreply.github.com>
Date: Wed, 12 Apr 2023 13:53:22 -0700
Subject: [PATCH 038/103] Work Template: use mattermost-server/playbooks
 package instead of old playbook repo (#22908)

---
 go.mod                                        |   4 +-
 go.sum                                        | 371 ------------------
 server/channels/app/work_template_executor.go |   2 +-
 server/channels/app/work_templates_test.go    |   2 +-
 server/channels/app/worktemplates/model.go    |   2 +-
 .../channels/app/worktemplates/model_test.go  |   2 +-
 6 files changed, 7 insertions(+), 376 deletions(-)

diff --git a/go.mod b/go.mod
index 4d95ef02c1..bc262ccf09 100644
--- a/go.mod
+++ b/go.mod
@@ -42,7 +42,6 @@ require (
 	github.com/mattermost/gziphandler v0.0.1
 	github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d
 	github.com/mattermost/logr/v2 v2.0.16
-	github.com/mattermost/mattermost-plugin-playbooks/client v0.7.0
 	github.com/mattermost/morph v1.0.5-0.20221115094356-4c18a75b1f5e
 	github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0
 	github.com/mattermost/squirrel v0.2.0
@@ -91,6 +90,7 @@ require (
 )
 
 require (
+	github.com/HdrHistogram/hdrhistogram-go v0.9.0 // indirect
 	github.com/JalfResi/justext v0.0.0-20221106200834-be571e3e3052 // indirect
 	github.com/PuerkitoBio/goquery v1.8.0 // indirect
 	github.com/RoaringBitmap/roaring v1.2.1 // indirect
@@ -131,6 +131,7 @@ require (
 	github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gopherjs/gopherjs v1.17.2 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
@@ -151,6 +152,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
diff --git a/go.sum b/go.sum
index 7aff53830e..852b686451 100644
--- a/go.sum
+++ b/go.sum
@@ -4,7 +4,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo=
-cloud.google.com/go v0.37.1/go.mod h1:SAbnLi6YTSPKSI0dTUEOVLCkyPfKXK8n4ibqiMoj4ok=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
@@ -18,8 +17,6 @@ cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bP
 cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
 cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
 cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.63.0/go.mod h1:GmezbQc7T2snqkEXWfZ0sy0VfkB/ivI2DdtJL2DEmlg=
-cloud.google.com/go v0.64.0/go.mod h1:xfORb36jGvE+6EexW71nMEtL025s3x6xvuYUKM4JLv4=
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
@@ -52,7 +49,6 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
 cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/spanner v1.9.0/go.mod h1:xvlEn0NZ5v1iJPYsBnUVRDNvccDxsBTEi16pJRKQVws=
 cloud.google.com/go/spanner v1.28.0/go.mod h1:7m6mtQZn/hMbMfx62ct5EWrGND4DNqkXyrmBPRS+OJo=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
@@ -60,10 +56,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-code.sajari.com/docconv v1.1.1-0.20210427001343-7b3472bc323a/go.mod h1:KPNt2zuWplps1W0TpOb6ltHj4Xu+j6h7a+YkqGHrxQE=
 code.sajari.com/docconv v1.3.5 h1:RBBs6aT3/5gHHWzAaxBj85e3ozsu05s2kAslhW7i+Ag=
 code.sajari.com/docconv v1.3.5/go.mod h1:EDkTrwa2yO2O9EbVpD3dlHXDVcxbfKDWnDNE/8vbbP8=
-contrib.go.opencensus.io/exporter/ocagent v0.4.9/go.mod h1:ueLzZcP7LPhPulEBukGn4aLh7Mx9YJwpVJ9nL2FYltw=
 dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
@@ -71,18 +65,14 @@ dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1
 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
-git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
-github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v26.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest v11.5.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
 github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
@@ -99,27 +89,16 @@ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBp
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/ClickHouse/clickhouse-go v1.3.12/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
 github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
-github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
-github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/HdrHistogram/hdrhistogram-go v0.9.0 h1:dpujRju0R4M/QZzcnR1LH1qm+TVG3UzkWdp5tH1WMcg=
 github.com/HdrHistogram/hdrhistogram-go v0.9.0/go.mod h1:nxrse8/Tzg2tg3DZcZjm6qEclQKK70g0KxO61gFFZD4=
 github.com/JalfResi/justext v0.0.0-20170829062021-c0282dea7198/go.mod h1:0SURuH1rsE8aVWvutuMZghRNrNrYEUzibzJfhEYR8L0=
 github.com/JalfResi/justext v0.0.0-20221106200834-be571e3e3052 h1:8T2zMbhLBbH9514PIQVHdsGhypMrsB4CxwbldKA9sBA=
 github.com/JalfResi/justext v0.0.0-20221106200834-be571e3e3052/go.mod h1:0SURuH1rsE8aVWvutuMZghRNrNrYEUzibzJfhEYR8L0=
-github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
-github.com/Julusian/godocdown v0.0.0-20170816220326-6d19f8ff2df8/go.mod h1:INZr5t32rG59/5xeltqoCJoNY7e5x/3xoY9WSWVWg74=
-github.com/Masterminds/glide v0.13.2/go.mod h1:STyF5vcenH/rUqTEv+/hBXlSTo7KYwg2oc2f4tzPWic=
-github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
-github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
-github.com/Masterminds/squirrel v1.5.0/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
 github.com/Masterminds/squirrel v1.5.3 h1:YPpoceAcxuzIljlr5iWpNKaql7hLeG1KLSrhvdHpkZc=
 github.com/Masterminds/squirrel v1.5.3/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
-github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@@ -146,29 +125,20 @@ github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:m
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PaulARoy/azurestoragecache v0.0.0-20170906084534-3c249a3ba788/go.mod h1:lY1dZd8HBzJ10eqKERHn3CU59tfhzcAVb2c0ZhIWSOk=
 github.com/PuerkitoBio/goquery v1.4.1/go.mod h1:T9ezsOHcCrDCgA8aF1Cqr3sSYbO/xgdy8/R/XiIMAhA=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
-github.com/PuerkitoBio/goquery v1.7.0/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U=
 github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
-github.com/RoaringBitmap/roaring v0.8.0/go.mod h1:jdT9ykXwHFNdJbEtxePexlFYH9LXucApeS0/+/g+p1I=
 github.com/RoaringBitmap/roaring v1.2.1 h1:58/LJlg/81wfEHd5L9qsHduznOIhyv4qb1yWcSvVq9A=
 github.com/RoaringBitmap/roaring v1.2.1/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA=
-github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
-github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
-github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/advancedlogic/GoOse v0.0.0-20191112112754-e742535969c1/go.mod h1:f3HCSN1fBWjcpGtXyM119MJgeQl838v6so/PQOqvE1w=
-github.com/advancedlogic/GoOse v0.0.0-20200830213114-1225d531e0ad/go.mod h1:f3HCSN1fBWjcpGtXyM119MJgeQl838v6so/PQOqvE1w=
 github.com/advancedlogic/GoOse v0.0.0-20210820140952-9d5822d4a625 h1:LZIP5Bj5poWWRZ8fcL4ZwCupb4FwcTFK2RCTxkGnCX8=
 github.com/advancedlogic/GoOse v0.0.0-20210820140952-9d5822d4a625/go.mod h1:f3HCSN1fBWjcpGtXyM119MJgeQl838v6so/PQOqvE1w=
-github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -177,9 +147,7 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
 github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk=
-github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
-github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
@@ -189,10 +157,8 @@ github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x0
 github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230/go.mod h1:QNYViu/X0HXDHw7m3KXzWSVXIbfUvJqBFe6Gj8/pYA0=
 github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2qMFB56yOP3KzkB3PbYZ4AlUFg3a88F67TIx5lB/WwY=
 github.com/apache/arrow/go/arrow v0.0.0-20211013220434-5962184e7a30/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/araddon/dateparse v0.0.0-20180729174819-cfd92a431d0e/go.mod h1:SLqhdZcd+dF3TEVL2RMoob5bBP5R1P1qkox+HtCBgGI=
 github.com/araddon/dateparse v0.0.0-20200409225146-d820a6159ab1/go.mod h1:SLqhdZcd+dF3TEVL2RMoob5bBP5R1P1qkox+HtCBgGI=
 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
@@ -200,15 +166,12 @@ github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoU
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1 h1:9h8f71kuF1pqovnn9h7LTHLEjxzyQaj0j1rQq5nsMM4=
 github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1/go.mod h1:noBAuukeYOXa0aXGqxr24tADqkwDO2KRD15FsuaZ5a8=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.19.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.38.67/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.44.173 h1:8kXIxvQnBpGhmR3Eof6SnCKgR0q5/L/3Qbv9vAC5wic=
 github.com/aws/aws-sdk-go v1.44.173/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/aws/aws-sdk-go-v2 v1.8.0/go.mod h1:xEFuWz+3TYdlPRuo+CqATbeDWIWyaT5uAPwPaWtgse0=
@@ -239,8 +202,6 @@ github.com/aws/smithy-go v1.7.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAm
 github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
-github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
-github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -261,25 +222,20 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
 github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/blevesearch/bleve v1.0.14/go.mod h1:e/LJTr+E7EaoVdkQZTfoz7dt4KoDNvDbLb8MSKuNTLQ=
 github.com/blevesearch/bleve/v2 v2.3.6 h1:NlntUHcV5CSWIhpugx4d/BRMGCiaoI8ZZXrXlahzNq4=
 github.com/blevesearch/bleve/v2 v2.3.6/go.mod h1:JM2legf1cKVkdV8Ehu7msKIOKC0McSw0Q16Fmv9vsW4=
 github.com/blevesearch/bleve_index_api v1.0.5 h1:Lc986kpC4Z0/n1g3gg8ul7H+lxgOQPcXb9SxvQGu+tw=
 github.com/blevesearch/bleve_index_api v1.0.5/go.mod h1:YXMDwaXFFXwncRS8UobWs7nvo0DmusriM1nztTlj1ms=
-github.com/blevesearch/blevex v1.0.0/go.mod h1:2rNVqoG2BZI8t1/P1awgTKnGlx5MP9ZbtEciQaNhswc=
-github.com/blevesearch/cld2 v0.0.0-20200327141045-8b5f551d37f5/go.mod h1:PN0QNTLs9+j1bKy3d/GB/59wsNBFC4sWLWG3k69lWbc=
 github.com/blevesearch/geo v0.1.17 h1:AguzI6/5mHXapzB0gE9IKWo+wWPHZmXZoscHcjFgAFA=
 github.com/blevesearch/geo v0.1.17/go.mod h1:uRMGWG0HJYfWfFJpK3zTdnnr1K+ksZTuWKhXeSokfnM=
 github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo=
 github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M=
 github.com/blevesearch/gtreap v0.1.1 h1:2JWigFrzDMR+42WGIN/V2p0cUvn4UP3C4Q5nmaZGW8Y=
 github.com/blevesearch/gtreap v0.1.1/go.mod h1:QaQyDRAT51sotthUWAH4Sj08awFSSWzgYICSZ3w0tYk=
-github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA=
 github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc=
 github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs=
 github.com/blevesearch/scorch_segment_api/v2 v2.1.4 h1:LmGmo5twU3gV+natJbKmOktS9eMhokPGKWuR+jX84vk=
 github.com/blevesearch/scorch_segment_api/v2 v2.1.4/go.mod h1:PgVnbbg/t1UkgezPDu8EHLi1BHQ17xUwsFdU6NnOYS0=
-github.com/blevesearch/segment v0.9.0/go.mod h1:9PfHYUdQCgHktBgvtUOF4x+pc4/l8rdH0u5spnW85UQ=
 github.com/blevesearch/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU=
 github.com/blevesearch/segment v0.9.1/go.mod h1:zN21iLm7+GnBHWTao9I+Au/7MBiL8pPFtJBJTsk6kQw=
 github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD/iWeNXm8s=
@@ -288,11 +244,6 @@ github.com/blevesearch/upsidedown_store_api v1.0.2 h1:U53Q6YoWEARVLd1OYNc9kvhBMG
 github.com/blevesearch/upsidedown_store_api v1.0.2/go.mod h1:M01mh3Gpfy56Ps/UXHjEO/knbqyQ1Oamg8If49gRwrQ=
 github.com/blevesearch/vellum v1.0.9 h1:PL+NWVk3dDGPCV0hoDu9XLLJgqU4E5s/dOeEJByQ2uQ=
 github.com/blevesearch/vellum v1.0.9/go.mod h1:ul1oT0FhSMDIExNjIxHqJoGpVrBpKCdgDQNxfqgJt7k=
-github.com/blevesearch/zap/v11 v11.0.14/go.mod h1:MUEZh6VHGXv1PKx3WnCbdP404LGG2IZVa/L66pyFwnY=
-github.com/blevesearch/zap/v12 v12.0.14/go.mod h1:rOnuZOiMKPQj18AEKEHJxuI14236tTQ1ZJz4PAnWlUg=
-github.com/blevesearch/zap/v13 v13.0.6/go.mod h1:L89gsjdRKGyGrRN6nCpIScCvvkyxvmeDCwZRcjjPCrw=
-github.com/blevesearch/zap/v14 v14.0.5/go.mod h1:bWe8S7tRrSBTIaZ6cLRbgNH4TUDaC9LZSpRGs85AsGY=
-github.com/blevesearch/zap/v15 v15.0.3/go.mod h1:iuwQrImsh1WjWJ0Ue2kBqY83a0rFtJTqfa9fp1rbVVU=
 github.com/blevesearch/zapx/v11 v11.3.7 h1:Y6yIAF/DVPiqZUA/jNgSLXmqewfzwHzuwfKyfdG+Xaw=
 github.com/blevesearch/zapx/v11 v11.3.7/go.mod h1:Xk9Z69AoAWIOvWudNDMlxJDqSYGf90LS0EfnaAIvXCA=
 github.com/blevesearch/zapx/v12 v12.3.7 h1:DfQ6rsmZfEK4PzzJJRXjiM6AObG02+HWvprlXQ1Y7eI=
@@ -314,10 +265,8 @@ github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx2
 github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
-github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
 github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
-github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
@@ -339,8 +288,6 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX
 github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
 github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
 github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -354,15 +301,11 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
 github.com/cockroachdb/cockroach-go/v2 v2.1.1/go.mod h1:7NtUnP6eK+l6k483WSYNrq3Kb23bWV10IRV1TyeSpwM=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
 github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
-github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
-github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
 github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
@@ -390,7 +333,6 @@ github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX
 github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-github.com/containerd/containerd v1.4.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
@@ -463,7 +405,6 @@ github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
 github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
 github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
@@ -480,11 +421,6 @@ github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/corpix/uarand v0.1.1/go.mod h1:SFKZvkcRoLqVRFZ4u25xPmp6m9ktANfbpXZ7SJ0/FNU=
-github.com/couchbase/ghistogram v0.1.0/go.mod h1:s1Jhy76zqfEecpNWJfWUiKZookAFaiGOEoyzgHt9i7k=
-github.com/couchbase/moss v0.1.0/go.mod h1:9MaHIaRuy9pvLPUJxB8sh8OrLfyDczECVL37grCIubs=
-github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4=
-github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -493,10 +429,7 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
-github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
 github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
-github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
-github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc=
 github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
 github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
 github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
@@ -505,23 +438,17 @@ github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpT
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
-github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/dgoogauth v0.0.0-20190221195224-5a805980a5f3 h1:AqeKSZIG/NIC75MNQlPy/LM3LxfpLwahICJBHwSMFNc=
 github.com/dgryski/dgoogauth v0.0.0-20190221195224-5a805980a5f3/go.mod h1:hEfFauPHz7+NnjR/yHJGhrKo1Za+zStgwUETx3yzqgY=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/dhui/dktest v0.3.3/go.mod h1:EML9sP4sqJELHn4jV7B0TY8oF6077nk83/tz7M56jcQ=
 github.com/dhui/dktest v0.3.10/go.mod h1:h5Enh0nG3Qbo9WjNFRrwmKUaePEBhXMOygbz3Ww7Sz0=
-github.com/die-net/lrucache v0.0.0-20181227122439-19a39ef22a11/go.mod h1:ew0MSjCVDdtGMjF3kzLK9hwdgF5mOE8SbYVF3Rc7mkU=
-github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
@@ -531,7 +458,6 @@ github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v20.10.13+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
@@ -543,22 +469,15 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
 github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo=
 github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY=
 github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dvyukov/go-fuzz v0.0.0-20210429054444-fca39067bc72/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw=
 github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a h1:etIrTD8BQqzColk9nKRusM9um5+1q0iOEJLqfBMIK64=
 github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a/go.mod h1:emQhSYTXqB0xxjLITTw4EaWZ+8IIQYw+kx9GqNUKdLg=
-github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
-github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
@@ -573,23 +492,15 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.
 github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
-github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
-github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
-github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
-github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/set v0.2.1 h1:nn2CaJyknWE/6txyUDGwysr3G5QC6xWB/PtVjPBbeaA=
 github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI=
-github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
@@ -598,7 +509,6 @@ github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzP
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
-github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
@@ -611,26 +521,17 @@ github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXt
 github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
 github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
 github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
-github.com/getsentry/sentry-go v0.11.0/go.mod h1:KBQIxiZAetw62Cj8Ri964vAEWVdgfaUCn30Q3bCvANo=
 github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo=
 github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573 h1:u8AQ9bPa9oC+8/A/jlWouakhIvkFfuxgIIRjiy8av7I=
 github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573/go.mod h1:eBvb3i++NHDH4Ugo9qCvMw8t0mTSctaEa5blJbWcNxs=
-github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
-github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
-github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
 github.com/go-asn1-ber/asn1-ber v1.3.2-0.20191121212151-29be175fc3a3/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-asn1-ber/asn1-ber v1.5.3/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
 github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
@@ -659,7 +560,6 @@ github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@@ -674,13 +574,10 @@ github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dp
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-redis/redis/v8 v8.0.0/go.mod h1:isLoQT/NFSP7V67lyvM9GmdvLdyZ7pEhsXvvyQtnQTo=
-github.com/go-redis/redis/v8 v8.10.0/go.mod h1:vXLTvigok0VtUX0znvbcEW1SOt4OA9CU1ZfnOtKOaiM=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-resty/resty/v2 v2.0.0/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8=
 github.com/go-resty/resty/v2 v2.3.0/go.mod h1:UpN9CgLZNsv4e9XG50UU8xdI0F43UQ4HmxLBDwaroHU=
-github.com/go-resty/resty/v2 v2.6.0/go.mod h1:PwvJS6hvaPkjtjNg9ph+VrSD92bi5Zq73w/BIH7cC3Q=
 github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
 github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@@ -715,10 +612,6 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe
 github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
 github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
 github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
 github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
@@ -731,7 +624,6 @@ github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx
 github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
 github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
@@ -739,7 +631,6 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/golang-migrate/migrate/v4 v4.14.1/go.mod h1:l7Ks0Au6fYHuUIxUhQ0rcVX1uLlJg54C/VvW7tvxSz0=
 github.com/golang-migrate/migrate/v4 v4.15.2 h1:vU+M05vs6jWHKDdmE1Ecwj0BznygFc4QsdRe2E/L7kc=
 github.com/golang-migrate/migrate/v4 v4.15.2/go.mod h1:f2toGLkYqD3JH+Todi4aZ2ZdbeUNx4sIwiOK96rE9Lw=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
@@ -785,19 +676,16 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
-github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -861,18 +749,14 @@ github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2c
 github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20210621113107-84c6004145de/go.mod h1:MtKwTfDNYAP5EtbQSMYjTSqvj1aXJKQRASWq3bwaP+g=
 github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
 github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
 github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
-github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
@@ -882,7 +766,6 @@ github.com/gorilla/schema v1.2.0 h1:YufUaxZYCKGFuAq3c96BOhjgd5nmXiOY9NGzF247Tsc=
 github.com/gorilla/schema v1.2.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -893,54 +776,39 @@ github.com/graph-gophers/dataloader/v7 v7.1.0/go.mod h1:1bKE0Dm6OUcTB/OAuYVOZctg
 github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a h1:i0+Se9S+2zL5CBxJouqn2Ej6UQMwH1c57ZB6DVnqck4=
 github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a/go.mod h1:YtmJZDLbF1YYNrlNAuiO5zAStUWc3XZT07iGsVqe1Os=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
-github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
-github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c h1:fEE5/5VNnYUoBOj2I9TP8Jc+a7lge3QWn9DKE7NCwfc=
 github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c/go.mod h1:ObS/W+h8RYb1Y7fYivughjxojTmIu5iAIjSrSLCLeqE=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
-github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b/go.mod h1:VzxiSdG6j1pi7rwGm/xYI5RbtpBgM8sARDXlvEvxlu0=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v0.16.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v1.4.0 h1:ctuWFGrhFha8BnnzxqeRGidlEcQkDyL5u8J8t5eA11I=
 github.com/hashicorp/go-hclog v1.4.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4=
 github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.4.2/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
 github.com/hashicorp/go-plugin v1.4.8 h1:CHGwpxYDOttQOY7HOWgETU9dyVjOXzniXDqJcYJE1zM=
 github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -951,34 +819,23 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
-github.com/hashicorp/memberlist v0.2.4/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
-github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428/go.mod h1:uhpZMVGznybq1itEKXj6RYw9I71qK4kH+OGMjRC4KEo=
-github.com/ikawaha/kagome.ipadic v1.1.2/go.mod h1:DPSBbU0czaJhAb/5uKQZHMc9MTVRpDugJfX+HddPHHg=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ=
-github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
-github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
-github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
-github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g=
-github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
 github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
 github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
@@ -987,7 +844,6 @@ github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgO
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
 github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
 github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
-github.com/jackc/pgconn v1.3.2/go.mod h1:LvCquS3HbBKwgl7KbX9KyqEIumJAbm1UMcTvGaIf3bM=
 github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=
 github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
 github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
@@ -1025,14 +881,12 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jamiealquiza/envy v1.1.0/go.mod h1:MP36BriGCLwEHhi1OU8E9569JNZrjWfCvzG7RsPnHus=
 github.com/jaytaylor/html2text v0.0.0-20180606194806-57d518f124b0/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba h1:QFQpJdgbON7I0jr2hYW7Bs+XV0qjc3d5tZoDnRFnqTg=
 github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
-github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@@ -1042,22 +896,18 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ=
-github.com/jmoiron/sqlx v1.3.4/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -1074,11 +924,6 @@ github.com/k0kubun/pp v2.3.0+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3t
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
-github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
-github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
-github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro=
-github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
@@ -1086,10 +931,7 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
@@ -1099,18 +941,12 @@ github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47e
 github.com/klauspost/compress v1.15.14 h1:i7WCKDToww0wA+9qrUZ1xOjp218vfFo3nTU6UHp+gOc=
 github.com/klauspost/compress v1.15.14/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU=
 github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
-github.com/klauspost/pgzip v1.2.4/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
-github.com/kljensen/snowball v0.6.0/go.mod h1:27N7E8fVU5H68RlUmnWwZCfxgt4POBJfENGMvNRhldw=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -1130,13 +966,10 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/krolaw/zipstream v0.0.0-20180621105154-0a2661891f94 h1:+AIlO01SKT9sfWU5CLWi0cfHc7dQwgGz3FhFRzXLoMg=
 github.com/krolaw/zipstream v0.0.0-20180621105154-0a2661891f94/go.mod h1:TcE3PIIkVWbP/HjhRAafgCjRKvDOi086iqp9VkNX/ng=
 github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4=
-github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
-github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw=
 github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
 github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk=
 github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw=
-github.com/ledongthuc/pdf v0.0.0-20210621053716-e28cb8259002/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5 h1:W7p+m/AECTL3s/YR5RpQ4hz5SjNeKzZBl1q36ws12s0=
@@ -1147,7 +980,6 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
 github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
@@ -1163,28 +995,18 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
-github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
 github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
-github.com/mattermost/go-i18n v1.11.0/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34=
 github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 h1:Khvh6waxG1cHc4Cz5ef9n3XVCxRWpAKUtqg9PJl5+y8=
 github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34=
-github.com/mattermost/gorp v1.6.2-0.20210714143452-8b50f5209a7f/go.mod h1:QCQ3U0M9T/BlAdjKFJo0I1oe/YAgbyjNdhU8bpOLafk=
-github.com/mattermost/gosaml2 v0.3.3/go.mod h1:Z429EIOiEi9kbq6yHoApfzlcXpa6dzRDc6pO+Vy2Ksk=
 github.com/mattermost/gziphandler v0.0.1 h1:uXHcXF5agnQ6bXabvpiwwwZOlCYoa7mKHH0lxns/o8w=
 github.com/mattermost/gziphandler v0.0.1/go.mod h1:CvvZR7sXqhj81V2swXuQY7T04Ccc89u7W7pHNPKev8g=
 github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d h1:/RJ/UV7M5c7L2TQ0KNm4yZxxFvC1nvRz/gY/Daa35aI=
 github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d/go.mod h1:HLbgMEI5K131jpxGazJ97AxfPDt31osq36YS1oxFQPQ=
-github.com/mattermost/logr v1.0.13/go.mod h1:Mt4DPu1NXMe6JxPdwCC0XBoxXmN9eXOIRPoZarU2PXs=
-github.com/mattermost/logr/v2 v2.0.10/go.mod h1:mpPp935r5dIkFDo2y9Q87cQWhFR/4xXpNh0k/y8Hmwg=
 github.com/mattermost/logr/v2 v2.0.16 h1:jnePX4cPskC3WDFvUardh/xZfxNdsFXbEERJQ1kUEDE=
 github.com/mattermost/logr/v2 v2.0.16/go.mod h1:1dm/YhTpozsqANXxo5Pi5zYLBsal2xY0pX+JZNbzYJY=
-github.com/mattermost/mattermost-plugin-playbooks/client v0.7.0 h1:5TPlzBmrrl6/q6rupBzGvLgeJf/qsn1NoqQmuPDJvdw=
-github.com/mattermost/mattermost-plugin-playbooks/client v0.7.0/go.mod h1:pIR9gutNcE4K726viIya01XT7+T9ziLF0jd5ho6kJlM=
-github.com/mattermost/mattermost-server/v6 v6.0.0-20210825182941-ddfa6e2436d6/go.mod h1:+S8CsNEPv1FOl1usaPBQ6Gu9+Sm1Cc9YdU/Qh1YMGVI=
 github.com/mattermost/morph v1.0.5-0.20221115094356-4c18a75b1f5e h1:VfNz+fvJ3DxOlALM22Eea8ONp5jHrybKBCcCtDPVlss=
 github.com/mattermost/morph v1.0.5-0.20221115094356-4c18a75b1f5e/go.mod h1:xo0ljDknTpPxEdhhrUdwhLCexIsYyDKS6b41HqG8wGU=
 github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 h1:G9tL6JXRBMzjuD1kkBtcnd42kUiT6QDwxfFYu7adM6o=
@@ -1194,7 +1016,6 @@ github.com/mattermost/squirrel v0.2.0/go.mod h1:NPPtk+CdpWre4GxMGoOpzEVFVc0ZoEFy
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -1208,9 +1029,7 @@ github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
-github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
@@ -1220,56 +1039,43 @@ github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.10/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
-github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
 github.com/mgdelacroix/foundation v0.0.0-20220812143423-0bfc18f73538 h1:6mFhRD89wtsxh7g8V6og9DR4y/UGlzzehc1c3O9tbMQ=
 github.com/mgdelacroix/foundation v0.0.0-20220812143423-0bfc18f73538/go.mod h1:ZwobEfNHde7sU2pGybCWEnSlQ2r+MGrHGOKLphHZ42g=
-github.com/mholt/archiver/v3 v3.5.0/go.mod h1:qqTTPUK/HZPFgFQ/TJ3BzvTpF/dPtFVJXdQbCmeMxwc=
 github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo=
 github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
-github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg=
 github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
 github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
-github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.11/go.mod h1:WoyW+ySKAKjY98B9+7ZbI8z8S3jaxaisdcvj9TGlazA=
 github.com/minio/minio-go/v7 v7.0.45 h1:g4IeM9M9pW/Lo8AGGNOjBZYlvmtlE1N5TQEYWXRWzIs=
 github.com/minio/minio-go/v7 v7.0.45/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw=
-github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
 github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
 github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
-github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@@ -1298,13 +1104,9 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
-github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
-github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
 github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
-github.com/muesli/smartcrop v0.2.1-0.20181030220600-548bbf0c0965/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI=
-github.com/muesli/smartcrop v0.3.0/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY=
@@ -1312,17 +1114,10 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
-github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
-github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
-github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
-github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
-github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:ncO5VaFWh0Nrt+4KT4mOZboaczBZcLuHrG+/sUeP8gI=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/ngdinhtoan/glide-cleanup v0.2.0/go.mod h1:UQzsmiDOb8YV3nOsCxK/c9zPpCZVNoHScRE3EO9pVMM=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc=
@@ -1330,7 +1125,6 @@ github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWk
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
 github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -1339,11 +1133,9 @@ github.com/olekukonko/tablewriter v0.0.0-20180506121414-d4647c9c7a84/go.mod h1:v
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
-github.com/olivere/elastic v6.2.35+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
 github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -1352,28 +1144,22 @@ github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
-github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
 github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
 github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/oov/psd v0.0.0-20210618170533-9fb823ddb631/go.mod h1:GHI1bnmAcbp96z6LNfBJvtrjxhaXGkbsk967utPlvL8=
 github.com/oov/psd v0.0.0-20220121172623-5db5eafcecbb h1:JF9kOhBBk4WPF7luXFu5yR+WgaFm9L/KiHJHhU9vDwA=
 github.com/oov/psd v0.0.0-20220121172623-5db5eafcecbb/go.mod h1:GHI1bnmAcbp96z6LNfBJvtrjxhaXGkbsk967utPlvL8=
 github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -1407,20 +1193,15 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
-github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
-github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
 github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
 github.com/otiai10/gosseract/v2 v2.2.4/go.mod h1:ahOp/kHojnOMGv1RaUnR0jwY5JVa6BYKhYAS8nbMLSo=
-github.com/otiai10/gosseract/v2 v2.3.1/go.mod h1:2ZOGgdTIXQzCS5f+N1HkcXRgDX6K3ZoYe3Yvo++cpp4=
 github.com/otiai10/gosseract/v2 v2.4.0 h1:gYd3mx6FuMtIlxL4sYb9JLCFEDzg09VgNSZRNbqpiGM=
 github.com/otiai10/gosseract/v2 v2.4.0/go.mod h1:fhbIDRh29bj13vni6RT3gtWKjKCAeqDYI4C1dxeJuek=
 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
-github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/otiai10/mint v1.3.3 h1:7JgpsBaN0uMkyju4tbYHu0mnM55hNKVYLsXmwr15NQI=
 github.com/otiai10/mint v1.3.3/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
 github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
@@ -1430,23 +1211,17 @@ github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrap
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/peterbourgon/diskv v0.0.0-20171120014656-2973218375c3/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
-github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
 github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
 github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4/v4 v4.0.3/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
 github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
-github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
-github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -1463,19 +1238,15 @@ github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prY
 github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.4.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
@@ -1483,11 +1254,9 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T
 github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
@@ -1497,7 +1266,6 @@ github.com/prometheus/common v0.33.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRL
 github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -1510,8 +1278,6 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/reflog/dateconstraints v0.2.1 h1:Hz1n2Q1vEm0Rj5gciDQcCN1iPBwfFjxUJy32NknGP/s=
 github.com/reflog/dateconstraints v0.2.1/go.mod h1:Ax8AxTBcJc3E/oVS2hd2j7RDM/5MDtuPwuR7lIHtPLo=
 github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
@@ -1528,25 +1294,20 @@ github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
 github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo=
 github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
-github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
 github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
-github.com/rudderlabs/analytics-go v3.3.1+incompatible/go.mod h1:LF8/ty9kUX4PTY3l5c97K3nZZaX5Hwsvt+NBaRL/f30=
 github.com/rudderlabs/analytics-go v3.3.3+incompatible h1:OG0XlKoXfr539e2t1dXtTB+Gr89uFW+OUNQBVhHIIBY=
 github.com/rudderlabs/analytics-go v3.3.3+incompatible/go.mod h1:LF8/ty9kUX4PTY3l5c97K3nZZaX5Hwsvt+NBaRL/f30=
-github.com/russellhaering/goxmldsig v1.1.0/go.mod h1:QK8GhXPB3+AfuCrfo0oRISa9NfzeCpWmxeGnqEpDF9o=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -1554,19 +1315,15 @@ github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfF
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
 github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
-github.com/satori/go.uuid v0.0.0-20180103174451-36e9d2ebbde5/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
 github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
 github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
-github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc=
 github.com/segmentio/backo-go v1.0.1 h1:68RQccglxZeyURy93ASB/2kc9QudzgIDexJ927N++y4=
 github.com/segmentio/backo-go v1.0.1/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
@@ -1579,7 +1336,6 @@ github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIl
 github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
 github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
 github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
-github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
 github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
 github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
 github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI=
@@ -1589,7 +1345,6 @@ github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9A
 github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw=
 github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y=
 github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
-github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
 github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q=
 github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ=
 github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I=
@@ -1599,7 +1354,6 @@ github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1l
 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
-github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
 github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
@@ -1614,11 +1368,8 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/snowflakedb/glog v0.0.0-20180824191149-f5055e6f21ce/go.mod h1:EB/w24pR5VKI60ecFnKqXzxX3dOorz1rnVicQTQrGM0=
-github.com/snowflakedb/gosnowflake v1.3.5/go.mod h1:13Ky+lxzIm3VqNDZJdyvu9MCGy+WgRdYFdXp96UcLZU=
 github.com/snowflakedb/gosnowflake v1.6.3/go.mod h1:6hLajn6yxuJ4xUHZegMekpq9rnQbGJ7TMwXjgTmA6lg=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
@@ -1636,7 +1387,6 @@ github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
 github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
 github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
@@ -1650,37 +1400,29 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
 github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
-github.com/splitio/go-client/v6 v6.1.0/go.mod h1:CEGAEFT99Fwb32ZIRcnZoXTMXddtB6IIpTmt3RP8mnM=
 github.com/splitio/go-client/v6 v6.2.1 h1:EH3xYH7fr2c0I0ZtYvsyn7DjC9ZmoNAFLoKoT3BmQFU=
 github.com/splitio/go-client/v6 v6.2.1/go.mod h1:+HnGMevmSUk56va2egs9W2s9mJ7LW9IXiDPB1ExOi+k=
-github.com/splitio/go-split-commons/v3 v3.1.0/go.mod h1:29NCy20oAS4ZMy4qkwTd6277eieVDonx4V/aeDU/wUQ=
 github.com/splitio/go-split-commons/v4 v4.2.0/go.mod h1:mzanM00PV8t1FL6IHc2UXepIH2z79d49ArZ2LoJHGrY=
 github.com/splitio/go-split-commons/v4 v4.2.3 h1:/bQg8Z0eCkF9RHl7Dh1SJ8j7Ci024bgtkZEWwEKXywc=
 github.com/splitio/go-split-commons/v4 v4.2.3/go.mod h1:mzanM00PV8t1FL6IHc2UXepIH2z79d49ArZ2LoJHGrY=
-github.com/splitio/go-toolkit/v4 v4.2.0/go.mod h1:EdIHN0yzB1GTXDYQc0KdKvnjkO/jfUM2YqHVYfhD3Wo=
 github.com/splitio/go-toolkit/v5 v5.2.2 h1:VHSJoIH9tsRt2cCzGKN4WG3BoGCr0tCPZIl8APtJ4bw=
 github.com/splitio/go-toolkit/v5 v5.2.2/go.mod h1:SYi/svhhtEgdMSb5tNcDcMjOSUH/7XVkvjp5dPL+nBE=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
-github.com/stephens2424/writerset v1.0.2/go.mod h1:aS2JhsMn6eA7e82oNmW4rfsgAOp9COBTTl8mzkwADnc=
-github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7Z4dM9/Y=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -1697,62 +1439,39 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
-github.com/tebeka/snowball v0.4.2/go.mod h1:4IfL14h1lvwZcp1sfXuuc7/7yCsvVffTWxWxCLfFpYg=
-github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8=
 github.com/throttled/throttled v2.2.5+incompatible h1:65UB52X0qNTYiT0Sohp8qLYVFwZQPDw85uSa65OljjQ=
 github.com/throttled/throttled v2.2.5+incompatible/go.mod h1:0BjlrEGQmvxps+HuXLsyRdqpSRvJpq0PNIsOtqP9Nos=
-github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
 github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
-github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw=
 github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
 github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
 github.com/twmb/murmur3 v1.1.6 h1:mqrRot1BRxm+Yct+vavLMou2/iJt0tNVTTC0QoIjaZg=
 github.com/twmb/murmur3 v1.1.6/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
-github.com/tylerb/graceful v1.2.15/go.mod h1:LPYTbOYmUTdabwRt0TGhLllQ0MUNbs0Y5q1WXJOI9II=
-github.com/uber/jaeger-client-go v2.29.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
 github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
 github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
-github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
 github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
-github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
-github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
 github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
 github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
@@ -1763,19 +1482,14 @@ github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmF
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
 github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
 github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
-github.com/wiggin77/cfg v1.0.2/go.mod h1:b3gotba2e5bXTqTW48DwIFoLc+4lWKP7WPi/CdvZ4aE=
-github.com/wiggin77/merror v1.0.2/go.mod h1:uQTcIU0Z6jRK4OwqganPYerzQxSFJ4GSHM3aurxxQpg=
-github.com/wiggin77/merror v1.0.3/go.mod h1:H2ETSu7/bPE0Ymf4bEwdUoo73OOEkdClnoRisfw0Nm0=
 github.com/wiggin77/merror v1.0.4 h1:XxFLEevmQQfgJW2AxhapuMG7C1fQqfbim/XyUmYv/ZM=
 github.com/wiggin77/merror v1.0.4/go.mod h1:H2ETSu7/bPE0Ymf4bEwdUoo73OOEkdClnoRisfw0Nm0=
 github.com/wiggin77/srslog v1.0.1 h1:gA2XjSMy3DrRdX9UqLuDtuVAAshb8bE1NhX1YK0Qe+8=
 github.com/wiggin77/srslog v1.0.1/go.mod h1:fehkyYDq1QfuYn60TDPu9YdY2bB85VUW2mvN1WynEls=
-github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
 github.com/writeas/go-strip-markdown v2.0.1+incompatible h1:IIqxTM5Jr7RzhigcL6FkrCNfXkvbR+Nbu1ls48pXYcw=
@@ -1784,29 +1498,21 @@ github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVT
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
-github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g=
 github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM=
-github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
-github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
-github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
-github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.3.8/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark v1.5.3 h1:3HUJmBFbQW9fhQOzMgseU134xfi6hU+mjWywx5Ty+/M=
 github.com/yuin/goldmark v1.5.3/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -1814,7 +1520,6 @@ github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX
 github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
-github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -1829,12 +1534,9 @@ go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lL
 go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE=
 go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc=
 go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4=
-go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.7.0/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8=
 go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
-go.opencensus.io v0.19.1/go.mod h1:gug0GbSHa8Pafr0d2urOSgoXHZ6x/RUlaiT0d9pqb4A=
-go.opencensus.io v0.19.2/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -1846,9 +1548,7 @@ go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUz
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4=
-go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0=
 go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo=
-go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I=
 go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
 go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI=
 go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM=
@@ -1856,17 +1556,13 @@ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE=
-go.opentelemetry.io/otel/internal/metric v0.21.0/go.mod h1:iOfAaY2YycsXfYD4kaRSbLx2LKmfpKObWBEv9QK5zFo=
 go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=
-go.opentelemetry.io/otel/metric v0.21.0/go.mod h1:JWCt1bjivC4iCrz/aCrM1GSw+ZcvY44KCbaeeRhzHnc=
 go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw=
-go.opentelemetry.io/otel/oteltest v1.0.0-RC1/go.mod h1:+eoIG0gdEOaPNftuy1YScLr1Gb4mL/9lpDkZ0JjMRq4=
 go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc=
 go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
 go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE=
 go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE=
 go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=
-go.opentelemetry.io/otel/trace v1.0.0-RC1/go.mod h1:86UHmyHWFEtWjfWPSbu0+d0Pf9Q6e1U+3ViBOc+NXAg=
 go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk=
 go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5fjhKeJGZPGFs=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
@@ -1875,7 +1571,6 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
@@ -1883,20 +1578,17 @@ go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
-golang.org/x/build v0.0.0-20190314133821-5284462c4bec/go.mod h1:atTaCNAy0f16Ah5aV1gMSwgiKVHwu/JncqDpuRr7lS4=
 golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -1908,20 +1600,15 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -1941,10 +1628,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -1953,12 +1638,10 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o
 golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210622092929-e6eecd499c2c/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.3.0 h1:HTDXbdK9bjfSWkPzDJIw89W8CAtfFGduujWs33NLLsg=
 golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -1978,7 +1661,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -1988,7 +1670,6 @@ golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2001,12 +1682,10 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -2019,7 +1698,6 @@ golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -2034,15 +1712,11 @@ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201029221708-28c70e62bb1d/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -2079,7 +1753,6 @@ golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAG
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2121,10 +1794,6 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2151,11 +1820,8 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2188,7 +1854,6 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2197,7 +1862,6 @@ golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201029080932-201ba4db2418/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2210,7 +1874,6 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2298,20 +1961,16 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -2325,7 +1984,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -2360,15 +2018,9 @@ golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200806022845-90696ccdc692/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200814230902-9882f1d1823d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200818005847-188abfa75333/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
-golang.org/x/tools v0.0.0-20200928182047-19e03678916f/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
-golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -2402,9 +2054,7 @@ gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY=
 google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
-google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
-google.golang.org/api v0.2.0/go.mod h1:IfRCZScioGtypHNTlz3gFk67J8uePVW7uDTBzXuIkhU=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -2450,15 +2100,12 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk=
-google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
-google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
 google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190321212433-e79c0c59cdb5/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -2490,13 +2137,9 @@ google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7Fc
 google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200911024640-645f7a48b24f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201030142918-24207fddd1c3/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -2539,12 +2182,10 @@ google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2I
 google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf h1:/JqRexUvugu6JURQ0O7RfV1EnvgrOxUV4tSjuAv0Sr0=
 google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
-google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -2560,7 +2201,6 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
@@ -2612,25 +2252,18 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
-gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
-gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
 gopkg.in/guregu/null.v4 v4.0.0 h1:1Wm3S1WEA2I26Kq+6vcW+w0gcDo44YKYD7YIEJNHDjg=
 gopkg.in/guregu/null.v4 v4.0.0/go.mod h1:YoQhUrADuG3i9WqesrCmpNRwm1ypAgSHYqoOcTu/JrI=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk=
 gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
-gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-gopkg.in/olivere/elastic.v6 v6.2.35/go.mod h1:2cTT8Z+/LcArSWpCgvZqBgt3VOqXiy7v00w12Lz8bd4=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
@@ -2648,7 +2281,6 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -2663,7 +2295,6 @@ gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 gotest.tools/v3 v3.1.0/go.mod h1:fHy7eyTmJFO5bQbUsEGQ1v4m2J3Jz9eWL54TP2/ZuYQ=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -2796,5 +2427,3 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
-willnorris.com/go/gifresize v1.0.0/go.mod h1:eBM8gogBGCcaH603vxSpnfjwXIpq6nmnj/jauBDKtAk=
-willnorris.com/go/imageproxy v0.10.0/go.mod h1:2tWdKRneln3E9X/zwH1RINpQAQWPeUiNynZ7UQ9OROk=
diff --git a/server/channels/app/work_template_executor.go b/server/channels/app/work_template_executor.go
index 400193ae02..a290434b37 100644
--- a/server/channels/app/work_template_executor.go
+++ b/server/channels/app/work_template_executor.go
@@ -10,7 +10,7 @@ import (
 	"regexp"
 	"strings"
 
-	pbclient "github.com/mattermost/mattermost-plugin-playbooks/client"
+	pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client"
 
 	fb_model "github.com/mattermost/mattermost-server/v6/server/boards/model"
 
diff --git a/server/channels/app/work_templates_test.go b/server/channels/app/work_templates_test.go
index 1f67662f7a..6d90b33665 100644
--- a/server/channels/app/work_templates_test.go
+++ b/server/channels/app/work_templates_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
 	"github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates"
 
-	pbclient "github.com/mattermost/mattermost-plugin-playbooks/client"
+	pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client"
 )
 
 func TestGetWorkTemplateCategories(t *testing.T) {
diff --git a/server/channels/app/worktemplates/model.go b/server/channels/app/worktemplates/model.go
index 4d9699509b..88223820d3 100644
--- a/server/channels/app/worktemplates/model.go
+++ b/server/channels/app/worktemplates/model.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"net/http"
 
-	pbclient "github.com/mattermost/mattermost-plugin-playbooks/client"
+	pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client"
 
 	"github.com/mattermost/mattermost-server/v6/model"
 )
diff --git a/server/channels/app/worktemplates/model_test.go b/server/channels/app/worktemplates/model_test.go
index ae6126f9d1..53e737a55c 100644
--- a/server/channels/app/worktemplates/model_test.go
+++ b/server/channels/app/worktemplates/model_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/v6/model"
 
-	pbclient "github.com/mattermost/mattermost-plugin-playbooks/client"
+	pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client"
 )
 
 func TestCanBeExecuted(t *testing.T) {

From 8c73f092e8536653998ffa434e92f24275a98319 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 12 Apr 2023 15:11:46 -0700
Subject: [PATCH 039/103] Fix public boards setting not applying properly.
 (#22921)

---
 server/boards/auth/auth.go                    |  4 +++
 .../integrationtests/permissions_test.go      | 29 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/server/boards/auth/auth.go b/server/boards/auth/auth.go
index 1b038d5768..0e90c8ecbd 100644
--- a/server/boards/auth/auth.go
+++ b/server/boards/auth/auth.go
@@ -58,6 +58,10 @@ func (a *Auth) IsValidReadToken(boardID string, readToken string) (bool, error)
 		return false, err
 	}
 
+	if !a.config.EnablePublicSharedBoards {
+		return false, errors.New("public shared boards disabled")
+	}
+
 	if sharing != nil && (sharing.ID == boardID && sharing.Enabled && sharing.Token == readToken) {
 		return true, nil
 	}
diff --git a/server/boards/integrationtests/permissions_test.go b/server/boards/integrationtests/permissions_test.go
index 573f55c2db..e86f1d1c64 100644
--- a/server/boards/integrationtests/permissions_test.go
+++ b/server/boards/integrationtests/permissions_test.go
@@ -585,6 +585,35 @@ func TestPermissionsGetBoard(t *testing.T) {
 	})
 }
 
+func TestPermissionsGetBoardPublic(t *testing.T) {
+	ttCases := []TestCase{
+		{"/boards/{PRIVATE_BOARD_ID}?read_token=invalid", methodGet, "", userAnon, http.StatusUnauthorized, 0},
+		{"/boards/{PRIVATE_BOARD_ID}?read_token=valid", methodGet, "", userAnon, http.StatusUnauthorized, 1},
+		{"/boards/{PRIVATE_BOARD_ID}?read_token=invalid", methodGet, "", userNoTeamMember, http.StatusForbidden, 0},
+		{"/boards/{PRIVATE_BOARD_ID}?read_token=valid", methodGet, "", userTeamMember, http.StatusForbidden, 1},
+	}
+	t.Run("plugin", func(t *testing.T) {
+		th := SetupTestHelperPluginMode(t)
+		defer th.TearDown()
+		cfg := th.Server.Config()
+		cfg.EnablePublicSharedBoards = false
+		th.Server.UpdateAppConfig()
+		clients := setupClients(th)
+		testData := setupData(t, th)
+		runTestCases(t, ttCases, testData, clients)
+	})
+	t.Run("local", func(t *testing.T) {
+		th := SetupTestHelperLocalMode(t)
+		defer th.TearDown()
+		cfg := th.Server.Config()
+		cfg.EnablePublicSharedBoards = false
+		th.Server.UpdateAppConfig()
+		clients := setupLocalClients(th)
+		testData := setupData(t, th)
+		runTestCases(t, ttCases, testData, clients)
+	})
+}
+
 func TestPermissionsPatchBoard(t *testing.T) {
 	ttCases := []TestCase{
 		{"/boards/{PRIVATE_BOARD_ID}", methodPatch, "{\"title\": \"test\"}", userAnon, http.StatusUnauthorized, 0},

From abb34c4879c8bb7feab2f14b54fbf6c5dfa29683 Mon Sep 17 00:00:00 2001
From: Colton Shaw <46071821+coltoneshaw@users.noreply.github.com>
Date: Wed, 12 Apr 2023 18:34:28 -0700
Subject: [PATCH 040/103] [Webapp] added hour diff to profile (#22669)

Automatic Merge
---
 webapp/channels/package.json                  |  2 +-
 .../profile_popover/profile_localtime.tsx     | 99 +++++++++++++++++++
 .../profile_popover/profile_popover.tsx       | 26 ++---
 webapp/channels/src/i18n/en.json              |  3 +
 webapp/package-lock.json                      | 16 +--
 5 files changed, 117 insertions(+), 29 deletions(-)
 create mode 100644 webapp/channels/src/components/profile_popover/profile_localtime.tsx

diff --git a/webapp/channels/package.json b/webapp/channels/package.json
index 5156360006..d33b6e0d89 100644
--- a/webapp/channels/package.json
+++ b/webapp/channels/package.json
@@ -51,7 +51,7 @@
     "localforage": "1.10.0",
     "localforage-observable": "2.1.1",
     "lodash": "4.17.21",
-    "luxon": "3.0.4",
+    "luxon": "3.3.0",
     "mark.js": "8.11.1",
     "marked": "github:mattermost/marked#2ef7f28cc7718e3f551c4ce9ea75fdd7580c2008",
     "memoize-one": "6.0.0",
diff --git a/webapp/channels/src/components/profile_popover/profile_localtime.tsx b/webapp/channels/src/components/profile_popover/profile_localtime.tsx
new file mode 100644
index 0000000000..dcb27a5ac9
--- /dev/null
+++ b/webapp/channels/src/components/profile_popover/profile_localtime.tsx
@@ -0,0 +1,99 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {DateTime, Duration} from 'luxon';
+
+import {FormattedMessage} from 'react-intl';
+
+import {UserTimezone} from '@mattermost/types/users';
+import Timestamp from 'components/timestamp';
+import {getUserCurrentTimezone} from 'mattermost-redux/utils/timezone_utils';
+
+type ProfileTimezoneProps = {
+    profileUserTimezone?: UserTimezone;
+    currentUserTimezone: string | undefined;
+}
+
+const returnTimeDiff = (
+    currentUserTimezone: string | undefined | null,
+    profileUserTimezone: string,
+) => {
+    if (!currentUserTimezone) {
+        return null;
+    }
+    const currentUserDate = DateTime.local().setZone(currentUserTimezone);
+    const profileUserDate = DateTime.local().setZone(profileUserTimezone);
+
+    const offset = Duration.fromObject({
+        hours: (profileUserDate.offset - currentUserDate.offset) / 60,
+    });
+
+    if (!offset.valueOf()) {
+        return undefined;
+    }
+
+    const timeOffset = offset.toHuman({unitDisplay: 'short', signDisplay: 'never'});
+
+    return offset.valueOf() > 0 ? (
+        <FormattedMessage
+            id='user_profile.account.hoursAhead'
+            defaultMessage='({timeOffset} ahead)'
+            values={{timeOffset}}
+        />
+    ) : (
+        <FormattedMessage
+            id='user_profile.account.hoursBehind'
+            defaultMessage='({timeOffset} behind)'
+            values={{timeOffset}}
+        />
+    );
+};
+
+export const ProfileTimezone = (
+    {
+        currentUserTimezone,
+        profileUserTimezone,
+    }: ProfileTimezoneProps,
+) => {
+    const profileTimezone = getUserCurrentTimezone(profileUserTimezone) || 'UTC';
+    const profileTimezoneShort = profileTimezone ? DateTime.now().setZone(profileTimezone).offsetNameShort : undefined;
+
+    return (
+        <div
+            className='user-popover__time-status-container'
+        >
+            <span className='user-popover__subtitle'>
+                {profileTimezoneShort ? (
+                    <FormattedMessage
+                        id='user_profile.account.localTimeWithTimezone'
+                        defaultMessage='Local Time ({timezone})'
+                        values={{
+                            timezone: profileTimezoneShort,
+                        }}
+                    />
+                ) : (
+                    <FormattedMessage
+                        id='user_profile.account.localTime'
+                        defaultMessage='Local Time'
+                    />
+                )}
+
+            </span>
+            <span>
+                <Timestamp
+                    useRelative={false}
+                    useDate={false}
+                    userTimezone={profileUserTimezone}
+                    useTime={{
+                        hour: 'numeric',
+                        minute: 'numeric',
+                    }}
+                />
+                {' '}
+                {returnTimeDiff(currentUserTimezone, profileTimezone)}
+            </span>
+
+        </div>
+    );
+};
diff --git a/webapp/channels/src/components/profile_popover/profile_popover.tsx b/webapp/channels/src/components/profile_popover/profile_popover.tsx
index 44f860579f..286cf45bba 100644
--- a/webapp/channels/src/components/profile_popover/profile_popover.tsx
+++ b/webapp/channels/src/components/profile_popover/profile_popover.tsx
@@ -23,6 +23,8 @@ import {t} from 'utils/i18n';
 import * as Utils from 'utils/utils';
 import {shouldFocusMainTextbox} from 'utils/post_utils';
 
+import {ProfileTimezone} from './profile_localtime';
+
 import StatusIcon from 'components/status_icon';
 import Timestamp from 'components/timestamp';
 import UserSettingsModal from 'components/user_settings/modal';
@@ -574,27 +576,11 @@ class ProfilePopover extends React.PureComponent<ProfilePopoverProps, ProfilePop
             !haveOverrideProp
         ) {
             dataContent.push(
-                <div
+                <ProfileTimezone
+                    currentUserTimezone={this.props.currentUserTimezone}
+                    profileUserTimezone={this.props.user.timezone}
                     key='user-popover-local-time'
-                    className='user-popover__time-status-container'
-                >
-                    <span className='user-popover__subtitle' >
-                        <FormattedMessage
-                            id='user_profile.account.localTime'
-                            defaultMessage='Local Time'
-                        />
-                    </span>
-                    <Timestamp
-                        useRelative={false}
-                        useDate={false}
-                        userTimezone={this.props.user?.timezone}
-                        useTime={{
-                            hour: 'numeric',
-                            minute: 'numeric',
-                            timeZoneName: 'short',
-                        }}
-                    />
-                </div>,
+                />,
             );
         }
 
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 8d285dd78e..a22b676e6e 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -5255,7 +5255,10 @@
   "user_groups_modal.viewGroup": "View Group",
   "user_list.notFound": "No users found",
   "user_profile.account.editProfile": "Edit Profile",
+  "user_profile.account.hoursAhead": "({timeOffset} ahead)",
+  "user_profile.account.hoursBehind": "({timeOffset} behind)",
   "user_profile.account.localTime": "Local Time",
+  "user_profile.account.localTimeWithTimezone": "Local Time ({timezone})",
   "user_profile.account.post_was_created": "This post was created by an integration from",
   "user_profile.add_user_to_channel": "Add to a Channel",
   "user_profile.add_user_to_channel.icon": "Add User to Channel Icon",
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index d4c2bb01ff..6cf657c836 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -3598,7 +3598,7 @@
         "localforage": "1.10.0",
         "localforage-observable": "2.1.1",
         "lodash": "4.17.21",
-        "luxon": "3.0.4",
+        "luxon": "3.3.0",
         "mark.js": "8.11.1",
         "marked": "github:mattermost/marked#2ef7f28cc7718e3f551c4ce9ea75fdd7580c2008",
         "memoize-one": "6.0.0",
@@ -24101,9 +24101,9 @@
       }
     },
     "node_modules/luxon": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.0.4.tgz",
-      "integrity": "sha512-aV48rGUwP/Vydn8HT+5cdr26YYQiUZ42NM6ToMoaGKwYfWbfLeRkEu1wXWMHBZT6+KyLfcbbtVcoQFCbbPjKlw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz",
+      "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==",
       "engines": {
         "node": ">=12"
       }
@@ -54303,9 +54303,9 @@
       }
     },
     "luxon": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.0.4.tgz",
-      "integrity": "sha512-aV48rGUwP/Vydn8HT+5cdr26YYQiUZ42NM6ToMoaGKwYfWbfLeRkEu1wXWMHBZT6+KyLfcbbtVcoQFCbbPjKlw=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz",
+      "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg=="
     },
     "lz-string": {
       "version": "1.5.0",
@@ -54521,7 +54521,7 @@
         "localforage": "1.10.0",
         "localforage-observable": "2.1.1",
         "lodash": "4.17.21",
-        "luxon": "3.0.4",
+        "luxon": "3.3.0",
         "mark.js": "8.11.1",
         "marked": "github:mattermost/marked#2ef7f28cc7718e3f551c4ce9ea75fdd7580c2008",
         "memoize-one": "6.0.0",

From 53ed2ce461349ffb3b87dd51ed52c9c43272d184 Mon Sep 17 00:00:00 2001
From: M-ZubairAhmed <m-zubairahmed@protonmail.com>
Date: Thu, 13 Apr 2023 08:31:35 +0530
Subject: [PATCH 041/103] MM-52093 : Revert back the 'global-style' npmrc
 config (#22901)

"global-styles" was added to hoist fewer dependencies from packages to the root node_modules and was initially intended to fix some issues with mismatched dependency versions in the Boards unit tests. However, it was found to be causing problems when the same version of dependencies was used across the products.
---
 webapp/.npmrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/.npmrc b/webapp/.npmrc
index 7f56c3b1a7..1b78f1c6f2 100644
--- a/webapp/.npmrc
+++ b/webapp/.npmrc
@@ -1,3 +1,2 @@
 save-exact=true
 legacy-peer-deps=true
-global-style=true

From 40349cddd47d7273d02c286e3b0de82765c8cfee Mon Sep 17 00:00:00 2001
From: Konstantinos Pittas <konstantinos.pittas@mattermost.com>
Date: Thu, 13 Apr 2023 11:00:55 +0300
Subject: [PATCH 042/103] [MM-51401] Add an extra check for the schema (#22531)

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 server/channels/api4/team.go      |  5 +++++
 server/channels/api4/team_test.go | 33 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/server/channels/api4/team.go b/server/channels/api4/team.go
index 510571f38d..0049b47c38 100644
--- a/server/channels/api4/team.go
+++ b/server/channels/api4/team.go
@@ -117,6 +117,11 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	if team.SchemeId != nil && !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionSysconsoleWriteUserManagementPermissions) {
+		c.SetPermissionError(model.PermissionSysconsoleWriteUserManagementPermissions)
+		return
+	}
+
 	rteam, err := c.App.CreateTeamWithUser(c.AppContext, &team, c.AppContext.Session().UserId)
 	if err != nil {
 		c.Err = err
diff --git a/server/channels/api4/team_test.go b/server/channels/api4/team_test.go
index 80d6839af4..f511ffe3f1 100644
--- a/server/channels/api4/team_test.go
+++ b/server/channels/api4/team_test.go
@@ -95,6 +95,39 @@ func TestCreateTeam(t *testing.T) {
 		CheckForbiddenStatus(t, resp)
 	})
 
+	t.Run("should verify user permissions during team creation", func(t *testing.T) {
+		th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes"))
+		th.App.SetPhase2PermissionsMigrationStatus(true)
+
+		sc := th.SystemAdminClient
+		scheme, _, err := sc.CreateScheme(&model.Scheme{
+			DisplayName: "dn_" + model.NewId(),
+			Name:        model.NewId(),
+			Scope:       model.SchemeScopeTeam,
+		})
+		require.NoError(t, err)
+
+		team, _, err := sc.CreateTeam(&model.Team{
+			DisplayName: "dn_" + model.NewId(),
+			Name:        GenerateTestTeamName(),
+			Email:       th.GenerateTestEmail(),
+			Type:        model.TeamOpen,
+			SchemeId:    &scheme.Id,
+		})
+		require.NoError(t, err)
+		require.Equal(t, scheme.Id, *team.SchemeId)
+
+		_, r, err := th.Client.CreateTeam(&model.Team{
+			DisplayName: "dn_" + model.NewId(),
+			Name:        GenerateTestTeamName(),
+			Email:       th.GenerateTestEmail(),
+			Type:        model.TeamOpen,
+			SchemeId:    &scheme.Id,
+		})
+		require.Error(t, err)
+		CheckForbiddenStatus(t, r)
+	})
+
 	t.Run("should take under consideration the server language when creating a new team", func(t *testing.T) {
 		c := th.SystemAdminClient
 		cfg, _, err := c.GetConfig()

From 24774f51daae65ea8b0e88834bc222cc72125852 Mon Sep 17 00:00:00 2001
From: Ashish Dhama <16203333+AshishDhama@users.noreply.github.com>
Date: Thu, 13 Apr 2023 13:58:41 +0530
Subject: [PATCH 043/103] [MM-52121]: Migrate About build modal unit test to
 testing library (#22927)

* Migrate About build modal unit test to testing library

* add user-event library

* add user event

* remove snapshot
---
 webapp/channels/package.json                  |   1 +
 .../about_build_modal.test.tsx.snap           | 980 ------------------
 .../about_build_modal.test.tsx                | 113 +-
 .../about_build_modal/about_build_modal.tsx   |   7 +-
 webapp/package-lock.json                      |  27 +
 5 files changed, 102 insertions(+), 1026 deletions(-)
 delete mode 100644 webapp/channels/src/components/about_build_modal/__snapshots__/about_build_modal.test.tsx.snap

diff --git a/webapp/channels/package.json b/webapp/channels/package.json
index d33b6e0d89..b948c1d924 100644
--- a/webapp/channels/package.json
+++ b/webapp/channels/package.json
@@ -116,6 +116,7 @@
     "@redux-devtools/extension": "3.2.3",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "12.1.4",
+    "@testing-library/user-event": "12.1.4",
     "@types/bootstrap": "4.5.0",
     "@types/country-list": "2.1.0",
     "@types/enzyme": "3.10.11",
diff --git a/webapp/channels/src/components/about_build_modal/__snapshots__/about_build_modal.test.tsx.snap b/webapp/channels/src/components/about_build_modal/__snapshots__/about_build_modal.test.tsx.snap
deleted file mode 100644
index aad61ae4ed..0000000000
--- a/webapp/channels/src/components/about_build_modal/__snapshots__/about_build_modal.test.tsx.snap
+++ /dev/null
@@ -1,980 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`components/AboutBuildModal should match snapshot for cloud edition 1`] = `
-<ContextProvider
-  value={
-    Object {
-      "store": Object {
-        "clearActions": [Function],
-        "dispatch": [Function],
-        "getActions": [Function],
-        "getState": [Function],
-        "replaceReducer": [Function],
-        "subscribe": [Function],
-      },
-      "subscription": Subscription {
-        "handleChangeWrapper": [Function],
-        "listeners": Object {
-          "notify": [Function],
-        },
-        "onStateChange": [Function],
-        "parentSub": undefined,
-        "store": Object {
-          "clearActions": [Function],
-          "dispatch": [Function],
-          "getActions": [Function],
-          "getState": [Function],
-          "replaceReducer": [Function],
-          "subscribe": [Function],
-        },
-        "unsubscribe": null,
-      },
-    }
-  }
->
-  <AboutBuildModalCloud
-    config={
-      Object {
-        "BuildDate": "21 January 2017",
-        "BuildEnterpriseReady": "true",
-        "BuildHash": "abcdef1234567890",
-        "BuildHashEnterprise": "0123456789abcdef",
-        "BuildNumber": "3.6.2",
-        "PrivacyPolicyLink": "https://about.custom.com/privacy-policy/",
-        "SQLDriverName": "Postgres",
-        "SchemaVersion": "77",
-        "TermsOfServiceLink": "https://about.custom.com/default-terms/",
-        "Version": "3.6.0",
-      }
-    }
-    doHide={[MockFunction]}
-    license={
-      Object {
-        "Cloud": "true",
-        "Company": "Mattermost Inc",
-        "IsLicensed": "true",
-      }
-    }
-    onExited={[MockFunction]}
-    show={true}
-  />
-</ContextProvider>
-`;
-
-exports[`components/AboutBuildModal should match snapshot for enterprise edition 1`] = `
-<Modal
-  animation={true}
-  aria-labelledby="aboutModalLabel"
-  autoFocus={true}
-  backdrop={true}
-  bsClass="modal"
-  dialogClassName="a11y__modal about-modal"
-  dialogComponentClass={[Function]}
-  enforceFocus={true}
-  keyboard={true}
-  manager={
-    ModalManager {
-      "add": [Function],
-      "containers": Array [],
-      "data": Array [],
-      "handleContainerOverflow": true,
-      "hideSiblingNodes": true,
-      "isTopModal": [Function],
-      "modals": Array [],
-      "remove": [Function],
-    }
-  }
-  onExited={[MockFunction]}
-  onHide={[Function]}
-  renderBackdrop={[Function]}
-  restoreFocus={true}
-  role="dialog"
-  show={true}
->
-  <ModalHeader
-    bsClass="modal-header"
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle
-      bsClass="modal-title"
-      componentClass="h1"
-      id="aboutModalLabel"
-    >
-      <MemoizedFormattedMessage
-        defaultMessage="About {appTitle}"
-        id="about.title"
-        values={
-          Object {
-            "appTitle": "Mattermost",
-          }
-        }
-      />
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody
-    bsClass="modal-body"
-    componentClass="div"
-  >
-    <div
-      className="about-modal__content"
-    >
-      <div
-        className="about-modal__logo"
-      >
-        <MattermostLogo />
-      </div>
-      <div>
-        <h3
-          className="about-modal__title"
-        >
-          <strong>
-            Mattermost
-             
-            <MemoizedFormattedMessage
-              defaultMessage="Enterprise Edition"
-              id="about.enterpriseEditione1"
-            />
-          </strong>
-        </h3>
-        <p
-          className="about-modal__subtitle pb-2"
-        >
-          <MemoizedFormattedMessage
-            defaultMessage="Modern communication from behind your firewall."
-            id="about.enterpriseEditionSt"
-          />
-        </p>
-        <div
-          className="form-group less"
-        >
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Mattermost Version:"
-              id="about.version"
-            />
-            <span
-              id="versionString"
-            >
-               3.6.2
-            </span>
-          </div>
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Database Schema Version:"
-              id="about.dbversion"
-            />
-            <span
-              id="dbversionString"
-            >
-               77
-            </span>
-          </div>
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Database:"
-              id="about.database"
-            />
-             Postgres
-          </div>
-        </div>
-        <div
-          className="form-group"
-        >
-          <MemoizedFormattedMessage
-            defaultMessage="Licensed to:"
-            id="about.licensed"
-          />
-          <Nbsp />
-          Mattermost Inc
-        </div>
-      </div>
-    </div>
-    <div
-      className="about-modal__footer"
-    >
-      <div>
-        <MemoizedFormattedMessage
-          defaultMessage="Learn more about Enterprise Edition at "
-          id="about.enterpriseEditionLearn"
-        />
-        <ExternalLink
-          href="https://mattermost.com/"
-          location="about_build_modal"
-        >
-          mattermost.com
-        </ExternalLink>
-      </div>
-      <div
-        className="form-group"
-      >
-        <div
-          className="about-modal__copyright"
-        >
-          <MemoizedFormattedMessage
-            defaultMessage="Copyright 2015 - {currentYear} Mattermost, Inc. All rights reserved"
-            id="about.copyright"
-            values={
-              Object {
-                "currentYear": 2017,
-              }
-            }
-          />
-        </div>
-        <div
-          className="about-modal__links"
-        >
-          <ExternalLink
-            href="https://mattermost.com/terms-of-use/"
-            id="tosLink"
-            location="about_build_modal"
-          >
-            <MemoizedFormattedMessage
-              defaultMessage="Terms of Use"
-              id="about.tos"
-            />
-          </ExternalLink>
-           - 
-          <ExternalLink
-            href="https://mattermost.com/privacy-policy/"
-            id="privacyLink"
-            location="about_build_modal"
-          >
-            <MemoizedFormattedMessage
-              defaultMessage="Privacy Policy"
-              id="about.privacy"
-            />
-          </ExternalLink>
-        </div>
-      </div>
-    </div>
-    <div
-      className="about-modal__notice form-group pt-3"
-    >
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Mattermost is made possible by the open source software used in our <linkServer>server</linkServer>, <linkDesktop>desktop</linkDesktop> and <linkMobile>mobile</linkMobile> apps."
-          id="about.notice"
-          values={
-            Object {
-              "linkDesktop": [Function],
-              "linkMobile": [Function],
-              "linkServer": [Function],
-            }
-          }
-        />
-      </p>
-    </div>
-    <div
-      className="about-modal__hash"
-    >
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Build Hash:"
-          id="about.hash"
-        />
-        <Nbsp />
-        abcdef1234567890
-        <br />
-        <MemoizedFormattedMessage
-          defaultMessage="EE Build Hash:"
-          id="about.hashee"
-        />
-        <Nbsp />
-        0123456789abcdef
-      </p>
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Build Date:"
-          id="about.date"
-        />
-        <Nbsp />
-        21 January 2017
-      </p>
-    </div>
-  </ModalBody>
-</Modal>
-`;
-
-exports[`components/AboutBuildModal should match snapshot for team edition 1`] = `
-<Modal
-  animation={true}
-  aria-labelledby="aboutModalLabel"
-  autoFocus={true}
-  backdrop={true}
-  bsClass="modal"
-  dialogClassName="a11y__modal about-modal"
-  dialogComponentClass={[Function]}
-  enforceFocus={true}
-  keyboard={true}
-  manager={
-    ModalManager {
-      "add": [Function],
-      "containers": Array [],
-      "data": Array [],
-      "handleContainerOverflow": true,
-      "hideSiblingNodes": true,
-      "isTopModal": [Function],
-      "modals": Array [],
-      "remove": [Function],
-    }
-  }
-  onExited={[MockFunction]}
-  onHide={[Function]}
-  renderBackdrop={[Function]}
-  restoreFocus={true}
-  role="dialog"
-  show={true}
->
-  <ModalHeader
-    bsClass="modal-header"
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle
-      bsClass="modal-title"
-      componentClass="h1"
-      id="aboutModalLabel"
-    >
-      <MemoizedFormattedMessage
-        defaultMessage="About {appTitle}"
-        id="about.title"
-        values={
-          Object {
-            "appTitle": "Mattermost",
-          }
-        }
-      />
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody
-    bsClass="modal-body"
-    componentClass="div"
-  >
-    <div
-      className="about-modal__content"
-    >
-      <div
-        className="about-modal__logo"
-      >
-        <MattermostLogo />
-      </div>
-      <div>
-        <h3
-          className="about-modal__title"
-        >
-          <strong>
-            Mattermost
-             
-            <MemoizedFormattedMessage
-              defaultMessage="Team Edition"
-              id="about.teamEditiont0"
-            />
-          </strong>
-        </h3>
-        <p
-          className="about-modal__subtitle pb-2"
-        >
-          <MemoizedFormattedMessage
-            defaultMessage="All your team communication in one place, instantly searchable and accessible anywhere."
-            id="about.teamEditionSt"
-          />
-        </p>
-        <div
-          className="form-group less"
-        >
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Mattermost Version:"
-              id="about.version"
-            />
-            <span
-              id="versionString"
-            >
-               3.6.2
-            </span>
-          </div>
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Database Schema Version:"
-              id="about.dbversion"
-            />
-            <span
-              id="dbversionString"
-            >
-               77
-            </span>
-          </div>
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Database:"
-              id="about.database"
-            />
-             Postgres
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      className="about-modal__footer"
-    >
-      <div>
-        <MemoizedFormattedMessage
-          defaultMessage="Join the Mattermost community at "
-          id="about.teamEditionLearn"
-        />
-        <ExternalLink
-          href="https://mattermost.com/community/"
-          location="about_build_modal"
-        >
-          mattermost.com/community/
-        </ExternalLink>
-      </div>
-      <div
-        className="form-group"
-      >
-        <div
-          className="about-modal__copyright"
-        >
-          <MemoizedFormattedMessage
-            defaultMessage="Copyright 2015 - {currentYear} Mattermost, Inc. All rights reserved"
-            id="about.copyright"
-            values={
-              Object {
-                "currentYear": 2017,
-              }
-            }
-          />
-        </div>
-        <div
-          className="about-modal__links"
-        >
-          <ExternalLink
-            href="https://mattermost.com/terms-of-use/"
-            id="tosLink"
-            location="about_build_modal"
-          >
-            <MemoizedFormattedMessage
-              defaultMessage="Terms of Use"
-              id="about.tos"
-            />
-          </ExternalLink>
-           - 
-          <ExternalLink
-            href="https://mattermost.com/privacy-policy/"
-            id="privacyLink"
-            location="about_build_modal"
-          >
-            <MemoizedFormattedMessage
-              defaultMessage="Privacy Policy"
-              id="about.privacy"
-            />
-          </ExternalLink>
-        </div>
-      </div>
-    </div>
-    <div
-      className="about-modal__notice form-group pt-3"
-    >
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Mattermost is made possible by the open source software used in our <linkServer>server</linkServer>, <linkDesktop>desktop</linkDesktop> and <linkMobile>mobile</linkMobile> apps."
-          id="about.notice"
-          values={
-            Object {
-              "linkDesktop": [Function],
-              "linkMobile": [Function],
-              "linkServer": [Function],
-            }
-          }
-        />
-      </p>
-    </div>
-    <div
-      className="about-modal__hash"
-    >
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Build Hash:"
-          id="about.hash"
-        />
-        <Nbsp />
-        abcdef1234567890
-        <br />
-        <MemoizedFormattedMessage
-          defaultMessage="EE Build Hash:"
-          id="about.hashee"
-        />
-        <Nbsp />
-      </p>
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Build Date:"
-          id="about.date"
-        />
-        <Nbsp />
-        21 January 2017
-      </p>
-    </div>
-  </ModalBody>
-</Modal>
-`;
-
-exports[`components/AboutBuildModal should show ci if a ci build 1`] = `
-<Modal
-  animation={true}
-  aria-labelledby="aboutModalLabel"
-  autoFocus={true}
-  backdrop={true}
-  bsClass="modal"
-  dialogClassName="a11y__modal about-modal"
-  dialogComponentClass={[Function]}
-  enforceFocus={true}
-  keyboard={true}
-  manager={
-    ModalManager {
-      "add": [Function],
-      "containers": Array [],
-      "data": Array [],
-      "handleContainerOverflow": true,
-      "hideSiblingNodes": true,
-      "isTopModal": [Function],
-      "modals": Array [],
-      "remove": [Function],
-    }
-  }
-  onExited={[MockFunction]}
-  onHide={[Function]}
-  renderBackdrop={[Function]}
-  restoreFocus={true}
-  role="dialog"
-  show={true}
->
-  <ModalHeader
-    bsClass="modal-header"
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle
-      bsClass="modal-title"
-      componentClass="h1"
-      id="aboutModalLabel"
-    >
-      <MemoizedFormattedMessage
-        defaultMessage="About {appTitle}"
-        id="about.title"
-        values={
-          Object {
-            "appTitle": "Mattermost",
-          }
-        }
-      />
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody
-    bsClass="modal-body"
-    componentClass="div"
-  >
-    <div
-      className="about-modal__content"
-    >
-      <div
-        className="about-modal__logo"
-      >
-        <MattermostLogo />
-      </div>
-      <div>
-        <h3
-          className="about-modal__title"
-        >
-          <strong>
-            Mattermost
-             
-            <MemoizedFormattedMessage
-              defaultMessage="Team Edition"
-              id="about.teamEditiont0"
-            />
-          </strong>
-        </h3>
-        <p
-          className="about-modal__subtitle pb-2"
-        >
-          <MemoizedFormattedMessage
-            defaultMessage="All your team communication in one place, instantly searchable and accessible anywhere."
-            id="about.teamEditionSt"
-          />
-        </p>
-        <div
-          className="form-group less"
-        >
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Mattermost Version:"
-              id="about.version"
-            />
-            <span
-              id="versionString"
-            >
-               ci
-            </span>
-          </div>
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Database Schema Version:"
-              id="about.dbversion"
-            />
-            <span
-              id="dbversionString"
-            >
-               77
-            </span>
-          </div>
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Build Number:"
-              id="about.buildnumber"
-            />
-            <span
-              id="buildnumberString"
-            >
-               123
-            </span>
-          </div>
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Database:"
-              id="about.database"
-            />
-             Postgres
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      className="about-modal__footer"
-    >
-      <div>
-        <MemoizedFormattedMessage
-          defaultMessage="Join the Mattermost community at "
-          id="about.teamEditionLearn"
-        />
-        <ExternalLink
-          href="https://mattermost.com/community/"
-          location="about_build_modal"
-        >
-          mattermost.com/community/
-        </ExternalLink>
-      </div>
-      <div
-        className="form-group"
-      >
-        <div
-          className="about-modal__copyright"
-        >
-          <MemoizedFormattedMessage
-            defaultMessage="Copyright 2015 - {currentYear} Mattermost, Inc. All rights reserved"
-            id="about.copyright"
-            values={
-              Object {
-                "currentYear": 2017,
-              }
-            }
-          />
-        </div>
-        <div
-          className="about-modal__links"
-        >
-          <ExternalLink
-            href="https://mattermost.com/terms-of-use/"
-            id="tosLink"
-            location="about_build_modal"
-          >
-            <MemoizedFormattedMessage
-              defaultMessage="Terms of Use"
-              id="about.tos"
-            />
-          </ExternalLink>
-           - 
-          <ExternalLink
-            href="https://mattermost.com/privacy-policy/"
-            id="privacyLink"
-            location="about_build_modal"
-          >
-            <MemoizedFormattedMessage
-              defaultMessage="Privacy Policy"
-              id="about.privacy"
-            />
-          </ExternalLink>
-        </div>
-      </div>
-    </div>
-    <div
-      className="about-modal__notice form-group pt-3"
-    >
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Mattermost is made possible by the open source software used in our <linkServer>server</linkServer>, <linkDesktop>desktop</linkDesktop> and <linkMobile>mobile</linkMobile> apps."
-          id="about.notice"
-          values={
-            Object {
-              "linkDesktop": [Function],
-              "linkMobile": [Function],
-              "linkServer": [Function],
-            }
-          }
-        />
-      </p>
-    </div>
-    <div
-      className="about-modal__hash"
-    >
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Build Hash:"
-          id="about.hash"
-        />
-        <Nbsp />
-        abcdef1234567890
-        <br />
-        <MemoizedFormattedMessage
-          defaultMessage="EE Build Hash:"
-          id="about.hashee"
-        />
-        <Nbsp />
-      </p>
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Build Date:"
-          id="about.date"
-        />
-        <Nbsp />
-        21 January 2017
-      </p>
-    </div>
-  </ModalBody>
-</Modal>
-`;
-
-exports[`components/AboutBuildModal should show dev if this is a dev build 1`] = `
-<Modal
-  animation={true}
-  aria-labelledby="aboutModalLabel"
-  autoFocus={true}
-  backdrop={true}
-  bsClass="modal"
-  dialogClassName="a11y__modal about-modal"
-  dialogComponentClass={[Function]}
-  enforceFocus={true}
-  keyboard={true}
-  manager={
-    ModalManager {
-      "add": [Function],
-      "containers": Array [],
-      "data": Array [],
-      "handleContainerOverflow": true,
-      "hideSiblingNodes": true,
-      "isTopModal": [Function],
-      "modals": Array [],
-      "remove": [Function],
-    }
-  }
-  onExited={[MockFunction]}
-  onHide={[Function]}
-  renderBackdrop={[Function]}
-  restoreFocus={true}
-  role="dialog"
-  show={true}
->
-  <ModalHeader
-    bsClass="modal-header"
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle
-      bsClass="modal-title"
-      componentClass="h1"
-      id="aboutModalLabel"
-    >
-      <MemoizedFormattedMessage
-        defaultMessage="About {appTitle}"
-        id="about.title"
-        values={
-          Object {
-            "appTitle": "Mattermost",
-          }
-        }
-      />
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody
-    bsClass="modal-body"
-    componentClass="div"
-  >
-    <div
-      className="about-modal__content"
-    >
-      <div
-        className="about-modal__logo"
-      >
-        <MattermostLogo />
-      </div>
-      <div>
-        <h3
-          className="about-modal__title"
-        >
-          <strong>
-            Mattermost
-             
-            <MemoizedFormattedMessage
-              defaultMessage="Team Edition"
-              id="about.teamEditiont0"
-            />
-          </strong>
-        </h3>
-        <p
-          className="about-modal__subtitle pb-2"
-        >
-          <MemoizedFormattedMessage
-            defaultMessage="All your team communication in one place, instantly searchable and accessible anywhere."
-            id="about.teamEditionSt"
-          />
-        </p>
-        <div
-          className="form-group less"
-        >
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Mattermost Version:"
-              id="about.version"
-            />
-            <span
-              id="versionString"
-            >
-               dev
-            </span>
-          </div>
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Database Schema Version:"
-              id="about.dbversion"
-            />
-            <span
-              id="dbversionString"
-            >
-               77
-            </span>
-          </div>
-          <div>
-            <MemoizedFormattedMessage
-              defaultMessage="Database:"
-              id="about.database"
-            />
-             Postgres
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      className="about-modal__footer"
-    >
-      <div>
-        <MemoizedFormattedMessage
-          defaultMessage="Join the Mattermost community at "
-          id="about.teamEditionLearn"
-        />
-        <ExternalLink
-          href="https://mattermost.com/community/"
-          location="about_build_modal"
-        >
-          mattermost.com/community/
-        </ExternalLink>
-      </div>
-      <div
-        className="form-group"
-      >
-        <div
-          className="about-modal__copyright"
-        >
-          <MemoizedFormattedMessage
-            defaultMessage="Copyright 2015 - {currentYear} Mattermost, Inc. All rights reserved"
-            id="about.copyright"
-            values={
-              Object {
-                "currentYear": 2017,
-              }
-            }
-          />
-        </div>
-        <div
-          className="about-modal__links"
-        >
-          <ExternalLink
-            href="https://mattermost.com/terms-of-use/"
-            id="tosLink"
-            location="about_build_modal"
-          >
-            <MemoizedFormattedMessage
-              defaultMessage="Terms of Use"
-              id="about.tos"
-            />
-          </ExternalLink>
-           - 
-          <ExternalLink
-            href="https://mattermost.com/privacy-policy/"
-            id="privacyLink"
-            location="about_build_modal"
-          >
-            <MemoizedFormattedMessage
-              defaultMessage="Privacy Policy"
-              id="about.privacy"
-            />
-          </ExternalLink>
-        </div>
-      </div>
-    </div>
-    <div
-      className="about-modal__notice form-group pt-3"
-    >
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Mattermost is made possible by the open source software used in our <linkServer>server</linkServer>, <linkDesktop>desktop</linkDesktop> and <linkMobile>mobile</linkMobile> apps."
-          id="about.notice"
-          values={
-            Object {
-              "linkDesktop": [Function],
-              "linkMobile": [Function],
-              "linkServer": [Function],
-            }
-          }
-        />
-      </p>
-    </div>
-    <div
-      className="about-modal__hash"
-    >
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Build Hash:"
-          id="about.hash"
-        />
-        <Nbsp />
-        abcdef1234567890
-        <br />
-        <MemoizedFormattedMessage
-          defaultMessage="EE Build Hash:"
-          id="about.hashee"
-        />
-        <Nbsp />
-      </p>
-      <p>
-        <MemoizedFormattedMessage
-          defaultMessage="Build Date:"
-          id="about.date"
-        />
-        <Nbsp />
-        21 January 2017
-      </p>
-    </div>
-  </ModalBody>
-</Modal>
-`;
diff --git a/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx b/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx
index 33241a3b7b..bff5e106b5 100644
--- a/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx
+++ b/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx
@@ -2,8 +2,6 @@
 // See LICENSE.txt for license information.
 
 import React from 'react';
-import {Modal} from 'react-bootstrap';
-import {shallow} from 'enzyme';
 import {Provider} from 'react-redux';
 
 import mockStore from 'tests/test_store';
@@ -12,11 +10,13 @@ import {ClientConfig, ClientLicense} from '@mattermost/types/config';
 
 import AboutBuildModal from 'components/about_build_modal/about_build_modal';
 
-import {mountWithIntl} from 'tests/helpers/intl-test-helper';
-
 import {AboutLinks} from 'utils/constants';
 
 import AboutBuildModalCloud from './about_build_modal_cloud/about_build_modal_cloud';
+import {screen} from '@testing-library/react';
+import {renderWithIntl} from 'tests/react_testing_utils';
+import store from 'stores/redux_store';
+import userEvent from '@testing-library/user-event';
 
 describe('components/AboutBuildModal', () => {
     const RealDate: DateConstructor = Date;
@@ -60,10 +60,17 @@ describe('components/AboutBuildModal', () => {
     });
 
     test('should match snapshot for enterprise edition', () => {
-        const wrapper = shallowAboutBuildModal({config, license});
-        expect(wrapper.find('#versionString').text()).toBe('\u00a03.6.2');
-        expect(wrapper.find('#dbversionString').text()).toBe('\u00a077');
-        expect(wrapper).toMatchSnapshot();
+        renderAboutBuildModal({config, license});
+        expect(screen.getByTestId('aboutModalVersion')).toHaveTextContent('Mattermost Version: 3.6.2');
+        expect(screen.getByTestId('aboutModalDBVersionString')).toHaveTextContent('Database Schema Version: 77');
+        expect(screen.getByText('Mattermost Enterprise Edition')).toBeInTheDocument();
+        expect(screen.getByText('Modern communication from behind your firewall.')).toBeInTheDocument();
+        expect(screen.getByRole('link', {name: 'mattermost.com'})).toHaveAttribute('href', 'https://mattermost.com/?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=&sid=');
+        expect(screen.getByText('EE Build Hash: 0123456789abcdef', {exact: false})).toBeInTheDocument();
+
+        expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt');
+        expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt');
+        expect(screen.getByRole('link', {name: 'mobile'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt');
     });
 
     test('should match snapshot for team edition', () => {
@@ -73,19 +80,25 @@ describe('components/AboutBuildModal', () => {
             BuildHashEnterprise: '',
         };
 
-        const wrapper = shallowAboutBuildModal({config: teamConfig, license: {}});
-        expect(wrapper.find('#versionString').text()).toBe('\u00a03.6.2');
-        expect(wrapper.find('#dbversionString').text()).toBe('\u00a077');
-        expect(wrapper).toMatchSnapshot();
+        renderAboutBuildModal({config: teamConfig, license: {}});
+        expect(screen.getByTestId('aboutModalVersion')).toHaveTextContent('Mattermost Version: 3.6.2');
+        expect(screen.getByTestId('aboutModalDBVersionString')).toHaveTextContent('Database Schema Version: 77');
+        expect(screen.getByText('Mattermost Team Edition')).toBeInTheDocument();
+        expect(screen.getByText('All your team communication in one place, instantly searchable and accessible anywhere.')).toBeInTheDocument();
+        expect(screen.getByRole('link', {name: 'mattermost.com/community/'})).toHaveAttribute('href', 'https://mattermost.com/community/?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=&sid=');
+        expect(screen.queryByText('EE Build Hash: 0123456789abcdef')).not.toBeInTheDocument();
+
+        expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt');
+        expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt');
+        expect(screen.getByRole('link', {name: 'mobile'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt');
     });
 
     test('should match snapshot for cloud edition', () => {
         if (license !== null) {
             license.Cloud = 'true';
         }
-        const store = mockStore();
 
-        const wrapper = shallow(
+        renderWithIntl(
             <Provider store={store}>
                 <AboutBuildModalCloud
                     config={config}
@@ -96,7 +109,14 @@ describe('components/AboutBuildModal', () => {
                 />
             </Provider>,
         );
-        expect(wrapper).toMatchSnapshot();
+
+        expect(screen.getByText('Mattermost Cloud')).toBeInTheDocument();
+        expect(screen.getByText('High trust messaging for the enterprise')).toBeInTheDocument();
+
+        expect(screen.getByText('0123456789abcdef', {exact: false})).toBeInTheDocument();
+        expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt');
+        expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt');
+        expect(screen.getByRole('link', {name: 'mobile'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt');
     });
 
     test('should show dev if this is a dev build', () => {
@@ -109,10 +129,18 @@ describe('components/AboutBuildModal', () => {
             BuildNumber: 'dev',
         };
 
-        const wrapper = shallowAboutBuildModal({config: sameBuildConfig, license: {}});
-        expect(wrapper).toMatchSnapshot();
-        expect(wrapper.find('#versionString').text()).toBe('\u00a0dev');
-        expect(wrapper.find('#dbversionString').text()).toBe('\u00a077');
+        renderAboutBuildModal({config: sameBuildConfig, license: {}});
+
+        expect(screen.getByTestId('aboutModalVersion')).toHaveTextContent('Mattermost Version: dev');
+        expect(screen.getByTestId('aboutModalDBVersionString')).toHaveTextContent('Database Schema Version: 77');
+        expect(screen.getByText('Mattermost Team Edition')).toBeInTheDocument();
+        expect(screen.getByText('All your team communication in one place, instantly searchable and accessible anywhere.')).toBeInTheDocument();
+        expect(screen.getByRole('link', {name: 'mattermost.com/community/'})).toHaveAttribute('href', 'https://mattermost.com/community/?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=&sid=');
+        expect(screen.queryByText('EE Build Hash: 0123456789abcdef')).not.toBeInTheDocument();
+
+        expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt');
+        expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt');
+        expect(screen.getByRole('link', {name: 'mobile'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt');
     });
 
     test('should show ci if a ci build', () => {
@@ -125,11 +153,19 @@ describe('components/AboutBuildModal', () => {
             BuildNumber: '123',
         };
 
-        const wrapper = shallowAboutBuildModal({config: differentBuildConfig, license: {}});
-        expect(wrapper).toMatchSnapshot();
-        expect(wrapper.find('#versionString').text()).toBe('\u00a0ci');
-        expect(wrapper.find('#dbversionString').text()).toBe('\u00a077');
-        expect(wrapper.find('#buildnumberString').text()).toBe('\u00a0123');
+        renderAboutBuildModal({config: differentBuildConfig, license: {}});
+
+        expect(screen.getByTestId('aboutModalVersion')).toHaveTextContent('Mattermost Version: ci');
+        expect(screen.getByTestId('aboutModalDBVersionString')).toHaveTextContent('Database Schema Version: 77');
+        expect(screen.getByTestId('aboutModalBuildNumber')).toHaveTextContent('Build Number: 123');
+        expect(screen.getByText('Mattermost Team Edition')).toBeInTheDocument();
+        expect(screen.getByText('All your team communication in one place, instantly searchable and accessible anywhere.')).toBeInTheDocument();
+        expect(screen.getByRole('link', {name: 'mattermost.com/community/'})).toHaveAttribute('href', 'https://mattermost.com/community/?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=&sid=');
+        expect(screen.queryByText('EE Build Hash: 0123456789abcdef')).not.toBeInTheDocument();
+
+        expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt');
+        expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt');
+        expect(screen.getByRole('link', {name: 'mobile'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt');
     });
 
     test('should call onExited callback when the modal is hidden', () => {
@@ -148,7 +184,7 @@ describe('components/AboutBuildModal', () => {
             },
         });
 
-        const wrapper = mountWithIntl(
+        renderWithIntl(
             <Provider store={store}>
                 <AboutBuildModal
                     config={config}
@@ -158,7 +194,7 @@ describe('components/AboutBuildModal', () => {
             </Provider>,
         );
 
-        wrapper.find(Modal).first().props().onExited?.(document.createElement('div'));
+        userEvent.click(screen.getByText('Close'));
         expect(onExited).toHaveBeenCalledTimes(1);
     });
 
@@ -176,7 +212,7 @@ describe('components/AboutBuildModal', () => {
                 },
             },
         });
-        const wrapper = mountWithIntl(
+        renderWithIntl(
             <Provider store={store}>
                 <AboutBuildModal
                     config={config}
@@ -186,24 +222,15 @@ describe('components/AboutBuildModal', () => {
             </Provider>,
         );
 
-        expect(
-            wrapper.find(AboutBuildModal).find('a#tosLink').props().href,
-        ).toBe(
-            AboutLinks.TERMS_OF_SERVICE +
-                '?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=currentUserId&sid=',
-        );
-        expect(
-            wrapper.find(AboutBuildModal).find('a#privacyLink').props().href,
-        ).toBe(
-            AboutLinks.PRIVACY_POLICY +
-                '?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=currentUserId&sid=',
-        );
+        expect(screen.getByRole('link', {name: 'Terms of Use'})).toHaveAttribute('href', `${AboutLinks.TERMS_OF_SERVICE}?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=currentUserId&sid=`);
 
-        expect(wrapper.find(AboutBuildModal).find('a#tosLink').props().href).not.toBe(config?.TermsOfServiceLink);
-        expect(wrapper.find(AboutBuildModal).find('a#privacyLink').props().href).not.toBe(config?.PrivacyPolicyLink);
+        expect(screen.getByRole('link', {name: 'Privacy Policy'})).toHaveAttribute('href', `${AboutLinks.PRIVACY_POLICY}?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=currentUserId&sid=`);
+
+        expect(screen.getByRole('link', {name: 'Terms of Use'})).not.toHaveAttribute('href', config?.TermsOfServiceLink);
+        expect(screen.getByRole('link', {name: 'Privacy Policy'})).not.toHaveAttribute('href', config?.PrivacyPolicyLink);
     });
 
-    function shallowAboutBuildModal(props = {}) {
+    function renderAboutBuildModal(props = {}) {
         const onExited = jest.fn();
         const show = true;
 
@@ -215,6 +242,6 @@ describe('components/AboutBuildModal', () => {
             ...props,
         };
 
-        return shallow(<AboutBuildModal {...allProps}/>);
+        return renderWithIntl(<Provider store={store}><AboutBuildModal {...allProps}/></Provider>);
     }
 });
diff --git a/webapp/channels/src/components/about_build_modal/about_build_modal.tsx b/webapp/channels/src/components/about_build_modal/about_build_modal.tsx
index ff7c7bd6ab..69ef4a84ea 100644
--- a/webapp/channels/src/components/about_build_modal/about_build_modal.tsx
+++ b/webapp/channels/src/components/about_build_modal/about_build_modal.tsx
@@ -49,6 +49,7 @@ export default class AboutBuildModal extends React.PureComponent<Props, State> {
 
     doHide = () => {
         this.setState({show: false});
+        this.props.onExited();
     };
 
     render() {
@@ -172,7 +173,7 @@ export default class AboutBuildModal extends React.PureComponent<Props, State> {
 
         // Only show build number if it's a number (so only builds from Jenkins)
         let buildnumber: JSX.Element | null = (
-            <div>
+            <div data-testid='aboutModalBuildNumber'>
                 <FormattedMessage
                     id='about.buildnumber'
                     defaultMessage='Build Number:'
@@ -227,7 +228,7 @@ export default class AboutBuildModal extends React.PureComponent<Props, State> {
                                 {subTitle}
                             </p>
                             <div className='form-group less'>
-                                <div>
+                                <div data-testid='aboutModalVersion'>
                                     <FormattedMessage
                                         id='about.version'
                                         defaultMessage='Mattermost Version:'
@@ -236,7 +237,7 @@ export default class AboutBuildModal extends React.PureComponent<Props, State> {
                                         {'\u00a0' + mmversion}
                                     </span>
                                 </div>
-                                <div>
+                                <div data-testid='aboutModalDBVersionString'>
                                     <FormattedMessage
                                         id='about.dbversion'
                                         defaultMessage='Database Schema Version:'
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 6cf657c836..d9d8e7e3f7 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -3663,6 +3663,7 @@
         "@redux-devtools/extension": "3.2.3",
         "@testing-library/jest-dom": "5.16.4",
         "@testing-library/react": "12.1.4",
+        "@testing-library/user-event": "12.1.4",
         "@types/bootstrap": "4.5.0",
         "@types/country-list": "2.1.0",
         "@types/enzyme": "3.10.11",
@@ -3844,6 +3845,22 @@
         }
       }
     },
+    "channels/node_modules/@testing-library/user-event": {
+      "version": "12.1.4",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.1.4.tgz",
+      "integrity": "sha512-vd5s43lNfyq/JEr8ndQmS+An6dEVUmjW9zqtpmMHU+rrPMaHLrUIlWZ9wDE8ALS/dFMsu6U00A5X/7Dv/2tWnw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=10",
+        "npm": ">=6"
+      },
+      "peerDependencies": {
+        "@testing-library/dom": ">=7.21.4"
+      }
+    },
     "channels/node_modules/@types/react-select": {
       "version": "3.0.19",
       "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.19.tgz",
@@ -54422,6 +54439,7 @@
         "@stripe/stripe-js": "1.41.0",
         "@testing-library/jest-dom": "5.16.4",
         "@testing-library/react": "12.1.4",
+        "@testing-library/user-event": "12.1.4",
         "@tippyjs/react": "4.2.6",
         "@types/bootstrap": "4.5.0",
         "@types/color-hash": "1.0.2",
@@ -54668,6 +54686,15 @@
             "typescript": "^4.7"
           }
         },
+        "@testing-library/user-event": {
+          "version": "12.1.4",
+          "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.1.4.tgz",
+          "integrity": "sha512-vd5s43lNfyq/JEr8ndQmS+An6dEVUmjW9zqtpmMHU+rrPMaHLrUIlWZ9wDE8ALS/dFMsu6U00A5X/7Dv/2tWnw==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.10.2"
+          }
+        },
         "@types/react-select": {
           "version": "3.0.19",
           "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.19.tgz",

From 35d3e3e91e8f0b5df5a53ddd815e9407fbdf2687 Mon Sep 17 00:00:00 2001
From: "Sinan Sonmez (Chaush)" <37421564+sinansonmez@users.noreply.github.com>
Date: Thu, 13 Apr 2023 10:51:11 +0200
Subject: [PATCH 044/103] GH21563: Add the request context and logger to all
 public methods in app/admin.go (#22898)

* migrate mlog

* fix linter issue
---
 server/channels/api4/system.go                |  6 ++---
 server/channels/app/admin.go                  | 24 +++++++++----------
 server/channels/app/app_iface.go              |  6 ++---
 .../app/opentracing/opentracing_layer.go      | 12 +++++-----
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/server/channels/api4/system.go b/server/channels/api4/system.go
index 705f2680d3..216533b67f 100644
--- a/server/channels/api4/system.go
+++ b/server/channels/api4/system.go
@@ -295,7 +295,7 @@ func databaseRecycle(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	c.App.RecycleDatabaseConnection()
+	c.App.RecycleDatabaseConnection(c.AppContext)
 
 	auditRec.Success()
 	ReturnStatusOK(w)
@@ -348,7 +348,7 @@ func queryLogs(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	logs, logerr := c.App.QueryLogs(c.Params.Page, c.Params.LogsPerPage, logFilter)
+	logs, logerr := c.App.QueryLogs(c.AppContext, c.Params.Page, c.Params.LogsPerPage, logFilter)
 	if logerr != nil {
 		c.Err = logerr
 		return
@@ -387,7 +387,7 @@ func getLogs(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	lines, appErr := c.App.GetLogs(c.Params.Page, c.Params.LogsPerPage)
+	lines, appErr := c.App.GetLogs(c.AppContext, c.Params.Page, c.Params.LogsPerPage)
 	if appErr != nil {
 		c.Err = appErr
 		return
diff --git a/server/channels/app/admin.go b/server/channels/app/admin.go
index 697e825812..fb3ab53000 100644
--- a/server/channels/app/admin.go
+++ b/server/channels/app/admin.go
@@ -11,17 +11,17 @@ import (
 	"time"
 
 	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
 	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
 	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
 	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
 )
 
 var latestVersionCache = cache.NewLRU(cache.LRUOptions{
 	Size: 1,
 })
 
-func (s *Server) GetLogs(page, perPage int) ([]string, *model.AppError) {
+func (s *Server) GetLogs(c request.CTX, page, perPage int) ([]string, *model.AppError) {
 	var lines []string
 
 	license := s.License()
@@ -33,7 +33,7 @@ func (s *Server) GetLogs(page, perPage int) ([]string, *model.AppError) {
 			lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
 			lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
 		} else {
-			mlog.Error("Could not get cluster info")
+			c.Logger().Error("Could not get cluster info")
 		}
 	}
 
@@ -56,7 +56,7 @@ func (s *Server) GetLogs(page, perPage int) ([]string, *model.AppError) {
 	return lines, nil
 }
 
-func (s *Server) QueryLogs(page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) {
+func (s *Server) QueryLogs(c request.CTX, page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) {
 	logData := make(map[string][]string)
 
 	serverName := "default"
@@ -66,7 +66,7 @@ func (s *Server) QueryLogs(page, perPage int, logFilter *model.LogFilter) (map[s
 		if info := s.platform.Cluster().GetMyClusterInfo(); info != nil {
 			serverName = info.Hostname
 		} else {
-			mlog.Error("Could not get cluster info")
+			c.Logger().Error("Could not get cluster info")
 		}
 	}
 
@@ -111,12 +111,12 @@ func AddLocalLogs(logData map[string][]string, s *Server, page, perPage int, ser
 	return nil
 }
 
-func (a *App) QueryLogs(page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) {
-	return a.Srv().QueryLogs(page, perPage, logFilter)
+func (a *App) QueryLogs(c request.CTX, page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) {
+	return a.Srv().QueryLogs(c, page, perPage, logFilter)
 }
 
-func (a *App) GetLogs(page, perPage int) ([]string, *model.AppError) {
-	return a.Srv().GetLogs(page, perPage)
+func (a *App) GetLogs(c request.CTX, page, perPage int) ([]string, *model.AppError) {
+	return a.Srv().GetLogs(c, page, perPage)
 }
 
 func (s *Server) GetLogsSkipSend(page, perPage int, logFilter *model.LogFilter) ([]string, *model.AppError) {
@@ -146,15 +146,15 @@ func (s *Server) InvalidateAllCachesSkipSend() {
 
 }
 
-func (a *App) RecycleDatabaseConnection() {
-	mlog.Info("Attempting to recycle database connections.")
+func (a *App) RecycleDatabaseConnection(c request.CTX) {
+	c.Logger().Info("Attempting to recycle database connections.")
 
 	// This works by setting 10 seconds as the max conn lifetime for all DB connections.
 	// This allows in gradually closing connections as they expire. In future, we can think
 	// of exposing this as a param from the REST api.
 	a.Srv().Store().RecycleDBConnections(10 * time.Second)
 
-	mlog.Info("Finished recycling database connections.")
+	c.Logger().Info("Finished recycling database connections.")
 }
 
 func (a *App) TestSiteURL(siteURL string) *model.AppError {
diff --git a/server/channels/app/app_iface.go b/server/channels/app/app_iface.go
index eb30bc0779..b7355144ea 100644
--- a/server/channels/app/app_iface.go
+++ b/server/channels/app/app_iface.go
@@ -682,7 +682,7 @@ type AppIface interface {
 	GetJobsPage(page int, perPage int) ([]*model.Job, *model.AppError)
 	GetLatestTermsOfService() (*model.TermsOfService, *model.AppError)
 	GetLatestVersion(latestVersionUrl string) (*model.GithubReleaseInfo, *model.AppError)
-	GetLogs(page, perPage int) ([]string, *model.AppError)
+	GetLogs(c request.CTX, page, perPage int) ([]string, *model.AppError)
 	GetLogsSkipSend(page, perPage int, logFilter *model.LogFilter) ([]string, *model.AppError)
 	GetMemberCountsByGroup(ctx context.Context, channelID string, includeTimezones bool) ([]*model.ChannelMemberCountByGroup, *model.AppError)
 	GetMessageForNotification(post *model.Post, translateFunc i18n.TranslateFunc) string
@@ -961,9 +961,9 @@ type AppIface interface {
 	PublishUserTyping(userID, channelID, parentId string) *model.AppError
 	PurgeBleveIndexes() *model.AppError
 	PurgeElasticsearchIndexes() *model.AppError
-	QueryLogs(page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError)
+	QueryLogs(c request.CTX, page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError)
 	ReadFile(path string) ([]byte, *model.AppError)
-	RecycleDatabaseConnection()
+	RecycleDatabaseConnection(c request.CTX)
 	RegenCommandToken(cmd *model.Command) (*model.Command, *model.AppError)
 	RegenOutgoingWebhookToken(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, *model.AppError)
 	RegenerateOAuthAppSecret(app *model.OAuthApp) (*model.OAuthApp, *model.AppError)
diff --git a/server/channels/app/opentracing/opentracing_layer.go b/server/channels/app/opentracing/opentracing_layer.go
index 6e522bb971..452ab79fa8 100644
--- a/server/channels/app/opentracing/opentracing_layer.go
+++ b/server/channels/app/opentracing/opentracing_layer.go
@@ -7111,7 +7111,7 @@ func (a *OpenTracingAppLayer) GetLdapGroup(ldapGroupID string) (*model.Group, *m
 	return resultVar0, resultVar1
 }
 
-func (a *OpenTracingAppLayer) GetLogs(page int, perPage int) ([]string, *model.AppError) {
+func (a *OpenTracingAppLayer) GetLogs(c request.CTX, page int, perPage int) ([]string, *model.AppError) {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetLogs")
 
@@ -7123,7 +7123,7 @@ func (a *OpenTracingAppLayer) GetLogs(page int, perPage int) ([]string, *model.A
 	}()
 
 	defer span.Finish()
-	resultVar0, resultVar1 := a.app.GetLogs(page, perPage)
+	resultVar0, resultVar1 := a.app.GetLogs(c, page, perPage)
 
 	if resultVar1 != nil {
 		span.LogFields(spanlog.Error(resultVar1))
@@ -13624,7 +13624,7 @@ func (a *OpenTracingAppLayer) PurgeElasticsearchIndexes() *model.AppError {
 	return resultVar0
 }
 
-func (a *OpenTracingAppLayer) QueryLogs(page int, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) {
+func (a *OpenTracingAppLayer) QueryLogs(c request.CTX, page int, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.QueryLogs")
 
@@ -13636,7 +13636,7 @@ func (a *OpenTracingAppLayer) QueryLogs(page int, perPage int, logFilter *model.
 	}()
 
 	defer span.Finish()
-	resultVar0, resultVar1 := a.app.QueryLogs(page, perPage, logFilter)
+	resultVar0, resultVar1 := a.app.QueryLogs(c, page, perPage, logFilter)
 
 	if resultVar1 != nil {
 		span.LogFields(spanlog.Error(resultVar1))
@@ -13668,7 +13668,7 @@ func (a *OpenTracingAppLayer) ReadFile(path string) ([]byte, *model.AppError) {
 	return resultVar0, resultVar1
 }
 
-func (a *OpenTracingAppLayer) RecycleDatabaseConnection() {
+func (a *OpenTracingAppLayer) RecycleDatabaseConnection(c request.CTX) {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.RecycleDatabaseConnection")
 
@@ -13680,7 +13680,7 @@ func (a *OpenTracingAppLayer) RecycleDatabaseConnection() {
 	}()
 
 	defer span.Finish()
-	a.app.RecycleDatabaseConnection()
+	a.app.RecycleDatabaseConnection(c)
 }
 
 func (a *OpenTracingAppLayer) RegenCommandToken(cmd *model.Command) (*model.Command, *model.AppError) {

From 7cc866ed89d1e3859470d5f97aac87f97c00331a Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Thu, 13 Apr 2023 09:34:48 -0400
Subject: [PATCH 045/103] actually fix tests through mocks.

---
 model/client4.go                     | 14 ++++++++++++++
 server/channels/api4/license_test.go | 22 +++++++++++++---------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/model/client4.go b/model/client4.go
index d6cc62ba0f..74b65948b0 100644
--- a/model/client4.go
+++ b/model/client4.go
@@ -8803,3 +8803,17 @@ func (c *Client4) GetWorkTemplatesByCategory(category string) ([]*WorkTemplate,
 	err = json.NewDecoder(r.Body).Decode(&templates)
 	return templates, BuildResponse(r), err
 }
+
+func (c *Client4) SubmitTrueUpReview(req map[string]any) (*Response, error) {
+	reqBytes, err := json.Marshal(req)
+	if err != nil {
+		return nil, NewAppError("SubmitTrueUpReview", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
+	}
+	r, err := c.DoAPIPostBytes(c.licenseRoute()+"/review", reqBytes)
+	if err != nil {
+		return BuildResponse(r), nil
+	}
+	defer closeBody(r)
+
+	return BuildResponse(r), nil
+}
diff --git a/server/channels/api4/license_test.go b/server/channels/api4/license_test.go
index 8769fae1fc..1a4b4a7803 100644
--- a/server/channels/api4/license_test.go
+++ b/server/channels/api4/license_test.go
@@ -484,7 +484,19 @@ func TestRequestTrueUpReview(t *testing.T) {
 	th.App.Srv().SetLicense(model.NewTestLicense())
 
 	t.Run("returns status 200 when telemetry data sent", func(t *testing.T) {
-		resp, err := th.SystemAdminClient.DoAPIPost("/license/review", "")
+		th.Client.Login(th.SystemAdminUser.Email, th.SystemAdminUser.Password)
+
+		cloud := mocks.CloudInterface{}
+		cloud.Mock.On("SubmitTrueUpReview", mock.Anything, mock.Anything).Return(nil)
+
+		cloudImpl := th.App.Srv().Cloud
+		defer func() {
+			th.App.Srv().Cloud = cloudImpl
+		}()
+		th.App.Srv().Cloud = &cloud
+
+		var reviewProfile map[string]any
+		resp, err := th.Client.SubmitTrueUpReview(reviewProfile)
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, resp.StatusCode)
 	})
@@ -521,14 +533,6 @@ func TestTrueUpReviewStatus(t *testing.T) {
 	th.App.Srv().SetLicense(model.NewTestLicense())
 
 	t.Run("returns 200 when status retrieved", func(t *testing.T) {
-		cloud := mocks.CloudInterface{}
-
-		cloudImpl := th.App.Srv().Cloud
-		defer func() {
-			th.App.Srv().Cloud = cloudImpl
-		}()
-		th.App.Srv().Cloud = &cloud
-
 		resp, err := th.SystemAdminClient.DoAPIGet("/license/review/status", "")
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, resp.StatusCode)

From 27d959485e7c0e1b94d6c8054cbafcf898bcb02a Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Thu, 13 Apr 2023 09:54:58 -0400
Subject: [PATCH 046/103] move setup/teardown into each test.

---
 server/channels/api4/license_test.go | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/server/channels/api4/license_test.go b/server/channels/api4/license_test.go
index 1a4b4a7803..d673e13543 100644
--- a/server/channels/api4/license_test.go
+++ b/server/channels/api4/license_test.go
@@ -478,12 +478,11 @@ func TestRequestRenewalLink(t *testing.T) {
 }
 
 func TestRequestTrueUpReview(t *testing.T) {
-	th := Setup(t)
-	defer th.TearDown()
-
-	th.App.Srv().SetLicense(model.NewTestLicense())
-
 	t.Run("returns status 200 when telemetry data sent", func(t *testing.T) {
+		th := Setup(t).InitBasic()
+		defer th.TearDown()
+		th.App.Srv().SetLicense(model.NewTestLicense())
+
 		th.Client.Login(th.SystemAdminUser.Email, th.SystemAdminUser.Password)
 
 		cloud := mocks.CloudInterface{}
@@ -502,6 +501,10 @@ func TestRequestTrueUpReview(t *testing.T) {
 	})
 
 	t.Run("returns 501 when ran by cloud user", func(t *testing.T) {
+		th := Setup(t).InitBasic()
+		defer th.TearDown()
+		th.App.Srv().SetLicense(model.NewTestLicense())
+
 		th.App.Srv().SetLicense(model.NewTestLicense("cloud"))
 
 		resp, err := th.SystemAdminClient.DoAPIPost("/license/review", "")
@@ -512,12 +515,19 @@ func TestRequestTrueUpReview(t *testing.T) {
 	})
 
 	t.Run("returns 403 when user does not have permissions", func(t *testing.T) {
+		th := Setup(t).InitBasic()
+		defer th.TearDown()
+		th.App.Srv().SetLicense(model.NewTestLicense())
+
 		resp, err := th.Client.DoAPIPost("/license/review", "")
 		require.Error(t, err)
 		require.Equal(t, http.StatusForbidden, resp.StatusCode)
 	})
 
 	t.Run("returns 400 when license is nil", func(t *testing.T) {
+		th := Setup(t).InitBasic()
+		defer th.TearDown()
+
 		th.App.Srv().SetLicense(nil)
 
 		resp, err := th.SystemAdminClient.DoAPIPost("/license/review", "")

From 574e61bcc1eab2907b632a2bb4ecb22eb9d276c2 Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Thu, 13 Apr 2023 19:39:16 +0530
Subject: [PATCH 047/103] MM-52009: Fix hub data race (#22925)

After the monorepo integration, the boards product
was started before we started the hub.

This led to a data race where the GetHubForUserId was actually
called before the hub was initialized.

To fix this we initialize the platform first, and then the products.

https://mattermost.atlassian.net/browse/MM-52009
```release-note
NONE
```
---
 server/channels/app/server.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/server/channels/app/server.go b/server/channels/app/server.go
index 6197c6c55b..65c3dbf371 100644
--- a/server/channels/app/server.go
+++ b/server/channels/app/server.go
@@ -260,8 +260,17 @@ func NewServer(options ...Option) (*Server, error) {
 		product.CommandKey:       app,
 	}
 
-	// Step 4: Initialize products.
-	// Depends on s.httpService.
+	// It is important to initialize the hub only after the global logger is set
+	// to avoid race conditions while logging from inside the hub.
+	// Step 4: Start platform
+	s.platform.Start()
+
+	// NOTE: There should be no call to App.Srv().Channels() before step 5 is done
+	// otherwise it will throw a panic.
+
+	// Step 5: Initialize products.
+	// Depends on s.httpService, and depends on the hub to be initialized.
+	// Otherwise we run into race conditions.
 	err = s.initializeProducts(product.GetProducts(), serviceMap)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to initialize products")
@@ -275,11 +284,6 @@ func NewServer(options ...Option) (*Server, error) {
 	}
 	app.ch = channelsWrapper.app.ch
 
-	// It is important to initialize the hub only after the global logger is set
-	// to avoid race conditions while logging from inside the hub.
-	// Step 5: Start hub in platform which the hub depends on s.Channels() (step 4)
-	s.platform.Start()
-
 	// -------------------------------------------------------------------------
 	// Everything below this is not order sensitive and safe to be moved around.
 	// If you are adding a new field that is non-channels specific, please add

From ea44b6bd38c884a237e26a1a57b05d0086eb73a0 Mon Sep 17 00:00:00 2001
From: Allan Guwatudde <guwats10@gmail.com>
Date: Thu, 13 Apr 2023 18:37:37 +0300
Subject: [PATCH 048/103] [MM-51475] - Monthly Subscriptions: Notifications to
 move to annual (#22842)

* [MM-51475] - Monthly Subscriptions: Notifications to move to annual

* change wording

* change banners impl

* fix translation

* rm env var

* fix tests

* rm unused consts

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../to_yearly_nudge_banner.test.tsx           |  93 ++++--------
 .../to_yearly_nudge_banner.tsx                | 136 +++++++++++++++---
 webapp/channels/src/i18n/en.json              |   5 +-
 webapp/channels/src/utils/constants.tsx       |   4 +-
 4 files changed, 148 insertions(+), 90 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.test.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.test.tsx
index af797c5f92..e9061333a5 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.test.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.test.tsx
@@ -2,11 +2,9 @@
 // See LICENSE.txt for license information.
 
 import React from 'react';
+import {screen} from '@testing-library/react';
 
-import {Provider} from 'react-redux';
-
-import {mountWithIntl} from 'tests/helpers/intl-test-helper';
-import mockStore from 'tests/test_store';
+import {renderWithIntlAndStore} from 'tests/react_testing_utils';
 import {CloudProducts, RecurringIntervals} from 'utils/constants';
 
 import {ToYearlyNudgeBanner, ToYearlyNudgeBannerDismissable} from './to_yearly_nudge_banner';
@@ -42,7 +40,7 @@ const initialState = {
     },
 };
 
-describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () => {
+describe('ToYearlyNudgeBannerDismissable', () => {
     test('should show for admins cloud professional monthly', () => {
         const state = JSON.parse(JSON.stringify(initialState));
         state.entities.users.profiles = {
@@ -63,14 +61,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () =
             },
         };
 
-        const store = mockStore(state);
-        const wrapper = mountWithIntl(
-            <Provider store={store}>
-                <ToYearlyNudgeBannerDismissable/>
-            </Provider>,
-        );
+        renderWithIntlAndStore(<ToYearlyNudgeBannerDismissable/>, state);
 
-        expect(wrapper.find('AnnouncementBar').exists()).toBe(true);
+        screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar');
     });
 
     test('should NOT show for NON admins', () => {
@@ -93,14 +86,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () =
             },
         };
 
-        const store = mockStore(state);
-        const wrapper = mountWithIntl(
-            <Provider store={store}>
-                <ToYearlyNudgeBannerDismissable/>
-            </Provider>,
-        );
+        renderWithIntlAndStore(<ToYearlyNudgeBannerDismissable/>, state);
 
-        expect(wrapper.find('AnnouncementBar').exists()).toBe(false);
+        expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow();
     });
 
     test('should NOT show for admins on cloud free', () => {
@@ -123,14 +111,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () =
             },
         };
 
-        const store = mockStore(state);
-        const wrapper = mountWithIntl(
-            <Provider store={store}>
-                <ToYearlyNudgeBannerDismissable/>
-            </Provider>,
-        );
+        renderWithIntlAndStore(<ToYearlyNudgeBannerDismissable/>, state);
 
-        expect(wrapper.find('AnnouncementBar').exists()).toBe(false);
+        expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow();
     });
 
     test('should NOT show for admins on cloud enterprise', () => {
@@ -153,14 +136,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () =
             },
         };
 
-        const store = mockStore(state);
-        const wrapper = mountWithIntl(
-            <Provider store={store}>
-                <ToYearlyNudgeBannerDismissable/>
-            </Provider>,
-        );
+        renderWithIntlAndStore(<ToYearlyNudgeBannerDismissable/>, state);
 
-        expect(wrapper.find('AnnouncementBar').exists()).toBe(false);
+        expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow();
     });
 
     test('should NOT show for admins on cloud pro annual', () => {
@@ -182,15 +160,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () =
                 },
             },
         };
+        renderWithIntlAndStore(<ToYearlyNudgeBannerDismissable/>, state);
 
-        const store = mockStore(state);
-        const wrapper = mountWithIntl(
-            <Provider store={store}>
-                <ToYearlyNudgeBannerDismissable/>
-            </Provider>,
-        );
-
-        expect(wrapper.find('AnnouncementBar').exists()).toBe(false);
+        expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow();
     });
 
     test('should NOT show for admins when banner was dismissed in preferences', () => {
@@ -200,10 +172,10 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () =
         };
         state.entities.preferences = {
             myPreferences: {
-                'cloud_yearly_nudge_banner--nudge_to_yearly_banner_dismissed': {
-                    category: 'cloud_yearly_nudge_banner',
-                    name: 'nudge_to_yearly_banner_dismissed',
-                    value: 'true',
+                'to_cloud_yearly_plan_nudge--nudge_to_cloud_yearly_plan_snoozed': {
+                    category: 'to_cloud_yearly_plan_nudge',
+                    name: 'nudge_to_cloud_yearly_plan_snoozed',
+                    value: '{"range": 0, "show": false}',
                 },
             },
         };
@@ -221,19 +193,13 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () =
                 },
             },
         };
+        renderWithIntlAndStore(<ToYearlyNudgeBannerDismissable/>, state);
 
-        const store = mockStore(state);
-        const wrapper = mountWithIntl(
-            <Provider store={store}>
-                <ToYearlyNudgeBannerDismissable/>
-            </Provider>,
-        );
-
-        expect(wrapper.find('AnnouncementBar').exists()).toBe(false);
+        expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow();
     });
 });
 
-describe('components/admin_console/billing/ToYearlyNudgeBanner', () => {
+describe('ToYearlyNudgeBanner', () => {
     test('should show for cloud professional monthly', () => {
         const state = JSON.parse(JSON.stringify(initialState));
         state.entities.cloud = {
@@ -251,14 +217,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBanner', () => {
             },
         };
 
-        const store = mockStore(state);
-        const wrapper = mountWithIntl(
-            <Provider store={store}>
-                <ToYearlyNudgeBanner/>
-            </Provider>,
-        );
+        renderWithIntlAndStore(<ToYearlyNudgeBanner/>, state);
 
-        expect(wrapper.find('AlertBanner').exists()).toBe(true);
+        screen.getByTestId('cloud-pro-monthly-deprecation-alert-banner');
     });
 
     test('should NOT show for non cloud professional monthly', () => {
@@ -278,13 +239,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBanner', () => {
             },
         };
 
-        const store = mockStore(state);
-        const wrapper = mountWithIntl(
-            <Provider store={store}>
-                <ToYearlyNudgeBanner/>
-            </Provider>,
-        );
+        renderWithIntlAndStore(<ToYearlyNudgeBanner/>, state);
 
-        expect(wrapper.find('AlertBanner').exists()).toBe(false);
+        expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-alert-banner')).toThrow();
     });
 });
+
diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.tsx
index 3cc1e8aa75..f2eac86e69 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.tsx
@@ -1,9 +1,10 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React from 'react';
+import React, {useEffect} from 'react';
 import {useDispatch, useSelector} from 'react-redux';
 import {useIntl, FormattedMessage} from 'react-intl';
+import moment from 'moment';
 
 import AlertBanner from 'components/alert_banner';
 import useOpenCloudPurchaseModal from 'components/common/hooks/useOpenCloudPurchaseModal';
@@ -22,12 +23,35 @@ import {GlobalState} from '@mattermost/types/store';
 
 import './to_yearly_nudge_banner.scss';
 
+enum DismissShowRange {
+    GreaterThanEqual90 = '>=90',
+    BetweenNinetyAnd60 = '89-61',
+    SixtyTo31 = '60-31',
+    ThirtyTo11 = '30-11',
+    TenTo1 = '10-1',
+    Zero = '0'
+}
+
+const cloudProMonthlyCloseMoment = '20230727';
+
+interface ToYearlyPlanDismissPreference {
+
+    // range represents the range for the days to the deprecation of cloud free e.g. in 30 to 10 days to deprecate cloud free
+    // Incase of dismissing the banner, range represents the time (days) period when this banner was dismissed.
+    // This is important because in case the banner was dismissed for a certain period, it helps us know that we should not show it again for that period.
+    range: DismissShowRange;
+    show: boolean;
+}
+
 const ToYearlyNudgeBannerDismissable = () => {
     const dispatch = useDispatch();
 
     const openPurchaseModal = useOpenCloudPurchaseModal({});
 
-    const nudgeDismissed = useSelector((state: GlobalState) => getPreference(state, Preferences.CLOUD_YEARLY_NUDGE_BANNER, CloudBanners.NUDGE_TO_YEARLY_BANNER_DISMISSED)) === 'true';
+    const snoozePreferenceVal = useSelector((state: GlobalState) => getPreference(state, Preferences.TO_CLOUD_YEARLY_PLAN_NUDGE, CloudBanners.NUDGE_TO_CLOUD_YEARLY_PLAN_SNOOZED, '{"range": 0, "show": true}'));
+    const snoozeInfo = JSON.parse(snoozePreferenceVal) as ToYearlyPlanDismissPreference;
+    const show = snoozeInfo.show;
+
     const currentUser = useSelector(getCurrentUser);
     const isAdmin = useSelector(isCurrentUserSystemAdmin);
     const product = useSelector(selectSubscriptionProduct);
@@ -35,16 +59,75 @@ const ToYearlyNudgeBannerDismissable = () => {
     const currentProductIsMonthly = product?.recurring_interval === RecurringIntervals.MONTH;
     const currentProductProMonthly = currentProductProfessional && currentProductIsMonthly;
 
-    const savedDismissedPref = () => {
+    const now = moment(Date.now());
+    const proMonthlyEndDate = moment(cloudProMonthlyCloseMoment, 'YYYYMMDD');
+    const daysToProMonthlyEnd = proMonthlyEndDate.diff(now, 'days');
+
+    const snoozedForRange = (range: DismissShowRange) => {
+        return snoozeInfo.range === range;
+    };
+
+    useEffect(() => {
+        if (!snoozeInfo.show) {
+            if (daysToProMonthlyEnd >= 90 && !snoozedForRange(DismissShowRange.GreaterThanEqual90)) {
+                showBanner(true);
+            }
+
+            if (daysToProMonthlyEnd < 90 && daysToProMonthlyEnd > 60 && !snoozedForRange(DismissShowRange.BetweenNinetyAnd60)) {
+                showBanner(true);
+            }
+
+            if (daysToProMonthlyEnd <= 60 && daysToProMonthlyEnd > 30 && !snoozedForRange(DismissShowRange.SixtyTo31)) {
+                showBanner(true);
+            }
+
+            if (daysToProMonthlyEnd <= 30 && daysToProMonthlyEnd > 10 && !snoozedForRange(DismissShowRange.ThirtyTo11)) {
+                showBanner(true);
+            }
+
+            if (daysToProMonthlyEnd <= 10) {
+                showBanner(true);
+            }
+        }
+    }, []);
+
+    const showBanner = (show = false) => {
+        let dRange = DismissShowRange.Zero;
+        if (daysToProMonthlyEnd >= 90) {
+            dRange = DismissShowRange.GreaterThanEqual90;
+        }
+
+        if (daysToProMonthlyEnd < 90 && daysToProMonthlyEnd > 60) {
+            dRange = DismissShowRange.BetweenNinetyAnd60;
+        }
+
+        if (daysToProMonthlyEnd <= 60 && daysToProMonthlyEnd > 30) {
+            dRange = DismissShowRange.SixtyTo31;
+        }
+
+        if (daysToProMonthlyEnd <= 30 && daysToProMonthlyEnd > 10) {
+            dRange = DismissShowRange.ThirtyTo11;
+        }
+
+        // ideally this case should not happen because snooze button is not shown when TenTo1 days are remaining
+        if (daysToProMonthlyEnd <= 10 && daysToProMonthlyEnd > 0) {
+            dRange = DismissShowRange.TenTo1;
+        }
+
+        const snoozeInfo: ToYearlyPlanDismissPreference = {
+            range: dRange,
+            show,
+        };
+
         dispatch(savePreferences(currentUser.id, [{
-            category: Preferences.CLOUD_YEARLY_NUDGE_BANNER,
-            name: CloudBanners.NUDGE_TO_YEARLY_BANNER_DISMISSED,
+            category: Preferences.TO_CLOUD_YEARLY_PLAN_NUDGE,
+            name: CloudBanners.NUDGE_TO_CLOUD_YEARLY_PLAN_SNOOZED,
             user_id: currentUser.id,
-            value: 'true',
+            value: JSON.stringify(snoozeInfo),
         }]));
     };
 
-    if (nudgeDismissed) {
+    if (!show) {
         return null;
     }
 
@@ -56,21 +139,30 @@ const ToYearlyNudgeBannerDismissable = () => {
         return null;
     }
 
-    const message = {
-        id: 'cloud_billing.nudge_to_yearly.announcement_bar',
-        defaultMessage: 'Simplify your billing and switch to an annual plan today',
-    };
+    const message = (
+        <FormattedMessage
+            id='cloud_billing.nudge_to_yearly.announcement_bar'
+            defaultMessage='Monthly billing will be discontinued in {days} days . Switch to annual billing'
+            values={{
+                days: daysToProMonthlyEnd,
+
+            }}
+        />
+    );
+
+    const announcementType = (daysToProMonthlyEnd <= 10) ? AnnouncementBarTypes.CRITICAL : AnnouncementBarTypes.ANNOUNCEMENT;
 
     return (
         <AnnouncementBar
-            type={AnnouncementBarTypes.ANNOUNCEMENT}
-            showCloseButton={true}
+            id='cloud-pro-monthly-deprecation-announcement-bar'
+            type={announcementType}
+            showCloseButton={daysToProMonthlyEnd > 10}
             onButtonClick={() => openPurchaseModal({trackingLocation: 'to_yearly_nudge_annoucement_bar'})}
             modalButtonText={t('cloud_billing.nudge_to_yearly.learn_more')}
             modalButtonDefaultText='Learn more'
-            message={<FormattedMessage {...message}/>}
+            message={message}
             showLinkAsButton={true}
-            handleClose={savedDismissedPref}
+            handleClose={showBanner}
         />
     );
 };
@@ -90,17 +182,22 @@ const ToYearlyNudgeBanner = () => {
         return null;
     }
 
+    const now = moment(Date.now());
+    const proMonthlyEndDate = moment(cloudProMonthlyCloseMoment, 'YYYYMMDD');
+    const daysToProMonthlyEnd = proMonthlyEndDate.diff(now, 'days');
+
     const title = (
         <FormattedMessage
             id='cloud_billing.nudge_to_yearly.title'
-            defaultMessage='Switch to an annual plan today'
+            defaultMessage='Action required: Switch to annual billing to keep your workspace.'
         />
     );
 
     const description = (
         <FormattedMessage
             id='cloud_billing.nudge_to_yearly.description'
-            defaultMessage='Simplify your billing by switching to an annual subscription.'
+            defaultMessage='Monthly billing will be discontinued on {date}. To keep your workspace, switch to annual billing.'
+            values={{date: moment(cloudProMonthlyCloseMoment, 'YYYYMMDD').format('MMMM DD, YYYY')}}
         />
     );
 
@@ -122,9 +219,12 @@ const ToYearlyNudgeBanner = () => {
         </button>
     );
 
+    const bannerMode = (daysToProMonthlyEnd <= 10) ? 'danger' : 'info';
+
     return (
         <AlertBanner
-            mode='info'
+            id='cloud-pro-monthly-deprecation-alert-banner'
+            mode={bannerMode}
             title={title}
             message={description}
             className='ToYearlyNudgeBanner'
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index a22b676e6e..249111c8b5 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -3039,10 +3039,11 @@
   "cloud_billing.nudge_to_paid.learn_more": "Upgrade",
   "cloud_billing.nudge_to_paid.title": "Upgrade to paid plan to keep your workspace",
   "cloud_billing.nudge_to_paid.view_plans": "View plans",
+  "cloud_billing.nudge_to_yearly.announcement_bar": "Monthly billing will be discontinued in {days} days . Switch to annual billing",
   "cloud_billing.nudge_to_yearly.contact_sales": "Contact sales",
-  "cloud_billing.nudge_to_yearly.description": "Simplify your billing by switching to an annual subscription.",
+  "cloud_billing.nudge_to_yearly.description": "Monthly billing will be discontinued on {date}. To keep your workspace, switch to annual billing.",
   "cloud_billing.nudge_to_yearly.learn_more": "Learn more",
-  "cloud_billing.nudge_to_yearly.title": "Switch to an annual plan today",
+  "cloud_billing.nudge_to_yearly.title": "Action required: Switch to annual billing to keep your workspace.",
   "cloud_delinquency.banner.buttonText": "Update billing now",
   "cloud_delinquency.banner.end_user_notify_admin_button": "Notify admin",
   "cloud_delinquency.banner.end_user_notify_admin_title": "Your workspace has been downgraded. Notify your admin to fix billing issues",
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index 4bb243003c..cffc537c84 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -157,7 +157,7 @@ export const Preferences = {
     CONFIGURATION_BANNERS: 'configuration_banners',
     NOTIFY_ADMIN_REVOKE_DOWNGRADED_WORKSPACE: 'admin_revoke_downgraded_instance',
     OVERAGE_USERS_BANNER: 'overage_users_banner',
-    CLOUD_YEARLY_NUDGE_BANNER: 'cloud_yearly_nudge_banner',
+    TO_CLOUD_YEARLY_PLAN_NUDGE: 'to_cloud_yearly_plan_nudge',
     TO_PAID_PLAN_NUDGE: 'to_paid_plan_nudge',
 };
 
@@ -726,7 +726,7 @@ export const CloudBanners = {
     TRIAL: 'trial',
     UPGRADE_FROM_TRIAL: 'upgrade_from_trial',
     THREE_DAYS_LEFT_TRIAL_MODAL_DISMISSED: 'dismiss_3_days_left_trial_modal',
-    NUDGE_TO_YEARLY_BANNER_DISMISSED: 'nudge_to_yearly_banner_dismissed',
+    NUDGE_TO_CLOUD_YEARLY_PLAN_SNOOZED: 'nudge_to_cloud_yearly_plan_snoozed',
     NUDGE_TO_PAID_PLAN_SNOOZED: 'nudge_to_paid_plan_snoozed',
 };
 

From a7ce08da9532678e682ac5b440a3fb92da89e29f Mon Sep 17 00:00:00 2001
From: Allan Guwatudde <guwats10@gmail.com>
Date: Thu, 13 Apr 2023 21:55:00 +0300
Subject: [PATCH 049/103] [MM-51236] - Update newsletter opt-in copy (#22849)

* [MM-51236] - Update newsletter opt-in copy

* feedback impl

* fix tests

* fix text color

* fix color

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../signup/__snapshots__/signup.test.tsx.snap   |  4 ++--
 .../channels/src/components/signup/signup.scss  |  4 ++--
 .../src/components/signup/signup.test.tsx       |  4 ++--
 .../channels/src/components/signup/signup.tsx   | 17 ++++++++++++++---
 .../components/widgets/inputs/check/check.scss  |  8 ++++++--
 webapp/channels/src/i18n/en.json                |  4 ++--
 webapp/channels/src/utils/constants.tsx         |  2 ++
 7 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap b/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
index 7ab9e4ee2c..077718b0fa 100644
--- a/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
+++ b/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
@@ -99,7 +99,7 @@ exports[`components/signup/Signup should match snapshot for all signup options e
               <span
                 className="interested"
               >
-                Interested in receiving Mattermost security updates via newsletter?
+                Interested in receiving Mattermost security, product, promotions, and company updates updates via newsletter?
               </span>
               <span
                 className="link"
@@ -272,7 +272,7 @@ exports[`components/signup/Signup should match snapshot for all signup options e
               <span
                 className="interested"
               >
-                Interested in receiving Mattermost security updates via newsletter?
+                Interested in receiving Mattermost security, product, promotions, and company updates updates via newsletter?
               </span>
               <span
                 className="link"
diff --git a/webapp/channels/src/components/signup/signup.scss b/webapp/channels/src/components/signup/signup.scss
index 7a2e486ad9..072e2f4505 100644
--- a/webapp/channels/src/components/signup/signup.scss
+++ b/webapp/channels/src/components/signup/signup.scss
@@ -169,7 +169,7 @@
                     .newsletter {
                         margin-top: 24px;
                         margin-bottom: 32px;
-                        color: var(--center-channel-color-rgb);
+                        color: rgba(var(--center-channel-color-rgb), 0.56);
                         font-family: 'Open Sans';
                         font-size: 12px;
                         font-style: normal;
@@ -178,7 +178,7 @@
 
                         .interested {
                             display: block;
-                            font-weight: 600;
+                            color: var(--center-channel-color);
                         }
                     }
 
diff --git a/webapp/channels/src/components/signup/signup.test.tsx b/webapp/channels/src/components/signup/signup.test.tsx
index 7ed833c3e7..dcc56032a0 100644
--- a/webapp/channels/src/components/signup/signup.test.tsx
+++ b/webapp/channels/src/components/signup/signup.test.tsx
@@ -311,7 +311,7 @@ describe('components/signup/Signup', () => {
         const checkInput = screen.getByTestId('signup-body-card-form-check-newsletter');
         expect(checkInput).toHaveAttribute('type', 'checkbox');
 
-        expect(signupContainer).toHaveTextContent(/I would like to receive Mattermost security updates via newsletter. Data Terms and Conditions apply/);
+        expect(signupContainer).toHaveTextContent('I would like to receive Mattermost security updates via newsletter. By subscribing, I consent to receive emails from Mattermost with product updates, promotions, and company news. I have read the Privacy Policy and understand that I can unsubscribe at any time');
     });
 
     it('should NOT show newsletter check box opt-in for self-hosted AND airgapped workspaces', async () => {
@@ -324,7 +324,7 @@ describe('components/signup/Signup', () => {
             </BrowserRouter>, {});
 
         expect(() => screen.getByTestId('signup-body-card-form-check-newsletter')).toThrow();
-        expect(signupContainer).toHaveTextContent('Interested in receiving Mattermost security updates via newsletter?Sign up at https://mattermost.com/security-updates/.');
+        expect(signupContainer).toHaveTextContent('Interested in receiving Mattermost security, product, promotions, and company updates updates via newsletter?Sign up at https://mattermost.com/security-updates/.');
     });
 
     it('should not show any newsletter related opt-in or text for cloud', async () => {
diff --git a/webapp/channels/src/components/signup/signup.tsx b/webapp/channels/src/components/signup/signup.tsx
index 3f3a13d460..454d5cd8ae 100644
--- a/webapp/channels/src/components/signup/signup.tsx
+++ b/webapp/channels/src/components/signup/signup.tsx
@@ -603,16 +603,27 @@ const Signup = ({onCustomizeHeader}: SignupProps) => {
                     onChange={() => setSubscribeToSecurityNewsletter(!subscribeToSecurityNewsletter)}
                     text={
                         formatMessage(
-                            {id: 'newsletter_optin.checkmark.text', defaultMessage: 'I would like to receive Mattermost security updates via newsletter. Data <a>Terms and Conditions</a> apply'},
+                            {id: 'newsletter_optin.checkmark.text', defaultMessage: '<span>I would like to receive Mattermost security updates via newsletter.</span> By subscribing, I consent to receive emails from Mattermost with product updates, promotions, and company news. I have read the <a>Privacy Policy</a> and understand that I can <aa>unsubscribe</aa> at any time'},
                             {
                                 a: (chunks: React.ReactNode | React.ReactNodeArray) => (
                                     <ExternalLink
                                         location='signup-newsletter-checkmark'
-                                        href={HostedCustomerLinks.SECURITY_UPDATES}
+                                        href={HostedCustomerLinks.PRIVACY}
                                     >
                                         {chunks}
                                     </ExternalLink>
                                 ),
+                                aa: (chunks: React.ReactNode | React.ReactNodeArray) => (
+                                    <ExternalLink
+                                        location='signup-newsletter-checkmark'
+                                        href={HostedCustomerLinks.NEWSLETTER_UNSUBSCRIBE_LINK}
+                                    >
+                                        {chunks}
+                                    </ExternalLink>
+                                ),
+                                span: (chunks: React.ReactNode | React.ReactNodeArray) => (
+                                    <span className='header'>{chunks}</span>
+                                ),
                             },
                         )}
                     checked={subscribeToSecurityNewsletter}
@@ -622,7 +633,7 @@ const Signup = ({onCustomizeHeader}: SignupProps) => {
         return (
             <div className='newsletter'>
                 <span className='interested'>
-                    {formatMessage({id: 'newsletter_optin.title', defaultMessage: 'Interested in receiving Mattermost security updates via newsletter?'})}
+                    {formatMessage({id: 'newsletter_optin.title', defaultMessage: 'Interested in receiving Mattermost security, product, promotions, and company updates updates via newsletter?'})}
                 </span>
                 <span className='link'>
                     {formatMessage(
diff --git a/webapp/channels/src/components/widgets/inputs/check/check.scss b/webapp/channels/src/components/widgets/inputs/check/check.scss
index e6e9809d39..09545e6d68 100644
--- a/webapp/channels/src/components/widgets/inputs/check/check.scss
+++ b/webapp/channels/src/components/widgets/inputs/check/check.scss
@@ -9,11 +9,15 @@
 
     .text {
         margin-left: 8px;
-        color: var(--center-channel-color-rgb);
-        font-family: 'Open Sans';
+        color: rgba(var(--center-channel-color-rgb), 0.56);
         font-size: 12px;
         font-style: normal;
         font-weight: 400;
         line-height: 16px;
+
+        .header {
+            display: block;
+            color: var(--center-channel-color);
+        }
     }
 }
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 249111c8b5..269e9af208 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -4265,9 +4265,9 @@
   "navbar.viewPinnedPosts": "View Pinned Posts",
   "newChannelWithBoard.tutorialTip.description": "The board you just created can be quickly accessed by clicking on the Boards icon in the App bar. You can view the boards that are linked to this channel in the right-hand sidebar and open one in full view.",
   "newChannelWithBoard.tutorialTip.title": "Access linked boards from the App Bar",
-  "newsletter_optin.checkmark.text": "I would like to receive Mattermost security updates via newsletter. Data <a>Terms and Conditions</a> apply",
+  "newsletter_optin.checkmark.text": "<span>I would like to receive Mattermost security updates via newsletter.</span> By subscribing, I consent to receive emails from Mattermost with product updates, promotions, and company news. I have read the <a>Privacy Policy</a> and understand that I can <aa>unsubscribe</aa> at any time",
   "newsletter_optin.desc": "Sign up at <a>{link}</a>.",
-  "newsletter_optin.title": "Interested in receiving Mattermost security updates via newsletter?",
+  "newsletter_optin.title": "Interested in receiving Mattermost security, product, promotions, and company updates updates via newsletter?",
   "next_steps_view.welcomeToMattermost": "Welcome to Mattermost",
   "no_results.channel_files_filtered.subtitle": "This channel doesn't contains any file with the selected file format.",
   "no_results.channel_files_filtered.title": "No files found",
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index cffc537c84..091eb5aff6 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -1080,6 +1080,8 @@ export const HostedCustomerLinks = {
     SELF_HOSTED_BILLING: 'https://docs.mattermost.com/manage/self-hosted-billing.html',
     TERMS_AND_CONDITIONS: 'https://mattermost.com/enterprise-edition-terms/',
     SECURITY_UPDATES: 'https://mattermost.com/security-updates/',
+    NEWSLETTER_UNSUBSCRIBE_LINK: 'https://forms.mattermost.com/UnsubscribePage.html',
+    PRIVACY: 'https://mattermost.com/privacy-policy/',
 };
 
 export const DocLinks = {

From 55063b026bc947b023f2f6e44c207e272b8d6b59 Mon Sep 17 00:00:00 2001
From: Nick Misasi <nick.misasi@mattermost.com>
Date: Thu, 13 Apr 2023 15:27:44 -0400
Subject: [PATCH 050/103] [MM-51922] Enforce minimum 10 seats in seats selector
 (#22916)

* Enforce minimum 10 seats in seats selector

* Ensure initial value is validated as well

* Fix linter

* fix tests

* Add a test for 10 seat minimum

* Fix linter, merge master
---
 .../src/components/seats_calculator/index.tsx | 19 ++++++++++++++++++-
 .../seats_calculator/seats_calculator.scss    |  4 ++++
 .../self_hosted_purchase_modal/index.test.tsx | 14 ++++++++++++--
 webapp/channels/src/i18n/en.json              |  1 +
 webapp/channels/src/utils/constants.tsx       |  1 +
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/webapp/channels/src/components/seats_calculator/index.tsx b/webapp/channels/src/components/seats_calculator/index.tsx
index fe2b9259a2..a38d09b70d 100644
--- a/webapp/channels/src/components/seats_calculator/index.tsx
+++ b/webapp/channels/src/components/seats_calculator/index.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React from 'react';
+import React, {useEffect} from 'react';
 import {useIntl, FormattedMessage, FormattedNumber} from 'react-intl';
 
 import {InformationOutlineIcon} from '@mattermost/compass-icons/components';
@@ -41,6 +41,12 @@ export const errorInvalidNumber = (
         defaultMessage='Enter a valid number of seats'
     />
 );
+export const errorMinSeats = (
+    <FormattedMessage
+        id='cloud_upgrade.error_min_seats'
+        defaultMessage='Minimum of 10 seats required'
+    />
+);
 
 function validateSeats(seats: string, annualPricePerSeat: number, minSeats: number, cloud: boolean): Seats {
     if (seats === '') {
@@ -58,6 +64,13 @@ function validateSeats(seats: string, annualPricePerSeat: number, minSeats: numb
         };
     }
 
+    if (seatsNumber < 10) {
+        return {
+            quantity: seats,
+            error: errorMinSeats,
+        };
+    }
+
     const maxSeats = calculateMaxUsers(annualPricePerSeat);
     const tooFewUsersErrorMessage = (
         <FormattedMessage
@@ -134,6 +147,10 @@ export default function SeatsCalculator(props: Props) {
         props.onChange(validateSeats(value, annualPricePerSeat, props.existingUsers, props.isCloud));
     };
 
+    useEffect(() => {
+        props.onChange(validateSeats(props.seats.quantity, annualPricePerSeat, props.existingUsers, props.isCloud));
+    }, []);
+
     const maxSeats = calculateMaxUsers(annualPricePerSeat);
     const total = '$' + intl.formatNumber((parseFloat(props.seats.quantity) || 0) * annualPricePerSeat, {maximumFractionDigits: 2});
     const userCountTooltip = (
diff --git a/webapp/channels/src/components/seats_calculator/seats_calculator.scss b/webapp/channels/src/components/seats_calculator/seats_calculator.scss
index 18dd6699a6..80add6f083 100644
--- a/webapp/channels/src/components/seats_calculator/seats_calculator.scss
+++ b/webapp/channels/src/components/seats_calculator/seats_calculator.scss
@@ -2,6 +2,10 @@
     padding: 14px 0;
     font-size: 14px;
 
+    .Input___customMessage.Input___error {
+        line-height: 14px;
+    }
+
     &__seats-item {
         position: relative;
         display: flex;
diff --git a/webapp/channels/src/components/self_hosted_purchase_modal/index.test.tsx b/webapp/channels/src/components/self_hosted_purchase_modal/index.test.tsx
index 81437b3d7a..c8d568206b 100644
--- a/webapp/channels/src/components/self_hosted_purchase_modal/index.test.tsx
+++ b/webapp/channels/src/components/self_hosted_purchase_modal/index.test.tsx
@@ -69,7 +69,7 @@ const mockCreatedIntent = SelfHostedSignupProgress.CREATED_INTENT;
 const mockCreatedLicense = SelfHostedSignupProgress.CREATED_LICENSE;
 const failOrg = 'failorg';
 
-const existingUsers = 10;
+const existingUsers = 11;
 
 jest.mock('mattermost-redux/client', () => {
     const original = jest.requireActual('mattermost-redux/client');
@@ -275,7 +275,17 @@ describe('SelfHostedPurchaseModal', () => {
         const tooFewSeats = existingUsers - 1;
         fireEvent.change(screen.getByTestId('selfHostedPurchaseSeatsInput'), valueEvent(tooFewSeats.toString()));
         expect(screen.getByText('Upgrade')).toBeDisabled();
-        screen.getByText('Your workspace currently has 10 users', {exact: false});
+        screen.getByText('Your workspace currently has 11 users', {exact: false});
+    });
+
+    it('Minimum of 10 seats is required for sign up', () => {
+        renderWithIntlAndStore(<div id='root-portal'><SelfHostedPurchaseModal productId={'prod_professional'}/></div>, initialState);
+        fillForm(defaultSuccessForm);
+
+        const tooFewSeats = 9;
+        fireEvent.change(screen.getByTestId('selfHostedPurchaseSeatsInput'), valueEvent(tooFewSeats.toString()));
+        expect(screen.getByText('Upgrade')).toBeDisabled();
+        screen.getByText('Minimum of 10 seats required', {exact: false});
     });
 
     it('happy path submit shows success screen', async () => {
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 269e9af208..3434e71dd2 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -3068,6 +3068,7 @@
   "cloud_delinquency.post_downgrade_banner.title": "Update your billing information now to re-activate paid features.",
   "cloud_signup.signup_consequences": "Your credit card will be charged today. <a>See how billing works.</a>",
   "cloud_subscribe.contact_support": "Compare plans",
+  "cloud_upgrade.error_min_seats": "Minimum of 10 seats required",
   "cloud.fetch_error": "Error fetching billing data. Please try again later.",
   "cloud.fetch_error.retry": "Retry",
   "cloud.invoice_pdf_preview.download": "<downloadLink>Download</downloadLink> this page for your records",
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index 091eb5aff6..87fc6be03a 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -1983,6 +1983,7 @@ export const Constants = {
     CHANNEL_HEADER_BUTTON_DISABLE_TIMEOUT: 1000,
     FIRST_ADMIN_ROLE: 'first_admin',
     MAX_PURCHASE_SEATS: 1000000,
+    MIN_PURCHASE_SEATS: 10,
 };
 
 export const ValidationErrors = {

From 25aade08824ec9747b77b954a88977863dc6886f Mon Sep 17 00:00:00 2001
From: Nick Misasi <nick.misasi@mattermost.com>
Date: Thu, 13 Apr 2023 15:27:56 -0400
Subject: [PATCH 051/103] [MM-51922] Enforce minimum 10 seats in seats selector
 (#22916)

* Enforce minimum 10 seats in seats selector

* Ensure initial value is validated as well

* Fix linter

* fix tests

* Add a test for 10 seat minimum

* Fix linter, merge master

From 193fa5777031b3316a5bbd7e10e2a92083ace5c8 Mon Sep 17 00:00:00 2001
From: Nick Misasi <nick.misasi@mattermost.com>
Date: Thu, 13 Apr 2023 16:13:34 -0400
Subject: [PATCH 052/103] [MM-51922] Enforce minimum 10 seats in seats selector
 (#22916)

* Enforce minimum 10 seats in seats selector

* Ensure initial value is validated as well

* Fix linter

* fix tests

* Add a test for 10 seat minimum

* Fix linter, merge master

From 024a5472ff368685a9e42b1d69d2a83347c7b88e Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 13 Apr 2023 16:23:32 -0400
Subject: [PATCH 053/103] MM-51451 Replace all characters in generated values
 instead of just the first one (#22869)

---
 .../src/components/admin_console/schema_admin_settings.jsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/channels/src/components/admin_console/schema_admin_settings.jsx b/webapp/channels/src/components/admin_console/schema_admin_settings.jsx
index d1b8886a8e..b35db711ef 100644
--- a/webapp/channels/src/components/admin_console/schema_admin_settings.jsx
+++ b/webapp/channels/src/components/admin_console/schema_admin_settings.jsx
@@ -671,7 +671,7 @@ export default class SchemaAdminSettings extends React.PureComponent {
     };
 
     handleGeneratedChange = (id, s) => {
-        this.handleChange(id, s.replace('+', '-').replace('/', '_'));
+        this.handleChange(id, s.replace(/\+/g, '-').replace(/\//g, '_'));
     };
 
     handleChange = (id, value, confirm = false, doSubmit = false, warning = false) => {

From 21b72c7607e429da5e54213a7ee3309465b6da26 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 13 Apr 2023 16:24:20 -0400
Subject: [PATCH 054/103] MM-50577 Replaced makeCreateAriaLabelForPost with
 better memoized usePostAriaLabel (#22833)

---
 .../post_view/post_aria_label_div.tsx         | 18 +-----
 .../latest_post_reader.test.tsx               | 14 +++++
 .../latest_post_reader.tsx                    | 16 +----
 .../src/selectors/entities/posts.ts           |  4 +-
 webapp/channels/src/utils/post_utils.ts       | 60 ++++++++++++-------
 5 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/webapp/channels/src/components/post_view/post_aria_label_div.tsx b/webapp/channels/src/components/post_view/post_aria_label_div.tsx
index c181ea4858..cdd02461dd 100644
--- a/webapp/channels/src/components/post_view/post_aria_label_div.tsx
+++ b/webapp/channels/src/components/post_view/post_aria_label_div.tsx
@@ -1,36 +1,24 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React, {useRef} from 'react';
-import {useSelector} from 'react-redux';
-import {useIntl} from 'react-intl';
+import React from 'react';
 
 import {Post} from '@mattermost/types/posts';
 
-import {GlobalState} from 'types/store';
-
-import {makeCreateAriaLabelForPost} from 'utils/post_utils';
+import {usePostAriaLabel} from 'utils/post_utils';
 
 export type Props = React.HTMLProps<HTMLDivElement> & {
-    labelPrefix?: string;
     post: Post;
 }
 
 const PostAriaLabelDiv = React.forwardRef((props: Props, ref: React.Ref<HTMLDivElement>) => {
     const {
         children,
-        labelPrefix,
         post,
         ...otherProps
     } = props;
 
-    const intl = useIntl();
-
-    const createAriaLabelForPost = useRef(makeCreateAriaLabelForPost());
-    let ariaLabel = useSelector<GlobalState, string>((state) => createAriaLabelForPost.current(state, post)(intl));
-    if (labelPrefix) {
-        ariaLabel = labelPrefix + ariaLabel;
-    }
+    const ariaLabel = usePostAriaLabel(post);
 
     return (
         <div
diff --git a/webapp/channels/src/components/post_view/post_list_virtualized/latest_post_reader.test.tsx b/webapp/channels/src/components/post_view/post_list_virtualized/latest_post_reader.test.tsx
index c8c3e07d41..25a07c738c 100644
--- a/webapp/channels/src/components/post_view/post_list_virtualized/latest_post_reader.test.tsx
+++ b/webapp/channels/src/components/post_view/post_list_virtualized/latest_post_reader.test.tsx
@@ -77,4 +77,18 @@ describe('LatestPostReader', () => {
         expect(span.prop('children')).toContain(author.username);
         expect(span.prop('children')).toContain('enero');
     });
+
+    test('should be able to handle an empty post array', () => {
+        const {mountOptions} = mockStore(baseState);
+
+        const props = {
+            ...baseProps,
+            postIds: [],
+        };
+
+        const wrapper = mount(<LatestPostReader {...props}/>, mountOptions);
+        const span = wrapper.childAt(0);
+
+        expect(span.prop('children')).toEqual('');
+    });
 });
diff --git a/webapp/channels/src/components/post_view/post_list_virtualized/latest_post_reader.tsx b/webapp/channels/src/components/post_view/post_list_virtualized/latest_post_reader.tsx
index 240f39f844..dd314b949b 100644
--- a/webapp/channels/src/components/post_view/post_list_virtualized/latest_post_reader.tsx
+++ b/webapp/channels/src/components/post_view/post_list_virtualized/latest_post_reader.tsx
@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React, {useMemo, useRef} from 'react';
-import {useIntl} from 'react-intl';
+import React, {useMemo} from 'react';
 import {useSelector} from 'react-redux';
 
 import {getPost} from 'mattermost-redux/selectors/entities/posts';
@@ -11,27 +10,18 @@ import {Post} from '@mattermost/types/posts';
 
 import {GlobalState} from 'types/store';
 
-import {getLatestPostId, makeCreateAriaLabelForPost} from 'utils/post_utils';
+import {getLatestPostId, usePostAriaLabel} from 'utils/post_utils';
 
 interface Props {
     postIds?: string[];
 }
 
 const LatestPostReader = (props: Props): JSX.Element => {
-    const intl = useIntl();
-
     const {postIds} = props;
     const latestPostId = useMemo(() => getLatestPostId(postIds || []), [postIds]);
     const latestPost = useSelector<GlobalState, Post>((state) => getPost(state, latestPostId));
 
-    const createAriaLabelForPost = useRef(makeCreateAriaLabelForPost());
-    const ariaLabel = useSelector<GlobalState, string>((state) => {
-        if (!latestPost) {
-            return '';
-        }
-
-        return createAriaLabelForPost.current(state, latestPost)(intl);
-    });
+    const ariaLabel = usePostAriaLabel(latestPost);
 
     return (
         <span
diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts
index d4940dd7b7..5c5f07a315 100644
--- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts
+++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts
@@ -71,13 +71,13 @@ export function getReactionsForPosts(state: GlobalState): RelationOneToOne<Post,
 
 export function makeGetReactionsForPost(): (state: GlobalState, postId: Post['id']) => {
     [x: string]: Reaction;
-} | undefined | null {
+} | undefined {
     return createSelector('makeGetReactionsForPost', getReactionsForPosts, (state: GlobalState, postId: string) => postId, (reactions, postId) => {
         if (reactions[postId]) {
             return reactions[postId];
         }
 
-        return null;
+        return undefined;
     });
 }
 
diff --git a/webapp/channels/src/utils/post_utils.ts b/webapp/channels/src/utils/post_utils.ts
index f1312f2eb9..07e613d45e 100644
--- a/webapp/channels/src/utils/post_utils.ts
+++ b/webapp/channels/src/utils/post_utils.ts
@@ -1,7 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {IntlShape} from 'react-intl';
+import {IntlShape, useIntl} from 'react-intl';
+
+import {useMemo} from 'react';
+
+import {useSelector} from 'react-redux';
 
 import {createSelector} from 'reselect';
 
@@ -17,6 +21,8 @@ import {haveIChannelPermission} from 'mattermost-redux/selectors/entities/roles'
 import {getCurrentTeamId, getTeam} from 'mattermost-redux/selectors/entities/teams';
 import {makeGetDisplayName, getCurrentUserId, getUser, UserMentionKey, getUsersByUsername} from 'mattermost-redux/selectors/entities/users';
 
+import {memoizeResult} from 'mattermost-redux/utils/helpers';
+
 import {Channel} from '@mattermost/types/channels';
 import {ClientConfig, ClientLicense} from '@mattermost/types/config';
 import {ServerError} from '@mattermost/types/errors';
@@ -42,8 +48,8 @@ import {allAtMentions} from 'utils/text_formatting';
 import {isMobile} from 'utils/user_agent';
 import * as Utils from 'utils/utils';
 
-import * as Emoticons from './emoticons';
 import EmojiMap from './emoji_map';
+import * as Emoticons from './emoticons';
 
 const CHANNEL_SWITCH_IGNORE_ENTER_THRESHOLD_MS = 500;
 
@@ -443,27 +449,41 @@ export function makeGetMentionsFromMessage(): (state: GlobalState, post: Post) =
     );
 }
 
-export function makeCreateAriaLabelForPost(): (state: GlobalState, post: Post) => (intl: IntlShape) => string {
-    const getReactionsForPost = makeGetUniqueReactionsToPost();
-    const getDisplayName = makeGetDisplayName();
-    const getMentionsFromMessage = makeGetMentionsFromMessage();
+export function usePostAriaLabel(post: Post | undefined) {
+    const intl = useIntl();
 
-    return createSelector(
-        'makeCreateAriaLabelForPost',
-        (state: GlobalState, post: Post) => post,
-        (state: GlobalState, post: Post) => getDisplayName(state, post.user_id),
-        (state: GlobalState, post: Post) => getReactionsForPost(state, post.id),
-        (state: GlobalState, post: Post) => get(state, Preferences.CATEGORY_FLAGGED_POST, post.id, null) != null,
-        getEmojiMap,
-        (state: GlobalState, post: Post) => getMentionsFromMessage(state, post),
-        (state: GlobalState) => getTeammateNameDisplaySetting(state),
-        (post, author, reactions, isFlagged, emojiMap, mentions, teammateNameDisplaySetting) => {
-            return (intl: IntlShape) => createAriaLabelForPost(post, author, isFlagged, reactions ?? {}, intl, emojiMap, mentions, teammateNameDisplaySetting);
-        },
-    );
+    const getDisplayName = useMemo(makeGetDisplayName, []);
+    const getReactionsForPost = useMemo(makeGetReactionsForPost, []);
+    const getMentionsFromMessage = useMemo(makeGetMentionsFromMessage, []);
+
+    const createAriaLabelMemoized = memoizeResult(createAriaLabelForPost);
+
+    return useSelector((state: GlobalState) => {
+        if (!post) {
+            return '';
+        }
+
+        const authorDisplayName = getDisplayName(state, post.user_id);
+        const reactions = getReactionsForPost(state, post?.id);
+        const isFlagged = get(state, Preferences.CATEGORY_FLAGGED_POST, post.id, null) != null;
+        const emojiMap = getEmojiMap(state);
+        const mentions = getMentionsFromMessage(state, post);
+        const teammateNameDisplaySetting = getTeammateNameDisplaySetting(state);
+
+        return createAriaLabelMemoized(
+            post,
+            authorDisplayName,
+            isFlagged,
+            reactions,
+            intl,
+            emojiMap,
+            mentions,
+            teammateNameDisplaySetting,
+        );
+    });
 }
 
-export function createAriaLabelForPost(post: Post, author: string, isFlagged: boolean, reactions: Record<string, Reaction>, intl: IntlShape, emojiMap: EmojiMap, mentions: Record<string, UserProfile>, teammateNameDisplaySetting: string): string {
+export function createAriaLabelForPost(post: Post, author: string, isFlagged: boolean, reactions: Record<string, Reaction> | undefined, intl: IntlShape, emojiMap: EmojiMap, mentions: Record<string, UserProfile>, teammateNameDisplaySetting: string): string {
     const {formatMessage, formatTime, formatDate} = intl;
 
     let message = post.state === Posts.POST_DELETED ? formatMessage({

From 5d122e5d7a3b1c6abc1ab9f4f8df9a2b8c1c5911 Mon Sep 17 00:00:00 2001
From: Allan Guwatudde <guwats10@gmail.com>
Date: Fri, 14 Apr 2023 00:15:38 +0300
Subject: [PATCH 055/103] [MM-51413] - Update Cloud pricing modal to remove
 mentions of Cloud Free (#22639)

* [MM-51413] - Update Cloud pricing modal to remove mentions of Cloud Free

* cleanup starter from pricing modal

* rm unused import

* enterprise button states

* fix purchase modal

* revert

* revert e2e

* revert

* revert

* revert

* revert

* revert

* revert

* add feature flag

* default FF to false

* revert

* fix feature flag self hosted checks

* add links

* feedback impl

* feedback impl

* fix lint

* feedback impl

* fix translation

* feedback impl

* feedback impl

* fix height

* improve alignment

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../pricing_modal/blank_card_image.svg.tsx    | 523 ++++++++++++++++++
 .../src/components/pricing_modal/card.tsx     | 108 +++-
 .../src/components/pricing_modal/content.tsx  | 206 ++++---
 .../pricing_modal/pricing_modal.scss          | 113 ++++
 .../pricing_modal/self_hosted_content.tsx     |  12 +-
 webapp/channels/src/i18n/en.json              |  10 +-
 webapp/channels/src/utils/constants.tsx       |   1 +
 7 files changed, 872 insertions(+), 101 deletions(-)
 create mode 100644 webapp/channels/src/components/pricing_modal/blank_card_image.svg.tsx

diff --git a/webapp/channels/src/components/pricing_modal/blank_card_image.svg.tsx b/webapp/channels/src/components/pricing_modal/blank_card_image.svg.tsx
new file mode 100644
index 0000000000..af07eb2e6e
--- /dev/null
+++ b/webapp/channels/src/components/pricing_modal/blank_card_image.svg.tsx
@@ -0,0 +1,523 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+const BlankCardImage = () => {
+    return (
+        <svg
+            width='264'
+            height='191'
+            viewBox='0 0 264 191'
+            fill='none'
+            xmlns='http://www.w3.org/2000/svg'
+            xmlnsXlink='http://www.w3.org/1999/xlink'
+        >
+            <g clipPath='url(#clip0_880_97924)'>
+                <path
+                    opacity='0.64'
+                    fillRule='evenodd'
+                    clipRule='evenodd'
+                    d='M151.099 23.4667C97.2454 23.4667 53.6738 58.1746 53.6738 100.897C53.6738 143.619 97.2454 178.327 151.099 178.327C204.952 178.327 248.524 143.619 248.524 100.897C248.524 58.1746 204.952 23.4667 151.099 23.4667ZM53.1868 100.897C53.1868 57.8316 97.0706 22.9951 151.099 22.9951C205.127 22.9951 249.011 57.8316 249.011 100.897C249.011 143.962 205.127 178.799 151.099 178.799C97.0706 178.799 53.1868 143.962 53.1868 100.897Z'
+                    fill='#3F4350'
+                    fillOpacity='0.64'
+                />
+                <path
+                    d='M214.989 15.7373H171.357C170.557 15.7347 169.765 15.8847 169.025 16.1786C168.285 16.4726 167.612 16.9048 167.045 17.4505C166.478 17.9963 166.027 18.645 165.718 19.3595C165.41 20.074 165.25 20.8403 165.247 21.6148V48.4725C165.25 49.247 165.41 50.0133 165.718 50.7278C166.027 51.4423 166.478 52.091 167.045 52.6368C167.612 53.1825 168.285 53.6147 169.025 53.9087C169.765 54.2026 170.557 54.3526 171.357 54.35H177.796V64.4035L187.455 54.35H214.973C215.773 54.3526 216.565 54.2026 217.305 53.9087C218.045 53.6147 218.718 53.1825 219.285 52.6368C219.852 52.091 220.303 51.4423 220.611 50.7278C220.92 50.0133 221.08 49.247 221.083 48.4725V21.6148C221.077 20.0533 220.433 18.5576 219.29 17.4558C218.148 16.354 216.601 15.736 214.989 15.7373Z'
+                    fill='#FFBC1F'
+                />
+                <path
+                    d='M187.455 54.3499H214.974C215.773 54.3525 216.565 54.2026 217.305 53.9086C218.045 53.6147 218.718 53.1825 219.285 52.6367C219.852 52.0909 220.303 51.4423 220.612 50.7278C220.92 50.0133 221.08 49.2469 221.083 48.4725V32.1672C221.083 32.1672 219.162 47.2451 218.816 48.5722C218.471 49.8994 217.786 51.8852 214.541 52.2145C211.295 52.5438 187.455 54.3499 187.455 54.3499Z'
+                    fill='#CC8F00'
+                />
+                <path
+                    d='M178.27 31.2043C179.047 31.2043 179.807 31.4276 180.453 31.8459C181.1 32.2642 181.603 32.8588 181.901 33.5544C182.198 34.25 182.276 35.0154 182.125 35.7539C181.973 36.4924 181.599 37.1707 181.049 37.7031C180.499 38.2355 179.799 38.5981 179.036 38.745C178.274 38.8918 177.484 38.8165 176.765 38.5283C176.047 38.2402 175.433 37.7522 175.002 37.1262C174.57 36.5002 174.339 35.7642 174.339 35.0112C174.338 34.5111 174.44 34.0158 174.637 33.5536C174.834 33.0914 175.124 32.6715 175.489 32.3179C175.854 31.9643 176.288 31.6839 176.765 31.4928C177.242 31.3017 177.753 31.2037 178.27 31.2043Z'
+                    fill='white'
+                />
+                <path
+                    d='M193.173 31.2043C193.95 31.2043 194.71 31.4276 195.357 31.8459C196.003 32.2642 196.507 32.8588 196.804 33.5544C197.102 34.25 197.18 35.0154 197.028 35.7539C196.876 36.4924 196.502 37.1707 195.952 37.7031C195.403 38.2355 194.702 38.5981 193.94 38.745C193.177 38.8918 192.387 38.8165 191.669 38.5283C190.951 38.2402 190.337 37.7522 189.905 37.1262C189.473 36.5002 189.242 35.7642 189.242 35.0112C189.242 34.5111 189.343 34.0158 189.54 33.5536C189.738 33.0914 190.027 32.6715 190.392 32.3179C190.757 31.9643 191.191 31.6839 191.668 31.4928C192.145 31.3017 192.657 31.2037 193.173 31.2043Z'
+                    fill='white'
+                />
+                <path
+                    d='M208.06 31.2043C208.838 31.2034 209.598 31.4258 210.245 31.8435C210.892 32.2612 211.397 32.8554 211.695 33.5509C211.993 34.2465 212.072 35.0121 211.921 35.7509C211.77 36.4896 211.396 37.1684 210.846 37.7013C210.297 38.2342 209.597 38.5973 208.834 38.7446C208.071 38.8919 207.281 38.8168 206.562 38.5288C205.844 38.2408 205.23 37.7529 204.798 37.1267C204.365 36.5006 204.135 35.7644 204.135 35.0112C204.134 34.5115 204.235 34.0166 204.432 33.5548C204.629 33.0929 204.918 32.6732 205.283 32.3197C205.647 31.9661 206.08 31.6856 206.557 31.4942C207.033 31.3029 207.544 31.2043 208.06 31.2043Z'
+                    fill='white'
+                />
+                <path
+                    d='M169.775 26.9834C170.219 25.4635 170.968 24.0436 171.98 22.8054C172.993 21.5672 174.248 20.5352 175.674 19.7688C175.758 19.7275 175.826 19.6601 175.867 19.5774C175.907 19.4947 175.919 19.4012 175.899 19.3116C175.879 19.222 175.828 19.1414 175.756 19.0824C175.684 19.0234 175.593 18.9893 175.499 18.9855C172.748 18.8258 167.195 19.3946 168.936 26.9435C168.954 27.0357 169.004 27.1192 169.077 27.1807C169.15 27.2422 169.243 27.2781 169.339 27.2827C169.436 27.2873 169.532 27.2603 169.611 27.206C169.69 27.1518 169.748 27.0734 169.775 26.9834Z'
+                    fill='#FFD470'
+                />
+                <path
+                    fillRule='evenodd'
+                    clipRule='evenodd'
+                    d='M136.167 65.1412C136.167 97.9081 108.757 124.471 74.9451 124.471C41.1333 124.471 13.7234 97.9081 13.7234 65.1412C13.7234 32.3743 41.1333 5.81152 74.9451 5.81152C108.757 5.81152 136.167 32.3743 136.167 65.1412ZM135.57 65.1412C135.57 97.5884 108.427 123.892 74.9451 123.892C41.4632 123.892 14.3207 97.5884 14.3207 65.1412C14.3207 32.694 41.4632 6.39035 74.9451 6.39035C108.427 6.39035 135.57 32.694 135.57 65.1412Z'
+                    fill='#3F4350'
+                    fillOpacity='0.16'
+                />
+                <path
+                    d='M74.9452 123.892C108.427 123.892 135.57 97.5885 135.57 65.1413C135.57 32.694 108.427 6.39038 74.9452 6.39038C41.4633 6.39038 14.3208 32.694 14.3208 65.1413C14.3208 97.5885 41.4633 123.892 74.9452 123.892Z'
+                    fill='white'
+                />
+                <path
+                    d='M74.9452 123.892C108.427 123.892 135.57 97.5885 135.57 65.1413C135.57 32.694 108.427 6.39038 74.9452 6.39038C41.4633 6.39038 14.3208 32.694 14.3208 65.1413C14.3208 97.5885 41.4633 123.892 74.9452 123.892Z'
+                    fill='#3F4350'
+                    fillOpacity='0.16'
+                />
+                <mask
+                    id='mask0_880_97924'
+
+                    maskUnits='userSpaceOnUse'
+                    x='14'
+                    y='6'
+                    width='122'
+                    height='118'
+                >
+                    <path
+                        d='M74.9452 123.892C108.427 123.892 135.57 97.5885 135.57 65.1413C135.57 32.694 108.427 6.39038 74.9452 6.39038C41.4633 6.39038 14.3208 32.694 14.3208 65.1413C14.3208 97.5885 41.4633 123.892 74.9452 123.892Z'
+                        fill='#E8E9ED'
+                    />
+                </mask>
+                <g mask='url(#mask0_880_97924)'>
+                    <path
+                        d='M27.9571 44.6527C26.8484 45.1959 25.9702 46.0966 25.4736 47.1996C24.977 48.3027 24.8932 49.5389 25.2367 50.6953C26.0152 53.3343 27.8681 57.2851 32.0098 62.9573C41.8792 76.4794 47.4267 74.5901 47.4267 74.5901L21.6533 93.6897L23.2971 127.481L100.927 127.697C100.927 127.697 122.725 101.777 123.059 100.661C127.285 86.2274 122.391 64.2541 102.817 48.7436C83.3165 33.2977 65.9021 26.0637 27.9571 44.6527Z'
+                        fill='white'
+                    />
+                    <path
+                        d='M27.9571 44.6527C26.8484 45.1959 25.9702 46.0966 25.4736 47.1996C24.977 48.3027 24.8932 49.5389 25.2367 50.6953C26.0152 53.3343 27.8681 57.2851 32.0098 62.9572C41.8792 76.4794 47.4267 74.5901 47.4267 74.5901L21.6533 93.6896L23.2971 127.481L100.927 127.696C100.927 127.696 122.725 101.777 123.059 100.661C127.285 86.2274 122.391 64.2541 102.817 48.7436C83.3164 33.2977 65.9021 26.0637 27.9571 44.6527Z'
+                        fill='#3F4350'
+                        fillOpacity='0.04'
+                    />
+                    <rect
+                        opacity='0.24'
+                        x='-0.0141602'
+                        y='-18.7185'
+                        width='125.898'
+                        height='165.23'
+                        fill='url(#pattern0)'
+                    />
+                </g>
+                <path
+                    d='M109.973 113.804C111.503 112.703 112.944 111.32 114.212 110.077C115.422 108.89 117.042 108.114 118.18 106.884C119.895 104.752 121.628 102.632 123.452 100.581C124.49 99.1964 125.474 97.7667 126.404 96.2918C128.16 93.4862 129.761 90.5918 131.199 87.621C131.796 86.3974 131.929 84.7321 132.519 83.5042C132.474 82.3065 132.43 81.4814 132.405 81.3112C132.101 79.1426 131.796 76.9733 131.489 74.8032C131.222 72.9248 130.957 71.0419 130.523 69.1914C129.689 65.6176 127.767 60.6111 127.614 57.0351C127.552 55.6219 130.332 51.6839 130.95 50.7878C133.62 46.9101 135.468 46.4621 138.911 42.5155C139.22 42.1622 139.516 41.615 139.185 41.279C138.853 40.9429 138.331 41.1691 137.941 41.3931L132.881 44.3014C132.492 44.5168 132.51 44.5922 132.063 44.5405C131.395 44.4651 131.506 43.7477 131.618 43.4634C131.813 43.011 131.978 42.1945 132.314 41.6193C133.717 39.2087 133.76 39.4134 135.165 37.0028C135.501 36.4254 136.135 34.5943 136.5 33.9868C137.35 32.5758 137.09 31.3781 136.278 31.4018C135.561 31.4255 134.276 33.556 132.941 34.6331C133.646 33.0174 135.699 30.1092 135.085 29.618C133.831 28.6012 131.591 31.3177 130.414 32.9119C129.143 34.6411 127.754 36.2856 126.255 37.8343C125.903 38.1984 125.552 38.4677 125.365 38.2953C125.143 38.0799 127.018 35.3332 127.367 34.6331C128.237 32.8882 132.26 27.955 130.101 28.6486C128.971 29.0106 124.451 33.235 122.251 36.7874C120.824 39.0268 119.264 41.1846 117.58 43.2501C117.58 43.2501 116.092 41.391 116.132 39.4543C116.132 38.9718 116.468 36.5719 115.8 35.4948C115.295 34.6805 114.953 35.3526 114.688 35.7102C113.576 37.2182 113.798 38.7262 112.713 42.9334C112.028 45.581 112.915 48.3707 112.935 51.1001C112.964 53.7305 112.435 56.3328 111.975 58.9265C108.86 76.5913 109.432 94.6352 109.695 112.567C109.697 112.994 109.791 113.415 109.973 113.804Z'
+                    fill='#FFBC1F'
+                />
+                <path
+                    d='M76.0292 37.3669C79.1432 34.9541 84.3126 32.313 86.7683 29.3423C88.9548 26.6969 93.7349 19.3639 94.133 16.8607C94.8382 12.4079 100.648 2.55006 107.942 3.18987C116.045 3.90292 122.669 10.008 122.669 15.077C122.669 21.6151 119.582 24.0171 115.918 28.4505C113.471 31.4233 114.386 33.2049 114.079 33.5022C113.525 34.0386 112.522 32.5974 111.93 33.2049C109.414 35.8094 107.417 38.1036 103.951 39.4522C103.08 39.8084 102.121 39.9117 101.191 39.7495C101.191 39.7495 95.9726 47.774 93.8261 54.6137C93.468 55.749 84.0056 52.83 78.1756 46.2919C74.283 41.9145 76.0292 37.3669 76.0292 37.3669Z'
+                    fill='#FFBC1F'
+                />
+                <path
+                    d='M101.182 39.7108C98.6687 39.1291 96.3999 37.8603 94.4513 36.1283C94.2096 35.9114 93.979 35.6845 93.7595 35.4475C93.6462 35.3254 93.4922 35.2455 93.3244 35.2219C93.1565 35.1983 92.9855 35.2324 92.8409 35.3183H92.8275C92.7312 35.3753 92.6499 35.4533 92.5903 35.5461C92.5307 35.6389 92.4943 35.744 92.4841 35.8529C92.474 35.9618 92.4903 36.0715 92.5318 36.1732C92.5733 36.2749 92.6387 36.3657 92.723 36.4385L92.9944 36.6755C95.7236 39.1055 96.8959 42.7138 97.0583 46.1821C97.0583 46.4493 97.0583 46.7207 97.0583 46.9921C99.1269 42.9271 101.196 39.7431 101.196 39.7431H101.222L101.182 39.7108Z'
+                    fill='#CC8F00'
+                />
+                <path
+                    d='M100.27 19.5363C100.88 18.8901 100.27 17.4467 100.27 16.2662C100.27 14.4825 103.031 12.9982 104.367 14.9736C104.961 15.8526 105.633 16.5936 106.407 16.8586C108.567 17.5997 111.846 15.7664 114.079 16.264C116.163 16.7293 115.825 16.249 117.653 17.3282C119.482 18.4075 121.499 19.3941 123.637 19.3144C125.774 19.2347 127.994 17.7138 128.085 15.6522C128.101 15.2817 128.057 14.8789 128.261 14.5751C128.441 14.2972 128.771 14.1572 129.062 13.9935C130.461 13.205 131.186 11.6733 131.827 10.2343C131.944 10.0037 132.025 9.7576 132.067 9.50402C132.156 8.71126 131.469 7.99605 130.699 7.72031C129.929 7.44457 129.086 7.44888 128.268 7.35194C124.14 6.86508 120.979 3.6251 117.146 2.07405C110.834 -0.480879 103.406 -1.01944 99.0556 4.09688C94.7048 9.2132 90.265 15.984 91.3839 22.5221C91.3705 22.507 95.9749 24.1356 100.27 19.5363Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M109.07 32.2593C109.171 32.8302 109.385 33.3767 109.702 33.8685C109.924 34.2196 110.504 33.8965 110.278 33.541C109.992 33.0971 109.8 32.6029 109.713 32.0869C109.639 31.6776 108.996 31.8521 109.07 32.2593Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M102.306 16.0012C103.273 15.6501 104.227 16.5548 103.731 17.4898C103.536 17.8582 104.112 18.1856 104.307 17.8151C105.044 16.4234 103.687 14.8099 102.128 15.3786C101.729 15.523 101.905 16.1477 102.306 16.0012Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M68.6156 55.4691C69.2583 54.9289 69.7923 54.2781 70.1904 53.5497C71.0231 51.9643 71.4184 50.1974 71.3382 48.4204C71.1158 43.0348 71.4805 42.7483 71.1158 38.5109C71.0624 37.912 69.5988 34.4545 69.5476 33.8556C69.363 31.7121 69.8167 27.4489 71.227 25.9539C71.4761 25.691 72.0233 26.1499 72.2279 26.4472C72.6728 27.0934 72.1567 30.5553 72.4504 31.8328C72.7217 33.0198 73.5759 34.7668 74.1987 35.9474C74.2212 35.996 74.2614 36.0348 74.3117 36.0563C74.362 36.0778 74.4188 36.0805 74.471 36.0639C74.5232 36.0473 74.5673 36.0126 74.5946 35.9664C74.622 35.9202 74.6307 35.8659 74.6191 35.8138C74.341 34.2261 73.9896 31.5656 74.2298 29.2477C74.3032 28.5282 75.7446 25.704 76.2317 25.1546C76.7189 24.6053 78.6785 22.5695 79.5682 23.4312C80.2355 24.0775 77.5663 27.2033 77.5663 30.7557C77.5663 32.3024 78.3226 34.3985 78.8498 35.6673C78.8592 35.7016 78.8823 35.7308 78.914 35.7486C78.9457 35.7664 78.9834 35.7713 79.0188 35.7621C79.0542 35.753 79.0844 35.7306 79.1028 35.6999C79.1211 35.6692 79.1261 35.6327 79.1167 35.5984C78.832 33.8061 78.5273 30.3399 79.784 27.7397C80.1488 26.99 81.8304 24.1012 82.6756 24.5084C84.0103 25.1546 82.2775 28.8599 82.2308 30.9711C82.1818 33.1253 82.8625 34.9112 83.5654 36.7875C83.588 36.8452 83.6306 36.8935 83.686 36.9239C83.7414 36.9544 83.806 36.9652 83.8687 36.9545C83.9315 36.9438 83.9884 36.9122 84.0296 36.8652C84.0709 36.8182 84.0939 36.7587 84.0948 36.6971C84.0948 36.2425 84.1504 36.0163 84.2393 35.0555C84.3639 33.6983 84.9556 31.5161 86.1367 31.1003C86.2355 31.0694 86.3412 31.0654 86.4422 31.0886C86.5433 31.1119 86.6357 31.1615 86.7096 31.2322C86.7835 31.3029 86.8359 31.3918 86.8612 31.4894C86.8865 31.5869 86.8836 31.6893 86.853 31.7854C85.9165 34.741 88.688 40.2149 88.2054 46.7832C87.6982 53.6574 83.2295 61.1671 80.6938 65.5617C79.5393 67.563 77.2816 71.5936 76.0471 73.5453C73.4157 77.7095 68.7246 84.4523 64.5384 89.5815C59.8495 95.3247 55.125 101.102 49.4418 105.928C45.0532 109.655 40.1463 112.768 35.1282 115.652C29.0958 119.12 22.5807 122.358 15.5673 122.524C14.6376 122.548 13.6789 122.509 12.8292 122.141C12.1563 121.812 11.5462 121.375 11.0252 120.848C7.56391 117.633 4.80354 113.778 2.90738 109.511C1.01123 105.244 0.0177922 100.653 -0.0141602 96.0076C-0.0141602 92.033 0.686506 88.0843 1.72972 84.2433C4.71923 73.2394 16.2858 56.9318 26.9626 48.3149C26.9626 48.3149 30.2502 50.0383 37.9153 59.4458C44.7306 67.8043 46.0919 73.0886 46.0919 73.0886C46.0919 73.0886 56.5486 65.7642 68.6156 55.4691Z'
+                    fill='#FFBC1F'
+                />
+                <mask
+                    id='mask1_880_97924'
+                    maskUnits='userSpaceOnUse'
+                    x='-1'
+                    y='23'
+                    width='90'
+                    height='100'
+                >
+                    <path
+                        d='M68.6156 55.4691C69.2583 54.9289 69.7923 54.2781 70.1904 53.5497C71.0231 51.9643 71.4184 50.1974 71.3382 48.4204C71.1158 43.0348 71.4805 42.7483 71.1158 38.5109C71.0624 37.912 69.5988 34.4545 69.5476 33.8556C69.363 31.7121 69.8167 27.4489 71.227 25.9539C71.4761 25.691 72.0233 26.1499 72.2279 26.4472C72.6728 27.0934 72.1567 30.5553 72.4504 31.8328C72.7217 33.0198 73.5759 34.7668 74.1987 35.9474C74.2212 35.996 74.2614 36.0348 74.3117 36.0563C74.362 36.0778 74.4188 36.0805 74.471 36.0639C74.5232 36.0473 74.5673 36.0126 74.5946 35.9664C74.622 35.9202 74.6307 35.8659 74.6191 35.8138C74.341 34.2261 73.9896 31.5656 74.2298 29.2477C74.3032 28.5282 75.7446 25.704 76.2317 25.1546C76.7189 24.6053 78.6785 22.5695 79.5682 23.4312C80.2355 24.0775 77.5663 27.2033 77.5663 30.7557C77.5663 32.3024 78.3226 34.3985 78.8498 35.6673C78.8592 35.7016 78.8823 35.7308 78.914 35.7486C78.9457 35.7664 78.9834 35.7713 79.0188 35.7621C79.0542 35.753 79.0844 35.7306 79.1028 35.6999C79.1211 35.6692 79.1261 35.6327 79.1167 35.5984C78.832 33.8061 78.5273 30.3399 79.784 27.7397C80.1488 26.99 81.8304 24.1012 82.6756 24.5084C84.0103 25.1546 82.2775 28.8599 82.2308 30.9711C82.1818 33.1253 82.8625 34.9112 83.5654 36.7875C83.588 36.8452 83.6306 36.8935 83.686 36.9239C83.7414 36.9544 83.806 36.9652 83.8687 36.9545C83.9315 36.9438 83.9884 36.9122 84.0296 36.8652C84.0709 36.8182 84.0939 36.7587 84.0948 36.6971C84.0948 36.2425 84.1504 36.0163 84.2393 35.0555C84.3639 33.6983 84.9556 31.5161 86.1367 31.1003C86.2355 31.0694 86.3412 31.0654 86.4422 31.0886C86.5433 31.1119 86.6357 31.1615 86.7096 31.2322C86.7835 31.3029 86.8359 31.3918 86.8612 31.4894C86.8865 31.5869 86.8836 31.6893 86.853 31.7854C85.9165 34.741 88.688 40.2149 88.2054 46.7832C87.6982 53.6574 83.2295 61.1671 80.6938 65.5617C79.5393 67.563 77.2816 71.5936 76.0471 73.5453C73.4157 77.7095 68.7246 84.4523 64.5384 89.5815C59.8495 95.3247 55.125 101.102 49.4418 105.928C45.0532 109.655 40.1463 112.768 35.1282 115.652C29.0958 119.12 22.5807 122.358 15.5673 122.524C14.6376 122.548 13.6789 122.509 12.8292 122.141C12.1563 121.812 11.5462 121.375 11.0252 120.848C7.56391 117.633 4.80354 113.778 2.90738 109.511C1.01123 105.244 0.0177922 100.653 -0.0141602 96.0076C-0.0141602 92.033 0.686506 88.0843 1.72972 84.2433C4.71923 73.2394 16.2858 56.9318 26.9626 48.3149C26.9626 48.3149 30.2502 50.0383 37.9153 59.4458C44.7306 67.8043 46.0919 73.0886 46.0919 73.0886C46.0919 73.0886 56.5486 65.7642 68.6156 55.4691Z'
+                        fill='white'
+                    />
+                </mask>
+                <g mask='url(#mask1_880_97924)'>
+                    <rect
+                        x='-0.0141602'
+                        y='-18.7188'
+                        width='55.8309'
+                        height='98.2334'
+                        fill='url(#pattern1)'
+                        fillOpacity='0.32'
+                    />
+                </g>
+                <path
+                    d='M82.3596 32.7267C82.5376 33.987 82.7422 35.3829 83.5252 36.4428C83.5596 36.4959 83.609 36.5383 83.6676 36.565C83.7262 36.5917 83.7914 36.6016 83.8556 36.5934C83.9198 36.5852 83.9802 36.5594 84.0297 36.5189C84.0791 36.4785 84.1156 36.4251 84.1347 36.3652C84.4416 35.4885 84.7152 34.5988 85.0377 33.7263C85.2602 33.1511 85.4826 32.367 85.9608 31.9361C86.8239 31.1455 86.4057 32.2334 86.3812 32.647C86.355 33.1497 86.3646 33.6536 86.4102 34.155C86.5481 35.9839 86.9751 37.7655 87.2532 39.5729C87.3155 39.9844 87.9605 39.8099 87.896 39.4027C87.509 36.8866 86.8017 34.4006 87.1798 31.8499C87.3199 30.8978 86.5125 30.6091 85.7495 31.2037C84.3749 32.2808 84.0212 34.6785 83.4918 36.1972L84.1013 36.1196C83.3561 35.1093 83.1737 33.7629 83.0025 32.5608C82.9446 32.1494 82.3018 32.3239 82.3596 32.731V32.7267Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M87.2866 39.6678C88.1608 43.7996 88.0585 48.0155 86.7528 52.0525C86.6238 52.4489 87.2689 52.6191 87.3956 52.2227C88.7302 48.0779 88.8281 43.7371 87.9295 39.4954C87.845 39.0883 87.1999 39.2606 87.2866 39.6678Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M129.229 40.3936C130.397 38.9244 131.51 37.4165 132.565 35.8697C132.801 35.5207 132.223 35.1976 131.989 35.5423C130.936 37.0933 129.824 38.6013 128.653 40.0662C128.392 40.3936 128.971 40.7124 129.229 40.3915V40.3936Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M132.948 35.174L133.286 34.8552C133.345 34.7939 133.377 34.7129 133.376 34.6292C133.374 34.5455 133.339 34.4656 133.278 34.4064C133.217 34.3472 133.134 34.3133 133.048 34.3118C132.961 34.3103 132.878 34.3414 132.814 34.3985L132.476 34.7152C132.445 34.7452 132.421 34.7808 132.404 34.82C132.387 34.8593 132.378 34.9013 132.378 34.9438C132.378 34.9863 132.386 35.0285 132.403 35.0678C132.42 35.1071 132.444 35.1428 132.475 35.1729C132.506 35.2031 132.543 35.227 132.584 35.2434C132.624 35.2597 132.667 35.2682 132.711 35.2683C132.755 35.2684 132.799 35.2601 132.839 35.2439C132.88 35.2278 132.917 35.204 132.948 35.174Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M117.538 43.0369C118.247 43.9718 119.184 44.9757 119.566 46.0851C120.176 47.8581 119.072 49.7947 117.406 50.5573C117.017 50.7361 117.355 51.2919 117.742 51.1153C118.569 50.7329 119.26 50.1221 119.728 49.36C120.197 48.5979 120.422 47.7185 120.376 46.8326C120.283 45.245 119.041 43.9352 118.114 42.7116C117.862 42.3798 117.284 42.7008 117.538 43.0369Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M124.504 58.8061C126.833 59.0409 128.094 56.4084 129.193 54.8531C129.436 54.5084 128.86 54.1852 128.617 54.5278C127.658 55.8849 126.52 58.3623 124.504 58.1598C124.077 58.1167 124.079 58.763 124.504 58.8061Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M78.2448 34.0192C78.3601 34.617 78.4344 35.2215 78.4672 35.8287C78.485 36.0894 78.6074 36.7464 78.4984 36.9489C78.3027 37.3173 78.8765 37.6448 79.0745 37.2742C79.2725 36.9037 79.1657 36.3759 79.1457 35.9946C79.1107 35.2716 79.0237 34.5517 78.8854 33.8404C78.8053 33.4311 78.1603 33.6034 78.2426 34.0106L78.2448 34.0192Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M74.0743 36.1197C74.1512 36.4936 74.1398 36.8795 74.0409 37.2485C73.9119 37.647 74.5548 37.8172 74.6838 37.4208C74.8116 36.9394 74.823 36.4359 74.7171 35.9495C74.646 35.5402 74.0031 35.7125 74.0743 36.1197Z'
+                    fill='#6F370B'
+                />
+                <path
+                    d='M113.045 25.2644H112.989C112.782 25.2644 112.584 25.3438 112.438 25.4852C112.292 25.6266 112.21 25.8184 112.21 26.0184C112.21 26.2184 112.292 26.4101 112.438 26.5515C112.584 26.6929 112.782 26.7724 112.989 26.7724H113.045C113.251 26.7724 113.449 26.6929 113.595 26.5515C113.741 26.4101 113.823 26.2184 113.823 26.0184C113.823 25.8184 113.741 25.6266 113.595 25.4852C113.449 25.3438 113.251 25.2644 113.045 25.2644Z'
+                    fill='#6F370B'
+                />
+                <mask
+                    id='mask2_880_97924'
+                    maskUnits='userSpaceOnUse'
+                    x='91'
+                    y='0'
+                    width='42'
+                    height='23'
+                >
+                    <path
+                        d='M100.27 19.5363C100.88 18.8901 100.27 17.4467 100.27 16.2662C100.27 14.4825 103.031 12.9982 104.368 14.9736C104.961 15.8526 105.633 16.5936 106.407 16.8586C108.567 17.5997 111.846 15.7664 114.079 16.264C116.163 16.7293 115.825 16.249 117.654 17.3282C119.482 18.4075 121.499 19.3941 123.637 19.3144C125.775 19.2347 127.995 17.7138 128.086 15.6522C128.101 15.2817 128.057 14.8789 128.261 14.5751C128.442 14.2972 128.771 14.1572 129.062 13.9935C130.461 13.205 131.186 11.6733 131.827 10.2343C131.944 10.0037 132.025 9.7576 132.067 9.50402C132.156 8.71126 131.469 7.99605 130.699 7.72031C129.93 7.44457 129.087 7.44888 128.268 7.35194C124.14 6.86508 120.979 3.6251 117.146 2.07405C110.834 -0.480879 103.407 -1.01944 99.0559 4.09688C94.7051 9.2132 90.2653 15.984 91.3841 22.5221C91.3708 22.507 95.9752 24.1356 100.27 19.5363Z'
+                        fill='white'
+                    />
+                </mask>
+                <g mask='url(#mask2_880_97924)'>
+                    <rect
+                        opacity='0.32'
+                        x='-0.013916'
+                        y='-18.7188'
+                        width='132.126'
+                        height='52.7789'
+                        fill='url(#pattern2)'
+                    />
+                </g>
+                <path
+                    d='M45.7271 72.4853C41.6605 75.9737 37.1804 78.982 32.3811 81.4469C28.0592 83.6615 23.1745 85.1824 19.7135 88.6744C19.4154 88.976 19.887 89.4327 20.185 89.1311C23.7707 85.5141 28.9511 83.9911 33.4043 81.6473C37.9964 79.2231 42.2901 76.3027 46.2031 72.942C46.5256 72.6662 46.0519 72.2095 45.7316 72.4853H45.7271Z'
+                    fill='#6F370B'
+                />
+                <path
+                    fillRule='evenodd'
+                    clipRule='evenodd'
+                    d='M262.624 135.525C262.624 166.203 237 191.072 205.392 191.072C173.784 191.072 148.16 166.203 148.16 135.525C148.16 104.847 173.784 79.9771 205.392 79.9771C237 79.9771 262.624 104.847 262.624 135.525ZM262.066 135.525C262.066 165.904 236.692 190.531 205.392 190.531C174.092 190.531 148.719 165.904 148.719 135.525C148.719 105.146 174.092 80.519 205.392 80.519C236.692 80.519 262.066 105.146 262.066 135.525Z'
+                    fill='#3F4350'
+                    fillOpacity='0.16'
+                />
+                <path
+                    d='M205.392 190.531C236.692 190.531 262.066 165.904 262.066 135.525C262.066 105.146 236.692 80.519 205.392 80.519C174.092 80.519 148.719 105.146 148.719 135.525C148.719 165.904 174.092 190.531 205.392 190.531Z'
+                    fill='white'
+                />
+                <path
+                    d='M205.392 190.531C236.692 190.531 262.066 165.904 262.066 135.525C262.066 105.146 236.692 80.519 205.392 80.519C174.092 80.519 148.719 105.146 148.719 135.525C148.719 165.904 174.092 190.531 205.392 190.531Z'
+                    fill='#3F4350'
+                    fillOpacity='0.16'
+                />
+                <mask
+                    id='mask3_880_97924'
+                    maskUnits='userSpaceOnUse'
+                    x='148'
+                    y='80'
+                    width='115'
+                    height='111'
+                >
+                    <path
+                        d='M205.392 190.531C236.692 190.531 262.066 165.904 262.066 135.525C262.066 105.146 236.692 80.519 205.392 80.519C174.092 80.519 148.719 105.146 148.719 135.525C148.719 165.904 174.092 190.531 205.392 190.531Z'
+                        fill='white'
+                    />
+                </mask>
+                <g mask='url(#mask3_880_97924)'>
+                    <path
+                        d='M179.564 151.478C196.645 143.38 215.247 140.67 233.113 144.784C241.138 146.632 258.453 158.24 264.204 165.942C264.186 176.63 245.13 207.443 214.302 208.883C201.327 209.489 162.229 175.616 158.643 169.647C158.643 169.654 169.544 156.23 179.564 151.478Z'
+                        fill='white'
+                    />
+                    <path
+                        d='M179.564 151.478C196.645 143.38 215.247 140.67 233.113 144.784C241.138 146.632 258.453 158.24 264.204 165.942C264.186 176.63 245.13 207.443 214.302 208.883C201.327 209.489 162.229 175.616 158.643 169.647C158.643 169.654 169.544 156.23 179.564 151.478Z'
+                        fill='#3F4350'
+                        fillOpacity='0.04'
+                    />
+                    <mask
+                        id='mask4_880_97924'
+                        maskUnits='userSpaceOnUse'
+                        x='158'
+                        y='142'
+                        width='107'
+                        height='67'
+                    >
+                        <path
+                            d='M179.564 151.478C196.645 143.38 215.247 140.67 233.113 144.784C241.138 146.632 258.453 158.24 264.204 165.942C264.186 176.63 245.13 207.443 214.302 208.883C201.327 209.489 162.229 175.616 158.643 169.647C158.643 169.654 169.544 156.23 179.564 151.478Z'
+                            fill='white'
+                        />
+                    </mask>
+                    <g mask='url(#mask4_880_97924)'>
+                        <rect
+                            x='134.026'
+                            y='80.519'
+                            width='137.479'
+                            height='142.545'
+                            fill='url(#pattern3)'
+                            fillOpacity='0.24'
+                        />
+                    </g>
+                    <path
+                        d='M172.291 140.716C174.2 145.914 179.411 151.737 185.747 152.332C196.386 153.333 200.644 145.922 203.897 138.398C206.283 132.866 207.497 120.347 206.751 113.357C205.607 102.652 198.996 92.4149 195.865 93.7857C177.479 101.832 172.577 119.557 171.874 123.862C171.1 128.602 170.843 136.754 172.291 140.716Z'
+                        fill='#4A2407'
+                    />
+                    <mask
+                        id='mask5_880_97924'
+
+                        maskUnits='userSpaceOnUse'
+                        x='171'
+                        y='93'
+                        width='36'
+                        height='60'
+                    >
+                        <path
+                            d='M172.291 140.716C174.2 145.914 179.411 151.737 185.747 152.332C196.386 153.333 200.644 145.922 203.897 138.398C206.283 132.866 207.497 120.347 206.751 113.357C205.607 102.652 198.996 92.4149 195.865 93.7857C177.479 101.832 172.577 119.557 171.874 123.862C171.1 128.602 170.843 136.754 172.291 140.716Z'
+                            fill='white'
+                        />
+                    </mask>
+                    <g mask='url(#mask5_880_97924)'>
+                        <rect
+                            opacity='0.32'
+                            x='134.026'
+                            y='80.5193'
+                            width='78.2318'
+                            height='87.066'
+                            fill='url(#pattern4)'
+                        />
+                    </g>
+                    <path
+                        d='M183.621 118.294C183.907 124.51 188.469 138.821 194.052 141.022C195.434 141.542 196.953 141.606 198.376 141.204L200.807 151.15C200.807 151.15 195.758 156.449 193.328 160.986C190.897 165.524 187.257 180.222 195.51 182.222C209.07 185.503 224.041 164.89 225.968 158.542C228.655 149.652 222.328 149.409 220.79 145.487C218.058 138.509 215.85 130.635 218.913 121.3C220.557 116.271 220.45 104.977 215.293 100.378C210.474 96.0797 194.265 95.5877 188.832 99.1311C184.585 101.895 183.366 112.76 183.621 118.294Z'
+                        fill='#AD831F'
+                    />
+                    <path
+                        d='M205.515 138.477C205.519 138.39 205.498 138.303 205.454 138.227C205.411 138.151 205.347 138.087 205.269 138.043C203.062 139.268 200.76 140.325 198.385 141.204L199.142 144.304C199.776 143.832 204.889 138.957 205.515 138.477Z'
+                        fill='#8B6918'
+                    />
+                    <path
+                        d='M206.598 90.9205C211.167 91.1493 220.784 95.4337 224.677 102.164C227.001 106.189 230.053 109.727 232.239 113.825C234.639 118.32 238.846 121.641 243.194 124.441C245.072 125.656 247.026 126.812 248.547 128.428C251.885 131.971 252.58 137.616 250.199 141.824C247.819 146.031 242.537 148.491 237.664 147.659C236.222 147.414 234.801 146.908 233.339 146.981C231.876 147.054 228.167 149.99 222.958 148.692C216.576 147.1 207.756 136.577 203.062 127.836C199.307 120.851 200.801 110.921 190.178 106.013C188.428 105.203 185.119 101.285 186.06 99.6413C189.859 92.9898 198.785 90.5277 206.598 90.9205Z'
+                        fill='#4A2407'
+                    />
+                    <mask
+                        id='mask6_880_97924'
+                        maskUnits='userSpaceOnUse'
+                        x='185'
+                        y='90'
+                        width='67'
+                        height='60'
+                    >
+                        <path
+                            d='M206.598 90.9205C211.167 91.1493 220.784 95.4337 224.677 102.164C227.001 106.189 230.053 109.727 232.239 113.825C234.639 118.32 238.846 121.641 243.194 124.441C245.072 125.656 247.026 126.812 248.547 128.428C251.885 131.971 252.58 137.616 250.199 141.824C247.819 146.031 242.537 148.491 237.664 147.659C236.222 147.414 234.801 146.908 233.339 146.981C231.876 147.054 228.167 149.99 222.958 148.692C216.576 147.1 207.756 136.577 203.062 127.836C199.307 120.851 200.801 110.921 190.178 106.013C188.428 105.203 185.119 101.285 186.06 99.6413C189.859 92.9898 198.785 90.5277 206.598 90.9205Z'
+                            fill='white'
+                        />
+                    </mask>
+                    <g mask='url(#mask6_880_97924)'>
+                        <rect
+                            opacity='0.32'
+                            x='134.026'
+                            y='80.519'
+                            width='113.697'
+                            height='81.599'
+                            fill='url(#pattern5)'
+                        />
+                    </g>
+                    <path
+                        d='M195.516 116.469L195.55 116.336C195.577 116.23 195.583 116.121 195.567 116.013C195.55 115.906 195.513 115.803 195.455 115.709C195.398 115.616 195.322 115.535 195.232 115.47C195.143 115.405 195.041 115.358 194.932 115.331C194.824 115.305 194.711 115.299 194.6 115.315C194.489 115.331 194.383 115.367 194.287 115.423C194.191 115.479 194.107 115.552 194.04 115.639C193.973 115.726 193.925 115.825 193.897 115.931L193.864 116.064C193.809 116.277 193.843 116.502 193.959 116.691C194.074 116.879 194.262 117.015 194.482 117.069C194.701 117.122 194.933 117.089 195.127 116.977C195.321 116.865 195.461 116.682 195.516 116.469Z'
+                        fill='#4A2407'
+                    />
+                    <path
+                        d='M186.414 117.544L186.448 117.411C186.503 117.198 186.469 116.973 186.353 116.785C186.237 116.596 186.049 116.46 185.83 116.407C185.611 116.353 185.379 116.386 185.185 116.498C184.991 116.611 184.851 116.793 184.795 117.006L184.762 117.139C184.707 117.352 184.741 117.577 184.856 117.766C184.972 117.954 185.16 118.09 185.38 118.144C185.599 118.197 185.831 118.165 186.025 118.052C186.219 117.94 186.359 117.757 186.414 117.544Z'
+                        fill='#4A2407'
+                    />
+                    <path
+                        d='M193.697 132.67C194.769 132.225 195.735 131.572 196.536 130.751C197.337 129.93 197.957 128.958 198.356 127.895C198.548 127.397 197.73 127.203 197.521 127.693C197.167 128.62 196.624 129.468 195.925 130.186C195.225 130.904 194.383 131.477 193.449 131.872C192.954 132.074 193.188 132.884 193.689 132.666L193.697 132.67Z'
+                        fill='#4A2407'
+                    />
+                    <path
+                        d='M189.414 121.699C189.607 122.65 189.555 123.632 189.264 124.558C189.08 125.135 188.473 125.773 188.4 126.348C188.263 127.397 190.044 127.6 190.787 127.638C191.334 127.666 191.309 126.84 190.764 126.812C190.537 126.8 189.604 126.743 189.406 126.484C189.256 126.281 189.521 126.079 189.65 125.822C189.881 125.377 190.061 124.908 190.186 124.425C190.421 123.453 190.436 122.444 190.23 121.466C190.13 120.944 189.314 121.181 189.414 121.699Z'
+                        fill='#4A2407'
+                    />
+                    <path
+                        d='M200.047 151.474C200.54 152.944 201.99 157.309 200.148 158.38C199.678 158.654 200.116 159.363 200.588 159.087C202.968 157.704 201.527 153.215 200.863 151.241C200.694 150.737 199.876 150.966 200.047 151.474Z'
+                        fill='#4A2407'
+                    />
+                </g>
+                <path
+                    d='M104.406 188.861C103.212 190.634 100.517 190.89 98.421 189.454L74.7569 173.279C73.9846 172.773 73.4434 171.997 73.2461 171.114C73.0488 170.23 73.2106 169.307 73.6978 168.536L94.5152 137.67C95.0895 136.911 95.9133 136.365 96.8506 136.121C97.7879 135.878 98.7826 135.952 99.6706 136.332L126.534 147.803C128.91 148.82 129.896 151.066 128.714 152.866L104.406 188.861Z'
+                    fill='#FFBC1F'
+                />
+                <path
+                    d='M100.64 186.762L76.2473 170.576L97.7036 138.769L124.887 150.816L100.64 186.762Z'
+                    fill='white'
+                />
+                <path
+                    d='M116.084 148.559C115.875 148.813 115.582 148.99 115.254 149.06C114.926 149.129 114.584 149.087 114.285 148.939L104.025 144.262C103.892 144.215 103.772 144.14 103.673 144.042C103.574 143.944 103.499 143.825 103.453 143.695C103.407 143.565 103.392 143.427 103.409 143.291C103.425 143.155 103.473 143.024 103.548 142.908L105.157 140.52C105.347 140.276 105.617 140.102 105.924 140.029C106.23 139.956 106.552 139.987 106.838 140.117L117.232 144.599C117.377 144.644 117.509 144.72 117.619 144.821C117.728 144.922 117.813 145.046 117.867 145.183C117.921 145.321 117.942 145.468 117.929 145.615C117.917 145.761 117.87 145.903 117.793 146.03L116.084 148.559Z'
+                    fill='#8D93A5'
+                />
+                <path
+                    d='M114.122 145.458L107.51 142.543L109.141 140.123C109.334 139.883 109.605 139.713 109.909 139.639C110.214 139.565 110.535 139.592 110.822 139.715L115.221 141.564C115.363 141.606 115.494 141.68 115.604 141.778C115.713 141.877 115.798 141.998 115.852 142.134C115.906 142.269 115.928 142.414 115.915 142.558C115.903 142.703 115.857 142.843 115.781 142.967L114.122 145.458Z'
+                    fill='#2D3039'
+                />
+                <path
+                    d='M114.604 158.572L100.881 151.735L101.598 150.669L115.372 157.435L114.604 158.572Z'
+                    fill='#3DB887'
+                />
+                <path
+                    d='M96.5548 151.039C96.5227 151.059 96.4863 151.072 96.4483 151.076C96.4104 151.081 96.3718 151.077 96.3357 151.065C96.2995 151.053 96.2666 151.033 96.2395 151.007C96.2124 150.981 96.1919 150.949 96.1793 150.914L95.3388 148.499C95.328 148.463 95.3253 148.424 95.3311 148.387C95.3369 148.35 95.3508 148.314 95.3721 148.283C95.3934 148.251 95.4215 148.225 95.4545 148.205C95.4874 148.185 95.5244 148.172 95.5629 148.167L95.8823 148.102C95.9654 148.085 96.052 148.096 96.1275 148.134C96.203 148.171 96.2628 148.233 96.297 148.308L96.7453 149.57C96.7571 149.605 96.7771 149.637 96.8037 149.663C96.8302 149.689 96.8626 149.709 96.8984 149.721C96.9341 149.734 96.9723 149.737 97.0099 149.733C97.0475 149.728 97.0835 149.716 97.1151 149.695L99.6592 148.303C99.7382 148.264 99.8282 148.252 99.9153 148.267C100.002 148.283 100.082 148.326 100.141 148.39L100.343 148.624C100.37 148.652 100.389 148.686 100.4 148.723C100.411 148.76 100.413 148.799 100.406 148.837C100.399 148.875 100.383 148.911 100.36 148.942C100.336 148.973 100.305 148.998 100.27 149.015L96.5548 151.039Z'
+                    fill='#3DB887'
+                />
+                <path
+                    d='M110.116 165.224L96.6614 157.99L97.3842 156.918L110.883 164.087L110.116 165.224Z'
+                    fill='#BABEC9'
+                />
+                <path
+                    d='M94.0838 158.24L90.1165 156.075L92.4027 152.676L96.4205 154.775L94.0838 158.24Z'
+                    fill='#BABEC9'
+                />
+                <path
+                    d='M105.627 171.881L92.4475 164.239L93.1648 163.168L106.395 170.744L105.627 171.881Z'
+                    fill='#BABEC9'
+                />
+                <path
+                    d='M89.9036 164.44L86.0146 162.151L88.3065 158.751L92.2459 160.976L89.9036 164.44Z'
+                    fill='#BABEC9'
+                />
+                <path
+                    d='M101.139 178.533L88.2336 170.488L88.9509 169.422L101.906 177.396L101.139 178.533Z'
+                    fill='#BABEC9'
+                />
+                <path
+                    d='M85.7231 170.635L81.9126 168.226L84.2101 164.832L88.0654 167.171L85.7231 170.635Z'
+                    fill='#BABEC9'
+                />
+            </g>
+            <defs>
+                <pattern
+                    id='pattern0'
+                    patternContentUnits='objectBoundingBox'
+                    width='1'
+                    height='1'
+                >
+                    <use
+                        xlinkHref='#image0_880_97924'
+                        transform='scale(0.00176678 0.00130378)'
+                    />
+                </pattern>
+                <pattern
+                    id='pattern1'
+                    patternContentUnits='objectBoundingBox'
+                    width='1'
+                    height='1'
+                >
+                    <use
+                        xlinkHref='#image1_880_97924'
+                        transform='scale(0.00398406 0.00219298)'
+                    />
+                </pattern>
+                <pattern
+                    id='pattern2'
+                    patternContentUnits='objectBoundingBox'
+                    width='1'
+                    height='1'
+                >
+                    <use
+                        xlinkHref='#image2_880_97924'
+                        transform='scale(0.0016835 0.00408163)'
+                    />
+                </pattern>
+                <pattern
+                    id='pattern3'
+                    patternContentUnits='objectBoundingBox'
+                    width='1'
+                    height='1'
+                >
+                    <use
+                        xlinkHref='#image3_880_97924'
+                        transform='scale(0.00151745 0.00142045)'
+                    />
+                </pattern>
+                <pattern
+                    id='pattern4'
+                    patternContentUnits='objectBoundingBox'
+                    width='1'
+                    height='1'
+                >
+                    <use
+                        xlinkHref='#image4_880_97924'
+                        transform='scale(0.00266667 0.00232558)'
+                    />
+                </pattern>
+                <pattern
+                    id='pattern5'
+                    patternContentUnits='objectBoundingBox'
+                    width='1'
+                    height='1'
+                >
+                    <use
+                        xlinkHref='#image5_880_97924'
+                        transform='scale(0.00183486 0.00248139)'
+                    />
+                </pattern>
+                <clipPath id='clip0_880_97924'>
+                    <rect
+                        width='264'
+                        height='191'
+                        fill='white'
+                    />
+                </clipPath>
+                <image
+                    id='image0_880_97924'
+                    width='566'
+                    height='767'
+                    xlinkHref='data:image/png;base64,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'
+                />
+                <image
+                    id='image1_880_97924'
+                    width='251'
+                    height='456'
+                    xlinkHref='data:image/png;base64,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'
+                />
+                <image
+                    id='image2_880_97924'
+                    width='594'
+                    height='245'
+                    xlinkHref='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAlIAAAD1CAYAAACbWRsMAAAgAElEQVR4Xu2dz/v9RJXnq+y9P+i9P3AvCrO2ld7bgHsbmPXY4uxtYNajwH4acK/86LUis2+B3qswexX+gCbzvNKn0ieVqqSSm3s/ufe+8zw8yvcmlapX8jVvzzn1PjHoEAEREAEREAEROByBruu+EUL4dQjhSyGE52OMvzvcJDWhEMVABERABERABETgeAS6rnvahBSTeyXG+MLxZqkZSUjpHRABERABERCBAxLouu4rIYTfhhC6EMIzMcaPDzjNu5+ShNTdvwICIAIiIAIiIAIisJWAhNRWcrpOBERABERABETg7glISN39KyAAIiACIiACIiACWwlISG0lp+tEQAREQAREQATunoCE1N2/AgIgAiIgAiIgAiKwlYCE1FZyuk4EREAEREAERODuCUhI3f0rIAAiIAIiIAIiIAJbCUhIbSWn60RABERABERABO6egITU3b8CAiACIiACIiACIrCVgITUVnK6TgREQAREQARE4O4JSEjd/SsgACIgAiIgAnsT6LruqRDCL0IIr8YYX9l7fI13HAISUsd5FpqJCIiACIjADRDouo5v6+9DCN8OIfw1xvjIDSxLS6gQkJDSqyECIiACIiACOxOwiNQ/hRDeUURqZ7gHG05C6mAPRNMRAREQAREQgYci0HXd90IIH8cYP36oOVzbfSWkru2Jab4iIAIiIAIisDMBS0e+HkL4R9KRIYRHY4yf7nybmxxOQuomH6sWJQIiIAIiMEfAIi9fjjG+fRRSXdf9cwjhayGEn15axJiQojiedKSE1IqXQkJqBSydKgIiIAIicP0Euq77jhWDdyGEp2OM7zz0qrqu+34I4bchBOaEkLr4Tr+u674eQviHEML7McYPH5rJtdxfQupanpTmKQIiIAIisAuBTLQ8F2N8c5eBTxik67qvmLgjIvX4kpDpuu7L3O7SkasTlnizl0pI3eyj1cJEQAREQARqBLquezaE8OnBUntN4qjrum+Y6PpSCOHJGOPv9KQfjoCE1MOx151FQAREQASMQNd1T4cQ/iWE8FaM8XmBqRNwETVOeinG+OIaXl3XcT71WL+IMf50zbU6d0pAQkpvhQiIgAiIwIMSsEJn6oPYek+N0GJq60EnfICbm08VxfJvrJmOsf5jCIF6KFizO+8k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'
+                />
+                <image
+                    id='image3_880_97924'
+                    width='659'
+                    height='704'
+                    xlinkHref='data:image/png;base64,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'
+                />
+                <image
+                    id='image4_880_97924'
+                    width='375'
+                    height='430'
+                    xlinkHref='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXcAAAGuCAYAAABr8UYZAAAgAElEQVR4Xu2dO9j9SnXeJdNzOfRc3cbHcHowUMfmUicBUtvGpDYGUsfAcU2A4xoDpydgXGPAqR1Deozt3ijPb85aytJoJI1u+9tb+9Xz8HD+35ZGM++M1qxZl3e1jS4hIASEgBC4HALt5UakAQkBISAEhEAj4a5FIASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4XnFQNSQgIASEg4a41IASEgBC4IAIS7hecVA1JCAgBISDhrjUgBISAELggAhLuF5xUDUkICAEhIOGuNSAEhIAQuCACEu4X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'
+                />
+                <image
+                    id='image5_880_97924'
+                    width='545'
+                    height='403'
+                    xlinkHref='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAiEAAAGTCAYAAAD+/cJkAAAgAElEQVR4Xu29S7fGRpWmKdHzNnbOm8Q55+KeQ0LNSeyec3HNSeyaZ9qeNwn8gAS7x1Vg5l3GzCttmDfGNS9s/gDR61HurdwKhaTQ5fv0XV6txcI+R1JEPJJPvNrXttEhAiIgAiIgAiIgAicQaE8YU0OKgAiIgAiIgAiIQCMRopdABERABERABETgFAISIadg16AiIAIiIAIiIAISIXoHREAEREAEREAETiEgEXIKdg0qAiIgAiIgAiIgEaJ3QAREQAREQARE4BQCEiGnYNegIiACIiACIiACEiF6B0RABERABERABE4hIBFyCnYNKgIiIAIiIAIiIBGid0AEREAEREAEROAUAhIhp2DXoCIgAiIgAiIgAhIhegdEQAREQAREQAROISARcgp2DSoCIiACIiACIiARondABERABERABETgFAISIadg16AiIAIiIAIiIAISIXoHREAEREAEREAETiEgEXIKdg0qAiIgAiIgAiIgEaJ3QAREQAREQARE4BQCEiGnYNegIiACIiACIiACEiF6B0RABERABERABE4hIBFyCnYNKgIiIAIiIAIiIBGid0AEREAEREAEROAUAhIhp2DXoCIgAiIgAiIgAhIhegdEQAREQAREQAROISARcgp2DSoCIiACIiACIiARondABERABERABETgFAISIadg16AiIAIiIAIiIAISIXoHREAEREAEREAETiEgEXIKdg0qAiIgAiIgAiIgEaJ3QAREQAREQARE4BQCEiGnYNegIiACIiACIiACEiF6B0RABERABERABE4hIBFyCnYNKgIiIAIiIAIiIBGid0AEREAEREAEROAUAhIhp2DXoCIgAiIgAiIgAhIhegdEQAREQAREQAROISARcgp2DSoCIiACIiACIiARondABERABERABETgFAISIadg16AiIAIiIAIiIAISIXoHREAEREAEREAETiEgEXIKdg0qAiIgAiIgAiIgEaJ3QAREQAREQARE4BQCEiGnYNegIiACIiACIiACEiF6B0RABERABERABE4hIBFyCnYNKgIiIAIiIAIiIBGid0AEREAEREAEROAUAhIhp2DXoCIgAiIgAiIgAhIhegdEQAREQAREQAROISARcgp2DSoCIiACIiACIiARondABERABERABETgFAISIadg16AiIAIiIAIiIAISIXoHREAEREAEREAETiEgEXIKdg0qAiIgAiIgAiIgEaJ3QAREQAREQARE4BQCEiGnYNegIiACIiACIiACEiF6B0RABERABERABE4hIBFyCnYNKgIiIAIiIAIiIBGid0AEREAEREAEROAUAhIhp2DXoCIgAiIgAiIgAhIhegdEQAREQAREQAROISARcgp2DSoCIiACIiACIiARondABERABERABETgFAISIadg16AiIAIiIAIiIAISIXoHREAEREAEREAETiEgEXIKdg0qAiIgAiIgAiIgEaJ3QAREQAREQARE4BQCEiGnYNegIiACIiACIiACEiF6B0RABERABERABE4hIBFyCnYNKgIiIAIiIAIiIBGid0AEREAEREAEROAUAhIhp2DXoCIgAiIgAiIgAhIhegdEQAREQAREQAROISARcgp2DSoCIiACIiACIiARondABERABERABETgFAISIadg16AiIAIiIAIiIAISIXoHREAEREAEREAETiEgEXIKdg0qAiIgAiIgAiIgEaJ3QAREQAREQARE4BQCEiGnYNegIiACIiACIiACEiF6B0RABERABERABE4hIBFyCnYNKgIiIAIiIAIiIBGid0AEREAEREAEROAUAhIhp2DXoCIgAiIgAiIgAhIhegdEQAREQAREQAROISARcgp2DSoCIiACIiACIiARondABERABERABETgFAISIadg16AiIAIiIAIiIAISIXoHREAEREAEREAETiEgEXIKdg0qAiIgAiIgAiIgEaJ3QAREQAREQARE4BQCEiGnYNegIiACIiACIiACEiF6B0RABERABERABE4hIBFyCnYNKgIiIAIiIAIiIBGid0AEREAEREAEROAUAhIhp2DXoCIgAiIgAiIgAhIhegdEQAREQAREQAROISARcgp2DSoCIiACIiACIiARondABERABERABETgFAISIadg16AiIAIiIAIiIAISIXoHREAEREAEREAETiEgEXIKdg0qAiIgAiIgAiIgEaJ3QAREQAREQARE4BQCEiGnYNegIiACIiACIiACEiF6B0RABERABERABE4hIBFyCnYNKgIiIAIiIAIiIBGid0AEREAEREAEROAUAhIhp2DXoCIgAiIgAiIgAhIhegdEQAREQAREQAROISARcgp2DSoC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'
+                />
+            </defs>
+        </svg>
+
+    );
+};
+
+export default BlankCardImage;
diff --git a/webapp/channels/src/components/pricing_modal/card.tsx b/webapp/channels/src/components/pricing_modal/card.tsx
index e8786589ec..b28ea8adcb 100644
--- a/webapp/channels/src/components/pricing_modal/card.tsx
+++ b/webapp/channels/src/components/pricing_modal/card.tsx
@@ -4,9 +4,16 @@
 import React, {ReactNode} from 'react';
 import {useIntl} from 'react-intl';
 import styled from 'styled-components';
+import classNames from 'classnames';
+
+import useOpenSalesLink from 'components/common/hooks/useOpenSalesLink';
+import ExternalLink from 'components/external_link';
+
+import {HostedCustomerLinks} from 'utils/constants';
 
 import BuildingSvg from './building.svg';
 import TadaSvg from './tada.svg';
+import BlankCardImage from './blank_card_image.svg';
 
 export enum ButtonCustomiserClasses {
     grayed = 'grayed',
@@ -38,7 +45,7 @@ type CardProps = {
     topColor: string;
     planLabel?: JSX.Element;
     plan: string;
-    planSummary?: string;
+    planSummary?: ReactNode;
     price?: string;
     rate?: ReactNode;
     planExtraInformation?: JSX.Element;
@@ -48,6 +55,8 @@ type CardProps = {
     briefing: PlanBriefing;
     planAddonsInfo?: PlanAddonsInfo;
     planTrialDisclaimer?: JSX.Element;
+    isCloud: boolean;
+    cloudFreeDeprecated: boolean;
 }
 
 type StyledProps = {
@@ -58,28 +67,101 @@ const StyledDiv = styled.div<StyledProps>`
 background-color: ${(props) => props.bgColor};
 `;
 
+export function BlankCard() {
+    const {formatMessage} = useIntl();
+    const [, contactSalesLink] = useOpenSalesLink();
+
+    return (
+        <div className='BlankCard'>
+            <div className='image'>
+                <BlankCardImage/>
+            </div>
+
+            <div className='description'>
+                <div className='title'>
+                    <span className='questions'>
+                        {formatMessage({id: 'pricing_modal.questions', defaultMessage: 'Questions?'})}
+                    </span>
+                    <span className='contact'>
+                        <ExternalLink
+                            location='cloud_pricing_modal'
+                            href={contactSalesLink}
+                        >
+                            {formatMessage({id: 'pricing_modal.contact_us', defaultMessage: 'Contact us'})}
+                        </ExternalLink>
+                    </span>
+                </div>
+                <div className='content'>
+                    {formatMessage({id: 'pricing_modal.reach_out', defaultMessage: 'Reach out to us and we’ll help you decide which plan is right for you and your organization.'})}
+                </div>
+            </div>
+            <hr/>
+            <div className='self-hosted-interest'>
+                <span className='interested'>
+                    {formatMessage({id: 'pricing_modal.interested_self_hosting', defaultMessage: 'Interested in self-hosting?'})}
+                </span>
+                <span className='learn'>
+                    <ExternalLink
+                        location='cloud_pricing_modal'
+                        href={HostedCustomerLinks.DOWNLOAD}
+                    >
+                        {formatMessage({id: 'pricing_modal.learn_more', defaultMessage: 'Learn more'})}
+                    </ExternalLink>
+                </span>
+            </div>
+        </div>
+    );
+}
+
 function Card(props: CardProps) {
     const {formatMessage} = useIntl();
+    const bottomClassName = classNames('bottom', {
+        bottom__round: props.cloudFreeDeprecated && props.isCloud,
+    });
+
+    const contactSalesCTAClassName = classNames('contact_sales_cta', {
+        contact_sales_cta__reduced: props.cloudFreeDeprecated && props.isCloud,
+    });
+
+    const planBriefingContentClassName = classNames('plan_briefing_content', {
+        plan_briefing_content__reduced: props.cloudFreeDeprecated,
+    });
+
+    const planPriceRateSectionClassName = classNames('plan_price_rate_section', {
+        plan_price_rate_section__expanded: props.cloudFreeDeprecated,
+    });
+
+    const planLimitsCtaClassName = classNames('plan_limits_cta', {
+        plan_limits_cta__expanded: props.cloudFreeDeprecated,
+    });
+
+    const buildingImgClassName = classNames('building_img', {
+        building_img__expanded: props.cloudFreeDeprecated,
+    });
+
     return (
         <div
             id={props.id}
             className='PlanCard'
         >
             {props.planLabel}
-            <StyledDiv
-                className='top'
-                bgColor={props.topColor}
-            />
-            <div className='bottom'>
+            {(!props.cloudFreeDeprecated || !props.isCloud) && (
+                <StyledDiv
+                    className='top'
+                    bgColor={props.topColor}
+                />
+            )}
+
+            <div className={bottomClassName}>
                 <div className='bottom_container'>
-                    <div className='plan_price_rate_section'>
+                    <div className={planPriceRateSectionClassName}>
                         <h3>{props.plan}</h3>
                         <p>{props.planSummary}</p>
-                        {props.price ? <h1>{props.price}</h1> : <BuildingSvg/>}
-                        <span>{props.rate}</span>
+                        {props.price ? <h1>{props.price}</h1> : <div className={buildingImgClassName}><BuildingSvg/></div>}
+                        {props.cloudFreeDeprecated ? (<span className='plan_rate'>{props.rate}</span>) : (<span>{props.rate}</span>)}
                     </div>
 
-                    <div className='plan_limits_cta'>
+                    <div className={planLimitsCtaClassName}>
                         {props.planExtraInformation}
                     </div>
 
@@ -96,7 +178,7 @@ function Card(props: CardProps) {
                         )}
                     </div>
 
-                    <div className='contact_sales_cta'>
+                    <div className={contactSalesCTAClassName}>
                         {props.contactSalesCTA && (
                             <div>
                                 <p>{formatMessage({id: 'pricing_modal.or', defaultMessage: 'or'})}</p>
@@ -105,9 +187,9 @@ function Card(props: CardProps) {
                     </div>
 
                     <div className='plan_briefing'>
-                        <hr/>
+                        {!props.cloudFreeDeprecated && <hr/>}
                         {props.planTrialDisclaimer}
-                        <div className='plan_briefing_content'>
+                        <div className={planBriefingContentClassName}>
                             <span className='title'>{props.briefing.title}</span>
                             {props.briefing.items?.map((i) => {
                                 return (
diff --git a/webapp/channels/src/components/pricing_modal/content.tsx b/webapp/channels/src/components/pricing_modal/content.tsx
index b4712ec50f..3edabd2186 100644
--- a/webapp/channels/src/components/pricing_modal/content.tsx
+++ b/webapp/channels/src/components/pricing_modal/content.tsx
@@ -20,6 +20,7 @@ import {
 } from 'mattermost-redux/selectors/entities/cloud';
 import {isCurrentUserSystemAdmin} from 'mattermost-redux/selectors/entities/users';
 import {DispatchFunc} from 'mattermost-redux/types/actions';
+import {deprecateCloudFree} from 'mattermost-redux/selectors/entities/preferences';
 
 import {Feedback} from '@mattermost/types/cloud';
 import useGetUsage from 'components/common/hooks/useGetUsage';
@@ -44,7 +45,7 @@ import DowngradeTeamRemovalModal from './downgrade_team_removal_modal';
 import ContactSalesCTA from './contact_sales_cta';
 import StarterDisclaimerCTA from './starter_disclaimer_cta';
 import StartTrialCaution from './start_trial_caution';
-import Card, {ButtonCustomiserClasses} from './card';
+import Card, {BlankCard, ButtonCustomiserClasses} from './card';
 
 import './content.scss';
 
@@ -68,6 +69,8 @@ function Content(props: ContentProps) {
     const subscription = useSelector(selectCloudSubscription);
     const currentProduct = useSelector(selectSubscriptionProduct);
     const products = useSelector(selectCloudProducts);
+
+    const cloudFreeDeprecated = useSelector(deprecateCloudFree);
     const yearlyProducts = findOnlyYearlyProducts(products || {}); // pricing modal should now only show yearly products
 
     const currentSubscriptionIsMonthly = currentProduct?.recurring_interval === RecurringIntervals.MONTH;
@@ -118,8 +121,20 @@ function Content(props: ContentProps) {
         trial_notification: isPreTrial,
     });
 
+    const getAdminProfessionalBtnText = () => {
+        if (currentSubscriptionIsMonthlyProfessional) {
+            return formatMessage({id: 'pricing_modal.btn.switch_to_annual', defaultMessage: 'Switch to annual billing'});
+        }
+
+        if (cloudFreeDeprecated) {
+            return formatMessage({id: 'pricing_modal.btn.purchase', defaultMessage: 'Purchase'});
+        }
+
+        return formatMessage({id: 'pricing_modal.btn.upgrade', defaultMessage: 'Upgrade'});
+    };
+
     const freeTierText = (!isStarter && !currentSubscriptionIsMonthly) ? formatMessage({id: 'pricing_modal.btn.contactSupport', defaultMessage: 'Contact Support'}) : formatMessage({id: 'pricing_modal.btn.downgrade', defaultMessage: 'Downgrade'});
-    const adminProfessionalTierText = currentSubscriptionIsMonthlyProfessional ? formatMessage({id: 'pricing_modal.btn.switch_to_annual', defaultMessage: 'Switch to annual billing'}) : formatMessage({id: 'pricing_modal.btn.upgrade', defaultMessage: 'Upgrade'});
+    const adminProfessionalTierText = getAdminProfessionalBtnText();
 
     const [openContactSales] = useOpenSalesLink();
     const [openContactSupport] = useOpenCloudZendeskSupportForm('Workspace downgrade', '');
@@ -209,7 +224,7 @@ function Content(props: ContentProps) {
                 action: () => openPurchaseModal('click_pricing_modal_professional_card_upgrade_button'),
                 text: adminProfessionalTierText,
                 disabled: isProfessionalAnnual || (isEnterprise && !isEnterpriseTrial),
-                customClass: isPostTrial ? ButtonCustomiserClasses.special : ButtonCustomiserClasses.active,
+                customClass: (cloudFreeDeprecated || isPostTrial) ? ButtonCustomiserClasses.special : ButtonCustomiserClasses.active,
             };
         }
 
@@ -234,7 +249,7 @@ function Content(props: ContentProps) {
     };
 
     const enterpriseBtnDetails = () => {
-        if (isPostTrial && isAdmin) {
+        if (cloudFreeDeprecated || (isPostTrial && isAdmin)) {
             return {
                 action: () => {
                     trackEvent(TELEMETRY_CATEGORIES.CLOUD_PRICING, 'click_enterprise_contact_sales');
@@ -270,7 +285,7 @@ function Content(props: ContentProps) {
     };
 
     const enterpriseCustomBtnDetails = () => {
-        if (!isPostTrial && isAdmin) {
+        if (!isPostTrial && isAdmin && !cloudFreeDeprecated) {
             return (
                 <CloudStartTrialButton
                     message={formatMessage({id: 'pricing_modal.btn.tryDays', defaultMessage: 'Try free for {days} days'}, {days: '30'})}
@@ -311,99 +326,117 @@ function Content(props: ContentProps) {
                 />
             </Modal.Header>
             <Modal.Body>
-                <div className='pricing-options-container'>
-                    <div className='alert-option-container'>
-                        <div className='alert-option'>
-                            <span>{formatMessage({id: 'pricing_modal.lookingToSelfHost', defaultMessage: 'Looking to self-host?'})}</span>
-                            <ExternalLink
-                                onClick={() =>
-                                    trackEvent(
-                                        TELEMETRY_CATEGORIES.CLOUD_PURCHASING,
-                                        'click_looking_to_self_host',
-                                    )
-                                }
-                                href={CloudLinks.DEPLOYMENT_OPTIONS}
-                                location='pricing_modal_content'
-                            >{formatMessage({id: 'pricing_modal.reviewDeploymentOptions', defaultMessage: 'Review deployment options'})}</ExternalLink>
+                {!cloudFreeDeprecated && (
+                    <div className='pricing-options-container'>
+                        <div className='alert-option-container'>
+                            <div className='alert-option'>
+                                <span>{formatMessage({id: 'pricing_modal.lookingToSelfHost', defaultMessage: 'Looking to self-host?'})}</span>
+                                <ExternalLink
+                                    onClick={() =>
+                                        trackEvent(
+                                            TELEMETRY_CATEGORIES.CLOUD_PURCHASING,
+                                            'click_looking_to_self_host',
+                                        )
+                                    }
+                                    href={CloudLinks.DEPLOYMENT_OPTIONS}
+                                    location='pricing_modal_content'
+                                >{formatMessage({id: 'pricing_modal.reviewDeploymentOptions', defaultMessage: 'Review deployment options'})}</ExternalLink>
+                            </div>
                         </div>
                     </div>
-                </div>
+                )}
 
-                <div className='PricingModal__body'>
-                    <Card
-                        id='free'
-                        topColor='#339970'
-                        plan='Free'
-                        planSummary={formatMessage({id: 'pricing_modal.planSummary.free', defaultMessage: 'Increased productivity for small teams'})}
-                        price='$0'
-                        rate={formatMessage({id: 'pricing_modal.price.freeForever', defaultMessage: 'Free forever'})}
-                        planLabel={
-                            isStarter ? (
-                                <PlanLabel
-                                    text={formatMessage({id: 'pricing_modal.planLabel.currentPlan', defaultMessage: 'CURRENT PLAN'})}
-                                    color='var(--denim-status-online)'
-                                    bgColor='var(--center-channel-bg)'
-                                    firstSvg={<CheckMarkSvg/>}
-                                />) : undefined}
-                        planExtraInformation={<StarterDisclaimerCTA/>}
-                        buttonDetails={{
-                            action: () => {
-                                if (!isStarter && !currentSubscriptionIsMonthly) {
-                                    openContactSupport();
-                                    return;
-                                }
+                <div
+                    className='PricingModal__body'
+                    style={{marginTop: cloudFreeDeprecated ? '74px' : ''}}
+                >
+                    {!cloudFreeDeprecated && (
+                        <Card
+                            id='free'
+                            topColor='#339970'
+                            plan='Free'
+                            planSummary={formatMessage({id: 'pricing_modal.planSummary.free', defaultMessage: 'Increased productivity for small teams'})}
+                            price='$0'
+                            rate={formatMessage({id: 'pricing_modal.price.freeForever', defaultMessage: 'Free forever'})}
+                            isCloud={true}
+                            cloudFreeDeprecated={cloudFreeDeprecated}
+                            planLabel={
+                                isStarter ? (
+                                    <PlanLabel
+                                        text={formatMessage({id: 'pricing_modal.planLabel.currentPlan', defaultMessage: 'CURRENT PLAN'})}
+                                        color='var(--denim-status-online)'
+                                        bgColor='var(--center-channel-bg)'
+                                        firstSvg={<CheckMarkSvg/>}
+                                    />) : undefined}
+                            planExtraInformation={<StarterDisclaimerCTA/>}
+                            buttonDetails={{
+                                action: () => {
+                                    if (!isStarter && !currentSubscriptionIsMonthly) {
+                                        openContactSupport();
+                                        return;
+                                    }
 
-                                if (!starterProduct) {
-                                    return;
-                                }
+                                    if (!starterProduct) {
+                                        return;
+                                    }
 
-                                if (usage.teams.active > 1) {
-                                    dispatch(
-                                        openModal({
-                                            modalId: ModalIdentifiers.CLOUD_DOWNGRADE_CHOOSE_TEAM,
-                                            dialogType: DowngradeTeamRemovalModal,
-                                            dialogProps: {
-                                                product_id: starterProduct?.id,
-                                                starterProduct,
-                                            },
-                                        }),
-                                    );
-                                } else {
-                                    dispatch(
-                                        openModal({
-                                            modalId: ModalIdentifiers.FEEDBACK,
-                                            dialogType: DowngradeFeedbackModal,
-                                            dialogProps: {
-                                                onSubmit: handleClickDowngrade,
-                                            },
-                                        }),
-                                    );
-                                }
-                            },
-                            text: freeTierText,
-                            disabled: isStarter || isEnterprise || !isAdmin,
-                            customClass: (isStarter || isEnterprise || !isAdmin) ? ButtonCustomiserClasses.grayed : ButtonCustomiserClasses.secondary,
-                        }}
-                        briefing={{
-                            title: formatMessage({id: 'pricing_modal.briefing.title', defaultMessage: 'Top features'}),
-                            items: hasLimits ? starterBriefing : legacyStarterBriefing,
-                        }}
-                    />
+                                    if (usage.teams.active > 1) {
+                                        dispatch(
+                                            openModal({
+                                                modalId: ModalIdentifiers.CLOUD_DOWNGRADE_CHOOSE_TEAM,
+                                                dialogType: DowngradeTeamRemovalModal,
+                                                dialogProps: {
+                                                    product_id: starterProduct?.id,
+                                                    starterProduct,
+                                                },
+                                            }),
+                                        );
+                                    } else {
+                                        dispatch(
+                                            openModal({
+                                                modalId: ModalIdentifiers.FEEDBACK,
+                                                dialogType: DowngradeFeedbackModal,
+                                                dialogProps: {
+                                                    onSubmit: handleClickDowngrade,
+                                                },
+                                            }),
+                                        );
+                                    }
+                                },
+                                text: freeTierText,
+                                disabled: isStarter || isEnterprise || !isAdmin,
+                                customClass: (isStarter || isEnterprise || !isAdmin) ? ButtonCustomiserClasses.grayed : ButtonCustomiserClasses.secondary,
+                            }}
+                            briefing={{
+                                title: formatMessage({id: 'pricing_modal.briefing.title', defaultMessage: 'Top features'}),
+                                items: hasLimits ? starterBriefing : legacyStarterBriefing,
+                            }}
+                        />
+
+                    )
+
+                    }
 
                     <Card
                         id='professional'
                         topColor='var(--denim-button-bg)'
                         plan='Professional'
-                        planSummary={formatMessage({id: 'pricing_modal.planSummary.professional', defaultMessage: 'Scalable solutions for growing teams'})}
+                        planSummary={formatMessage({id: 'pricing_modal.planSummary.professional', defaultMessage: 'Scalable solutions {br} for growing teams'}, {
+                            br: <br/>,
+                        })}
                         price={`$${professionalPrice}`}
                         rate={formatMessage({id: 'pricing_modal.rate.seatPerMonth', defaultMessage: 'USD per seat/month {br}<b>(billed annually)</b>'}, {
                             br: <br/>,
                             b: (chunks: React.ReactNode | React.ReactNodeArray) => (
-                                <span style={{fontSize: '14px'}}>
-                                    <b>{chunks}</b>
+                                <span className='billed_annually'>
+                                    {
+                                        cloudFreeDeprecated ? chunks : (<b>{chunks}</b>)
+                                    }
                                 </span>
                             ),
                         })}
+                        isCloud={true}
+                        cloudFreeDeprecated={cloudFreeDeprecated}
                         planLabel={isProfessional ? (
                             <PlanLabel
                                 text={professionalPlanLabelText()}
@@ -413,7 +446,7 @@ function Content(props: ContentProps) {
                             />) : undefined}
                         buttonDetails={professionalBtnDetails()}
                         briefing={{
-                            title: formatMessage({id: 'pricing_modal.briefing.title', defaultMessage: 'Top features'}),
+                            title: cloudFreeDeprecated ? formatMessage({id: 'pricing_modal.briefing.title_no_limit', defaultMessage: 'No limits on your team’s usage'}) : formatMessage({id: 'pricing_modal.briefing.title', defaultMessage: 'Top features'}),
                             items: [
                                 formatMessage({id: 'pricing_modal.briefing.professional.messageBoardsIntegrationsCalls', defaultMessage: 'Unlimited access to messages and files'}),
                                 formatMessage({id: 'pricing_modal.briefing.professional.unLimitedTeams', defaultMessage: 'Unlimited teams'}),
@@ -442,6 +475,8 @@ function Content(props: ContentProps) {
                         topColor='#E07315'
                         plan='Enterprise'
                         planSummary={formatMessage({id: 'pricing_modal.planSummary.enterprise', defaultMessage: 'Administration, security, and compliance for large teams'})}
+                        isCloud={true}
+                        cloudFreeDeprecated={cloudFreeDeprecated}
                         planLabel={
                             isEnterprise ? (
                                 <PlanLabel
@@ -453,10 +488,10 @@ function Content(props: ContentProps) {
                                 />) : undefined}
                         buttonDetails={enterpriseBtnDetails()}
                         customButtonDetails={enterpriseCustomBtnDetails()}
-                        planTrialDisclaimer={(!isPostTrial && isAdmin) ? <StartTrialCaution/> : undefined}
-                        contactSalesCTA={(isPostTrial || !isAdmin) ? undefined : <ContactSalesCTA/>}
+                        planTrialDisclaimer={(!isPostTrial && isAdmin && !cloudFreeDeprecated) ? <StartTrialCaution/> : undefined}
+                        contactSalesCTA={(isPostTrial || !isAdmin || cloudFreeDeprecated) ? undefined : <ContactSalesCTA/>}
                         briefing={{
-                            title: formatMessage({id: 'pricing_modal.briefing.title', defaultMessage: 'Top features'}),
+                            title: cloudFreeDeprecated ? formatMessage({id: 'pricing_modal.briefing.title_large_scale', defaultMessage: 'Large scale collaboration'}) : formatMessage({id: 'pricing_modal.briefing.title', defaultMessage: 'Top features'}),
                             items: [
                                 formatMessage({id: 'pricing_modal.briefing.enterprise.groupSync', defaultMessage: 'AD/LDAP group sync'}),
                                 formatMessage({id: 'pricing_modal.briefing.enterprise.rolesAndPermissions', defaultMessage: 'Advanced roles and permissions'}),
@@ -480,6 +515,7 @@ function Content(props: ContentProps) {
                             ],
                         }}
                     />
+                    {cloudFreeDeprecated && <BlankCard/>}
                 </div>
             </Modal.Body>
         </div>
diff --git a/webapp/channels/src/components/pricing_modal/pricing_modal.scss b/webapp/channels/src/components/pricing_modal/pricing_modal.scss
index 0a3dd434f1..2366782e89 100644
--- a/webapp/channels/src/components/pricing_modal/pricing_modal.scss
+++ b/webapp/channels/src/components/pricing_modal/pricing_modal.scss
@@ -128,6 +128,74 @@
         margin-bottom: 111px;
         gap: 48px;
 
+        .BlankCard {
+            position: relative;
+            width: 280px;
+
+            .image {
+                margin-top: 8px;
+            }
+
+            hr {
+                border-top: 1px solid rgba(var(--center-channel-color-rgb), 0.16);
+            }
+
+            .description {
+                border-bottom: 1px solid rgba(var(--center-channel-color-rgb) 0.16);
+                text-align: left;
+
+                .title {
+                    margin-top: 24px;
+                    margin-bottom: 8px;
+                    font-family: 'Open Sans';
+                    font-size: 14px;
+                    font-style: normal;
+                    font-weight: 600;
+                    line-height: 20px;
+
+                    .questions {
+                        margin-right: 2px;
+                        color: var(--center-channel-color);
+                    }
+
+                    .contact {
+                        color: var(--denim-button-bg);
+                    }
+                }
+
+                .content {
+                    margin-bottom: 25px;
+                    color: rgba(var(--center-channel-color-rgb), 0.72);
+                    font-family: 'Open Sans';
+                    font-size: 14px;
+                    font-style: normal;
+                    font-weight: 400;
+                    line-height: 20px;
+                }
+            }
+
+            .self-hosted-interest {
+                padding: 8px;
+                margin-top: 24px;
+                background: rgba(var(--denim-button-bg-rgb), 0.08);
+                border-radius: 8px;
+                font-family: 'Open Sans';
+                font-size: 14px;
+                font-style: normal;
+                font-weight: 600;
+                line-height: 20px;
+
+                .interested {
+                    margin-right: 2px;
+                    color: var(--center-channel-color);
+                }
+
+                .learn {
+                    color: var(--denim-button-bg);
+                }
+            }
+        }
+
         .PlanCard {
             position: relative;
             width: 280px;
@@ -180,6 +248,7 @@
                         text-align: center;
 
                         h3 {
+                            margin-top: 32px;
                             color: var(--center-channel-color);
                             font-family: 'Metropolis';
                             font-size: 24px;
@@ -210,6 +279,32 @@
                             font-weight: 400;
                             line-height: 24px;
                         }
+
+                        .plan_rate {
+                            margin-bottom: 0;
+                        }
+
+                        .building_img {
+                            padding-top: 0;
+                        }
+
+                        .building_img__expanded {
+                            padding-top: 14px;
+                        }
+
+                        .billed_annually {
+                            font-family: 'Open sans', sans-serif;
+                            font-size: 16px;
+                        }
+                    }
+
+                    .plan_price_rate_section__expanded {
+                        height: 244px;
+
+                        span,
+                        p {
+                            margin-bottom: 45px;
+                        }
                     }
 
                     .contact_sales_cta {
@@ -218,10 +313,19 @@
                         text-align: center;
                     }
 
+                    .contact_sales_cta__reduced {
+                        height: 32px;
+                        margin-top: 0;
+                    }
+
                     .plan_limits_cta {
                         height: 21px;
                     }
 
+                    .plan_limits_cta__expanded {
+                        height: 32px;
+                    }
+
                     .plan_buttons {
                         height: auto;
 
@@ -306,6 +410,10 @@
                                 }
                             }
                         }
+
+                        .plan_briefing_content__reduced {
+                            margin-top: 0;
+                        }
                     }
                 }
 
@@ -355,6 +463,11 @@
                     }
                 }
             }
+
+            .bottom__round {
+                border: 1px solid rgba(var(--center-channel-color-rgb), 0.16);
+                border-radius: 8px;
+            }
         }
     }
 }
diff --git a/webapp/channels/src/components/pricing_modal/self_hosted_content.tsx b/webapp/channels/src/components/pricing_modal/self_hosted_content.tsx
index 67c1f8e69a..6ac25580ac 100644
--- a/webapp/channels/src/components/pricing_modal/self_hosted_content.tsx
+++ b/webapp/channels/src/components/pricing_modal/self_hosted_content.tsx
@@ -186,6 +186,8 @@ function SelfHostedContent(props: ContentProps) {
                         planSummary={formatMessage({id: 'pricing_modal.planSummary.free', defaultMessage: 'Increased productivity for small teams'})}
                         price='$0'
                         rate={formatMessage({id: 'pricing_modal.price.freeForever', defaultMessage: 'Free forever'})}
+                        isCloud={false}
+                        cloudFreeDeprecated={false}
                         planLabel={
                             isStarter ? (
                                 <PlanLabel
@@ -209,16 +211,20 @@ function SelfHostedContent(props: ContentProps) {
                         id='professional'
                         topColor='var(--denim-button-bg)'
                         plan='Professional'
-                        planSummary={formatMessage({id: 'pricing_modal.planSummary.professional', defaultMessage: 'Scalable solutions for growing teams'})}
+                        planSummary={formatMessage({id: 'pricing_modal.planSummary.professional', defaultMessage: 'Scalable solutions {br} for growing teams'}, {
+                            br: <br/>,
+                        })}
                         price={professionalPrice}
                         rate={formatMessage({id: 'pricing_modal.rate.seatPerMonth', defaultMessage: 'USD per seat/month {br}<b>(billed annually)</b>'}, {
                             br: <br/>,
                             b: (chunks: React.ReactNode | React.ReactNodeArray) => (
-                                <span style={{fontSize: '14px'}}>
+                                <span className='billed_annually'>
                                     <b>{chunks}</b>
                                 </span>
                             ),
                         })}
+                        isCloud={false}
+                        cloudFreeDeprecated={false}
                         planLabel={
                             isProfessional ? (
                                 <PlanLabel
@@ -277,6 +283,8 @@ function SelfHostedContent(props: ContentProps) {
                         topColor='#E07315'
                         plan='Enterprise'
                         planSummary={formatMessage({id: 'pricing_modal.planSummary.enterprise', defaultMessage: 'Administration, security, and compliance for large teams'})}
+                        isCloud={false}
+                        cloudFreeDeprecated={false}
                         planLabel={
                             isEnterprise ? (
                                 <PlanLabel
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 3434e71dd2..9a248005fc 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -4563,23 +4563,29 @@
   "pricing_modal.briefing.ssoWithGitLab": "SSO with Gitlab",
   "pricing_modal.briefing.storageStarter": "{storage} file storage limit",
   "pricing_modal.briefing.title": "Top features",
+  "pricing_modal.briefing.title_large_scale": "Large scale collaboration",
+  "pricing_modal.briefing.title_no_limit": "No limits on your team’s usage",
   "pricing_modal.briefing.unlimitedPlaybookRuns": "Unlimited playbooks and runs",
   "pricing_modal.briefing.unlimitedWorkspaceTeams": "Unlimited workspace teams",
   "pricing_modal.btn.contactSales": "Contact Sales",
   "pricing_modal.btn.contactSalesForQuote": "Contact Sales",
   "pricing_modal.btn.contactSupport": "Contact Support",
   "pricing_modal.btn.downgrade": "Downgrade",
+  "pricing_modal.btn.purchase": "Purchase",
   "pricing_modal.btn.switch_to_annual": "Switch to annual billing",
   "pricing_modal.btn.tooltip": "Only visible to system admins",
   "pricing_modal.btn.tryDays": "Try free for {days} days",
   "pricing_modal.btn.upgrade": "Upgrade",
   "pricing_modal.btn.viewPlans": "View plans",
+  "pricing_modal.contact_us": "Contact us",
   "pricing_modal.extra_briefing.cloud.free.calls": "Group calls of up to 8 people, 1:1 calls, and screen share",
   "pricing_modal.extra_briefing.enterprise.playBookAnalytics": "Playbook analytics dashboard",
   "pricing_modal.extra_briefing.free.calls": "Voice calls and screen share",
   "pricing_modal.extra_briefing.professional.guestAccess": "Guest access with MFA enforcement",
   "pricing_modal.extra_briefing.professional.ssoadLdap": "SSO support with AD/LDAP, Google, O365, OpenID",
   "pricing_modal.extra_briefing.professional.ssoSaml": "SSO with SAML 2.0, including Okta, OneLogin, and ADFS",
+  "pricing_modal.interested_self_hosting": "Interested in self-hosting?",
+  "pricing_modal.learn_more": "Learn more",
   "pricing_modal.lookingForCloudOption": "Looking for a cloud option?",
   "pricing_modal.lookingToSelfHost": "Looking to self-host?",
   "pricing_modal.noitfy_cta.request": "Request admin to upgrade",
@@ -4592,9 +4598,11 @@
   "pricing_modal.planLabel.mostPopular": "MOST POPULAR",
   "pricing_modal.planSummary.enterprise": "Administration, security, and compliance for large teams",
   "pricing_modal.planSummary.free": "Increased productivity for small teams",
-  "pricing_modal.planSummary.professional": "Scalable solutions for growing teams",
+  "pricing_modal.planSummary.professional": "Scalable solutions {br} for growing teams",
   "pricing_modal.price.freeForever": "Free forever",
+  "pricing_modal.questions": "Questions?",
   "pricing_modal.rate.seatPerMonth": "USD per seat/month {br}<b>(billed annually)</b>",
+  "pricing_modal.reach_out": "Reach out to us and we’ll help you decide which plan is right for you and your organization.",
   "pricing_modal.reviewDeploymentOptions": "Review deployment options",
   "pricing_modal.start_trial.disclaimer": "By selecting <span>Try free for 30 days,</span> I agree to the <linkAgreement>Mattermost Software and Services License Agreement</linkAgreement>, <linkPrivacy>Privacy Policy</linkPrivacy>, and receiving product emails.",
   "pricing_modal.subtitle": "Choose a plan to get started",
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index 87fc6be03a..856cb071df 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -1080,6 +1080,7 @@ export const HostedCustomerLinks = {
     SELF_HOSTED_BILLING: 'https://docs.mattermost.com/manage/self-hosted-billing.html',
     TERMS_AND_CONDITIONS: 'https://mattermost.com/enterprise-edition-terms/',
     SECURITY_UPDATES: 'https://mattermost.com/security-updates/',
+    DOWNLOAD: 'https://mattermost.com/download',
     NEWSLETTER_UNSUBSCRIBE_LINK: 'https://forms.mattermost.com/UnsubscribePage.html',
     PRIVACY: 'https://mattermost.com/privacy-policy/',
 };

From a2e70eb71cc70ba64a9e2d612f54343e1bb038c0 Mon Sep 17 00:00:00 2001
From: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Date: Fri, 14 Apr 2023 09:56:05 +0300
Subject: [PATCH 056/103] server/channels: remove newWebConn method (#22933)

---
 server/channels/app/app_iface.go                |  2 --
 .../app/opentracing/opentracing_layer.go        | 17 -----------------
 server/channels/app/web_conn.go                 |  5 -----
 3 files changed, 24 deletions(-)

diff --git a/server/channels/app/app_iface.go b/server/channels/app/app_iface.go
index b7355144ea..640b508cf1 100644
--- a/server/channels/app/app_iface.go
+++ b/server/channels/app/app_iface.go
@@ -264,8 +264,6 @@ type AppIface interface {
 	// MoveChannel method is prone to data races if someone joins to channel during the move process. However this
 	// function is only exposed to sysadmins and the possibility of this edge case is relatively small.
 	MoveChannel(c request.CTX, team *model.Team, channel *model.Channel, user *model.User) *model.AppError
-	// NewWebConn returns a new WebConn instance.
-	NewWebConn(cfg *platform.WebConnConfig) *platform.WebConn
 	// NotifySessionsExpired is called periodically from the job server to notify any mobile sessions that have expired.
 	NotifySessionsExpired() error
 	// OverrideIconURLIfEmoji changes the post icon override URL prop, if it has an emoji icon,
diff --git a/server/channels/app/opentracing/opentracing_layer.go b/server/channels/app/opentracing/opentracing_layer.go
index 452ab79fa8..73193c5bd9 100644
--- a/server/channels/app/opentracing/opentracing_layer.go
+++ b/server/channels/app/opentracing/opentracing_layer.go
@@ -12761,23 +12761,6 @@ func (a *OpenTracingAppLayer) NewPluginAPI(c *request.Context, manifest *model.M
 	return resultVar0
 }
 
-func (a *OpenTracingAppLayer) NewWebConn(cfg *platform.WebConnConfig) *platform.WebConn {
-	origCtx := a.ctx
-	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.NewWebConn")
-
-	a.ctx = newCtx
-	a.app.Srv().Store().SetContext(newCtx)
-	defer func() {
-		a.app.Srv().Store().SetContext(origCtx)
-		a.ctx = origCtx
-	}()
-
-	defer span.Finish()
-	resultVar0 := a.app.NewWebConn(cfg)
-
-	return resultVar0
-}
-
 func (a *OpenTracingAppLayer) NotifyAndSetWarnMetricAck(warnMetricId string, sender *model.User, forceAck bool, isBot bool) *model.AppError {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.NotifyAndSetWarnMetricAck")
diff --git a/server/channels/app/web_conn.go b/server/channels/app/web_conn.go
index f0c4bb94c5..43f1255cd9 100644
--- a/server/channels/app/web_conn.go
+++ b/server/channels/app/web_conn.go
@@ -13,8 +13,3 @@ import (
 func (a *App) PopulateWebConnConfig(s *model.Session, cfg *platform.WebConnConfig, seqVal string) (*platform.WebConnConfig, error) {
 	return a.Srv().Platform().PopulateWebConnConfig(s, cfg, seqVal)
 }
-
-// NewWebConn returns a new WebConn instance.
-func (a *App) NewWebConn(cfg *platform.WebConnConfig) *platform.WebConn {
-	return a.Srv().Platform().NewWebConn(cfg, a, a.ch)
-}

From aca9553df111d14b0bf2ab5b61fb8eb2a77abdec Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Fri, 14 Apr 2023 13:23:38 +0530
Subject: [PATCH 057/103] MM-49675: Update dependencies (#22909)

https://mattermost.atlassian.net/browse/MM-49675

```release-note
NONE
```
---
 go.mod | 120 +++++++++++++-------------
 go.sum | 262 +++++++++++++++++++++++++++++----------------------------
 2 files changed, 194 insertions(+), 188 deletions(-)

diff --git a/go.mod b/go.mod
index bc262ccf09..2eb36199e3 100644
--- a/go.mod
+++ b/go.mod
@@ -4,12 +4,12 @@ go 1.19
 
 require (
 	code.sajari.com/docconv v1.3.5
-	github.com/Masterminds/semver/v3 v3.2.0
-	github.com/Masterminds/squirrel v1.5.3
+	github.com/Masterminds/semver/v3 v3.2.1
+	github.com/Masterminds/squirrel v1.5.4
 	github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1
-	github.com/aws/aws-sdk-go v1.44.173
+	github.com/aws/aws-sdk-go v1.44.240
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/blevesearch/bleve/v2 v2.3.6
+	github.com/blevesearch/bleve/v2 v2.3.7
 	github.com/cespare/xxhash/v2 v2.2.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/dgryski/dgoogauth v0.0.0-20190221195224-5a805980a5f3
@@ -17,7 +17,7 @@ require (
 	github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a
 	github.com/francoispqt/gojay v1.2.13
 	github.com/fsnotify/fsnotify v1.6.0
-	github.com/getsentry/sentry-go v0.16.0
+	github.com/getsentry/sentry-go v0.20.0
 	github.com/go-sql-driver/mysql v1.7.0
 	github.com/golang-migrate/migrate/v4 v4.15.2
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
@@ -31,9 +31,9 @@ require (
 	github.com/graph-gophers/dataloader/v7 v7.1.0
 	github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a
 	github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c
-	github.com/hashicorp/go-hclog v1.4.0
-	github.com/hashicorp/go-plugin v1.4.8
-	github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba
+	github.com/hashicorp/go-hclog v1.5.0
+	github.com/hashicorp/go-plugin v1.4.9
+	github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/krolaw/zipstream v0.0.0-20180621105154-0a2661891f94
 	github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80
@@ -47,26 +47,26 @@ require (
 	github.com/mattermost/squirrel v0.2.0
 	github.com/mgdelacroix/foundation v0.0.0-20220812143423-0bfc18f73538
 	github.com/mholt/archiver/v3 v3.5.1
-	github.com/microcosm-cc/bluemonday v1.0.21
-	github.com/minio/minio-go/v7 v7.0.45
-	github.com/mitchellh/mapstructure v1.4.3
+	github.com/microcosm-cc/bluemonday v1.0.23
+	github.com/minio/minio-go/v7 v7.0.51
+	github.com/mitchellh/mapstructure v1.5.0
 	github.com/oklog/run v1.1.0
 	github.com/oov/psd v0.0.0-20220121172623-5db5eafcecbb
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/pborman/uuid v1.2.1
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.12.1
+	github.com/prometheus/client_golang v1.14.0
 	github.com/reflog/dateconstraints v0.2.1
-	github.com/rivo/uniseg v0.4.3
+	github.com/rivo/uniseg v0.4.4
 	github.com/rs/cors v1.8.3
 	github.com/rudderlabs/analytics-go v3.3.3+incompatible
 	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
-	github.com/sergi/go-diff v1.2.0
+	github.com/sergi/go-diff v1.3.1
 	github.com/sirupsen/logrus v1.9.0
-	github.com/spf13/cobra v1.6.1
-	github.com/spf13/viper v1.10.1
-	github.com/splitio/go-client/v6 v6.2.1
-	github.com/stretchr/testify v1.8.1
+	github.com/spf13/cobra v1.7.0
+	github.com/spf13/viper v1.15.0
+	github.com/splitio/go-client/v6 v6.3.1
+	github.com/stretchr/testify v1.8.2
 	github.com/throttled/throttled v2.2.5+incompatible
 	github.com/tinylib/msgp v1.1.8
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
@@ -75,14 +75,14 @@ require (
 	github.com/wiggin77/merror v1.0.4
 	github.com/writeas/go-strip-markdown v2.0.1+incompatible
 	github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c
-	github.com/yuin/goldmark v1.5.3
-	golang.org/x/crypto v0.5.0
-	golang.org/x/image v0.3.0
-	golang.org/x/net v0.8.0
-	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
+	github.com/yuin/goldmark v1.5.4
+	golang.org/x/crypto v0.8.0
+	golang.org/x/image v0.7.0
+	golang.org/x/net v0.9.0
+	golang.org/x/oauth2 v0.7.0
 	golang.org/x/sync v0.1.0
-	golang.org/x/text v0.8.0
-	golang.org/x/tools v0.6.0
+	golang.org/x/text v0.9.0
+	golang.org/x/tools v0.8.0
 	gopkg.in/guregu/null.v4 v4.0.0
 	gopkg.in/mail.v2 v2.3.1
 	gopkg.in/yaml.v2 v2.4.0
@@ -92,15 +92,15 @@ require (
 require (
 	github.com/HdrHistogram/hdrhistogram-go v0.9.0 // indirect
 	github.com/JalfResi/justext v0.0.0-20221106200834-be571e3e3052 // indirect
-	github.com/PuerkitoBio/goquery v1.8.0 // indirect
-	github.com/RoaringBitmap/roaring v1.2.1 // indirect
+	github.com/PuerkitoBio/goquery v1.8.1 // indirect
+	github.com/RoaringBitmap/roaring v1.2.3 // indirect
 	github.com/advancedlogic/GoOse v0.0.0-20210820140952-9d5822d4a625 // indirect
-	github.com/andybalholm/brotli v1.0.4 // indirect
+	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/andybalholm/cascadia v1.3.1 // indirect
 	github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bits-and-blooms/bitset v1.4.0 // indirect
+	github.com/bits-and-blooms/bitset v1.5.0 // indirect
 	github.com/bits-and-blooms/bloom/v3 v3.3.1 // indirect
 	github.com/blevesearch/bleve_index_api v1.0.5 // indirect
 	github.com/blevesearch/geo v0.1.17 // indirect
@@ -116,20 +116,19 @@ require (
 	github.com/blevesearch/zapx/v12 v12.3.7 // indirect
 	github.com/blevesearch/zapx/v13 v13.3.7 // indirect
 	github.com/blevesearch/zapx/v14 v14.3.7 // indirect
-	github.com/blevesearch/zapx/v15 v15.3.8 // indirect
+	github.com/blevesearch/zapx/v15 v15.3.9 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/fatih/color v1.13.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/fatih/set v0.2.1 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
-	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/go-resty/resty/v2 v2.7.0 // indirect
-	github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/geo v0.0.0-20230404232722-c4acd7a044dc // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/google/uuid v1.3.0 // indirect
@@ -142,18 +141,17 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/compress v1.15.14 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.3 // indirect
+	github.com/klauspost/compress v1.16.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/klauspost/pgzip v1.2.5 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5 // indirect
-	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
-	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
@@ -164,26 +162,28 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/otiai10/gosseract/v2 v2.4.0 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
 	github.com/philhofer/fwd v1.1.2 // indirect
 	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.33.0 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/redis/go-redis/v9 v9.0.3 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.3 // indirect
 	github.com/rs/xid v1.4.0 // indirect
 	github.com/segmentio/backo-go v1.0.1 // indirect
-	github.com/spf13/afero v1.8.2 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/splitio/go-split-commons/v4 v4.2.3 // indirect
-	github.com/splitio/go-toolkit/v5 v5.2.2 // indirect
+	github.com/splitio/go-split-commons/v4 v4.3.1 // indirect
+	github.com/splitio/go-toolkit/v5 v5.3.0 // indirect
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/tidwall/gjson v1.14.4 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
@@ -191,25 +191,25 @@ require (
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/wiggin77/srslog v1.0.1 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	go.etcd.io/bbolt v1.3.6 // indirect
+	go.etcd.io/bbolt v1.3.7 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
-	golang.org/x/mod v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf // indirect
-	google.golang.org/grpc v1.51.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/grpc v1.54.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
-	lukechampine.com/uint128 v1.2.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	lukechampine.com/uint128 v1.3.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect
 	modernc.org/ccgo/v3 v3.16.13 // indirect
-	modernc.org/libc v1.22.2 // indirect
+	modernc.org/libc v1.22.3 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
 	modernc.org/memory v1.5.0 // indirect
 	modernc.org/opt v0.1.3 // indirect
-	modernc.org/sqlite v1.20.1 // indirect
+	modernc.org/sqlite v1.21.1 // indirect
 	modernc.org/strutil v1.1.3 // indirect
 	modernc.org/token v1.1.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 852b686451..67c290126e 100644
--- a/go.sum
+++ b/go.sum
@@ -87,7 +87,6 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
 github.com/HdrHistogram/hdrhistogram-go v0.9.0 h1:dpujRju0R4M/QZzcnR1LH1qm+TVG3UzkWdp5tH1WMcg=
@@ -95,10 +94,10 @@ github.com/HdrHistogram/hdrhistogram-go v0.9.0/go.mod h1:nxrse8/Tzg2tg3DZcZjm6qE
 github.com/JalfResi/justext v0.0.0-20170829062021-c0282dea7198/go.mod h1:0SURuH1rsE8aVWvutuMZghRNrNrYEUzibzJfhEYR8L0=
 github.com/JalfResi/justext v0.0.0-20221106200834-be571e3e3052 h1:8T2zMbhLBbH9514PIQVHdsGhypMrsB4CxwbldKA9sBA=
 github.com/JalfResi/justext v0.0.0-20221106200834-be571e3e3052/go.mod h1:0SURuH1rsE8aVWvutuMZghRNrNrYEUzibzJfhEYR8L0=
-github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
-github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
-github.com/Masterminds/squirrel v1.5.3 h1:YPpoceAcxuzIljlr5iWpNKaql7hLeG1KLSrhvdHpkZc=
-github.com/Masterminds/squirrel v1.5.3/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
+github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
+github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
+github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=
+github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@@ -127,14 +126,14 @@ github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMo
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PuerkitoBio/goquery v1.4.1/go.mod h1:T9ezsOHcCrDCgA8aF1Cqr3sSYbO/xgdy8/R/XiIMAhA=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
-github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U=
-github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI=
+github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
+github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/RoaringBitmap/roaring v1.2.1 h1:58/LJlg/81wfEHd5L9qsHduznOIhyv4qb1yWcSvVq9A=
-github.com/RoaringBitmap/roaring v1.2.1/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA=
+github.com/RoaringBitmap/roaring v1.2.3 h1:yqreLINqIrX22ErkKI0vY47/ivtJr6n+kMhVOVmhWBY=
+github.com/RoaringBitmap/roaring v1.2.3/go.mod h1:plvDsJQpxOC5bw8LRteu/MLWHsHez/3y6cubLI4/1yE=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/advancedlogic/GoOse v0.0.0-20191112112754-e742535969c1/go.mod h1:f3HCSN1fBWjcpGtXyM119MJgeQl838v6so/PQOqvE1w=
 github.com/advancedlogic/GoOse v0.0.0-20210820140952-9d5822d4a625 h1:LZIP5Bj5poWWRZ8fcL4ZwCupb4FwcTFK2RCTxkGnCX8=
@@ -148,8 +147,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
 github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk=
 github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
-github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
-github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
+github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY=
@@ -172,8 +171,8 @@ github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1 h1:9h8f71kuF1pqovnn9
 github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1/go.mod h1:noBAuukeYOXa0aXGqxr24tADqkwDO2KRD15FsuaZ5a8=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.44.173 h1:8kXIxvQnBpGhmR3Eof6SnCKgR0q5/L/3Qbv9vAC5wic=
-github.com/aws/aws-sdk-go v1.44.173/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.240 h1:38f1qBTuzotDC6bgSNLw1vrrYaoWL8MNNzwTsGjP6TY=
+github.com/aws/aws-sdk-go v1.44.240/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/aws/aws-sdk-go-v2 v1.8.0/go.mod h1:xEFuWz+3TYdlPRuo+CqATbeDWIWyaT5uAPwPaWtgse0=
 github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
 github.com/aws/aws-sdk-go-v2/config v1.6.0/go.mod h1:TNtBVmka80lRPk5+S9ZqVfFszOQAGJJ9KbT3EM3CHNU=
@@ -213,8 +212,8 @@ github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCS
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
 github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/bits-and-blooms/bitset v1.3.1/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
-github.com/bits-and-blooms/bitset v1.4.0 h1:+YZ8ePm+He2pU3dZlIZiOeAKfrBkXi1lSrXJ/Xzgbu8=
-github.com/bits-and-blooms/bitset v1.4.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
+github.com/bits-and-blooms/bitset v1.5.0 h1:NpE8frKRLGHIcEzkR+gZhiioW1+WbYV6fKwD6ZIpQT8=
+github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/bits-and-blooms/bloom/v3 v3.3.1 h1:K2+A19bXT8gJR5mU7y+1yW6hsKfNCjcP2uNfLFKncjQ=
 github.com/bits-and-blooms/bloom/v3 v3.3.1/go.mod h1:bhUUknWd5khVbTe4UgMCSiOOVJzr3tMoijSK3WwvW90=
 github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
@@ -222,8 +221,8 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
 github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/blevesearch/bleve/v2 v2.3.6 h1:NlntUHcV5CSWIhpugx4d/BRMGCiaoI8ZZXrXlahzNq4=
-github.com/blevesearch/bleve/v2 v2.3.6/go.mod h1:JM2legf1cKVkdV8Ehu7msKIOKC0McSw0Q16Fmv9vsW4=
+github.com/blevesearch/bleve/v2 v2.3.7 h1:nIfIrhv28tvgBpbVF8Dq7/U1zW/YiwSqg/PBgE3x8bo=
+github.com/blevesearch/bleve/v2 v2.3.7/go.mod h1:2tToYD6mDeseIA13jcZiEEqYrVLg6xdk0v6+F7dWquU=
 github.com/blevesearch/bleve_index_api v1.0.5 h1:Lc986kpC4Z0/n1g3gg8ul7H+lxgOQPcXb9SxvQGu+tw=
 github.com/blevesearch/bleve_index_api v1.0.5/go.mod h1:YXMDwaXFFXwncRS8UobWs7nvo0DmusriM1nztTlj1ms=
 github.com/blevesearch/geo v0.1.17 h1:AguzI6/5mHXapzB0gE9IKWo+wWPHZmXZoscHcjFgAFA=
@@ -252,13 +251,15 @@ github.com/blevesearch/zapx/v13 v13.3.7 h1:igIQg5eKmjw168I7av0Vtwedf7kHnQro/M+ub
 github.com/blevesearch/zapx/v13 v13.3.7/go.mod h1:yyrB4kJ0OT75UPZwT/zS+Ru0/jYKorCOOSY5dBzAy+s=
 github.com/blevesearch/zapx/v14 v14.3.7 h1:gfe+fbWslDWP/evHLtp/GOvmNM3sw1BbqD7LhycBX20=
 github.com/blevesearch/zapx/v14 v14.3.7/go.mod h1:9J/RbOkqZ1KSjmkOes03AkETX7hrXT0sFMpWH4ewC4w=
-github.com/blevesearch/zapx/v15 v15.3.8 h1:q4uMngBHzL1IIhRc8AJUEkj6dGOE3u1l3phLu7hq8uk=
-github.com/blevesearch/zapx/v15 v15.3.8/go.mod h1:m7Y6m8soYUvS7MjN9eKlz1xrLCcmqfFadmu7GhWIrLY=
+github.com/blevesearch/zapx/v15 v15.3.9 h1:/s9zqKxFaZKQTTcMO2b/Tup0ch5MSztlvw+frVDfIBk=
+github.com/blevesearch/zapx/v15 v15.3.9/go.mod h1:m7Y6m8soYUvS7MjN9eKlz1xrLCcmqfFadmu7GhWIrLY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
+github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
 github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
@@ -473,8 +474,9 @@ github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L
 github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a h1:etIrTD8BQqzColk9nKRusM9um5+1q0iOEJLqfBMIK64=
 github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a/go.mod h1:emQhSYTXqB0xxjLITTw4EaWZ+8IIQYw+kx9GqNUKdLg=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
@@ -496,8 +498,9 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
 github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/fatih/set v0.2.1 h1:nn2CaJyknWE/6txyUDGwysr3G5QC6xWB/PtVjPBbeaA=
 github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
@@ -512,6 +515,7 @@ github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
+github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
@@ -522,8 +526,8 @@ github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmx
 github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
-github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo=
-github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y=
+github.com/getsentry/sentry-go v0.20.0 h1:bwXW98iMRIWxn+4FgPW7vMrjmbym6HblXALmhjHmQaQ=
+github.com/getsentry/sentry-go v0.20.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573 h1:u8AQ9bPa9oC+8/A/jlWouakhIvkFfuxgIIRjiy8av7I=
@@ -545,12 +549,10 @@ github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
@@ -574,8 +576,6 @@ github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dp
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
-github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-resty/resty/v2 v2.0.0/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8=
 github.com/go-resty/resty/v2 v2.3.0/go.mod h1:UpN9CgLZNsv4e9XG50UU8xdI0F43UQ4HmxLBDwaroHU=
 github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
@@ -636,8 +636,8 @@ github.com/golang-migrate/migrate/v4 v4.15.2/go.mod h1:f2toGLkYqD3JH+Todi4aZ2Zdb
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo=
-github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
+github.com/golang/geo v0.0.0-20230404232722-c4acd7a044dc h1:WkAZHSmcnJhZyutVoVXe7lDSQBbISxITcm57tYf22PE=
+github.com/golang/geo v0.0.0-20230404232722-c4acd7a044dc/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -673,8 +673,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -726,7 +727,6 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -794,16 +794,16 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-hclog v1.4.0 h1:ctuWFGrhFha8BnnzxqeRGidlEcQkDyL5u8J8t5eA11I=
-github.com/hashicorp/go-hclog v1.4.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
+github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.4.8 h1:CHGwpxYDOttQOY7HOWgETU9dyVjOXzniXDqJcYJE1zM=
-github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
+github.com/hashicorp/go-plugin v1.4.9 h1:ESiK220/qE0aGxWdzKIvRH69iLiuN/PjoLTm69RoWtU=
+github.com/hashicorp/go-plugin v1.4.9/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
@@ -832,7 +832,6 @@ github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ=
@@ -883,8 +882,8 @@ github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dv
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jaytaylor/html2text v0.0.0-20180606194806-57d518f124b0/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
-github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba h1:QFQpJdgbON7I0jr2hYW7Bs+XV0qjc3d5tZoDnRFnqTg=
-github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
+github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 h1:iCHtR9CQyktQ5+f3dMVZfwD2KWJUgm7M0gdL9NGr8KA=
+github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
@@ -938,13 +937,13 @@ github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdY
 github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.15.14 h1:i7WCKDToww0wA+9qrUZ1xOjp218vfFo3nTU6UHp+gOc=
-github.com/klauspost/compress v1.15.14/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
+github.com/klauspost/compress v1.16.4 h1:91KN02FnsOYhuunwU4ssRe8lc2JosWmizWa91B5v1PU=
+github.com/klauspost/compress v1.16.4/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU=
-github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
+github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -954,8 +953,8 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
@@ -987,8 +986,8 @@ github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm
 github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
-github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
+github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -1032,8 +1031,8 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
+github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
@@ -1048,25 +1047,25 @@ github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOq
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.10/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
-github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
 github.com/mgdelacroix/foundation v0.0.0-20220812143423-0bfc18f73538 h1:6mFhRD89wtsxh7g8V6og9DR4y/UGlzzehc1c3O9tbMQ=
 github.com/mgdelacroix/foundation v0.0.0-20220812143423-0bfc18f73538/go.mod h1:ZwobEfNHde7sU2pGybCWEnSlQ2r+MGrHGOKLphHZ42g=
 github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo=
 github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
-github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg=
-github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
+github.com/microcosm-cc/bluemonday v1.0.23 h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY=
+github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.45 h1:g4IeM9M9pW/Lo8AGGNOjBZYlvmtlE1N5TQEYWXRWzIs=
-github.com/minio/minio-go/v7 v7.0.45/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw=
+github.com/minio/minio-go/v7 v7.0.51 h1:eSewrwc23TqUDEH8aw8Bwp4f+JDdozRrPWcKR7DZhmY=
+github.com/minio/minio-go/v7 v7.0.51/go.mod h1:IbbodHyjUAguneyucUaahv+VMNs/EOTV9du7A7/Z3HU=
 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
 github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
@@ -1081,8 +1080,8 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
-github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
@@ -1123,7 +1122,6 @@ github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWk
 github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc=
 github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
 github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
@@ -1145,9 +1143,6 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
 github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -1157,9 +1152,6 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
 github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
-github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
 github.com/oov/psd v0.0.0-20220121172623-5db5eafcecbb h1:JF9kOhBBk4WPF7luXFu5yR+WgaFm9L/KiHJHhU9vDwA=
 github.com/oov/psd v0.0.0-20220121172623-5db5eafcecbb/go.mod h1:GHI1bnmAcbp96z6LNfBJvtrjxhaXGkbsk967utPlvL8=
 github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -1211,6 +1203,8 @@ github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrap
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us=
+github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
 github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
@@ -1243,14 +1237,15 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
-github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
 github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
@@ -1260,9 +1255,8 @@ github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.33.0 h1:rHgav/0a6+uYgGdNt3jwz8FNSesO/Hsang3O0T9A5SE=
-github.com/prometheus/common v0.33.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE=
+github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
+github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
 github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -1275,15 +1269,18 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
+github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k=
+github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
 github.com/reflog/dateconstraints v0.2.1 h1:Hz1n2Q1vEm0Rj5gciDQcCN1iPBwfFjxUJy32NknGP/s=
 github.com/reflog/dateconstraints v0.2.1/go.mod h1:Ax8AxTBcJc3E/oVS2hd2j7RDM/5MDtuPwuR7lIHtPLo=
 github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa h1:tEkEyxYeZ43TR55QU/hsIt9aRGBxbgGuz9CGykjvogY=
-github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/richardlehane/mscfb v1.0.3/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
 github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
 github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
@@ -1292,13 +1289,14 @@ github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN
 github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
-github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
+github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo=
 github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
@@ -1327,8 +1325,8 @@ github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod
 github.com/segmentio/backo-go v1.0.1 h1:68RQccglxZeyURy93ASB/2kc9QudzgIDexJ927N++y4=
 github.com/segmentio/backo-go v1.0.1/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
-github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
+github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -1380,17 +1378,17 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
-github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
+github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
+github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
-github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
+github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
-github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
-github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
+github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
@@ -1402,15 +1400,14 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
-github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
-github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
-github.com/splitio/go-client/v6 v6.2.1 h1:EH3xYH7fr2c0I0ZtYvsyn7DjC9ZmoNAFLoKoT3BmQFU=
-github.com/splitio/go-client/v6 v6.2.1/go.mod h1:+HnGMevmSUk56va2egs9W2s9mJ7LW9IXiDPB1ExOi+k=
-github.com/splitio/go-split-commons/v4 v4.2.0/go.mod h1:mzanM00PV8t1FL6IHc2UXepIH2z79d49ArZ2LoJHGrY=
-github.com/splitio/go-split-commons/v4 v4.2.3 h1:/bQg8Z0eCkF9RHl7Dh1SJ8j7Ci024bgtkZEWwEKXywc=
-github.com/splitio/go-split-commons/v4 v4.2.3/go.mod h1:mzanM00PV8t1FL6IHc2UXepIH2z79d49ArZ2LoJHGrY=
-github.com/splitio/go-toolkit/v5 v5.2.2 h1:VHSJoIH9tsRt2cCzGKN4WG3BoGCr0tCPZIl8APtJ4bw=
-github.com/splitio/go-toolkit/v5 v5.2.2/go.mod h1:SYi/svhhtEgdMSb5tNcDcMjOSUH/7XVkvjp5dPL+nBE=
+github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU=
+github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA=
+github.com/splitio/go-client/v6 v6.3.1 h1:HtIVILFZotiT2AE1gTElWehrdy71kh8kDux3M3IuKjA=
+github.com/splitio/go-client/v6 v6.3.1/go.mod h1:B7mq//ds3MiYjbY1amIESSR8qKcSWjOJJBzVgSAqlLE=
+github.com/splitio/go-split-commons/v4 v4.3.1 h1:+BaNoyuxOWopYN603Pbk1etiysHaEz8EghVx20CbwDk=
+github.com/splitio/go-split-commons/v4 v4.3.1/go.mod h1:tjtSYwuIMDGTEifO1dMcKk9UYf0Q2gz0xypkT//cdLc=
+github.com/splitio/go-toolkit/v5 v5.3.0 h1:NSUBIkyRwyMQ6ruPOiG1Kl1pni/pW3Gqiu7L+11mIMw=
+github.com/splitio/go-toolkit/v5 v5.3.0/go.mod h1:yn9f3Bmka+97BNnNnnlM1V484jMqu7MNoM/RBZLbZZs=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
@@ -1432,10 +1429,12 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
+github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
@@ -1514,8 +1513,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.5.3 h1:3HUJmBFbQW9fhQOzMgseU134xfi6hU+mjWywx5Ty+/M=
-github.com/yuin/goldmark v1.5.3/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU=
+github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
 github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
@@ -1524,8 +1523,9 @@ gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
-go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
+go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
+go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
 go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
@@ -1611,9 +1611,9 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
+golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1638,8 +1638,8 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o
 golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.3.0 h1:HTDXbdK9bjfSWkPzDJIw89W8CAtfFGduujWs33NLLsg=
-golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A=
+golang.org/x/image v0.7.0 h1:gzS29xtG1J5ybQlv0PuyfE3nmc6R4qB73m6LUUmvFuw=
+golang.org/x/image v0.7.0/go.mod h1:nd/q4ef1AKKYl/4kft7g+6UyGbdiqWqTP1ZAbRoV7Rg=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -1667,8 +1667,9 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1736,17 +1737,19 @@ golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1767,8 +1770,8 @@ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg=
-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
+golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
 golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1910,7 +1913,6 @@ golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1922,8 +1924,10 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -1931,6 +1935,7 @@ golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1942,9 +1947,9 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2037,8 +2042,9 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
-golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
+golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -2179,8 +2185,8 @@ google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ6
 google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
-google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf h1:/JqRexUvugu6JURQ0O7RfV1EnvgrOxUV4tSjuAv0Sr0=
-google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
+google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
@@ -2218,8 +2224,8 @@ google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5
 google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
-google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
+google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag=
+google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -2235,8 +2241,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
@@ -2262,13 +2268,13 @@ gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk=
 gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -2346,8 +2352,8 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
-lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo=
+lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/b v1.0.0/go.mod h1:uZWcZfRj1BpYzfN9JTerzlNUnnPsV9O2ZA8JsRcubNg=
 modernc.org/cc/v3 v3.32.4/go.mod h1:0R6jl1aZlIl2avnYfbfHBS1QB6/f+16mihBObaBC878=
 modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
@@ -2375,8 +2381,8 @@ modernc.org/libc v1.9.5/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
 modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A=
 modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU=
 modernc.org/libc v1.16.7/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU=
-modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0=
-modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug=
+modernc.org/libc v1.22.3 h1:D/g6O5ftAfavceqlLOFwaZuA5KYafKwmr30A6iSqoyY=
+modernc.org/libc v1.22.3/go.mod h1:MQrloYP209xa2zHome2a8HLiLm6k0UT8CoHpV74tOFw=
 modernc.org/lldb v1.0.0/go.mod h1:jcRvJGWfCGodDZz8BPwiKMJxGJngQ/5DrRapkQnLob8=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
@@ -2395,15 +2401,15 @@ modernc.org/ql v1.0.0/go.mod h1:xGVyrLIatPcO2C1JvI/Co8c0sr6y91HKFNy4pt9JXEY=
 modernc.org/sortutil v1.1.0/go.mod h1:ZyL98OQHJgH9IEfN71VsamvJgrtRX9Dj2gX+vH86L1k=
 modernc.org/sqlite v1.10.6/go.mod h1:Z9FEjUtZP4qFEg6/SiADg9XCER7aYy9a/j7Pg9P7CPs=
 modernc.org/sqlite v1.18.0/go.mod h1:B9fRWZacNxJBHoCJZQr1R54zhVn3fjfl0aszflrTSxY=
-modernc.org/sqlite v1.20.1 h1:z6qRLw72B0VfRrJjs3l6hWkzYDx1bo0WGVrBGP4ohhM=
-modernc.org/sqlite v1.20.1/go.mod h1:fODt+bFmc/j8LcoCbMSkAuKuGmhxjG45KGc25N2705M=
+modernc.org/sqlite v1.21.1 h1:GyDFqNnESLOhwwDRaHGdp2jKLDzpyT/rNLglX3ZkMSU=
+modernc.org/sqlite v1.21.1/go.mod h1:XwQ0wZPIh1iKb5mkvCJ3szzbhk+tykC8ZWqTRTgYRwI=
 modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
 modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
 modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
 modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
 modernc.org/tcl v1.5.2/go.mod h1:pmJYOLgpiys3oI4AeAafkcUfE+TKKilminxNyU/+Zlo=
 modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw=
-modernc.org/tcl v1.15.0 h1:oY+JeD11qVVSgVvodMJsu7Edf8tr5E/7tuhF5cNYz34=
+modernc.org/tcl v1.15.1 h1:mOQwiEK4p7HruMZcwKTZPw/aqtGM4aY00uzWhlKKYws=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

From 470e4c9d66bbc6c5a85cd59b603f5c34f574e8a1 Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Fri, 14 Apr 2023 13:32:05 +0530
Subject: [PATCH 058/103] MM-51786: Sentry crash while installing a blocked
 plugin (#22804)

We would return "nil, nil" if a plugin was on the blocklist.
This would cause a nil dereference panic while trying to add
struct fields from manifest to the audit logs.

To avoid it, we return an error explicitly and ignore the
error ids to unnecessarily have it log an error.

https://mattermost.atlassian.net/browse/MM-51786

```release-note
NONE
```
---
 server/channels/app/plugin.go              |  7 ++++++-
 server/channels/app/plugin_install.go      | 11 +++++++----
 server/channels/app/plugin_install_test.go | 19 +++++++++----------
 server/i18n/en.json                        |  8 ++++++++
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/server/channels/app/plugin.go b/server/channels/app/plugin.go
index 210002a3ff..64e9d176f9 100644
--- a/server/channels/app/plugin.go
+++ b/server/channels/app/plugin.go
@@ -352,7 +352,7 @@ func (ch *Channels) syncPlugins() *model.AppError {
 			}
 
 			mlog.Info("Syncing plugin from file store", mlog.String("bundle", plugin.path))
-			if _, err := ch.installPluginLocally(reader, signature, installPluginLocallyAlways); err != nil {
+			if _, err := ch.installPluginLocally(reader, signature, installPluginLocallyAlways); err != nil && err.Id != "app.plugin.blocked.app_error" && err.Id != "app.plugin.skip_installation.app_error" {
 				mlog.Error("Failed to sync plugin from file store", mlog.String("bundle", plugin.path), mlog.Err(err))
 			}
 		}(plugin)
@@ -952,6 +952,11 @@ func (ch *Channels) processPrepackagedPlugins(pluginsDir string) []*plugin.Prepa
 			defer wg.Done()
 			p, err := ch.processPrepackagedPlugin(psPath)
 			if err != nil {
+				var appErr *model.AppError
+				// A log line already appears if the plugin is on the blocklist
+				if errors.As(err, &appErr) && (appErr.Id == "app.plugin.blocked.app_error" || appErr.Id == "app.plugin.skip_installation.app_error") {
+					return
+				}
 				mlog.Error("Failed to install prepackaged plugin", mlog.String("path", psPath.path), mlog.Err(err))
 				return
 			}
diff --git a/server/channels/app/plugin_install.go b/server/channels/app/plugin_install.go
index 5db3e2cb77..2d666c7d47 100644
--- a/server/channels/app/plugin_install.go
+++ b/server/channels/app/plugin_install.go
@@ -92,7 +92,10 @@ func (ch *Channels) installPluginFromData(data model.PluginEventData) {
 
 	manifest, appErr := ch.installPluginLocally(reader, signature, installPluginLocallyAlways)
 	if appErr != nil {
-		mlog.Error("Failed to sync plugin from file store", mlog.String("bundle", plugin.path), mlog.Err(appErr))
+		// A log line already appears if the plugin is on the blocklist or skipped
+		if appErr.Id != "app.plugin.blocked.app_error" && appErr.Id != "app.plugin.skip_installation.app_error" {
+			mlog.Error("Failed to sync plugin from file store", mlog.String("bundle", plugin.path), mlog.Err(appErr))
+		}
 		return
 	}
 
@@ -330,8 +333,8 @@ func (ch *Channels) installExtractedPlugin(manifest *model.Manifest, fromPluginD
 
 	// Check plugin id is not blocked
 	if plugin.PluginIDIsBlocked(manifest.Id) {
-		mlog.Debug("Skipping installation of plugin since plugin is on blocklist", mlog.String("plugin_id", manifest.Id))
-		return nil, nil
+		mlog.Debug("Skipping installation of plugin since plugin is on blocklist. Some plugins are blocked because they are built into this version of Mattermost.", mlog.String("plugin_id", manifest.Id))
+		return nil, model.NewAppError("installExtractedPlugin", "app.plugin.blocked.app_error", map[string]any{"Id": manifest.Id}, "", http.StatusInternalServerError)
 	}
 
 	// Check for plugins installed with the same ID.
@@ -365,7 +368,7 @@ func (ch *Channels) installExtractedPlugin(manifest *model.Manifest, fromPluginD
 
 			if version.LTE(existingVersion) {
 				mlog.Debug("Skipping local installation of plugin since existing version is newer", mlog.String("plugin_id", manifest.Id))
-				return nil, nil
+				return nil, model.NewAppError("installExtractedPlugin", "app.plugin.skip_installation.app_error", map[string]any{"Id": manifest.Id}, "", http.StatusInternalServerError)
 			}
 		}
 
diff --git a/server/channels/app/plugin_install_test.go b/server/channels/app/plugin_install_test.go
index 5fde414bd6..ecbb75e164 100644
--- a/server/channels/app/plugin_install_test.go
+++ b/server/channels/app/plugin_install_test.go
@@ -172,10 +172,9 @@ func TestInstallPluginLocally(t *testing.T) {
 		defer th.TearDown()
 		cleanExistingBundles(t, th)
 
-		manifest, appErr := installPlugin(t, th, "playbooks", "0.0.1", installPluginLocallyAlways)
-		require.Nil(t, appErr)
-		require.Nil(t, manifest)
-
+		_, appErr := installPlugin(t, th, "playbooks", "0.0.1", installPluginLocallyAlways)
+		require.NotNil(t, appErr)
+		require.Equal(t, "app.plugin.blocked.app_error", appErr.Id)
 		assertBundleInfoManifests(t, th, []*model.Manifest{})
 	})
 
@@ -222,9 +221,9 @@ func TestInstallPluginLocally(t *testing.T) {
 			require.Nil(t, appErr)
 			require.NotNil(t, existingManifest)
 
-			manifest, appErr := installPlugin(t, th, "valid", "0.0.1", installPluginLocallyOnlyIfNewOrUpgrade)
-			require.Nil(t, appErr)
-			require.Nil(t, manifest)
+			_, appErr = installPlugin(t, th, "valid", "0.0.1", installPluginLocallyOnlyIfNewOrUpgrade)
+			require.NotNil(t, appErr)
+			require.Equal(t, "app.plugin.skip_installation.app_error", appErr.Id)
 
 			assertBundleInfoManifests(t, th, []*model.Manifest{existingManifest})
 		})
@@ -238,9 +237,9 @@ func TestInstallPluginLocally(t *testing.T) {
 			require.Nil(t, appErr)
 			require.NotNil(t, existingManifest)
 
-			manifest, appErr := installPlugin(t, th, "valid", "0.0.2", installPluginLocallyOnlyIfNewOrUpgrade)
-			require.Nil(t, appErr)
-			require.Nil(t, manifest)
+			_, appErr = installPlugin(t, th, "valid", "0.0.2", installPluginLocallyOnlyIfNewOrUpgrade)
+			require.NotNil(t, appErr)
+			require.Equal(t, "app.plugin.skip_installation.app_error", appErr.Id)
 
 			assertBundleInfoManifests(t, th, []*model.Manifest{existingManifest})
 		})
diff --git a/server/i18n/en.json b/server/i18n/en.json
index e91fbf2656..540a62bff5 100644
--- a/server/i18n/en.json
+++ b/server/i18n/en.json
@@ -5931,6 +5931,10 @@
     "id": "app.oauth.update_app.updating.app_error",
     "translation": "We encountered an error updating the app."
   },
+  {
+    "id": "app.plugin.blocked.app_error",
+    "translation": "Plugin {{.Id}} is on the block list. Some plugins are blocked because they are built into this version of Mattermost."
+  },
   {
     "id": "app.plugin.cluster.save_config.app_error",
     "translation": "The plugin configuration in your config.json file must be updated manually when using ReadOnlyConfig with clustering enabled."
@@ -6063,6 +6067,10 @@
     "id": "app.plugin.signature_decode.app_error",
     "translation": "Unable to decode base64 signature."
   },
+  {
+    "id": "app.plugin.skip_installation.app_error",
+    "translation": "Skipping installation of plugin {{.Id}} since existing version is equal or newer."
+  },
   {
     "id": "app.plugin.store_bundle.app_error",
     "translation": "Unable to store the plugin to the configured file store."

From 4bf31bd227170e11339c257570f9336f197a2dc7 Mon Sep 17 00:00:00 2001
From: GitStart <1501599+gitstart@users.noreply.github.com>
Date: Fri, 14 Apr 2023 09:57:22 +0100
Subject: [PATCH 059/103] MM-50746 : Edits to messages persist after cancelling
 (#22676)

---
 .../channels/messaging/edit_message_spec.js   | 38 +++++++++++++++++++
 .../src/components/edit_post/edit_post.tsx    |  8 +++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/edit_message_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/edit_message_spec.js
index 0bf2363650..1aad5036be 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/edit_message_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/edit_message_spec.js
@@ -145,4 +145,42 @@ describe('Edit Message', () => {
             cy.get(postText).should('have.text', `${secondMessage} Another new message Edited`);
         });
     });
+
+    it('MM-T5416 should discard any changes made after cancelling the edit and opening the edit textbox again should display the original message', () => {
+        const message = 'World!';
+        cy.postMessage(message);
+
+        // * Verify message is sent and not pending
+        cy.getLastPostId().then((postId) => {
+            const postText = `#postMessageText_${postId}`;
+            cy.get(postText).should('have.text', message);
+
+            // # Open edit textbox
+            cy.uiGetPostTextBox().type('{uparrow}');
+
+            // * Edit Post Input should appear, and edit the post
+            cy.get('#edit_textbox').should('be.visible');
+
+            // * Press the escape key to cancel
+            cy.get('#edit_textbox').should('have.text', message).type(' Another new message{esc}');
+            cy.get('#edit_textbox').should('not.exist');
+
+            // * Check that the message wasn't edited
+            cy.get(postText).should('have.text', message);
+        });
+
+        cy.getLastPostId().then((postId) => {
+            const postText = `#postMessageText_${postId}`;
+            cy.get(postText).should('have.text', message);
+
+            // # Open edit textbox again
+            cy.uiGetPostTextBox().type('{uparrow}');
+
+            // * Edit Post Input should appear, and edit the post
+            cy.get('#edit_textbox').should('be.visible');
+
+            // * Opening the edit textbox again after previously cancelling the edit should contain the original message.
+            cy.get('#edit_textbox').should('have.text', message);
+        });
+    });
 });
diff --git a/webapp/channels/src/components/edit_post/edit_post.tsx b/webapp/channels/src/components/edit_post/edit_post.tsx
index 9a467ebbbf..3711dca85f 100644
--- a/webapp/channels/src/components/edit_post/edit_post.tsx
+++ b/webapp/channels/src/components/edit_post/edit_post.tsx
@@ -220,7 +220,13 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft,
         actions.unsetEditingPost();
     };
 
-    const handleAutomatedRefocusAndExit = () => handleRefocusAndExit(editingPost.refocusId || null);
+    const handleAutomatedRefocusAndExit = () => {
+        draftRef.current = {
+            ...draftRef.current,
+            message: '',
+        };
+        handleRefocusAndExit(editingPost.refocusId || null);
+    };
 
     const handleEdit = async () => {
         if (!editingPost.post || isSaveDisabled()) {

From 56bf1b695af91debe1b0b6901dcef67fd2a96f2d Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Fri, 14 Apr 2023 14:28:50 +0530
Subject: [PATCH 060/103] MM-49984: Displaying active search backend in system
 console (#22721)

This will be shown in the system console to let users know
which search backend is active.

Implemented via adding an extra param in the ping response.

https://mattermost.atlassian.net/browse/MM-49984

```release-note
The database section in the system console now has an additional
read-only section which shows the active search backend in use.

This can be helpful to confirm which is the currently active
search engine when there are multiple of them configured.
```
---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 server/channels/api4/system.go                |  2 +
 server/channels/app/app_iface.go              |  1 +
 .../app/opentracing/opentracing_layer.go      | 17 +++++++
 server/channels/app/searchengine.go           |  4 ++
 server/i18n/en.json                           |  8 ++--
 .../services/searchengine/searchengine.go     | 13 +++++-
 .../searchengine/searchengine_test.go         | 42 +++++++++++++++++
 .../database_settings.test.jsx.snap           | 30 ++++++++++++
 .../admin_console/database_settings.jsx       | 46 ++++++++++++++++++-
 .../admin_console/database_settings.test.jsx  |  6 +++
 webapp/channels/src/i18n/en.json              |  2 +
 webapp/platform/client/src/client4.ts         |  1 +
 12 files changed, 166 insertions(+), 6 deletions(-)
 create mode 100644 server/platform/services/searchengine/searchengine_test.go

diff --git a/server/channels/api4/system.go b/server/channels/api4/system.go
index 216533b67f..00143beeb8 100644
--- a/server/channels/api4/system.go
+++ b/server/channels/api4/system.go
@@ -190,6 +190,8 @@ func getSystemPing(c *Context, w http.ResponseWriter, r *http.Request) {
 		s["CanReceiveNotifications"] = c.App.SendTestPushNotification(deviceID)
 	}
 
+	s["ActiveSearchBackend"] = c.App.ActiveSearchBackend()
+
 	if s[model.STATUS] != model.StatusOk {
 		w.WriteHeader(http.StatusInternalServerError)
 	}
diff --git a/server/channels/app/app_iface.go b/server/channels/app/app_iface.go
index 640b508cf1..b402409be2 100644
--- a/server/channels/app/app_iface.go
+++ b/server/channels/app/app_iface.go
@@ -400,6 +400,7 @@ type AppIface interface {
 	VerifyPlugin(plugin, signature io.ReadSeeker) *model.AppError
 	AccountMigration() einterfaces.AccountMigrationInterface
 	ActivateMfa(userID, token string) *model.AppError
+	ActiveSearchBackend() string
 	AddChannelsToRetentionPolicy(policyID string, channelIDs []string) *model.AppError
 	AddConfigListener(listener func(*model.Config, *model.Config)) string
 	AddDirectChannels(c request.CTX, teamID string, user *model.User) *model.AppError
diff --git a/server/channels/app/opentracing/opentracing_layer.go b/server/channels/app/opentracing/opentracing_layer.go
index 73193c5bd9..48ff40a0ca 100644
--- a/server/channels/app/opentracing/opentracing_layer.go
+++ b/server/channels/app/opentracing/opentracing_layer.go
@@ -89,6 +89,23 @@ func (a *OpenTracingAppLayer) ActivateMfa(userID string, token string) *model.Ap
 	return resultVar0
 }
 
+func (a *OpenTracingAppLayer) ActiveSearchBackend() string {
+	origCtx := a.ctx
+	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.ActiveSearchBackend")
+
+	a.ctx = newCtx
+	a.app.Srv().Store().SetContext(newCtx)
+	defer func() {
+		a.app.Srv().Store().SetContext(origCtx)
+		a.ctx = origCtx
+	}()
+
+	defer span.Finish()
+	resultVar0 := a.app.ActiveSearchBackend()
+
+	return resultVar0
+}
+
 func (a *OpenTracingAppLayer) AddChannelMember(c request.CTX, userID string, channel *model.Channel, opts app.ChannelMemberOpts) (*model.ChannelMember, *model.AppError) {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.AddChannelMember")
diff --git a/server/channels/app/searchengine.go b/server/channels/app/searchengine.go
index d441662a5f..345edefb05 100644
--- a/server/channels/app/searchengine.go
+++ b/server/channels/app/searchengine.go
@@ -60,3 +60,7 @@ func (a *App) PurgeBleveIndexes() *model.AppError {
 	}
 	return nil
 }
+
+func (a *App) ActiveSearchBackend() string {
+	return a.ch.srv.platform.SearchEngine.ActiveEngine()
+}
diff --git a/server/i18n/en.json b/server/i18n/en.json
index 540a62bff5..5f8740a548 100644
--- a/server/i18n/en.json
+++ b/server/i18n/en.json
@@ -7795,6 +7795,10 @@
     "id": "ent.elasticsearch.indexer.index_batch.nothing_left_to_index.error",
     "translation": "Trying to index a new batch when all the entities are completed"
   },
+  {
+    "id": "ent.elasticsearch.max_version.app_error",
+    "translation": "Elasticsearch version {{.Version}} is higher than max supported version of {{.MaxVersion}}"
+  },
   {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch is not started"
@@ -7863,10 +7867,6 @@
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Failed to decode search results"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch is already started."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Failed to create Elasticsearch bulk processor."
diff --git a/server/platform/services/searchengine/searchengine.go b/server/platform/services/searchengine/searchengine.go
index 55948e98e8..6530b93723 100644
--- a/server/platform/services/searchengine/searchengine.go
+++ b/server/platform/services/searchengine/searchengine.go
@@ -45,8 +45,19 @@ func (seb *Broker) GetActiveEngines() []SearchEngineInterface {
 	if seb.ElasticsearchEngine != nil && seb.ElasticsearchEngine.IsActive() {
 		engines = append(engines, seb.ElasticsearchEngine)
 	}
-	if seb.BleveEngine != nil && seb.BleveEngine.IsActive() {
+	if seb.BleveEngine != nil && seb.BleveEngine.IsActive() && seb.BleveEngine.IsIndexingEnabled() {
 		engines = append(engines, seb.BleveEngine)
 	}
 	return engines
 }
+
+func (seb *Broker) ActiveEngine() string {
+	activeEngines := seb.GetActiveEngines()
+	if len(activeEngines) > 0 {
+		return activeEngines[0].GetName()
+	}
+	if *seb.cfg.SqlSettings.DisableDatabaseSearch {
+		return "none"
+	}
+	return "database"
+}
diff --git a/server/platform/services/searchengine/searchengine_test.go b/server/platform/services/searchengine/searchengine_test.go
new file mode 100644
index 0000000000..00f806f3df
--- /dev/null
+++ b/server/platform/services/searchengine/searchengine_test.go
@@ -0,0 +1,42 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+package searchengine
+
+import (
+	"testing"
+
+	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/mocks"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestActiveEngine(t *testing.T) {
+	cfg := &model.Config{}
+	cfg.SetDefaults()
+
+	b := NewBroker(cfg)
+
+	esMock := &mocks.SearchEngineInterface{}
+	esMock.On("IsActive").Return(true)
+	esMock.On("GetName").Return("elasticsearch")
+
+	bleveMock := &mocks.SearchEngineInterface{}
+	bleveMock.On("IsActive").Return(true)
+	bleveMock.On("IsIndexingEnabled").Return(true)
+	bleveMock.On("GetName").Return("bleve")
+
+	assert.Equal(t, "database", b.ActiveEngine())
+
+	b.ElasticsearchEngine = esMock
+	assert.Equal(t, "elasticsearch", b.ActiveEngine())
+
+	b.ElasticsearchEngine = nil
+	b.BleveEngine = bleveMock
+	assert.Equal(t, "bleve", b.ActiveEngine())
+
+	b.BleveEngine = nil
+	*b.cfg.SqlSettings.DisableDatabaseSearch = true
+
+	assert.Equal(t, "none", b.ActiveEngine())
+}
diff --git a/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.jsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.jsx.snap
index 5685b6f279..ded545ccf4 100644
--- a/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.jsx.snap
+++ b/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.jsx.snap
@@ -353,6 +353,36 @@ exports[`components/DatabaseSettings should match snapshot 1`] = `
           </div>
         </div>
       </div>
+      <div
+        className="form-group"
+      >
+        <label
+          className="control-label col-sm-4"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="Active Search Backend:"
+            id="admin.database.search_backend.title"
+          />
+        </label>
+        <div
+          className="col-sm-8"
+        >
+          <input
+            className="form-control"
+            disabled={true}
+            type="text"
+            value=""
+          />
+          <div
+            className="help-text"
+          >
+            <MemoizedFormattedMessage
+              defaultMessage="Shows the currently active backend used for search. Values can be none, database, elasticsearch, bleve etc."
+              id="admin.database.search_backend.help_text"
+            />
+          </div>
+        </div>
+      </div>
     </SettingsGroup>
     <div
       className="admin-console-save"
diff --git a/webapp/channels/src/components/admin_console/database_settings.jsx b/webapp/channels/src/components/admin_console/database_settings.jsx
index e75e100c89..520cb8e2a7 100644
--- a/webapp/channels/src/components/admin_console/database_settings.jsx
+++ b/webapp/channels/src/components/admin_console/database_settings.jsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
-import {recycleDatabaseConnection} from 'actions/admin_actions.jsx';
+import {recycleDatabaseConnection, ping} from 'actions/admin_actions';
 import * as Utils from 'utils/utils';
 import {t} from 'utils/i18n';
 
@@ -19,6 +19,15 @@ import TextSetting from './text_setting';
 import MigrationsTable from './database';
 
 export default class DatabaseSettings extends AdminSettings {
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            ...this.state,
+            searchBackend: '',
+        };
+    }
+
     getConfigFromState = (config) => {
         // driverName and dataSource are read-only from the UI
 
@@ -34,6 +43,17 @@ export default class DatabaseSettings extends AdminSettings {
         return config;
     };
 
+    componentDidMount() {
+        this.getSearchBackend().then((searchBackend) => {
+            this.setState({searchBackend});
+        });
+    }
+
+    async getSearchBackend() {
+        const res = await ping()();
+        return res.ActiveSearchBackend;
+    }
+
     getStateFromConfig(config) {
         return {
             driverName: config.SqlSettings.DriverName,
@@ -368,6 +388,30 @@ export default class DatabaseSettings extends AdminSettings {
                         </div>
                     </div>
                 </div>
+                <div className='form-group'>
+                    <label
+                        className='control-label col-sm-4'
+                    >
+                        <FormattedMessage
+                            id='admin.database.search_backend.title'
+                            defaultMessage='Active Search Backend:'
+                        />
+                    </label>
+                    <div className='col-sm-8'>
+                        <input
+                            type='text'
+                            className='form-control'
+                            value={this.state.searchBackend}
+                            disabled={true}
+                        />
+                        <div className='help-text'>
+                            <FormattedMessage
+                                id='admin.database.search_backend.help_text'
+                                defaultMessage='Shows the currently active backend used for search. Values can be none, database, elasticsearch, bleve etc.'
+                            />
+                        </div>
+                    </div>
+                </div>
             </SettingsGroup>
         );
     };
diff --git a/webapp/channels/src/components/admin_console/database_settings.test.jsx b/webapp/channels/src/components/admin_console/database_settings.test.jsx
index b6e98f8a6c..936ee41d13 100644
--- a/webapp/channels/src/components/admin_console/database_settings.test.jsx
+++ b/webapp/channels/src/components/admin_console/database_settings.test.jsx
@@ -7,8 +7,14 @@ import {shallow} from 'enzyme';
 import DatabaseSettings from 'components/admin_console/database_settings.jsx';
 
 jest.mock('actions/admin_actions.jsx', () => {
+    const pingFn = () => {
+        return jest.fn(() => {
+            return {ActiveSearchBackend: 'none'};
+        });
+    };
     return {
         recycleDatabaseConnection: jest.fn(),
+        ping: pingFn,
     };
 });
 
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 9a248005fc..a94109ae80 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -741,6 +741,8 @@
   "admin.database.migrations_table.name": "Name",
   "admin.database.migrations_table.title": "Applied Schema Migrations",
   "admin.database.migrations_table.version": "Version",
+  "admin.database.search_backend.help_text": "Shows the currently active backend used for search. Values can be none, database, elasticsearch, bleve etc.",
+  "admin.database.search_backend.title": "Active Search Backend",
   "admin.database.title": "Database",
   "admin.developer.title": "Developer Settings",
   "admin.elasticsearch.bulkIndexingTitle": "Bulk Indexing:",
diff --git a/webapp/platform/client/src/client4.ts b/webapp/platform/client/src/client4.ts
index a58b1655ba..1f8638ab53 100644
--- a/webapp/platform/client/src/client4.ts
+++ b/webapp/platform/client/src/client4.ts
@@ -2439,6 +2439,7 @@ export default class Client4 {
     ping = () => {
         return this.doFetch<{
             status: string;
+            ActiveSearchBackend: string;
         }>(
             `${this.getBaseRoute()}/system/ping?time=${Date.now()}`,
             {method: 'get'},

From f34a06493d1a156f581ac1fec79c3a67baf2b9e1 Mon Sep 17 00:00:00 2001
From: M-ZubairAhmed <m-zubairahmed@protonmail.com>
Date: Fri, 14 Apr 2023 15:02:42 +0530
Subject: [PATCH 061/103] MM-52144 : Remove stub package
 "@types/react-day-picker" (#22945)

This package was added during the resolution of issues with Boards CI tests. This pull request isolates and tests the package's impact after recent npm changes. It was found that removing the stub package did not result in any issues.
---
 webapp/boards/package.json |  1 -
 webapp/package-lock.json   | 21 ---------------------
 2 files changed, 22 deletions(-)

diff --git a/webapp/boards/package.json b/webapp/boards/package.json
index 318e177a43..241571048f 100644
--- a/webapp/boards/package.json
+++ b/webapp/boards/package.json
@@ -95,7 +95,6 @@
 		"@types/node": "16.11.7",
 		"@types/react": "17.0.53",
 		"@types/react-beautiful-dnd": "^13.1.2",
-		"@types/react-day-picker": "5.3.0",
 		"@types/react-dom": "17.0.19",
 		"@types/react-redux": "^7.1.23",
 		"@types/react-router-dom": "^5.3.3",
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index d9d8e7e3f7..f00c8fe841 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -98,7 +98,6 @@
         "@types/node": "16.11.7",
         "@types/react": "17.0.53",
         "@types/react-beautiful-dnd": "^13.1.2",
-        "@types/react-day-picker": "5.3.0",
         "@types/react-dom": "17.0.19",
         "@types/react-redux": "^7.1.23",
         "@types/react-router-dom": "^5.3.3",
@@ -11837,16 +11836,6 @@
         "@types/react": "*"
       }
     },
-    "node_modules/@types/react-day-picker": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@types/react-day-picker/-/react-day-picker-5.3.0.tgz",
-      "integrity": "sha512-iMMXQjwTH8uxPTW3WYP6ZufZBSMFFEScGIztENtKfvukefrojmX/WCUNPrimC9ys1ll5nnM0VGaHolYLAbcEtw==",
-      "deprecated": "This is a stub types definition for react-day-picker (https://github.com/gpbl/react-day-picker). react-day-picker provides its own type definitions, so you don't need @types/react-day-picker installed!",
-      "dev": true,
-      "dependencies": {
-        "react-day-picker": "*"
-      }
-    },
     "node_modules/@types/react-dom": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.2.tgz",
@@ -42031,15 +42020,6 @@
         "@types/react": "*"
       }
     },
-    "@types/react-day-picker": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@types/react-day-picker/-/react-day-picker-5.3.0.tgz",
-      "integrity": "sha512-iMMXQjwTH8uxPTW3WYP6ZufZBSMFFEScGIztENtKfvukefrojmX/WCUNPrimC9ys1ll5nnM0VGaHolYLAbcEtw==",
-      "dev": true,
-      "requires": {
-        "react-day-picker": "*"
-      }
-    },
     "@types/react-dom": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.2.tgz",
@@ -44047,7 +44027,6 @@
         "@types/node": "16.11.7",
         "@types/react": "17.0.53",
         "@types/react-beautiful-dnd": "^13.1.2",
-        "@types/react-day-picker": "5.3.0",
         "@types/react-dom": "17.0.19",
         "@types/react-redux": "^7.1.23",
         "@types/react-router-dom": "^5.3.3",

From c99bbd0b156646dc4f8595b5e2914155700926be Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Fri, 14 Apr 2023 11:46:38 -0400
Subject: [PATCH 062/103] MM-51662 Add more information to help text for SVGs
 and Latex (#22956)

---
 .../src/components/admin_console/admin_definition.jsx         | 4 ++--
 webapp/channels/src/i18n/en.json                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/admin_definition.jsx b/webapp/channels/src/components/admin_console/admin_definition.jsx
index e528ccc4e1..1801037c3f 100644
--- a/webapp/channels/src/components/admin_console/admin_definition.jsx
+++ b/webapp/channels/src/components/admin_console/admin_definition.jsx
@@ -2869,7 +2869,7 @@ const AdminDefinition = {
                         label: t('admin.customization.enableSVGsTitle'),
                         label_default: 'Enable SVGs:',
                         help_text: t('admin.customization.enableSVGsDesc'),
-                        help_text_default: 'Enable previews for SVG file attachments and allow them to appear in messages.',
+                        help_text_default: 'Enable previews for SVG file attachments and allow them to appear in messages.\n\nEnabling SVGs is not recommended in environments where not all users are trusted.',
                         isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.SITE.POSTS)),
                     },
                     {
@@ -2878,7 +2878,7 @@ const AdminDefinition = {
                         label: t('admin.customization.enableLatexTitle'),
                         label_default: 'Enable Latex Rendering:',
                         help_text: t('admin.customization.enableLatexDesc'),
-                        help_text_default: 'Enable rendering of Latex in code blocks. If false, Latex code will be highlighted only.',
+                        help_text_default: 'Enable rendering of Latex in code blocks. If false, Latex code will be highlighted only.\n\nEnabling Latex is not recommended in environments where not all users are trusted.',
                         isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.SITE.POSTS)),
                     },
                     {
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index a94109ae80..804769ce3b 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -661,7 +661,7 @@
   "admin.customization.enableGifPickerTitle": "Enable GIF Picker:",
   "admin.customization.enableInlineLatexDesc": "Enable rendering of inline Latex code. If false, Latex can only be rendered in a code block using syntax highlighting. Please review our <link>documentation</link> for details about text formatting.",
   "admin.customization.enableInlineLatexTitle": "Enable Inline Latex Rendering:",
-  "admin.customization.enableLatexDesc": "Enable rendering of Latex in code blocks. If false, Latex code will be highlighted only.",
+  "admin.customization.enableLatexDesc": "Enable rendering of Latex in code blocks. If false, Latex code will be highlighted only.\n\nEnabling Latex is not recommended in environments where not all users are trusted.",
   "admin.customization.enableLatexTitle": "Enable Latex Rendering:",
   "admin.customization.enableLinkPreviewsDesc": "Display a preview of website content, image links and YouTube links below the message when available. The server must be connected to the internet and have access through the firewall (if applicable) to the websites from which previews are expected. Users can disable these previews from Settings > Display > Website Link Previews.",
   "admin.customization.enableLinkPreviewsTitle": "Enable website link previews:",
@@ -669,7 +669,7 @@
   "admin.customization.enablePermalinkPreviewsTitle": "Enable message link previews:",
   "admin.customization.enablePublicSharedBoardsDesc": "This allows board editors to share boards that can be accessed by anyone with the link.",
   "admin.customization.enablePublicSharedBoardsTitle": "Enable Publicly-Shared Boards:",
-  "admin.customization.enableSVGsDesc": "Enable previews for SVG file attachments and allow them to appear in messages.",
+  "admin.customization.enableSVGsDesc": "Enable previews for SVG file attachments and allow them to appear in messages.\n\nEnabling SVGs is not recommended in environments where not all users are trusted.",
   "admin.customization.enableSVGsTitle": "Enable SVGs:",
   "admin.customization.gfycatApiKey": "Gfycat API Key:",
   "admin.customization.gfycatApiKeyDescription": "Request an API key at <link>https://developers.gfycat.com/signup/#</link>. Enter the client ID you receive via email to this field. When blank, uses the default API key provided by Gfycat.",

From 3c5fad563e466bd8c9741300e92a7a14877738e0 Mon Sep 17 00:00:00 2001
From: Colton Shaw <46071821+coltoneshaw@users.noreply.github.com>
Date: Fri, 14 Apr 2023 09:34:28 -0700
Subject: [PATCH 063/103] Workspace dashboard improvements (#22883)

Automatic Merge
---
 .../chips_list.test.tsx                       |   2 +-
 .../workspace-optimization/chips_list.tsx     |   2 +-
 .../workspace-optimization/dashboard.data.tsx | 625 +++++++-----------
 .../workspace-optimization/dashboard.tsx      | 192 +-----
 .../workspace-optimization/dashboard.type.ts  |  75 +++
 .../dashboard_checks/access.ts                |  66 ++
 .../dashboard_checks/config.ts                |  84 +++
 .../dashboard_checks/data_privacy.ts          |  70 ++
 .../dashboard_checks/easy_management.ts       | 129 ++++
 .../dashboard_checks/performance.ts           |  72 ++
 .../dashboard_checks/updates.ts               |  94 +++
 webapp/channels/src/i18n/en.json              |  12 +-
 12 files changed, 835 insertions(+), 588 deletions(-)
 create mode 100644 webapp/channels/src/components/admin_console/workspace-optimization/dashboard.type.ts
 create mode 100644 webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/access.ts
 create mode 100644 webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/config.ts
 create mode 100644 webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/data_privacy.ts
 create mode 100644 webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts
 create mode 100644 webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/performance.ts
 create mode 100644 webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/updates.ts

diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx
index 3953977204..514597a354 100644
--- a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx
@@ -6,7 +6,7 @@ import {shallow} from 'enzyme';
 
 import ChipsList, {ChipsInfoType} from 'components/admin_console/workspace-optimization/chips_list';
 
-import {ItemStatus} from './dashboard.data';
+import {ItemStatus} from './dashboard.type';
 
 describe('components/admin_console/workspace-optimization/chips_list', () => {
     const overallScoreChips: ChipsInfoType = {
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx
index 2dd06b5bc1..d9911f749b 100644
--- a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx
@@ -6,7 +6,7 @@ import {FormattedMessage} from 'react-intl';
 
 import Chip from 'components/common/chip/chip';
 
-import {ItemStatus} from './dashboard.data';
+import {ItemStatus} from './dashboard.type';
 
 import './dashboard.scss';
 
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx
index dd5ee9b565..93bfad13b8 100644
--- a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React from 'react';
+import React, {useEffect, useMemo, useState} from 'react';
 import {useIntl} from 'react-intl';
 import {useSelector} from 'react-redux';
 
@@ -14,56 +14,23 @@ import {
     AccountMultipleOutlineIcon,
 } from '@mattermost/compass-icons/components';
 
-import {getLicense} from 'mattermost-redux/selectors/entities/general';
+import {getLicense, getServerVersion} from 'mattermost-redux/selectors/entities/general';
 
 import {GlobalState} from '@mattermost/types/store';
 
-import {CloudLinks, ConsolePages, DocLinks} from 'utils/constants';
+import {ConsolePages} from 'utils/constants';
 import {daysToLicenseExpire, isEnterpriseOrE20License, getIsStarterLicense} from '../../../utils/license_utils';
 import useOpenSalesLink from 'components/common/hooks/useOpenSalesLink';
+import {AdminConfig} from '@mattermost/types/config';
+import {runConfigChecks} from './dashboard_checks/config';
+import {DataModel, ItemStatus, Options} from './dashboard.type';
+import {runAccessChecks} from './dashboard_checks/access';
+import {runDataPrivacyChecks} from './dashboard_checks/data_privacy';
+import {runPerformanceChecks} from './dashboard_checks/performance';
+import {runEaseOfUseChecks} from './dashboard_checks/easy_management';
+import {runUpdateChecks} from './dashboard_checks/updates';
 
-export type DataModel = {
-    [key: string]: {
-        title: string;
-        description: string;
-        descriptionOk: string;
-        items: ItemModel[];
-        icon: React.ReactNode;
-        hide?: boolean;
-    };
-}
-
-export enum ItemStatus {
-    NONE = 'none',
-    OK = 'ok',
-    INFO = 'info',
-    WARNING = 'warning',
-    ERROR = 'error',
-}
-
-export type ItemModel = {
-    id: string;
-    title: string;
-    description: string;
-    status: ItemStatus;
-    scoreImpact: number;
-    impactModifier: number;
-    configUrl?: string;
-    configText?: string;
-    telemetryAction?: string;
-    infoUrl?: string;
-    infoText?: string;
-}
-
-export type UpdatesParam = {
-    serverVersion: {
-        type: string;
-        status: ItemStatus;
-        description: string;
-    };
-}
-
-const impactModifiers: Record<ItemStatus, number> = {
+export const impactModifiers: Record<ItemStatus, number> = {
     [ItemStatus.NONE]: 1,
     [ItemStatus.OK]: 1,
     [ItemStatus.INFO]: 0.5,
@@ -71,11 +38,191 @@ const impactModifiers: Record<ItemStatus, number> = {
     [ItemStatus.ERROR]: 0,
 };
 
-const useMetricsData = () => {
+const getUpdatesData = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => ({
+    title: formatMessage({
+        id: 'admin.reporting.workspace_optimization.updates.title',
+        defaultMessage: 'Server updates',
+    }),
+    description: formatMessage({
+        id: 'admin.reporting.workspace_optimization.updates.description',
+        defaultMessage: 'An update is available.',
+    }),
+    descriptionOk: formatMessage({
+        id: 'admin.reporting.workspace_optimization.updates.descriptionOk',
+        defaultMessage: 'Your workspace is completely up to date!',
+    }),
+    icon: (
+        <div className='icon'>
+            <ArrowUpBoldCircleOutlineIcon
+                size={20}
+                color={'var(--sys-center-channel-color)'}
+            />
+        </div>
+    ),
+    items: await runUpdateChecks(config, formatMessage, options),
+});
+
+const getConfigurationData = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => ({
+    title: formatMessage({
+        id: 'admin.reporting.workspace_optimization.configuration.title',
+        defaultMessage: 'Configuration',
+    }),
+    description: formatMessage({
+        id: 'admin.reporting.workspace_optimization.configuration.description',
+        defaultMessage: 'You have configuration issues to resolve',
+    }),
+    hide: options.isCloud,
+    descriptionOk: formatMessage({
+        id: 'admin.reporting.workspace_optimization.configuration.descriptionOk',
+        defaultMessage: 'You\'ve successfully configured SSL and Session Lengths!',
+    }),
+    icon: (
+        <div className='icon'>
+            <TuneIcon
+                size={20}
+                color={'var(--sys-center-channel-color)'}
+            />
+        </div>
+    ),
+    items: await runConfigChecks(config, formatMessage, options),
+});
+
+const getAccessData = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => ({
+    title: formatMessage({
+        id: 'admin.reporting.workspace_optimization.access.title',
+        defaultMessage: 'Workspace access',
+    }),
+    description: formatMessage({
+        id: 'admin.reporting.workspace_optimization.access.description',
+        defaultMessage: 'Web server configuration may be affecting access to your Mattermost workspace.',
+    }),
+    hide: options.isCloud,
+    descriptionOk: formatMessage({
+        id: 'admin.reporting.workspace_optimization.access.descriptionOk',
+        defaultMessage: 'Your web server configuration is passing a live URL test!',
+    }),
+    icon: (
+        <div className='icon'>
+            <ServerVariantIcon
+                size={20}
+                color={'var(--sys-center-channel-color)'}
+            />
+        </div>
+    ),
+    items: await runAccessChecks(config, formatMessage),
+});
+
+const getPerformanceData = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => ({
+    title: formatMessage({
+        id: 'admin.reporting.workspace_optimization.performance.title',
+        defaultMessage: 'Performance',
+    }),
+    description: formatMessage({
+        id: 'admin.reporting.workspace_optimization.performance.description',
+        defaultMessage: 'Your server would benefit from some performance tweaks.',
+    }),
+    hide: options.isCloud,
+    descriptionOk: formatMessage({
+        id: 'admin.reporting.workspace_optimization.performance.descriptionOk',
+        defaultMessage: 'Your search performance suits your workspace usage!',
+    }),
+    icon: (
+        <div className='icon'>
+            <ChartLineIcon
+                size={20}
+                color={'var(--sys-center-channel-color)'}
+            />
+        </div>
+    ),
+    items: await runPerformanceChecks(config, formatMessage, options),
+});
+
+const getDataPrivacyData = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => ({
+    title: formatMessage({
+        id: 'admin.reporting.workspace_optimization.data_privacy.title',
+        defaultMessage: 'Data privacy',
+    }),
+    description: formatMessage({
+        id: 'admin.reporting.workspace_optimization.data_privacy.description',
+        defaultMessage: 'Get better insight and control over your data.',
+    }),
+    descriptionOk: formatMessage({
+        id: 'admin.reporting.workspace_optimization.data_privacy.descriptionOk',
+        defaultMessage: 'You\'ve enabled data retention and compliance features!',
+    }),
+    icon: (
+        <div className='icon'>
+            <LockOutlineIcon
+                size={20}
+                color={'var(--sys-center-channel-color)'}
+            />
+        </div>
+    ),
+    items: await runDataPrivacyChecks(config, formatMessage, options),
+});
+
+const getEaseOfManagementData = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => ({
+    title: formatMessage({
+        id: 'admin.reporting.workspace_optimization.ease_of_management.title',
+        defaultMessage: 'Ease of management',
+    }),
+    description: formatMessage({
+        id: 'admin.reporting.workspace_optimization.ease_of_management.description',
+        defaultMessage: 'Make it easier to manage your Mattermost workspace.',
+    }),
+    descriptionOk: formatMessage({
+        id: 'admin.reporting.workspace_optimization.ease_of_management.descriptionOk',
+        defaultMessage: 'Your user authentication setup is appropriate based on your current usage!',
+    }),
+    icon: (
+        <div className='icon'>
+            <AccountMultipleOutlineIcon
+                size={20}
+                color={'var(--sys-center-channel-color)'}
+            />
+        </div>
+    ),
+    items: await runEaseOfUseChecks(config, formatMessage, options),
+});
+
+const useMetricsData = (
+    config: Partial<AdminConfig>,
+) => {
+    const [loading, setLoading] = useState(true);
+    const [data, setData] = useState<DataModel | undefined>(undefined);
+
     const {formatMessage} = useIntl();
     const prevTrialLicense = useSelector((state: GlobalState) => state.entities.admin.prevTrialLicense);
     const license = useSelector(getLicense);
 
+    // get the currently installed server version
+    const installedVersion = useSelector((state: GlobalState) => getServerVersion(state));
+    const analytics = useSelector((state: GlobalState) => state.entities.admin.analytics) as unknown as Options['analytics'];
+
     const canStartTrial = license?.IsLicensed !== 'true' && prevTrialLicense?.IsLicensed !== 'true';
     const daysUntilExpiration = daysToLicenseExpire(license) || -1;
 
@@ -87,358 +234,46 @@ const useMetricsData = () => {
 
     const [, contactSalesLink] = useOpenSalesLink();
 
-    const trialOrEnterpriseCtaConfig = {
+    const trialOrEnterpriseCtaConfig = useMemo(() => ({
         configUrl: canStartTrial ? ConsolePages.LICENSE : contactSalesLink,
         configText: canStartTrial ? formatMessage({id: 'admin.reporting.workspace_optimization.cta.startTrial', defaultMessage: 'Start trial'}) : formatMessage({id: 'admin.reporting.workspace_optimization.cta.upgradeLicense', defaultMessage: 'Contact sales'}),
+    }), [canStartTrial, contactSalesLink, formatMessage]);
+
+    const options: Options = useMemo(() => ({
+        isLicensed,
+        isEnterpriseLicense,
+        trialOrEnterpriseCtaConfig,
+        isStarterLicense,
+        isCloud,
+        analytics,
+        installedVersion,
+    }), [isLicensed, isEnterpriseLicense, trialOrEnterpriseCtaConfig, isStarterLicense, isCloud, analytics, installedVersion]);
+
+    useEffect(() => {
+        setLoading(true);
+        const refreshData = async () => {
+            const data = {
+                updates: await getUpdatesData(config, formatMessage, options),
+                configuration: await getConfigurationData(config, formatMessage, options),
+                access: await getAccessData(config, formatMessage, options),
+                performance: await getPerformanceData(config, formatMessage, options),
+                dataPrivacy: await getDataPrivacyData(config, formatMessage, options),
+                easyManagement: await getEaseOfManagementData(config, formatMessage, options),
+            };
+
+            return data;
+        };
+
+        refreshData().then((data) => {
+            setData(data);
+            setLoading(false);
+        });
+    }, [config, formatMessage, options]);
+
+    return {
+        data,
+        loading,
     };
-
-    const getUpdatesData = (data: UpdatesParam) => ({
-        title: formatMessage({
-            id: 'admin.reporting.workspace_optimization.updates.title',
-            defaultMessage: 'Server updates',
-        }),
-        description: formatMessage({
-            id: 'admin.reporting.workspace_optimization.updates.description',
-            defaultMessage: 'An update is available.',
-        }),
-        descriptionOk: formatMessage({
-            id: 'admin.reporting.workspace_optimization.updates.descriptionOk',
-            defaultMessage: 'Your workspace is completely up to date!',
-        }),
-        icon: (
-            <div className='icon'>
-                <ArrowUpBoldCircleOutlineIcon
-                    size={20}
-                    color={'var(--sys-center-channel-color)'}
-                />
-            </div>
-        ),
-        items: [
-            {
-                id: 'server_version',
-                title: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.updates.server_version.status.title',
-                    defaultMessage: '{type} version update available.',
-                }, {type: data.serverVersion.type}),
-                description: data.serverVersion.description,
-                configUrl: CloudLinks.DOWNLOAD_UPDATE,
-                configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.downloadUpdate', defaultMessage: 'Download update'}),
-                infoUrl: DocLinks.UPGRADE_SERVER,
-                infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
-                telemetryAction: 'server-version',
-                status: data.serverVersion.status,
-                scoreImpact: 15,
-                impactModifier: impactModifiers[data.serverVersion.status],
-            },
-        ],
-    });
-
-    type ConfigurationParam = {
-        ssl: {
-            status: ItemStatus;
-        };
-        sessionLength: {
-            status: ItemStatus;
-        };
-    }
-
-    const getConfigurationData = (data: ConfigurationParam) => ({
-        title: formatMessage({
-            id: 'admin.reporting.workspace_optimization.configuration.title',
-            defaultMessage: 'Configuration',
-        }),
-        description: formatMessage({
-            id: 'admin.reporting.workspace_optimization.configuration.description',
-            defaultMessage: 'You have configuration issues to resolve',
-        }),
-        hide: isCloud,
-        descriptionOk: formatMessage({
-            id: 'admin.reporting.workspace_optimization.configuration.descriptionOk',
-            defaultMessage: 'You\'ve successfully configured SSL and Session Lengths!',
-        }),
-        icon: (
-            <div className='icon'>
-                <TuneIcon
-                    size={20}
-                    color={'var(--sys-center-channel-color)'}
-                />
-            </div>
-        ),
-        items: [
-            {
-                id: 'ssl',
-                title: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.configuration.ssl.title',
-                    defaultMessage: 'Configure SSL to make your server more secure',
-                }),
-                description: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.configuration.ssl.description',
-                    defaultMessage: 'We strongly recommend securing your Mattermost workspace by configuring SSL in production environments.',
-                }),
-                infoUrl: DocLinks.SSL_CERTIFICATE,
-                infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
-                telemetryAction: 'ssl',
-                status: data.ssl.status,
-                scoreImpact: 25,
-                impactModifier: impactModifiers[data.ssl.status],
-            },
-            {
-                id: 'session-length',
-                title: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.configuration.session_length.title',
-                    defaultMessage: 'Session lengths is set to default',
-                }),
-                description: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.configuration.session_length.description',
-                    defaultMessage: 'Your session length is set to the default of 30 days. A longer session length provides convenience, and a shorter session provides tighter security. We recommend adjusting this based on your organization\'s security policies.',
-                }),
-                configUrl: ConsolePages.SESSION_LENGTHS,
-                configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureSessionLength', defaultMessage: 'Configure session length'}),
-                infoUrl: DocLinks.SESSION_LENGTHS,
-                infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
-                telemetryAction: 'session-length',
-                status: data.sessionLength.status,
-                scoreImpact: 8,
-                impactModifier: impactModifiers[data.sessionLength.status],
-            },
-        ],
-    });
-
-    type AccessParam = {
-        siteUrl: {
-            status: ItemStatus;
-        };
-    }
-
-    const getAccessData = (data: AccessParam) => ({
-        title: formatMessage({
-            id: 'admin.reporting.workspace_optimization.access.title',
-            defaultMessage: 'Workspace access',
-        }),
-        description: formatMessage({
-            id: 'admin.reporting.workspace_optimization.access.description',
-            defaultMessage: 'Web server configuration may be affecting access to your Mattermost workspace.',
-        }),
-        hide: isCloud,
-        descriptionOk: formatMessage({
-            id: 'admin.reporting.workspace_optimization.access.descriptionOk',
-            defaultMessage: 'Your web server configuration is passing a live URL test!',
-        }),
-        icon: (
-            <div className='icon'>
-                <ServerVariantIcon
-                    size={20}
-                    color={'var(--sys-center-channel-color)'}
-                />
-            </div>
-        ),
-        items: [
-            {
-                id: 'site-url',
-                title: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.access.site_url.title',
-                    defaultMessage: 'Misconfigured web server',
-                }),
-                description: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.access.site_url.description',
-                    defaultMessage: 'Your web server settings aren\'t passing a live URL test which means your workspace may not be accessible to users. We recommend updating your web server settings.',
-                }),
-                configUrl: ConsolePages.WEB_SERVER,
-                configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureWebServer', defaultMessage: 'Configure web server'}),
-                infoUrl: DocLinks.SITE_URL,
-                infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
-                telemetryAction: 'site-url',
-                status: data.siteUrl.status,
-                scoreImpact: 12,
-                impactModifier: impactModifiers[data.siteUrl.status],
-            },
-        ],
-    });
-
-    type PerformanceParam = {
-        search: {
-            status: ItemStatus;
-        };
-    }
-
-    const getPerformanceData = (data: PerformanceParam) => ({
-        title: formatMessage({
-            id: 'admin.reporting.workspace_optimization.performance.title',
-            defaultMessage: 'Performance',
-        }),
-        description: formatMessage({
-            id: 'admin.reporting.workspace_optimization.performance.description',
-            defaultMessage: 'Your server would benefit from some performance tweaks.',
-        }),
-        hide: isCloud,
-        descriptionOk: formatMessage({
-            id: 'admin.reporting.workspace_optimization.performance.descriptionOk',
-            defaultMessage: 'Your search performance suits your workspace usage!',
-        }),
-        icon: (
-            <div className='icon'>
-                <ChartLineIcon
-                    size={20}
-                    color={'var(--sys-center-channel-color)'}
-                />
-            </div>
-        ),
-        items: [
-            {
-                id: 'search',
-                title: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.performance.search.title',
-                    defaultMessage: 'Search performance',
-                }),
-                description: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.performance.search.description',
-                    defaultMessage: 'Your server has reached over 500 users and 2 million posts which can result in slow search performance. We recommend enabling Elasticsearch for better performance.',
-                }),
-                ...(isLicensed && isEnterpriseLicense ? {
-                    configUrl: ConsolePages.ELASTICSEARCH,
-                    configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureElasticsearch', defaultMessage: 'Try Elasticsearch'}),
-                } : trialOrEnterpriseCtaConfig),
-                infoUrl: DocLinks.ELASTICSEARCH,
-                infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
-                telemetryAction: 'search-optimization',
-                status: data.search.status,
-                scoreImpact: 20,
-                impactModifier: impactModifiers[data.search.status],
-            },
-        ],
-    });
-
-    type DataPrivacyParam = {
-        retention: {
-            status: ItemStatus;
-        };
-    }
-
-    // TBD
-    const getDataPrivacyData = (data: DataPrivacyParam) => ({
-        title: formatMessage({
-            id: 'admin.reporting.workspace_optimization.data_privacy.title',
-            defaultMessage: 'Data privacy',
-        }),
-        description: formatMessage({
-            id: 'admin.reporting.workspace_optimization.data_privacy.description',
-            defaultMessage: 'Get better insight and control over your data.',
-        }),
-        descriptionOk: formatMessage({
-            id: 'admin.reporting.workspace_optimization.data_privacy.descriptionOk',
-            defaultMessage: 'You\'ve enabled data retention and compliance features!',
-        }),
-        icon: (
-            <div className='icon'>
-                <LockOutlineIcon
-                    size={20}
-                    color={'var(--sys-center-channel-color)'}
-                />
-            </div>
-        ),
-        items: [
-            {
-                id: 'data-retention',
-                title: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.data_privacy.retention.title',
-                    defaultMessage: 'Become more data aware',
-                }),
-                description: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.data_privacy.retention.description',
-                    defaultMessage: 'Organizations in highly regulated industries require more control and insight with their data. We recommend enabling Data Retention and Compliance features.',
-                }),
-                ...(isLicensed && isEnterpriseLicense ? {
-                    configUrl: ConsolePages.DATA_RETENTION,
-                    configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureDataRetention', defaultMessage: 'Try data retention'}),
-                } : trialOrEnterpriseCtaConfig),
-                infoUrl: DocLinks.DATA_RETENTION_POLICY,
-                infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
-                telemetryAction: 'data-retention',
-                status: data.retention.status,
-                scoreImpact: 16,
-                impactModifier: impactModifiers[data.retention.status],
-            },
-        ],
-    });
-
-    type EaseOfManagementParam = {
-        ldap: {
-            status: ItemStatus;
-        };
-        guestAccounts?: {
-            status: ItemStatus;
-        };
-    }
-
-    // TBD
-    const getEaseOfManagementData = (data: EaseOfManagementParam) => ({
-        title: formatMessage({
-            id: 'admin.reporting.workspace_optimization.ease_of_management.title',
-            defaultMessage: 'Ease of management',
-        }),
-        description: formatMessage({
-            id: 'admin.reporting.workspace_optimization.ease_of_management.description',
-            defaultMessage: 'Make it easier to manage your Mattermost workspace.',
-        }),
-        descriptionOk: formatMessage({
-            id: 'admin.reporting.workspace_optimization.ease_of_management.descriptionOk',
-            defaultMessage: 'Your user authentication setup is appropriate based on your current usage!',
-        }),
-        icon: (
-            <div className='icon'>
-                <AccountMultipleOutlineIcon
-                    size={20}
-                    color={'var(--sys-center-channel-color)'}
-                />
-            </div>
-        ),
-        items: [
-            {
-                id: 'ad-ldap',
-                title: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.title',
-                    defaultMessage: 'AD/LDAP integration recommended',
-                }),
-                description: formatMessage({
-                    id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.description',
-                    defaultMessage: 'You\'ve reached over 100 users! We recommend setting up AD/LDAP user authentication for easier onboarding as well as automated deactivations and role assignments.',
-                }),
-                ...(isLicensed && !isStarterLicense ? {
-                    configUrl: ConsolePages.AD_LDAP,
-                    configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureLDAP', defaultMessage: 'Try AD/LDAP'}),
-                } : trialOrEnterpriseCtaConfig),
-                infoUrl: DocLinks.AD_LDAP,
-                infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
-                telemetryAction: 'ad-ldap',
-                status: data.ldap.status,
-                scoreImpact: 22,
-                impactModifier: impactModifiers[data.ldap.status],
-            },
-
-            // commented out for now.
-            // @see discussion here: https://github.com/mattermost/mattermost-webapp/pull/9822#discussion_r806879385
-            // {
-            //     id: 'guest-accounts',
-            //     title: formatMessage({
-            //         id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.title',
-            //         defaultMessage: 'Guest Accounts recommended',
-            //     }),
-            //     description: formatMessage({
-            //         id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.description',
-            //         defaultMessage: 'Several user accounts are using different domains than your Site URL. You can control user access to channels and teams with guest accounts. We recommend starting an Enterprise trial and enabling Guest Access.',
-            //     }),
-            //     ...trialOrEnterpriseCtaConfig,
-            //     infoUrl: 'https://docs.mattermost.com/onboard/guest-accounts.html',
-            //     infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
-            //     telemetryAction: 'guest-accounts',
-            //     status: data.guestAccounts.status,
-            //     scoreImpact: 6,
-            //     impactModifier: impactModifiers[data.guestAccounts.status],
-            // },
-        ],
-    });
-
-    return {getAccessData, getConfigurationData, getUpdatesData, getPerformanceData, getDataPrivacyData, getEaseOfManagementData, isLicensed, isEnterpriseLicense};
 };
 
 export default useMetricsData;
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx
index 6fcbd8b6f3..2409601512 100644
--- a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx
@@ -4,17 +4,11 @@
 import {CheckIcon} from '@mattermost/compass-icons/components';
 import classNames from 'classnames';
 
-import React, {useEffect, useState} from 'react';
-import {useIntl} from 'react-intl';
-import {useSelector} from 'react-redux';
+import React from 'react';
 import styled from 'styled-components';
 
-import {GlobalState} from '@mattermost/types/store';
-import {getServerVersion} from 'mattermost-redux/selectors/entities/general';
-import {Client4} from 'mattermost-redux/client';
 import Accordion, {AccordionItemType} from 'components/common/accordion/accordion';
 
-import {elasticsearchTest, ldapTest, testSiteURL} from '../../../actions/admin_actions';
 import LoadingScreen from '../../loading_screen';
 import FormattedAdminHeader from '../../widgets/admin_console/formatted_admin_header';
 import {Props} from '../admin_console';
@@ -22,10 +16,11 @@ import {Props} from '../admin_console';
 import ChipsList, {ChipsInfoType} from './chips_list';
 import CtaButtons from './cta_buttons';
 
-import useMetricsData, {DataModel, ItemStatus, UpdatesParam} from './dashboard.data';
+import useMetricsData from './dashboard.data';
 
 import './dashboard.scss';
 import OverallScore from './overall-score';
+import {ItemStatus} from './dashboard.type';
 
 const AccordionItem = styled.div`
     padding: 12px;
@@ -49,180 +44,7 @@ const successIcon = (
 );
 
 const WorkspaceOptimizationDashboard = (props: Props) => {
-    const [loading, setLoading] = useState(true);
-    const [versionData, setVersionData] = useState<UpdatesParam['serverVersion']>({type: '', description: '', status: ItemStatus.NONE});
-
-    // const [guestAccountStatus, setGuestAccountStatus] = useState<ItemStatus>('none');
-    const [liveUrlStatus, setLiveUrlStatus] = useState<ItemStatus>(ItemStatus.ERROR);
-    const [elastisearchStatus, setElasticsearchStatus] = useState<ItemStatus>(ItemStatus.INFO);
-    const [ldapStatus, setLdapStatus] = useState<ItemStatus>(ItemStatus.INFO);
-    const [dataRetentionStatus, setDataRetentionStatus] = useState<ItemStatus>(ItemStatus.INFO);
-    const {formatMessage} = useIntl();
-    const {getAccessData, getConfigurationData, getUpdatesData, getPerformanceData, getDataPrivacyData, getEaseOfManagementData, isLicensed, isEnterpriseLicense} = useMetricsData();
-
-    // get the currently installed server version
-    const installedVersion = useSelector((state: GlobalState) => getServerVersion(state));
-    const analytics = useSelector((state: GlobalState) => state.entities.admin.analytics);
-    const {TOTAL_USERS: totalUsers, TOTAL_POSTS: totalPosts} = analytics!;
-
-    // gather locally available data
-    const {
-        ServiceSettings,
-        DataRetentionSettings,
-        ElasticsearchSettings,
-        LdapSettings,
-
-        // TeamSettings,
-        // GuestAccountsSettings,
-    } = props.config;
-    const {location} = document;
-
-    const sessionLengthWebInHours = ServiceSettings?.SessionLengthWebInHours || -1;
-
-    const testURL = () => {
-        if (!ServiceSettings?.SiteURL) {
-            return Promise.resolve();
-        }
-
-        const onSuccess = ({status}: any) => setLiveUrlStatus(status === 'OK' ? ItemStatus.OK : ItemStatus.ERROR);
-        const onError = () => setLiveUrlStatus(ItemStatus.ERROR);
-        return testSiteURL(onSuccess, onError, ServiceSettings?.SiteURL);
-    };
-
-    const testDataRetention = async () => {
-        if (!isLicensed || !isEnterpriseLicense) {
-            return Promise.resolve();
-        }
-
-        if (DataRetentionSettings?.EnableMessageDeletion || DataRetentionSettings?.EnableFileDeletion) {
-            setDataRetentionStatus(ItemStatus.OK);
-            return Promise.resolve();
-        }
-
-        const result = await fetch(`${Client4.getBaseRoute()}/data_retention/policies?page=0&per_page=0`).then((result) => result.json());
-
-        setDataRetentionStatus(result.total_count > 0 ? ItemStatus.OK : ItemStatus.INFO);
-        return Promise.resolve();
-    };
-
-    const fetchVersion = async () => {
-        const result = await fetch(`${Client4.getBaseRoute()}/latest_version`).then((result) => result.json());
-
-        if (result.tag_name) {
-            const sanitizedVersion = result.tag_name.startsWith('v') ? result.tag_name.slice(1) : result.tag_name;
-            const newVersionParts = sanitizedVersion.split('.');
-            const installedVersionParts = installedVersion.split('.').slice(0, 3);
-
-            // quick general check if a newer version is available
-            let type = '';
-            let status: ItemStatus = ItemStatus.OK;
-
-            if (newVersionParts.join('') > installedVersionParts.join('')) {
-                // get correct values to be inserted into the accordion item
-                switch (true) {
-                case newVersionParts[0] > installedVersionParts[0]:
-                    type = formatMessage({
-                        id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.major',
-                        defaultMessage: 'Major',
-                    });
-                    status = ItemStatus.ERROR;
-                    break;
-                case newVersionParts[1] > installedVersionParts[1]:
-                    type = formatMessage({
-                        id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.minor',
-                        defaultMessage: 'Minor',
-                    });
-                    status = ItemStatus.WARNING;
-                    break;
-                case newVersionParts[2] > installedVersionParts[2]:
-                    type = formatMessage({
-                        id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.patch',
-                        defaultMessage: 'Patch',
-                    });
-                    status = ItemStatus.INFO;
-                    break;
-                }
-            }
-
-            setVersionData({type, description: result.body, status});
-        }
-    };
-
-    const testElasticsearch = () => {
-        if (!isLicensed || !isEnterpriseLicense || !(ElasticsearchSettings?.EnableIndexing && ElasticsearchSettings?.EnableSearching)) {
-            return Promise.resolve();
-        }
-
-        const onSuccess = ({status}: any) => setElasticsearchStatus(status === 'OK' ? ItemStatus.OK : ItemStatus.INFO);
-        const onError = () => setElasticsearchStatus(ItemStatus.INFO);
-
-        return elasticsearchTest(props.config, onSuccess, onError);
-    };
-
-    const testLdap = () => {
-        if (!isLicensed || !LdapSettings?.Enable) {
-            return Promise.resolve();
-        }
-
-        const onSuccess = ({status}: any) => setLdapStatus(status === 'OK' ? ItemStatus.OK : ItemStatus.INFO);
-        const onError = () => setLdapStatus(ItemStatus.INFO);
-
-        return ldapTest(onSuccess, onError);
-    };
-
-    // commented out for now.
-    // @see discussion here: https://github.com/mattermost/mattermost-webapp/pull/9822#discussion_r806879385
-    // const fetchGuestAccounts = async () => {
-    //     if (TeamSettings?.EnableOpenServer && GuestAccountsSettings?.Enable) {
-    //         let usersArray = await fetch(`${Client4.getBaseRoute()}/users/invalid_emails`).then((result) => result.json());
-    //
-    //         // this setting is just a string with a list of domains, or an empty string
-    //         if (GuestAccountsSettings?.RestrictCreationToDomains) {
-    //             const domainList = GuestAccountsSettings?.RestrictCreationToDomains;
-    //             usersArray = usersArray.filter(({email}: Record<string, unknown>) => domainList.includes((email as string).split('@')[1]));
-    //         }
-    //
-    //         // if guest accounts make up more than 5% of the user base show the info accordion
-    //         if (usersArray.length > (totalUsers as number * 0.05)) {
-    //             setGuestAccountStatus(ItemStatus.INFO);
-    //             return;
-    //         }
-    //     }
-    //
-    //     setGuestAccountStatus(ItemStatus.OK);
-    // };
-
-    useEffect(() => {
-        const promises = [];
-        promises.push(testURL());
-        promises.push(testLdap());
-        promises.push(fetchVersion());
-        promises.push(testElasticsearch());
-        promises.push(testDataRetention());
-
-        // promises.push(fetchGuestAccounts());
-        Promise.all(promises).then(() => setLoading(false));
-    }, [props.config, isLicensed, isEnterpriseLicense]);
-
-    const data: DataModel = {
-        updates: getUpdatesData({serverVersion: versionData}),
-        configuration: getConfigurationData({
-            ssl: {status: location.protocol === 'https:' ? ItemStatus.OK : ItemStatus.ERROR},
-            sessionLength: {status: sessionLengthWebInHours === 720 ? ItemStatus.INFO : ItemStatus.OK},
-        }),
-        access: getAccessData({siteUrl: {status: liveUrlStatus}}),
-        performance: getPerformanceData({
-            search: {
-                status: totalPosts < 2_000_000 && totalUsers < 500 ? ItemStatus.OK : elastisearchStatus,
-            },
-        }),
-        dataPrivacy: getDataPrivacyData({retention: {status: dataRetentionStatus}}),
-        easyManagement: getEaseOfManagementData({
-            ldap: {status: totalUsers < 100 ? ItemStatus.OK : ldapStatus},
-
-            // guestAccounts: {status: guestAccountStatus},
-        }),
-    };
+    const {data, loading} = useMetricsData(props.config);
 
     const overallScoreChips: ChipsInfoType = {
         [ItemStatus.INFO]: 0,
@@ -236,7 +58,7 @@ const WorkspaceOptimizationDashboard = (props: Props) => {
     };
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const accData: AccordionItemType[] = Object.entries(data).filter(([_, y]) => !y.hide).map(([accordionKey, accordionData]) => {
+    const accordionItemsData: AccordionItemType[] | undefined = data && Object.entries(data).filter(([_, y]) => !y.hide).map(([accordionKey, accordionData]) => {
         const accordionDataChips: ChipsInfoType = {
             [ItemStatus.INFO]: 0,
             [ItemStatus.WARNING]: 0,
@@ -297,7 +119,7 @@ const WorkspaceOptimizationDashboard = (props: Props) => {
         };
     });
 
-    return loading ? <LoadingScreen/> : (
+    return loading || !accordionItemsData ? <LoadingScreen/> : (
         <div className='WorkspaceOptimizationDashboard wrapper--fixed'>
             <FormattedAdminHeader
                 id={'admin.reporting.workspace_optimization.title'}
@@ -314,7 +136,7 @@ const WorkspaceOptimizationDashboard = (props: Props) => {
                     chartValue={Math.floor((overallScore.current / overallScore.max) * 100)}
                 />
                 <Accordion
-                    accordionItemsData={accData}
+                    accordionItemsData={accordionItemsData}
                     expandMultiple={true}
                 />
             </div>
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.type.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.type.ts
new file mode 100644
index 0000000000..b87c9d1bdd
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.type.ts
@@ -0,0 +1,75 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export type DataModel = {
+    [key: string]: {
+        title: string;
+        description: string;
+        descriptionOk: string;
+        items: ItemModel[];
+        icon: React.ReactNode;
+        hide?: boolean;
+    };
+}
+
+export enum ItemStatus {
+
+    /** Return NONE if it's not relevant, not configured, or not an option */
+    NONE = 'none',
+
+    /** Return OK if all checks for this have passed */
+    OK = 'ok',
+
+    /** Return info if it might not be relevant to them, but they could utilize it */
+    INFO = 'info',
+    WARNING = 'warning',
+    ERROR = 'error',
+}
+
+export type ItemModel = {
+    id: string;
+    title: string;
+    description: string;
+    status: ItemStatus;
+    scoreImpact: number;
+    impactModifier: number;
+    configUrl?: string;
+    configText?: string;
+    telemetryAction?: string;
+    infoUrl?: string;
+    infoText?: string;
+}
+
+export type UpdatesParam = {
+    serverVersion: {
+        type: string;
+        status: ItemStatus;
+        description: string;
+    };
+}
+
+type Analytics = {
+    DAILY_ACTIVE_USERS: number;
+    MONTHLY_ACTIVE_USERS: number;
+    TOTAL_INACTIVE_USERS: number;
+    TOTAL_MASTER_DB_CONNECTIONS: number;
+    TOTAL_POSTS: number;
+    TOTAL_PRIVATE_GROUPS: number;
+    TOTAL_PUBLIC_CHANNELS: number;
+    TOTAL_READ_DB_CONNECTIONS: number;
+    TOTAL_TEAMS: number;
+    TOTAL_USERS: number;
+    TOTAL_WEBSOCKET_CONNECTIONS: number;
+}
+export type Options = {
+    isLicensed: boolean;
+    isEnterpriseLicense: boolean;
+    trialOrEnterpriseCtaConfig: {
+        configUrl: string;
+        configText: string;
+    };
+    isCloud: boolean;
+    isStarterLicense: boolean;
+    analytics: Analytics | undefined;
+    installedVersion: string;
+};
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/access.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/access.ts
new file mode 100644
index 0000000000..e8f37024bb
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/access.ts
@@ -0,0 +1,66 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {useIntl} from 'react-intl';
+import {ItemModel, ItemStatus} from '../dashboard.type';
+import {ConsolePages, DocLinks} from 'utils/constants';
+import {impactModifiers} from '../dashboard.data';
+import {AdminConfig} from '@mattermost/types/config';
+import {testSiteURL} from 'actions/admin_actions';
+
+/**
+ *
+ * @description Checking to see if the siteURL is configured correctly by running it through the same "check siteURL" button that exists on the webserver page.
+ */
+const siteURLCheck = async (config: Partial<AdminConfig>, formatMessage: ReturnType<typeof useIntl>['formatMessage']): Promise<ItemModel> => {
+    let status = ItemStatus.OK;
+    const testURL = async () => {
+        if (!config.ServiceSettings?.SiteURL) {
+            status = ItemStatus.ERROR;
+        }
+
+        const onSuccess = ({status: s}: any) => {
+            if (s === 'OK') {
+                status = ItemStatus.OK;
+            }
+        };
+        const onError = () => {
+            status = ItemStatus.ERROR;
+        };
+        await testSiteURL(onSuccess, onError, config.ServiceSettings?.SiteURL);
+    };
+
+    await testURL();
+    return {
+        id: 'site-url',
+        title: formatMessage({
+            id: 'admin.reporting.workspace_optimization.access.site_url.title',
+            defaultMessage: 'Misconfigured web server',
+        }),
+        description: formatMessage({
+            id: 'admin.reporting.workspace_optimization.access.site_url.description',
+            defaultMessage: 'Your web server settings aren\'t passing a live URL test which means your workspace may not be accessible to users. We recommend updating your web server settings.',
+        }),
+        configUrl: ConsolePages.WEB_SERVER,
+        configText: formatMessage({id: 'admin.reporting.workspace_optimization.access.site_url.cta', defaultMessage: 'Configure web server'}),
+        infoUrl: DocLinks.SITE_URL,
+        infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+        telemetryAction: 'site-url',
+        status,
+        scoreImpact: 12,
+        impactModifier: impactModifiers[status],
+    };
+};
+
+const checks = [
+    siteURLCheck,
+];
+
+export const runAccessChecks = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+) => {
+    const results = await Promise.all(checks.map((check) => check(config, formatMessage)));
+    return results;
+};
+
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/config.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/config.ts
new file mode 100644
index 0000000000..3cc59e7939
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/config.ts
@@ -0,0 +1,84 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
+import {AdminConfig} from '@mattermost/types/config';
+import {useIntl} from 'react-intl';
+import {ConsolePages, DocLinks} from 'utils/constants';
+import {ItemModel, ItemStatus, Options} from '../dashboard.type';
+import {impactModifiers} from '../dashboard.data';
+
+/**
+ *
+ * @description This checks to see if the user's active session is done over https. This does not check if the server is configured to use https.
+ */
+const ssl = (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+): ItemModel => {
+    const status = document.location.protocol === 'https:' ? ItemStatus.OK : ItemStatus.ERROR;
+
+    return {
+        id: 'ssl',
+        title: formatMessage({
+            id: 'admin.reporting.workspace_optimization.configuration.ssl.title',
+            defaultMessage: 'Configure SSL to make your server more secure',
+        }),
+        description: formatMessage({
+            id: 'admin.reporting.workspace_optimization.configuration.ssl.description',
+            defaultMessage: 'We strongly recommend securing your Mattermost workspace by configuring SSL in production environments.',
+        }),
+        infoUrl: DocLinks.SSL_CERTIFICATE,
+        infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+        telemetryAction: 'ssl',
+        status,
+        scoreImpact: 25,
+        impactModifier: impactModifiers[status],
+    };
+};
+
+/**
+ *
+ * @description This checks to see if the user has adjusted the default session lengths to something other than 720 hours.
+ */
+const sessionLength = (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+): ItemModel => {
+    const status = config.ServiceSettings?.SessionLengthMobileInHours === 720 ? ItemStatus.INFO : ItemStatus.OK;
+    return {
+        id: 'session-length',
+        title: formatMessage({
+            id: 'admin.reporting.workspace_optimization.configuration.session_length.title',
+            defaultMessage: 'Session lengths is set to default',
+        }),
+        description: formatMessage({
+            id: 'admin.reporting.workspace_optimization.configuration.session_length.description',
+            defaultMessage: 'Your session length is set to the default of 30 days. A longer session length provides convenience, and a shorter session provides tighter security. We recommend adjusting this based on your organization\'s security policies.',
+        }),
+        configUrl: ConsolePages.SESSION_LENGTHS,
+        configText: formatMessage({id: 'admin.reporting.workspace_optimization.configuration.session_length.cta', defaultMessage: 'Configure session length'}),
+        infoUrl: DocLinks.SESSION_LENGTHS,
+        infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+        telemetryAction: 'session-length',
+        status,
+        scoreImpact: 8,
+        impactModifier: impactModifiers[status],
+    };
+};
+
+export const runConfigChecks = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => {
+    const checks = [
+        ssl,
+        sessionLength,
+    ];
+    const results = await Promise.all(checks.map((check) => check(config, formatMessage, options)));
+    return results;
+};
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/data_privacy.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/data_privacy.ts
new file mode 100644
index 0000000000..049f90015c
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/data_privacy.ts
@@ -0,0 +1,70 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {useIntl} from 'react-intl';
+import {impactModifiers} from '../dashboard.data';
+import {ConsolePages, DocLinks} from 'utils/constants';
+import {Client4} from 'mattermost-redux/client';
+import {ItemStatus, Options} from '../dashboard.type';
+import {AdminConfig} from '@mattermost/types/config';
+
+/**
+ *
+ * @description Checks if they they have a global policy deletion enabled, or if a custom policy has been created.
+ */
+const dataRetentionCheck = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => {
+    const testDataRetention = async (
+        config: Partial<AdminConfig>,
+        options: Options,
+    ) => {
+        if (!options.isLicensed || !options.isEnterpriseLicense) {
+            return ItemStatus.INFO;
+        }
+
+        if (config.DataRetentionSettings?.EnableMessageDeletion || config.DataRetentionSettings?.EnableFileDeletion) {
+            return ItemStatus.OK;
+        }
+
+        const policyCount: {total_count: number} = await fetch(`${Client4.getBaseRoute()}/data_retention/policies_count`).then((result) => result.json());
+        return policyCount.total_count > 0 ? ItemStatus.OK : ItemStatus.INFO;
+    };
+
+    const status = await testDataRetention(config, options);
+    return {
+        id: 'data-retention',
+        title: formatMessage({
+            id: 'admin.reporting.workspace_optimization.data_privacy.retention.title',
+            defaultMessage: 'Become more data aware',
+        }),
+        description: formatMessage({
+            id: 'admin.reporting.workspace_optimization.data_privacy.retention.description',
+            defaultMessage: 'Organizations in highly regulated industries require more control and insight with their data. We recommend enabling Data Retention and Compliance features.',
+        }),
+        ...(options.isLicensed && options.isEnterpriseLicense ? {
+            configUrl: ConsolePages.DATA_RETENTION,
+            configText: formatMessage({id: 'admin.reporting.workspace_optimization.data_privacy.retention.cta', defaultMessage: 'Try data retention'}),
+        } : options.trialOrEnterpriseCtaConfig),
+        infoUrl: DocLinks.DATA_RETENTION_POLICY,
+        infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+        telemetryAction: 'data-retention',
+        status,
+        scoreImpact: 16,
+        impactModifier: impactModifiers[status],
+    };
+};
+
+export const runDataPrivacyChecks = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => {
+    const checks = [
+        dataRetentionCheck,
+    ];
+    const results = await Promise.all(checks.map((check) => check(config, formatMessage, options)));
+    return results;
+};
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts
new file mode 100644
index 0000000000..1a959918ad
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts
@@ -0,0 +1,129 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {AdminConfig} from '@mattermost/types/config';
+import {useIntl} from 'react-intl';
+import {ItemModel, ItemStatus, Options} from '../dashboard.type';
+import {ConsolePages, DocLinks} from 'utils/constants';
+import {impactModifiers} from '../dashboard.data';
+
+// import {Client4} from 'mattermost-redux/client';
+// import {AnalyticsRow} from '@mattermost/types/admin';
+import {ldapTest} from 'actions/admin_actions';
+
+const usesLDAP = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+): Promise<ItemModel> => {
+    const testLdap = async (
+        config: Partial<AdminConfig>,
+        options: Options,
+    ): Promise<ItemStatus> => {
+        let check = ItemStatus.INFO;
+
+        if (!options.isLicensed || !config.LdapSettings?.Enable) {
+            return check;
+        }
+
+        const onSuccess = ({status}: any) => {
+            if (status === 'OK') {
+                check = ItemStatus.OK;
+            }
+        };
+
+        await ldapTest(onSuccess);
+
+        return check;
+    };
+
+    // something feels flawed in this check.
+    const status = options.analytics?.TOTAL_USERS as number > 100 ? await testLdap(config, options) : ItemStatus.OK;
+
+    return {
+        id: 'ad-ldap',
+        title: formatMessage({
+            id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.title',
+            defaultMessage: 'AD/LDAP integration recommended',
+        }),
+        description: formatMessage({
+            id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.description',
+            defaultMessage: 'You\'ve reached over 100 users! We recommend setting up AD/LDAP user authentication for easier onboarding as well as automated deactivations and role assignments.',
+        }),
+        ...(options.isLicensed && !options.isStarterLicense ? {
+            configUrl: ConsolePages.AD_LDAP,
+            configText: formatMessage({id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.cta', defaultMessage: 'Try AD/LDAP'}),
+        } : options.trialOrEnterpriseCtaConfig),
+        infoUrl: DocLinks.AD_LDAP,
+        infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+        telemetryAction: 'ad-ldap',
+        status,
+        scoreImpact: 22,
+        impactModifier: impactModifiers[status],
+    };
+};
+
+// // commented out for now.
+// // @see discussion here: https://github.com/mattermost/mattermost-webapp/pull/9822#discussion_r806879385
+// const fetchGuestAccounts = async (
+//     config: Partial<AdminConfig>,
+//     analytics: Record<string, number | AnalyticsRow[]> | undefined,
+// ) => {
+//     if (config.TeamSettings?.EnableOpenServer && config.GuestAccountsSettings?.Enable) {
+//         let usersArray = await fetch(`${Client4.getBaseRoute()}/users/invalid_emails`).then((result) => result.json());
+
+//         // this setting is just a string with a list of domains, or an empty string
+//         if (config.GuestAccountsSettings?.RestrictCreationToDomains) {
+//             const domainList = config.GuestAccountsSettings?.RestrictCreationToDomains;
+//             usersArray = usersArray.filter(({email}: Record<string, unknown>) => domainList.includes((email as string).split('@')[1]));
+//         }
+
+//         // if guest accounts make up more than 5% of the user base show the info accordion
+//         if (analytics && usersArray.length > (analytics.totalUsers as number * 0.05)) {
+//             return ItemStatus.INFO;
+//         }
+//     }
+
+//     return ItemStatus.OK;
+// };
+
+// const guestAccounts = async (
+//     config: Partial<AdminConfig>,
+//     formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+//     options: Options,
+// ): Promise<ItemModel> => {
+//     const status = await fetchGuestAccounts(config, options.analytics);
+//     return {
+//         id: 'guest-accounts',
+//         title: formatMessage({
+//             id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.title',
+//             defaultMessage: 'Guest Accounts recommended',
+//         }),
+//         description: formatMessage({
+//             id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.description',
+//             defaultMessage: 'Several user accounts are using different domains than your Site URL. You can control user access to channels and teams with guest accounts. We recommend starting an Enterprise trial and enabling Guest Access.',
+//         }),
+//         ...options.trialOrEnterpriseCtaConfig,
+//         infoUrl: 'https://docs.mattermost.com/onboard/guest-accounts.html',
+//         infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+//         telemetryAction: 'guest-accounts',
+//         status,
+//         scoreImpact: 6,
+//         impactModifier: impactModifiers[status],
+//     };
+// };
+
+export const runEaseOfUseChecks = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+): Promise<ItemModel[]> => {
+    const checks = [
+        usesLDAP,
+
+        // guestAccounts,
+    ];
+
+    const results = await Promise.all(checks.map((check) => check(config, formatMessage, options)));
+    return results;
+};
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/performance.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/performance.ts
new file mode 100644
index 0000000000..50d7f6f662
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/performance.ts
@@ -0,0 +1,72 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {AdminConfig} from '@mattermost/types/config';
+import {ItemModel, ItemStatus, Options} from '../dashboard.type';
+import {elasticsearchTest} from 'actions/admin_actions';
+import {useIntl} from 'react-intl';
+import {ConsolePages, DocLinks} from 'utils/constants';
+import {impactModifiers} from '../dashboard.data';
+
+const search = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+): Promise<ItemModel> => {
+    const testElasticsearch = async (
+        config: Partial<AdminConfig>,
+        options: Options,
+    ) => {
+        let check = ItemStatus.INFO;
+
+        if (!options.isLicensed || !options.isEnterpriseLicense || !(config.ElasticsearchSettings?.EnableIndexing && config.ElasticsearchSettings?.EnableSearching)) {
+            return check;
+        }
+
+        const onSuccess = ({status}: any) => {
+            if (status === 'OK') {
+                check = ItemStatus.OK;
+            }
+        };
+        await elasticsearchTest(config, onSuccess);
+        return check;
+    };
+
+    const totalPosts = options.analytics?.TOTAL_POSTS as number;
+    const totalUsers = options.analytics?.TOTAL_USERS as number;
+    const status = totalPosts < 2_000_000 && totalUsers < 500 ? ItemStatus.OK : await testElasticsearch(config, options);
+    return {
+        id: 'search',
+        title: formatMessage({
+            id: 'admin.reporting.workspace_optimization.performance.search.title',
+            defaultMessage: 'Search performance',
+        }),
+        description: formatMessage({
+            id: 'admin.reporting.workspace_optimization.performance.search.description',
+            defaultMessage: 'Your server has reached over 500 users and 2 million posts which can result in slow search performance. We recommend enabling Elasticsearch for better performance.',
+        }),
+        ...(options.isLicensed && options.isEnterpriseLicense ? {
+            configUrl: ConsolePages.ELASTICSEARCH,
+            configText: formatMessage({id: 'admin.reporting.workspace_optimization.search.cta', defaultMessage: 'Try Elasticsearch'}),
+        } : options.trialOrEnterpriseCtaConfig),
+        infoUrl: DocLinks.ELASTICSEARCH,
+        infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+        telemetryAction: 'search-optimization',
+        status,
+        scoreImpact: 20,
+        impactModifier: impactModifiers[status],
+    };
+};
+
+export const runPerformanceChecks = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => {
+    const checks = [
+        search,
+    ];
+
+    const results = await Promise.all(checks.map((check) => check(config, formatMessage, options)));
+    return results;
+};
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/updates.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/updates.ts
new file mode 100644
index 0000000000..438e358f6d
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/updates.ts
@@ -0,0 +1,94 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Client4} from 'mattermost-redux/client';
+import {ItemStatus, Options} from '../dashboard.type';
+import {useIntl} from 'react-intl';
+import {AdminConfig} from '@mattermost/types/config';
+import {CloudLinks, DocLinks} from 'utils/constants';
+import {impactModifiers} from '../dashboard.data';
+
+const testServerVersion = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => {
+    const fetchVersion = async (
+        installedVersion: string,
+        formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    ) => {
+        const result = await fetch(`${Client4.getBaseRoute()}/latest_version`).then((result) => result.json());
+
+        if (result.tag_name) {
+            const sanitizedVersion = result.tag_name.startsWith('v') ? result.tag_name.slice(1) : result.tag_name;
+            const newVersionParts = sanitizedVersion.split('.');
+            const installedVersionParts = installedVersion.split('.').slice(0, 3);
+
+            // quick general check if a newer version is available
+            let type = '';
+            let status: ItemStatus = ItemStatus.OK;
+
+            if (newVersionParts.join('') > installedVersionParts.join('')) {
+                // get correct values to be inserted into the accordion item
+                switch (true) {
+                case newVersionParts[0] > installedVersionParts[0]:
+                    type = formatMessage({
+                        id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.major',
+                        defaultMessage: 'Major',
+                    });
+                    status = ItemStatus.ERROR;
+                    break;
+                case newVersionParts[1] > installedVersionParts[1]:
+                    type = formatMessage({
+                        id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.minor',
+                        defaultMessage: 'Minor',
+                    });
+                    status = ItemStatus.WARNING;
+                    break;
+                case newVersionParts[2] > installedVersionParts[2]:
+                    type = formatMessage({
+                        id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.patch',
+                        defaultMessage: 'Patch',
+                    });
+                    status = ItemStatus.INFO;
+                    break;
+                }
+            }
+
+            return {type, description: result.body, status};
+        }
+
+        return {type: '', description: '', status: ItemStatus.OK};
+    };
+
+    const serverVersion = await fetchVersion(options.installedVersion, formatMessage);
+    return {
+        id: 'server_version',
+        title: formatMessage({
+            id: 'admin.reporting.workspace_optimization.updates.server_version.status.title',
+            defaultMessage: '{type} version update available.',
+        }, {type: serverVersion.type}),
+        description: serverVersion.description,
+        configUrl: CloudLinks.DOWNLOAD_UPDATE,
+        configText: formatMessage({id: 'admin.reporting.workspace_optimization.updates.server_version.cta', defaultMessage: 'Download update'}),
+        infoUrl: DocLinks.UPGRADE_SERVER,
+        infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+        telemetryAction: 'server-version',
+        status: serverVersion.status,
+        scoreImpact: 15,
+        impactModifier: impactModifiers[serverVersion.status],
+    };
+};
+
+export const runUpdateChecks = async (
+    config: Partial<AdminConfig>,
+    formatMessage: ReturnType<typeof useIntl>['formatMessage'],
+    options: Options,
+) => {
+    const checks = [
+        testServerVersion,
+    ];
+
+    const results = await Promise.all(checks.map((check) => check(config, formatMessage, options)));
+    return results;
+};
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 804769ce3b..238b42172d 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -1944,6 +1944,7 @@
   "admin.reload.reloadFail": "Reloading unsuccessful: {error}",
   "admin.reporting.workspace_optimization.access.description": "Web server configuration may be affecting access to your Mattermost workspace.",
   "admin.reporting.workspace_optimization.access.descriptionOk": "Access to your workspace seems available!",
+  "admin.reporting.workspace_optimization.access.site_url.cta": "Configure web server",
   "admin.reporting.workspace_optimization.access.site_url.description": "Your web server settings aren't passing a live URL test which means your workspace may not be accessible to users. We recommend updating your web server settings.",
   "admin.reporting.workspace_optimization.access.site_url.title": "Misconfigured web server",
   "admin.reporting.workspace_optimization.access.title": "Workspace access",
@@ -1952,27 +1953,24 @@
   "admin.reporting.workspace_optimization.chip_warnings": "Warnings: {count}",
   "admin.reporting.workspace_optimization.configuration.description": "You have configuration issues to resolve",
   "admin.reporting.workspace_optimization.configuration.descriptionOk": "You seem to have good configuration for SSL and Session Lengths!",
+  "admin.reporting.workspace_optimization.configuration.session_length.cta": "Configure session length",
   "admin.reporting.workspace_optimization.configuration.session_length.description": "Your session length is set to the default of 30 days. A longer session length provides convenience, and a shorter session provides tighter security. We recommend adjusting this based on your organization's security policies.",
   "admin.reporting.workspace_optimization.configuration.session_length.title": "Session lengths is set to default",
   "admin.reporting.workspace_optimization.configuration.ssl.description": "We strongly recommend securing your Mattermost workspace by configuring SSL in production environments.",
   "admin.reporting.workspace_optimization.configuration.ssl.title": "Configure SSL to make your server more secure",
   "admin.reporting.workspace_optimization.configuration.title": "Configuration",
-  "admin.reporting.workspace_optimization.cta.configureDataRetention": "Try data retention",
-  "admin.reporting.workspace_optimization.cta.configureElasticsearch": "Try Elasticsearch",
-  "admin.reporting.workspace_optimization.cta.configureLDAP": "Try AD/LDAP",
-  "admin.reporting.workspace_optimization.cta.configureSessionLength": "Configure session length",
-  "admin.reporting.workspace_optimization.cta.configureWebServer": "Configure web server",
-  "admin.reporting.workspace_optimization.cta.downloadUpdate": "Download update",
   "admin.reporting.workspace_optimization.cta.learnMore": "Learn more",
   "admin.reporting.workspace_optimization.cta.startTrial": "Start trial",
   "admin.reporting.workspace_optimization.cta.upgradeLicense": "Contact sales",
   "admin.reporting.workspace_optimization.data_privacy.description": "Get better insight and control over your data.",
   "admin.reporting.workspace_optimization.data_privacy.descriptionOk": "You seem to be using data retention and compliance features!",
+  "admin.reporting.workspace_optimization.data_privacy.retention.cta": "Try data retention",
   "admin.reporting.workspace_optimization.data_privacy.retention.description": "Organizations in highly regulated industries require more control and insight with their data. We recommend enabling Data Retention and Compliance features.",
   "admin.reporting.workspace_optimization.data_privacy.retention.title": "Become more data aware",
   "admin.reporting.workspace_optimization.data_privacy.title": "Data privacy",
   "admin.reporting.workspace_optimization.ease_of_management.description": "Make it easier to manage your Mattermost workspace.",
   "admin.reporting.workspace_optimization.ease_of_management.descriptionOk": "Your user authentication setup is appropriate based on your current usage!",
+  "admin.reporting.workspace_optimization.ease_of_management.ldap.cta": "Try AD/LDAP",
   "admin.reporting.workspace_optimization.ease_of_management.ldap.description": "You've reached over 100 users! We recommend setting up AD/LDAP user authentication for easier onboarding as well as automated deactivations and role assignments.",
   "admin.reporting.workspace_optimization.ease_of_management.ldap.title": "AD/LDAP integration recommended",
   "admin.reporting.workspace_optimization.ease_of_management.title": "Ease of management",
@@ -1983,9 +1981,11 @@
   "admin.reporting.workspace_optimization.performance.search.description": "Your server has reached over 500 users and 2 million posts which can result in slow search performance. We recommend enabling Elasticsearch for better performance.",
   "admin.reporting.workspace_optimization.performance.search.title": "Search performance",
   "admin.reporting.workspace_optimization.performance.title": "Performance",
+  "admin.reporting.workspace_optimization.search.cta": "Try Elasticsearch",
   "admin.reporting.workspace_optimization.title": "Workspace Optimization",
   "admin.reporting.workspace_optimization.updates.description": "An update is available.",
   "admin.reporting.workspace_optimization.updates.descriptionOk": "Your workspace is completely up to date!",
+  "admin.reporting.workspace_optimization.updates.server_version.cta": "Download update",
   "admin.reporting.workspace_optimization.updates.server_version.status.title": "{type} version update available.",
   "admin.reporting.workspace_optimization.updates.server_version.update_type.major": "Major",
   "admin.reporting.workspace_optimization.updates.server_version.update_type.minor": "Minor",

From 183e3c6033a70e079f447372de0d806fc5cc0cdc Mon Sep 17 00:00:00 2001
From: Conor Macpherson <116016004+ConorMacpherson@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:00:18 -0400
Subject: [PATCH 064/103] Update index.tsx

Fix success modal not closing.
---
 .../self_hosted_purchases/self_hosted_expansion_modal/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
index 5fbd4d6ebc..88efd97956 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
@@ -509,7 +509,7 @@ export default function SelfHostedExpansionModal() {
                             <SuccessPage
                                 onClose={() => {
                                     setFormState({...formState, submitting: false, error: '', succeeded: false});
-                                    closeModal(ModalIdentifiers.SELF_HOSTED_EXPANSION);
+                                    dispatch(closeModal(ModalIdentifiers.SELF_HOSTED_EXPANSION));
                                 }}
                             />
                         )}

From ecbdd917879ca2d1ed9b49ba6cd9e405b75deebb Mon Sep 17 00:00:00 2001
From: Conor Macpherson <116016004+ConorMacpherson@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:01:54 -0400
Subject: [PATCH 065/103] Update enterprise_edition_left_panel.tsx

Fix handle click `+Add Seats` button to ensure checks for expansion availability look at service settings OR expansion availability are
---
 .../enterprise_edition/enterprise_edition_left_panel.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx
index b2616d9453..7cc45db259 100644
--- a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx
+++ b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx
@@ -100,7 +100,7 @@ const EnterpriseEditionLeftPanel = ({
     );
 
     const handleClickAddSeats = () => {
-        if (!isSelfHostedExpansionEnabled && !canExpand) {
+        if (!isSelfHostedExpansionEnabled || !canExpand) {
             window.open(expandableLink(unsanitizedLicense.Id), '_blank');
         } else {
             selfHostedExpansionModal.open();

From 241376b3155cb374ceb7031243918c722e940b2e Mon Sep 17 00:00:00 2001
From: M-ZubairAhmed <m-zubairahmed@protonmail.com>
Date: Sat, 15 Apr 2023 00:42:00 +0530
Subject: [PATCH 066/103] MM-52165 : Remove 50% maxWorker on Channels test run
 (#22962)

* test

* remove boards maxWorkers

---------

Co-authored-by: Caleb Roseland <caleb@calebroseland.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
---
 webapp/boards/jest.config.js                        |  3 +--
 webapp/boards/package.json                          |  1 -
 webapp/channels/build/contrib/gitlab/.gitlab-ci.yml |  2 +-
 webapp/channels/package.json                        | 11 ++++-------
 webapp/package-lock.json                            |  5 +----
 webapp/package.json                                 |  1 +
 webapp/playbooks/package.json                       |  8 +++++---
 7 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/webapp/boards/jest.config.js b/webapp/boards/jest.config.js
index 05b4cd53e9..85b8e69719 100644
--- a/webapp/boards/jest.config.js
+++ b/webapp/boards/jest.config.js
@@ -7,7 +7,7 @@ const config = {
     transform: {
         "^.+\\.(t|j)sx?$": ["@swc/jest"]
     },
-    moduleFileExtensions: [      
+    moduleFileExtensions: [
         "ts",
         "tsx",
         "js",
@@ -20,7 +20,6 @@ const config = {
         "/nanoevents/",
         "node_modules/(?!react-native|react-router|react-day-picker)"
     ],
-    maxWorkers: "80%",
     testEnvironment: "jsdom",
     collectCoverage: true,
     collectCoverageFrom: [
diff --git a/webapp/boards/package.json b/webapp/boards/package.json
index 241571048f..da149e9f85 100644
--- a/webapp/boards/package.json
+++ b/webapp/boards/package.json
@@ -103,7 +103,6 @@
 		"@typescript-eslint/eslint-plugin": "5.57.1",
 		"@typescript-eslint/parser": "5.57.1",
 		"babel-eslint": "10.1.0",
-		"cross-env": "^7.0.3",
 		"css-loader": "6.7.1",
 		"eslint-import-resolver-webpack": "0.13.2",
 		"eslint-plugin-babel": "^5.3.1",
diff --git a/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml b/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml
index 66b2cef95e..9d9bb1c246 100644
--- a/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml
+++ b/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml
@@ -13,4 +13,4 @@ test:
   before_script:
     - npm ci --ignore-scripts
   script:
-    - npm run test:speed
+    - npm run test
diff --git a/webapp/channels/package.json b/webapp/channels/package.json
index b948c1d924..12beb235e3 100644
--- a/webapp/channels/package.json
+++ b/webapp/channels/package.json
@@ -156,7 +156,6 @@
     "babel-plugin-typescript-to-proptypes": "1.4.2",
     "bundle-loader": "0.2.0",
     "copy-webpack-plugin": "11.0.0",
-    "cross-env": "7.0.3",
     "css-loader": "5.2.6",
     "dotenv-webpack": "8.0.1",
     "enzyme": "3.11.0",
@@ -216,15 +215,13 @@
     "build": "cross-env NODE_ENV=production webpack",
     "run": "webpack --progress --watch",
     "dev-server": "webpack serve --mode development",
-    "test": "cross-env TZ=Etc/UTC jest --maxWorkers=50%",
+    "test": "cross-env TZ=Etc/UTC jest",
+    "test:watch": "cross-env TZ=Etc/UTC jest --watch",
+    "test:updatesnapshot": "cross-env TZ=Etc/UTC jest --updateSnapshot",
+    "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles --verbose",
     "test-ci": "cross-env TZ=Etc/UTC jest --ci --maxWorkers=100%",
     "clean": "rm -rf dist node_modules .eslintcache .stylelintcache tsconfig.tsbuildinfo",
     "stats": "cross-env NODE_ENV=production webpack --profile --json > webpack_stats.json",
-    "updatesnapshot": "cross-env TZ=Etc/UTC jest --updateSnapshot",
-    "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles",
-    "test:speed": "cross-env TZ=Etc/UTC jest",
-    "test:watch": "cross-env TZ=Etc/UTC jest --watch",
-    "test:coverage": "cross-env TZ=Etc/UTC jest --coverage",
     "mmjstool": "mmjstool",
     "i18n-extract": "npm run mmjstool -- i18n extract-webapp --webapp-dir ./src",
     "i18n-clean-empty": "npm run mmjstool -- i18n clean-empty --webapp-dir ./src",
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index f00c8fe841..b666571cc3 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -19,6 +19,7 @@
         "blessed": "0.1.81",
         "chalk": "4.1.2",
         "concurrently": "7.6.0",
+        "cross-env": "7.0.3",
         "eslint": "8.37.0",
         "strip-ansi": "6.0.1"
       },
@@ -106,7 +107,6 @@
         "@typescript-eslint/eslint-plugin": "5.57.1",
         "@typescript-eslint/parser": "5.57.1",
         "babel-eslint": "10.1.0",
-        "cross-env": "^7.0.3",
         "css-loader": "6.7.1",
         "eslint-import-resolver-webpack": "0.13.2",
         "eslint-plugin-babel": "^5.3.1",
@@ -3702,7 +3702,6 @@
         "babel-plugin-typescript-to-proptypes": "1.4.2",
         "bundle-loader": "0.2.0",
         "copy-webpack-plugin": "11.0.0",
-        "cross-env": "7.0.3",
         "css-loader": "5.2.6",
         "dotenv-webpack": "8.0.1",
         "enzyme": "3.11.0",
@@ -44037,7 +44036,6 @@
         "babel-eslint": "10.1.0",
         "color": "^4.2.1",
         "core-js": "3.21.1",
-        "cross-env": "^7.0.3",
         "css-loader": "6.7.1",
         "draft-js": "^0.11.7",
         "emoji-mart": "^3.0.1",
@@ -54469,7 +54467,6 @@
         "copy-webpack-plugin": "11.0.0",
         "core-js": "3.26.0",
         "country-list": "2.2.0",
-        "cross-env": "7.0.3",
         "crypto-browserify": "3.12.0",
         "css-loader": "5.2.6",
         "css-vars-ponyfill": "2.4.8",
diff --git a/webapp/package.json b/webapp/package.json
index e799178631..1127b9407f 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -20,6 +20,7 @@
     "blessed": "0.1.81",
     "chalk": "4.1.2",
     "concurrently": "7.6.0",
+    "cross-env": "7.0.3",
     "eslint": "8.37.0",
     "strip-ansi": "6.0.1"
   },
diff --git a/webapp/playbooks/package.json b/webapp/playbooks/package.json
index b36df25faa..f604532cba 100644
--- a/webapp/playbooks/package.json
+++ b/webapp/playbooks/package.json
@@ -119,9 +119,11 @@
     "dev-server": "webpack serve --mode=development",
     "check": "eslint --ignore-pattern node_modules --ignore-pattern dist --ext .js --ext .jsx --ext tsx --ext ts . --quiet --cache",
     "fix": "eslint --ignore-pattern node_modules --ignore-pattern dist --ext .js --ext .jsx --ext tsx --ext ts . --quiet --fix --cache",
-    "test": "jest --forceExit --detectOpenHandles --verbose",
-    "test:watch": "jest --watch",
-    "test-ci": "jest --ci --forceExit --detectOpenHandles --maxWorkers=100%",
+    "test": "cross-env TZ=Etc/UTC jest",
+    "test:watch": "cross-env TZ=Etc/UTC jest --watch",
+    "test:updatesnapshot": "cross-env TZ=Etc/UTC jest --updateSnapshot",
+    "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles --verbose",
+    "test-ci": "cross-env TZ=Etc/UTC jest --ci --maxWorkers=100%",
     "check-types": "tsc -b",
     "extract": "formatjs extract 'src/**/*.{ts,tsx}' --out-file i18n/temp.json --id-interpolation-pattern '[sha512:contenthash:base64:6]' && formatjs compile 'i18n/temp.json' --out-file i18n/en.json && rm i18n/temp.json",
     "graphql": "graphql-codegen --config graphql_gen.ts",

From 1f6169fb3f774d9ae2990919e4053a558716e783 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Fri, 14 Apr 2023 15:17:44 -0400
Subject: [PATCH 067/103] Add README to webapp folder (#22831)

* Add README to webapp folder

* Remove old web app README

* Rewrite a sentence to remove jargon
---
 webapp/README.md          | 28 ++++++++++++++++++++
 webapp/channels/README.md | 56 ---------------------------------------
 webapp/platform/README.md | 17 ------------
 3 files changed, 28 insertions(+), 73 deletions(-)
 create mode 100644 webapp/README.md
 delete mode 100644 webapp/channels/README.md

diff --git a/webapp/README.md b/webapp/README.md
new file mode 100644
index 0000000000..dfb7d47a09
--- /dev/null
+++ b/webapp/README.md
@@ -0,0 +1,28 @@
+# Mattermost Web App
+
+This folder contains the client code for the Mattermost web app. It's broken up into multiple packages each of which either contains an area of the app (such as `playbooks` or `boards`) or shared logic used across other packages (such as the packages located in the `platform` directory). For anyone who's used to working in [the mattermost/mattermost-webapp repo](https://github.com/mattermost/mattermost-webapp), most of that is now located in `channels`.
+
+## npm Workspaces
+
+To interact with a workspace using npm, such as to add a dependency or run a script, use the `--workspace` (or `--workspaces`) flag. This can be done when using built-in npm commands such as `npm add` or when running scripts. Those commands should be run from this directory.
+
+```sh
+# Add a dependency to a single package
+npm add react --workspace=boards
+
+# Build multiple packages
+npm run build --workspace=packages/client --workspace=packages/components
+
+# Test all workspaces
+npm test --workspaces
+
+# Clean all workspaces that have a clean script defined
+npm run clean --workspaces --if-present
+```
+
+To install dependencies for a workspace, simply run `npm install` from this folder as you would do normally. Most packages' dependencies will be included in the root `node_modules`, and all packages' dependencies will appear in the `package-lock.json`. A `node_modules` will only be created inside a package if one of its dependencies conflicts with that of another package.
+
+## Useful Links
+
+- [Developer setup](https://developers.mattermost.com/contribute/developer-setup/), now included with the Mattermost server developer setup
+- [Web app developer documentation](https://developers.mattermost.com/contribute/more-info/webapp/)
\ No newline at end of file
diff --git a/webapp/channels/README.md b/webapp/channels/README.md
deleted file mode 100644
index 48fcadb720..0000000000
--- a/webapp/channels/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Mattermost Web App
-# [![Mattermost](https://user-images.githubusercontent.com/7205829/137170381-fe86eef0-bccc-4fdd-8e92-b258884ebdd7.png)](https://mattermost.com)
-
-[Mattermost](https://mattermost.com) is an open source platform for secure collaboration across the entire software development lifecycle. This repo is the primary source for core development on the Mattermost platform; it's written in Golang and React, and runs as a single Linux binary with MySQL or PostgreSQL. A new compiled version is released under an MIT license every month on the 16th.
-
-<img width="1006" alt="mattermost-hero" src="https://user-images.githubusercontent.com/7205829/136107976-7a894c9e-290a-490d-8501-e5fdbfc3785a.png">
-
-This repo hosts the webapp client code. If you'd like to report an issue with Mattermost, please create an issue on [mattermost-server](https://github.com/mattermost/mattermost-server), which hosts the server code. You can also look at the [Get Help With Mattermost](https://docs.mattermost.com/guides/get-help.html) guide to find the resources available to our community.
-
-- [Product documentation](https://docs.mattermost.com/)
-- [Developer documentation](https://developers.mattermost.com/)
-- [Download compiled version](https://mattermost.com/download)
-
-## Try out Mattermost
-
-- [Join the Mattermost Contributor's server](https://community.mattermost.com/signup_user_complete/?id=codoy5s743rq5mk18i7u5ksz7e) to join community discussions about contributions, development and more
-- [Get started with Mattermost Cloud](https://customers.mattermost.com/cloud/signup) to try out Mattermost
-
-[![Deploy a Preview](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/mattermost/mattermost-heroku)
-
-_Note: Heroku preview does not include email or persistent storage._
-
-## Install Mattermost
-
-- [Deploy Guide](https://docs.mattermost.com/guides/deployment.html) - Deploy Mattermost in minutes via Docker, Ubuntu, or tar.
-- [Developer Machine Setup](https://developers.mattermost.com/contribute/server/developer-setup) - Follow this guide if you want to write code for Mattermost
-
-Other Install Guides:
-- [Deploy Mattermost on Docker](https://docs.mattermost.com/install/install-docker.html)
-- [Mattermost Omnibus](https://docs.mattermost.com/install/installing-mattermost-omnibus.html)
-- [Install Mattermost from Tar](https://docs.mattermost.com/install/install-tar.html)
-- [Ubuntu 20.04 LTS](https://docs.mattermost.com/install/installing-ubuntu-2004-LTS.html)
-- [Kubernetes](https://docs.mattermost.com/install/install-kubernetes.html)
-- [Helm](https://docs.mattermost.com/install/install-kubernetes.html#installing-the-operators-via-helm)
-- [Debian Buster](https://docs.mattermost.com/install/install-debian.html)
-- [RHEL 8](https://docs.mattermost.com/install/install-rhel-8.html)
-- [More server install guides](https://docs.mattermost.com/guides/deployment.html)
-
-## Get Involved
-
-- [Contribute to Mattermost](https://handbook.mattermost.com/contributors/contributors/ways-to-contribute)
-- [Find "Help Wanted" projects](https://github.com/mattermost/mattermost-server/issues?page=1&q=is%3Aissue+is%3Aopen+%22Help+Wanted%22&utf8=%E2%9C%93)
-- [Join Developer Discussion on a Mattermost Server for contributors](https://docs.mattermost.com/guides/community-chat.html)
-- [Get Help With Mattermost](https://docs.mattermost.com/guides/get-help.html)
-
-## Learn More
-
-- [API Options - webhooks, slash commands, drivers and web service](https://api.mattermost.com/)
-- [Localization Guide](https://handbook.mattermost.com/contributors/contributors/localization)
-
-## Get the Latest News
-
-- **Twitter** - Follow [Mattermost](https://twitter.com/Mattermost)
-- **Email** - Subscribe to our [newsletter](https://mattermost.com/community-newsletter/)
-
-Any other questions, mail us at [info@mattermost.com](mailto:info@mattermost.com). We'd love to meet you!
diff --git a/webapp/platform/README.md b/webapp/platform/README.md
index 1340c2e844..faa21e41fa 100644
--- a/webapp/platform/README.md
+++ b/webapp/platform/README.md
@@ -1,22 +1,5 @@
 This folder contains a number of packages intended to be built and shipped separately on NPM as well as a few legacy packages for internal use only (`reselect` and `mattermost-redux`). The following documentation only applies to the newer packages and not to the legacy ones.
 
-### Working with subpackages
-
-To interact with one or more packages in a workspace, such as to add a dependency or run a script, use the `--workspace` (or `--workspaces`) flag. This can be done when using built-in NPM commands such as `npm add` or when running scripts. This doesn't need to be done from inside the package.
-
-```sh
-# Add a dependency to a single package
-npm add react --workspace=packages/apple
-
-# Build multiple packages
-npm run build --workspace=packages/banana --workspace=packages/carrot
-
-# Clean all workspaces
-npm run clean --workspaces
-```
-
-To install dependencies for a workspace, simply run `npm install` from the root of the source tree as you would do normally. Every packages' dependencies will be included in `node_modules` and in the `package-lock.json` which are shared across the repo.
-
 ### Importing a subpackage
 
 Subpackages should be imported using their full name, both inside the web app and when installing them using `npm`. They should not be imported using a relative path, and the `src` folder shouldn't be necessary to include.

From 80d0a7f210e2756d8f6c6fbd501e933f1fd1b478 Mon Sep 17 00:00:00 2001
From: Nathaniel Allred <neallred@protonmail.com>
Date: Fri, 14 Apr 2023 16:31:07 -0500
Subject: [PATCH 068/103] fix values (#22944)

---
 model/config.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/model/config.go b/model/config.go
index a91ac29c40..4868229bbf 100644
--- a/model/config.go
+++ b/model/config.go
@@ -239,10 +239,10 @@ const (
 	Office365SettingsDefaultTokenEndpoint   = "https://login.microsoftonline.com/common/oauth2/v2.0/token"
 	Office365SettingsDefaultUserAPIEndpoint = "https://graph.microsoft.com/v1.0/me"
 
-	CloudSettingsDefaultCwsURL    = "https://customers.cloud.mattermost.com"
+	CloudSettingsDefaultCwsURL    = "https://customers.mattermost.com"
 	CloudSettingsDefaultCwsAPIURL = "https://portal.internal.prod.cloud.mattermost.com"
 	// TODO: update to "https://portal.test.cloud.mattermost.com" when ready to use test license key
-	CloudSettingsDefaultCwsURLTest = "https://customers.cloud.mattermost.com"
+	CloudSettingsDefaultCwsURLTest = "https://customers.mattermost.com"
 	// TODO: update to // "https://api.internal.test.cloud.mattermost.com" when ready to use test license key
 	CloudSettingsDefaultCwsAPIURLTest = "https://portal.internal.prod.cloud.mattermost.com"
 

From 2119bc09011db822e64053f4ee95e2be038cd6f6 Mon Sep 17 00:00:00 2001
From: M-ZubairAhmed <m-zubairahmed@protonmail.com>
Date: Sun, 16 Apr 2023 05:19:08 +0530
Subject: [PATCH 069/103] MM-51974 : Unify "react-intl" related dependencies
 versions across products (#22894)

Picks out formatjs-eslint-plugin to webapp root. Updates react-intl to 6.3.2 in all products. Executed i18n-extract and checked if any translations got changed. Although it was a major version update, the only breaking change was for a vue peer dependency. Adds "*" to take whatever dependency rule to products and declare the react-intl as the root package. Fixes a few lint and type errors cropped in due to the update No-ID rule removed from playbooks in preparation for unifying practices across products. Lastly, a few missing translations in Playbooks added
---
 webapp/boards/.eslintrc.json                  |    6 +-
 webapp/boards/package.json                    |    5 +-
 .../boardSwitcherDialog.tsx                   |    2 +-
 .../shareBoard/teamPermissionsRow.tsx         |    4 +-
 .../components/sidebar/sidebarCategory.tsx    |    3 +-
 webapp/channels/.eslintrc.json                |    2 +-
 webapp/channels/package.json                  |    3 +-
 .../formatted_markdown_message.test.tsx.snap  |   10 +
 .../__snapshots__/team_profile.test.tsx.snap  |   12 +
 .../configuration_bar/configuration_bar.tsx   |    4 +-
 .../__snapshots__/error.test.tsx.snap         |    3 +
 .../__snapshots__/success.test.tsx.snap       |    3 +
 .../__snapshots__/code_block.test.tsx.snap    |   15 +
 .../__snapshots__/panel_body.test.tsx.snap    |   12 +
 .../plugin_marketplace/marketplace_modal.tsx  |    4 +-
 .../profile_popover.test.tsx.snap             |    9 +
 .../at_mention_suggestion.test.tsx.snap       |    6 +
 .../__snapshots__/thread_footer.test.tsx.snap |   51 +
 .../global_threads/global_threads.tsx         |    4 +-
 .../crt_threads_pane_tutorial_tip.tsx         |    4 +-
 .../crt_tour/crt_unread_tutorial_tip.tsx      |    4 +-
 .../user_group_popover.test.tsx.snap          |   15 +
 .../group_member_list.test.tsx.snap           |   15 +
 .../widgets/menu/menu_items/useWords.tsx      |    6 +-
 .../__snapshots__/avatars.test.tsx.snap       |   60 +
 .../channel_header_plug.test.tsx.snap         |   60 +
 .../mobile_channel_header_plug.test.tsx.snap  |   30 +
 webapp/package-lock.json                      | 1771 ++++-------------
 webapp/package.json                           |    4 +
 webapp/platform/components/package.json       |    4 +-
 webapp/platform/types/package.json            |    4 +-
 webapp/playbooks/.eslintrc.json               |    3 +-
 webapp/playbooks/i18n/en.json                 |    3 +
 webapp/playbooks/package.json                 |    5 +-
 .../backstage/metrics/metrics_card.tsx        |    4 +
 .../components/backstage/playbook_list.tsx    |    4 +-
 .../backstage/playbook_list_row.tsx           |    3 +-
 .../playbook_run/rhs_info_metrics.tsx         |    1 +
 .../playbook_run/status_update.tsx            |    4 +-
 .../components/backstage/runs_list/row.tsx    |    7 +-
 .../src/components/checklist_item/command.tsx |    2 +-
 .../components/modals/run_playbook_modal.tsx  |    1 +
 .../modals/update_run_status_modal.tsx        |    9 +-
 .../src/components/playbooks_selector.tsx     |    2 +-
 .../src/components/sidebar/sidebar.tsx        |    9 +-
 .../components/widgets/menu/menu_wrapper.tsx  |    1 +
 46 files changed, 739 insertions(+), 1454 deletions(-)

diff --git a/webapp/boards/.eslintrc.json b/webapp/boards/.eslintrc.json
index 38051b75e8..f31eeaf6c1 100644
--- a/webapp/boards/.eslintrc.json
+++ b/webapp/boards/.eslintrc.json
@@ -91,9 +91,6 @@
       "error",
       { "allowSameFolder": true, "rootDir": "webapp/boards"}
     ],
- /*    "no-restricted-imports": ["error", {
-      "patterns": ["..*"]
-    }], */
     "import-newlines/enforce": [
       2,
       3
@@ -101,7 +98,8 @@
     "object-curly-spacing": [
       2,
       "never"
-    ]
+    ],
+    "formatjs/no-multiple-whitespaces": 2
   },
   "overrides": [
     {
diff --git a/webapp/boards/package.json b/webapp/boards/package.json
index da149e9f85..4ec669e8bf 100644
--- a/webapp/boards/package.json
+++ b/webapp/boards/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"description": "",
 	"scripts": {
-		"i18n-extract": "formatjs extract \"src/**/*.{ts,tsx}\" --ignore \"**/*.d.ts\" \"../**/*.d.ts\" --out-file i18n/tmp.json && formatjs compile i18n/tmp.json --out-file i18n/en.json && npx rimraf i18n/tmp.json",
+		"i18n-extract": "formatjs extract \"src/**/*.{ts,tsx}\" --ignore \"**/*.d.ts\" --out-file i18n/tmp.json && formatjs compile i18n/tmp.json --out-file i18n/en.json && npx rimraf i18n/tmp.json",
 		"build": "webpack --mode=production",
 		"build:watch": "webpack --mode=production --watch",
 		"start:product": "webpack serve --mode=development",
@@ -58,7 +58,7 @@
 		"react-dom": "17.0.2",
 		"react-hot-keys": "^2.7.1",
 		"react-hotkeys-hook": "^3.4.4",
-		"react-intl": "^5.20.0",
+		"react-intl": "*",
 		"react-redux": "^7.2.1",
 		"react-router-dom": "^5.2.0",
 		"react-select": "5.5.9",
@@ -106,7 +106,6 @@
 		"css-loader": "6.7.1",
 		"eslint-import-resolver-webpack": "0.13.2",
 		"eslint-plugin-babel": "^5.3.1",
-		"eslint-plugin-formatjs": "4.9.0",
 		"eslint-plugin-header": "3.1.1",
 		"eslint-plugin-import": "2.25.4",
 		"eslint-plugin-import-newlines": "1.3.1",
diff --git a/webapp/boards/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx b/webapp/boards/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx
index f0325bf586..c45d87e5d0 100644
--- a/webapp/boards/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx
+++ b/webapp/boards/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx
@@ -39,7 +39,7 @@ const BoardSwitcherDialog = (props: Props): JSX.Element => {
     const team = useAppSelector(getCurrentTeam)
     const me = useAppSelector(getMe)
     const title = intl.formatMessage({id: 'FindBoardsDialog.Title', defaultMessage: 'Find Boards'})
-    const subTitle = intl.formatMessage(
+    const subTitle = intl.formatMessage<ReactNode>(
         {
             id: 'FindBoardsDialog.SubTitle',
             defaultMessage: 'Type to find a board. Use <b>UP/DOWN</b> to browse. <b>ENTER</b> to select, <b>ESC</b> to dismiss',
diff --git a/webapp/boards/src/components/shareBoard/teamPermissionsRow.tsx b/webapp/boards/src/components/shareBoard/teamPermissionsRow.tsx
index 1f7c1a5822..25a5a8a6c0 100644
--- a/webapp/boards/src/components/shareBoard/teamPermissionsRow.tsx
+++ b/webapp/boards/src/components/shareBoard/teamPermissionsRow.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React, {useState} from 'react'
+import React, {ReactNode, useState} from 'react'
 import {useIntl} from 'react-intl'
 
 import MenuWrapper from 'src/widgets/menuWrapper'
@@ -77,7 +77,7 @@ const TeamPermissionsRow = (): JSX.Element => {
                     id: 'shareBoard.confirm-change-team-role.title',
                     defaultMessage: 'Change minimum board role',
                 }),
-                subText: intl.formatMessage({
+                subText: intl.formatMessage<ReactNode>({
                     id: 'shareBoard.confirm-change-team-role.body',
                     defaultMessage: 'Everyone on this board with a lower permission than the "{role}" role will <b>now be promoted to {role}</b>. Are you sure you want to change the minimum role for the board?',
                 }, {
diff --git a/webapp/boards/src/components/sidebar/sidebarCategory.tsx b/webapp/boards/src/components/sidebar/sidebarCategory.tsx
index dc036fc180..5b54c8c7a9 100644
--- a/webapp/boards/src/components/sidebar/sidebarCategory.tsx
+++ b/webapp/boards/src/components/sidebar/sidebarCategory.tsx
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 import React, {
+    ReactNode,
     useCallback,
     useEffect,
     useMemo,
@@ -167,7 +168,7 @@ const SidebarCategory = (props: Props) => {
             id: 'SidebarCategories.CategoryMenu.DeleteModal.Title',
             defaultMessage: 'Delete this category?',
         }),
-        subText: intl.formatMessage(
+        subText: intl.formatMessage<ReactNode>(
             {
                 id: 'SidebarCategories.CategoryMenu.DeleteModal.Body',
                 defaultMessage: 'Boards in <b>{categoryName}</b> will move back to the Boards categories. You\'re not removed from any boards.',
diff --git a/webapp/channels/.eslintrc.json b/webapp/channels/.eslintrc.json
index cdc3b7bf18..644947847a 100644
--- a/webapp/channels/.eslintrc.json
+++ b/webapp/channels/.eslintrc.json
@@ -97,7 +97,7 @@
       }
     ],
     "max-lines": ["warn", {"max": 800, "skipBlankLines": true, "skipComments": true}],
-    "formatjs/no-multiple-whitespaces": ["error"]
+    "formatjs/no-multiple-whitespaces": 2
   },
   "overrides": [
     {
diff --git a/webapp/channels/package.json b/webapp/channels/package.json
index 12beb235e3..c2f702aa9b 100644
--- a/webapp/channels/package.json
+++ b/webapp/channels/package.json
@@ -70,7 +70,7 @@
     "react-day-picker": "8.3.6",
     "react-dom": "17.0.2",
     "react-hot-loader": "4.13.0",
-    "react-intl": "5.20.10",
+    "react-intl": "*",
     "react-is": "17.0.2",
     "react-overlays": "0.9.3",
     "react-popper": "2.3.0",
@@ -162,7 +162,6 @@
     "enzyme-adapter-react-17-updated": "1.0.2",
     "enzyme-to-json": "3.6.2",
     "eslint-import-resolver-webpack": "0.13.2",
-    "eslint-plugin-formatjs": "4.9.1",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#5b0c972eacf19286e4c66221b39113bf8728a99e",
diff --git a/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap b/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap
index 4c65f52555..07a4830b20 100644
--- a/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap
+++ b/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`components/FormattedMarkdownMessage should allow to disable links 1`] =
 <IntlProvider
   defaultFormats={Object {}}
   defaultLocale="en"
+  fallbackOnEmptyString={true}
   formats={Object {}}
   locale="en"
   messages={
@@ -14,6 +15,7 @@ exports[`components/FormattedMarkdownMessage should allow to disable links 1`] =
     }
   }
   onError={[Function]}
+  onWarn={[Function]}
   textComponent={Symbol(react.fragment)}
 >
   <FormattedMarkdownMessage
@@ -41,6 +43,7 @@ exports[`components/FormattedMarkdownMessage should backup to default 1`] = `
 <IntlProvider
   defaultFormats={Object {}}
   defaultLocale="en"
+  fallbackOnEmptyString={true}
   formats={Object {}}
   locale="en"
   messages={
@@ -51,6 +54,7 @@ exports[`components/FormattedMarkdownMessage should backup to default 1`] = `
     }
   }
   onError={[Function]}
+  onWarn={[Function]}
   textComponent={Symbol(react.fragment)}
 >
   <FormattedMarkdownMessage
@@ -72,6 +76,7 @@ exports[`components/FormattedMarkdownMessage should escape non-BR 1`] = `
 <IntlProvider
   defaultFormats={Object {}}
   defaultLocale="en"
+  fallbackOnEmptyString={true}
   formats={Object {}}
   locale="en"
   messages={
@@ -82,6 +87,7 @@ exports[`components/FormattedMarkdownMessage should escape non-BR 1`] = `
     }
   }
   onError={[Function]}
+  onWarn={[Function]}
   textComponent={Symbol(react.fragment)}
 >
   <FormattedMarkdownMessage
@@ -109,6 +115,7 @@ exports[`components/FormattedMarkdownMessage should render message 1`] = `
 <IntlProvider
   defaultFormats={Object {}}
   defaultLocale="en"
+  fallbackOnEmptyString={true}
   formats={Object {}}
   locale="en"
   messages={
@@ -119,6 +126,7 @@ exports[`components/FormattedMarkdownMessage should render message 1`] = `
     }
   }
   onError={[Function]}
+  onWarn={[Function]}
   textComponent={Symbol(react.fragment)}
 >
   <FormattedMarkdownMessage
@@ -140,6 +148,7 @@ exports[`components/FormattedMarkdownMessage values should work 1`] = `
 <IntlProvider
   defaultFormats={Object {}}
   defaultLocale="en"
+  fallbackOnEmptyString={true}
   formats={Object {}}
   locale="en"
   messages={
@@ -150,6 +159,7 @@ exports[`components/FormattedMarkdownMessage values should work 1`] = `
     }
   }
   onError={[Function]}
+  onWarn={[Function]}
   textComponent={Symbol(react.fragment)}
 >
   <FormattedMarkdownMessage
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap
index f3da9ea817..a714b14a38 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap
@@ -213,9 +213,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud restore sho
                     content="name"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -242,6 +244,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud restore sho
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
@@ -457,9 +460,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
                     content="name"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -486,6 +491,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
@@ -603,9 +609,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
                       id="sharedTooltip"
                       intl={
                         Object {
+                          "$t": [Function],
                           "defaultFormats": Object {},
                           "defaultLocale": "en",
                           "defaultRichTextElements": undefined,
+                          "fallbackOnEmptyString": true,
                           "formatDate": [Function],
                           "formatDateTimeRange": [Function],
                           "formatDateToParts": [Function],
@@ -632,6 +640,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
                           "locale": "en",
                           "messages": Object {},
                           "onError": [Function],
+                          "onWarn": [Function],
                           "textComponent": "span",
                           "timeZone": "Etc/UTC",
                           "wrapRichTextChunksInFragment": undefined,
@@ -834,9 +843,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
                     content="name"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -863,6 +874,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx b/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx
index b6a0a0b572..5c8ef4c5f1 100644
--- a/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx
+++ b/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React from 'react';
+import React, {ReactNode} from 'react';
 import {FormattedMessage, injectIntl, IntlShape} from 'react-intl';
 import {Link} from 'react-router-dom';
 
@@ -395,7 +395,7 @@ const ConfigurationAnnouncementBar = (props: Props) => {
             defaultMessage = 'Please configure your <linkSite>site URL</linkSite> on the <linkConsole>System Console</linkConsole>.';
         }
 
-        const values = {
+        const values: Record<string, ReactNode> = {
             linkSite: (msg: string) => (
                 <ExternalLink
                     href={props.siteURL}
diff --git a/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/error.test.tsx.snap b/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/error.test.tsx.snap
index acaf5d5d19..11d2ecaa22 100644
--- a/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/error.test.tsx.snap
+++ b/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/error.test.tsx.snap
@@ -29,9 +29,11 @@ exports[`components/pricing_modal/downgrade_team_removal_modal matches snapshot
           forwardedRef={null}
           intl={
             Object {
+              "$t": [Function],
               "defaultFormats": Object {},
               "defaultLocale": "en",
               "defaultRichTextElements": undefined,
+              "fallbackOnEmptyString": true,
               "formatDate": [Function],
               "formatDateTimeRange": [Function],
               "formatDateToParts": [Function],
@@ -58,6 +60,7 @@ exports[`components/pricing_modal/downgrade_team_removal_modal matches snapshot
               "locale": "en",
               "messages": Object {},
               "onError": [Function],
+              "onWarn": [Function],
               "textComponent": "span",
               "timeZone": "Etc/UTC",
               "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/success.test.tsx.snap b/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/success.test.tsx.snap
index 10328e6da5..42691638be 100644
--- a/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/success.test.tsx.snap
+++ b/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/success.test.tsx.snap
@@ -29,9 +29,11 @@ exports[`components/pricing_modal/downgrade_team_removal_modal matches snapshot
           forwardedRef={null}
           intl={
             Object {
+              "$t": [Function],
               "defaultFormats": Object {},
               "defaultLocale": "en",
               "defaultRichTextElements": undefined,
+              "fallbackOnEmptyString": true,
               "formatDate": [Function],
               "formatDateTimeRange": [Function],
               "formatDateToParts": [Function],
@@ -58,6 +60,7 @@ exports[`components/pricing_modal/downgrade_team_removal_modal matches snapshot
               "locale": "en",
               "messages": Object {},
               "onError": [Function],
+              "onWarn": [Function],
               "textComponent": "span",
               "timeZone": "Etc/UTC",
               "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/code_block/__snapshots__/code_block.test.tsx.snap b/webapp/channels/src/components/code_block/__snapshots__/code_block.test.tsx.snap
index ad8a1dc2ce..5dd6346344 100644
--- a/webapp/channels/src/components/code_block/__snapshots__/code_block.test.tsx.snap
+++ b/webapp/channels/src/components/code_block/__snapshots__/code_block.test.tsx.snap
@@ -4,10 +4,12 @@ exports[`codeBlock should render html code block with proper indentation after s
 <IntlProvider
   defaultFormats={Object {}}
   defaultLocale="en"
+  fallbackOnEmptyString={true}
   formats={Object {}}
   locale="en"
   messages={Object {}}
   onError={[Function]}
+  onWarn={[Function]}
   textComponent={Symbol(react.fragment)}
 >
   <CodeBlock
@@ -68,9 +70,11 @@ exports[`codeBlock should render html code block with proper indentation after s
                   id="copyButton"
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -97,6 +101,7 @@ exports[`codeBlock should render html code block with proper indentation after s
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": Symbol(react.fragment),
                       "timeZone": undefined,
                       "wrapRichTextChunksInFragment": undefined,
@@ -228,10 +233,12 @@ exports[`codeBlock should render typescript code block after syntax highlighting
 <IntlProvider
   defaultFormats={Object {}}
   defaultLocale="en"
+  fallbackOnEmptyString={true}
   formats={Object {}}
   locale="en"
   messages={Object {}}
   onError={[Function]}
+  onWarn={[Function]}
   textComponent={Symbol(react.fragment)}
 >
   <CodeBlock
@@ -292,9 +299,11 @@ const myFunction = () => {
                   id="copyButton"
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -321,6 +330,7 @@ const myFunction = () => {
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": Symbol(react.fragment),
                       "timeZone": undefined,
                       "wrapRichTextChunksInFragment": undefined,
@@ -452,10 +462,12 @@ exports[`codeBlock should render unknown language after syntax highlighting 1`]
 <IntlProvider
   defaultFormats={Object {}}
   defaultLocale="en"
+  fallbackOnEmptyString={true}
   formats={Object {}}
   locale="en"
   messages={Object {}}
   onError={[Function]}
+  onWarn={[Function]}
   textComponent={Symbol(react.fragment)}
 >
   <CodeBlock
@@ -514,9 +526,11 @@ it shouldn't highlight, it's just garbage
                   id="copyButton"
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -543,6 +557,7 @@ it shouldn't highlight, it's just garbage
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": Symbol(react.fragment),
                       "timeZone": undefined,
                       "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap b/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap
index 3026f7a40e..b173fc6031 100644
--- a/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap
+++ b/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap
@@ -73,9 +73,11 @@ exports[`components/drafts/panel/panel_body should have called handleFormattedTe
                   hide={[Function]}
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -102,6 +104,7 @@ exports[`components/drafts/panel/panel_body should have called handleFormattedTe
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -351,9 +354,11 @@ exports[`components/drafts/panel/panel_body should match snapshot 1`] = `
                   hide={[Function]}
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -380,6 +385,7 @@ exports[`components/drafts/panel/panel_body should match snapshot 1`] = `
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -635,9 +641,11 @@ exports[`components/drafts/panel/panel_body should match snapshot for priority 1
                   hide={[Function]}
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -664,6 +672,7 @@ exports[`components/drafts/panel/panel_body should match snapshot for priority 1
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -989,9 +998,11 @@ exports[`components/drafts/panel/panel_body should match snapshot for requested_
                   hide={[Function]}
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -1018,6 +1029,7 @@ exports[`components/drafts/panel/panel_body should match snapshot for requested_
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/plugin_marketplace/marketplace_modal.tsx b/webapp/channels/src/components/plugin_marketplace/marketplace_modal.tsx
index 062727f9e1..f2de2bd2dc 100644
--- a/webapp/channels/src/components/plugin_marketplace/marketplace_modal.tsx
+++ b/webapp/channels/src/components/plugin_marketplace/marketplace_modal.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React, {useCallback, useEffect, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useRef, useState, ReactNode} from 'react';
 import {Tabs, Tab, SelectCallback} from 'react-bootstrap';
 import {useIntl} from 'react-intl';
 import {useDispatch, useSelector} from 'react-redux';
@@ -40,7 +40,7 @@ const MarketplaceTabs = {
 
 const SEARCH_TIMEOUT_MILLISECONDS = 200;
 
-const linkConsole = (msg: string) => (
+const linkConsole = (msg: string): ReactNode => (
     <Link to='/admin_console/plugins/plugin_management'>
         {msg}
     </Link>
diff --git a/webapp/channels/src/components/profile_popover/__snapshots__/profile_popover.test.tsx.snap b/webapp/channels/src/components/profile_popover/__snapshots__/profile_popover.test.tsx.snap
index fc0a51d05a..aba8e516d7 100644
--- a/webapp/channels/src/components/profile_popover/__snapshots__/profile_popover.test.tsx.snap
+++ b/webapp/channels/src/components/profile_popover/__snapshots__/profile_popover.test.tsx.snap
@@ -3491,9 +3491,11 @@ exports[`components/ProfilePopover should show the start call button when isCall
       hide={[MockFunction]}
       intl={
         Object {
+          "$t": [Function],
           "defaultFormats": Object {},
           "defaultLocale": "en",
           "defaultRichTextElements": undefined,
+          "fallbackOnEmptyString": true,
           "formatDate": [Function],
           "formatDateTimeRange": [Function],
           "formatDateToParts": [Function],
@@ -3520,6 +3522,7 @@ exports[`components/ProfilePopover should show the start call button when isCall
           "locale": "en",
           "messages": Object {},
           "onError": [Function],
+          "onWarn": [Function],
           "textComponent": "span",
           "timeZone": "Etc/UTC",
           "wrapRichTextChunksInFragment": undefined,
@@ -3804,9 +3807,11 @@ exports[`components/ProfilePopover should show the start call button when isCall
                               hourCycle="h12"
                               intl={
                                 Object {
+                                  "$t": [Function],
                                   "defaultFormats": Object {},
                                   "defaultLocale": "en",
                                   "defaultRichTextElements": undefined,
+                                  "fallbackOnEmptyString": true,
                                   "formatDate": [Function],
                                   "formatDateTimeRange": [Function],
                                   "formatDateToParts": [Function],
@@ -3833,6 +3838,7 @@ exports[`components/ProfilePopover should show the start call button when isCall
                                   "locale": "en",
                                   "messages": Object {},
                                   "onError": [Function],
+                                  "onWarn": [Function],
                                   "textComponent": "span",
                                   "timeZone": "Etc/UTC",
                                   "wrapRichTextChunksInFragment": undefined,
@@ -4076,9 +4082,11 @@ exports[`components/ProfilePopover should show the start call button when isCall
                               id="addToChannelTooltip"
                               intl={
                                 Object {
+                                  "$t": [Function],
                                   "defaultFormats": Object {},
                                   "defaultLocale": "en",
                                   "defaultRichTextElements": undefined,
+                                  "fallbackOnEmptyString": true,
                                   "formatDate": [Function],
                                   "formatDateTimeRange": [Function],
                                   "formatDateToParts": [Function],
@@ -4105,6 +4113,7 @@ exports[`components/ProfilePopover should show the start call button when isCall
                                   "locale": "en",
                                   "messages": Object {},
                                   "onError": [Function],
+                                  "onWarn": [Function],
                                   "textComponent": "span",
                                   "timeZone": "Etc/UTC",
                                   "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/suggestion/at_mention_provider/__snapshots__/at_mention_suggestion.test.tsx.snap b/webapp/channels/src/components/suggestion/at_mention_provider/__snapshots__/at_mention_suggestion.test.tsx.snap
index a3c6df367c..5e338d7941 100644
--- a/webapp/channels/src/components/suggestion/at_mention_provider/__snapshots__/at_mention_suggestion.test.tsx.snap
+++ b/webapp/channels/src/components/suggestion/at_mention_provider/__snapshots__/at_mention_suggestion.test.tsx.snap
@@ -4,9 +4,11 @@ exports[`at mention suggestion Should display nick name of non signed in user 1`
 <AtMentionSuggestion
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -33,6 +35,7 @@ exports[`at mention suggestion Should display nick name of non signed in user 1`
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -113,9 +116,11 @@ exports[`at mention suggestion Should not display nick name of the signed in use
 <AtMentionSuggestion
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -142,6 +147,7 @@ exports[`at mention suggestion Should not display nick name of the signed in use
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
diff --git a/webapp/channels/src/components/threading/channel_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap b/webapp/channels/src/components/threading/channel_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap
index 045dd7effa..2cf5b16bdf 100644
--- a/webapp/channels/src/components/threading/channel_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap
+++ b/webapp/channels/src/components/threading/channel_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap
@@ -105,9 +105,11 @@ exports[`components/threading/channel_threads/thread_footer should report total
                   hide={[Function]}
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -134,6 +136,7 @@ exports[`components/threading/channel_threads/thread_footer should report total
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -189,9 +192,11 @@ exports[`components/threading/channel_threads/thread_footer should report total
                         id="name-5"
                         intl={
                           Object {
+                            "$t": [Function],
                             "defaultFormats": Object {},
                             "defaultLocale": "en",
                             "defaultRichTextElements": undefined,
+                            "fallbackOnEmptyString": true,
                             "formatDate": [Function],
                             "formatDateTimeRange": [Function],
                             "formatDateToParts": [Function],
@@ -218,6 +223,7 @@ exports[`components/threading/channel_threads/thread_footer should report total
                             "locale": "en",
                             "messages": Object {},
                             "onError": [Function],
+                            "onWarn": [Function],
                             "textComponent": "span",
                             "timeZone": "Etc/UTC",
                             "wrapRichTextChunksInFragment": undefined,
@@ -325,9 +331,11 @@ exports[`components/threading/channel_threads/thread_footer should report total
                   hide={[Function]}
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -354,6 +362,7 @@ exports[`components/threading/channel_threads/thread_footer should report total
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -409,9 +418,11 @@ exports[`components/threading/channel_threads/thread_footer should report total
                         id="name-4"
                         intl={
                           Object {
+                            "$t": [Function],
                             "defaultFormats": Object {},
                             "defaultLocale": "en",
                             "defaultRichTextElements": undefined,
+                            "fallbackOnEmptyString": true,
                             "formatDate": [Function],
                             "formatDateTimeRange": [Function],
                             "formatDateToParts": [Function],
@@ -438,6 +449,7 @@ exports[`components/threading/channel_threads/thread_footer should report total
                             "locale": "en",
                             "messages": Object {},
                             "onError": [Function],
+                            "onWarn": [Function],
                             "textComponent": "span",
                             "timeZone": "Etc/UTC",
                             "wrapRichTextChunksInFragment": undefined,
@@ -545,9 +557,11 @@ exports[`components/threading/channel_threads/thread_footer should report total
                   hide={[Function]}
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -574,6 +588,7 @@ exports[`components/threading/channel_threads/thread_footer should report total
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -629,9 +644,11 @@ exports[`components/threading/channel_threads/thread_footer should report total
                         id="name-3"
                         intl={
                           Object {
+                            "$t": [Function],
                             "defaultFormats": Object {},
                             "defaultLocale": "en",
                             "defaultRichTextElements": undefined,
+                            "fallbackOnEmptyString": true,
                             "formatDate": [Function],
                             "formatDateTimeRange": [Function],
                             "formatDateToParts": [Function],
@@ -658,6 +675,7 @@ exports[`components/threading/channel_threads/thread_footer should report total
                             "locale": "en",
                             "messages": Object {},
                             "onError": [Function],
+                            "onWarn": [Function],
                             "textComponent": "span",
                             "timeZone": "Etc/UTC",
                             "wrapRichTextChunksInFragment": undefined,
@@ -763,9 +781,11 @@ exports[`components/threading/channel_threads/thread_footer should report total
                   id="names-overflow"
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -792,6 +812,7 @@ exports[`components/threading/channel_threads/thread_footer should report total
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -954,9 +975,11 @@ exports[`components/threading/channel_threads/thread_footer should report total
           hourCycle="h12"
           intl={
             Object {
+              "$t": [Function],
               "defaultFormats": Object {},
               "defaultLocale": "en",
               "defaultRichTextElements": undefined,
+              "fallbackOnEmptyString": true,
               "formatDate": [Function],
               "formatDateTimeRange": [Function],
               "formatDateToParts": [Function],
@@ -983,6 +1006,7 @@ exports[`components/threading/channel_threads/thread_footer should report total
               "locale": "en",
               "messages": Object {},
               "onError": [Function],
+              "onWarn": [Function],
               "textComponent": "span",
               "timeZone": "Etc/UTC",
               "wrapRichTextChunksInFragment": undefined,
@@ -1105,9 +1129,11 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
               id="threadFooterIndicator"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1134,6 +1160,7 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1233,9 +1260,11 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                   hide={[Function]}
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -1262,6 +1291,7 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -1317,9 +1347,11 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                         id="name-5"
                         intl={
                           Object {
+                            "$t": [Function],
                             "defaultFormats": Object {},
                             "defaultLocale": "en",
                             "defaultRichTextElements": undefined,
+                            "fallbackOnEmptyString": true,
                             "formatDate": [Function],
                             "formatDateTimeRange": [Function],
                             "formatDateToParts": [Function],
@@ -1346,6 +1378,7 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                             "locale": "en",
                             "messages": Object {},
                             "onError": [Function],
+                            "onWarn": [Function],
                             "textComponent": "span",
                             "timeZone": "Etc/UTC",
                             "wrapRichTextChunksInFragment": undefined,
@@ -1453,9 +1486,11 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                   hide={[Function]}
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -1482,6 +1517,7 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -1537,9 +1573,11 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                         id="name-4"
                         intl={
                           Object {
+                            "$t": [Function],
                             "defaultFormats": Object {},
                             "defaultLocale": "en",
                             "defaultRichTextElements": undefined,
+                            "fallbackOnEmptyString": true,
                             "formatDate": [Function],
                             "formatDateTimeRange": [Function],
                             "formatDateToParts": [Function],
@@ -1566,6 +1604,7 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                             "locale": "en",
                             "messages": Object {},
                             "onError": [Function],
+                            "onWarn": [Function],
                             "textComponent": "span",
                             "timeZone": "Etc/UTC",
                             "wrapRichTextChunksInFragment": undefined,
@@ -1673,9 +1712,11 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                   hide={[Function]}
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -1702,6 +1743,7 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -1757,9 +1799,11 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                         id="name-3"
                         intl={
                           Object {
+                            "$t": [Function],
                             "defaultFormats": Object {},
                             "defaultLocale": "en",
                             "defaultRichTextElements": undefined,
+                            "fallbackOnEmptyString": true,
                             "formatDate": [Function],
                             "formatDateTimeRange": [Function],
                             "formatDateToParts": [Function],
@@ -1786,6 +1830,7 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                             "locale": "en",
                             "messages": Object {},
                             "onError": [Function],
+                            "onWarn": [Function],
                             "textComponent": "span",
                             "timeZone": "Etc/UTC",
                             "wrapRichTextChunksInFragment": undefined,
@@ -1891,9 +1936,11 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                   id="names-overflow"
                   intl={
                     Object {
+                      "$t": [Function],
                       "defaultFormats": Object {},
                       "defaultLocale": "en",
                       "defaultRichTextElements": undefined,
+                      "fallbackOnEmptyString": true,
                       "formatDate": [Function],
                       "formatDateTimeRange": [Function],
                       "formatDateToParts": [Function],
@@ -1920,6 +1967,7 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
                       "locale": "en",
                       "messages": Object {},
                       "onError": [Function],
+                      "onWarn": [Function],
                       "textComponent": "span",
                       "timeZone": "Etc/UTC",
                       "wrapRichTextChunksInFragment": undefined,
@@ -2082,9 +2130,11 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
           hourCycle="h12"
           intl={
             Object {
+              "$t": [Function],
               "defaultFormats": Object {},
               "defaultLocale": "en",
               "defaultRichTextElements": undefined,
+              "fallbackOnEmptyString": true,
               "formatDate": [Function],
               "formatDateTimeRange": [Function],
               "formatDateToParts": [Function],
@@ -2111,6 +2161,7 @@ exports[`components/threading/channel_threads/thread_footer should show unread i
               "locale": "en",
               "messages": Object {},
               "onError": [Function],
+              "onWarn": [Function],
               "textComponent": "span",
               "timeZone": "Etc/UTC",
               "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/threading/global_threads/global_threads.tsx b/webapp/channels/src/components/threading/global_threads/global_threads.tsx
index 6096168747..9304aecd22 100644
--- a/webapp/channels/src/components/threading/global_threads/global_threads.tsx
+++ b/webapp/channels/src/components/threading/global_threads/global_threads.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React, {memo, useCallback, useEffect, useState} from 'react';
+import React, {ReactNode, memo, useCallback, useEffect, useState} from 'react';
 import {useIntl} from 'react-intl';
 import {isEmpty} from 'lodash';
 import {Link, useRouteMatch} from 'react-router-dom';
@@ -215,7 +215,7 @@ const GlobalThreads = () => {
                                 id: 'globalThreads.threadPane.unselectedTitle',
                                 defaultMessage: '{numUnread, plural, =0 {Looks like you’re all caught up} other {Catch up on your threads}}',
                             }, {numUnread})}
-                            subtitle={formatMessage({
+                            subtitle={formatMessage<ReactNode>({
                                 id: 'globalThreads.threadPane.unreadMessageLink',
                                 defaultMessage: 'You have {numUnread, plural, =0 {no unread threads} =1 {<link>{numUnread} thread</link>} other {<link>{numUnread} threads</link>}} {numUnread, plural, =0 {} other {with unread messages}}',
                             }, {
diff --git a/webapp/channels/src/components/tours/crt_tour/crt_threads_pane_tutorial_tip.tsx b/webapp/channels/src/components/tours/crt_tour/crt_threads_pane_tutorial_tip.tsx
index 907966e23f..549bdd2521 100644
--- a/webapp/channels/src/components/tours/crt_tour/crt_threads_pane_tutorial_tip.tsx
+++ b/webapp/channels/src/components/tours/crt_tour/crt_threads_pane_tutorial_tip.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React from 'react';
+import React, {ReactNode} from 'react';
 import {FormattedMessage, useIntl} from 'react-intl';
 import {useDispatch, useSelector} from 'react-redux';
 
@@ -29,7 +29,7 @@ const CRTThreadsPaneTutorialTip = () => {
 
     const screen = (
         <p>
-            {formatMessage(
+            {formatMessage<ReactNode>(
                 {
                     id: 'tutorial_threads.threads_pane.description',
                     defaultMessage: 'Click the <b>Follow</b> button to be notified about replies and see it in your <b>Threads</b> view. Within a thread, the <b>New Messages</b> line shows you where you left off.',
diff --git a/webapp/channels/src/components/tours/crt_tour/crt_unread_tutorial_tip.tsx b/webapp/channels/src/components/tours/crt_tour/crt_unread_tutorial_tip.tsx
index 37b3d2e8c7..f86d207528 100644
--- a/webapp/channels/src/components/tours/crt_tour/crt_unread_tutorial_tip.tsx
+++ b/webapp/channels/src/components/tours/crt_tour/crt_unread_tutorial_tip.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React from 'react';
+import React, {ReactNode} from 'react';
 import {FormattedMessage, useIntl} from 'react-intl';
 
 import {useMeasurePunchouts} from '@mattermost/components';
@@ -19,7 +19,7 @@ const CRTUnreadTutorialTip = () => {
 
     const screen = (
         <p>
-            {formatMessage(
+            {formatMessage<ReactNode>(
                 {
                     id: 'tutorial_threads.unread.description',
                     defaultMessage: 'You can switch to <b>Unreads</b> to show only threads that are unread.',
diff --git a/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap b/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap
index bada1bc768..bb7813eb26 100644
--- a/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap
+++ b/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap
@@ -1177,9 +1177,11 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                           id="name-id0"
                                                           intl={
                                                             Object {
+                                                              "$t": [Function],
                                                               "defaultFormats": Object {},
                                                               "defaultLocale": "en",
                                                               "defaultRichTextElements": undefined,
+                                                              "fallbackOnEmptyString": true,
                                                               "formatDate": [Function],
                                                               "formatDateTimeRange": [Function],
                                                               "formatDateToParts": [Function],
@@ -1206,6 +1208,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                               "locale": "en",
                                                               "messages": Object {},
                                                               "onError": [Function],
+                                                              "onWarn": [Function],
                                                               "textComponent": "span",
                                                               "timeZone": "Etc/UTC",
                                                               "wrapRichTextChunksInFragment": undefined,
@@ -1393,9 +1396,11 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                           id="name-id1"
                                                           intl={
                                                             Object {
+                                                              "$t": [Function],
                                                               "defaultFormats": Object {},
                                                               "defaultLocale": "en",
                                                               "defaultRichTextElements": undefined,
+                                                              "fallbackOnEmptyString": true,
                                                               "formatDate": [Function],
                                                               "formatDateTimeRange": [Function],
                                                               "formatDateToParts": [Function],
@@ -1422,6 +1427,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                               "locale": "en",
                                                               "messages": Object {},
                                                               "onError": [Function],
+                                                              "onWarn": [Function],
                                                               "textComponent": "span",
                                                               "timeZone": "Etc/UTC",
                                                               "wrapRichTextChunksInFragment": undefined,
@@ -1609,9 +1615,11 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                           id="name-id10"
                                                           intl={
                                                             Object {
+                                                              "$t": [Function],
                                                               "defaultFormats": Object {},
                                                               "defaultLocale": "en",
                                                               "defaultRichTextElements": undefined,
+                                                              "fallbackOnEmptyString": true,
                                                               "formatDate": [Function],
                                                               "formatDateTimeRange": [Function],
                                                               "formatDateToParts": [Function],
@@ -1638,6 +1646,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                               "locale": "en",
                                                               "messages": Object {},
                                                               "onError": [Function],
+                                                              "onWarn": [Function],
                                                               "textComponent": "span",
                                                               "timeZone": "Etc/UTC",
                                                               "wrapRichTextChunksInFragment": undefined,
@@ -1825,9 +1834,11 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                           id="name-id11"
                                                           intl={
                                                             Object {
+                                                              "$t": [Function],
                                                               "defaultFormats": Object {},
                                                               "defaultLocale": "en",
                                                               "defaultRichTextElements": undefined,
+                                                              "fallbackOnEmptyString": true,
                                                               "formatDate": [Function],
                                                               "formatDateTimeRange": [Function],
                                                               "formatDateToParts": [Function],
@@ -1854,6 +1865,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                               "locale": "en",
                                                               "messages": Object {},
                                                               "onError": [Function],
+                                                              "onWarn": [Function],
                                                               "textComponent": "span",
                                                               "timeZone": "Etc/UTC",
                                                               "wrapRichTextChunksInFragment": undefined,
@@ -2041,9 +2053,11 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                           id="name-id12"
                                                           intl={
                                                             Object {
+                                                              "$t": [Function],
                                                               "defaultFormats": Object {},
                                                               "defaultLocale": "en",
                                                               "defaultRichTextElements": undefined,
+                                                              "fallbackOnEmptyString": true,
                                                               "formatDate": [Function],
                                                               "formatDateTimeRange": [Function],
                                                               "formatDateToParts": [Function],
@@ -2070,6 +2084,7 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                               "locale": "en",
                                                               "messages": Object {},
                                                               "onError": [Function],
+                                                              "onWarn": [Function],
                                                               "textComponent": "span",
                                                               "timeZone": "Etc/UTC",
                                                               "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/user_group_popover/group_member_list/__snapshots__/group_member_list.test.tsx.snap b/webapp/channels/src/components/user_group_popover/group_member_list/__snapshots__/group_member_list.test.tsx.snap
index 2af3bd35f5..5b176b147b 100644
--- a/webapp/channels/src/components/user_group_popover/group_member_list/__snapshots__/group_member_list.test.tsx.snap
+++ b/webapp/channels/src/components/user_group_popover/group_member_list/__snapshots__/group_member_list.test.tsx.snap
@@ -457,9 +457,11 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                           id="name-id0"
                                           intl={
                                             Object {
+                                              "$t": [Function],
                                               "defaultFormats": Object {},
                                               "defaultLocale": "en",
                                               "defaultRichTextElements": undefined,
+                                              "fallbackOnEmptyString": true,
                                               "formatDate": [Function],
                                               "formatDateTimeRange": [Function],
                                               "formatDateToParts": [Function],
@@ -486,6 +488,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                               "locale": "en",
                                               "messages": Object {},
                                               "onError": [Function],
+                                              "onWarn": [Function],
                                               "textComponent": "span",
                                               "timeZone": "Etc/UTC",
                                               "wrapRichTextChunksInFragment": undefined,
@@ -673,9 +676,11 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                           id="name-id1"
                                           intl={
                                             Object {
+                                              "$t": [Function],
                                               "defaultFormats": Object {},
                                               "defaultLocale": "en",
                                               "defaultRichTextElements": undefined,
+                                              "fallbackOnEmptyString": true,
                                               "formatDate": [Function],
                                               "formatDateTimeRange": [Function],
                                               "formatDateToParts": [Function],
@@ -702,6 +707,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                               "locale": "en",
                                               "messages": Object {},
                                               "onError": [Function],
+                                              "onWarn": [Function],
                                               "textComponent": "span",
                                               "timeZone": "Etc/UTC",
                                               "wrapRichTextChunksInFragment": undefined,
@@ -889,9 +895,11 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                           id="name-id2"
                                           intl={
                                             Object {
+                                              "$t": [Function],
                                               "defaultFormats": Object {},
                                               "defaultLocale": "en",
                                               "defaultRichTextElements": undefined,
+                                              "fallbackOnEmptyString": true,
                                               "formatDate": [Function],
                                               "formatDateTimeRange": [Function],
                                               "formatDateToParts": [Function],
@@ -918,6 +926,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                               "locale": "en",
                                               "messages": Object {},
                                               "onError": [Function],
+                                              "onWarn": [Function],
                                               "textComponent": "span",
                                               "timeZone": "Etc/UTC",
                                               "wrapRichTextChunksInFragment": undefined,
@@ -1105,9 +1114,11 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                           id="name-id3"
                                           intl={
                                             Object {
+                                              "$t": [Function],
                                               "defaultFormats": Object {},
                                               "defaultLocale": "en",
                                               "defaultRichTextElements": undefined,
+                                              "fallbackOnEmptyString": true,
                                               "formatDate": [Function],
                                               "formatDateTimeRange": [Function],
                                               "formatDateToParts": [Function],
@@ -1134,6 +1145,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                               "locale": "en",
                                               "messages": Object {},
                                               "onError": [Function],
+                                              "onWarn": [Function],
                                               "textComponent": "span",
                                               "timeZone": "Etc/UTC",
                                               "wrapRichTextChunksInFragment": undefined,
@@ -1321,9 +1333,11 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                           id="name-id4"
                                           intl={
                                             Object {
+                                              "$t": [Function],
                                               "defaultFormats": Object {},
                                               "defaultLocale": "en",
                                               "defaultRichTextElements": undefined,
+                                              "fallbackOnEmptyString": true,
                                               "formatDate": [Function],
                                               "formatDateTimeRange": [Function],
                                               "formatDateToParts": [Function],
@@ -1350,6 +1364,7 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                               "locale": "en",
                                               "messages": Object {},
                                               "onError": [Function],
+                                              "onWarn": [Function],
                                               "textComponent": "span",
                                               "timeZone": "Etc/UTC",
                                               "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/widgets/menu/menu_items/useWords.tsx b/webapp/channels/src/components/widgets/menu/menu_items/useWords.tsx
index b6834ce9f8..2f0c19edda 100644
--- a/webapp/channels/src/components/widgets/menu/menu_items/useWords.tsx
+++ b/webapp/channels/src/components/widgets/menu/menu_items/useWords.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React from 'react';
+import React, {ReactNode} from 'react';
 import {useIntl} from 'react-intl';
 import {PrimitiveType, FormatXMLElementFn} from 'intl-messageformat';
 
@@ -118,7 +118,7 @@ export default function useWords(highestLimit: LimitSummary | false, isAdminUser
                 id: 'workspace_limits.menu_limit.messages',
                 defaultMessage: 'Total messages',
             }),
-            description: intl.formatMessage(
+            description: intl.formatMessage<ReactNode>(
                 {
                     id,
                     defaultMessage,
@@ -150,7 +150,7 @@ export default function useWords(highestLimit: LimitSummary | false, isAdminUser
                 id: 'workspace_limits.menu_limit.file_storage',
                 defaultMessage: 'File storage limit',
             }),
-            description: intl.formatMessage(
+            description: intl.formatMessage<ReactNode>(
                 {
                     id,
                     defaultMessage,
diff --git a/webapp/channels/src/components/widgets/users/avatars/__snapshots__/avatars.test.tsx.snap b/webapp/channels/src/components/widgets/users/avatars/__snapshots__/avatars.test.tsx.snap
index 251977f749..c60ea6c672 100644
--- a/webapp/channels/src/components/widgets/users/avatars/__snapshots__/avatars.test.tsx.snap
+++ b/webapp/channels/src/components/widgets/users/avatars/__snapshots__/avatars.test.tsx.snap
@@ -59,9 +59,11 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
               hide={[Function]}
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -88,6 +90,7 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -143,9 +146,11 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
                     id="name-1"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -172,6 +177,7 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
@@ -279,9 +285,11 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
               hide={[Function]}
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -308,6 +316,7 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -363,9 +372,11 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
                     id="name-6"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -392,6 +403,7 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
@@ -499,9 +511,11 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
               hide={[Function]}
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -528,6 +542,7 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -583,9 +598,11 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
                     id="name-7"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -612,6 +629,7 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
@@ -717,9 +735,11 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
               id="names-overflow"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -746,6 +766,7 @@ exports[`components/widgets/users/Avatars should fetch missing users 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -860,9 +881,11 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
               hide={[Function]}
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -889,6 +912,7 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -944,9 +968,11 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
                     id="name-1"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -973,6 +999,7 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
@@ -1080,9 +1107,11 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
               hide={[Function]}
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1109,6 +1138,7 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1164,9 +1194,11 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
                     id="name-2"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -1193,6 +1225,7 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
@@ -1300,9 +1333,11 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
               hide={[Function]}
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1329,6 +1364,7 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1384,9 +1420,11 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
                     id="name-3"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -1413,6 +1451,7 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
@@ -1518,9 +1557,11 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
               id="names-overflow"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1547,6 +1588,7 @@ exports[`components/widgets/users/Avatars should properly count overflow 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1659,9 +1701,11 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
               hide={[Function]}
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1688,6 +1732,7 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1743,9 +1788,11 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
                     id="name-1"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -1772,6 +1819,7 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
@@ -1879,9 +1927,11 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
               hide={[Function]}
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1908,6 +1958,7 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1963,9 +2014,11 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
                     id="name-2"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -1992,6 +2045,7 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
@@ -2099,9 +2153,11 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
               hide={[Function]}
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -2128,6 +2184,7 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -2183,9 +2240,11 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
                     id="name-3"
                     intl={
                       Object {
+                        "$t": [Function],
                         "defaultFormats": Object {},
                         "defaultLocale": "en",
                         "defaultRichTextElements": undefined,
+                        "fallbackOnEmptyString": true,
                         "formatDate": [Function],
                         "formatDateTimeRange": [Function],
                         "formatDateToParts": [Function],
@@ -2212,6 +2271,7 @@ exports[`components/widgets/users/Avatars should support userIds 1`] = `
                         "locale": "en",
                         "messages": Object {},
                         "onError": [Function],
+                        "onWarn": [Function],
                         "textComponent": "span",
                         "timeZone": "Etc/UTC",
                         "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/plugins/channel_header_plug/__snapshots__/channel_header_plug.test.tsx.snap b/webapp/channels/src/plugins/channel_header_plug/__snapshots__/channel_header_plug.test.tsx.snap
index af45331634..1f86fdb0ad 100644
--- a/webapp/channels/src/plugins/channel_header_plug/__snapshots__/channel_header_plug.test.tsx.snap
+++ b/webapp/channels/src/plugins/channel_header_plug/__snapshots__/channel_header_plug.test.tsx.snap
@@ -59,9 +59,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot when the App Bar is vis
   }
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -88,6 +90,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot when the App Bar is vis
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -114,9 +117,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with no extended compon
   components={Array []}
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -143,6 +148,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with no extended compon
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -182,9 +188,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with one extended compo
   }
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -211,6 +219,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with one extended compo
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -264,9 +273,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with one extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -293,6 +304,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with one extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -501,9 +513,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
   }
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -530,6 +544,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -583,9 +598,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -612,6 +629,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -693,9 +711,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -722,6 +742,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -803,9 +824,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -832,6 +855,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -913,9 +937,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -942,6 +968,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1023,9 +1050,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1052,6 +1081,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1133,9 +1163,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1162,6 +1194,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1243,9 +1276,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1272,6 +1307,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1353,9 +1389,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1382,6 +1420,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1463,9 +1502,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1492,6 +1533,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1573,9 +1615,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1602,6 +1646,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1683,9 +1728,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1712,6 +1759,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1793,9 +1841,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1822,6 +1872,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -1903,9 +1954,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -1932,6 +1985,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -2013,9 +2067,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -2042,6 +2098,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
@@ -2123,9 +2180,11 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
               id="pluginTooltip"
               intl={
                 Object {
+                  "$t": [Function],
                   "defaultFormats": Object {},
                   "defaultLocale": "en",
                   "defaultRichTextElements": undefined,
+                  "fallbackOnEmptyString": true,
                   "formatDate": [Function],
                   "formatDateTimeRange": [Function],
                   "formatDateToParts": [Function],
@@ -2152,6 +2211,7 @@ exports[`plugins/ChannelHeaderPlug should match snapshot with six extended compo
                   "locale": "en",
                   "messages": Object {},
                   "onError": [Function],
+                  "onWarn": [Function],
                   "textComponent": "span",
                   "timeZone": "Etc/UTC",
                   "wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/plugins/mobile_channel_header_plug/__snapshots__/mobile_channel_header_plug.test.tsx.snap b/webapp/channels/src/plugins/mobile_channel_header_plug/__snapshots__/mobile_channel_header_plug.test.tsx.snap
index cbf9f0b2c0..81c46341e7 100644
--- a/webapp/channels/src/plugins/mobile_channel_header_plug/__snapshots__/mobile_channel_header_plug.test.tsx.snap
+++ b/webapp/channels/src/plugins/mobile_channel_header_plug/__snapshots__/mobile_channel_header_plug.test.tsx.snap
@@ -16,9 +16,11 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with no binding,
   components={Array []}
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -45,6 +47,7 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with no binding,
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -70,9 +73,11 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with no bindings
   components={Array []}
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -99,6 +104,7 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with no bindings
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -124,9 +130,11 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with no extended
   components={Array []}
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -153,6 +161,7 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with no extended
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -178,9 +187,11 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with no extended
   components={Array []}
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -207,6 +218,7 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with no extended
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -306,9 +318,11 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with one binding,
   components={Array []}
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -335,6 +349,7 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with one binding,
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -454,9 +469,11 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with one extended
   }
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -483,6 +500,7 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with one extended
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -547,9 +565,11 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with one extended
   }
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -576,6 +596,7 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with one extended
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -642,9 +663,11 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with one extended
   }
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -671,6 +694,7 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with one extended
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -723,9 +747,11 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with two bindings
   components={Array []}
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -752,6 +778,7 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with two bindings
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
@@ -876,9 +903,11 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with two extended
   }
   intl={
     Object {
+      "$t": [Function],
       "defaultFormats": Object {},
       "defaultLocale": "en",
       "defaultRichTextElements": undefined,
+      "fallbackOnEmptyString": true,
       "formatDate": [Function],
       "formatDateTimeRange": [Function],
       "formatDateToParts": [Function],
@@ -905,6 +934,7 @@ exports[`plugins/MobileChannelHeaderPlug should match snapshot with two extended
       "locale": "en",
       "messages": Object {},
       "onError": [Function],
+      "onWarn": [Function],
       "textComponent": "span",
       "timeZone": "Etc/UTC",
     }
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index b666571cc3..446d433da2 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -15,12 +15,16 @@
         "playbooks",
         "boards"
       ],
+      "dependencies": {
+        "react-intl": "6.3.2"
+      },
       "devDependencies": {
         "blessed": "0.1.81",
         "chalk": "4.1.2",
         "concurrently": "7.6.0",
         "cross-env": "7.0.3",
         "eslint": "8.37.0",
+        "eslint-plugin-formatjs": "4.9.1",
         "strip-ansi": "6.0.1"
       },
       "engines": {
@@ -62,7 +66,7 @@
         "react-dom": "17.0.2",
         "react-hot-keys": "^2.7.1",
         "react-hotkeys-hook": "^3.4.4",
-        "react-intl": "^5.20.0",
+        "react-intl": "*",
         "react-redux": "^7.2.1",
         "react-router-dom": "^5.2.0",
         "react-select": "5.5.9",
@@ -110,7 +114,6 @@
         "css-loader": "6.7.1",
         "eslint-import-resolver-webpack": "0.13.2",
         "eslint-plugin-babel": "^5.3.1",
-        "eslint-plugin-formatjs": "4.9.0",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-import": "2.25.4",
         "eslint-plugin-import-newlines": "1.3.1",
@@ -1561,138 +1564,6 @@
         "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "boards/node_modules/eslint-plugin-formatjs": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-formatjs/-/eslint-plugin-formatjs-4.9.0.tgz",
-      "integrity": "sha512-U3u8TI/Mogo3sunTHDh24mc3p1zWAz/VaYjSkGhuYcLmqfkqEr3BmGUNQ8NTDvZviYHNTkhjHWuXQnUkh81grQ==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/icu-messageformat-parser": "2.3.0",
-        "@formatjs/ts-transformer": "3.12.0",
-        "@types/eslint": "7 || 8",
-        "@types/picomatch": "^2.3.0",
-        "@typescript-eslint/typescript-estree": "5.45.0",
-        "emoji-regex": "^10.2.1",
-        "magic-string": "^0.29.0",
-        "picomatch": "^2.3.1",
-        "tslib": "2.4.0",
-        "typescript": "^4.7",
-        "unicode-emoji-utils": "^1.1.1"
-      },
-      "peerDependencies": {
-        "eslint": "7 || 8"
-      }
-    },
-    "boards/node_modules/eslint-plugin-formatjs/node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.3.tgz",
-      "integrity": "sha512-SlsbRC/RX+/zg4AApWIFNDdkLtFbkq3LNoZWXZCE/nHVKqoIJyaoQyge/I0Y38vLxowUn9KTtXgusLD91+orbg==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/intl-localematcher": "0.2.32",
-        "tslib": "^2.4.0"
-      }
-    },
-    "boards/node_modules/eslint-plugin-formatjs/node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.3.0.tgz",
-      "integrity": "sha512-xqtlqYAbfJDF4b6e4O828LBNOWXrFcuYadqAbYORlDRwhyJ2bH+xpUBPldZbzRGUN2mxlZ4Ykhm7jvERtmI8NQ==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.14.3",
-        "@formatjs/icu-skeleton-parser": "1.3.18",
-        "tslib": "^2.4.0"
-      }
-    },
-    "boards/node_modules/eslint-plugin-formatjs/node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.3.18",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.18.tgz",
-      "integrity": "sha512-ND1ZkZfmLPcHjAH1sVpkpQxA+QYfOX3py3SjKWMUVGDow18gZ0WPqz3F+pJLYQMpS2LnnQ5zYR2jPVYTbRwMpg==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.14.3",
-        "tslib": "^2.4.0"
-      }
-    },
-    "boards/node_modules/eslint-plugin-formatjs/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.2.32",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.32.tgz",
-      "integrity": "sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "boards/node_modules/eslint-plugin-formatjs/node_modules/@typescript-eslint/types": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.0.tgz",
-      "integrity": "sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "boards/node_modules/eslint-plugin-formatjs/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz",
-      "integrity": "sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.45.0",
-        "@typescript-eslint/visitor-keys": "5.45.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "boards/node_modules/eslint-plugin-formatjs/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz",
-      "integrity": "sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.45.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "boards/node_modules/eslint-plugin-formatjs/node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
     "boards/node_modules/eslint-plugin-import": {
       "version": "2.25.4",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz",
@@ -2867,18 +2738,6 @@
       "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
       "dev": true
     },
-    "boards/node_modules/magic-string": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz",
-      "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "boards/node_modules/marked": {
       "version": "4.0.17",
       "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.17.tgz",
@@ -3288,12 +3147,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "boards/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "boards/node_modules/typescript": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
@@ -3616,7 +3469,7 @@
         "react-day-picker": "8.3.6",
         "react-dom": "17.0.2",
         "react-hot-loader": "4.13.0",
-        "react-intl": "5.20.10",
+        "react-intl": "*",
         "react-is": "17.0.2",
         "react-overlays": "0.9.3",
         "react-popper": "2.3.0",
@@ -3708,7 +3561,6 @@
         "enzyme-adapter-react-17-updated": "1.0.2",
         "enzyme-to-json": "3.6.2",
         "eslint-import-resolver-webpack": "0.13.2",
-        "eslint-plugin-formatjs": "4.9.1",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-import": "2.27.5",
         "eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#5b0c972eacf19286e4c66221b39113bf8728a99e",
@@ -3780,69 +3632,6 @@
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "channels/node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.3.tgz",
-      "integrity": "sha512-SlsbRC/RX+/zg4AApWIFNDdkLtFbkq3LNoZWXZCE/nHVKqoIJyaoQyge/I0Y38vLxowUn9KTtXgusLD91+orbg==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/intl-localematcher": "0.2.32",
-        "tslib": "^2.4.0"
-      }
-    },
-    "channels/node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.3.0.tgz",
-      "integrity": "sha512-xqtlqYAbfJDF4b6e4O828LBNOWXrFcuYadqAbYORlDRwhyJ2bH+xpUBPldZbzRGUN2mxlZ4Ykhm7jvERtmI8NQ==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.14.3",
-        "@formatjs/icu-skeleton-parser": "1.3.18",
-        "tslib": "^2.4.0"
-      }
-    },
-    "channels/node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.3.18",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.18.tgz",
-      "integrity": "sha512-ND1ZkZfmLPcHjAH1sVpkpQxA+QYfOX3py3SjKWMUVGDow18gZ0WPqz3F+pJLYQMpS2LnnQ5zYR2jPVYTbRwMpg==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.14.3",
-        "tslib": "^2.4.0"
-      }
-    },
-    "channels/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.2.32",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.32.tgz",
-      "integrity": "sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "channels/node_modules/@formatjs/ts-transformer": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.12.0.tgz",
-      "integrity": "sha512-/jEpXcqA6y/vdijgkxSoKGfkGR5VcClJeI8hnpJ2PBCHfrc4ywFMyoZqRAakKW3IJVttaDo7mGvBAIDxV1F4Qg==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/icu-messageformat-parser": "2.3.0",
-        "@types/json-stable-stringify": "^1.0.32",
-        "@types/node": "14 || 16 || 17",
-        "chalk": "^4.0.0",
-        "json-stable-stringify": "^1.0.1",
-        "tslib": "^2.4.0",
-        "typescript": "^4.7"
-      },
-      "peerDependencies": {
-        "ts-jest": ">=27"
-      },
-      "peerDependenciesMeta": {
-        "ts-jest": {
-          "optional": true
-        }
-      }
-    },
     "channels/node_modules/@testing-library/user-event": {
       "version": "12.1.4",
       "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.1.4.tgz",
@@ -4097,85 +3886,6 @@
         "ms": "^2.1.1"
       }
     },
-    "channels/node_modules/eslint-plugin-formatjs": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-formatjs/-/eslint-plugin-formatjs-4.9.1.tgz",
-      "integrity": "sha512-e6A7v84y6/RgXRYWqIQHJSHKutXGsQVdkYkzL7pgw5cJGEao0YVFqrbYu8ckbQsxQWfq8Dai4w0A/531F0mm2A==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/icu-messageformat-parser": "2.3.0",
-        "@formatjs/ts-transformer": "3.12.0",
-        "@types/eslint": "7 || 8",
-        "@types/picomatch": "^2.3.0",
-        "@typescript-eslint/typescript-estree": "5.45.0",
-        "emoji-regex": "^10.2.1",
-        "magic-string": "^0.29.0",
-        "picomatch": "^2.3.1",
-        "tslib": "2.4.0",
-        "typescript": "^4.7",
-        "unicode-emoji-utils": "^1.1.1"
-      },
-      "peerDependencies": {
-        "eslint": "7 || 8"
-      }
-    },
-    "channels/node_modules/eslint-plugin-formatjs/node_modules/@typescript-eslint/types": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.0.tgz",
-      "integrity": "sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "channels/node_modules/eslint-plugin-formatjs/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz",
-      "integrity": "sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.45.0",
-        "@typescript-eslint/visitor-keys": "5.45.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "channels/node_modules/eslint-plugin-formatjs/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz",
-      "integrity": "sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.45.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "channels/node_modules/eslint-plugin-import": {
       "version": "2.27.5",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
@@ -4382,18 +4092,6 @@
         }
       }
     },
-    "channels/node_modules/magic-string": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz",
-      "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "channels/node_modules/natural-compare-lite": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
@@ -4452,12 +4150,6 @@
         "react-dom": ">=15.0.0"
       }
     },
-    "channels/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "node_modules/@adobe/css-tools": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz",
@@ -7343,57 +7035,56 @@
       }
     },
     "node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.9.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.8.tgz",
-      "integrity": "sha512-2U4n11bLmTij/k4ePCEFKJILPYwdMcJTdnKVBi+JMWBgu5O1N+XhCazlE6QXqVO1Agh2Doh0b/9Jf1mSmSVfhA==",
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.3.tgz",
+      "integrity": "sha512-SlsbRC/RX+/zg4AApWIFNDdkLtFbkq3LNoZWXZCE/nHVKqoIJyaoQyge/I0Y38vLxowUn9KTtXgusLD91+orbg==",
       "dependencies": {
-        "@formatjs/intl-localematcher": "0.2.20",
-        "tslib": "^2.1.0"
+        "@formatjs/intl-localematcher": "0.2.32",
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/@formatjs/fast-memoize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.0.tgz",
-      "integrity": "sha512-fObitP9Tlc31SKrPHgkPgQpGo4+4yXfQQITTCNH8AZdEqB7Mq4nPrjpUL/tNGN3lEeJcFxDbi0haX8HM7QvQ8w==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.0.1.tgz",
+      "integrity": "sha512-M2GgV+qJn5WJQAYewz7q2Cdl6fobQa69S1AzSM2y0P68ZDbK5cWrJIcPCO395Of1ksftGZoOt4LYCO/j9BKBSA==",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.11.tgz",
-      "integrity": "sha512-5mWb8U8aulYGwnDZWrr+vdgn5PilvtrqQYQ1pvpgzQes/osi85TwmL2GqTGLlKIvBKD2XNA61kAqXYY95w4LWg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.3.0.tgz",
+      "integrity": "sha512-xqtlqYAbfJDF4b6e4O828LBNOWXrFcuYadqAbYORlDRwhyJ2bH+xpUBPldZbzRGUN2mxlZ4Ykhm7jvERtmI8NQ==",
       "dependencies": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/icu-skeleton-parser": "1.2.12",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/icu-skeleton-parser": "1.3.18",
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.2.12",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.12.tgz",
-      "integrity": "sha512-DTFxWmEA02ZNW6fsYjGYSADvtrqqjCYF7DSgCmMfaaE0gLP4pCdAgOPE+lkXXU+jP8iCw/YhMT2Seyk/C5lBWg==",
+      "version": "1.3.18",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.18.tgz",
+      "integrity": "sha512-ND1ZkZfmLPcHjAH1sVpkpQxA+QYfOX3py3SjKWMUVGDow18gZ0WPqz3F+pJLYQMpS2LnnQ5zYR2jPVYTbRwMpg==",
       "dependencies": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/@formatjs/intl": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.14.1.tgz",
-      "integrity": "sha512-mtL8oBgFwTu0GHFnxaF93fk/zNzNkPzl+27Fwg5AZ88pWHWb7037dpODzoCBnaIVk4FBO5emUn/6jI9Byj8hOw==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.6.9.tgz",
+      "integrity": "sha512-EtcMZ9O24YSASu/jGOaTQtArx7XROjlKiO4KmkxJ/3EyAQLCr5hrS+KKvNud0a7GIwBucOb3IFrZ7WiSm2A/Cw==",
       "dependencies": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/fast-memoize": "1.2.0",
-        "@formatjs/icu-messageformat-parser": "2.0.11",
-        "@formatjs/intl-displaynames": "5.2.3",
-        "@formatjs/intl-listformat": "6.3.3",
-        "intl-messageformat": "9.9.1",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/fast-memoize": "2.0.1",
+        "@formatjs/icu-messageformat-parser": "2.3.0",
+        "@formatjs/intl-displaynames": "6.2.6",
+        "@formatjs/intl-listformat": "7.1.9",
+        "intl-messageformat": "10.3.3",
+        "tslib": "^2.4.0"
       },
       "peerDependencies": {
-        "@types/node": "14 || 16",
-        "typescript": "^4.2"
+        "typescript": "^4.7"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -7402,31 +7093,31 @@
       }
     },
     "node_modules/@formatjs/intl-displaynames": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.2.3.tgz",
-      "integrity": "sha512-5BmhSurLbfgdeo0OBcNPPkIS8ikMMYaHe2NclxEQZqcMvrnQzNMNnUE2dDF5vZx+mkvKq77aQYzpc8RfqVsRCQ==",
+      "version": "6.2.6",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.2.6.tgz",
+      "integrity": "sha512-scf5AQTk9EjpvPhboo5sizVOvidTdMOnajv9z+0cejvl7JNl9bl/aMrNBgC72UH+bP3l45usPUKAGskV6sNIrA==",
       "dependencies": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/intl-localematcher": "0.2.20",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/intl-localematcher": "0.2.32",
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/@formatjs/intl-listformat": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.3.3.tgz",
-      "integrity": "sha512-3nzAKgVS5rePDa5HiH0OwZgAhqxLtzlMc9Pg4QgajRHSP1TqFiMmQnnn52wd3+xVTb7cjZVm3JBnTv51/MhTOg==",
+      "version": "7.1.9",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.1.9.tgz",
+      "integrity": "sha512-5YikxwRqRXTVWVujhswDOTCq6gs+m9IcNbNZLa6FLtyBStAjEsuE2vAU+lPsbz9ZTST57D5fodjIh2JXT6sMWQ==",
       "dependencies": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/intl-localematcher": "0.2.20",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/intl-localematcher": "0.2.32",
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/@formatjs/intl-localematcher": {
-      "version": "0.2.20",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.20.tgz",
-      "integrity": "sha512-/Ro85goRZnCojzxOegANFYL0LaDIpdPjAukR7xMTjOtRx+3yyjR0ifGTOW3/Kjhmab3t6GnyHBYWZSudxEOxPA==",
+      "version": "0.2.32",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.32.tgz",
+      "integrity": "sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/@formatjs/ts-transformer": {
@@ -12135,6 +11826,75 @@
       "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.0.tgz",
+      "integrity": "sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz",
+      "integrity": "sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.45.0",
+        "@typescript-eslint/visitor-keys": "5.45.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz",
+      "integrity": "sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.45.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/@vue/compiler-core": {
       "version": "3.2.47",
       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
@@ -17856,6 +17616,69 @@
         "eslint": ">=4.0.0"
       }
     },
+    "node_modules/eslint-plugin-formatjs": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-formatjs/-/eslint-plugin-formatjs-4.9.1.tgz",
+      "integrity": "sha512-e6A7v84y6/RgXRYWqIQHJSHKutXGsQVdkYkzL7pgw5cJGEao0YVFqrbYu8ckbQsxQWfq8Dai4w0A/531F0mm2A==",
+      "dev": true,
+      "dependencies": {
+        "@formatjs/icu-messageformat-parser": "2.3.0",
+        "@formatjs/ts-transformer": "3.12.0",
+        "@types/eslint": "7 || 8",
+        "@types/picomatch": "^2.3.0",
+        "@typescript-eslint/typescript-estree": "5.45.0",
+        "emoji-regex": "^10.2.1",
+        "magic-string": "^0.29.0",
+        "picomatch": "^2.3.1",
+        "tslib": "2.4.0",
+        "typescript": "^4.7",
+        "unicode-emoji-utils": "^1.1.1"
+      },
+      "peerDependencies": {
+        "eslint": "7 || 8"
+      }
+    },
+    "node_modules/eslint-plugin-formatjs/node_modules/@formatjs/ts-transformer": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.12.0.tgz",
+      "integrity": "sha512-/jEpXcqA6y/vdijgkxSoKGfkGR5VcClJeI8hnpJ2PBCHfrc4ywFMyoZqRAakKW3IJVttaDo7mGvBAIDxV1F4Qg==",
+      "dev": true,
+      "dependencies": {
+        "@formatjs/icu-messageformat-parser": "2.3.0",
+        "@types/json-stable-stringify": "^1.0.32",
+        "@types/node": "14 || 16 || 17",
+        "chalk": "^4.0.0",
+        "json-stable-stringify": "^1.0.1",
+        "tslib": "^2.4.0",
+        "typescript": "^4.7"
+      },
+      "peerDependencies": {
+        "ts-jest": ">=27"
+      },
+      "peerDependenciesMeta": {
+        "ts-jest": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-formatjs/node_modules/magic-string": {
+      "version": "0.29.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz",
+      "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.13"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/eslint-plugin-formatjs/node_modules/tslib": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+      "dev": true
+    },
     "node_modules/eslint-plugin-header": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
@@ -21416,13 +21239,14 @@
       }
     },
     "node_modules/intl-messageformat": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.9.1.tgz",
-      "integrity": "sha512-cuzS/XKHn//hvKka77JKU2dseiVY2dofQjIOZv6ZFxFt4Z9sPXnZ7KQ9Ak2r+4XBCjI04MqJ1PhKs/3X22AkfA==",
+      "version": "10.3.3",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.3.3.tgz",
+      "integrity": "sha512-un/f07/g2e/3Q8e1ghDKET+el22Bi49M7O/rHxd597R+oLpPOMykSv5s51cABVfu3FZW+fea4hrzf2MHu1W4hw==",
       "dependencies": {
-        "@formatjs/fast-memoize": "1.2.0",
-        "@formatjs/icu-messageformat-parser": "2.0.11",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/fast-memoize": "2.0.1",
+        "@formatjs/icu-messageformat-parser": "2.3.0",
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/into-stream": {
@@ -24803,72 +24627,6 @@
         "mmjstool": "bin/mmjstool"
       }
     },
-    "node_modules/mmjstool/node_modules/@typescript-eslint/types": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.44.0.tgz",
-      "integrity": "sha512-Tp+zDnHmGk4qKR1l+Y1rBvpjpm5tGXX339eAlRBDg+kgZkz9Bw+pqi4dyseOZMsGuSH69fYfPJCBKBrbPCxYFQ==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/mmjstool/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.44.0.tgz",
-      "integrity": "sha512-M6Jr+RM7M5zeRj2maSfsZK2660HKAJawv4Ud0xT+yauyvgrsHu276VtXlKDFnEmhG+nVEd0fYZNXGoAgxwDWJw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.44.0",
-        "@typescript-eslint/visitor-keys": "5.44.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/mmjstool/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.44.0.tgz",
-      "integrity": "sha512-a48tLG8/4m62gPFbJ27FxwCOqPKxsb8KC3HkmYoq2As/4YyjQl1jDbRr1s63+g4FS/iIehjmN3L5UjmKva1HzQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.44.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/mmjstool/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
     "node_modules/mmjstool/node_modules/yargs": {
       "version": "17.3.1",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz",
@@ -27738,24 +27496,24 @@
       }
     },
     "node_modules/react-intl": {
-      "version": "5.20.10",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.20.10.tgz",
-      "integrity": "sha512-zy0ZQhpjkGsKcK1BFo2HbGM/q8GBVovzoXZGQ76DowR0yr6UzQuPLkrlIrObL2zxIYiDaxaz+hUJaoa2a1xqOQ==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.3.2.tgz",
+      "integrity": "sha512-NT03zOHRAFGcZdTx4cXcVKZtnWBOM6RfLPK8Q67eA+Ba+pHdYb+cmrahncqAnevZKgO1r/nEauiVFKwQeudLIw==",
       "dependencies": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/icu-messageformat-parser": "2.0.11",
-        "@formatjs/intl": "1.14.1",
-        "@formatjs/intl-displaynames": "5.2.3",
-        "@formatjs/intl-listformat": "6.3.3",
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/icu-messageformat-parser": "2.3.0",
+        "@formatjs/intl": "2.6.9",
+        "@formatjs/intl-displaynames": "6.2.6",
+        "@formatjs/intl-listformat": "7.1.9",
         "@types/hoist-non-react-statics": "^3.3.1",
-        "@types/react": "17",
+        "@types/react": "16 || 17 || 18",
         "hoist-non-react-statics": "^3.3.2",
-        "intl-messageformat": "9.9.1",
-        "tslib": "^2.1.0"
+        "intl-messageformat": "10.3.3",
+        "tslib": "^2.4.0"
       },
       "peerDependencies": {
-        "react": "^16.3.0 || 17",
-        "typescript": "^4.2"
+        "react": "^16.6.0 || 17 || 18",
+        "typescript": "^4.7"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -33609,7 +33367,7 @@
         "react": "^17.0.2",
         "react-bootstrap": "github:mattermost/react-bootstrap#d821e2b1db1059bd36112d7587fd1b0912b27626",
         "react-dom": "^17.0.2",
-        "react-intl": "^5.20.0",
+        "react-intl": "^6.3.2",
         "shallow-equals": "^1.0.0",
         "styled-components": "^5.3.5",
         "tippy.js": "^6.3.7"
@@ -34027,7 +33785,7 @@
         "react-dom": "^17.0.2",
         "react-infinite-scroll-component": "^6.1.0",
         "react-infinite-scroller": "1.2.6",
-        "react-intl": "5.24.1",
+        "react-intl": "*",
         "react-redux": "7.2.6",
         "react-router-dom": "5.3.4",
         "react-router-hash-link": "2.4.3",
@@ -34084,7 +33842,6 @@
         "classnames": "2.3.1",
         "css-loader": "6.5.1",
         "eslint-import-resolver-webpack": "0.13.2",
-        "eslint-plugin-formatjs": "4.0.2",
         "eslint-plugin-import": "2.25.4",
         "eslint-plugin-import-newlines": "1.3.0",
         "eslint-plugin-no-relative-import-paths": "1.5.0",
@@ -34428,189 +34185,6 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "playbooks/node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.11.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.8.tgz",
-      "integrity": "sha512-fgLqyWlwmTEuqV/TSLEL/t9JOmHNLFvCdgzXB0jc2w+WOItPCOJ1T0eyN6fQBQKRPfSqqNlu+kWj7ijcOVTVVQ==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/intl-localematcher": "0.2.28",
-        "tslib": "2.4.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/fast-memoize": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz",
-      "integrity": "sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.4.tgz",
-      "integrity": "sha512-3PqMvKWV1oyok0BuiXUAHIaotdhdTJw6OICqCZbfUgKT+ZRwRWO4IlCgvXJeCITaKS5p+PY0XXKjf/vUyIpWjQ==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.8",
-        "@formatjs/icu-skeleton-parser": "1.3.10",
-        "tslib": "2.4.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.10.tgz",
-      "integrity": "sha512-kXJmtLDqFF5aLTf8IxdJXnhrIX1Qb4Qp3a9jqRecGDYfzOa9hMhi9U0nKyhrJJ4cXxBzptcgb+LWkyeHL6nlBQ==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.8",
-        "tslib": "2.4.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.18.1.tgz",
-      "integrity": "sha512-xmkefWqqiCWNUbGvMwykNG+kRs2o9DsEBTulimRKTUtdA9+OfIWDtg6XFZop5aWsMIpNQqnL2uW3IzWFidWgrQ==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "@formatjs/fast-memoize": "1.2.1",
-        "@formatjs/icu-messageformat-parser": "2.0.16",
-        "@formatjs/intl-displaynames": "5.3.1",
-        "@formatjs/intl-listformat": "6.4.1",
-        "intl-messageformat": "9.11.1",
-        "tslib": "^2.1.0"
-      },
-      "peerDependencies": {
-        "typescript": "^4.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl-displaynames": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.3.1.tgz",
-      "integrity": "sha512-VJ9Aol+mxxYVFVuix06fEbz+SR3uneZltrjGoG16hh83rF5Pjgb5BN6yAQXSvZwUvr+npk62uqKrjajOga4M6g==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "@formatjs/intl-localematcher": "0.2.22",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.1.tgz",
-      "integrity": "sha512-tgtNODZUGuUI6PAcnvaLZpGrZLVkXnnAvgzOiueYMzFdOdcOw4iH1WKhCe3+r6VR8rHKToJ2HksUGNCB+zt/bg==",
-      "dependencies": {
-        "@formatjs/intl-localematcher": "0.2.22",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.2.22",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.22.tgz",
-      "integrity": "sha512-z+TvbHW8Q/g2l7/PnfUl0mV9gWxV4d0HT6GQyzkO5QI6QjCvCZGiztnmLX7zoyS16uSMvZ2PoMDfSK9xvZkRRA==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl-listformat": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.4.1.tgz",
-      "integrity": "sha512-vQeTRBwRoTDcXAkJ3WGk+ReA0sKq8ldYFwKvf/J3PCd98BlZwuxPaXhTsl1iqKEh0mTdHl8zZ9iohIJTi/u1cg==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "@formatjs/intl-localematcher": "0.2.22",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl-listformat/node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.1.tgz",
-      "integrity": "sha512-tgtNODZUGuUI6PAcnvaLZpGrZLVkXnnAvgzOiueYMzFdOdcOw4iH1WKhCe3+r6VR8rHKToJ2HksUGNCB+zt/bg==",
-      "dependencies": {
-        "@formatjs/intl-localematcher": "0.2.22",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl-listformat/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.2.22",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.22.tgz",
-      "integrity": "sha512-z+TvbHW8Q/g2l7/PnfUl0mV9gWxV4d0HT6GQyzkO5QI6QjCvCZGiztnmLX7zoyS16uSMvZ2PoMDfSK9xvZkRRA==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.2.28",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.28.tgz",
-      "integrity": "sha512-FLsc6Gifs1np/8HnCn/7Q+lHMmenrD5fuDhRT82yj0gi9O19kfaFwjQUw1gZsyILuRyT93GuzdifHj7TKRhBcw==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "2.4.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl/node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.1.tgz",
-      "integrity": "sha512-tgtNODZUGuUI6PAcnvaLZpGrZLVkXnnAvgzOiueYMzFdOdcOw4iH1WKhCe3+r6VR8rHKToJ2HksUGNCB+zt/bg==",
-      "dependencies": {
-        "@formatjs/intl-localematcher": "0.2.22",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl/node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.16.tgz",
-      "integrity": "sha512-sYg0ImXsAqBbjU/LotoCD9yKC5nUpWVy3s4DwWerHXD4sm62FcjMF8mekwudRk3eZLHqSO+M21MpFUUjDQ+Q5Q==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "@formatjs/icu-skeleton-parser": "1.3.3",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl/node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.3.tgz",
-      "integrity": "sha512-ifWnzjmHPHUF89UpCvClTP66sXYFc8W/qg7Qt+qtTUB9BqRWlFeUsevAzaMYDJsRiOy4S2WJFrJoZgRKUFfPGQ==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/intl/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.2.22",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.22.tgz",
-      "integrity": "sha512-z+TvbHW8Q/g2l7/PnfUl0mV9gWxV4d0HT6GQyzkO5QI6QjCvCZGiztnmLX7zoyS16uSMvZ2PoMDfSK9xvZkRRA==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/@formatjs/ts-transformer": {
-      "version": "3.9.9",
-      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.9.9.tgz",
-      "integrity": "sha512-V5BDpn5XW1wWBkpDn5SFHRH4Ndf3oyjxmuqWMxe2EwOKkV4XJvzZI73k3p/Hut3Xg55AxBQQmkFK9hyeBJPyIg==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/icu-messageformat-parser": "2.1.4",
-        "@types/json-stable-stringify": "^1.0.32",
-        "@types/node": "14 || 16 || 17",
-        "chalk": "^4.0.0",
-        "json-stable-stringify": "^1.0.1",
-        "tslib": "2.4.0",
-        "typescript": "^4.5"
-      },
-      "peerDependencies": {
-        "ts-jest": "27 || 28"
-      },
-      "peerDependenciesMeta": {
-        "ts-jest": {
-          "optional": true
-        }
-      }
-    },
     "playbooks/node_modules/@mattermost/compass-icons": {
       "version": "0.1.32",
       "resolved": "https://registry.npmjs.org/@mattermost/compass-icons/-/compass-icons-0.1.32.tgz",
@@ -35069,26 +34643,6 @@
         "node": ">=10.13.0"
       }
     },
-    "playbooks/node_modules/eslint-plugin-formatjs": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-formatjs/-/eslint-plugin-formatjs-4.0.2.tgz",
-      "integrity": "sha512-6tEtLtH4N39pnYp5MjelxHDdohU6yMp5fmXqQq4Uu8MAbkAWAiufNKXfFdLSjuPa0lY5x/ExXKJHr1NJsZtzVA==",
-      "dev": true,
-      "dependencies": {
-        "@formatjs/icu-messageformat-parser": "2.1.4",
-        "@formatjs/ts-transformer": "3.9.9",
-        "@types/eslint": "7 || 8",
-        "@types/picomatch": "^2.3.0",
-        "@typescript-eslint/typescript-estree": "^5.9.1",
-        "emoji-regex": "^10.0.0",
-        "picomatch": "^2.3.1",
-        "tslib": "2.4.0",
-        "typescript": "^4.5"
-      },
-      "peerDependencies": {
-        "eslint": "7 || 8"
-      }
-    },
     "playbooks/node_modules/eslint-plugin-import": {
       "version": "2.25.4",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz",
@@ -35268,53 +34822,6 @@
         "node": ">= 0.10"
       }
     },
-    "playbooks/node_modules/intl-messageformat": {
-      "version": "9.11.1",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.11.1.tgz",
-      "integrity": "sha512-kT0i8AIa1Aez8jGn1i9Xva/sdbjOPY15abR82qnU4jnESjxtynHLW1CBh9ehs13sPA8cE/4A2d6LEne91oDp4w==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "@formatjs/fast-memoize": "1.2.1",
-        "@formatjs/icu-messageformat-parser": "2.0.16",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/intl-messageformat/node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.1.tgz",
-      "integrity": "sha512-tgtNODZUGuUI6PAcnvaLZpGrZLVkXnnAvgzOiueYMzFdOdcOw4iH1WKhCe3+r6VR8rHKToJ2HksUGNCB+zt/bg==",
-      "dependencies": {
-        "@formatjs/intl-localematcher": "0.2.22",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/intl-messageformat/node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.16.tgz",
-      "integrity": "sha512-sYg0ImXsAqBbjU/LotoCD9yKC5nUpWVy3s4DwWerHXD4sm62FcjMF8mekwudRk3eZLHqSO+M21MpFUUjDQ+Q5Q==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "@formatjs/icu-skeleton-parser": "1.3.3",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/intl-messageformat/node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.3.tgz",
-      "integrity": "sha512-ifWnzjmHPHUF89UpCvClTP66sXYFc8W/qg7Qt+qtTUB9BqRWlFeUsevAzaMYDJsRiOy4S2WJFrJoZgRKUFfPGQ==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/intl-messageformat/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.2.22",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.22.tgz",
-      "integrity": "sha512-z+TvbHW8Q/g2l7/PnfUl0mV9gWxV4d0HT6GQyzkO5QI6QjCvCZGiztnmLX7zoyS16uSMvZ2PoMDfSK9xvZkRRA==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "playbooks/node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -35506,68 +35013,6 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "playbooks/node_modules/react-intl": {
-      "version": "5.24.1",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.24.1.tgz",
-      "integrity": "sha512-GP9ZP4UlWPGjleY2Yu0wJggz4/14VsjGaTduq+jGGsLBsuAVq6Gxa+K58mbn5rRU9E10sHxH75Q73oJMqiGBiw==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "@formatjs/icu-messageformat-parser": "2.0.16",
-        "@formatjs/intl": "1.18.1",
-        "@formatjs/intl-displaynames": "5.3.1",
-        "@formatjs/intl-listformat": "6.4.1",
-        "@types/hoist-non-react-statics": "^3.3.1",
-        "@types/react": "16 || 17",
-        "hoist-non-react-statics": "^3.3.2",
-        "intl-messageformat": "9.11.1",
-        "tslib": "^2.1.0"
-      },
-      "peerDependencies": {
-        "react": "^16.3.0 || 17",
-        "typescript": "^4.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "playbooks/node_modules/react-intl/node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.1.tgz",
-      "integrity": "sha512-tgtNODZUGuUI6PAcnvaLZpGrZLVkXnnAvgzOiueYMzFdOdcOw4iH1WKhCe3+r6VR8rHKToJ2HksUGNCB+zt/bg==",
-      "dependencies": {
-        "@formatjs/intl-localematcher": "0.2.22",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/react-intl/node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.16.tgz",
-      "integrity": "sha512-sYg0ImXsAqBbjU/LotoCD9yKC5nUpWVy3s4DwWerHXD4sm62FcjMF8mekwudRk3eZLHqSO+M21MpFUUjDQ+Q5Q==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "@formatjs/icu-skeleton-parser": "1.3.3",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/react-intl/node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.3.tgz",
-      "integrity": "sha512-ifWnzjmHPHUF89UpCvClTP66sXYFc8W/qg7Qt+qtTUB9BqRWlFeUsevAzaMYDJsRiOy4S2WJFrJoZgRKUFfPGQ==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.11.1",
-        "tslib": "^2.1.0"
-      }
-    },
-    "playbooks/node_modules/react-intl/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.2.22",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.22.tgz",
-      "integrity": "sha512-z+TvbHW8Q/g2l7/PnfUl0mV9gWxV4d0HT6GQyzkO5QI6QjCvCZGiztnmLX7zoyS16uSMvZ2PoMDfSK9xvZkRRA==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "playbooks/node_modules/react-overlays": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-5.2.1.tgz",
@@ -35800,11 +35245,6 @@
         "node": ">=6"
       }
     },
-    "playbooks/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
     "playbooks/node_modules/uncontrollable": {
       "version": "7.2.1",
       "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz",
@@ -38204,81 +37644,81 @@
       }
     },
     "@formatjs/ecma402-abstract": {
-      "version": "1.9.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.8.tgz",
-      "integrity": "sha512-2U4n11bLmTij/k4ePCEFKJILPYwdMcJTdnKVBi+JMWBgu5O1N+XhCazlE6QXqVO1Agh2Doh0b/9Jf1mSmSVfhA==",
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.3.tgz",
+      "integrity": "sha512-SlsbRC/RX+/zg4AApWIFNDdkLtFbkq3LNoZWXZCE/nHVKqoIJyaoQyge/I0Y38vLxowUn9KTtXgusLD91+orbg==",
       "requires": {
-        "@formatjs/intl-localematcher": "0.2.20",
-        "tslib": "^2.1.0"
+        "@formatjs/intl-localematcher": "0.2.32",
+        "tslib": "^2.4.0"
       }
     },
     "@formatjs/fast-memoize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.0.tgz",
-      "integrity": "sha512-fObitP9Tlc31SKrPHgkPgQpGo4+4yXfQQITTCNH8AZdEqB7Mq4nPrjpUL/tNGN3lEeJcFxDbi0haX8HM7QvQ8w==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.0.1.tgz",
+      "integrity": "sha512-M2GgV+qJn5WJQAYewz7q2Cdl6fobQa69S1AzSM2y0P68ZDbK5cWrJIcPCO395Of1ksftGZoOt4LYCO/j9BKBSA==",
       "requires": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.4.0"
       }
     },
     "@formatjs/icu-messageformat-parser": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.11.tgz",
-      "integrity": "sha512-5mWb8U8aulYGwnDZWrr+vdgn5PilvtrqQYQ1pvpgzQes/osi85TwmL2GqTGLlKIvBKD2XNA61kAqXYY95w4LWg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.3.0.tgz",
+      "integrity": "sha512-xqtlqYAbfJDF4b6e4O828LBNOWXrFcuYadqAbYORlDRwhyJ2bH+xpUBPldZbzRGUN2mxlZ4Ykhm7jvERtmI8NQ==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/icu-skeleton-parser": "1.2.12",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/icu-skeleton-parser": "1.3.18",
+        "tslib": "^2.4.0"
       }
     },
     "@formatjs/icu-skeleton-parser": {
-      "version": "1.2.12",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.12.tgz",
-      "integrity": "sha512-DTFxWmEA02ZNW6fsYjGYSADvtrqqjCYF7DSgCmMfaaE0gLP4pCdAgOPE+lkXXU+jP8iCw/YhMT2Seyk/C5lBWg==",
+      "version": "1.3.18",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.18.tgz",
+      "integrity": "sha512-ND1ZkZfmLPcHjAH1sVpkpQxA+QYfOX3py3SjKWMUVGDow18gZ0WPqz3F+pJLYQMpS2LnnQ5zYR2jPVYTbRwMpg==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "tslib": "^2.4.0"
       }
     },
     "@formatjs/intl": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.14.1.tgz",
-      "integrity": "sha512-mtL8oBgFwTu0GHFnxaF93fk/zNzNkPzl+27Fwg5AZ88pWHWb7037dpODzoCBnaIVk4FBO5emUn/6jI9Byj8hOw==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.6.9.tgz",
+      "integrity": "sha512-EtcMZ9O24YSASu/jGOaTQtArx7XROjlKiO4KmkxJ/3EyAQLCr5hrS+KKvNud0a7GIwBucOb3IFrZ7WiSm2A/Cw==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/fast-memoize": "1.2.0",
-        "@formatjs/icu-messageformat-parser": "2.0.11",
-        "@formatjs/intl-displaynames": "5.2.3",
-        "@formatjs/intl-listformat": "6.3.3",
-        "intl-messageformat": "9.9.1",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/fast-memoize": "2.0.1",
+        "@formatjs/icu-messageformat-parser": "2.3.0",
+        "@formatjs/intl-displaynames": "6.2.6",
+        "@formatjs/intl-listformat": "7.1.9",
+        "intl-messageformat": "10.3.3",
+        "tslib": "^2.4.0"
       }
     },
     "@formatjs/intl-displaynames": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.2.3.tgz",
-      "integrity": "sha512-5BmhSurLbfgdeo0OBcNPPkIS8ikMMYaHe2NclxEQZqcMvrnQzNMNnUE2dDF5vZx+mkvKq77aQYzpc8RfqVsRCQ==",
+      "version": "6.2.6",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.2.6.tgz",
+      "integrity": "sha512-scf5AQTk9EjpvPhboo5sizVOvidTdMOnajv9z+0cejvl7JNl9bl/aMrNBgC72UH+bP3l45usPUKAGskV6sNIrA==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/intl-localematcher": "0.2.20",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/intl-localematcher": "0.2.32",
+        "tslib": "^2.4.0"
       }
     },
     "@formatjs/intl-listformat": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.3.3.tgz",
-      "integrity": "sha512-3nzAKgVS5rePDa5HiH0OwZgAhqxLtzlMc9Pg4QgajRHSP1TqFiMmQnnn52wd3+xVTb7cjZVm3JBnTv51/MhTOg==",
+      "version": "7.1.9",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.1.9.tgz",
+      "integrity": "sha512-5YikxwRqRXTVWVujhswDOTCq6gs+m9IcNbNZLa6FLtyBStAjEsuE2vAU+lPsbz9ZTST57D5fodjIh2JXT6sMWQ==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/intl-localematcher": "0.2.20",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/intl-localematcher": "0.2.32",
+        "tslib": "^2.4.0"
       }
     },
     "@formatjs/intl-localematcher": {
-      "version": "0.2.20",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.20.tgz",
-      "integrity": "sha512-/Ro85goRZnCojzxOegANFYL0LaDIpdPjAukR7xMTjOtRx+3yyjR0ifGTOW3/Kjhmab3t6GnyHBYWZSudxEOxPA==",
+      "version": "0.2.32",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.32.tgz",
+      "integrity": "sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==",
       "requires": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.4.0"
       }
     },
     "@formatjs/ts-transformer": {
@@ -42319,6 +41759,45 @@
       "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
+    "@typescript-eslint/types": {
+      "version": "5.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.0.tgz",
+      "integrity": "sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==",
+      "dev": true
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "5.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz",
+      "integrity": "sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "5.45.0",
+        "@typescript-eslint/visitor-keys": "5.45.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "5.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz",
+      "integrity": "sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "5.45.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+          "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+          "dev": true
+        }
+      }
+    },
     "@vue/compiler-core": {
       "version": "3.2.47",
       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
@@ -44041,7 +43520,6 @@
         "emoji-mart": "^3.0.1",
         "eslint-import-resolver-webpack": "0.13.2",
         "eslint-plugin-babel": "^5.3.1",
-        "eslint-plugin-formatjs": "4.9.0",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-import": "2.25.4",
         "eslint-plugin-import-newlines": "1.3.1",
@@ -44084,7 +43562,7 @@
         "react-dom": "17.0.2",
         "react-hot-keys": "^2.7.1",
         "react-hotkeys-hook": "^3.4.4",
-        "react-intl": "^5.20.0",
+        "react-intl": "*",
         "react-redux": "^7.2.1",
         "react-router-dom": "^5.2.0",
         "react-select": "5.5.9",
@@ -45186,104 +44664,6 @@
           "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
           "dev": true
         },
-        "eslint-plugin-formatjs": {
-          "version": "4.9.0",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-formatjs/-/eslint-plugin-formatjs-4.9.0.tgz",
-          "integrity": "sha512-U3u8TI/Mogo3sunTHDh24mc3p1zWAz/VaYjSkGhuYcLmqfkqEr3BmGUNQ8NTDvZviYHNTkhjHWuXQnUkh81grQ==",
-          "dev": true,
-          "requires": {
-            "@formatjs/icu-messageformat-parser": "2.3.0",
-            "@formatjs/ts-transformer": "3.12.0",
-            "@types/eslint": "7 || 8",
-            "@types/picomatch": "^2.3.0",
-            "@typescript-eslint/typescript-estree": "5.45.0",
-            "emoji-regex": "^10.2.1",
-            "magic-string": "^0.29.0",
-            "picomatch": "^2.3.1",
-            "tslib": "2.4.0",
-            "typescript": "^4.7",
-            "unicode-emoji-utils": "^1.1.1"
-          },
-          "dependencies": {
-            "@formatjs/ecma402-abstract": {
-              "version": "1.14.3",
-              "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.3.tgz",
-              "integrity": "sha512-SlsbRC/RX+/zg4AApWIFNDdkLtFbkq3LNoZWXZCE/nHVKqoIJyaoQyge/I0Y38vLxowUn9KTtXgusLD91+orbg==",
-              "dev": true,
-              "requires": {
-                "@formatjs/intl-localematcher": "0.2.32",
-                "tslib": "^2.4.0"
-              }
-            },
-            "@formatjs/icu-messageformat-parser": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.3.0.tgz",
-              "integrity": "sha512-xqtlqYAbfJDF4b6e4O828LBNOWXrFcuYadqAbYORlDRwhyJ2bH+xpUBPldZbzRGUN2mxlZ4Ykhm7jvERtmI8NQ==",
-              "dev": true,
-              "requires": {
-                "@formatjs/ecma402-abstract": "1.14.3",
-                "@formatjs/icu-skeleton-parser": "1.3.18",
-                "tslib": "^2.4.0"
-              }
-            },
-            "@formatjs/icu-skeleton-parser": {
-              "version": "1.3.18",
-              "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.18.tgz",
-              "integrity": "sha512-ND1ZkZfmLPcHjAH1sVpkpQxA+QYfOX3py3SjKWMUVGDow18gZ0WPqz3F+pJLYQMpS2LnnQ5zYR2jPVYTbRwMpg==",
-              "dev": true,
-              "requires": {
-                "@formatjs/ecma402-abstract": "1.14.3",
-                "tslib": "^2.4.0"
-              }
-            },
-            "@formatjs/intl-localematcher": {
-              "version": "0.2.32",
-              "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.32.tgz",
-              "integrity": "sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==",
-              "dev": true,
-              "requires": {
-                "tslib": "^2.4.0"
-              }
-            },
-            "@typescript-eslint/types": {
-              "version": "5.45.0",
-              "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.0.tgz",
-              "integrity": "sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==",
-              "dev": true
-            },
-            "@typescript-eslint/typescript-estree": {
-              "version": "5.45.0",
-              "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz",
-              "integrity": "sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==",
-              "dev": true,
-              "requires": {
-                "@typescript-eslint/types": "5.45.0",
-                "@typescript-eslint/visitor-keys": "5.45.0",
-                "debug": "^4.3.4",
-                "globby": "^11.1.0",
-                "is-glob": "^4.0.3",
-                "semver": "^7.3.7",
-                "tsutils": "^3.21.0"
-              }
-            },
-            "@typescript-eslint/visitor-keys": {
-              "version": "5.45.0",
-              "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz",
-              "integrity": "sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==",
-              "dev": true,
-              "requires": {
-                "@typescript-eslint/types": "5.45.0",
-                "eslint-visitor-keys": "^3.3.0"
-              }
-            },
-            "typescript": {
-              "version": "4.9.5",
-              "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-              "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
-              "dev": true
-            }
-          }
-        },
         "eslint-plugin-import": {
           "version": "2.25.4",
           "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz",
@@ -46178,15 +45558,6 @@
           "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
           "dev": true
         },
-        "magic-string": {
-          "version": "0.29.0",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz",
-          "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/sourcemap-codec": "^1.4.13"
-          }
-        },
         "marked": {
           "version": "4.0.17",
           "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.17.tgz",
@@ -46439,12 +45810,6 @@
           "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.0.2.tgz",
           "integrity": "sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew=="
         },
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        },
         "typescript": {
           "version": "4.6.2",
           "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
@@ -49691,6 +49056,57 @@
         "eslint-rule-composer": "^0.3.0"
       }
     },
+    "eslint-plugin-formatjs": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-formatjs/-/eslint-plugin-formatjs-4.9.1.tgz",
+      "integrity": "sha512-e6A7v84y6/RgXRYWqIQHJSHKutXGsQVdkYkzL7pgw5cJGEao0YVFqrbYu8ckbQsxQWfq8Dai4w0A/531F0mm2A==",
+      "dev": true,
+      "requires": {
+        "@formatjs/icu-messageformat-parser": "2.3.0",
+        "@formatjs/ts-transformer": "3.12.0",
+        "@types/eslint": "7 || 8",
+        "@types/picomatch": "^2.3.0",
+        "@typescript-eslint/typescript-estree": "5.45.0",
+        "emoji-regex": "^10.2.1",
+        "magic-string": "^0.29.0",
+        "picomatch": "^2.3.1",
+        "tslib": "2.4.0",
+        "typescript": "^4.7",
+        "unicode-emoji-utils": "^1.1.1"
+      },
+      "dependencies": {
+        "@formatjs/ts-transformer": {
+          "version": "3.12.0",
+          "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.12.0.tgz",
+          "integrity": "sha512-/jEpXcqA6y/vdijgkxSoKGfkGR5VcClJeI8hnpJ2PBCHfrc4ywFMyoZqRAakKW3IJVttaDo7mGvBAIDxV1F4Qg==",
+          "dev": true,
+          "requires": {
+            "@formatjs/icu-messageformat-parser": "2.3.0",
+            "@types/json-stable-stringify": "^1.0.32",
+            "@types/node": "14 || 16 || 17",
+            "chalk": "^4.0.0",
+            "json-stable-stringify": "^1.0.1",
+            "tslib": "^2.4.0",
+            "typescript": "^4.7"
+          }
+        },
+        "magic-string": {
+          "version": "0.29.0",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz",
+          "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/sourcemap-codec": "^1.4.13"
+          }
+        },
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+          "dev": true
+        }
+      }
+    },
     "eslint-plugin-header": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
@@ -52227,13 +51643,14 @@
       "dev": true
     },
     "intl-messageformat": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.9.1.tgz",
-      "integrity": "sha512-cuzS/XKHn//hvKka77JKU2dseiVY2dofQjIOZv6ZFxFt4Z9sPXnZ7KQ9Ak2r+4XBCjI04MqJ1PhKs/3X22AkfA==",
+      "version": "10.3.3",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.3.3.tgz",
+      "integrity": "sha512-un/f07/g2e/3Q8e1ghDKET+el22Bi49M7O/rHxd597R+oLpPOMykSv5s51cABVfu3FZW+fea4hrzf2MHu1W4hw==",
       "requires": {
-        "@formatjs/fast-memoize": "1.2.0",
-        "@formatjs/icu-messageformat-parser": "2.0.11",
-        "tslib": "^2.1.0"
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/fast-memoize": "2.0.1",
+        "@formatjs/icu-messageformat-parser": "2.3.0",
+        "tslib": "^2.4.0"
       }
     },
     "into-stream": {
@@ -54480,7 +53897,6 @@
         "enzyme-adapter-react-17-updated": "1.0.2",
         "enzyme-to-json": "3.6.2",
         "eslint-import-resolver-webpack": "0.13.2",
-        "eslint-plugin-formatjs": "4.9.1",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-import": "2.27.5",
         "eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#5b0c972eacf19286e4c66221b39113bf8728a99e",
@@ -54538,7 +53954,7 @@
         "react-day-picker": "8.3.6",
         "react-dom": "17.0.2",
         "react-hot-loader": "4.13.0",
-        "react-intl": "5.20.10",
+        "react-intl": "*",
         "react-is": "17.0.2",
         "react-overlays": "0.9.3",
         "react-popper": "2.3.0",
@@ -54607,61 +54023,6 @@
           "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
           "dev": true
         },
-        "@formatjs/ecma402-abstract": {
-          "version": "1.14.3",
-          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.3.tgz",
-          "integrity": "sha512-SlsbRC/RX+/zg4AApWIFNDdkLtFbkq3LNoZWXZCE/nHVKqoIJyaoQyge/I0Y38vLxowUn9KTtXgusLD91+orbg==",
-          "dev": true,
-          "requires": {
-            "@formatjs/intl-localematcher": "0.2.32",
-            "tslib": "^2.4.0"
-          }
-        },
-        "@formatjs/icu-messageformat-parser": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.3.0.tgz",
-          "integrity": "sha512-xqtlqYAbfJDF4b6e4O828LBNOWXrFcuYadqAbYORlDRwhyJ2bH+xpUBPldZbzRGUN2mxlZ4Ykhm7jvERtmI8NQ==",
-          "dev": true,
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.14.3",
-            "@formatjs/icu-skeleton-parser": "1.3.18",
-            "tslib": "^2.4.0"
-          }
-        },
-        "@formatjs/icu-skeleton-parser": {
-          "version": "1.3.18",
-          "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.18.tgz",
-          "integrity": "sha512-ND1ZkZfmLPcHjAH1sVpkpQxA+QYfOX3py3SjKWMUVGDow18gZ0WPqz3F+pJLYQMpS2LnnQ5zYR2jPVYTbRwMpg==",
-          "dev": true,
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.14.3",
-            "tslib": "^2.4.0"
-          }
-        },
-        "@formatjs/intl-localematcher": {
-          "version": "0.2.32",
-          "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.32.tgz",
-          "integrity": "sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.4.0"
-          }
-        },
-        "@formatjs/ts-transformer": {
-          "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.12.0.tgz",
-          "integrity": "sha512-/jEpXcqA6y/vdijgkxSoKGfkGR5VcClJeI8hnpJ2PBCHfrc4ywFMyoZqRAakKW3IJVttaDo7mGvBAIDxV1F4Qg==",
-          "dev": true,
-          "requires": {
-            "@formatjs/icu-messageformat-parser": "2.3.0",
-            "@types/json-stable-stringify": "^1.0.32",
-            "@types/node": "14 || 16 || 17",
-            "chalk": "^4.0.0",
-            "json-stable-stringify": "^1.0.1",
-            "tslib": "^2.4.0",
-            "typescript": "^4.7"
-          }
-        },
         "@testing-library/user-event": {
           "version": "12.1.4",
           "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.1.4.tgz",
@@ -54824,58 +54185,6 @@
             }
           }
         },
-        "eslint-plugin-formatjs": {
-          "version": "4.9.1",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-formatjs/-/eslint-plugin-formatjs-4.9.1.tgz",
-          "integrity": "sha512-e6A7v84y6/RgXRYWqIQHJSHKutXGsQVdkYkzL7pgw5cJGEao0YVFqrbYu8ckbQsxQWfq8Dai4w0A/531F0mm2A==",
-          "dev": true,
-          "requires": {
-            "@formatjs/icu-messageformat-parser": "2.3.0",
-            "@formatjs/ts-transformer": "3.12.0",
-            "@types/eslint": "7 || 8",
-            "@types/picomatch": "^2.3.0",
-            "@typescript-eslint/typescript-estree": "5.45.0",
-            "emoji-regex": "^10.2.1",
-            "magic-string": "^0.29.0",
-            "picomatch": "^2.3.1",
-            "tslib": "2.4.0",
-            "typescript": "^4.7",
-            "unicode-emoji-utils": "^1.1.1"
-          },
-          "dependencies": {
-            "@typescript-eslint/types": {
-              "version": "5.45.0",
-              "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.45.0.tgz",
-              "integrity": "sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==",
-              "dev": true
-            },
-            "@typescript-eslint/typescript-estree": {
-              "version": "5.45.0",
-              "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz",
-              "integrity": "sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==",
-              "dev": true,
-              "requires": {
-                "@typescript-eslint/types": "5.45.0",
-                "@typescript-eslint/visitor-keys": "5.45.0",
-                "debug": "^4.3.4",
-                "globby": "^11.1.0",
-                "is-glob": "^4.0.3",
-                "semver": "^7.3.7",
-                "tsutils": "^3.21.0"
-              }
-            },
-            "@typescript-eslint/visitor-keys": {
-              "version": "5.45.0",
-              "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz",
-              "integrity": "sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==",
-              "dev": true,
-              "requires": {
-                "@typescript-eslint/types": "5.45.0",
-                "eslint-visitor-keys": "^3.3.0"
-              }
-            }
-          }
-        },
         "eslint-plugin-import": {
           "version": "2.27.5",
           "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
@@ -55019,15 +54328,6 @@
             "yargs": "^16.0.3"
           }
         },
-        "magic-string": {
-          "version": "0.29.0",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz",
-          "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/sourcemap-codec": "^1.4.13"
-          }
-        },
         "natural-compare-lite": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
@@ -55076,12 +54376,6 @@
               }
             }
           }
-        },
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
         }
       }
     },
@@ -55507,43 +54801,6 @@
         "yargs": "^17.3.1"
       },
       "dependencies": {
-        "@typescript-eslint/types": {
-          "version": "5.44.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.44.0.tgz",
-          "integrity": "sha512-Tp+zDnHmGk4qKR1l+Y1rBvpjpm5tGXX339eAlRBDg+kgZkz9Bw+pqi4dyseOZMsGuSH69fYfPJCBKBrbPCxYFQ==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.44.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.44.0.tgz",
-          "integrity": "sha512-M6Jr+RM7M5zeRj2maSfsZK2660HKAJawv4Ud0xT+yauyvgrsHu276VtXlKDFnEmhG+nVEd0fYZNXGoAgxwDWJw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.44.0",
-            "@typescript-eslint/visitor-keys": "5.44.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.44.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.44.0.tgz",
-          "integrity": "sha512-a48tLG8/4m62gPFbJ27FxwCOqPKxsb8KC3HkmYoq2As/4YyjQl1jDbRr1s63+g4FS/iIehjmN3L5UjmKva1HzQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.44.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        },
         "yargs": {
           "version": "17.3.1",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz",
@@ -56715,7 +55972,6 @@
         "css-loader": "6.5.1",
         "debounce": "1.2.1",
         "eslint-import-resolver-webpack": "0.13.2",
-        "eslint-plugin-formatjs": "4.0.2",
         "eslint-plugin-import": "2.25.4",
         "eslint-plugin-import-newlines": "1.3.0",
         "eslint-plugin-no-relative-import-paths": "1.5.0",
@@ -56741,7 +55997,7 @@
         "react-dom": "^17.0.2",
         "react-infinite-scroll-component": "^6.1.0",
         "react-infinite-scroller": "1.2.6",
-        "react-intl": "5.24.1",
+        "react-intl": "*",
         "react-redux": "7.2.6",
         "react-refresh": "0.11.0",
         "react-router-dom": "5.3.4",
@@ -57017,179 +56273,6 @@
             "use-isomorphic-layout-effect": "^1.1.1"
           }
         },
-        "@formatjs/ecma402-abstract": {
-          "version": "1.11.8",
-          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.8.tgz",
-          "integrity": "sha512-fgLqyWlwmTEuqV/TSLEL/t9JOmHNLFvCdgzXB0jc2w+WOItPCOJ1T0eyN6fQBQKRPfSqqNlu+kWj7ijcOVTVVQ==",
-          "dev": true,
-          "requires": {
-            "@formatjs/intl-localematcher": "0.2.28",
-            "tslib": "2.4.0"
-          }
-        },
-        "@formatjs/fast-memoize": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz",
-          "integrity": "sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==",
-          "requires": {
-            "tslib": "^2.1.0"
-          }
-        },
-        "@formatjs/icu-messageformat-parser": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.4.tgz",
-          "integrity": "sha512-3PqMvKWV1oyok0BuiXUAHIaotdhdTJw6OICqCZbfUgKT+ZRwRWO4IlCgvXJeCITaKS5p+PY0XXKjf/vUyIpWjQ==",
-          "dev": true,
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.11.8",
-            "@formatjs/icu-skeleton-parser": "1.3.10",
-            "tslib": "2.4.0"
-          }
-        },
-        "@formatjs/icu-skeleton-parser": {
-          "version": "1.3.10",
-          "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.10.tgz",
-          "integrity": "sha512-kXJmtLDqFF5aLTf8IxdJXnhrIX1Qb4Qp3a9jqRecGDYfzOa9hMhi9U0nKyhrJJ4cXxBzptcgb+LWkyeHL6nlBQ==",
-          "dev": true,
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.11.8",
-            "tslib": "2.4.0"
-          }
-        },
-        "@formatjs/intl": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-1.18.1.tgz",
-          "integrity": "sha512-xmkefWqqiCWNUbGvMwykNG+kRs2o9DsEBTulimRKTUtdA9+OfIWDtg6XFZop5aWsMIpNQqnL2uW3IzWFidWgrQ==",
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.11.1",
-            "@formatjs/fast-memoize": "1.2.1",
-            "@formatjs/icu-messageformat-parser": "2.0.16",
-            "@formatjs/intl-displaynames": "5.3.1",
-            "@formatjs/intl-listformat": "6.4.1",
-            "intl-messageformat": "9.11.1",
-            "tslib": "^2.1.0"
-          },
-          "dependencies": {
-            "@formatjs/ecma402-abstract": {
-              "version": "1.11.1",
-              "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.1.tgz",
-              "integrity": "sha512-tgtNODZUGuUI6PAcnvaLZpGrZLVkXnnAvgzOiueYMzFdOdcOw4iH1WKhCe3+r6VR8rHKToJ2HksUGNCB+zt/bg==",
-              "requires": {
-                "@formatjs/intl-localematcher": "0.2.22",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/icu-messageformat-parser": {
-              "version": "2.0.16",
-              "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.16.tgz",
-              "integrity": "sha512-sYg0ImXsAqBbjU/LotoCD9yKC5nUpWVy3s4DwWerHXD4sm62FcjMF8mekwudRk3eZLHqSO+M21MpFUUjDQ+Q5Q==",
-              "requires": {
-                "@formatjs/ecma402-abstract": "1.11.1",
-                "@formatjs/icu-skeleton-parser": "1.3.3",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/icu-skeleton-parser": {
-              "version": "1.3.3",
-              "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.3.tgz",
-              "integrity": "sha512-ifWnzjmHPHUF89UpCvClTP66sXYFc8W/qg7Qt+qtTUB9BqRWlFeUsevAzaMYDJsRiOy4S2WJFrJoZgRKUFfPGQ==",
-              "requires": {
-                "@formatjs/ecma402-abstract": "1.11.1",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/intl-localematcher": {
-              "version": "0.2.22",
-              "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.22.tgz",
-              "integrity": "sha512-z+TvbHW8Q/g2l7/PnfUl0mV9gWxV4d0HT6GQyzkO5QI6QjCvCZGiztnmLX7zoyS16uSMvZ2PoMDfSK9xvZkRRA==",
-              "requires": {
-                "tslib": "^2.1.0"
-              }
-            }
-          }
-        },
-        "@formatjs/intl-displaynames": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.3.1.tgz",
-          "integrity": "sha512-VJ9Aol+mxxYVFVuix06fEbz+SR3uneZltrjGoG16hh83rF5Pjgb5BN6yAQXSvZwUvr+npk62uqKrjajOga4M6g==",
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.11.1",
-            "@formatjs/intl-localematcher": "0.2.22",
-            "tslib": "^2.1.0"
-          },
-          "dependencies": {
-            "@formatjs/ecma402-abstract": {
-              "version": "1.11.1",
-              "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.1.tgz",
-              "integrity": "sha512-tgtNODZUGuUI6PAcnvaLZpGrZLVkXnnAvgzOiueYMzFdOdcOw4iH1WKhCe3+r6VR8rHKToJ2HksUGNCB+zt/bg==",
-              "requires": {
-                "@formatjs/intl-localematcher": "0.2.22",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/intl-localematcher": {
-              "version": "0.2.22",
-              "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.22.tgz",
-              "integrity": "sha512-z+TvbHW8Q/g2l7/PnfUl0mV9gWxV4d0HT6GQyzkO5QI6QjCvCZGiztnmLX7zoyS16uSMvZ2PoMDfSK9xvZkRRA==",
-              "requires": {
-                "tslib": "^2.1.0"
-              }
-            }
-          }
-        },
-        "@formatjs/intl-listformat": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.4.1.tgz",
-          "integrity": "sha512-vQeTRBwRoTDcXAkJ3WGk+ReA0sKq8ldYFwKvf/J3PCd98BlZwuxPaXhTsl1iqKEh0mTdHl8zZ9iohIJTi/u1cg==",
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.11.1",
-            "@formatjs/intl-localematcher": "0.2.22",
-            "tslib": "^2.1.0"
-          },
-          "dependencies": {
-            "@formatjs/ecma402-abstract": {
-              "version": "1.11.1",
-              "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.1.tgz",
-              "integrity": "sha512-tgtNODZUGuUI6PAcnvaLZpGrZLVkXnnAvgzOiueYMzFdOdcOw4iH1WKhCe3+r6VR8rHKToJ2HksUGNCB+zt/bg==",
-              "requires": {
-                "@formatjs/intl-localematcher": "0.2.22",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/intl-localematcher": {
-              "version": "0.2.22",
-              "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.22.tgz",
-              "integrity": "sha512-z+TvbHW8Q/g2l7/PnfUl0mV9gWxV4d0HT6GQyzkO5QI6QjCvCZGiztnmLX7zoyS16uSMvZ2PoMDfSK9xvZkRRA==",
-              "requires": {
-                "tslib": "^2.1.0"
-              }
-            }
-          }
-        },
-        "@formatjs/intl-localematcher": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.28.tgz",
-          "integrity": "sha512-FLsc6Gifs1np/8HnCn/7Q+lHMmenrD5fuDhRT82yj0gi9O19kfaFwjQUw1gZsyILuRyT93GuzdifHj7TKRhBcw==",
-          "dev": true,
-          "requires": {
-            "tslib": "2.4.0"
-          }
-        },
-        "@formatjs/ts-transformer": {
-          "version": "3.9.9",
-          "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.9.9.tgz",
-          "integrity": "sha512-V5BDpn5XW1wWBkpDn5SFHRH4Ndf3oyjxmuqWMxe2EwOKkV4XJvzZI73k3p/Hut3Xg55AxBQQmkFK9hyeBJPyIg==",
-          "dev": true,
-          "requires": {
-            "@formatjs/icu-messageformat-parser": "2.1.4",
-            "@types/json-stable-stringify": "^1.0.32",
-            "@types/node": "14 || 16 || 17",
-            "chalk": "^4.0.0",
-            "json-stable-stringify": "^1.0.1",
-            "tslib": "2.4.0",
-            "typescript": "^4.5"
-          }
-        },
         "@mattermost/compass-icons": {
           "version": "0.1.32",
           "resolved": "https://registry.npmjs.org/@mattermost/compass-icons/-/compass-icons-0.1.32.tgz",
@@ -57494,23 +56577,6 @@
             "tapable": "^2.2.0"
           }
         },
-        "eslint-plugin-formatjs": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-formatjs/-/eslint-plugin-formatjs-4.0.2.tgz",
-          "integrity": "sha512-6tEtLtH4N39pnYp5MjelxHDdohU6yMp5fmXqQq4Uu8MAbkAWAiufNKXfFdLSjuPa0lY5x/ExXKJHr1NJsZtzVA==",
-          "dev": true,
-          "requires": {
-            "@formatjs/icu-messageformat-parser": "2.1.4",
-            "@formatjs/ts-transformer": "3.9.9",
-            "@types/eslint": "7 || 8",
-            "@types/picomatch": "^2.3.0",
-            "@typescript-eslint/typescript-estree": "^5.9.1",
-            "emoji-regex": "^10.0.0",
-            "picomatch": "^2.3.1",
-            "tslib": "2.4.0",
-            "typescript": "^4.5"
-          }
-        },
         "eslint-plugin-import": {
           "version": "2.25.4",
           "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz",
@@ -57643,55 +56709,6 @@
           "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
           "dev": true
         },
-        "intl-messageformat": {
-          "version": "9.11.1",
-          "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.11.1.tgz",
-          "integrity": "sha512-kT0i8AIa1Aez8jGn1i9Xva/sdbjOPY15abR82qnU4jnESjxtynHLW1CBh9ehs13sPA8cE/4A2d6LEne91oDp4w==",
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.11.1",
-            "@formatjs/fast-memoize": "1.2.1",
-            "@formatjs/icu-messageformat-parser": "2.0.16",
-            "tslib": "^2.1.0"
-          },
-          "dependencies": {
-            "@formatjs/ecma402-abstract": {
-              "version": "1.11.1",
-              "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.1.tgz",
-              "integrity": "sha512-tgtNODZUGuUI6PAcnvaLZpGrZLVkXnnAvgzOiueYMzFdOdcOw4iH1WKhCe3+r6VR8rHKToJ2HksUGNCB+zt/bg==",
-              "requires": {
-                "@formatjs/intl-localematcher": "0.2.22",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/icu-messageformat-parser": {
-              "version": "2.0.16",
-              "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.16.tgz",
-              "integrity": "sha512-sYg0ImXsAqBbjU/LotoCD9yKC5nUpWVy3s4DwWerHXD4sm62FcjMF8mekwudRk3eZLHqSO+M21MpFUUjDQ+Q5Q==",
-              "requires": {
-                "@formatjs/ecma402-abstract": "1.11.1",
-                "@formatjs/icu-skeleton-parser": "1.3.3",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/icu-skeleton-parser": {
-              "version": "1.3.3",
-              "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.3.tgz",
-              "integrity": "sha512-ifWnzjmHPHUF89UpCvClTP66sXYFc8W/qg7Qt+qtTUB9BqRWlFeUsevAzaMYDJsRiOy4S2WJFrJoZgRKUFfPGQ==",
-              "requires": {
-                "@formatjs/ecma402-abstract": "1.11.1",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/intl-localematcher": {
-              "version": "0.2.22",
-              "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.22.tgz",
-              "integrity": "sha512-z+TvbHW8Q/g2l7/PnfUl0mV9gWxV4d0HT6GQyzkO5QI6QjCvCZGiztnmLX7zoyS16uSMvZ2PoMDfSK9xvZkRRA==",
-              "requires": {
-                "tslib": "^2.1.0"
-              }
-            }
-          }
-        },
         "is-stream": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -57834,61 +56851,6 @@
             "warning": "^4.0.3"
           }
         },
-        "react-intl": {
-          "version": "5.24.1",
-          "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.24.1.tgz",
-          "integrity": "sha512-GP9ZP4UlWPGjleY2Yu0wJggz4/14VsjGaTduq+jGGsLBsuAVq6Gxa+K58mbn5rRU9E10sHxH75Q73oJMqiGBiw==",
-          "requires": {
-            "@formatjs/ecma402-abstract": "1.11.1",
-            "@formatjs/icu-messageformat-parser": "2.0.16",
-            "@formatjs/intl": "1.18.1",
-            "@formatjs/intl-displaynames": "5.3.1",
-            "@formatjs/intl-listformat": "6.4.1",
-            "@types/hoist-non-react-statics": "^3.3.1",
-            "@types/react": "16 || 17",
-            "hoist-non-react-statics": "^3.3.2",
-            "intl-messageformat": "9.11.1",
-            "tslib": "^2.1.0"
-          },
-          "dependencies": {
-            "@formatjs/ecma402-abstract": {
-              "version": "1.11.1",
-              "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.1.tgz",
-              "integrity": "sha512-tgtNODZUGuUI6PAcnvaLZpGrZLVkXnnAvgzOiueYMzFdOdcOw4iH1WKhCe3+r6VR8rHKToJ2HksUGNCB+zt/bg==",
-              "requires": {
-                "@formatjs/intl-localematcher": "0.2.22",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/icu-messageformat-parser": {
-              "version": "2.0.16",
-              "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.16.tgz",
-              "integrity": "sha512-sYg0ImXsAqBbjU/LotoCD9yKC5nUpWVy3s4DwWerHXD4sm62FcjMF8mekwudRk3eZLHqSO+M21MpFUUjDQ+Q5Q==",
-              "requires": {
-                "@formatjs/ecma402-abstract": "1.11.1",
-                "@formatjs/icu-skeleton-parser": "1.3.3",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/icu-skeleton-parser": {
-              "version": "1.3.3",
-              "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.3.tgz",
-              "integrity": "sha512-ifWnzjmHPHUF89UpCvClTP66sXYFc8W/qg7Qt+qtTUB9BqRWlFeUsevAzaMYDJsRiOy4S2WJFrJoZgRKUFfPGQ==",
-              "requires": {
-                "@formatjs/ecma402-abstract": "1.11.1",
-                "tslib": "^2.1.0"
-              }
-            },
-            "@formatjs/intl-localematcher": {
-              "version": "0.2.22",
-              "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.22.tgz",
-              "integrity": "sha512-z+TvbHW8Q/g2l7/PnfUl0mV9gWxV4d0HT6GQyzkO5QI6QjCvCZGiztnmLX7zoyS16uSMvZ2PoMDfSK9xvZkRRA==",
-              "requires": {
-                "tslib": "^2.1.0"
-              }
-            }
-          }
-        },
         "react-overlays": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-5.2.1.tgz",
@@ -58033,11 +56995,6 @@
           "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
           "dev": true
         },
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        },
         "uncontrollable": {
           "version": "7.2.1",
           "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz",
@@ -59270,20 +58227,20 @@
       }
     },
     "react-intl": {
-      "version": "5.20.10",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.20.10.tgz",
-      "integrity": "sha512-zy0ZQhpjkGsKcK1BFo2HbGM/q8GBVovzoXZGQ76DowR0yr6UzQuPLkrlIrObL2zxIYiDaxaz+hUJaoa2a1xqOQ==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.3.2.tgz",
+      "integrity": "sha512-NT03zOHRAFGcZdTx4cXcVKZtnWBOM6RfLPK8Q67eA+Ba+pHdYb+cmrahncqAnevZKgO1r/nEauiVFKwQeudLIw==",
       "requires": {
-        "@formatjs/ecma402-abstract": "1.9.8",
-        "@formatjs/icu-messageformat-parser": "2.0.11",
-        "@formatjs/intl": "1.14.1",
-        "@formatjs/intl-displaynames": "5.2.3",
-        "@formatjs/intl-listformat": "6.3.3",
+        "@formatjs/ecma402-abstract": "1.14.3",
+        "@formatjs/icu-messageformat-parser": "2.3.0",
+        "@formatjs/intl": "2.6.9",
+        "@formatjs/intl-displaynames": "6.2.6",
+        "@formatjs/intl-listformat": "7.1.9",
         "@types/hoist-non-react-statics": "^3.3.1",
-        "@types/react": "17",
+        "@types/react": "16 || 17 || 18",
         "hoist-non-react-statics": "^3.3.2",
-        "intl-messageformat": "9.9.1",
-        "tslib": "^2.1.0"
+        "intl-messageformat": "10.3.3",
+        "tslib": "^2.4.0"
       }
     },
     "react-is": {
diff --git a/webapp/package.json b/webapp/package.json
index 1127b9407f..71a78d45a2 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -16,12 +16,16 @@
     "check-types": "npm run check-types --workspaces --if-present",
     "clean": "npm run clean --workspaces --if-present"
   },
+  "dependencies": {
+    "react-intl": "6.3.2"
+  },
   "devDependencies": {
     "blessed": "0.1.81",
     "chalk": "4.1.2",
     "concurrently": "7.6.0",
     "cross-env": "7.0.3",
     "eslint": "8.37.0",
+    "eslint-plugin-formatjs": "4.9.1",
     "strip-ansi": "6.0.1"
   },
   "workspaces": [
diff --git a/webapp/platform/components/package.json b/webapp/platform/components/package.json
index 5f06ac80d4..21de3a2762 100644
--- a/webapp/platform/components/package.json
+++ b/webapp/platform/components/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "build": "rollup -c",
     "run": "rollup -c --watch",
-    "clean": "rm -rf dist node_modules tsconfig.tsbuildinfo"
+    "clean": "rm -rf dist node_modules tsconfig.tsbuildinfo .rollup.cache"
   },
   "devDependencies": {
     "@babel/cli": "^7.17.6",
@@ -53,7 +53,7 @@
     "react": "^17.0.2",
     "react-bootstrap": "github:mattermost/react-bootstrap#d821e2b1db1059bd36112d7587fd1b0912b27626",
     "react-dom": "^17.0.2",
-    "react-intl": "^5.20.0",
+    "react-intl": "^6.3.2",
     "shallow-equals": "^1.0.0",
     "styled-components": "^5.3.5",
     "tippy.js": "^6.3.7"
diff --git a/webapp/platform/types/package.json b/webapp/platform/types/package.json
index 8cced94898..280f796605 100644
--- a/webapp/platform/types/package.json
+++ b/webapp/platform/types/package.json
@@ -15,7 +15,9 @@
   },
   "typesVersions": {
     ">=3.1": {
-      "*": ["./lib/*.d.ts"]
+      "*": [
+        "./lib/*.d.ts"
+      ]
     }
   },
   "repository": {
diff --git a/webapp/playbooks/.eslintrc.json b/webapp/playbooks/.eslintrc.json
index d38c4a2da4..981cb77baa 100644
--- a/webapp/playbooks/.eslintrc.json
+++ b/webapp/playbooks/.eslintrc.json
@@ -630,9 +630,8 @@
         "onlyEquality": false
       }
     ],
-    "formatjs/no-id": 2,
+    "formatjs/no-multiple-whitespaces": 2,
     "formatjs/enforce-default-message": 2,
-    "formatjs/no-multiple-whitespaces": 1,
     "formatjs/no-multiple-plurals": 2,
     "formatjs/enforce-placeholders": 2,
     "formatjs/no-literal-string-in-jsx": 2,
diff --git a/webapp/playbooks/i18n/en.json b/webapp/playbooks/i18n/en.json
index f0d4c3f9c0..98383c74e6 100644
--- a/webapp/playbooks/i18n/en.json
+++ b/webapp/playbooks/i18n/en.json
@@ -95,6 +95,7 @@
   "9M92On": "Select channels",
   "9Obw6C": "Filter",
   "9PXW6Q": "Duration / Started on",
+  "9S+ZiL": "No team is selected",
   "9SIW2x": "Target value for each run",
   "9TTfXU": "Your System Admin has been notified.",
   "9X3jwi": "{icon} Cost",
@@ -142,6 +143,7 @@
   "DXACD6": "Publish retrospective report and access the timeline",
   "DaHpK1": "Search for a channel",
   "DnBhRg": "Add People",
+  "DoskyC": "All Teams",
   "DqTQOp": "Once",
   "DtCplA": "{numParticipants, plural, =1 {<b>#</b> participant} other {<b>#</b> participants}}",
   "EQpfkS": "Finished",
@@ -222,6 +224,7 @@
   "MyIJbr": "Contents",
   "N1U/QR": "Task state changes",
   "N2IrpM": "Confirm",
+  "N7Ln74": "Rerun",
   "NFyWnZ": "Work more effectively",
   "NGKqOC": "Also add me to the channel linked to this run",
   "NJ9uPu": "Key metrics",
diff --git a/webapp/playbooks/package.json b/webapp/playbooks/package.json
index f604532cba..9de10ef9bb 100644
--- a/webapp/playbooks/package.json
+++ b/webapp/playbooks/package.json
@@ -28,7 +28,7 @@
     "react-dom": "^17.0.2",
     "react-infinite-scroll-component": "^6.1.0",
     "react-infinite-scroller": "1.2.6",
-    "react-intl": "5.24.1",
+    "react-intl": "*",
     "react-redux": "7.2.6",
     "react-router-dom": "5.3.4",
     "react-router-hash-link": "2.4.3",
@@ -85,7 +85,6 @@
     "classnames": "2.3.1",
     "css-loader": "6.5.1",
     "eslint-import-resolver-webpack": "0.13.2",
-    "eslint-plugin-formatjs": "4.0.2",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-import-newlines": "1.3.0",
     "eslint-plugin-no-relative-import-paths": "1.5.0",
@@ -125,7 +124,7 @@
     "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles --verbose",
     "test-ci": "cross-env TZ=Etc/UTC jest --ci --maxWorkers=100%",
     "check-types": "tsc -b",
-    "extract": "formatjs extract 'src/**/*.{ts,tsx}' --out-file i18n/temp.json --id-interpolation-pattern '[sha512:contenthash:base64:6]' && formatjs compile 'i18n/temp.json' --out-file i18n/en.json && rm i18n/temp.json",
+    "extract": "formatjs extract 'src/**/*.{ts,tsx}' --ignore \"**/*.d.ts\" --out-file i18n/temp.json --id-interpolation-pattern '[sha512:contenthash:base64:6]' && formatjs compile 'i18n/temp.json' --out-file i18n/en.json && rm i18n/temp.json",
     "graphql": "graphql-codegen --config graphql_gen.ts",
     "report-unused-exports": "ts-prune",
     "build:product": "webpack --mode=production",
diff --git a/webapp/playbooks/src/components/backstage/metrics/metrics_card.tsx b/webapp/playbooks/src/components/backstage/metrics/metrics_card.tsx
index 8785373bfa..a5c304bdf4 100644
--- a/webapp/playbooks/src/components/backstage/metrics/metrics_card.tsx
+++ b/webapp/playbooks/src/components/backstage/metrics/metrics_card.tsx
@@ -55,11 +55,13 @@ const MetricsCard = ({playbookMetrics, playbookStats, index}: Props) => {
                 <SummaryCardInner>
                     <Cell>
                         <Title>{formatMessage({defaultMessage: 'Average value'})}</Title>
+                        {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
                         <Value>{stats.average === null ? '-' : transformFn(stats.average)}</Value>
                     </Cell>
                     <Cell>
                         <Title>{formatMessage({defaultMessage: '10-run average value'})}</Title>
                         <Row>
+                            {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
                             <Value>{stats.rolling_average === null ? '-' : transformFn(stats.rolling_average)}</Value>
                             {percentageChange(stats.rolling_average_change)}
                         </Row>
@@ -67,9 +69,11 @@ const MetricsCard = ({playbookMetrics, playbookStats, index}: Props) => {
                     <Cell>
                         <Title>{formatMessage({defaultMessage: 'Value range'})}</Title>
                         <Value>
+                            {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
                             {stats.value_range[0] === null ? '-' : valueTransformFn(stats.value_range[0])}
                             {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
                             <ValueTo>{' ' + formatMessage({defaultMessage: 'to'}) + ' '}</ValueTo>
+                            {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
                             {stats.value_range[1] === null ? '-' : valueTransformFn(stats.value_range[1])}
                         </Value>
                     </Cell>
diff --git a/webapp/playbooks/src/components/backstage/playbook_list.tsx b/webapp/playbooks/src/components/backstage/playbook_list.tsx
index 095fc566cc..e01ea8f2c3 100644
--- a/webapp/playbooks/src/components/backstage/playbook_list.tsx
+++ b/webapp/playbooks/src/components/backstage/playbook_list.tsx
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
-import React, {PropsWithChildren, useRef} from 'react';
+import React, {PropsWithChildren, ReactNode, useRef} from 'react';
 import {FormattedMessage, useIntl} from 'react-intl';
 import {useDispatch, useSelector} from 'react-redux';
 import styled from 'styled-components';
@@ -350,7 +350,7 @@ const PlaybookList = (props: { firstTimeUserExperience?: boolean }) => {
                                         {formatMessage({defaultMessage: 'Choose a template'})}
                                     </AltHeading>
                                     <ImportSub>
-                                        {formatMessage({defaultMessage: 'or <ImportPlaybookButton>Import a playbook</ImportPlaybookButton>'}, {
+                                        {formatMessage<ReactNode>({defaultMessage: 'or <ImportPlaybookButton>Import a playbook</ImportPlaybookButton>'}, {
                                             ImportPlaybookButton: (chunks) => (
                                                 <ImportLinkButton
                                                     onClick={handleImportClick}
diff --git a/webapp/playbooks/src/components/backstage/playbook_list_row.tsx b/webapp/playbooks/src/components/backstage/playbook_list_row.tsx
index 18220eae5d..5e3171f706 100644
--- a/webapp/playbooks/src/components/backstage/playbook_list_row.tsx
+++ b/webapp/playbooks/src/components/backstage/playbook_list_row.tsx
@@ -191,6 +191,7 @@ const PlaybookListRow = (props: Props) => {
                     <InfoLine>
                         {infos.map((info, i) => (
                             <Fragment key={props.playbook.id + '-infoline' + i}>
+                                {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
                                 {i > 0 && ' - '}
                                 {info}
                             </Fragment>))}
@@ -204,7 +205,7 @@ const PlaybookListRow = (props: Props) => {
                         value={props.playbook.last_run_at}
                     />
                 ) : (
-                    '-'
+                    '-' // eslint-disable-line formatjs/no-literal-string-in-jsx
                 )}
             </PlaybookItemRow>
             <PlaybookItemRow>{props.playbook.active_runs}</PlaybookItemRow>
diff --git a/webapp/playbooks/src/components/backstage/playbook_runs/playbook_run/rhs_info_metrics.tsx b/webapp/playbooks/src/components/backstage/playbook_runs/playbook_run/rhs_info_metrics.tsx
index 12ec609903..d27d14b73d 100644
--- a/webapp/playbooks/src/components/backstage/playbook_runs/playbook_run/rhs_info_metrics.tsx
+++ b/webapp/playbooks/src/components/backstage/playbook_runs/playbook_run/rhs_info_metrics.tsx
@@ -122,6 +122,7 @@ const Value = ({metricValue, metricType, editable}: ValueProps) => {
     if (metricValue === null) {
         return (
             <ValuePlaceholder>
+                {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
                 {editable ? formatMessage({defaultMessage: 'Add value...'}) : '-'}
             </ValuePlaceholder>
         );
diff --git a/webapp/playbooks/src/components/backstage/playbook_runs/playbook_run/status_update.tsx b/webapp/playbooks/src/components/backstage/playbook_runs/playbook_run/status_update.tsx
index 6bd98acae3..f15a474f4f 100644
--- a/webapp/playbooks/src/components/backstage/playbook_runs/playbook_run/status_update.tsx
+++ b/webapp/playbooks/src/components/backstage/playbook_runs/playbook_run/status_update.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React, {useState} from 'react';
+import React, {ReactNode, useState} from 'react';
 import {useDispatch} from 'react-redux';
 import styled from 'styled-components';
 import {FormattedMessage, useIntl} from 'react-intl';
@@ -425,7 +425,7 @@ const useRequestUpdateButton = ({type, onClick, disabled = false}: {disabled: bo
         <Tooltip
             id={'request-update-button-tooltip'}
             placement={'bottom'}
-            content={formatMessage(
+            content={formatMessage<ReactNode>(
                 {defaultMessage: '<title>Professional feature</title>\n<body>This is a paid feature, available with a free 30-day trial</body>'},
                 {
                     title: (el) => <div>{el}</div>,
diff --git a/webapp/playbooks/src/components/backstage/runs_list/row.tsx b/webapp/playbooks/src/components/backstage/runs_list/row.tsx
index b3be46f5b6..b8d5a7d2fa 100644
--- a/webapp/playbooks/src/components/backstage/runs_list/row.tsx
+++ b/webapp/playbooks/src/components/backstage/runs_list/row.tsx
@@ -94,7 +94,12 @@ const Row = (props: Props) => {
 
     let infoLine: React.ReactNode = null;
     if (!props.fixedTeam) {
-        infoLine = <InfoLine>{playbookName ? teamName + ' • ' + playbookName : teamName}</InfoLine>;
+        infoLine = (
+            <InfoLine>
+                {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
+                {playbookName ? teamName + ' • ' + playbookName : teamName}
+            </InfoLine>
+        );
     }
 
     function openPlaybookRunDetails(playbookRun: PlaybookRun) {
diff --git a/webapp/playbooks/src/components/checklist_item/command.tsx b/webapp/playbooks/src/components/checklist_item/command.tsx
index 708af31469..248619dda4 100644
--- a/webapp/playbooks/src/components/checklist_item/command.tsx
+++ b/webapp/playbooks/src/components/checklist_item/command.tsx
@@ -79,7 +79,7 @@ const Command = (props: CommandProps) => {
                 }
             }}
         >
-            {props.command_last_run ? 'Rerun' : 'Run'}
+            {props.command_last_run ? formatMessage({defaultMessage: 'Rerun'}) : formatMessage({defaultMessage: 'Run'})}
         </Run>
     );
 
diff --git a/webapp/playbooks/src/components/modals/run_playbook_modal.tsx b/webapp/playbooks/src/components/modals/run_playbook_modal.tsx
index 581c318f39..5652702fab 100644
--- a/webapp/playbooks/src/components/modals/run_playbook_modal.tsx
+++ b/webapp/playbooks/src/components/modals/run_playbook_modal.tsx
@@ -284,6 +284,7 @@ const RunNameSection = ({runName, onSetRunName}: runNameProps) => {
 
     return (<>
         <RunNameLabel invalid={Boolean(error)}>
+            {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
             {formatMessage({defaultMessage: 'Run name'})}{error ? ' *' : ''}
         </RunNameLabel>
         <BaseInput
diff --git a/webapp/playbooks/src/components/modals/update_run_status_modal.tsx b/webapp/playbooks/src/components/modals/update_run_status_modal.tsx
index 01ced4ca5c..12c5d0e8ef 100644
--- a/webapp/playbooks/src/components/modals/update_run_status_modal.tsx
+++ b/webapp/playbooks/src/components/modals/update_run_status_modal.tsx
@@ -1,7 +1,12 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React, {ComponentProps, useMemo, useState} from 'react';
+import React, {
+    ComponentProps,
+    ReactNode,
+    useMemo,
+    useState,
+} from 'react';
 import {Link} from 'react-router-dom';
 import {useDispatch, useSelector} from 'react-redux';
 import styled from 'styled-components';
@@ -205,7 +210,7 @@ const UpdateRunStatusModal = ({
         }
         const followersChannelCount = run?.followers?.length ?? 0;
 
-        const OverviewLink = (...chunks: string[]) => (
+        const OverviewLink = (...chunks: string[]): ReactNode => (
             <Link
                 data-testid='run-overview-link'
                 to={pluginUrl(`/runs/${playbookRunId}?from=status_modal`)}
diff --git a/webapp/playbooks/src/components/playbooks_selector.tsx b/webapp/playbooks/src/components/playbooks_selector.tsx
index 6ebcdb4d11..e11eb0f01f 100644
--- a/webapp/playbooks/src/components/playbooks_selector.tsx
+++ b/webapp/playbooks/src/components/playbooks_selector.tsx
@@ -124,7 +124,7 @@ const PlaybooksSelector = (props: Props) => {
         return props.searchTerm === '' ? (
             <ErrorContainer>
                 <ClipboardSvg/>
-                <ErrorTitle>{formatMessage({defaultMessage: 'Get started with Playbooks'}, {searchTerm: props.searchTerm})}</ErrorTitle>
+                <ErrorTitle>{formatMessage({defaultMessage: 'Get started with Playbooks'})}</ErrorTitle>
                 <ErrorSubTitle>{formatMessage({defaultMessage: 'Playbooks are configurable checklists that define a repeatable process for teams to achieve specific and predictable outcomes'})}</ErrorSubTitle>
                 <PrimaryButton onClick={props.onCreatePlaybook}>
                     <Plus size={16}/>
diff --git a/webapp/playbooks/src/components/sidebar/sidebar.tsx b/webapp/playbooks/src/components/sidebar/sidebar.tsx
index b7f241e079..de39393db2 100644
--- a/webapp/playbooks/src/components/sidebar/sidebar.tsx
+++ b/webapp/playbooks/src/components/sidebar/sidebar.tsx
@@ -6,6 +6,7 @@ import {useSelector} from 'react-redux';
 import {Team} from '@mattermost/types/teams';
 import {OverlayTrigger, Tooltip} from 'react-bootstrap';
 import Scrollbars from 'react-custom-scrollbars';
+import {useIntl} from 'react-intl';
 
 import {OVERLAY_DELAY} from 'src/constants';
 
@@ -43,6 +44,8 @@ const teamNameSelector = (teamId: string) => (state: GlobalState): Team => getTe
 const Sidebar = (props: SidebarProps) => {
     const team = useSelector(teamNameSelector(props.team_id));
 
+    const {formatMessage} = useIntl();
+
     return (
         <SidebarComponent>
             <Header>
@@ -51,11 +54,13 @@ const Sidebar = (props: SidebarProps) => {
                     delay={OVERLAY_DELAY}
                     shouldUpdatePosition={true}
                     overlay={
-                        <Tooltip id='team-name__tooltip'>{team?.description?.length ? team.description : 'No team is selected'}</Tooltip>
+                        <Tooltip id='team-name__tooltip'>
+                            {team?.description?.length ? team.description : formatMessage({defaultMessage: 'No team is selected'})}
+                        </Tooltip>
                     }
                 >
                     <TeamName>
-                        {team?.display_name?.length ? team.display_name : 'All Teams'}
+                        {team?.display_name?.length ? team.display_name : formatMessage({defaultMessage: 'All Teams'})}
                     </TeamName>
                 </OverlayTrigger>
                 {props.headerDropdown}
diff --git a/webapp/playbooks/src/components/widgets/menu/menu_wrapper.tsx b/webapp/playbooks/src/components/widgets/menu/menu_wrapper.tsx
index 9fa298e2b3..bffd28c3d9 100644
--- a/webapp/playbooks/src/components/widgets/menu/menu_wrapper.tsx
+++ b/webapp/playbooks/src/components/widgets/menu/menu_wrapper.tsx
@@ -90,6 +90,7 @@ const MenuWrapper = (props: Props) => {
     return (
         <MenuWrapperComponent
             role='button'
+            // eslint-disable-next-line formatjs/no-literal-string-in-jsx
             aria-label={props.label || 'menuwrapper'}
             className={className}
             onClick={toggle}

From 5c8880321fc381b1398ed02a0f52462935017a73 Mon Sep 17 00:00:00 2001
From: M-ZubairAhmed <m-zubairahmed@protonmail.com>
Date: Sun, 16 Apr 2023 13:23:36 +0530
Subject: [PATCH 070/103] MM-51975 : Standardise Formatjs config for Playbooks
 & Boards (#22948)

Added Formatjs's built-in formatter called "simple". With this change, the intermediate Formatjs compile step is removed. Additionally, the npm command for Playbooks was standardised by replacing "extract" with "i18n-extract" to ensure consistency across all products.
---
 webapp/boards/i18n/en.json    | 2 +-
 webapp/boards/package.json    | 2 +-
 webapp/playbooks/i18n/en.json | 2 +-
 webapp/playbooks/package.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/boards/i18n/en.json b/webapp/boards/i18n/en.json
index a913658a73..2fe9b2c5fa 100644
--- a/webapp/boards/i18n/en.json
+++ b/webapp/boards/i18n/en.json
@@ -453,4 +453,4 @@
   "tutorial_tip.ok": "Next",
   "tutorial_tip.out": "Opt out of these tips.",
   "tutorial_tip.seen": "Seen this before?"
-}
\ No newline at end of file
+}
diff --git a/webapp/boards/package.json b/webapp/boards/package.json
index 4ec669e8bf..6a16614cd5 100644
--- a/webapp/boards/package.json
+++ b/webapp/boards/package.json
@@ -4,7 +4,6 @@
 	"private": true,
 	"description": "",
 	"scripts": {
-		"i18n-extract": "formatjs extract \"src/**/*.{ts,tsx}\" --ignore \"**/*.d.ts\" --out-file i18n/tmp.json && formatjs compile i18n/tmp.json --out-file i18n/en.json && npx rimraf i18n/tmp.json",
 		"build": "webpack --mode=production",
 		"build:watch": "webpack --mode=production --watch",
 		"start:product": "webpack serve --mode=development",
@@ -18,6 +17,7 @@
 		"check-types": "tsc -b",
 		"check-types:fix": "npm run check-types -- --noEmit --fix",
 		"check": "npm run check-lint && npm run check-style",
+		"i18n-extract": "formatjs extract \"src/**/*.{ts,tsx}\" --ignore \"**/*.d.ts\" --id-interpolation-pattern '[sha512:contenthash:base64:6]' --format simple --out-file i18n/en.json",
 		"fix": "npm run check-lint:fix && npm run check-style:fix",
 		"test": "cross-env TZ=Etc/UTC jest",
 		"test:watch": "cross-env TZ=Etc/UTC jest --watch",
diff --git a/webapp/playbooks/i18n/en.json b/webapp/playbooks/i18n/en.json
index 98383c74e6..a87fb63adc 100644
--- a/webapp/playbooks/i18n/en.json
+++ b/webapp/playbooks/i18n/en.json
@@ -607,4 +607,4 @@
   "zx0myy": "Participants",
   "zxj2Gh": "Last updated {time}",
   "zz6ObK": "Restore"
-}
\ No newline at end of file
+}
diff --git a/webapp/playbooks/package.json b/webapp/playbooks/package.json
index 9de10ef9bb..57b00f521a 100644
--- a/webapp/playbooks/package.json
+++ b/webapp/playbooks/package.json
@@ -124,7 +124,7 @@
     "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles --verbose",
     "test-ci": "cross-env TZ=Etc/UTC jest --ci --maxWorkers=100%",
     "check-types": "tsc -b",
-    "extract": "formatjs extract 'src/**/*.{ts,tsx}' --ignore \"**/*.d.ts\" --out-file i18n/temp.json --id-interpolation-pattern '[sha512:contenthash:base64:6]' && formatjs compile 'i18n/temp.json' --out-file i18n/en.json && rm i18n/temp.json",
+    "i18n-extract": "formatjs extract \"src/**/*.{ts,tsx}\" --ignore \"**/*.d.ts\" --id-interpolation-pattern '[sha512:contenthash:base64:6]' --format simple --out-file i18n/en.json",
     "graphql": "graphql-codegen --config graphql_gen.ts",
     "report-unused-exports": "ts-prune",
     "build:product": "webpack --mode=production",

From 496b1e4e1c56a67d1ac392e10c6ba4a35a971087 Mon Sep 17 00:00:00 2001
From: M-ZubairAhmed <m-zubairahmed@protonmail.com>
Date: Mon, 17 Apr 2023 15:41:45 +0530
Subject: [PATCH 071/103] Skip flaky "sidebar template close other" Boards test
 temporarily (#22977)

---
 .../boards/src/components/sidebar/sidebarCategory.test.tsx   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webapp/boards/src/components/sidebar/sidebarCategory.test.tsx b/webapp/boards/src/components/sidebar/sidebarCategory.test.tsx
index 5b97525b25..ec233123dc 100644
--- a/webapp/boards/src/components/sidebar/sidebarCategory.test.tsx
+++ b/webapp/boards/src/components/sidebar/sidebarCategory.test.tsx
@@ -193,7 +193,10 @@ describe('components/sidebarCategory', () => {
         expect(mockTemplateClose).toBeCalled()
     })
 
-    test('sidebar template close other', async () => {
+    // TODO: Remove when fetch is mocked correctly
+    // https://mattermost.atlassian.net/browse/MM-52212
+    // eslint-disable-next-line no-only-tests/no-only-tests
+    test.skip('sidebar template close other', async () => {
         const mockStore = configureStore([])
         const store = mockStore(state)
 

From a80e1e21b969238dafecb03ac81d659de05c5204 Mon Sep 17 00:00:00 2001
From: Doug Lauder <wiggin77@warpmail.net>
Date: Mon, 17 Apr 2023 06:33:07 -0400
Subject: [PATCH 072/103] Remove redundant store APIs for Boards: (#22968)

- getBlocksWithParent
- getBlocksWithParentAndType
- getBlocksWithType
- getBlocksForBoard
---
 server/boards/api/blocks.go                   | 15 ++--
 server/boards/app/blocks.go                   | 19 +---
 server/boards/app/blocks_test.go              | 63 +++++++++++--
 server/boards/app/export.go                   |  2 +-
 .../boards_and_blocks_test.go                 |  4 +-
 server/boards/integrationtests/export_test.go |  2 +-
 server/boards/model/block.go                  |  2 +-
 .../services/store/mockstore/mockstore.go     | 60 -------------
 .../boards/services/store/sqlstore/blocks.go  | 32 -------
 .../store/sqlstore/boards_and_blocks.go       |  2 +-
 .../services/store/sqlstore/public_methods.go | 20 -----
 server/boards/services/store/store.go         |  4 -
 .../services/store/storetests/blocks.go       | 89 ++++++++++++-------
 .../store/storetests/data_retention.go        |  4 +-
 14 files changed, 128 insertions(+), 190 deletions(-)

diff --git a/server/boards/api/blocks.go b/server/boards/api/blocks.go
index 312e3cd37e..c1b8f6a562 100644
--- a/server/boards/api/blocks.go
+++ b/server/boards/api/blocks.go
@@ -72,7 +72,6 @@ func (a *API) handleGetBlocks(w http.ResponseWriter, r *http.Request) {
 	query := r.URL.Query()
 	parentID := query.Get("parent_id")
 	blockType := query.Get("type")
-	all := query.Get("all")
 	blockID := query.Get("block_id")
 	boardID := mux.Vars(r)["boardID"]
 
@@ -122,18 +121,11 @@ func (a *API) handleGetBlocks(w http.ResponseWriter, r *http.Request) {
 	auditRec.AddMeta("boardID", boardID)
 	auditRec.AddMeta("parentID", parentID)
 	auditRec.AddMeta("blockType", blockType)
-	auditRec.AddMeta("all", all)
 	auditRec.AddMeta("blockID", blockID)
 
 	var blocks []*model.Block
 	var block *model.Block
 	switch {
-	case all != "":
-		blocks, err = a.app.GetBlocksForBoard(boardID)
-		if err != nil {
-			a.errorResponse(w, r, err)
-			return
-		}
 	case blockID != "":
 		block, err = a.app.GetBlockByID(blockID)
 		if err != nil {
@@ -148,7 +140,12 @@ func (a *API) handleGetBlocks(w http.ResponseWriter, r *http.Request) {
 
 		blocks = append(blocks, block)
 	default:
-		blocks, err = a.app.GetBlocks(boardID, parentID, blockType)
+		opts := model.QueryBlocksOptions{
+			BoardID:   boardID,
+			ParentID:  parentID,
+			BlockType: model.BlockType(blockType),
+		}
+		blocks, err = a.app.GetBlocks(opts)
 		if err != nil {
 			a.errorResponse(w, r, err)
 			return
diff --git a/server/boards/app/blocks.go b/server/boards/app/blocks.go
index 0e736212c9..8db5ad5990 100644
--- a/server/boards/app/blocks.go
+++ b/server/boards/app/blocks.go
@@ -18,20 +18,11 @@ import (
 
 var ErrBlocksFromMultipleBoards = errors.New("the block set contain blocks from multiple boards")
 
-func (a *App) GetBlocks(boardID, parentID string, blockType string) ([]*model.Block, error) {
-	if boardID == "" {
+func (a *App) GetBlocks(opts model.QueryBlocksOptions) ([]*model.Block, error) {
+	if opts.BoardID == "" {
 		return []*model.Block{}, nil
 	}
-
-	if blockType != "" && parentID != "" {
-		return a.store.GetBlocksWithParentAndType(boardID, parentID, blockType)
-	}
-
-	if blockType != "" {
-		return a.store.GetBlocksWithType(boardID, blockType)
-	}
-
-	return a.store.GetBlocksWithParent(boardID, parentID)
+	return a.store.GetBlocks(opts)
 }
 
 func (a *App) DuplicateBlock(boardID string, blockID string, userID string, asTemplate bool) ([]*model.Block, error) {
@@ -514,10 +505,6 @@ func (a *App) GetBlockCountsByType() (map[string]int64, error) {
 	return a.store.GetBlockCountsByType()
 }
 
-func (a *App) GetBlocksForBoard(boardID string) ([]*model.Block, error) {
-	return a.store.GetBlocksForBoard(boardID)
-}
-
 func (a *App) notifyBlockChanged(action notify.Action, block *model.Block, oldBlock *model.Block, modifiedByID string) {
 	// don't notify if notifications service disabled, or block change is generated via system user.
 	if a.notifications == nil || modifiedByID == model.SystemUserID {
diff --git a/server/boards/app/blocks_test.go b/server/boards/app/blocks_test.go
index 9e4f53c2f9..a810b064d5 100644
--- a/server/boards/app/blocks_test.go
+++ b/server/boards/app/blocks_test.go
@@ -207,10 +207,17 @@ func TestIsWithinViewsLimit(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "board_id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil)
 
 		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
 		assert.NoError(t, err)
@@ -225,10 +232,17 @@ func TestIsWithinViewsLimit(t *testing.T) {
 				Views: mm_model.NewInt(1),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "board_id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil)
 
 		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
 		assert.NoError(t, err)
@@ -243,10 +257,17 @@ func TestIsWithinViewsLimit(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "board_id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}, {}, {}}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}, {}, {}}, nil)
 
 		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
 		assert.NoError(t, err)
@@ -261,10 +282,17 @@ func TestIsWithinViewsLimit(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "board_id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{}, nil)
 
 		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
 		assert.NoError(t, err)
@@ -333,10 +361,17 @@ func TestInsertBlocks(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "test-board-id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("test-board-id", "parent_id", "view").Return([]*model.Block{{}}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil)
 
 		_, err := th.App.InsertBlocks([]*model.Block{block}, "user-id-1")
 		require.NoError(t, err)
@@ -365,10 +400,17 @@ func TestInsertBlocks(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "test-board-id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("test-board-id", "parent_id", "view").Return([]*model.Block{{}, {}}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}, {}}, nil)
 
 		_, err := th.App.InsertBlocks([]*model.Block{block}, "user-id-1")
 		require.Error(t, err)
@@ -406,10 +448,17 @@ func TestInsertBlocks(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "test-board-id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil).Times(2)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil).Times(2)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil).Times(2)
-		th.Store.EXPECT().GetBlocksWithParentAndType("test-board-id", "parent_id", "view").Return([]*model.Block{{}}, nil).Times(2)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil).Times(2)
 
 		_, err := th.App.InsertBlocks([]*model.Block{view1, view2}, "user-id-1")
 		require.Error(t, err)
diff --git a/server/boards/app/export.go b/server/boards/app/export.go
index 4f717be041..60af732727 100644
--- a/server/boards/app/export.go
+++ b/server/boards/app/export.go
@@ -86,7 +86,7 @@ func (a *App) writeArchiveBoard(zw *zip.Writer, board model.Board, opt model.Exp
 	var files []string
 	// write the board's blocks
 	// TODO: paginate this
-	blocks, err := a.GetBlocksForBoard(board.ID)
+	blocks, err := a.GetBlocks(model.QueryBlocksOptions{BoardID: board.ID})
 	if err != nil {
 		return err
 	}
diff --git a/server/boards/integrationtests/boards_and_blocks_test.go b/server/boards/integrationtests/boards_and_blocks_test.go
index 8541265c38..9ae48366f8 100644
--- a/server/boards/integrationtests/boards_and_blocks_test.go
+++ b/server/boards/integrationtests/boards_and_blocks_test.go
@@ -133,7 +133,7 @@ func TestCreateBoardsAndBlocks(t *testing.T) {
 			require.Equal(t, "public board", board1.Title)
 			require.Equal(t, model.BoardTypeOpen, board1.Type)
 			require.NotEqual(t, "board-id-1", board1.ID)
-			blocks1, err := th.Server.App().GetBlocksForBoard(board1.ID)
+			blocks1, err := th.Server.App().GetBlocks(model.QueryBlocksOptions{BoardID: board1.ID})
 			require.NoError(t, err)
 			require.Len(t, blocks1, 1)
 			require.Equal(t, "block 1", blocks1[0].Title)
@@ -147,7 +147,7 @@ func TestCreateBoardsAndBlocks(t *testing.T) {
 			require.Equal(t, "private board", board2.Title)
 			require.Equal(t, model.BoardTypePrivate, board2.Type)
 			require.NotEqual(t, "board-id-2", board2.ID)
-			blocks2, err := th.Server.App().GetBlocksForBoard(board2.ID)
+			blocks2, err := th.Server.App().GetBlocks(model.QueryBlocksOptions{BoardID: board2.ID})
 			require.NoError(t, err)
 			require.Len(t, blocks2, 1)
 			require.Equal(t, "block 2", blocks2[0].Title)
diff --git a/server/boards/integrationtests/export_test.go b/server/boards/integrationtests/export_test.go
index 40de905346..da96ebf301 100644
--- a/server/boards/integrationtests/export_test.go
+++ b/server/boards/integrationtests/export_test.go
@@ -62,7 +62,7 @@ func TestExportBoard(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, boardsImported, 1)
 		boardImported := boardsImported[0]
-		blocksImported, err := th.Server.App().GetBlocksForBoard(boardImported.ID)
+		blocksImported, err := th.Server.App().GetBlocks(model.QueryBlocksOptions{BoardID: boardImported.ID})
 		require.NoError(t, err)
 		require.Len(t, blocksImported, 1)
 		require.Equal(t, block.Title, blocksImported[0].Title)
diff --git a/server/boards/model/block.go b/server/boards/model/block.go
index 587c648eff..02b633e840 100644
--- a/server/boards/model/block.go
+++ b/server/boards/model/block.go
@@ -176,7 +176,7 @@ type QueryBlocksOptions struct {
 	ParentID  string    // if not empty then filter for blocks belonging to specified parent
 	BlockType BlockType // if not empty and not `TypeUnknown` then filter for records of specified block type
 	Page      int       // page number to select when paginating
-	PerPage   int       // number of blocks per page (default=-1, meaning unlimited)
+	PerPage   int       // number of blocks per page (default=0, meaning unlimited)
 }
 
 // QuerySubtreeOptions are query options that can be passed to GetSubTree methods.
diff --git a/server/boards/services/store/mockstore/mockstore.go b/server/boards/services/store/mockstore/mockstore.go
index 1c5f6e0c21..5cd89f13eb 100644
--- a/server/boards/services/store/mockstore/mockstore.go
+++ b/server/boards/services/store/mockstore/mockstore.go
@@ -536,66 +536,6 @@ func (mr *MockStoreMockRecorder) GetBlocksComplianceHistory(arg0 interface{}) *g
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksComplianceHistory", reflect.TypeOf((*MockStore)(nil).GetBlocksComplianceHistory), arg0)
 }
 
-// GetBlocksForBoard mocks base method.
-func (m *MockStore) GetBlocksForBoard(arg0 string) ([]*model0.Block, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetBlocksForBoard", arg0)
-	ret0, _ := ret[0].([]*model0.Block)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// GetBlocksForBoard indicates an expected call of GetBlocksForBoard.
-func (mr *MockStoreMockRecorder) GetBlocksForBoard(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksForBoard", reflect.TypeOf((*MockStore)(nil).GetBlocksForBoard), arg0)
-}
-
-// GetBlocksWithParent mocks base method.
-func (m *MockStore) GetBlocksWithParent(arg0, arg1 string) ([]*model0.Block, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetBlocksWithParent", arg0, arg1)
-	ret0, _ := ret[0].([]*model0.Block)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// GetBlocksWithParent indicates an expected call of GetBlocksWithParent.
-func (mr *MockStoreMockRecorder) GetBlocksWithParent(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksWithParent", reflect.TypeOf((*MockStore)(nil).GetBlocksWithParent), arg0, arg1)
-}
-
-// GetBlocksWithParentAndType mocks base method.
-func (m *MockStore) GetBlocksWithParentAndType(arg0, arg1, arg2 string) ([]*model0.Block, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetBlocksWithParentAndType", arg0, arg1, arg2)
-	ret0, _ := ret[0].([]*model0.Block)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// GetBlocksWithParentAndType indicates an expected call of GetBlocksWithParentAndType.
-func (mr *MockStoreMockRecorder) GetBlocksWithParentAndType(arg0, arg1, arg2 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksWithParentAndType", reflect.TypeOf((*MockStore)(nil).GetBlocksWithParentAndType), arg0, arg1, arg2)
-}
-
-// GetBlocksWithType mocks base method.
-func (m *MockStore) GetBlocksWithType(arg0, arg1 string) ([]*model0.Block, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetBlocksWithType", arg0, arg1)
-	ret0, _ := ret[0].([]*model0.Block)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// GetBlocksWithType indicates an expected call of GetBlocksWithType.
-func (mr *MockStoreMockRecorder) GetBlocksWithType(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksWithType", reflect.TypeOf((*MockStore)(nil).GetBlocksWithType), arg0, arg1)
-}
-
 // GetBoard mocks base method.
 func (m *MockStore) GetBoard(arg0 string) (*model0.Board, error) {
 	m.ctrl.T.Helper()
diff --git a/server/boards/services/store/sqlstore/blocks.go b/server/boards/services/store/sqlstore/blocks.go
index 67318e6b25..c20002963e 100644
--- a/server/boards/services/store/sqlstore/blocks.go
+++ b/server/boards/services/store/sqlstore/blocks.go
@@ -105,23 +105,6 @@ func (s *SQLStore) getBlocks(db sq.BaseRunner, opts model.QueryBlocksOptions) ([
 	return s.blocksFromRows(rows)
 }
 
-func (s *SQLStore) getBlocksWithParentAndType(db sq.BaseRunner, boardID, parentID string, blockType string) ([]*model.Block, error) {
-	opts := model.QueryBlocksOptions{
-		BoardID:   boardID,
-		ParentID:  parentID,
-		BlockType: model.BlockType(blockType),
-	}
-	return s.getBlocks(db, opts)
-}
-
-func (s *SQLStore) getBlocksWithParent(db sq.BaseRunner, boardID, parentID string) ([]*model.Block, error) {
-	opts := model.QueryBlocksOptions{
-		BoardID:  boardID,
-		ParentID: parentID,
-	}
-	return s.getBlocks(db, opts)
-}
-
 func (s *SQLStore) getBlocksByIDs(db sq.BaseRunner, ids []string) ([]*model.Block, error) {
 	query := s.getQueryBuilder(db).
 		Select(s.blockFields("")...).
@@ -148,14 +131,6 @@ func (s *SQLStore) getBlocksByIDs(db sq.BaseRunner, ids []string) ([]*model.Bloc
 	return blocks, nil
 }
 
-func (s *SQLStore) getBlocksWithType(db sq.BaseRunner, boardID, blockType string) ([]*model.Block, error) {
-	opts := model.QueryBlocksOptions{
-		BoardID:   boardID,
-		BlockType: model.BlockType(blockType),
-	}
-	return s.getBlocks(db, opts)
-}
-
 // getSubTree2 returns blocks within 2 levels of the given blockID.
 func (s *SQLStore) getSubTree2(db sq.BaseRunner, boardID string, blockID string, opts model.QuerySubtreeOptions) ([]*model.Block, error) {
 	query := s.getQueryBuilder(db).
@@ -188,13 +163,6 @@ func (s *SQLStore) getSubTree2(db sq.BaseRunner, boardID string, blockID string,
 	return s.blocksFromRows(rows)
 }
 
-func (s *SQLStore) getBlocksForBoard(db sq.BaseRunner, boardID string) ([]*model.Block, error) {
-	opts := model.QueryBlocksOptions{
-		BoardID: boardID,
-	}
-	return s.getBlocks(db, opts)
-}
-
 func (s *SQLStore) blocksFromRows(rows *sql.Rows) ([]*model.Block, error) {
 	results := []*model.Block{}
 
diff --git a/server/boards/services/store/sqlstore/boards_and_blocks.go b/server/boards/services/store/sqlstore/boards_and_blocks.go
index 23d8f5696c..6a88c78f2a 100644
--- a/server/boards/services/store/sqlstore/boards_and_blocks.go
+++ b/server/boards/services/store/sqlstore/boards_and_blocks.go
@@ -166,7 +166,7 @@ func (s *SQLStore) duplicateBoard(db sq.BaseRunner, boardID string, userID strin
 	}
 
 	bab.Boards = []*model.Board{board}
-	blocks, err := s.getBlocksForBoard(db, boardID)
+	blocks, err := s.getBlocks(db, model.QueryBlocksOptions{BoardID: boardID})
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/server/boards/services/store/sqlstore/public_methods.go b/server/boards/services/store/sqlstore/public_methods.go
index dca9d162bf..df4d3419ea 100644
--- a/server/boards/services/store/sqlstore/public_methods.go
+++ b/server/boards/services/store/sqlstore/public_methods.go
@@ -326,26 +326,6 @@ func (s *SQLStore) GetBlocksComplianceHistory(opts model.QueryBlocksComplianceHi
 
 }
 
-func (s *SQLStore) GetBlocksForBoard(boardID string) ([]*model.Block, error) {
-	return s.getBlocksForBoard(s.db, boardID)
-
-}
-
-func (s *SQLStore) GetBlocksWithParent(boardID string, parentID string) ([]*model.Block, error) {
-	return s.getBlocksWithParent(s.db, boardID, parentID)
-
-}
-
-func (s *SQLStore) GetBlocksWithParentAndType(boardID string, parentID string, blockType string) ([]*model.Block, error) {
-	return s.getBlocksWithParentAndType(s.db, boardID, parentID, blockType)
-
-}
-
-func (s *SQLStore) GetBlocksWithType(boardID string, blockType string) ([]*model.Block, error) {
-	return s.getBlocksWithType(s.db, boardID, blockType)
-
-}
-
 func (s *SQLStore) GetBoard(id string) (*model.Board, error) {
 	return s.getBoard(s.db, id)
 
diff --git a/server/boards/services/store/store.go b/server/boards/services/store/store.go
index 5d4da0460b..23b8a3d1c3 100644
--- a/server/boards/services/store/store.go
+++ b/server/boards/services/store/store.go
@@ -18,12 +18,8 @@ const CardLimitTimestampSystemKey = "card_limit_timestamp"
 // Store represents the abstraction of the data storage.
 type Store interface {
 	GetBlocks(opts model.QueryBlocksOptions) ([]*model.Block, error)
-	GetBlocksWithParentAndType(boardID, parentID string, blockType string) ([]*model.Block, error)
-	GetBlocksWithParent(boardID, parentID string) ([]*model.Block, error)
 	GetBlocksByIDs(ids []string) ([]*model.Block, error)
-	GetBlocksWithType(boardID, blockType string) ([]*model.Block, error)
 	GetSubTree2(boardID, blockID string, opts model.QuerySubtreeOptions) ([]*model.Block, error)
-	GetBlocksForBoard(boardID string) ([]*model.Block, error)
 	// @withTransaction
 	InsertBlock(block *model.Block, userID string) error
 	// @withTransaction
diff --git a/server/boards/services/store/storetests/blocks.go b/server/boards/services/store/storetests/blocks.go
index 85dbae606b..1df3ae288d 100644
--- a/server/boards/services/store/storetests/blocks.go
+++ b/server/boards/services/store/storetests/blocks.go
@@ -69,7 +69,7 @@ func testInsertBlock(t *testing.T, store store.Store) {
 	userID := testUserID
 	boardID := testBoardID
 
-	blocks, errBlocks := store.GetBlocksForBoard(boardID)
+	blocks, errBlocks := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, errBlocks)
 	initialCount := len(blocks)
 
@@ -85,7 +85,7 @@ func testInsertBlock(t *testing.T, store store.Store) {
 		err := store.InsertBlock(block, "user-id-1")
 		require.NoError(t, err)
 
-		blocks, err := store.GetBlocksForBoard(boardID)
+		blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 		require.NoError(t, err)
 		require.Len(t, blocks, initialCount+1)
 
@@ -105,7 +105,7 @@ func testInsertBlock(t *testing.T, store store.Store) {
 		err := store.InsertBlock(block, "user-id-1")
 		require.Error(t, err)
 
-		blocks, err := store.GetBlocksForBoard(boardID)
+		blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 		require.NoError(t, err)
 		require.Len(t, blocks, initialCount+1)
 	})
@@ -121,7 +121,7 @@ func testInsertBlock(t *testing.T, store store.Store) {
 		err := store.InsertBlock(block, "user-id-1")
 		require.Error(t, err)
 
-		blocks, err := store.GetBlocksForBoard(boardID)
+		blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 		require.NoError(t, err)
 		require.Len(t, blocks, initialCount+1)
 	})
@@ -204,7 +204,7 @@ func testInsertBlock(t *testing.T, store store.Store) {
 func testInsertBlocks(t *testing.T, store store.Store) {
 	userID := testUserID
 
-	blocks, errBlocks := store.GetBlocksForBoard("id-test")
+	blocks, errBlocks := store.GetBlocks(model.QueryBlocksOptions{BoardID: "id-test"})
 	require.NoError(t, errBlocks)
 	initialCount := len(blocks)
 
@@ -227,7 +227,7 @@ func testInsertBlocks(t *testing.T, store store.Store) {
 		err := store.InsertBlocks(newBlocks, "user-id-1")
 		require.Error(t, err)
 
-		blocks, err := store.GetBlocksForBoard("id-test")
+		blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: "id-test"})
 		require.NoError(t, err)
 		// no blocks should have been inserted
 		require.Len(t, blocks, initialCount)
@@ -249,7 +249,7 @@ func testPatchBlock(t *testing.T, store store.Store) {
 	err := store.InsertBlock(block, "user-id-1")
 	require.NoError(t, err)
 
-	blocks, errBlocks := store.GetBlocksForBoard(boardID)
+	blocks, errBlocks := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, errBlocks)
 	initialCount := len(blocks)
 
@@ -259,7 +259,7 @@ func testPatchBlock(t *testing.T, store store.Store) {
 		require.ErrorAs(t, err, &nf)
 		require.True(t, model.IsErrNotFound(err))
 
-		blocks, err := store.GetBlocksForBoard(boardID)
+		blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 		require.NoError(t, err)
 		require.Len(t, blocks, initialCount)
 	})
@@ -272,7 +272,7 @@ func testPatchBlock(t *testing.T, store store.Store) {
 		err := store.PatchBlock("id-test", blockPatch, "user-id-1")
 		require.Error(t, err)
 
-		blocks, err := store.GetBlocksForBoard(boardID)
+		blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 		require.NoError(t, err)
 		require.Len(t, blocks, initialCount)
 	})
@@ -452,7 +452,7 @@ var (
 
 func testGetSubTree2(t *testing.T, store store.Store) {
 	boardID := testBoardID
-	blocks, err := store.GetBlocksForBoard(boardID)
+	blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, err)
 	initialCount := len(blocks)
 
@@ -460,7 +460,7 @@ func testGetSubTree2(t *testing.T, store store.Store) {
 	time.Sleep(1 * time.Millisecond)
 	defer DeleteBlocks(t, store, subtreeSampleBlocks, "test")
 
-	blocks, err = store.GetBlocksForBoard(boardID)
+	blocks, err = store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, err)
 	require.Len(t, blocks, initialCount+6)
 
@@ -492,7 +492,7 @@ func testDeleteBlock(t *testing.T, store store.Store) {
 	userID := testUserID
 	boardID := testBoardID
 
-	blocks, err := store.GetBlocksForBoard(boardID)
+	blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, err)
 	initialCount := len(blocks)
 
@@ -516,7 +516,7 @@ func testDeleteBlock(t *testing.T, store store.Store) {
 	InsertBlocks(t, store, blocksToInsert, "user-id-1")
 	defer DeleteBlocks(t, store, blocksToInsert, "test")
 
-	blocks, err = store.GetBlocksForBoard(boardID)
+	blocks, err = store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, err)
 	require.Len(t, blocks, initialCount+3)
 
@@ -550,7 +550,7 @@ func testUndeleteBlock(t *testing.T, store store.Store) {
 	boardID := testBoardID
 	userID := testUserID
 
-	blocks, err := store.GetBlocksForBoard(boardID)
+	blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, err)
 	initialCount := len(blocks)
 
@@ -574,7 +574,7 @@ func testUndeleteBlock(t *testing.T, store store.Store) {
 	InsertBlocks(t, store, blocksToInsert, "user-id-1")
 	defer DeleteBlocks(t, store, blocksToInsert, "test")
 
-	blocks, err = store.GetBlocksForBoard(boardID)
+	blocks, err = store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, err)
 	require.Len(t, blocks, initialCount+3)
 
@@ -643,7 +643,7 @@ func testUndeleteBlock(t *testing.T, store store.Store) {
 
 func testGetBlocks(t *testing.T, store store.Store) {
 	boardID := testBoardID
-	blocks, err := store.GetBlocksForBoard(boardID)
+	blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, err)
 
 	blocksToInsert := []*model.Block{
@@ -686,65 +686,74 @@ func testGetBlocks(t *testing.T, store store.Store) {
 	InsertBlocks(t, store, blocksToInsert, "user-id-1")
 	defer DeleteBlocks(t, store, blocksToInsert, "test")
 
-	t.Run("not existing parent", func(t *testing.T) {
+	t.Run("not existing parent with type", func(t *testing.T) {
 		time.Sleep(1 * time.Millisecond)
-		blocks, err = store.GetBlocksWithParentAndType(boardID, "not-exists", "test")
+		opts := model.QueryBlocksOptions{BoardID: boardID, ParentID: "not-exists", BlockType: model.BlockType("test")}
+		blocks, err = store.GetBlocks(opts)
 		require.NoError(t, err)
 		require.Empty(t, blocks)
 	})
 
-	t.Run("not existing type", func(t *testing.T) {
+	t.Run("not existing type with parent", func(t *testing.T) {
 		time.Sleep(1 * time.Millisecond)
-		blocks, err = store.GetBlocksWithParentAndType(boardID, "block1", "not-existing")
+		opts := model.QueryBlocksOptions{BoardID: boardID, ParentID: "block1", BlockType: model.BlockType("not-existing")}
+		blocks, err = store.GetBlocks(opts)
 		require.NoError(t, err)
 		require.Empty(t, blocks)
 	})
 
 	t.Run("valid parent and type", func(t *testing.T) {
 		time.Sleep(1 * time.Millisecond)
-		blocks, err = store.GetBlocksWithParentAndType(boardID, "block1", "test")
+		opts := model.QueryBlocksOptions{BoardID: boardID, ParentID: "block1", BlockType: model.BlockType("test")}
+		blocks, err = store.GetBlocks(opts)
 		require.NoError(t, err)
 		require.Len(t, blocks, 2)
 	})
 
 	t.Run("not existing parent", func(t *testing.T) {
 		time.Sleep(1 * time.Millisecond)
-		blocks, err = store.GetBlocksWithParent(boardID, "not-exists")
+		opts := model.QueryBlocksOptions{BoardID: boardID, ParentID: "not-exists"}
+		blocks, err = store.GetBlocks(opts)
 		require.NoError(t, err)
 		require.Empty(t, blocks)
 	})
 
 	t.Run("valid parent", func(t *testing.T) {
 		time.Sleep(1 * time.Millisecond)
-		blocks, err = store.GetBlocksWithParent(boardID, "block1")
+		opts := model.QueryBlocksOptions{BoardID: boardID, ParentID: "block1"}
+		blocks, err = store.GetBlocks(opts)
 		require.NoError(t, err)
 		require.Len(t, blocks, 3)
 	})
 
 	t.Run("not existing type", func(t *testing.T) {
 		time.Sleep(1 * time.Millisecond)
-		blocks, err = store.GetBlocksWithType(boardID, "not-exists")
+		opts := model.QueryBlocksOptions{BoardID: boardID, BlockType: model.BlockType("not-exists")}
+		blocks, err = store.GetBlocks(opts)
 		require.NoError(t, err)
 		require.Empty(t, blocks)
 	})
 
 	t.Run("valid type", func(t *testing.T) {
 		time.Sleep(1 * time.Millisecond)
-		blocks, err = store.GetBlocksWithType(boardID, "test")
+		opts := model.QueryBlocksOptions{BoardID: boardID, BlockType: model.BlockType("test")}
+		blocks, err = store.GetBlocks(opts)
 		require.NoError(t, err)
 		require.Len(t, blocks, 4)
 	})
 
 	t.Run("not existing board", func(t *testing.T) {
 		time.Sleep(1 * time.Millisecond)
-		blocks, err = store.GetBlocksForBoard("not-exists")
+		opts := model.QueryBlocksOptions{BoardID: "not-exists"}
+		blocks, err = store.GetBlocks(opts)
 		require.NoError(t, err)
 		require.Empty(t, blocks)
 	})
 
 	t.Run("all blocks of the a board", func(t *testing.T) {
 		time.Sleep(1 * time.Millisecond)
-		blocks, err = store.GetBlocksForBoard(boardID)
+		opts := model.QueryBlocksOptions{BoardID: boardID}
+		blocks, err = store.GetBlocks(opts)
 		require.NoError(t, err)
 		require.Len(t, blocks, 5)
 	})
@@ -863,7 +872,7 @@ func testDuplicateBlock(t *testing.T, store store.Store) {
 
 func testGetBlockMetadata(t *testing.T, store store.Store) {
 	boardID := testBoardID
-	blocks, err := store.GetBlocksForBoard(boardID)
+	blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, err)
 
 	blocksToInsert := []*model.Block{
@@ -1082,12 +1091,20 @@ func testUndeleteBlockChildren(t *testing.T, store store.Store) {
 		require.Nil(t, block)
 
 		// ensure the card children were deleted
-		blocks, err := store.GetBlocksWithParentAndType(cardDelete.BoardID, cardDelete.ID, model.TypeText)
+		blocks, err := store.GetBlocks(model.QueryBlocksOptions{
+			BoardID:   cardDelete.BoardID,
+			ParentID:  cardDelete.ID,
+			BlockType: model.TypeText},
+		)
 		require.NoError(t, err)
 		assert.Empty(t, blocks)
 
 		// ensure the other card children remain.
-		blocks, err = store.GetBlocksWithParentAndType(cardKeep.BoardID, cardKeep.ID, model.TypeText)
+		blocks, err = store.GetBlocks(model.QueryBlocksOptions{
+			BoardID:   cardKeep.BoardID,
+			ParentID:  cardKeep.ID,
+			BlockType: model.TypeText},
+		)
 		require.NoError(t, err)
 		assert.Len(t, blocks, len(blocksKeep))
 
@@ -1101,7 +1118,11 @@ func testUndeleteBlockChildren(t *testing.T, store store.Store) {
 		require.NotNil(t, block)
 
 		// ensure the card children were restored
-		blocks, err = store.GetBlocksWithParentAndType(cardDelete.BoardID, cardDelete.ID, model.TypeText)
+		blocks, err = store.GetBlocks(model.QueryBlocksOptions{
+			BoardID:   cardDelete.BoardID,
+			ParentID:  cardDelete.ID,
+			BlockType: model.TypeText},
+		)
 		require.NoError(t, err)
 		assert.Len(t, blocks, len(blocksDelete))
 	})
@@ -1117,12 +1138,12 @@ func testUndeleteBlockChildren(t *testing.T, store store.Store) {
 		require.Nil(t, board)
 
 		// ensure all cards and blocks for the board were deleted
-		blocks, err := store.GetBlocksForBoard(boardDelete.ID)
+		blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardDelete.ID})
 		require.NoError(t, err)
 		assert.Empty(t, blocks)
 
 		// ensure the other board's cards and blocks remain.
-		blocks, err = store.GetBlocksForBoard(boardKeep.ID)
+		blocks, err = store.GetBlocks(model.QueryBlocksOptions{BoardID: boardKeep.ID})
 		require.NoError(t, err)
 		assert.Len(t, blocks, len(blocksKeep)+len(cardsKeep))
 
@@ -1136,7 +1157,7 @@ func testUndeleteBlockChildren(t *testing.T, store store.Store) {
 		require.NotNil(t, board)
 
 		// ensure the board's cards and blocks were restored.
-		blocks, err = store.GetBlocksForBoard(boardDelete.ID)
+		blocks, err = store.GetBlocks(model.QueryBlocksOptions{BoardID: boardDelete.ID})
 		require.NoError(t, err)
 		assert.Len(t, blocks, len(blocksDelete)+len(cardsDelete))
 	})
diff --git a/server/boards/services/store/storetests/data_retention.go b/server/boards/services/store/storetests/data_retention.go
index 83901845ed..47b67b05d7 100644
--- a/server/boards/services/store/storetests/data_retention.go
+++ b/server/boards/services/store/storetests/data_retention.go
@@ -98,7 +98,7 @@ func LoadData(t *testing.T, store store.Store) {
 func testRunDataRetention(t *testing.T, store store.Store, batchSize int) {
 	LoadData(t, store)
 
-	blocks, err := store.GetBlocksForBoard(boardID)
+	blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 	require.NoError(t, err)
 	require.Len(t, blocks, 4)
 	initialCount := len(blocks)
@@ -115,7 +115,7 @@ func testRunDataRetention(t *testing.T, store store.Store, batchSize int) {
 		require.True(t, deletions > int64(initialCount))
 
 		// expect all blocks to be deleted.
-		blocks, errBlocks := store.GetBlocksForBoard(boardID)
+		blocks, errBlocks := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID})
 		require.NoError(t, errBlocks)
 		require.Equal(t, 0, len(blocks))
 

From 1e080d970f671670e9073db11db71bf9f6c9883c Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 14 Apr 2023 10:59:06 +0200
Subject: [PATCH 073/103] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-server-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server-monorepo/

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/
---
 server/i18n/bg.json    | 4 ----
 server/i18n/de.json    | 4 ----
 server/i18n/en_AU.json | 4 ----
 server/i18n/es.json    | 4 ----
 server/i18n/fa.json    | 4 ----
 server/i18n/fr.json    | 4 ----
 server/i18n/hu.json    | 4 ----
 server/i18n/it.json    | 4 ----
 server/i18n/ja.json    | 4 ----
 server/i18n/ko.json    | 4 ----
 server/i18n/nl.json    | 4 ----
 server/i18n/pl.json    | 4 ----
 server/i18n/pt-BR.json | 4 ----
 server/i18n/ro.json    | 4 ----
 server/i18n/ru.json    | 4 ----
 server/i18n/sv.json    | 4 ----
 server/i18n/tr.json    | 4 ----
 server/i18n/uk.json    | 4 ----
 server/i18n/zh-CN.json | 4 ----
 server/i18n/zh-TW.json | 4 ----
 20 files changed, 80 deletions(-)

diff --git a/server/i18n/bg.json b/server/i18n/bg.json
index f9fa12c015..00b110c3b1 100644
--- a/server/i18n/bg.json
+++ b/server/i18n/bg.json
@@ -1927,10 +1927,6 @@
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Неуспешно създаване на групов процесор Elasticsearch."
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch вече е стартиран."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Неуспешно декодиране на резултатите от търсенето"
diff --git a/server/i18n/de.json b/server/i18n/de.json
index 3e7aed88f5..f6d50b4ec2 100644
--- a/server/i18n/de.json
+++ b/server/i18n/de.json
@@ -3135,10 +3135,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Konnte Suchergebnisse nicht dekodieren"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch ist bereits gestartet."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Fehler beim Erstellen der Elasticsearch-Massenverarbeitung."
diff --git a/server/i18n/en_AU.json b/server/i18n/en_AU.json
index c1c5da8290..bb53e81dcf 100644
--- a/server/i18n/en_AU.json
+++ b/server/i18n/en_AU.json
@@ -3291,10 +3291,6 @@
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Failed to create Elasticsearch bulk processor."
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch is already started."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Failed to decode search results"
diff --git a/server/i18n/es.json b/server/i18n/es.json
index 6a8f3c43ce..f919a013e4 100644
--- a/server/i18n/es.json
+++ b/server/i18n/es.json
@@ -3139,10 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "No pudo decodificar los resultados de búsqueda"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch ya fue iniciado."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "No se pudo crear el procesador a granel de Elasticsearch."
diff --git a/server/i18n/fa.json b/server/i18n/fa.json
index f9d6cb94df..529465d842 100644
--- a/server/i18n/fa.json
+++ b/server/i18n/fa.json
@@ -1959,10 +1959,6 @@
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "پردازنده انبوه جستجوی الاستیک ایجاد نشد."
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "جستجوی الاستیک در حال حاضر آغاز شده است."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "رمزگشایی نتایج جستجو انجام نشد"
diff --git a/server/i18n/fr.json b/server/i18n/fr.json
index 77720df20d..5a15ff6ff4 100644
--- a/server/i18n/fr.json
+++ b/server/i18n/fr.json
@@ -3139,10 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Impossible de décoder les résultats de recherche"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch est déjà démarré"
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Impossible de créer le processeur d'opérations en masse d'Elasticsearch (Elasticsearch bulk processor)"
diff --git a/server/i18n/hu.json b/server/i18n/hu.json
index e66cb9ae7f..4f48f7723a 100644
--- a/server/i18n/hu.json
+++ b/server/i18n/hu.json
@@ -3331,10 +3331,6 @@
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Nem sikerült létrehozni az Elasticsearch tömeges feldolgozót."
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Az Elasticsearch már elindult."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Nem sikerült dekódolni a keresési eredményeket"
diff --git a/server/i18n/it.json b/server/i18n/it.json
index 0129b143eb..24c1fd89a4 100644
--- a/server/i18n/it.json
+++ b/server/i18n/it.json
@@ -3139,10 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Impossibile decodificare i risultati della ricerca"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch è già in esecuzione."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Impossibile creare il processore massivo Elasticsearch."
diff --git a/server/i18n/ja.json b/server/i18n/ja.json
index 58aa66d022..f7e6bf17db 100644
--- a/server/i18n/ja.json
+++ b/server/i18n/ja.json
@@ -3131,10 +3131,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "検索結果をデコードできませんでした"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearchは既に起動しています。"
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Elasticsearch Bulk Processorを生成することが出来ませんでした。"
diff --git a/server/i18n/ko.json b/server/i18n/ko.json
index ddd30b9753..97296dcbdb 100644
--- a/server/i18n/ko.json
+++ b/server/i18n/ko.json
@@ -3131,10 +3131,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "검색 결과를 디코딩하지 못했습니다"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch가 이미 시작되었습니다."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Failed to create Elasticsearch bulk processor"
diff --git a/server/i18n/nl.json b/server/i18n/nl.json
index 2e19d757c6..60e8a39a68 100644
--- a/server/i18n/nl.json
+++ b/server/i18n/nl.json
@@ -3135,10 +3135,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Fout bij decoderen van zoekresultaten"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch is reeds gestart."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Aanmaken van Elasticsearch-bulkprocessor is mislukt."
diff --git a/server/i18n/pl.json b/server/i18n/pl.json
index 339c00b48b..3904b4a334 100644
--- a/server/i18n/pl.json
+++ b/server/i18n/pl.json
@@ -3139,10 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Błąd w dekodowaniu wyników wyszukiwania"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch jest obecnie uruchomiony."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Nie udało się utworzyć procesora zbiorczego Elasticsearch."
diff --git a/server/i18n/pt-BR.json b/server/i18n/pt-BR.json
index 48f679a2be..157989b6af 100644
--- a/server/i18n/pt-BR.json
+++ b/server/i18n/pt-BR.json
@@ -3139,10 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Falha ao decodificar os resultados da pesquisa"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch já está iniciado."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Erro ao criar o bulk processor do Elastisearch."
diff --git a/server/i18n/ro.json b/server/i18n/ro.json
index a7ec824541..2b51862302 100644
--- a/server/i18n/ro.json
+++ b/server/i18n/ro.json
@@ -3139,10 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Nu a reuşit să decodeze rezultatele cautării"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch este deja pornit."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Nu s-a putut crea procesorul în bloc Elasticsearch."
diff --git a/server/i18n/ru.json b/server/i18n/ru.json
index 452811806c..9e0af91cc3 100644
--- a/server/i18n/ru.json
+++ b/server/i18n/ru.json
@@ -3139,10 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Не удалось декодировать результаты поиска"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch уже запущен."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Не удалось создать массовый обработчик Elasticsearch."
diff --git a/server/i18n/sv.json b/server/i18n/sv.json
index f63afba27a..c0dca8cf57 100644
--- a/server/i18n/sv.json
+++ b/server/i18n/sv.json
@@ -3079,10 +3079,6 @@
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Misslyckades att skapa Elasticsearch bulk processor."
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch är redan startat."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Kunde inte avkoda sökresultaten"
diff --git a/server/i18n/tr.json b/server/i18n/tr.json
index fd34c87165..58af066bbd 100644
--- a/server/i18n/tr.json
+++ b/server/i18n/tr.json
@@ -3135,10 +3135,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Arama sonuçlarının kodu çözülemedi"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch zaten başlatılmış."
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Elasticsearch toplu işlemi oluşturulamadı."
diff --git a/server/i18n/uk.json b/server/i18n/uk.json
index b63779f26f..de5501e1a6 100644
--- a/server/i18n/uk.json
+++ b/server/i18n/uk.json
@@ -3139,10 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Не вдається розшифрувати результати пошуку"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Еластичний пошук не запускається"
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "Не вдалося створити масовий процесор Elasticsearch"
diff --git a/server/i18n/zh-CN.json b/server/i18n/zh-CN.json
index bbf95c2889..314e3c6bb6 100644
--- a/server/i18n/zh-CN.json
+++ b/server/i18n/zh-CN.json
@@ -3131,10 +3131,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "解码搜索结果失败"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "ElasticSearch 已启动。"
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "创建 Elasticsearch 批量处理器失败。"
diff --git a/server/i18n/zh-TW.json b/server/i18n/zh-TW.json
index e677cec709..4f759a4290 100644
--- a/server/i18n/zh-TW.json
+++ b/server/i18n/zh-TW.json
@@ -3131,10 +3131,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "無法解碼搜尋結果"
   },
-  {
-    "id": "ent.elasticsearch.start.already_started.app_error",
-    "translation": "Elasticsearch 已啟動"
-  },
   {
     "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
     "translation": "建立 Elasticsearch 批次處理器時失敗"

From e102f3523be0efed8881fcc2b57b1f5e49642493 Mon Sep 17 00:00:00 2001
From: Matthew Williams <Matthew.Williams@outlook.com.au>
Date: Fri, 14 Apr 2023 10:59:07 +0200
Subject: [PATCH 074/103] Translated using Weblate (English (Australia))

Currently translated at 99.9% (5771 of 5773 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/en_AU/

Translated using Weblate (English (Australia))

Currently translated at 99.9% (2533 of 2534 strings)

Translation: mattermost-languages-shipped/mattermost-server-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server-monorepo/en_AU/

From 4b80de9aaf0f3b371699db53ef9c6ea9874482bf Mon Sep 17 00:00:00 2001
From: Kaya Zeren <kayazeren@gmail.com>
Date: Fri, 14 Apr 2023 10:59:08 +0200
Subject: [PATCH 075/103] Translated using Weblate (Turkish)

Currently translated at 100.0% (5795 of 5795 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (5794 of 5794 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (5791 of 5791 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (5788 of 5788 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (5777 of 5777 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (5773 of 5773 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 97.4% (5623 of 5773 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (2534 of 2534 strings)

Translation: mattermost-languages-shipped/mattermost-server-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (454 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/tr/
---
 webapp/boards/i18n/tr.json       | 920 +++++++++++++++----------------
 webapp/channels/src/i18n/tr.json |  28 +-
 2 files changed, 485 insertions(+), 463 deletions(-)

diff --git a/webapp/boards/i18n/tr.json b/webapp/boards/i18n/tr.json
index 0c9614a803..948676da4a 100644
--- a/webapp/boards/i18n/tr.json
+++ b/webapp/boards/i18n/tr.json
@@ -1,462 +1,462 @@
 {
-  "AdminBadge.SystemAdmin": "Yönetici",
-  "AdminBadge.TeamAdmin": "Takım yöneticisi",
-  "AppBar.Tooltip": "Bağlantılı panoları aç/kapat",
-  "Attachment.Attachment-title": "Ek dosya",
-  "AttachmentBlock.DeleteAction": "sil",
-  "AttachmentBlock.addElement": "{type} ekle",
-  "AttachmentBlock.delete": "Ek dosya silindi.",
-  "AttachmentBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
-  "AttachmentBlock.upload": "Ek dosya yükleniyor.",
-  "AttachmentBlock.uploadSuccess": "Ek dosya yüklendi.",
-  "AttachmentElement.delete-confirmation-dialog-button-text": "Sil",
-  "AttachmentElement.download": "İndir",
-  "AttachmentElement.upload-percentage": "Yükleniyor...(%{uploadPercent})",
-  "BoardComponent.add-a-group": "+ Grup ekle",
-  "BoardComponent.delete": "Sil",
-  "BoardComponent.hidden-columns": "Gizli sütunlar",
-  "BoardComponent.hide": "Gizle",
-  "BoardComponent.new": "+ Yeni",
-  "BoardComponent.no-property": "{property} yok",
-  "BoardComponent.no-property-title": "{property} alanı boş olan ögeler buraya atanır. Bu sütun silinemez.",
-  "BoardComponent.show": "Görüntüle",
-  "BoardMember.schemeAdmin": "Yönetici",
-  "BoardMember.schemeCommenter": "Yorumcu",
-  "BoardMember.schemeEditor": "Düzenleyici",
-  "BoardMember.schemeNone": "Yok",
-  "BoardMember.schemeViewer": "Görüntüleyici",
-  "BoardMember.unlinkChannel": "Bağlantıyı kaldır",
-  "BoardPage.newVersion": "Yeni bir pano sürümü yayınlanmış. Yeniden yüklemek için buraya tıklayın.",
-  "BoardPage.syncFailed": "Pano silinmiş ya da erişim izni geri alınmış olabilir.",
-  "BoardTemplateSelector.add-template": "Yeni kalıp ekle",
-  "BoardTemplateSelector.create-empty-board": "Boş bir pano ekle",
-  "BoardTemplateSelector.delete-template": "Sil",
-  "BoardTemplateSelector.description": "Kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
-  "BoardTemplateSelector.edit-template": "Düzenle",
-  "BoardTemplateSelector.plugin.no-content-description": "Aşağıdaki kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
-  "BoardTemplateSelector.plugin.no-content-title": "Bir pano ekleyin",
-  "BoardTemplateSelector.title": "Bir pano ekle",
-  "BoardTemplateSelector.use-this-template": "Bu kalıp kullanılsın",
-  "BoardsSwitcher.Title": "Pano arama",
-  "BoardsUnfurl.Limited": "Kart arşivlendiğinden ek bilgiler gizleniyor",
-  "BoardsUnfurl.Remainder": "+{remainder} diğer",
-  "BoardsUnfurl.Updated": "Güncellenme: {time}",
-  "Calculations.Options.average.displayName": "Ortalama",
-  "Calculations.Options.average.label": "Ortalama",
-  "Calculations.Options.count.displayName": "Sayı",
-  "Calculations.Options.count.label": "Sayı",
-  "Calculations.Options.countChecked.displayName": "İşaretlenmiş",
-  "Calculations.Options.countChecked.label": "İşaretlenmiş sayısı",
-  "Calculations.Options.countUnchecked.displayName": "İşaretlenmemiş",
-  "Calculations.Options.countUnchecked.label": "İşaretlenmemiş sayısı",
-  "Calculations.Options.countUniqueValue.displayName": "Eşsiz",
-  "Calculations.Options.countUniqueValue.label": "Eşsiz değer sayısı",
-  "Calculations.Options.countValue.displayName": "Değer",
-  "Calculations.Options.countValue.label": "Değer sayısı",
-  "Calculations.Options.dateRange.displayName": "Aralık",
-  "Calculations.Options.dateRange.label": "Aralık",
-  "Calculations.Options.earliest.displayName": "En erken",
-  "Calculations.Options.earliest.label": "En erken",
-  "Calculations.Options.latest.displayName": "En geç",
-  "Calculations.Options.latest.label": "En geç",
-  "Calculations.Options.max.displayName": "En fazla",
-  "Calculations.Options.max.label": "En fazla",
-  "Calculations.Options.median.displayName": "Orta değer",
-  "Calculations.Options.median.label": "Orta değer",
-  "Calculations.Options.min.displayName": "En az",
-  "Calculations.Options.min.label": "En az",
-  "Calculations.Options.none.displayName": "Hesapla",
-  "Calculations.Options.none.label": "Yok",
-  "Calculations.Options.percentChecked.displayName": "İşaretlenmiş",
-  "Calculations.Options.percentChecked.label": "İşaretlenmiş yüzdesi",
-  "Calculations.Options.percentUnchecked.displayName": "İşaretlenmemiş",
-  "Calculations.Options.percentUnchecked.label": "İşaretlenmemiş yüzdesi",
-  "Calculations.Options.range.displayName": "Aralık",
-  "Calculations.Options.range.label": "Aralık",
-  "Calculations.Options.sum.displayName": "Toplam",
-  "Calculations.Options.sum.label": "Toplam",
-  "CalendarCard.untitled": "Adlandırılmamış",
-  "CardActionsMenu.copiedLink": "Kopyalandı!",
-  "CardActionsMenu.copyLink": "Bağlantıyı kopyala",
-  "CardActionsMenu.delete": "Sil",
-  "CardActionsMenu.duplicate": "Kopyala",
-  "CardBadges.title-checkboxes": "İşaret kutuları",
-  "CardBadges.title-comments": "Yorumlar",
-  "CardBadges.title-description": "Bu kartın bir açıklaması var",
-  "CardDetail.Attach": "Dosya ekle",
-  "CardDetail.Follow": "İzle",
-  "CardDetail.Following": "İzleniyor",
-  "CardDetail.add-content": "İçerik ekle",
-  "CardDetail.add-icon": "Simge ekle",
-  "CardDetail.add-property": "+ Bir özellik ekle",
-  "CardDetail.addCardText": "kart metni ekle",
-  "CardDetail.limited-body": "Professional ya da Enterprise tarifesine geçin.",
-  "CardDetail.limited-button": "Üst tarifeye geç",
-  "CardDetail.limited-title": "Bu kart gizli",
-  "CardDetail.moveContent": "Kart içeriğini taşı",
-  "CardDetail.new-comment-placeholder": "Bir yorum ekle...",
-  "CardDetailProperty.confirm-delete-heading": "Özelliği silmeyi onaylayın",
-  "CardDetailProperty.confirm-delete-subtext": "\"{propertyName}\" özelliğini silmek istediğinize emin misiniz? Bu işlem özelliği panodaki tüm kartlardan siler.",
-  "CardDetailProperty.confirm-property-name-change-subtext": "\"{propertyName}\" {customText} özelliğini değiştirmek istediğinize emin misiniz? Bu işlem bu panodaki {numOfCards} kartı etkiler ve veri kaybına yol açabilir.",
-  "CardDetailProperty.confirm-property-type-change": "Özellik türü değişimini onaylayın",
-  "CardDetailProperty.delete-action-button": "Sil",
-  "CardDetailProperty.property-change-action-button": "Özelliği değiştir",
-  "CardDetailProperty.property-changed": "Özellik değiştirildi!",
-  "CardDetailProperty.property-deleted": "{propertyName} silindi!",
-  "CardDetailProperty.property-name-change-subtext": "\"{oldPropType}\" türünden \"{newPropType}\" türüne",
-  "CardDetial.limited-link": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
-  "CardDialog.delete-confirmation-dialog-attachment": "Ek dosyanın silinmesini onaylayın",
-  "CardDialog.delete-confirmation-dialog-button-text": "Sil",
-  "CardDialog.delete-confirmation-dialog-heading": "Kartı silmeyi onaylayın",
-  "CardDialog.editing-template": "Bir kalıbı düzenliyorsunuz.",
-  "CardDialog.nocard": "Bu kart bulunamadı ya da erişilebilir değil.",
-  "Categories.CreateCategoryDialog.CancelText": "İptal",
-  "Categories.CreateCategoryDialog.CreateText": "Ekle",
-  "Categories.CreateCategoryDialog.Placeholder": "Kategorinize bir ad verin",
-  "Categories.CreateCategoryDialog.UpdateText": "Güncelle",
-  "CenterPanel.Login": "Oturum aç",
-  "CenterPanel.Share": "Paylaş",
-  "ChannelIntro.CreateBoard": "Bir pano ekle",
-  "ColorOption.selectColor": "{color} rengi seçin",
-  "Comment.delete": "Sil",
-  "CommentsList.send": "Gönder",
-  "ConfirmPerson.empty": "Boş",
-  "ConfirmPerson.search": "Arama...",
-  "ConfirmationDialog.cancel-action": "İptal",
-  "ConfirmationDialog.confirm-action": "Onayla",
-  "ContentBlock.Delete": "Sil",
-  "ContentBlock.DeleteAction": "sil",
-  "ContentBlock.addElement": "{type} ekle",
-  "ContentBlock.checkbox": "işaret kutusu",
-  "ContentBlock.divider": "ayıraç",
-  "ContentBlock.editCardCheckbox": "değiştirilmiş işaret kutusu",
-  "ContentBlock.editCardCheckboxText": "kart metnini düzenle",
-  "ContentBlock.editCardText": "kart metnini düzenle",
-  "ContentBlock.editText": "Metni düzenle...",
-  "ContentBlock.image": "görsel",
-  "ContentBlock.insertAbove": "Üste ekle",
-  "ContentBlock.moveBlock": "kart içeriğini taşı",
-  "ContentBlock.moveDown": "Alta taşı",
-  "ContentBlock.moveUp": "Üste taşı",
-  "ContentBlock.text": "metin",
-  "DateFilter.empty": "Boş",
-  "DateRange.clear": "Temizle",
-  "DateRange.empty": "Boş",
-  "DateRange.endDate": "Bitiş tarihi",
-  "DateRange.today": "Bugün",
-  "DeleteBoardDialog.confirm-cancel": "İptal",
-  "DeleteBoardDialog.confirm-delete": "Sil",
-  "DeleteBoardDialog.confirm-info": "“{boardTitle}” panosunu silmek istediğinize emin misiniz? Silme işlemi bu panodaki tüm kartları siler.",
-  "DeleteBoardDialog.confirm-info-template": "“{boardTitle}” pano kalıbını silmek istediğinize emin misiniz?",
-  "DeleteBoardDialog.confirm-tite": "Panoyu silmeyi onayla",
-  "DeleteBoardDialog.confirm-tite-template": "Pano kalıbını silmeyi onayla",
-  "Dialog.closeDialog": "Pencereyi kapat",
-  "EditableDayPicker.today": "Bugün",
-  "Error.mobileweb": "Mobil web desteği şu anda erken beta aşamasındadır. Tüm işlevler kullanılamıyor olabilir.",
-  "Error.websocket-closed": "Websoket bağlantısı kesildi. Bu sorun sürerse, sunucu ya da web vekil sunucu yapılandırmanızı denetleyin.",
-  "Filter.contains": "şunu içeren",
-  "Filter.ends-with": "şununla biten",
-  "Filter.includes": "şunu içeren",
-  "Filter.is": "şu olan",
-  "Filter.is-after": "şundan sonra",
-  "Filter.is-before": "şundan önce",
-  "Filter.is-empty": "boş olan",
-  "Filter.is-not-empty": "boş olmayan",
-  "Filter.is-not-set": "şuna ayarlanmamış olan",
-  "Filter.is-set": "şuna ayarlanmış olan",
-  "Filter.isafter": "şundan sonra",
-  "Filter.isbefore": "şundan önce",
-  "Filter.not-contains": "şunu içermeyen",
-  "Filter.not-ends-with": "şununla bitmeyen",
-  "Filter.not-includes": "şunu içermeyen",
-  "Filter.not-starts-with": "şununla başlamayan",
-  "Filter.starts-with": "şununla başlayan",
-  "FilterByText.placeholder": "metni süz",
-  "FilterComponent.add-filter": "+ Süzgeç ekle",
-  "FilterComponent.delete": "Sil",
-  "FilterValue.empty": "(boş)",
-  "FindBoardsDialog.IntroText": "Pano arama",
-  "FindBoardsDialog.NoResultsFor": "\"{searchQuery}\" için bir sonuç bulunamadı",
-  "FindBoardsDialog.NoResultsSubtext": "Yazımı denetleyin ya da başka bir arama yapmayı deneyin.",
-  "FindBoardsDialog.SubTitle": "Bulmak istediğiniz pano adını yazmaya başlayın. Gezinmek için <b>YUKAR/AŞAĞI</b>, seçmek için <b>ENTER</b>, vazgeçmek için <b>ESC</b> tuşlarını kullanın",
-  "FindBoardsDialog.Title": "Pano arama",
-  "GroupBy.hideEmptyGroups": "{count} boş grubu gizle",
-  "GroupBy.showHiddenGroups": "{count} gizli grubu görüntüle",
-  "GroupBy.ungroup": "Gruplamayı kaldır",
-  "HideBoard.MenuOption": "Panoyu gizle",
-  "KanbanCard.untitled": "Adlandırılmamış",
-  "MentionSuggestion.is-not-board-member": "(pano üyesi değil)",
-  "Mutator.new-board-from-template": "kalıptan yeni pano",
-  "Mutator.new-card-from-template": "kalıptan yeni kart oluştur",
-  "Mutator.new-template-from-card": "karttan yeni kalıp oluştur",
-  "OnboardingTour.AddComments.Body": "Sorunlar hakkında yorum yapabilir ve Mattermost kullanıcılarının dikkatini çekmek için @anabilirsiniz.",
-  "OnboardingTour.AddComments.Title": "Yorum yap",
-  "OnboardingTour.AddDescription.Body": "Takım arkadaşlarınızın kartın ne ile ilgili olduğunu anlaması için kartınıza bir açıklama ekleyin.",
-  "OnboardingTour.AddDescription.Title": "Açıklama ekle",
-  "OnboardingTour.AddProperties.Body": "Daha güçlü kılmak için kartlara çeşitli özellikler ekleyin.",
-  "OnboardingTour.AddProperties.Title": "Özellikler ekle",
-  "OnboardingTour.AddView.Body": "Farklı görünümler kullanarak panonuzu düzenleyecek yeni bir görünüm oluşturmak için buraya gidin.",
-  "OnboardingTour.AddView.Title": "Yeni bir görünüm ekle",
-  "OnboardingTour.CopyLink.Body": "Kartlarınızı takım arkadaşlarınızla paylaşmak için bağlantıyı kopyalayıp bir kanala, doğrudan iletiye veya grup iletisine yapıştırın.",
-  "OnboardingTour.CopyLink.Title": "Bağlantıyı kopyala",
-  "OnboardingTour.OpenACard.Body": "Panoların işinizi düzenlemenize yardımcı olabileceği güçlü yolları keşfetmek için bir kart açın.",
-  "OnboardingTour.OpenACard.Title": "Bir kart açın",
-  "OnboardingTour.ShareBoard.Body": "Panonuzu içeride, ekibiniz ile paylaşabilir ya da kuruluşunuzun dışında herkese açık olarak yayınlayabilirsiniz.",
-  "OnboardingTour.ShareBoard.Title": "Panoyu paylaş",
-  "PersonProperty.board-members": "Pano üyeleri",
-  "PersonProperty.me": "Benim",
-  "PersonProperty.non-board-members": "Pano üyesi olmayanlar",
-  "PropertyMenu.Delete": "Sil",
-  "PropertyMenu.changeType": "Özellik türünü değiştir",
-  "PropertyMenu.selectType": "Özellik türünü seçin",
-  "PropertyMenu.typeTitle": "Tür",
-  "PropertyType.Checkbox": "İşaret kutusu",
-  "PropertyType.CreatedBy": "Oluşturan",
-  "PropertyType.CreatedTime": "Oluşturulma zamanı",
-  "PropertyType.Date": "Tarih",
-  "PropertyType.Email": "E-posta",
-  "PropertyType.MultiPerson": "Çok kişi",
-  "PropertyType.MultiSelect": "Çoklu seçim",
-  "PropertyType.Number": "Sayı",
-  "PropertyType.Person": "Kişi",
-  "PropertyType.Phone": "Telefon",
-  "PropertyType.Select": "Seçin",
-  "PropertyType.Text": "Metin",
-  "PropertyType.Unknown": "Bilinmiyor",
-  "PropertyType.UpdatedBy": "Son güncelleyen",
-  "PropertyType.UpdatedTime": "Son güncelleme zamanı",
-  "PropertyType.Url": "Adres",
-  "PropertyValueElement.empty": "Boş",
-  "RegistrationLink.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
-  "RegistrationLink.copiedLink": "Kopyalandı!",
-  "RegistrationLink.copyLink": "Bağlantıyı kopyala",
-  "RegistrationLink.description": "Başkalarının hesap ekleyebilmesi için bu bağlantıyı paylaş:",
-  "RegistrationLink.regenerateToken": "Kodu yeniden oluştur",
-  "RegistrationLink.tokenRegenerated": "Kayıt bağlantısı yeniden oluşturuldu",
-  "ShareBoard.PublishDescription": "Web üzerinde herkese açık olarak \"salt okunur\" bir bağlantı yayınlayın ve paylaşın.",
-  "ShareBoard.PublishTitle": "Web üzerinde yayınla",
-  "ShareBoard.ShareInternal": "İçeride paylaş",
-  "ShareBoard.ShareInternalDescription": "İzni olan kullanıcılar bu bağlantıyı kullanabilecek.",
-  "ShareBoard.Title": "Panoyu paylaş",
-  "ShareBoard.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
-  "ShareBoard.copiedLink": "Kopyalandı!",
-  "ShareBoard.copyLink": "Bağlantıyı kopyala",
-  "ShareBoard.regenerate": "Kodu yeniden oluştur",
-  "ShareBoard.searchPlaceholder": "Kişi ve kanal arama",
-  "ShareBoard.teamPermissionsText": "{teamName} takımındaki herkes",
-  "ShareBoard.tokenRegenrated": "Kod yeniden oluşturuldu",
-  "ShareBoard.userPermissionsRemoveMemberText": "Üyelikten çıkar",
-  "ShareBoard.userPermissionsYouText": "(Siz)",
-  "ShareTemplate.Title": "Kalıbı paylaş",
-  "ShareTemplate.searchPlaceholder": "Kişi arama",
-  "Sidebar.about": "Focalboard hakkında",
-  "Sidebar.add-board": "+ Pano ekle",
-  "Sidebar.changePassword": "Parola değiştir",
-  "Sidebar.delete-board": "Panoyu sil",
-  "Sidebar.duplicate-board": "Panoyu kopyala",
-  "Sidebar.export-archive": "Arşivi dışa aktar",
-  "Sidebar.import": "İçe aktar",
-  "Sidebar.import-archive": "Arşivi içe aktar",
-  "Sidebar.invite-users": "Kullanıcıları çağır",
-  "Sidebar.logout": "Oturumu kapat",
-  "Sidebar.new-category.badge": "Yeni",
-  "Sidebar.new-category.drag-boards-cta": "Panoları sürükleyip buraya bırakın...",
-  "Sidebar.no-boards-in-category": "İçeride bir pano yok",
-  "Sidebar.product-tour": "Tanıtım turu",
-  "Sidebar.random-icons": "Rastgele simgeler",
-  "Sidebar.set-language": "Dili ayarla",
-  "Sidebar.set-theme": "Temayı ayarla",
-  "Sidebar.settings": "Ayarlar",
-  "Sidebar.template-from-board": "Panodan yeni kalıp",
-  "Sidebar.untitled-board": "(Adlandırılmamış pano)",
-  "Sidebar.untitled-view": "(Adlandırılmamış görünüm)",
-  "SidebarCategories.BlocksMenu.Move": "Şuraya taşı...",
-  "SidebarCategories.CategoryMenu.CreateNew": "Yeni kategori ekle",
-  "SidebarCategories.CategoryMenu.Delete": "Kategoriyi sił",
-  "SidebarCategories.CategoryMenu.DeleteModal.Body": "<b>{categoryName}</b> içindeki panolar Panolar kategorisine taşınacak. Herhangi bir panodan çıkarılmayacaksınız.",
-  "SidebarCategories.CategoryMenu.DeleteModal.Title": "Bu kategori silinsin mi?",
-  "SidebarCategories.CategoryMenu.Update": "Kategoriyi yeniden adlandır",
-  "SidebarTour.ManageCategories.Body": "Özel kategoriler oluşturun ve yönetin. Kategoriler kullanıcıya özeldir, bu nedenle bir panoyu kendi kategorinize taşımanız aynı panoyu kullanan diğer üyeleri etkilemez.",
-  "SidebarTour.ManageCategories.Title": "Kategori yönetimi",
-  "SidebarTour.SearchForBoards.Body": "Panoları hızlıca aramak ve yan çubuğunuza eklemek için pano değiştiriciyi (Cmd/Ctrl + K) açın.",
-  "SidebarTour.SearchForBoards.Title": "Pano arama",
-  "SidebarTour.SidebarCategories.Body": "Tüm panolarınızı artık yeni yan çubuğunuz altında bulabilirsiniz. Artık çalışma alanları arasında geçiş yapmanıza gerek yok. Önceki çalışma alanlarınıza göre eklenmiş tek seferlik özel kategoriler, 7.2 sürümüne güncellemenizin bir parçası olarak otomatik şekilde eklenmiş olabilir. Bunları isteğinize göre kaldırabilir ya da düzenleyebilirsiniz.",
-  "SidebarTour.SidebarCategories.Link": "Ayrıntılı bilgi alın",
-  "SidebarTour.SidebarCategories.Title": "Yan çubuk kategorileri",
-  "SiteStats.total_boards": "Toplam pano",
-  "SiteStats.total_cards": "Toplam kart",
-  "TableComponent.add-icon": "Simge ekle",
-  "TableComponent.name": "Ad",
-  "TableComponent.plus-new": "+ Yeni",
-  "TableHeaderMenu.delete": "Sil",
-  "TableHeaderMenu.duplicate": "Kopya oluştur",
-  "TableHeaderMenu.hide": "Gizle",
-  "TableHeaderMenu.insert-left": "Sola ekle",
-  "TableHeaderMenu.insert-right": "Sağa ekle",
-  "TableHeaderMenu.sort-ascending": "Artan sıralama",
-  "TableHeaderMenu.sort-descending": "Azalan sıralama",
-  "TableRow.DuplicateCard": "kartı kopyala",
-  "TableRow.MoreOption": "Diğer işlemler",
-  "TableRow.open": "Aç",
-  "TopBar.give-feedback": "Geri bildirimde bulunun",
-  "URLProperty.copiedLink": "Kopyalandı!",
-  "URLProperty.copy": "Kopyala",
-  "URLProperty.edit": "Düzenle",
-  "UndoRedoHotKeys.canRedo": "Yinele",
-  "UndoRedoHotKeys.canRedo-with-description": "{description} yinele",
-  "UndoRedoHotKeys.canUndo": "Geri al",
-  "UndoRedoHotKeys.canUndo-with-description": "{description} geri al",
-  "UndoRedoHotKeys.cannotRedo": "Yinelenecek bir işlem yok",
-  "UndoRedoHotKeys.cannotUndo": "Geri alınacak bir işlem yok",
-  "ValueSelector.noOptions": "Herhangi bir seçenek yok. İlk seçeneği eklemek için yazmaya başlayın!",
-  "ValueSelector.valueSelector": "Değer seçici",
-  "ValueSelectorLabel.openMenu": "Menüyü aç",
-  "VersionMessage.help": "Bu sürümdeki yeniliklere bakın.",
-  "VersionMessage.learn-more": "Ayrıntılı bilgi alın",
-  "View.AddView": "Görünüm ekle",
-  "View.Board": "Pano",
-  "View.DeleteView": "Görünümü sil",
-  "View.DuplicateView": "Görünümü kopyala",
-  "View.Gallery": "Galeri",
-  "View.NewBoardTitle": "Pano görünümü",
-  "View.NewCalendarTitle": "Takvim görünümü",
-  "View.NewGalleryTitle": "Galeri görünümü",
-  "View.NewTableTitle": "Tablo görünümü",
-  "View.NewTemplateDefaultTitle": "Adlandırılmamış kalıp",
-  "View.NewTemplateTitle": "Adlandırılmamış",
-  "View.Table": "Tablo",
-  "ViewHeader.add-template": "Yeni kalıp",
-  "ViewHeader.delete-template": "Sil",
-  "ViewHeader.display-by": "Görünüm: {property}",
-  "ViewHeader.edit-template": "Düzenle",
-  "ViewHeader.empty-card": "Boş kart",
-  "ViewHeader.export-board-archive": "Pano arşivini dışa aktar",
-  "ViewHeader.export-complete": "Dışa aktarıldı!",
-  "ViewHeader.export-csv": "CSV olarak dışa aktar",
-  "ViewHeader.export-failed": "Dışa aktarılamadı!",
-  "ViewHeader.filter": "Süz",
-  "ViewHeader.group-by": "Grupla: {property}",
-  "ViewHeader.new": "Yeni",
-  "ViewHeader.properties": "Özellikler",
-  "ViewHeader.properties-menu": "Özellikler menüsü",
-  "ViewHeader.search-text": "Kart arama",
-  "ViewHeader.select-a-template": "Bir kalıp seçin",
-  "ViewHeader.set-default-template": "Varsayılan olarak ata",
-  "ViewHeader.sort": "Sırala",
-  "ViewHeader.untitled": "Adlandırılmamış",
-  "ViewHeader.view-header-menu": "Başlık menüsünü görüntüle",
-  "ViewHeader.view-menu": "Menüyü görüntüle",
-  "ViewLimitDialog.Heading": "Bir panoyu görüntüleme sınırına ulaşıldı",
-  "ViewLimitDialog.PrimaryButton.Title.Admin": "Üst tarifeye geç",
-  "ViewLimitDialog.PrimaryButton.Title.RegularUser": "Yöneticiyi bilgilendir",
-  "ViewLimitDialog.Subtext.Admin": "Professional ya da Enterprise tarifemize geçin.",
-  "ViewLimitDialog.Subtext.Admin.PricingPageLink": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
-  "ViewLimitDialog.Subtext.RegularUser": "Yöneticinizi Professional ya da Enterprise tarifesine geçmesi hakkında bilgilendirin.",
-  "ViewLimitDialog.UpgradeImg.AltText": "üst tarifeye geçiş görseli",
-  "ViewLimitDialog.notifyAdmin.Success": "Yöneticiniz bilgilendirildi",
-  "ViewTitle.hide-description": "açıklamayı gizle",
-  "ViewTitle.pick-icon": "Simge seçin",
-  "ViewTitle.random-icon": "Rastgele",
-  "ViewTitle.remove-icon": "Simgeyi kaldır",
-  "ViewTitle.show-description": "açıklamayı görüntüle",
-  "ViewTitle.untitled-board": "Adlandırılmamış pano",
-  "WelcomePage.Description": "Pano, alışılmış Kanban panosu görünümünde takımların işleri tanımlamasını, düzenlemesini, izlemesi ve yönetmesini sağlayan bir proje yönetimi aracıdır.",
-  "WelcomePage.Explore.Button": "Tura çıkın",
-  "WelcomePage.Heading": "Panolara hoş geldiniz",
-  "WelcomePage.NoThanks.Text": "Hayır teşekkürler, kendim anlayacağım",
-  "WelcomePage.StartUsingIt.Text": "Kullanmaya başlayın",
-  "Workspace.editing-board-template": "Bir pano kalıbını düzenliyorsunuz.",
-  "badge.guest": "Konuk",
-  "boardPage.confirm-join-button": "Katıl",
-  "boardPage.confirm-join-text": "Bir özel kanala, pano yöneticisi tarafından açıkça eklenmeden katılmak üzeresiniz. Bu özel kanala katılmak istediğinize emin misiniz?",
-  "boardPage.confirm-join-title": "Özel kanala katıl",
-  "boardSelector.confirm-link-board": "Panoyu kanala bağla",
-  "boardSelector.confirm-link-board-button": "Evet, panoyu bağla",
-  "boardSelector.confirm-link-board-subtext": "\"{boardName}\" panosunu kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır. Bir pano ile bir kanalın bağlantısını istediğiniz zaman kaldırabilirsiniz.",
-  "boardSelector.confirm-link-board-subtext-with-other-channel": "\"{boardName}\" panosunu bir kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konukl üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
-  "boardSelector.create-a-board": "Bir pano ekle",
-  "boardSelector.link": "Bağlantı",
-  "boardSelector.search-for-boards": "Pano arama",
-  "boardSelector.title": "Panoları bağla",
-  "boardSelector.unlink": "Bağlantıyı kaldır",
-  "calendar.month": "Ay",
-  "calendar.today": "Bugün",
-  "calendar.week": "Hafta",
-  "centerPanel.undefined": "{propertyName} yok",
-  "centerPanel.unknown-user": "Kullanıcı bilinmiyor",
-  "cloudMessage.learn-more": "Ayrıntılı bilgi alın",
-  "createImageBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
-  "default-properties.badges": "Yorumlar ve açıklama",
-  "default-properties.title": "Başlık",
-  "error.back-to-home": "Girişe dön",
-  "error.back-to-team": "Takıma dön",
-  "error.board-not-found": "Pano bulunamadı.",
-  "error.go-login": "Oturum aç",
-  "error.invalid-read-only-board": "Bu panoya erişme izniniz yok. Panolara erişmek için oturum açın.",
-  "error.not-logged-in": "Oturumunuzun süresi dolmuş ya da oturum açmamışsınız. Panolara erişmek için yeniden oturum açın.",
-  "error.page.title": "Bir şeyler ters gitti",
-  "error.team-undefined": "Geçerli bir takım değil.",
-  "error.unknown": "Bir sorun çıktı.",
-  "generic.previous": "Önceki",
-  "guest-no-board.subtitle": "Henüz bu takımdaki herhangi bir panoya erişme izniniz yok. Lütfen biri sizi bir panoya ekleyene kadar bekleyin.",
-  "guest-no-board.title": "Henüz bir pano yok",
-  "imagePaste.upload-failed": "Dosya boyutu sınırı aşıldığından bazı dosyalar yüklenemedi.",
-  "limitedCard.title": "Kartlar gizli",
-  "login.log-in-button": "Oturum aç",
-  "login.log-in-title": "Oturum açın",
-  "login.register-button": "ya da hesabınız yoksa bir hesap açın",
-  "new_channel_modal.create_board.empty_board_description": "Yeni boş bir pano oluştur",
-  "new_channel_modal.create_board.empty_board_title": "Boş pano",
-  "new_channel_modal.create_board.select_template_placeholder": "Bir kalıp seçin",
-  "new_channel_modal.create_board.title": "Bu kanal için bir pano oluştur",
-  "notification-box-card-limit-reached.close-tooltip": "10 gün için sustur",
-  "notification-box-card-limit-reached.contact-link": "yöneticinizi bilgilendirin",
-  "notification-box-card-limit-reached.link": "Ücretli bir tarifeye geçin",
-  "notification-box-card-limit-reached.title": "panoda {cards} kart gizli",
-  "notification-box-cards-hidden.title": "Bu işlem başka bir kartı gizledi",
-  "notification-box.card-limit-reached.not-admin.text": "Arşivlenmiş kartlara erişmek için {contactLink} ile görüşerek ücretli bir tarifeye geçmesini isteyin.",
-  "notification-box.card-limit-reached.text": "Kart sınırına ulaşıldı. Eski kartları görüntülemek için {link}",
-  "person.add-user-to-board": "{username} kullanıcısını panoya ekle",
-  "person.add-user-to-board-confirm-button": "Panoya ekle",
-  "person.add-user-to-board-permissions": "İzinler",
-  "person.add-user-to-board-question": "{username} kullanıcısını panoya eklemek ister misiniz?",
-  "person.add-user-to-board-warning": "{username} panonun bir üyesi değil ve pano ile ilgili herhangi bir bildirim almayacak.",
-  "register.login-button": "ya da bir hesabınız varsa oturum açın",
-  "register.signup-title": "Hesap açın",
-  "rhs-board-non-admin-msg": "Panonun yöneticilerinden değilsiniz",
-  "rhs-boards.add": "Ekle",
-  "rhs-boards.dm": "Dİ",
-  "rhs-boards.gm": "Gİ",
-  "rhs-boards.header.dm": "bu doğrudan ileti",
-  "rhs-boards.header.gm": "bu grup iletisi",
-  "rhs-boards.last-update-at": "Son güncelleme: {datetime}",
-  "rhs-boards.link-boards-to-channel": "Panoları {channelName} kanalına bağla",
-  "rhs-boards.linked-boards": "Bağlı panolar",
-  "rhs-boards.no-boards-linked-to-channel": "Henüz {channelName} kanalına bağlanmış bir pano yok",
-  "rhs-boards.no-boards-linked-to-channel-description": "Panolar, takımlar arasındaki çalışmaları tanımlamak, organize etmek, izlemek ve yönetmek için kullanılabilen kandan panosuna benzer bir proje yönetimi aracıdır.",
-  "rhs-boards.unlink-board": "Panonun bağlantısını kaldır",
-  "rhs-boards.unlink-board1": "Pano bağlantısını kaldır",
-  "rhs-channel-boards-header.title": "Panolar",
-  "share-board.publish": "Yayınla",
-  "share-board.share": "Paylaş",
-  "shareBoard.channels-select-group": "Kanallar",
-  "shareBoard.confirm-change-team-role.body": "Bu panoda izinleri \"{role}\" rolünden daha aşağıda olan herkes <b>{role} rolüne yükseltilecek</b>. Panonunen düşük rolünü değiştirmek istediğinize emin misiniz?",
-  "shareBoard.confirm-change-team-role.confirmBtnText": "Panonun en düşük rolünü değiştir",
-  "shareBoard.confirm-change-team-role.title": "Panonun en düşük rolünü değiştir",
-  "shareBoard.confirm-link-channel": "Panoyu kanala bağla",
-  "shareBoard.confirm-link-channel-button": "Kanalı bağla",
-  "shareBoard.confirm-link-channel-button-with-other-channel": "Eski bağlantıyı kes ve bu kanala bağla",
-  "shareBoard.confirm-link-channel-subtext": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.",
-  "shareBoard.confirm-link-channel-subtext-with-other-channel": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
-  "shareBoard.confirm-unlink.body": "Bir kanalın bir pano ile bağlantısını kaldırdığınızda, kanalın tüm üyeleri (var olan ve yeni), kendilerine özel olarak izin verilmedikçe, panoya erişimi kaybeder.",
-  "shareBoard.confirm-unlink.confirmBtnText": "Kanalın bağlantısını kaldır",
-  "shareBoard.confirm-unlink.title": "Kanalın pano ile bağlantısı kaldır",
-  "shareBoard.lastAdmin": "Panoların en az bir yöneticisi olmalıdır",
-  "shareBoard.members-select-group": "Üyeler",
-  "shareBoard.unknown-channel-display-name": "Kanal bilinmiyor",
-  "tutorial_tip.finish_tour": "Tamam",
-  "tutorial_tip.got_it": "Anladım",
-  "tutorial_tip.ok": "Sonraki",
-  "tutorial_tip.out": "Bu ipuçları görüntülenmesin.",
-  "tutorial_tip.seen": "Daha önce gördünüz mü?"
+    "AdminBadge.SystemAdmin": "Yönetici",
+    "AdminBadge.TeamAdmin": "Takım yöneticisi",
+    "AppBar.Tooltip": "Bağlantılı panoları aç/kapat",
+    "Attachment.Attachment-title": "Ek dosya",
+    "AttachmentBlock.DeleteAction": "sil",
+    "AttachmentBlock.addElement": "{type} ekle",
+    "AttachmentBlock.delete": "Ek dosya silindi.",
+    "AttachmentBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
+    "AttachmentBlock.upload": "Ek dosya yükleniyor.",
+    "AttachmentBlock.uploadSuccess": "Ek dosya yüklendi.",
+    "AttachmentElement.delete-confirmation-dialog-button-text": "Sil",
+    "AttachmentElement.download": "İndir",
+    "AttachmentElement.upload-percentage": "Yükleniyor...(%{uploadPercent})",
+    "BoardComponent.add-a-group": "+ Grup ekle",
+    "BoardComponent.delete": "Sil",
+    "BoardComponent.hidden-columns": "Gizli sütunlar",
+    "BoardComponent.hide": "Gizle",
+    "BoardComponent.new": "+ Yeni",
+    "BoardComponent.no-property": "{property} yok",
+    "BoardComponent.no-property-title": "{property} alanı boş olan ögeler buraya atanır. Bu sütun silinemez.",
+    "BoardComponent.show": "Görüntüle",
+    "BoardMember.schemeAdmin": "Yönetici",
+    "BoardMember.schemeCommenter": "Yorumcu",
+    "BoardMember.schemeEditor": "Düzenleyici",
+    "BoardMember.schemeNone": "Yok",
+    "BoardMember.schemeViewer": "Görüntüleyici",
+    "BoardMember.unlinkChannel": "Bağlantıyı kaldır",
+    "BoardPage.newVersion": "Yeni bir pano sürümü yayınlanmış. Yeniden yüklemek için buraya tıklayın.",
+    "BoardPage.syncFailed": "Pano silinmiş ya da erişim izni geri alınmış olabilir.",
+    "BoardTemplateSelector.add-template": "Yeni kalıp ekle",
+    "BoardTemplateSelector.create-empty-board": "Boş bir pano ekle",
+    "BoardTemplateSelector.delete-template": "Sil",
+    "BoardTemplateSelector.description": "Kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
+    "BoardTemplateSelector.edit-template": "Düzenle",
+    "BoardTemplateSelector.plugin.no-content-description": "Aşağıdaki kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
+    "BoardTemplateSelector.plugin.no-content-title": "Bir pano ekleyin",
+    "BoardTemplateSelector.title": "Bir pano ekle",
+    "BoardTemplateSelector.use-this-template": "Bu kalıp kullanılsın",
+    "BoardsSwitcher.Title": "Pano arama",
+    "BoardsUnfurl.Limited": "Kart arşivlendiğinden ek bilgiler gizleniyor",
+    "BoardsUnfurl.Remainder": "+{remainder} diğer",
+    "BoardsUnfurl.Updated": "Güncellenme: {time}",
+    "Calculations.Options.average.displayName": "Ortalama",
+    "Calculations.Options.average.label": "Ortalama",
+    "Calculations.Options.count.displayName": "Sayı",
+    "Calculations.Options.count.label": "Sayı",
+    "Calculations.Options.countChecked.displayName": "İşaretlenmiş",
+    "Calculations.Options.countChecked.label": "İşaretlenmiş sayısı",
+    "Calculations.Options.countUnchecked.displayName": "İşaretlenmemiş",
+    "Calculations.Options.countUnchecked.label": "İşaretlenmemiş sayısı",
+    "Calculations.Options.countUniqueValue.displayName": "Eşsiz",
+    "Calculations.Options.countUniqueValue.label": "Eşsiz değer sayısı",
+    "Calculations.Options.countValue.displayName": "Değer",
+    "Calculations.Options.countValue.label": "Değer sayısı",
+    "Calculations.Options.dateRange.displayName": "Aralık",
+    "Calculations.Options.dateRange.label": "Aralık",
+    "Calculations.Options.earliest.displayName": "En erken",
+    "Calculations.Options.earliest.label": "En erken",
+    "Calculations.Options.latest.displayName": "En geç",
+    "Calculations.Options.latest.label": "En geç",
+    "Calculations.Options.max.displayName": "En fazla",
+    "Calculations.Options.max.label": "En fazla",
+    "Calculations.Options.median.displayName": "Orta değer",
+    "Calculations.Options.median.label": "Orta değer",
+    "Calculations.Options.min.displayName": "En az",
+    "Calculations.Options.min.label": "En az",
+    "Calculations.Options.none.displayName": "Hesapla",
+    "Calculations.Options.none.label": "Yok",
+    "Calculations.Options.percentChecked.displayName": "İşaretlenmiş",
+    "Calculations.Options.percentChecked.label": "İşaretlenmiş yüzdesi",
+    "Calculations.Options.percentUnchecked.displayName": "İşaretlenmemiş",
+    "Calculations.Options.percentUnchecked.label": "İşaretlenmemiş yüzdesi",
+    "Calculations.Options.range.displayName": "Aralık",
+    "Calculations.Options.range.label": "Aralık",
+    "Calculations.Options.sum.displayName": "Toplam",
+    "Calculations.Options.sum.label": "Toplam",
+    "CalendarCard.untitled": "Adlandırılmamış",
+    "CardActionsMenu.copiedLink": "Kopyalandı!",
+    "CardActionsMenu.copyLink": "Bağlantıyı kopyala",
+    "CardActionsMenu.delete": "Sil",
+    "CardActionsMenu.duplicate": "Kopyala",
+    "CardBadges.title-checkboxes": "İşaret kutuları",
+    "CardBadges.title-comments": "Yorumlar",
+    "CardBadges.title-description": "Bu kartın bir açıklaması var",
+    "CardDetail.Attach": "Dosya ekle",
+    "CardDetail.Follow": "İzle",
+    "CardDetail.Following": "İzleniyor",
+    "CardDetail.add-content": "İçerik ekle",
+    "CardDetail.add-icon": "Simge ekle",
+    "CardDetail.add-property": "+ Bir özellik ekle",
+    "CardDetail.addCardText": "kart metni ekle",
+    "CardDetail.limited-body": "Professional ya da Enterprise tarifesine geçin.",
+    "CardDetail.limited-button": "Üst tarifeye geç",
+    "CardDetail.limited-title": "Bu kart gizli",
+    "CardDetail.moveContent": "Kart içeriğini taşı",
+    "CardDetail.new-comment-placeholder": "Bir yorum ekle...",
+    "CardDetailProperty.confirm-delete-heading": "Özelliği silmeyi onaylayın",
+    "CardDetailProperty.confirm-delete-subtext": "\"{propertyName}\" özelliğini silmek istediğinize emin misiniz? Bu işlem özelliği panodaki tüm kartlardan siler.",
+    "CardDetailProperty.confirm-property-name-change-subtext": "\"{propertyName}\" {customText} özelliğini değiştirmek istediğinize emin misiniz? Bu işlem bu panodaki {numOfCards} kartı etkiler ve veri kaybına yol açabilir.",
+    "CardDetailProperty.confirm-property-type-change": "Özellik türü değişimini onaylayın",
+    "CardDetailProperty.delete-action-button": "Sil",
+    "CardDetailProperty.property-change-action-button": "Özelliği değiştir",
+    "CardDetailProperty.property-changed": "Özellik değiştirildi!",
+    "CardDetailProperty.property-deleted": "{propertyName} silindi!",
+    "CardDetailProperty.property-name-change-subtext": "\"{oldPropType}\" türünden \"{newPropType}\" türüne",
+    "CardDetial.limited-link": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
+    "CardDialog.delete-confirmation-dialog-attachment": "Ek dosyanın silinmesini onaylayın",
+    "CardDialog.delete-confirmation-dialog-button-text": "Sil",
+    "CardDialog.delete-confirmation-dialog-heading": "Kartı silmeyi onaylayın",
+    "CardDialog.editing-template": "Bir kalıbı düzenliyorsunuz.",
+    "CardDialog.nocard": "Bu kart bulunamadı ya da erişilebilir değil.",
+    "Categories.CreateCategoryDialog.CancelText": "İptal",
+    "Categories.CreateCategoryDialog.CreateText": "Ekle",
+    "Categories.CreateCategoryDialog.Placeholder": "Kategorinize bir ad verin",
+    "Categories.CreateCategoryDialog.UpdateText": "Güncelle",
+    "CenterPanel.Login": "Oturum aç",
+    "CenterPanel.Share": "Paylaş",
+    "ChannelIntro.CreateBoard": "Bir pano ekle",
+    "ColorOption.selectColor": "{color} rengi seçin",
+    "Comment.delete": "Sil",
+    "CommentsList.send": "Gönder",
+    "ConfirmPerson.empty": "Boş",
+    "ConfirmPerson.search": "Arama...",
+    "ConfirmationDialog.cancel-action": "İptal",
+    "ConfirmationDialog.confirm-action": "Onayla",
+    "ContentBlock.Delete": "Sil",
+    "ContentBlock.DeleteAction": "sil",
+    "ContentBlock.addElement": "{type} ekle",
+    "ContentBlock.checkbox": "işaret kutusu",
+    "ContentBlock.divider": "ayıraç",
+    "ContentBlock.editCardCheckbox": "değiştirilmiş işaret kutusu",
+    "ContentBlock.editCardCheckboxText": "kart metnini düzenle",
+    "ContentBlock.editCardText": "kart metnini düzenle",
+    "ContentBlock.editText": "Metni düzenle...",
+    "ContentBlock.image": "görsel",
+    "ContentBlock.insertAbove": "Üste ekle",
+    "ContentBlock.moveBlock": "kart içeriğini taşı",
+    "ContentBlock.moveDown": "Alta taşı",
+    "ContentBlock.moveUp": "Üste taşı",
+    "ContentBlock.text": "metin",
+    "DateFilter.empty": "Boş",
+    "DateRange.clear": "Temizle",
+    "DateRange.empty": "Boş",
+    "DateRange.endDate": "Bitiş tarihi",
+    "DateRange.today": "Bugün",
+    "DeleteBoardDialog.confirm-cancel": "İptal",
+    "DeleteBoardDialog.confirm-delete": "Sil",
+    "DeleteBoardDialog.confirm-info": "“{boardTitle}” panosunu silmek istediğinize emin misiniz? Silme işlemi bu panodaki tüm kartları siler.",
+    "DeleteBoardDialog.confirm-info-template": "“{boardTitle}” pano kalıbını silmek istediğinize emin misiniz?",
+    "DeleteBoardDialog.confirm-tite": "Panoyu silmeyi onayla",
+    "DeleteBoardDialog.confirm-tite-template": "Pano kalıbını silmeyi onayla",
+    "Dialog.closeDialog": "Pencereyi kapat",
+    "EditableDayPicker.today": "Bugün",
+    "Error.mobileweb": "Mobil web desteği şu anda erken beta aşamasındadır. Tüm işlevler kullanılamıyor olabilir.",
+    "Error.websocket-closed": "Websoket bağlantısı kesildi. Bu sorun sürerse, sunucu ya da web vekil sunucu yapılandırmanızı denetleyin.",
+    "Filter.contains": "şunu içeren",
+    "Filter.ends-with": "şununla biten",
+    "Filter.includes": "şunu içeren",
+    "Filter.is": "şu olan",
+    "Filter.is-after": "şundan sonra",
+    "Filter.is-before": "şundan önce",
+    "Filter.is-empty": "boş olan",
+    "Filter.is-not-empty": "boş olmayan",
+    "Filter.is-not-set": "şuna ayarlanmamış olan",
+    "Filter.is-set": "şuna ayarlanmış olan",
+    "Filter.isafter": "şundan sonra",
+    "Filter.isbefore": "şundan önce",
+    "Filter.not-contains": "şunu içermeyen",
+    "Filter.not-ends-with": "şununla bitmeyen",
+    "Filter.not-includes": "şunu içermeyen",
+    "Filter.not-starts-with": "şununla başlamayan",
+    "Filter.starts-with": "şununla başlayan",
+    "FilterByText.placeholder": "metni süz",
+    "FilterComponent.add-filter": "+ Süzgeç ekle",
+    "FilterComponent.delete": "Sil",
+    "FilterValue.empty": "(boş)",
+    "FindBoardsDialog.IntroText": "Pano arama",
+    "FindBoardsDialog.NoResultsFor": "\"{searchQuery}\" için bir sonuç bulunamadı",
+    "FindBoardsDialog.NoResultsSubtext": "Yazımı denetleyin ya da başka bir arama yapmayı deneyin.",
+    "FindBoardsDialog.SubTitle": "Bulmak istediğiniz pano adını yazmaya başlayın. Gezinmek için <b>YUKAR/AŞAĞI</b>, seçmek için <b>ENTER</b>, vazgeçmek için <b>ESC</b> tuşlarını kullanın",
+    "FindBoardsDialog.Title": "Pano arama",
+    "GroupBy.hideEmptyGroups": "{count} boş grubu gizle",
+    "GroupBy.showHiddenGroups": "{count} gizli grubu görüntüle",
+    "GroupBy.ungroup": "Gruplamayı kaldır",
+    "HideBoard.MenuOption": "Panoyu gizle",
+    "KanbanCard.untitled": "Adlandırılmamış",
+    "MentionSuggestion.is-not-board-member": "(pano üyesi değil)",
+    "Mutator.new-board-from-template": "kalıptan yeni pano",
+    "Mutator.new-card-from-template": "kalıptan yeni kart oluştur",
+    "Mutator.new-template-from-card": "karttan yeni kalıp oluştur",
+    "OnboardingTour.AddComments.Body": "Sorunlar hakkında yorum yapabilir ve Mattermost kullanıcılarının dikkatini çekmek için @anabilirsiniz.",
+    "OnboardingTour.AddComments.Title": "Yorum yap",
+    "OnboardingTour.AddDescription.Body": "Takım arkadaşlarınızın kartın ne ile ilgili olduğunu anlaması için kartınıza bir açıklama ekleyin.",
+    "OnboardingTour.AddDescription.Title": "Açıklama ekle",
+    "OnboardingTour.AddProperties.Body": "Daha güçlü kılmak için kartlara çeşitli özellikler ekleyin.",
+    "OnboardingTour.AddProperties.Title": "Özellikler ekle",
+    "OnboardingTour.AddView.Body": "Farklı görünümler kullanarak panonuzu düzenleyecek yeni bir görünüm oluşturmak için buraya gidin.",
+    "OnboardingTour.AddView.Title": "Yeni bir görünüm ekle",
+    "OnboardingTour.CopyLink.Body": "Kartlarınızı takım arkadaşlarınızla paylaşmak için bağlantıyı kopyalayıp bir kanala, doğrudan iletiye veya grup iletisine yapıştırın.",
+    "OnboardingTour.CopyLink.Title": "Bağlantıyı kopyala",
+    "OnboardingTour.OpenACard.Body": "Panoların işinizi düzenlemenize yardımcı olabileceği güçlü yolları keşfetmek için bir kart açın.",
+    "OnboardingTour.OpenACard.Title": "Bir kart açın",
+    "OnboardingTour.ShareBoard.Body": "Panonuzu içeride, ekibiniz ile paylaşabilir ya da kuruluşunuzun dışında herkese açık olarak yayınlayabilirsiniz.",
+    "OnboardingTour.ShareBoard.Title": "Panoyu paylaş",
+    "PersonProperty.board-members": "Pano üyeleri",
+    "PersonProperty.me": "Benim",
+    "PersonProperty.non-board-members": "Pano üyesi olmayanlar",
+    "PropertyMenu.Delete": "Sil",
+    "PropertyMenu.changeType": "Özellik türünü değiştir",
+    "PropertyMenu.selectType": "Özellik türünü seçin",
+    "PropertyMenu.typeTitle": "Tür",
+    "PropertyType.Checkbox": "İşaret kutusu",
+    "PropertyType.CreatedBy": "Oluşturan",
+    "PropertyType.CreatedTime": "Oluşturulma zamanı",
+    "PropertyType.Date": "Tarih",
+    "PropertyType.Email": "E-posta",
+    "PropertyType.MultiPerson": "Çok kişi",
+    "PropertyType.MultiSelect": "Çoklu seçim",
+    "PropertyType.Number": "Sayı",
+    "PropertyType.Person": "Kişi",
+    "PropertyType.Phone": "Telefon",
+    "PropertyType.Select": "Seçin",
+    "PropertyType.Text": "Metin",
+    "PropertyType.Unknown": "Bilinmiyor",
+    "PropertyType.UpdatedBy": "Son güncelleyen",
+    "PropertyType.UpdatedTime": "Son güncelleme zamanı",
+    "PropertyType.Url": "Adres",
+    "PropertyValueElement.empty": "Boş",
+    "RegistrationLink.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
+    "RegistrationLink.copiedLink": "Kopyalandı!",
+    "RegistrationLink.copyLink": "Bağlantıyı kopyala",
+    "RegistrationLink.description": "Başkalarının hesap ekleyebilmesi için bu bağlantıyı paylaş:",
+    "RegistrationLink.regenerateToken": "Kodu yeniden oluştur",
+    "RegistrationLink.tokenRegenerated": "Kayıt bağlantısı yeniden oluşturuldu",
+    "ShareBoard.PublishDescription": "Web üzerinde herkese açık olarak \"salt okunur\" bir bağlantı yayınlayın ve paylaşın.",
+    "ShareBoard.PublishTitle": "Web üzerinde yayınla",
+    "ShareBoard.ShareInternal": "İçeride paylaş",
+    "ShareBoard.ShareInternalDescription": "İzni olan kullanıcılar bu bağlantıyı kullanabilecek.",
+    "ShareBoard.Title": "Panoyu paylaş",
+    "ShareBoard.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
+    "ShareBoard.copiedLink": "Kopyalandı!",
+    "ShareBoard.copyLink": "Bağlantıyı kopyala",
+    "ShareBoard.regenerate": "Kodu yeniden oluştur",
+    "ShareBoard.searchPlaceholder": "Kişi ve kanal arama",
+    "ShareBoard.teamPermissionsText": "{teamName} takımındaki herkes",
+    "ShareBoard.tokenRegenrated": "Kod yeniden oluşturuldu",
+    "ShareBoard.userPermissionsRemoveMemberText": "Üyelikten çıkar",
+    "ShareBoard.userPermissionsYouText": "(Siz)",
+    "ShareTemplate.Title": "Kalıbı paylaş",
+    "ShareTemplate.searchPlaceholder": "Kişi arama",
+    "Sidebar.about": "Focalboard hakkında",
+    "Sidebar.add-board": "+ Pano ekle",
+    "Sidebar.changePassword": "Parola değiştir",
+    "Sidebar.delete-board": "Panoyu sil",
+    "Sidebar.duplicate-board": "Panoyu kopyala",
+    "Sidebar.export-archive": "Arşivi dışa aktar",
+    "Sidebar.import": "İçe aktar",
+    "Sidebar.import-archive": "Arşivi içe aktar",
+    "Sidebar.invite-users": "Kullanıcıları çağır",
+    "Sidebar.logout": "Oturumu kapat",
+    "Sidebar.new-category.badge": "Yeni",
+    "Sidebar.new-category.drag-boards-cta": "Panoları sürükleyip buraya bırakın...",
+    "Sidebar.no-boards-in-category": "İçeride bir pano yok",
+    "Sidebar.product-tour": "Tanıtım turu",
+    "Sidebar.random-icons": "Rastgele simgeler",
+    "Sidebar.set-language": "Dili ayarla",
+    "Sidebar.set-theme": "Temayı ayarla",
+    "Sidebar.settings": "Ayarlar",
+    "Sidebar.template-from-board": "Panodan yeni kalıp",
+    "Sidebar.untitled-board": "(Adlandırılmamış pano)",
+    "Sidebar.untitled-view": "(Adlandırılmamış görünüm)",
+    "SidebarCategories.BlocksMenu.Move": "Şuraya taşı...",
+    "SidebarCategories.CategoryMenu.CreateNew": "Yeni kategori ekle",
+    "SidebarCategories.CategoryMenu.Delete": "Kategoriyi sił",
+    "SidebarCategories.CategoryMenu.DeleteModal.Body": "<b>{categoryName}</b> içindeki panolar Panolar kategorisine taşınacak. Herhangi bir panodan çıkarılmayacaksınız.",
+    "SidebarCategories.CategoryMenu.DeleteModal.Title": "Bu kategori silinsin mi?",
+    "SidebarCategories.CategoryMenu.Update": "Kategoriyi yeniden adlandır",
+    "SidebarTour.ManageCategories.Body": "Özel kategoriler oluşturun ve yönetin. Kategoriler kullanıcıya özeldir, bu nedenle bir panoyu kendi kategorinize taşımanız aynı panoyu kullanan diğer üyeleri etkilemez.",
+    "SidebarTour.ManageCategories.Title": "Kategori yönetimi",
+    "SidebarTour.SearchForBoards.Body": "Panoları hızlıca aramak ve yan çubuğunuza eklemek için pano değiştiriciyi (Cmd/Ctrl + K) açın.",
+    "SidebarTour.SearchForBoards.Title": "Pano arama",
+    "SidebarTour.SidebarCategories.Body": "Tüm panolarınızı artık yeni yan çubuğunuz altında bulabilirsiniz. Artık çalışma alanları arasında geçiş yapmanıza gerek yok. Önceki çalışma alanlarınıza göre eklenmiş tek seferlik özel kategoriler, 7.2 sürümüne güncellemenizin bir parçası olarak otomatik şekilde eklenmiş olabilir. Bunları isteğinize göre kaldırabilir ya da düzenleyebilirsiniz.",
+    "SidebarTour.SidebarCategories.Link": "Ayrıntılı bilgi alın",
+    "SidebarTour.SidebarCategories.Title": "Yan çubuk kategorileri",
+    "SiteStats.total_boards": "Toplam pano",
+    "SiteStats.total_cards": "Toplam kart",
+    "TableComponent.add-icon": "Simge ekle",
+    "TableComponent.name": "Ad",
+    "TableComponent.plus-new": "+ Yeni",
+    "TableHeaderMenu.delete": "Sil",
+    "TableHeaderMenu.duplicate": "Kopya oluştur",
+    "TableHeaderMenu.hide": "Gizle",
+    "TableHeaderMenu.insert-left": "Sola ekle",
+    "TableHeaderMenu.insert-right": "Sağa ekle",
+    "TableHeaderMenu.sort-ascending": "Artan sıralama",
+    "TableHeaderMenu.sort-descending": "Azalan sıralama",
+    "TableRow.DuplicateCard": "kartı kopyala",
+    "TableRow.MoreOption": "Diğer işlemler",
+    "TableRow.open": "Aç",
+    "TopBar.give-feedback": "Geri bildirimde bulunun",
+    "URLProperty.copiedLink": "Kopyalandı!",
+    "URLProperty.copy": "Kopyala",
+    "URLProperty.edit": "Düzenle",
+    "UndoRedoHotKeys.canRedo": "Yinele",
+    "UndoRedoHotKeys.canRedo-with-description": "{description} yinele",
+    "UndoRedoHotKeys.canUndo": "Geri al",
+    "UndoRedoHotKeys.canUndo-with-description": "{description} geri al",
+    "UndoRedoHotKeys.cannotRedo": "Yinelenecek bir işlem yok",
+    "UndoRedoHotKeys.cannotUndo": "Geri alınacak bir işlem yok",
+    "ValueSelector.noOptions": "Herhangi bir seçenek yok. İlk seçeneği eklemek için yazmaya başlayın!",
+    "ValueSelector.valueSelector": "Değer seçici",
+    "ValueSelectorLabel.openMenu": "Menüyü aç",
+    "VersionMessage.help": "Bu sürümdeki yeniliklere bakın.",
+    "VersionMessage.learn-more": "Ayrıntılı bilgi alın",
+    "View.AddView": "Görünüm ekle",
+    "View.Board": "Pano",
+    "View.DeleteView": "Görünümü sil",
+    "View.DuplicateView": "Görünümü kopyala",
+    "View.Gallery": "Galeri",
+    "View.NewBoardTitle": "Pano görünümü",
+    "View.NewCalendarTitle": "Takvim görünümü",
+    "View.NewGalleryTitle": "Galeri görünümü",
+    "View.NewTableTitle": "Tablo görünümü",
+    "View.NewTemplateDefaultTitle": "Adlandırılmamış kalıp",
+    "View.NewTemplateTitle": "Adlandırılmamış",
+    "View.Table": "Tablo",
+    "ViewHeader.add-template": "Yeni kalıp",
+    "ViewHeader.delete-template": "Sil",
+    "ViewHeader.display-by": "Görünüm: {property}",
+    "ViewHeader.edit-template": "Düzenle",
+    "ViewHeader.empty-card": "Boş kart",
+    "ViewHeader.export-board-archive": "Pano arşivini dışa aktar",
+    "ViewHeader.export-complete": "Dışa aktarıldı!",
+    "ViewHeader.export-csv": "CSV olarak dışa aktar",
+    "ViewHeader.export-failed": "Dışa aktarılamadı!",
+    "ViewHeader.filter": "Süz",
+    "ViewHeader.group-by": "Grupla: {property}",
+    "ViewHeader.new": "Yeni",
+    "ViewHeader.properties": "Özellikler",
+    "ViewHeader.properties-menu": "Özellikler menüsü",
+    "ViewHeader.search-text": "Kart arama",
+    "ViewHeader.select-a-template": "Bir kalıp seçin",
+    "ViewHeader.set-default-template": "Varsayılan olarak ata",
+    "ViewHeader.sort": "Sırala",
+    "ViewHeader.untitled": "Adlandırılmamış",
+    "ViewHeader.view-header-menu": "Başlık menüsünü görüntüle",
+    "ViewHeader.view-menu": "Menüyü görüntüle",
+    "ViewLimitDialog.Heading": "Bir panoyu görüntüleme sınırına ulaşıldı",
+    "ViewLimitDialog.PrimaryButton.Title.Admin": "Üst tarifeye geç",
+    "ViewLimitDialog.PrimaryButton.Title.RegularUser": "Yöneticiyi bilgilendir",
+    "ViewLimitDialog.Subtext.Admin": "Professional ya da Enterprise tarifemize geçin.",
+    "ViewLimitDialog.Subtext.Admin.PricingPageLink": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
+    "ViewLimitDialog.Subtext.RegularUser": "Yöneticinizi Professional ya da Enterprise tarifesine geçmesi hakkında bilgilendirin.",
+    "ViewLimitDialog.UpgradeImg.AltText": "üst tarifeye geçiş görseli",
+    "ViewLimitDialog.notifyAdmin.Success": "Yöneticiniz bilgilendirildi",
+    "ViewTitle.hide-description": "açıklamayı gizle",
+    "ViewTitle.pick-icon": "Simge seçin",
+    "ViewTitle.random-icon": "Rastgele",
+    "ViewTitle.remove-icon": "Simgeyi kaldır",
+    "ViewTitle.show-description": "açıklamayı görüntüle",
+    "ViewTitle.untitled-board": "Adlandırılmamış pano",
+    "WelcomePage.Description": "Pano, alışılmış Kanban panosu görünümünde takımların işleri tanımlamasını, düzenlemesini, izlemesi ve yönetmesini sağlayan bir proje yönetimi aracıdır.",
+    "WelcomePage.Explore.Button": "Tura çıkın",
+    "WelcomePage.Heading": "Panolara hoş geldiniz",
+    "WelcomePage.NoThanks.Text": "Hayır teşekkürler, kendim anlayacağım",
+    "WelcomePage.StartUsingIt.Text": "Kullanmaya başlayın",
+    "Workspace.editing-board-template": "Bir pano kalıbını düzenliyorsunuz.",
+    "badge.guest": "Konuk",
+    "boardPage.confirm-join-button": "Katıl",
+    "boardPage.confirm-join-text": "Bir özel kanala, pano yöneticisi tarafından açıkça eklenmeden katılmak üzeresiniz. Bu özel kanala katılmak istediğinize emin misiniz?",
+    "boardPage.confirm-join-title": "Özel kanala katıl",
+    "boardSelector.confirm-link-board": "Panoyu kanala bağla",
+    "boardSelector.confirm-link-board-button": "Evet, panoyu bağla",
+    "boardSelector.confirm-link-board-subtext": "\"{boardName}\" panosunu kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır. Bir pano ile bir kanalın bağlantısını istediğiniz zaman kaldırabilirsiniz.",
+    "boardSelector.confirm-link-board-subtext-with-other-channel": "\"{boardName}\" panosunu bir kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konukl üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
+    "boardSelector.create-a-board": "Bir pano ekle",
+    "boardSelector.link": "Bağlantı",
+    "boardSelector.search-for-boards": "Pano arama",
+    "boardSelector.title": "Panoları bağla",
+    "boardSelector.unlink": "Bağlantıyı kaldır",
+    "calendar.month": "Ay",
+    "calendar.today": "Bugün",
+    "calendar.week": "Hafta",
+    "centerPanel.undefined": "{propertyName} yok",
+    "centerPanel.unknown-user": "Kullanıcı bilinmiyor",
+    "cloudMessage.learn-more": "Ayrıntılı bilgi alın",
+    "createImageBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
+    "default-properties.badges": "Yorumlar ve açıklama",
+    "default-properties.title": "Başlık",
+    "error.back-to-home": "Girişe dön",
+    "error.back-to-team": "Takıma dön",
+    "error.board-not-found": "Pano bulunamadı.",
+    "error.go-login": "Oturum aç",
+    "error.invalid-read-only-board": "Bu panoya erişme izniniz yok. Panolara erişmek için oturum açın.",
+    "error.not-logged-in": "Oturumunuzun süresi dolmuş ya da oturum açmamışsınız. Panolara erişmek için yeniden oturum açın.",
+    "error.page.title": "Bir şeyler ters gitti",
+    "error.team-undefined": "Geçerli bir takım değil.",
+    "error.unknown": "Bir sorun çıktı.",
+    "generic.previous": "Önceki",
+    "guest-no-board.subtitle": "Henüz bu takımdaki herhangi bir panoya erişme izniniz yok. Lütfen biri sizi bir panoya ekleyene kadar bekleyin.",
+    "guest-no-board.title": "Henüz bir pano yok",
+    "imagePaste.upload-failed": "Dosya boyutu sınırı aşıldığından bazı dosyalar yüklenemedi.",
+    "limitedCard.title": "Kartlar gizli",
+    "login.log-in-button": "Oturum aç",
+    "login.log-in-title": "Oturum açın",
+    "login.register-button": "ya da hesabınız yoksa bir hesap açın",
+    "new_channel_modal.create_board.empty_board_description": "Yeni boş bir pano oluştur",
+    "new_channel_modal.create_board.empty_board_title": "Boş pano",
+    "new_channel_modal.create_board.select_template_placeholder": "Bir kalıp seçin",
+    "new_channel_modal.create_board.title": "Bu kanal için bir pano oluştur",
+    "notification-box-card-limit-reached.close-tooltip": "10 gün için sustur",
+    "notification-box-card-limit-reached.contact-link": "yöneticinizi bilgilendirin",
+    "notification-box-card-limit-reached.link": "Ücretli bir tarifeye geçin",
+    "notification-box-card-limit-reached.title": "panoda {cards} kart gizli",
+    "notification-box-cards-hidden.title": "Bu işlem başka bir kartı gizledi",
+    "notification-box.card-limit-reached.not-admin.text": "Arşivlenmiş kartlara erişmek için {contactLink} ile görüşerek ücretli bir tarifeye geçmesini isteyin.",
+    "notification-box.card-limit-reached.text": "Kart sınırına ulaşıldı. Eski kartları görüntülemek için {link}",
+    "person.add-user-to-board": "{username} kullanıcısını panoya ekle",
+    "person.add-user-to-board-confirm-button": "Panoya ekle",
+    "person.add-user-to-board-permissions": "İzinler",
+    "person.add-user-to-board-question": "{username} kullanıcısını panoya eklemek ister misiniz?",
+    "person.add-user-to-board-warning": "{username} panonun bir üyesi değil ve pano ile ilgili herhangi bir bildirim almayacak.",
+    "register.login-button": "ya da bir hesabınız varsa oturum açın",
+    "register.signup-title": "Hesap açın",
+    "rhs-board-non-admin-msg": "Panonun yöneticilerinden değilsiniz",
+    "rhs-boards.add": "Ekle",
+    "rhs-boards.dm": "Dİ",
+    "rhs-boards.gm": "Gİ",
+    "rhs-boards.header.dm": "bu doğrudan ileti",
+    "rhs-boards.header.gm": "bu grup iletisi",
+    "rhs-boards.last-update-at": "Son güncelleme: {datetime}",
+    "rhs-boards.link-boards-to-channel": "Panoları {channelName} kanalına bağla",
+    "rhs-boards.linked-boards": "Bağlı panolar",
+    "rhs-boards.no-boards-linked-to-channel": "Henüz {channelName} kanalına bağlanmış bir pano yok",
+    "rhs-boards.no-boards-linked-to-channel-description": "Panolar, takımlar arasındaki çalışmaları tanımlamak, organize etmek, izlemek ve yönetmek için kullanılabilen kandan panosuna benzer bir proje yönetimi aracıdır.",
+    "rhs-boards.unlink-board": "Panonun bağlantısını kaldır",
+    "rhs-boards.unlink-board1": "Pano bağlantısını kaldır",
+    "rhs-channel-boards-header.title": "Panolar",
+    "share-board.publish": "Yayınla",
+    "share-board.share": "Paylaş",
+    "shareBoard.channels-select-group": "Kanallar",
+    "shareBoard.confirm-change-team-role.body": "Bu panoda izinleri \"{role}\" rolünden daha aşağıda olan herkes <b>{role} rolüne yükseltilecek</b>. Panonunen düşük rolünü değiştirmek istediğinize emin misiniz?",
+    "shareBoard.confirm-change-team-role.confirmBtnText": "Panonun en düşük rolünü değiştir",
+    "shareBoard.confirm-change-team-role.title": "Panonun en düşük rolünü değiştir",
+    "shareBoard.confirm-link-channel": "Panoyu kanala bağla",
+    "shareBoard.confirm-link-channel-button": "Kanalı bağla",
+    "shareBoard.confirm-link-channel-button-with-other-channel": "Eski bağlantıyı kes ve bu kanala bağla",
+    "shareBoard.confirm-link-channel-subtext": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.",
+    "shareBoard.confirm-link-channel-subtext-with-other-channel": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
+    "shareBoard.confirm-unlink.body": "Bir kanalın bir pano ile bağlantısını kaldırdığınızda, kanalın tüm üyeleri (var olan ve yeni), kendilerine özel olarak izin verilmedikçe, panoya erişimi kaybeder.",
+    "shareBoard.confirm-unlink.confirmBtnText": "Kanalın bağlantısını kaldır",
+    "shareBoard.confirm-unlink.title": "Kanalın pano ile bağlantısı kaldır",
+    "shareBoard.lastAdmin": "Panoların en az bir yöneticisi olmalıdır",
+    "shareBoard.members-select-group": "Üyeler",
+    "shareBoard.unknown-channel-display-name": "Kanal bilinmiyor",
+    "tutorial_tip.finish_tour": "Tamam",
+    "tutorial_tip.got_it": "Anladım",
+    "tutorial_tip.ok": "Sonraki",
+    "tutorial_tip.out": "Bu ipuçları görüntülenmesin.",
+    "tutorial_tip.seen": "Daha önce gördünüz mü?"
 }
diff --git a/webapp/channels/src/i18n/tr.json b/webapp/channels/src/i18n/tr.json
index a442629a8d..fe91931be3 100644
--- a/webapp/channels/src/i18n/tr.json
+++ b/webapp/channels/src/i18n/tr.json
@@ -1,4 +1,10 @@
 {
+  "FIFTY_TO_100": "51-100",
+  "FIVE_HUNDRED_TO_1000": "501-1000",
+  "ONE_HUNDRED_TO_500": "101-500",
+  "ONE_THOUSAND_TO_2500": "1001-2500",
+  "ONE_TO_50": "1-50",
+  "TWO_THOUSAND_FIVE_HUNDRED_AND_UP": "2501-5000",
   "about.buildnumber": "Yapım numarası:",
   "about.cloudEdition": "Cloud",
   "about.copyright": "Telif hakkı 2015 - {currentYear} Mattermost, Inc. Tüm hakları saklıdır",
@@ -304,6 +310,9 @@
   "admin.billing.subscription.cancelSubscriptionSection.description": "Şu anda bir çalışma alanı yalnızca bir müşteri hizmetleri temsilcisi ile görüşerek silinebilir.",
   "admin.billing.subscription.cancelSubscriptionSection.title": "Aboneliğinizi iptal edin",
   "admin.billing.subscription.cloudMonthlyBadge": "Aylık",
+  "admin.billing.subscription.cloudReverseTrial.daysLeftOnTrial": "Deneme sürenizin bitmesine {daysLeftOnTrial} gün kaldı. Çalışma alanınızı korumak için ücretli bir tarife satın alın ya da satış ekibiyle görüşün.",
+  "admin.billing.subscription.cloudReverseTrial.lastDay": "Bugün deneme sürenizin son günü. {userEndTrialHour} saatinden önce ücretli bir tarife satın alın ya da satış ekibi ile görüşün",
+  "admin.billing.subscription.cloudReverseTrial.subscribeButton": "Seçeneklerinize bakın",
   "admin.billing.subscription.cloudTrial.daysLeftOnTrial": "Ücretsiz deneme sürenizin sonlanmasına {daysLeftOnTrial} gün kaldı",
   "admin.billing.subscription.cloudTrial.lastDay": "Bugün ücretsiz deneme sürenizin son günü. Erişiminiz {userEndTrialDate} günü {userEndTrialHour} saatinde sona erecek.",
   "admin.billing.subscription.cloudTrial.moreThan3Days": "Deneme süreniz başladı! Bitmesine {daysLeftOnTrial} gün var",
@@ -963,7 +972,7 @@
   "admin.featureDiscovery.WarningDescription": "Lisansınız, tüm Enterprise tarifesi özelliklerine tam erişim sağlayacak şekilde güncelleniyor. Lisans güncellemesi tamamlandığında bu sayfa otomatik olarak yenilenecek. Lütfen bekleyin ",
   "admin.featureDiscovery.WarningTitle": "Deneme süreniz başladı ve lisansınız güncelleniyor.",
   "admin.feature_discovery.trial-request.accept-terms": "<highlight>Denemeyi başlat</highlight> üzerine tıklayarak, <linkEvaluation>Mattermost yazılım deneme sözleşmesi</linkEvaluation> ve <linkPrivacy>kişisel verilerin gizliliği ilkesi</linkPrivacy> metinlerini ve ürün ile ilgili e-postaları almayı kabul ediyorum.",
-  "admin.feature_discovery.trial-request.accept-terms.cloudFree": "<highlight>{trialLength} günlük ücretsiz deneme</highlight> süresini başlatırken, <linkEvaluation>Mattermost yazılım değerlendirme sözleşmesi</linkEvaluation> ve <linkPrivacy>kişisel verilerin gizliliği ilkesi</linkPrivacy> metinleri ile ürün tanırımı e-postalarını almayı kabul ediyorum.",
+  "admin.feature_discovery.trial-request.accept-terms.cloudFree": "<highlight>{trialLength} günlük ücretsiz deneme</highlight> süresini başlatırken, <linkEvaluation>Mattermost yazılım değerlendirme sözleşmesi</linkEvaluation> ve <linkPrivacy>kişisel verilerin gizliliği ilkesi</linkPrivacy> metinleri ile ürün tanıtımı e-postalarını almayı kabul ediyorum.",
   "admin.feature_discovery.trial-request.error": "Deneme lisansı alınamadı. <link>https://mattermost.com/trial</link> adresinden lisans isteğinde bulunabilirsiniz.",
   "admin.feature_flags.flag": "İşaret",
   "admin.feature_flags.flag_value": "Değer",
@@ -3034,10 +3043,16 @@
   "cloud.startTrial.modal.btn": "Denemeyi başlat",
   "cloud_archived.error.access": "Kalıcı bağlantı, {planName} tarifesinin sınırları nedeniyle arşivlenmiş olan bir iletiye ait. İletiye yeniden erişmek için tarifenizi yükseltin.",
   "cloud_archived.error.title": "İleti arşivlenmiş",
+  "cloud_billing.nudge_to_paid.contact_sales": "Satış ekibi ile görüşün",
+  "cloud_billing.nudge_to_paid.description": "Cloud Free, {days} gün içinde kullanımdan kaldırılacak. Ücretli bir tarifeye yükseltin ya da satış ekibi ile görüşün.",
+  "cloud_billing.nudge_to_paid.learn_more": "Üst tarifeye geç",
+  "cloud_billing.nudge_to_paid.title": "Çalışma alanınızı korumak için ücretli tarifeye yükseltin",
+  "cloud_billing.nudge_to_paid.view_plans": "Tarifelere bakın",
+  "cloud_billing.nudge_to_yearly.announcement_bar": "Aylık faturalama {days} gün içinde durdurulacak. Yıllık faturalamaya geçin",
   "cloud_billing.nudge_to_yearly.contact_sales": "Satış ekibi ile görüşün",
-  "cloud_billing.nudge_to_yearly.description": "Yıllık aboneliğe geçerek faturalamanızı basitleştirin.",
+  "cloud_billing.nudge_to_yearly.description": "Aylık faturalama {date} adresinde durdurulacak. Çalışma alanınızı korumak için yıllık faturalamaya geçin.",
   "cloud_billing.nudge_to_yearly.learn_more": "Ayrıntılı bilgi alın",
-  "cloud_billing.nudge_to_yearly.title": "Bugün yıllık plana geçin",
+  "cloud_billing.nudge_to_yearly.title": "İşlem yapılması gerekiyor: Çalışma alanınızı korumak için yıllık faturalamaya geçin.",
   "cloud_billing_history_modal.title": "Fatura(lar)",
   "cloud_delinquency.banner.buttonText": "Fatura bilgilerini güncelle",
   "cloud_delinquency.banner.end_user_notify_admin_button": "Yöneticiyi bilgilendir",
@@ -5627,7 +5642,10 @@
   "user_groups_modal.viewGroup": "Grubu görüntüle",
   "user_list.notFound": "Herhangi bir kullanıcı bulunamadı",
   "user_profile.account.editProfile": "Profili düzenle",
+  "user_profile.account.hoursAhead": "({timeOffset} ileride)",
+  "user_profile.account.hoursBehind": "({timeOffset} geride)",
   "user_profile.account.localTime": "Yerel saat",
+  "user_profile.account.localTimeWithTimezone": "Yerel saat ({timezone})",
   "user_profile.account.post_was_created": "Bu ileti bir bütünleştirme formu ile gönderilmiş",
   "user_profile.add_user_to_channel": "Kanala ekle",
   "user_profile.add_user_to_channel.icon": "Kanala kullanıcı ekle simgesi",
@@ -5699,7 +5717,11 @@
   "work_templates.customize.name_label_all": "Kanalınızı, panonuzu ve senaryonuzu adlandırın",
   "work_templates.customize.name_label_channels_boards": "Kanalınızı ve panonuzu adlandırın",
   "work_templates.customize.name_label_channels_playbooks": "Kanalınızı ve senaryonuzu adlandırın",
+  "work_templates.customize.private_channel_permission_issue": "Özel kanallar oluşturma izniniz yok.",
   "work_templates.customize.private_playbook_license_issue": "Gizli senaryolar Enterprise lisansı ile kullanılabilir.",
+  "work_templates.customize.private_playbook_permission_issue": "Özel senaryolar oluşturma izniniz yok.",
+  "work_templates.customize.public_channel_permission_issue": "Herkese açık kanallar oluşturma izniniz yok.",
+  "work_templates.customize.public_playbook_permission_issue": "Herkese açık senaryolar oluşturma izniniz yok.",
   "work_templates.customize.visibility_title": "Buna kimler erişebilmeli?",
   "work_templates.menu.modal_title": "Kalıptan oluştur",
   "work_templates.menu.quick_use": "Hızlı kullanım",

From 29f08a9baa78584bdbf77c889117657bd7cd8d1e Mon Sep 17 00:00:00 2001
From: jprusch <rs@schaeferbarthold.de>
Date: Fri, 14 Apr 2023 10:59:09 +0200
Subject: [PATCH 076/103] Translated using Weblate (German)

Currently translated at 100.0% (5804 of 5804 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/de/

Translated using Weblate (German)

Currently translated at 100.0% (5794 of 5794 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/de/

Translated using Weblate (German)

Currently translated at 100.0% (5788 of 5788 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/de/

Translated using Weblate (German)

Currently translated at 100.0% (5783 of 5783 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/de/

Translated using Weblate (German)

Currently translated at 100.0% (5777 of 5777 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/de/
---
 webapp/channels/src/i18n/de.json | 37 +++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/webapp/channels/src/i18n/de.json b/webapp/channels/src/i18n/de.json
index 5dac2f372b..daa92fc1ba 100644
--- a/webapp/channels/src/i18n/de.json
+++ b/webapp/channels/src/i18n/de.json
@@ -1,4 +1,10 @@
 {
+  "FIFTY_TO_100": "51-100",
+  "FIVE_HUNDRED_TO_1000": "501-1000",
+  "ONE_HUNDRED_TO_500": "101-500",
+  "ONE_THOUSAND_TO_2500": "1001-2500",
+  "ONE_TO_50": "1-50",
+  "TWO_THOUSAND_FIVE_HUNDRED_AND_UP": "2501-5000",
   "about.buildnumber": "Build-Nummer:",
   "about.cloudEdition": "Cloud",
   "about.copyright": "Copyright 2015 - {currentYear} Mattermost, Inc. Alle Rechte vorbehalten",
@@ -304,6 +310,9 @@
   "admin.billing.subscription.cancelSubscriptionSection.description": "Zurzeit ist das Löschen eines Workspaces nur mit der Hilfe eines Supportmitarbeiters möglich.",
   "admin.billing.subscription.cancelSubscriptionSection.title": "Dein Abonnement kündigen",
   "admin.billing.subscription.cloudMonthlyBadge": "Monatlich",
+  "admin.billing.subscription.cloudReverseTrial.daysLeftOnTrial": "{daysLeftOnTrial} Tage verbleibende Testzeit. Erwirb einen Plan oder kontaktiere den Vertrieb, um deinen Arbeitsbereich zu behalten.",
+  "admin.billing.subscription.cloudReverseTrial.lastDay": "Dies ist der letzte Tag deiner Testphase. Kaufe einen Plan vor {userEndTrialHour} oder kontaktiere den Vertrieb",
+  "admin.billing.subscription.cloudReverseTrial.subscribeButton": "Prüfe deine Optionen",
   "admin.billing.subscription.cloudTrial.daysLeftOnTrial": "Es verbleiben noch {daysLeftOnTrial} Tage für deine kostenlose Testversion",
   "admin.billing.subscription.cloudTrial.lastDay": "Dies ist der letzte Tag deiner kostenlosen Testversion. Dein Zugang wird am {userEndTrialDate} um {userEndTrialHour} ablaufen.",
   "admin.billing.subscription.cloudTrial.moreThan3Days": "Deine kostenlose Testphase hat begonnen! Es sind noch {daysLeftOnTrial} übrig",
@@ -3034,10 +3043,16 @@
   "cloud.startTrial.modal.btn": "Starte Test",
   "cloud_archived.error.access": "Der Permalink gehört zu einer Nachricht, die aufgrund der Beschränkungen von {planName} archiviert wurde. Aktualisiere um erneut auf die Nachricht zuzugreifen.",
   "cloud_archived.error.title": "Nachricht archiviert",
+  "cloud_billing.nudge_to_paid.contact_sales": "Vertrieb kontaktieren",
+  "cloud_billing.nudge_to_paid.description": "Cloud Free wird in {days} Tagen ablaufen. Steige auf einen kostenpflichtigen Plan um oder kontaktiere den Vertrieb.",
+  "cloud_billing.nudge_to_paid.learn_more": "Aktualisierung",
+  "cloud_billing.nudge_to_paid.title": "Upgrade auf einen kostenpflichtigen Plan, um deinen Arbeitsbereich zu behalten",
+  "cloud_billing.nudge_to_paid.view_plans": "Zeige Pläne",
+  "cloud_billing.nudge_to_yearly.announcement_bar": "Die monatliche Abrechnung wird in {days} Tagen eingestellt. Umstellung auf jährliche Abrechnung",
   "cloud_billing.nudge_to_yearly.contact_sales": "Vertrieb kontaktieren",
-  "cloud_billing.nudge_to_yearly.description": "Vereinfache deine Abrechnung, indem du zu einem Jahresabonnement wechselst.",
+  "cloud_billing.nudge_to_yearly.description": "Die monatliche Abrechnung wird zum {date} eingestellt. Um deinen Arbeitsbereich zu behalten, wechsele zur jährlichen Abrechnung.",
   "cloud_billing.nudge_to_yearly.learn_more": "Mehr erfahren",
-  "cloud_billing.nudge_to_yearly.title": "Wechsele noch heute zu einem Jahresplan",
+  "cloud_billing.nudge_to_yearly.title": "Maßnahme erforderlich: Wechsele zur jährlichen Abrechnung, um deinen Arbeitsbereich zu behalten.",
   "cloud_billing_history_modal.title": "Rechnung(en)",
   "cloud_delinquency.banner.buttonText": "Rechnung jetzt aktualisieren",
   "cloud_delinquency.banner.end_user_notify_admin_button": "Admin benachrichtigen",
@@ -3063,6 +3078,7 @@
   "cloud_delinquency.post_downgrade_banner.title": "Aktualisiere jetzt deine Rechnungsdaten, um bezahlte Funktionen wieder zu aktivieren.",
   "cloud_signup.signup_consequences": "Deine Kreditkarte wird noch heute belastet. <a>Sieh, wie die Abrechnung funktioniert.</a>",
   "cloud_subscribe.contact_support": "Pläne vergleichen",
+  "cloud_upgrade.error_min_seats": "Mindestanzahl von 10 Sitzen erforderlich",
   "collapsed_reply_threads_modal.confirm": "Verstanden",
   "collapsed_reply_threads_modal.description": "Nachrichtenverläufe sind überarbeitet worden, um dich dabei zu unterstützen eine übersichtliche Diskussion rund um bestimmte Nachrichten zu erstellen. Dadurch werden Kanäle übersichtlicher, da alle Antworten unter der Ursprungsnachricht zusammengefasst werden, und alle Diskussionen, denen du folgst unter **Unterhaltungen** angezeigt werden. Folge der Tour um zu sehen, was neu ist.",
   "collapsed_reply_threads_modal.skip_tour": "Tour überspringen",
@@ -4254,9 +4270,9 @@
   "navbar_dropdown.viewMembers": "Zeige Mitglieder",
   "newChannelWithBoard.tutorialTip.description": "Auf das soeben erstellte Board kannst du schnell zugreifen, indem du auf das Symbol Boards in der App-Leiste klickst. Du kannst die Boards, die mit diesem Kanal verknüpft sind, in der rechten Seitenleiste anzeigen und eines in der Vollansicht öffnen.",
   "newChannelWithBoard.tutorialTip.title": "Zugriff auf verknüpfte Boards über die App-Leiste",
-  "newsletter_optin.checkmark.text": "Ich möchte die Sicherheitsupdates von Mattermost per Newsletter erhalten. <a> Es gelten die Allgemeinen Geschäftsbedingungen und Datenschutzrichtlinien</a>",
+  "newsletter_optin.checkmark.text": "<span>Ich möchte die Sicherheitsupdates von Mattermost per Newsletter erhalten.</span> Mit der Anmeldung erkläre ich mich damit einverstanden, E-Mails von Mattermost mit Produktaktualisierungen, Werbeaktionen und Unternehmensnachrichten zu erhalten. Ich habe die <a>Datenschutzrichtlinie</a> gelesen und verstehe, dass ich <aa>jederzeit abbestellen</aa> kann",
   "newsletter_optin.desc": "Melde dich unter <a>{link}</a> an.",
-  "newsletter_optin.title": "Bist du daran interessiert, Mattermost-Sicherheitsupdates per Newsletter zu erhalten?",
+  "newsletter_optin.title": "Bist du daran interessiert, per Newsletter über Sicherheits-, Produkt-, Werbe- und Unternehmens-Updates von Mattermost informiert zu werden?",
   "next_steps_view.welcomeToMattermost": "Willkommen bei Mattermost",
   "no_results.channel_files.subtitle": "Dateien, die in diesem Kanal gepostet wurden, werden hier angezeigt.",
   "no_results.channel_files.title": "Noch keine Dateien",
@@ -4548,23 +4564,29 @@
   "pricing_modal.briefing.ssoWithGitLab": "SSO mit Gitlab",
   "pricing_modal.briefing.storageStarter": "{storage} Dateispeicherlimit",
   "pricing_modal.briefing.title": "Top Funktionen",
+  "pricing_modal.briefing.title_large_scale": "Zusammenarbeit im großen Maßstab",
+  "pricing_modal.briefing.title_no_limit": "Keine Einschränkungen für die Nutzung durch dein Team",
   "pricing_modal.briefing.unlimitedPlaybookRuns": "Unbeschränkte Playbooks und Durchläufe",
   "pricing_modal.briefing.unlimitedWorkspaceTeams": "Unbeschränkte Teams",
   "pricing_modal.btn.contactSales": "Verkaufsteam kontaktieren",
   "pricing_modal.btn.contactSalesForQuote": "Kontaktiere den Vertrieb",
   "pricing_modal.btn.contactSupport": "Support kontaktieren",
   "pricing_modal.btn.downgrade": "Runterstufen",
+  "pricing_modal.btn.purchase": "Kaufen",
   "pricing_modal.btn.switch_to_annual": "Wechsel auf jährliche Abrechnung",
   "pricing_modal.btn.tooltip": "Nur sichtbar für System Admins",
   "pricing_modal.btn.tryDays": "Teste kostenfrei für {days} Tage",
   "pricing_modal.btn.upgrade": "Upgrade",
   "pricing_modal.btn.viewPlans": "Zeige Pläne",
+  "pricing_modal.contact_us": "Kontaktiere uns",
   "pricing_modal.extra_briefing.cloud.free.calls": "Gruppenanrufe mit bis zu 8 Personen, 1:1-Anrufe und Bildschirmfreigabe",
   "pricing_modal.extra_briefing.enterprise.playBookAnalytics": "Playbooks Analyse Dashboard",
   "pricing_modal.extra_briefing.free.calls": "Sprachanrufe und Bildschirmfreigabe",
   "pricing_modal.extra_briefing.professional.guestAccess": "Gastzugriff mit MFA Zwang",
   "pricing_modal.extra_briefing.professional.ssoSaml": "SSO mit SAML 2.0, inklusive Okta, OneLogin und ADFS",
   "pricing_modal.extra_briefing.professional.ssoadLdap": "SSO Unterstützung mit AD/LDAP, Google, O365, OpenID",
+  "pricing_modal.interested_self_hosting": "Interessiert an Selbst-Hosting?",
+  "pricing_modal.learn_more": "Erfahre mehr",
   "pricing_modal.lookingForCloudOption": "Suchst du eine Cloud Lösung?",
   "pricing_modal.lookingToSelfHost": "Möchtest du selbst hosten?",
   "pricing_modal.noitfy_cta.request": "Administrator zum Upgrade auffordern",
@@ -4576,10 +4598,12 @@
   "pricing_modal.planLabel.mostPopular": "POPULÄR",
   "pricing_modal.planSummary.enterprise": "Verwaltung, Sicherheit und Compliance für große Teams",
   "pricing_modal.planSummary.free": "Erhöhte Produktivität für kleine Teams",
-  "pricing_modal.planSummary.professional": "Skalierbare Lösungen für wachsende Teams",
+  "pricing_modal.planSummary.professional": "Skalierbare Lösungen {br} für wachsende Teams",
   "pricing_modal.plan_label_trialDays": "{days} TAGE, DIE IM TEST VERBLEIBEN",
   "pricing_modal.price.freeForever": "Kostenlos für immer",
+  "pricing_modal.questions": "Fragen?",
   "pricing_modal.rate.seatPerMonth": "USD pro Sitz/Monat {br}<b>(jährliche Abrechnung)</b>",
+  "pricing_modal.reach_out": "Setze dich mit uns in Verbindung und wir helfen dir bei der Entscheidung, welcher Plan für dich und dein Unternehmen der richtige ist.",
   "pricing_modal.reviewDeploymentOptions": "Prüfe deine Bereitstellungsoptionen",
   "pricing_modal.start_trial.disclaimer": "Durch Auswahl von <span>30 Tage lang kostenlos testen,</span> stimme ich dem <linkAgreement>Mattermost Software und Services License Agreement</linkAgreement>, <linkPrivacy>der Datenschutz-Richtlinie</linkPrivacy> und dem Erhalt von Produkt-E-Mails zu.",
   "pricing_modal.subtitle": "Wähle einen Plan um loszulegen",
@@ -5627,7 +5651,10 @@
   "user_groups_modal.viewGroup": "Gruppe anzeigen",
   "user_list.notFound": "Keine Benutzer gefunden",
   "user_profile.account.editProfile": "Profil bearbeiten",
+  "user_profile.account.hoursAhead": "({timeOffset} voraus)",
+  "user_profile.account.hoursBehind": "({timeOffset} zurück)",
   "user_profile.account.localTime": "Ortszeit",
+  "user_profile.account.localTimeWithTimezone": "Ortszeit ({timezone})",
   "user_profile.account.post_was_created": "Dieser Beitrag wurde erstellt durch eine Integration von",
   "user_profile.add_user_to_channel": "Einem Kanal hinzufügen",
   "user_profile.add_user_to_channel.icon": "Benutzer zu Kanal-Symbol hinzufügen",

From 2f7c9b9e69569887961bcb6f0068592444b93e3f Mon Sep 17 00:00:00 2001
From: Tom De Moor <tom@controlaltdieliet.be>
Date: Fri, 14 Apr 2023 10:59:09 +0200
Subject: [PATCH 077/103] Translated using Weblate (Dutch)

Currently translated at 100.0% (5783 of 5783 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (454 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (605 of 605 strings)

Translation: mattermost-languages-shipped/mattermost-playbooks-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-playbooks-webapp-monorepo/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (5777 of 5777 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/nl/
---
 webapp/boards/i18n/nl.json       | 11 +++++++++++
 webapp/channels/src/i18n/nl.json | 10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/webapp/boards/i18n/nl.json b/webapp/boards/i18n/nl.json
index d0d735c948..67c60a9a46 100644
--- a/webapp/boards/i18n/nl.json
+++ b/webapp/boards/i18n/nl.json
@@ -1,4 +1,6 @@
 {
+  "AdminBadge.SystemAdmin": "Beheerder",
+  "AdminBadge.TeamAdmin": "Teambeheerder",
   "AppBar.Tooltip": "Gekoppelde borden weergeven",
   "Attachment.Attachment-title": "Bijlage",
   "AttachmentBlock.DeleteAction": "verwijderen",
@@ -137,6 +139,7 @@
   "ContentBlock.moveDown": "Naar beneden verplaatsen",
   "ContentBlock.moveUp": "Naar boven verplaatsen",
   "ContentBlock.text": "tekst",
+  "DateFilter.empty": "Leeg",
   "DateRange.clear": "Wissen",
   "DateRange.empty": "Leeg",
   "DateRange.endDate": "Einddatum",
@@ -155,10 +158,14 @@
   "Filter.ends-with": "eindigt met",
   "Filter.includes": "bevat",
   "Filter.is": "is",
+  "Filter.is-after": "is na",
+  "Filter.is-before": "is voor",
   "Filter.is-empty": "is leeg",
   "Filter.is-not-empty": "is niet leeg",
   "Filter.is-not-set": "is niet ingesteld",
   "Filter.is-set": "is ingesteld",
+  "Filter.isafter": "is na",
+  "Filter.isbefore": "is voor",
   "Filter.not-contains": "bevat niet",
   "Filter.not-ends-with": "eindigt niet met",
   "Filter.not-includes": "bevat niet",
@@ -305,6 +312,7 @@
   "ValueSelector.valueSelector": "Waardekiezer",
   "ValueSelectorLabel.openMenu": "Menu openen",
   "VersionMessage.help": "Bekijk eens wat nieuw is in deze versie.",
+  "VersionMessage.learn-more": "Meer info",
   "View.AddView": "Weergave toevoegen",
   "View.Board": "Bord",
   "View.DeleteView": "Weergave verwijderen",
@@ -359,6 +367,9 @@
   "WelcomePage.StartUsingIt.Text": "Ga het gebruiken",
   "Workspace.editing-board-template": "Je bent een bordsjabloon aan het bewerken.",
   "badge.guest": "Gast",
+  "boardPage.confirm-join-button": "Word lid",
+  "boardPage.confirm-join-text": "Je staat op het punt lid te worden van een privé-bord zonder dat je expliciet bent toegevoegd door de bordbeheerder. Weet je zeker dat je lid wilt worden van dit privé-bord?",
+  "boardPage.confirm-join-title": "Word lid van het privé-bord",
   "boardSelector.confirm-link-board": "Koppel bord aan kanaal",
   "boardSelector.confirm-link-board-button": "Ja, koppel het bord",
   "boardSelector.confirm-link-board-subtext": "Wanneer je \"{boardName}\" aan het kanaal koppelt, kunnen alle leden van het kanaal (bestaande en nieuwe) het bewerken. Dit sluit leden die gast zijn uit. Je kan de koppeling van een bord naar een kanaal op elk moment ongedaan maken.",
diff --git a/webapp/channels/src/i18n/nl.json b/webapp/channels/src/i18n/nl.json
index 51711707fc..ba510ad9c5 100644
--- a/webapp/channels/src/i18n/nl.json
+++ b/webapp/channels/src/i18n/nl.json
@@ -1,4 +1,10 @@
 {
+  "FIFTY_TO_100": "51-100",
+  "FIVE_HUNDRED_TO_1000": "501-1000",
+  "ONE_HUNDRED_TO_500": "101-500",
+  "ONE_THOUSAND_TO_2500": "1001-2500",
+  "ONE_TO_50": "1-50",
+  "TWO_THOUSAND_FIVE_HUNDRED_AND_UP": "2501-5000",
   "about.buildnumber": "Compilatienummer:",
   "about.cloudEdition": "Cloud",
   "about.copyright": "Copyright 2015 - {currentYear} Mattermost, Inc. Alle rechten voorbehouden",
@@ -4024,7 +4030,7 @@
   "licensingPage.infoBanner.startTrialTitle": "Gratis 30 dagen proberen!",
   "licensingPage.overageUsersBanner.cta": "Neem contact op met de verkoopsafdeling",
   "licensingPage.overageUsersBanner.ctaExpandSeats": "Extra plaatsen kopen",
-  "licensingPage.overageUsersBanner.noticeDescription": "Breng jouw Customer Success Manager op de hoogte bij jouw volgende true-up check.",
+  "licensingPage.overageUsersBanner.noticeDescription": "Breng jouw Customer Success Manager op de hoogte bij jouw volgende true-up check.<a></a>",
   "licensingPage.overageUsersBanner.noticeTitle": "Het aantal gebruikers van jouw werkruimte heeft het aantal betaalde licentieplaatsen overschreden met {seats, number} {seats, plural, one {plaats} other {plaatsen}}",
   "licensingPage.overageUsersBanner.text": "Het aantal gebruikers van jouw werkruimte heeft het aantal betaalde licenties overschreden met {seats, number} {seats, plural, one {plaats} other {plaatsen}}. Koop extra licenties om aan de eisen te blijven voldoen.",
   "link_preview.image_preview": "Voorbeeld van afbeelding tonen",
@@ -4581,7 +4587,7 @@
   "pricing_modal.price.freeForever": "Voor altijd gratis",
   "pricing_modal.rate.seatPerMonth": "USD per gebruiker/maand{br}<b>(Jaarlijks gefactureerd)</b>",
   "pricing_modal.reviewDeploymentOptions": "Bekijk de installatiemogelijkheden",
-  "pricing_modal.start_trial.disclaimer": "Door <span>Gratis 30 dagen proberen,</span> te selecteren ga ik akkoord met de <a>Mattermost Software Evaluatie Overeenkomst, Privacy Beleid,</a> en het ontvangen van product emails.",
+  "pricing_modal.start_trial.disclaimer": "Door het selecteren van <span>Probeer 30 dagen gratis,</span> ga ik akkoord met de <linkAgreement>Mattermost Software and Services License Agreement</linkAgreement>, <linkPrivacy>Privacy Policy</linkPrivacy>, en het ontvangen van product e-mails.",
   "pricing_modal.subtitle": "Kies een plan om te beginnen",
   "pricing_modal.title": "Kies een plan",
   "pricing_modal.wantToTry": "Wil je proberen? ",

From 11e50cb26c538ac779ffdaa9f11456c481cafa4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20Balsevi=C4=8Dius?= <andrius@geocad.lt>
Date: Fri, 14 Apr 2023 10:59:10 +0200
Subject: [PATCH 078/103] Translated using Weblate (Lithuanian)

Currently translated at 100.0% (454 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/lt/

From 2c870845afea10e0d568a9c1452d0c1bcf478799 Mon Sep 17 00:00:00 2001
From: Caleb Roseland <caleb@calebroseland.com>
Date: Fri, 14 Apr 2023 10:59:10 +0200
Subject: [PATCH 079/103] Translated using Weblate (Georgian)

Currently translated at 25.7% (117 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/ka/

Translated using Weblate (Persian)

Currently translated at 26.8% (122 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/fa/

Translated using Weblate (Turkish)

Currently translated at 100.0% (454 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/tr/
---
 webapp/boards/i18n/tr.json | 920 ++++++++++++++++++-------------------
 1 file changed, 460 insertions(+), 460 deletions(-)

diff --git a/webapp/boards/i18n/tr.json b/webapp/boards/i18n/tr.json
index 948676da4a..0c9614a803 100644
--- a/webapp/boards/i18n/tr.json
+++ b/webapp/boards/i18n/tr.json
@@ -1,462 +1,462 @@
 {
-    "AdminBadge.SystemAdmin": "Yönetici",
-    "AdminBadge.TeamAdmin": "Takım yöneticisi",
-    "AppBar.Tooltip": "Bağlantılı panoları aç/kapat",
-    "Attachment.Attachment-title": "Ek dosya",
-    "AttachmentBlock.DeleteAction": "sil",
-    "AttachmentBlock.addElement": "{type} ekle",
-    "AttachmentBlock.delete": "Ek dosya silindi.",
-    "AttachmentBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
-    "AttachmentBlock.upload": "Ek dosya yükleniyor.",
-    "AttachmentBlock.uploadSuccess": "Ek dosya yüklendi.",
-    "AttachmentElement.delete-confirmation-dialog-button-text": "Sil",
-    "AttachmentElement.download": "İndir",
-    "AttachmentElement.upload-percentage": "Yükleniyor...(%{uploadPercent})",
-    "BoardComponent.add-a-group": "+ Grup ekle",
-    "BoardComponent.delete": "Sil",
-    "BoardComponent.hidden-columns": "Gizli sütunlar",
-    "BoardComponent.hide": "Gizle",
-    "BoardComponent.new": "+ Yeni",
-    "BoardComponent.no-property": "{property} yok",
-    "BoardComponent.no-property-title": "{property} alanı boş olan ögeler buraya atanır. Bu sütun silinemez.",
-    "BoardComponent.show": "Görüntüle",
-    "BoardMember.schemeAdmin": "Yönetici",
-    "BoardMember.schemeCommenter": "Yorumcu",
-    "BoardMember.schemeEditor": "Düzenleyici",
-    "BoardMember.schemeNone": "Yok",
-    "BoardMember.schemeViewer": "Görüntüleyici",
-    "BoardMember.unlinkChannel": "Bağlantıyı kaldır",
-    "BoardPage.newVersion": "Yeni bir pano sürümü yayınlanmış. Yeniden yüklemek için buraya tıklayın.",
-    "BoardPage.syncFailed": "Pano silinmiş ya da erişim izni geri alınmış olabilir.",
-    "BoardTemplateSelector.add-template": "Yeni kalıp ekle",
-    "BoardTemplateSelector.create-empty-board": "Boş bir pano ekle",
-    "BoardTemplateSelector.delete-template": "Sil",
-    "BoardTemplateSelector.description": "Kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
-    "BoardTemplateSelector.edit-template": "Düzenle",
-    "BoardTemplateSelector.plugin.no-content-description": "Aşağıdaki kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
-    "BoardTemplateSelector.plugin.no-content-title": "Bir pano ekleyin",
-    "BoardTemplateSelector.title": "Bir pano ekle",
-    "BoardTemplateSelector.use-this-template": "Bu kalıp kullanılsın",
-    "BoardsSwitcher.Title": "Pano arama",
-    "BoardsUnfurl.Limited": "Kart arşivlendiğinden ek bilgiler gizleniyor",
-    "BoardsUnfurl.Remainder": "+{remainder} diğer",
-    "BoardsUnfurl.Updated": "Güncellenme: {time}",
-    "Calculations.Options.average.displayName": "Ortalama",
-    "Calculations.Options.average.label": "Ortalama",
-    "Calculations.Options.count.displayName": "Sayı",
-    "Calculations.Options.count.label": "Sayı",
-    "Calculations.Options.countChecked.displayName": "İşaretlenmiş",
-    "Calculations.Options.countChecked.label": "İşaretlenmiş sayısı",
-    "Calculations.Options.countUnchecked.displayName": "İşaretlenmemiş",
-    "Calculations.Options.countUnchecked.label": "İşaretlenmemiş sayısı",
-    "Calculations.Options.countUniqueValue.displayName": "Eşsiz",
-    "Calculations.Options.countUniqueValue.label": "Eşsiz değer sayısı",
-    "Calculations.Options.countValue.displayName": "Değer",
-    "Calculations.Options.countValue.label": "Değer sayısı",
-    "Calculations.Options.dateRange.displayName": "Aralık",
-    "Calculations.Options.dateRange.label": "Aralık",
-    "Calculations.Options.earliest.displayName": "En erken",
-    "Calculations.Options.earliest.label": "En erken",
-    "Calculations.Options.latest.displayName": "En geç",
-    "Calculations.Options.latest.label": "En geç",
-    "Calculations.Options.max.displayName": "En fazla",
-    "Calculations.Options.max.label": "En fazla",
-    "Calculations.Options.median.displayName": "Orta değer",
-    "Calculations.Options.median.label": "Orta değer",
-    "Calculations.Options.min.displayName": "En az",
-    "Calculations.Options.min.label": "En az",
-    "Calculations.Options.none.displayName": "Hesapla",
-    "Calculations.Options.none.label": "Yok",
-    "Calculations.Options.percentChecked.displayName": "İşaretlenmiş",
-    "Calculations.Options.percentChecked.label": "İşaretlenmiş yüzdesi",
-    "Calculations.Options.percentUnchecked.displayName": "İşaretlenmemiş",
-    "Calculations.Options.percentUnchecked.label": "İşaretlenmemiş yüzdesi",
-    "Calculations.Options.range.displayName": "Aralık",
-    "Calculations.Options.range.label": "Aralık",
-    "Calculations.Options.sum.displayName": "Toplam",
-    "Calculations.Options.sum.label": "Toplam",
-    "CalendarCard.untitled": "Adlandırılmamış",
-    "CardActionsMenu.copiedLink": "Kopyalandı!",
-    "CardActionsMenu.copyLink": "Bağlantıyı kopyala",
-    "CardActionsMenu.delete": "Sil",
-    "CardActionsMenu.duplicate": "Kopyala",
-    "CardBadges.title-checkboxes": "İşaret kutuları",
-    "CardBadges.title-comments": "Yorumlar",
-    "CardBadges.title-description": "Bu kartın bir açıklaması var",
-    "CardDetail.Attach": "Dosya ekle",
-    "CardDetail.Follow": "İzle",
-    "CardDetail.Following": "İzleniyor",
-    "CardDetail.add-content": "İçerik ekle",
-    "CardDetail.add-icon": "Simge ekle",
-    "CardDetail.add-property": "+ Bir özellik ekle",
-    "CardDetail.addCardText": "kart metni ekle",
-    "CardDetail.limited-body": "Professional ya da Enterprise tarifesine geçin.",
-    "CardDetail.limited-button": "Üst tarifeye geç",
-    "CardDetail.limited-title": "Bu kart gizli",
-    "CardDetail.moveContent": "Kart içeriğini taşı",
-    "CardDetail.new-comment-placeholder": "Bir yorum ekle...",
-    "CardDetailProperty.confirm-delete-heading": "Özelliği silmeyi onaylayın",
-    "CardDetailProperty.confirm-delete-subtext": "\"{propertyName}\" özelliğini silmek istediğinize emin misiniz? Bu işlem özelliği panodaki tüm kartlardan siler.",
-    "CardDetailProperty.confirm-property-name-change-subtext": "\"{propertyName}\" {customText} özelliğini değiştirmek istediğinize emin misiniz? Bu işlem bu panodaki {numOfCards} kartı etkiler ve veri kaybına yol açabilir.",
-    "CardDetailProperty.confirm-property-type-change": "Özellik türü değişimini onaylayın",
-    "CardDetailProperty.delete-action-button": "Sil",
-    "CardDetailProperty.property-change-action-button": "Özelliği değiştir",
-    "CardDetailProperty.property-changed": "Özellik değiştirildi!",
-    "CardDetailProperty.property-deleted": "{propertyName} silindi!",
-    "CardDetailProperty.property-name-change-subtext": "\"{oldPropType}\" türünden \"{newPropType}\" türüne",
-    "CardDetial.limited-link": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
-    "CardDialog.delete-confirmation-dialog-attachment": "Ek dosyanın silinmesini onaylayın",
-    "CardDialog.delete-confirmation-dialog-button-text": "Sil",
-    "CardDialog.delete-confirmation-dialog-heading": "Kartı silmeyi onaylayın",
-    "CardDialog.editing-template": "Bir kalıbı düzenliyorsunuz.",
-    "CardDialog.nocard": "Bu kart bulunamadı ya da erişilebilir değil.",
-    "Categories.CreateCategoryDialog.CancelText": "İptal",
-    "Categories.CreateCategoryDialog.CreateText": "Ekle",
-    "Categories.CreateCategoryDialog.Placeholder": "Kategorinize bir ad verin",
-    "Categories.CreateCategoryDialog.UpdateText": "Güncelle",
-    "CenterPanel.Login": "Oturum aç",
-    "CenterPanel.Share": "Paylaş",
-    "ChannelIntro.CreateBoard": "Bir pano ekle",
-    "ColorOption.selectColor": "{color} rengi seçin",
-    "Comment.delete": "Sil",
-    "CommentsList.send": "Gönder",
-    "ConfirmPerson.empty": "Boş",
-    "ConfirmPerson.search": "Arama...",
-    "ConfirmationDialog.cancel-action": "İptal",
-    "ConfirmationDialog.confirm-action": "Onayla",
-    "ContentBlock.Delete": "Sil",
-    "ContentBlock.DeleteAction": "sil",
-    "ContentBlock.addElement": "{type} ekle",
-    "ContentBlock.checkbox": "işaret kutusu",
-    "ContentBlock.divider": "ayıraç",
-    "ContentBlock.editCardCheckbox": "değiştirilmiş işaret kutusu",
-    "ContentBlock.editCardCheckboxText": "kart metnini düzenle",
-    "ContentBlock.editCardText": "kart metnini düzenle",
-    "ContentBlock.editText": "Metni düzenle...",
-    "ContentBlock.image": "görsel",
-    "ContentBlock.insertAbove": "Üste ekle",
-    "ContentBlock.moveBlock": "kart içeriğini taşı",
-    "ContentBlock.moveDown": "Alta taşı",
-    "ContentBlock.moveUp": "Üste taşı",
-    "ContentBlock.text": "metin",
-    "DateFilter.empty": "Boş",
-    "DateRange.clear": "Temizle",
-    "DateRange.empty": "Boş",
-    "DateRange.endDate": "Bitiş tarihi",
-    "DateRange.today": "Bugün",
-    "DeleteBoardDialog.confirm-cancel": "İptal",
-    "DeleteBoardDialog.confirm-delete": "Sil",
-    "DeleteBoardDialog.confirm-info": "“{boardTitle}” panosunu silmek istediğinize emin misiniz? Silme işlemi bu panodaki tüm kartları siler.",
-    "DeleteBoardDialog.confirm-info-template": "“{boardTitle}” pano kalıbını silmek istediğinize emin misiniz?",
-    "DeleteBoardDialog.confirm-tite": "Panoyu silmeyi onayla",
-    "DeleteBoardDialog.confirm-tite-template": "Pano kalıbını silmeyi onayla",
-    "Dialog.closeDialog": "Pencereyi kapat",
-    "EditableDayPicker.today": "Bugün",
-    "Error.mobileweb": "Mobil web desteği şu anda erken beta aşamasındadır. Tüm işlevler kullanılamıyor olabilir.",
-    "Error.websocket-closed": "Websoket bağlantısı kesildi. Bu sorun sürerse, sunucu ya da web vekil sunucu yapılandırmanızı denetleyin.",
-    "Filter.contains": "şunu içeren",
-    "Filter.ends-with": "şununla biten",
-    "Filter.includes": "şunu içeren",
-    "Filter.is": "şu olan",
-    "Filter.is-after": "şundan sonra",
-    "Filter.is-before": "şundan önce",
-    "Filter.is-empty": "boş olan",
-    "Filter.is-not-empty": "boş olmayan",
-    "Filter.is-not-set": "şuna ayarlanmamış olan",
-    "Filter.is-set": "şuna ayarlanmış olan",
-    "Filter.isafter": "şundan sonra",
-    "Filter.isbefore": "şundan önce",
-    "Filter.not-contains": "şunu içermeyen",
-    "Filter.not-ends-with": "şununla bitmeyen",
-    "Filter.not-includes": "şunu içermeyen",
-    "Filter.not-starts-with": "şununla başlamayan",
-    "Filter.starts-with": "şununla başlayan",
-    "FilterByText.placeholder": "metni süz",
-    "FilterComponent.add-filter": "+ Süzgeç ekle",
-    "FilterComponent.delete": "Sil",
-    "FilterValue.empty": "(boş)",
-    "FindBoardsDialog.IntroText": "Pano arama",
-    "FindBoardsDialog.NoResultsFor": "\"{searchQuery}\" için bir sonuç bulunamadı",
-    "FindBoardsDialog.NoResultsSubtext": "Yazımı denetleyin ya da başka bir arama yapmayı deneyin.",
-    "FindBoardsDialog.SubTitle": "Bulmak istediğiniz pano adını yazmaya başlayın. Gezinmek için <b>YUKAR/AŞAĞI</b>, seçmek için <b>ENTER</b>, vazgeçmek için <b>ESC</b> tuşlarını kullanın",
-    "FindBoardsDialog.Title": "Pano arama",
-    "GroupBy.hideEmptyGroups": "{count} boş grubu gizle",
-    "GroupBy.showHiddenGroups": "{count} gizli grubu görüntüle",
-    "GroupBy.ungroup": "Gruplamayı kaldır",
-    "HideBoard.MenuOption": "Panoyu gizle",
-    "KanbanCard.untitled": "Adlandırılmamış",
-    "MentionSuggestion.is-not-board-member": "(pano üyesi değil)",
-    "Mutator.new-board-from-template": "kalıptan yeni pano",
-    "Mutator.new-card-from-template": "kalıptan yeni kart oluştur",
-    "Mutator.new-template-from-card": "karttan yeni kalıp oluştur",
-    "OnboardingTour.AddComments.Body": "Sorunlar hakkında yorum yapabilir ve Mattermost kullanıcılarının dikkatini çekmek için @anabilirsiniz.",
-    "OnboardingTour.AddComments.Title": "Yorum yap",
-    "OnboardingTour.AddDescription.Body": "Takım arkadaşlarınızın kartın ne ile ilgili olduğunu anlaması için kartınıza bir açıklama ekleyin.",
-    "OnboardingTour.AddDescription.Title": "Açıklama ekle",
-    "OnboardingTour.AddProperties.Body": "Daha güçlü kılmak için kartlara çeşitli özellikler ekleyin.",
-    "OnboardingTour.AddProperties.Title": "Özellikler ekle",
-    "OnboardingTour.AddView.Body": "Farklı görünümler kullanarak panonuzu düzenleyecek yeni bir görünüm oluşturmak için buraya gidin.",
-    "OnboardingTour.AddView.Title": "Yeni bir görünüm ekle",
-    "OnboardingTour.CopyLink.Body": "Kartlarınızı takım arkadaşlarınızla paylaşmak için bağlantıyı kopyalayıp bir kanala, doğrudan iletiye veya grup iletisine yapıştırın.",
-    "OnboardingTour.CopyLink.Title": "Bağlantıyı kopyala",
-    "OnboardingTour.OpenACard.Body": "Panoların işinizi düzenlemenize yardımcı olabileceği güçlü yolları keşfetmek için bir kart açın.",
-    "OnboardingTour.OpenACard.Title": "Bir kart açın",
-    "OnboardingTour.ShareBoard.Body": "Panonuzu içeride, ekibiniz ile paylaşabilir ya da kuruluşunuzun dışında herkese açık olarak yayınlayabilirsiniz.",
-    "OnboardingTour.ShareBoard.Title": "Panoyu paylaş",
-    "PersonProperty.board-members": "Pano üyeleri",
-    "PersonProperty.me": "Benim",
-    "PersonProperty.non-board-members": "Pano üyesi olmayanlar",
-    "PropertyMenu.Delete": "Sil",
-    "PropertyMenu.changeType": "Özellik türünü değiştir",
-    "PropertyMenu.selectType": "Özellik türünü seçin",
-    "PropertyMenu.typeTitle": "Tür",
-    "PropertyType.Checkbox": "İşaret kutusu",
-    "PropertyType.CreatedBy": "Oluşturan",
-    "PropertyType.CreatedTime": "Oluşturulma zamanı",
-    "PropertyType.Date": "Tarih",
-    "PropertyType.Email": "E-posta",
-    "PropertyType.MultiPerson": "Çok kişi",
-    "PropertyType.MultiSelect": "Çoklu seçim",
-    "PropertyType.Number": "Sayı",
-    "PropertyType.Person": "Kişi",
-    "PropertyType.Phone": "Telefon",
-    "PropertyType.Select": "Seçin",
-    "PropertyType.Text": "Metin",
-    "PropertyType.Unknown": "Bilinmiyor",
-    "PropertyType.UpdatedBy": "Son güncelleyen",
-    "PropertyType.UpdatedTime": "Son güncelleme zamanı",
-    "PropertyType.Url": "Adres",
-    "PropertyValueElement.empty": "Boş",
-    "RegistrationLink.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
-    "RegistrationLink.copiedLink": "Kopyalandı!",
-    "RegistrationLink.copyLink": "Bağlantıyı kopyala",
-    "RegistrationLink.description": "Başkalarının hesap ekleyebilmesi için bu bağlantıyı paylaş:",
-    "RegistrationLink.regenerateToken": "Kodu yeniden oluştur",
-    "RegistrationLink.tokenRegenerated": "Kayıt bağlantısı yeniden oluşturuldu",
-    "ShareBoard.PublishDescription": "Web üzerinde herkese açık olarak \"salt okunur\" bir bağlantı yayınlayın ve paylaşın.",
-    "ShareBoard.PublishTitle": "Web üzerinde yayınla",
-    "ShareBoard.ShareInternal": "İçeride paylaş",
-    "ShareBoard.ShareInternalDescription": "İzni olan kullanıcılar bu bağlantıyı kullanabilecek.",
-    "ShareBoard.Title": "Panoyu paylaş",
-    "ShareBoard.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
-    "ShareBoard.copiedLink": "Kopyalandı!",
-    "ShareBoard.copyLink": "Bağlantıyı kopyala",
-    "ShareBoard.regenerate": "Kodu yeniden oluştur",
-    "ShareBoard.searchPlaceholder": "Kişi ve kanal arama",
-    "ShareBoard.teamPermissionsText": "{teamName} takımındaki herkes",
-    "ShareBoard.tokenRegenrated": "Kod yeniden oluşturuldu",
-    "ShareBoard.userPermissionsRemoveMemberText": "Üyelikten çıkar",
-    "ShareBoard.userPermissionsYouText": "(Siz)",
-    "ShareTemplate.Title": "Kalıbı paylaş",
-    "ShareTemplate.searchPlaceholder": "Kişi arama",
-    "Sidebar.about": "Focalboard hakkında",
-    "Sidebar.add-board": "+ Pano ekle",
-    "Sidebar.changePassword": "Parola değiştir",
-    "Sidebar.delete-board": "Panoyu sil",
-    "Sidebar.duplicate-board": "Panoyu kopyala",
-    "Sidebar.export-archive": "Arşivi dışa aktar",
-    "Sidebar.import": "İçe aktar",
-    "Sidebar.import-archive": "Arşivi içe aktar",
-    "Sidebar.invite-users": "Kullanıcıları çağır",
-    "Sidebar.logout": "Oturumu kapat",
-    "Sidebar.new-category.badge": "Yeni",
-    "Sidebar.new-category.drag-boards-cta": "Panoları sürükleyip buraya bırakın...",
-    "Sidebar.no-boards-in-category": "İçeride bir pano yok",
-    "Sidebar.product-tour": "Tanıtım turu",
-    "Sidebar.random-icons": "Rastgele simgeler",
-    "Sidebar.set-language": "Dili ayarla",
-    "Sidebar.set-theme": "Temayı ayarla",
-    "Sidebar.settings": "Ayarlar",
-    "Sidebar.template-from-board": "Panodan yeni kalıp",
-    "Sidebar.untitled-board": "(Adlandırılmamış pano)",
-    "Sidebar.untitled-view": "(Adlandırılmamış görünüm)",
-    "SidebarCategories.BlocksMenu.Move": "Şuraya taşı...",
-    "SidebarCategories.CategoryMenu.CreateNew": "Yeni kategori ekle",
-    "SidebarCategories.CategoryMenu.Delete": "Kategoriyi sił",
-    "SidebarCategories.CategoryMenu.DeleteModal.Body": "<b>{categoryName}</b> içindeki panolar Panolar kategorisine taşınacak. Herhangi bir panodan çıkarılmayacaksınız.",
-    "SidebarCategories.CategoryMenu.DeleteModal.Title": "Bu kategori silinsin mi?",
-    "SidebarCategories.CategoryMenu.Update": "Kategoriyi yeniden adlandır",
-    "SidebarTour.ManageCategories.Body": "Özel kategoriler oluşturun ve yönetin. Kategoriler kullanıcıya özeldir, bu nedenle bir panoyu kendi kategorinize taşımanız aynı panoyu kullanan diğer üyeleri etkilemez.",
-    "SidebarTour.ManageCategories.Title": "Kategori yönetimi",
-    "SidebarTour.SearchForBoards.Body": "Panoları hızlıca aramak ve yan çubuğunuza eklemek için pano değiştiriciyi (Cmd/Ctrl + K) açın.",
-    "SidebarTour.SearchForBoards.Title": "Pano arama",
-    "SidebarTour.SidebarCategories.Body": "Tüm panolarınızı artık yeni yan çubuğunuz altında bulabilirsiniz. Artık çalışma alanları arasında geçiş yapmanıza gerek yok. Önceki çalışma alanlarınıza göre eklenmiş tek seferlik özel kategoriler, 7.2 sürümüne güncellemenizin bir parçası olarak otomatik şekilde eklenmiş olabilir. Bunları isteğinize göre kaldırabilir ya da düzenleyebilirsiniz.",
-    "SidebarTour.SidebarCategories.Link": "Ayrıntılı bilgi alın",
-    "SidebarTour.SidebarCategories.Title": "Yan çubuk kategorileri",
-    "SiteStats.total_boards": "Toplam pano",
-    "SiteStats.total_cards": "Toplam kart",
-    "TableComponent.add-icon": "Simge ekle",
-    "TableComponent.name": "Ad",
-    "TableComponent.plus-new": "+ Yeni",
-    "TableHeaderMenu.delete": "Sil",
-    "TableHeaderMenu.duplicate": "Kopya oluştur",
-    "TableHeaderMenu.hide": "Gizle",
-    "TableHeaderMenu.insert-left": "Sola ekle",
-    "TableHeaderMenu.insert-right": "Sağa ekle",
-    "TableHeaderMenu.sort-ascending": "Artan sıralama",
-    "TableHeaderMenu.sort-descending": "Azalan sıralama",
-    "TableRow.DuplicateCard": "kartı kopyala",
-    "TableRow.MoreOption": "Diğer işlemler",
-    "TableRow.open": "Aç",
-    "TopBar.give-feedback": "Geri bildirimde bulunun",
-    "URLProperty.copiedLink": "Kopyalandı!",
-    "URLProperty.copy": "Kopyala",
-    "URLProperty.edit": "Düzenle",
-    "UndoRedoHotKeys.canRedo": "Yinele",
-    "UndoRedoHotKeys.canRedo-with-description": "{description} yinele",
-    "UndoRedoHotKeys.canUndo": "Geri al",
-    "UndoRedoHotKeys.canUndo-with-description": "{description} geri al",
-    "UndoRedoHotKeys.cannotRedo": "Yinelenecek bir işlem yok",
-    "UndoRedoHotKeys.cannotUndo": "Geri alınacak bir işlem yok",
-    "ValueSelector.noOptions": "Herhangi bir seçenek yok. İlk seçeneği eklemek için yazmaya başlayın!",
-    "ValueSelector.valueSelector": "Değer seçici",
-    "ValueSelectorLabel.openMenu": "Menüyü aç",
-    "VersionMessage.help": "Bu sürümdeki yeniliklere bakın.",
-    "VersionMessage.learn-more": "Ayrıntılı bilgi alın",
-    "View.AddView": "Görünüm ekle",
-    "View.Board": "Pano",
-    "View.DeleteView": "Görünümü sil",
-    "View.DuplicateView": "Görünümü kopyala",
-    "View.Gallery": "Galeri",
-    "View.NewBoardTitle": "Pano görünümü",
-    "View.NewCalendarTitle": "Takvim görünümü",
-    "View.NewGalleryTitle": "Galeri görünümü",
-    "View.NewTableTitle": "Tablo görünümü",
-    "View.NewTemplateDefaultTitle": "Adlandırılmamış kalıp",
-    "View.NewTemplateTitle": "Adlandırılmamış",
-    "View.Table": "Tablo",
-    "ViewHeader.add-template": "Yeni kalıp",
-    "ViewHeader.delete-template": "Sil",
-    "ViewHeader.display-by": "Görünüm: {property}",
-    "ViewHeader.edit-template": "Düzenle",
-    "ViewHeader.empty-card": "Boş kart",
-    "ViewHeader.export-board-archive": "Pano arşivini dışa aktar",
-    "ViewHeader.export-complete": "Dışa aktarıldı!",
-    "ViewHeader.export-csv": "CSV olarak dışa aktar",
-    "ViewHeader.export-failed": "Dışa aktarılamadı!",
-    "ViewHeader.filter": "Süz",
-    "ViewHeader.group-by": "Grupla: {property}",
-    "ViewHeader.new": "Yeni",
-    "ViewHeader.properties": "Özellikler",
-    "ViewHeader.properties-menu": "Özellikler menüsü",
-    "ViewHeader.search-text": "Kart arama",
-    "ViewHeader.select-a-template": "Bir kalıp seçin",
-    "ViewHeader.set-default-template": "Varsayılan olarak ata",
-    "ViewHeader.sort": "Sırala",
-    "ViewHeader.untitled": "Adlandırılmamış",
-    "ViewHeader.view-header-menu": "Başlık menüsünü görüntüle",
-    "ViewHeader.view-menu": "Menüyü görüntüle",
-    "ViewLimitDialog.Heading": "Bir panoyu görüntüleme sınırına ulaşıldı",
-    "ViewLimitDialog.PrimaryButton.Title.Admin": "Üst tarifeye geç",
-    "ViewLimitDialog.PrimaryButton.Title.RegularUser": "Yöneticiyi bilgilendir",
-    "ViewLimitDialog.Subtext.Admin": "Professional ya da Enterprise tarifemize geçin.",
-    "ViewLimitDialog.Subtext.Admin.PricingPageLink": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
-    "ViewLimitDialog.Subtext.RegularUser": "Yöneticinizi Professional ya da Enterprise tarifesine geçmesi hakkında bilgilendirin.",
-    "ViewLimitDialog.UpgradeImg.AltText": "üst tarifeye geçiş görseli",
-    "ViewLimitDialog.notifyAdmin.Success": "Yöneticiniz bilgilendirildi",
-    "ViewTitle.hide-description": "açıklamayı gizle",
-    "ViewTitle.pick-icon": "Simge seçin",
-    "ViewTitle.random-icon": "Rastgele",
-    "ViewTitle.remove-icon": "Simgeyi kaldır",
-    "ViewTitle.show-description": "açıklamayı görüntüle",
-    "ViewTitle.untitled-board": "Adlandırılmamış pano",
-    "WelcomePage.Description": "Pano, alışılmış Kanban panosu görünümünde takımların işleri tanımlamasını, düzenlemesini, izlemesi ve yönetmesini sağlayan bir proje yönetimi aracıdır.",
-    "WelcomePage.Explore.Button": "Tura çıkın",
-    "WelcomePage.Heading": "Panolara hoş geldiniz",
-    "WelcomePage.NoThanks.Text": "Hayır teşekkürler, kendim anlayacağım",
-    "WelcomePage.StartUsingIt.Text": "Kullanmaya başlayın",
-    "Workspace.editing-board-template": "Bir pano kalıbını düzenliyorsunuz.",
-    "badge.guest": "Konuk",
-    "boardPage.confirm-join-button": "Katıl",
-    "boardPage.confirm-join-text": "Bir özel kanala, pano yöneticisi tarafından açıkça eklenmeden katılmak üzeresiniz. Bu özel kanala katılmak istediğinize emin misiniz?",
-    "boardPage.confirm-join-title": "Özel kanala katıl",
-    "boardSelector.confirm-link-board": "Panoyu kanala bağla",
-    "boardSelector.confirm-link-board-button": "Evet, panoyu bağla",
-    "boardSelector.confirm-link-board-subtext": "\"{boardName}\" panosunu kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır. Bir pano ile bir kanalın bağlantısını istediğiniz zaman kaldırabilirsiniz.",
-    "boardSelector.confirm-link-board-subtext-with-other-channel": "\"{boardName}\" panosunu bir kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konukl üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
-    "boardSelector.create-a-board": "Bir pano ekle",
-    "boardSelector.link": "Bağlantı",
-    "boardSelector.search-for-boards": "Pano arama",
-    "boardSelector.title": "Panoları bağla",
-    "boardSelector.unlink": "Bağlantıyı kaldır",
-    "calendar.month": "Ay",
-    "calendar.today": "Bugün",
-    "calendar.week": "Hafta",
-    "centerPanel.undefined": "{propertyName} yok",
-    "centerPanel.unknown-user": "Kullanıcı bilinmiyor",
-    "cloudMessage.learn-more": "Ayrıntılı bilgi alın",
-    "createImageBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
-    "default-properties.badges": "Yorumlar ve açıklama",
-    "default-properties.title": "Başlık",
-    "error.back-to-home": "Girişe dön",
-    "error.back-to-team": "Takıma dön",
-    "error.board-not-found": "Pano bulunamadı.",
-    "error.go-login": "Oturum aç",
-    "error.invalid-read-only-board": "Bu panoya erişme izniniz yok. Panolara erişmek için oturum açın.",
-    "error.not-logged-in": "Oturumunuzun süresi dolmuş ya da oturum açmamışsınız. Panolara erişmek için yeniden oturum açın.",
-    "error.page.title": "Bir şeyler ters gitti",
-    "error.team-undefined": "Geçerli bir takım değil.",
-    "error.unknown": "Bir sorun çıktı.",
-    "generic.previous": "Önceki",
-    "guest-no-board.subtitle": "Henüz bu takımdaki herhangi bir panoya erişme izniniz yok. Lütfen biri sizi bir panoya ekleyene kadar bekleyin.",
-    "guest-no-board.title": "Henüz bir pano yok",
-    "imagePaste.upload-failed": "Dosya boyutu sınırı aşıldığından bazı dosyalar yüklenemedi.",
-    "limitedCard.title": "Kartlar gizli",
-    "login.log-in-button": "Oturum aç",
-    "login.log-in-title": "Oturum açın",
-    "login.register-button": "ya da hesabınız yoksa bir hesap açın",
-    "new_channel_modal.create_board.empty_board_description": "Yeni boş bir pano oluştur",
-    "new_channel_modal.create_board.empty_board_title": "Boş pano",
-    "new_channel_modal.create_board.select_template_placeholder": "Bir kalıp seçin",
-    "new_channel_modal.create_board.title": "Bu kanal için bir pano oluştur",
-    "notification-box-card-limit-reached.close-tooltip": "10 gün için sustur",
-    "notification-box-card-limit-reached.contact-link": "yöneticinizi bilgilendirin",
-    "notification-box-card-limit-reached.link": "Ücretli bir tarifeye geçin",
-    "notification-box-card-limit-reached.title": "panoda {cards} kart gizli",
-    "notification-box-cards-hidden.title": "Bu işlem başka bir kartı gizledi",
-    "notification-box.card-limit-reached.not-admin.text": "Arşivlenmiş kartlara erişmek için {contactLink} ile görüşerek ücretli bir tarifeye geçmesini isteyin.",
-    "notification-box.card-limit-reached.text": "Kart sınırına ulaşıldı. Eski kartları görüntülemek için {link}",
-    "person.add-user-to-board": "{username} kullanıcısını panoya ekle",
-    "person.add-user-to-board-confirm-button": "Panoya ekle",
-    "person.add-user-to-board-permissions": "İzinler",
-    "person.add-user-to-board-question": "{username} kullanıcısını panoya eklemek ister misiniz?",
-    "person.add-user-to-board-warning": "{username} panonun bir üyesi değil ve pano ile ilgili herhangi bir bildirim almayacak.",
-    "register.login-button": "ya da bir hesabınız varsa oturum açın",
-    "register.signup-title": "Hesap açın",
-    "rhs-board-non-admin-msg": "Panonun yöneticilerinden değilsiniz",
-    "rhs-boards.add": "Ekle",
-    "rhs-boards.dm": "Dİ",
-    "rhs-boards.gm": "Gİ",
-    "rhs-boards.header.dm": "bu doğrudan ileti",
-    "rhs-boards.header.gm": "bu grup iletisi",
-    "rhs-boards.last-update-at": "Son güncelleme: {datetime}",
-    "rhs-boards.link-boards-to-channel": "Panoları {channelName} kanalına bağla",
-    "rhs-boards.linked-boards": "Bağlı panolar",
-    "rhs-boards.no-boards-linked-to-channel": "Henüz {channelName} kanalına bağlanmış bir pano yok",
-    "rhs-boards.no-boards-linked-to-channel-description": "Panolar, takımlar arasındaki çalışmaları tanımlamak, organize etmek, izlemek ve yönetmek için kullanılabilen kandan panosuna benzer bir proje yönetimi aracıdır.",
-    "rhs-boards.unlink-board": "Panonun bağlantısını kaldır",
-    "rhs-boards.unlink-board1": "Pano bağlantısını kaldır",
-    "rhs-channel-boards-header.title": "Panolar",
-    "share-board.publish": "Yayınla",
-    "share-board.share": "Paylaş",
-    "shareBoard.channels-select-group": "Kanallar",
-    "shareBoard.confirm-change-team-role.body": "Bu panoda izinleri \"{role}\" rolünden daha aşağıda olan herkes <b>{role} rolüne yükseltilecek</b>. Panonunen düşük rolünü değiştirmek istediğinize emin misiniz?",
-    "shareBoard.confirm-change-team-role.confirmBtnText": "Panonun en düşük rolünü değiştir",
-    "shareBoard.confirm-change-team-role.title": "Panonun en düşük rolünü değiştir",
-    "shareBoard.confirm-link-channel": "Panoyu kanala bağla",
-    "shareBoard.confirm-link-channel-button": "Kanalı bağla",
-    "shareBoard.confirm-link-channel-button-with-other-channel": "Eski bağlantıyı kes ve bu kanala bağla",
-    "shareBoard.confirm-link-channel-subtext": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.",
-    "shareBoard.confirm-link-channel-subtext-with-other-channel": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
-    "shareBoard.confirm-unlink.body": "Bir kanalın bir pano ile bağlantısını kaldırdığınızda, kanalın tüm üyeleri (var olan ve yeni), kendilerine özel olarak izin verilmedikçe, panoya erişimi kaybeder.",
-    "shareBoard.confirm-unlink.confirmBtnText": "Kanalın bağlantısını kaldır",
-    "shareBoard.confirm-unlink.title": "Kanalın pano ile bağlantısı kaldır",
-    "shareBoard.lastAdmin": "Panoların en az bir yöneticisi olmalıdır",
-    "shareBoard.members-select-group": "Üyeler",
-    "shareBoard.unknown-channel-display-name": "Kanal bilinmiyor",
-    "tutorial_tip.finish_tour": "Tamam",
-    "tutorial_tip.got_it": "Anladım",
-    "tutorial_tip.ok": "Sonraki",
-    "tutorial_tip.out": "Bu ipuçları görüntülenmesin.",
-    "tutorial_tip.seen": "Daha önce gördünüz mü?"
+  "AdminBadge.SystemAdmin": "Yönetici",
+  "AdminBadge.TeamAdmin": "Takım yöneticisi",
+  "AppBar.Tooltip": "Bağlantılı panoları aç/kapat",
+  "Attachment.Attachment-title": "Ek dosya",
+  "AttachmentBlock.DeleteAction": "sil",
+  "AttachmentBlock.addElement": "{type} ekle",
+  "AttachmentBlock.delete": "Ek dosya silindi.",
+  "AttachmentBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
+  "AttachmentBlock.upload": "Ek dosya yükleniyor.",
+  "AttachmentBlock.uploadSuccess": "Ek dosya yüklendi.",
+  "AttachmentElement.delete-confirmation-dialog-button-text": "Sil",
+  "AttachmentElement.download": "İndir",
+  "AttachmentElement.upload-percentage": "Yükleniyor...(%{uploadPercent})",
+  "BoardComponent.add-a-group": "+ Grup ekle",
+  "BoardComponent.delete": "Sil",
+  "BoardComponent.hidden-columns": "Gizli sütunlar",
+  "BoardComponent.hide": "Gizle",
+  "BoardComponent.new": "+ Yeni",
+  "BoardComponent.no-property": "{property} yok",
+  "BoardComponent.no-property-title": "{property} alanı boş olan ögeler buraya atanır. Bu sütun silinemez.",
+  "BoardComponent.show": "Görüntüle",
+  "BoardMember.schemeAdmin": "Yönetici",
+  "BoardMember.schemeCommenter": "Yorumcu",
+  "BoardMember.schemeEditor": "Düzenleyici",
+  "BoardMember.schemeNone": "Yok",
+  "BoardMember.schemeViewer": "Görüntüleyici",
+  "BoardMember.unlinkChannel": "Bağlantıyı kaldır",
+  "BoardPage.newVersion": "Yeni bir pano sürümü yayınlanmış. Yeniden yüklemek için buraya tıklayın.",
+  "BoardPage.syncFailed": "Pano silinmiş ya da erişim izni geri alınmış olabilir.",
+  "BoardTemplateSelector.add-template": "Yeni kalıp ekle",
+  "BoardTemplateSelector.create-empty-board": "Boş bir pano ekle",
+  "BoardTemplateSelector.delete-template": "Sil",
+  "BoardTemplateSelector.description": "Kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
+  "BoardTemplateSelector.edit-template": "Düzenle",
+  "BoardTemplateSelector.plugin.no-content-description": "Aşağıdaki kalıplardan birini kullanarak ya da sıfırdan başlayarak yan çubuğa bir pano ekleyin.",
+  "BoardTemplateSelector.plugin.no-content-title": "Bir pano ekleyin",
+  "BoardTemplateSelector.title": "Bir pano ekle",
+  "BoardTemplateSelector.use-this-template": "Bu kalıp kullanılsın",
+  "BoardsSwitcher.Title": "Pano arama",
+  "BoardsUnfurl.Limited": "Kart arşivlendiğinden ek bilgiler gizleniyor",
+  "BoardsUnfurl.Remainder": "+{remainder} diğer",
+  "BoardsUnfurl.Updated": "Güncellenme: {time}",
+  "Calculations.Options.average.displayName": "Ortalama",
+  "Calculations.Options.average.label": "Ortalama",
+  "Calculations.Options.count.displayName": "Sayı",
+  "Calculations.Options.count.label": "Sayı",
+  "Calculations.Options.countChecked.displayName": "İşaretlenmiş",
+  "Calculations.Options.countChecked.label": "İşaretlenmiş sayısı",
+  "Calculations.Options.countUnchecked.displayName": "İşaretlenmemiş",
+  "Calculations.Options.countUnchecked.label": "İşaretlenmemiş sayısı",
+  "Calculations.Options.countUniqueValue.displayName": "Eşsiz",
+  "Calculations.Options.countUniqueValue.label": "Eşsiz değer sayısı",
+  "Calculations.Options.countValue.displayName": "Değer",
+  "Calculations.Options.countValue.label": "Değer sayısı",
+  "Calculations.Options.dateRange.displayName": "Aralık",
+  "Calculations.Options.dateRange.label": "Aralık",
+  "Calculations.Options.earliest.displayName": "En erken",
+  "Calculations.Options.earliest.label": "En erken",
+  "Calculations.Options.latest.displayName": "En geç",
+  "Calculations.Options.latest.label": "En geç",
+  "Calculations.Options.max.displayName": "En fazla",
+  "Calculations.Options.max.label": "En fazla",
+  "Calculations.Options.median.displayName": "Orta değer",
+  "Calculations.Options.median.label": "Orta değer",
+  "Calculations.Options.min.displayName": "En az",
+  "Calculations.Options.min.label": "En az",
+  "Calculations.Options.none.displayName": "Hesapla",
+  "Calculations.Options.none.label": "Yok",
+  "Calculations.Options.percentChecked.displayName": "İşaretlenmiş",
+  "Calculations.Options.percentChecked.label": "İşaretlenmiş yüzdesi",
+  "Calculations.Options.percentUnchecked.displayName": "İşaretlenmemiş",
+  "Calculations.Options.percentUnchecked.label": "İşaretlenmemiş yüzdesi",
+  "Calculations.Options.range.displayName": "Aralık",
+  "Calculations.Options.range.label": "Aralık",
+  "Calculations.Options.sum.displayName": "Toplam",
+  "Calculations.Options.sum.label": "Toplam",
+  "CalendarCard.untitled": "Adlandırılmamış",
+  "CardActionsMenu.copiedLink": "Kopyalandı!",
+  "CardActionsMenu.copyLink": "Bağlantıyı kopyala",
+  "CardActionsMenu.delete": "Sil",
+  "CardActionsMenu.duplicate": "Kopyala",
+  "CardBadges.title-checkboxes": "İşaret kutuları",
+  "CardBadges.title-comments": "Yorumlar",
+  "CardBadges.title-description": "Bu kartın bir açıklaması var",
+  "CardDetail.Attach": "Dosya ekle",
+  "CardDetail.Follow": "İzle",
+  "CardDetail.Following": "İzleniyor",
+  "CardDetail.add-content": "İçerik ekle",
+  "CardDetail.add-icon": "Simge ekle",
+  "CardDetail.add-property": "+ Bir özellik ekle",
+  "CardDetail.addCardText": "kart metni ekle",
+  "CardDetail.limited-body": "Professional ya da Enterprise tarifesine geçin.",
+  "CardDetail.limited-button": "Üst tarifeye geç",
+  "CardDetail.limited-title": "Bu kart gizli",
+  "CardDetail.moveContent": "Kart içeriğini taşı",
+  "CardDetail.new-comment-placeholder": "Bir yorum ekle...",
+  "CardDetailProperty.confirm-delete-heading": "Özelliği silmeyi onaylayın",
+  "CardDetailProperty.confirm-delete-subtext": "\"{propertyName}\" özelliğini silmek istediğinize emin misiniz? Bu işlem özelliği panodaki tüm kartlardan siler.",
+  "CardDetailProperty.confirm-property-name-change-subtext": "\"{propertyName}\" {customText} özelliğini değiştirmek istediğinize emin misiniz? Bu işlem bu panodaki {numOfCards} kartı etkiler ve veri kaybına yol açabilir.",
+  "CardDetailProperty.confirm-property-type-change": "Özellik türü değişimini onaylayın",
+  "CardDetailProperty.delete-action-button": "Sil",
+  "CardDetailProperty.property-change-action-button": "Özelliği değiştir",
+  "CardDetailProperty.property-changed": "Özellik değiştirildi!",
+  "CardDetailProperty.property-deleted": "{propertyName} silindi!",
+  "CardDetailProperty.property-name-change-subtext": "\"{oldPropType}\" türünden \"{newPropType}\" türüne",
+  "CardDetial.limited-link": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
+  "CardDialog.delete-confirmation-dialog-attachment": "Ek dosyanın silinmesini onaylayın",
+  "CardDialog.delete-confirmation-dialog-button-text": "Sil",
+  "CardDialog.delete-confirmation-dialog-heading": "Kartı silmeyi onaylayın",
+  "CardDialog.editing-template": "Bir kalıbı düzenliyorsunuz.",
+  "CardDialog.nocard": "Bu kart bulunamadı ya da erişilebilir değil.",
+  "Categories.CreateCategoryDialog.CancelText": "İptal",
+  "Categories.CreateCategoryDialog.CreateText": "Ekle",
+  "Categories.CreateCategoryDialog.Placeholder": "Kategorinize bir ad verin",
+  "Categories.CreateCategoryDialog.UpdateText": "Güncelle",
+  "CenterPanel.Login": "Oturum aç",
+  "CenterPanel.Share": "Paylaş",
+  "ChannelIntro.CreateBoard": "Bir pano ekle",
+  "ColorOption.selectColor": "{color} rengi seçin",
+  "Comment.delete": "Sil",
+  "CommentsList.send": "Gönder",
+  "ConfirmPerson.empty": "Boş",
+  "ConfirmPerson.search": "Arama...",
+  "ConfirmationDialog.cancel-action": "İptal",
+  "ConfirmationDialog.confirm-action": "Onayla",
+  "ContentBlock.Delete": "Sil",
+  "ContentBlock.DeleteAction": "sil",
+  "ContentBlock.addElement": "{type} ekle",
+  "ContentBlock.checkbox": "işaret kutusu",
+  "ContentBlock.divider": "ayıraç",
+  "ContentBlock.editCardCheckbox": "değiştirilmiş işaret kutusu",
+  "ContentBlock.editCardCheckboxText": "kart metnini düzenle",
+  "ContentBlock.editCardText": "kart metnini düzenle",
+  "ContentBlock.editText": "Metni düzenle...",
+  "ContentBlock.image": "görsel",
+  "ContentBlock.insertAbove": "Üste ekle",
+  "ContentBlock.moveBlock": "kart içeriğini taşı",
+  "ContentBlock.moveDown": "Alta taşı",
+  "ContentBlock.moveUp": "Üste taşı",
+  "ContentBlock.text": "metin",
+  "DateFilter.empty": "Boş",
+  "DateRange.clear": "Temizle",
+  "DateRange.empty": "Boş",
+  "DateRange.endDate": "Bitiş tarihi",
+  "DateRange.today": "Bugün",
+  "DeleteBoardDialog.confirm-cancel": "İptal",
+  "DeleteBoardDialog.confirm-delete": "Sil",
+  "DeleteBoardDialog.confirm-info": "“{boardTitle}” panosunu silmek istediğinize emin misiniz? Silme işlemi bu panodaki tüm kartları siler.",
+  "DeleteBoardDialog.confirm-info-template": "“{boardTitle}” pano kalıbını silmek istediğinize emin misiniz?",
+  "DeleteBoardDialog.confirm-tite": "Panoyu silmeyi onayla",
+  "DeleteBoardDialog.confirm-tite-template": "Pano kalıbını silmeyi onayla",
+  "Dialog.closeDialog": "Pencereyi kapat",
+  "EditableDayPicker.today": "Bugün",
+  "Error.mobileweb": "Mobil web desteği şu anda erken beta aşamasındadır. Tüm işlevler kullanılamıyor olabilir.",
+  "Error.websocket-closed": "Websoket bağlantısı kesildi. Bu sorun sürerse, sunucu ya da web vekil sunucu yapılandırmanızı denetleyin.",
+  "Filter.contains": "şunu içeren",
+  "Filter.ends-with": "şununla biten",
+  "Filter.includes": "şunu içeren",
+  "Filter.is": "şu olan",
+  "Filter.is-after": "şundan sonra",
+  "Filter.is-before": "şundan önce",
+  "Filter.is-empty": "boş olan",
+  "Filter.is-not-empty": "boş olmayan",
+  "Filter.is-not-set": "şuna ayarlanmamış olan",
+  "Filter.is-set": "şuna ayarlanmış olan",
+  "Filter.isafter": "şundan sonra",
+  "Filter.isbefore": "şundan önce",
+  "Filter.not-contains": "şunu içermeyen",
+  "Filter.not-ends-with": "şununla bitmeyen",
+  "Filter.not-includes": "şunu içermeyen",
+  "Filter.not-starts-with": "şununla başlamayan",
+  "Filter.starts-with": "şununla başlayan",
+  "FilterByText.placeholder": "metni süz",
+  "FilterComponent.add-filter": "+ Süzgeç ekle",
+  "FilterComponent.delete": "Sil",
+  "FilterValue.empty": "(boş)",
+  "FindBoardsDialog.IntroText": "Pano arama",
+  "FindBoardsDialog.NoResultsFor": "\"{searchQuery}\" için bir sonuç bulunamadı",
+  "FindBoardsDialog.NoResultsSubtext": "Yazımı denetleyin ya da başka bir arama yapmayı deneyin.",
+  "FindBoardsDialog.SubTitle": "Bulmak istediğiniz pano adını yazmaya başlayın. Gezinmek için <b>YUKAR/AŞAĞI</b>, seçmek için <b>ENTER</b>, vazgeçmek için <b>ESC</b> tuşlarını kullanın",
+  "FindBoardsDialog.Title": "Pano arama",
+  "GroupBy.hideEmptyGroups": "{count} boş grubu gizle",
+  "GroupBy.showHiddenGroups": "{count} gizli grubu görüntüle",
+  "GroupBy.ungroup": "Gruplamayı kaldır",
+  "HideBoard.MenuOption": "Panoyu gizle",
+  "KanbanCard.untitled": "Adlandırılmamış",
+  "MentionSuggestion.is-not-board-member": "(pano üyesi değil)",
+  "Mutator.new-board-from-template": "kalıptan yeni pano",
+  "Mutator.new-card-from-template": "kalıptan yeni kart oluştur",
+  "Mutator.new-template-from-card": "karttan yeni kalıp oluştur",
+  "OnboardingTour.AddComments.Body": "Sorunlar hakkında yorum yapabilir ve Mattermost kullanıcılarının dikkatini çekmek için @anabilirsiniz.",
+  "OnboardingTour.AddComments.Title": "Yorum yap",
+  "OnboardingTour.AddDescription.Body": "Takım arkadaşlarınızın kartın ne ile ilgili olduğunu anlaması için kartınıza bir açıklama ekleyin.",
+  "OnboardingTour.AddDescription.Title": "Açıklama ekle",
+  "OnboardingTour.AddProperties.Body": "Daha güçlü kılmak için kartlara çeşitli özellikler ekleyin.",
+  "OnboardingTour.AddProperties.Title": "Özellikler ekle",
+  "OnboardingTour.AddView.Body": "Farklı görünümler kullanarak panonuzu düzenleyecek yeni bir görünüm oluşturmak için buraya gidin.",
+  "OnboardingTour.AddView.Title": "Yeni bir görünüm ekle",
+  "OnboardingTour.CopyLink.Body": "Kartlarınızı takım arkadaşlarınızla paylaşmak için bağlantıyı kopyalayıp bir kanala, doğrudan iletiye veya grup iletisine yapıştırın.",
+  "OnboardingTour.CopyLink.Title": "Bağlantıyı kopyala",
+  "OnboardingTour.OpenACard.Body": "Panoların işinizi düzenlemenize yardımcı olabileceği güçlü yolları keşfetmek için bir kart açın.",
+  "OnboardingTour.OpenACard.Title": "Bir kart açın",
+  "OnboardingTour.ShareBoard.Body": "Panonuzu içeride, ekibiniz ile paylaşabilir ya da kuruluşunuzun dışında herkese açık olarak yayınlayabilirsiniz.",
+  "OnboardingTour.ShareBoard.Title": "Panoyu paylaş",
+  "PersonProperty.board-members": "Pano üyeleri",
+  "PersonProperty.me": "Benim",
+  "PersonProperty.non-board-members": "Pano üyesi olmayanlar",
+  "PropertyMenu.Delete": "Sil",
+  "PropertyMenu.changeType": "Özellik türünü değiştir",
+  "PropertyMenu.selectType": "Özellik türünü seçin",
+  "PropertyMenu.typeTitle": "Tür",
+  "PropertyType.Checkbox": "İşaret kutusu",
+  "PropertyType.CreatedBy": "Oluşturan",
+  "PropertyType.CreatedTime": "Oluşturulma zamanı",
+  "PropertyType.Date": "Tarih",
+  "PropertyType.Email": "E-posta",
+  "PropertyType.MultiPerson": "Çok kişi",
+  "PropertyType.MultiSelect": "Çoklu seçim",
+  "PropertyType.Number": "Sayı",
+  "PropertyType.Person": "Kişi",
+  "PropertyType.Phone": "Telefon",
+  "PropertyType.Select": "Seçin",
+  "PropertyType.Text": "Metin",
+  "PropertyType.Unknown": "Bilinmiyor",
+  "PropertyType.UpdatedBy": "Son güncelleyen",
+  "PropertyType.UpdatedTime": "Son güncelleme zamanı",
+  "PropertyType.Url": "Adres",
+  "PropertyValueElement.empty": "Boş",
+  "RegistrationLink.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
+  "RegistrationLink.copiedLink": "Kopyalandı!",
+  "RegistrationLink.copyLink": "Bağlantıyı kopyala",
+  "RegistrationLink.description": "Başkalarının hesap ekleyebilmesi için bu bağlantıyı paylaş:",
+  "RegistrationLink.regenerateToken": "Kodu yeniden oluştur",
+  "RegistrationLink.tokenRegenerated": "Kayıt bağlantısı yeniden oluşturuldu",
+  "ShareBoard.PublishDescription": "Web üzerinde herkese açık olarak \"salt okunur\" bir bağlantı yayınlayın ve paylaşın.",
+  "ShareBoard.PublishTitle": "Web üzerinde yayınla",
+  "ShareBoard.ShareInternal": "İçeride paylaş",
+  "ShareBoard.ShareInternalDescription": "İzni olan kullanıcılar bu bağlantıyı kullanabilecek.",
+  "ShareBoard.Title": "Panoyu paylaş",
+  "ShareBoard.confirmRegenerateToken": "Bu işlem daha önce paylaşılmış bağlantıları geçersiz kılacak. İlerlemek istiyor musunuz?",
+  "ShareBoard.copiedLink": "Kopyalandı!",
+  "ShareBoard.copyLink": "Bağlantıyı kopyala",
+  "ShareBoard.regenerate": "Kodu yeniden oluştur",
+  "ShareBoard.searchPlaceholder": "Kişi ve kanal arama",
+  "ShareBoard.teamPermissionsText": "{teamName} takımındaki herkes",
+  "ShareBoard.tokenRegenrated": "Kod yeniden oluşturuldu",
+  "ShareBoard.userPermissionsRemoveMemberText": "Üyelikten çıkar",
+  "ShareBoard.userPermissionsYouText": "(Siz)",
+  "ShareTemplate.Title": "Kalıbı paylaş",
+  "ShareTemplate.searchPlaceholder": "Kişi arama",
+  "Sidebar.about": "Focalboard hakkında",
+  "Sidebar.add-board": "+ Pano ekle",
+  "Sidebar.changePassword": "Parola değiştir",
+  "Sidebar.delete-board": "Panoyu sil",
+  "Sidebar.duplicate-board": "Panoyu kopyala",
+  "Sidebar.export-archive": "Arşivi dışa aktar",
+  "Sidebar.import": "İçe aktar",
+  "Sidebar.import-archive": "Arşivi içe aktar",
+  "Sidebar.invite-users": "Kullanıcıları çağır",
+  "Sidebar.logout": "Oturumu kapat",
+  "Sidebar.new-category.badge": "Yeni",
+  "Sidebar.new-category.drag-boards-cta": "Panoları sürükleyip buraya bırakın...",
+  "Sidebar.no-boards-in-category": "İçeride bir pano yok",
+  "Sidebar.product-tour": "Tanıtım turu",
+  "Sidebar.random-icons": "Rastgele simgeler",
+  "Sidebar.set-language": "Dili ayarla",
+  "Sidebar.set-theme": "Temayı ayarla",
+  "Sidebar.settings": "Ayarlar",
+  "Sidebar.template-from-board": "Panodan yeni kalıp",
+  "Sidebar.untitled-board": "(Adlandırılmamış pano)",
+  "Sidebar.untitled-view": "(Adlandırılmamış görünüm)",
+  "SidebarCategories.BlocksMenu.Move": "Şuraya taşı...",
+  "SidebarCategories.CategoryMenu.CreateNew": "Yeni kategori ekle",
+  "SidebarCategories.CategoryMenu.Delete": "Kategoriyi sił",
+  "SidebarCategories.CategoryMenu.DeleteModal.Body": "<b>{categoryName}</b> içindeki panolar Panolar kategorisine taşınacak. Herhangi bir panodan çıkarılmayacaksınız.",
+  "SidebarCategories.CategoryMenu.DeleteModal.Title": "Bu kategori silinsin mi?",
+  "SidebarCategories.CategoryMenu.Update": "Kategoriyi yeniden adlandır",
+  "SidebarTour.ManageCategories.Body": "Özel kategoriler oluşturun ve yönetin. Kategoriler kullanıcıya özeldir, bu nedenle bir panoyu kendi kategorinize taşımanız aynı panoyu kullanan diğer üyeleri etkilemez.",
+  "SidebarTour.ManageCategories.Title": "Kategori yönetimi",
+  "SidebarTour.SearchForBoards.Body": "Panoları hızlıca aramak ve yan çubuğunuza eklemek için pano değiştiriciyi (Cmd/Ctrl + K) açın.",
+  "SidebarTour.SearchForBoards.Title": "Pano arama",
+  "SidebarTour.SidebarCategories.Body": "Tüm panolarınızı artık yeni yan çubuğunuz altında bulabilirsiniz. Artık çalışma alanları arasında geçiş yapmanıza gerek yok. Önceki çalışma alanlarınıza göre eklenmiş tek seferlik özel kategoriler, 7.2 sürümüne güncellemenizin bir parçası olarak otomatik şekilde eklenmiş olabilir. Bunları isteğinize göre kaldırabilir ya da düzenleyebilirsiniz.",
+  "SidebarTour.SidebarCategories.Link": "Ayrıntılı bilgi alın",
+  "SidebarTour.SidebarCategories.Title": "Yan çubuk kategorileri",
+  "SiteStats.total_boards": "Toplam pano",
+  "SiteStats.total_cards": "Toplam kart",
+  "TableComponent.add-icon": "Simge ekle",
+  "TableComponent.name": "Ad",
+  "TableComponent.plus-new": "+ Yeni",
+  "TableHeaderMenu.delete": "Sil",
+  "TableHeaderMenu.duplicate": "Kopya oluştur",
+  "TableHeaderMenu.hide": "Gizle",
+  "TableHeaderMenu.insert-left": "Sola ekle",
+  "TableHeaderMenu.insert-right": "Sağa ekle",
+  "TableHeaderMenu.sort-ascending": "Artan sıralama",
+  "TableHeaderMenu.sort-descending": "Azalan sıralama",
+  "TableRow.DuplicateCard": "kartı kopyala",
+  "TableRow.MoreOption": "Diğer işlemler",
+  "TableRow.open": "Aç",
+  "TopBar.give-feedback": "Geri bildirimde bulunun",
+  "URLProperty.copiedLink": "Kopyalandı!",
+  "URLProperty.copy": "Kopyala",
+  "URLProperty.edit": "Düzenle",
+  "UndoRedoHotKeys.canRedo": "Yinele",
+  "UndoRedoHotKeys.canRedo-with-description": "{description} yinele",
+  "UndoRedoHotKeys.canUndo": "Geri al",
+  "UndoRedoHotKeys.canUndo-with-description": "{description} geri al",
+  "UndoRedoHotKeys.cannotRedo": "Yinelenecek bir işlem yok",
+  "UndoRedoHotKeys.cannotUndo": "Geri alınacak bir işlem yok",
+  "ValueSelector.noOptions": "Herhangi bir seçenek yok. İlk seçeneği eklemek için yazmaya başlayın!",
+  "ValueSelector.valueSelector": "Değer seçici",
+  "ValueSelectorLabel.openMenu": "Menüyü aç",
+  "VersionMessage.help": "Bu sürümdeki yeniliklere bakın.",
+  "VersionMessage.learn-more": "Ayrıntılı bilgi alın",
+  "View.AddView": "Görünüm ekle",
+  "View.Board": "Pano",
+  "View.DeleteView": "Görünümü sil",
+  "View.DuplicateView": "Görünümü kopyala",
+  "View.Gallery": "Galeri",
+  "View.NewBoardTitle": "Pano görünümü",
+  "View.NewCalendarTitle": "Takvim görünümü",
+  "View.NewGalleryTitle": "Galeri görünümü",
+  "View.NewTableTitle": "Tablo görünümü",
+  "View.NewTemplateDefaultTitle": "Adlandırılmamış kalıp",
+  "View.NewTemplateTitle": "Adlandırılmamış",
+  "View.Table": "Tablo",
+  "ViewHeader.add-template": "Yeni kalıp",
+  "ViewHeader.delete-template": "Sil",
+  "ViewHeader.display-by": "Görünüm: {property}",
+  "ViewHeader.edit-template": "Düzenle",
+  "ViewHeader.empty-card": "Boş kart",
+  "ViewHeader.export-board-archive": "Pano arşivini dışa aktar",
+  "ViewHeader.export-complete": "Dışa aktarıldı!",
+  "ViewHeader.export-csv": "CSV olarak dışa aktar",
+  "ViewHeader.export-failed": "Dışa aktarılamadı!",
+  "ViewHeader.filter": "Süz",
+  "ViewHeader.group-by": "Grupla: {property}",
+  "ViewHeader.new": "Yeni",
+  "ViewHeader.properties": "Özellikler",
+  "ViewHeader.properties-menu": "Özellikler menüsü",
+  "ViewHeader.search-text": "Kart arama",
+  "ViewHeader.select-a-template": "Bir kalıp seçin",
+  "ViewHeader.set-default-template": "Varsayılan olarak ata",
+  "ViewHeader.sort": "Sırala",
+  "ViewHeader.untitled": "Adlandırılmamış",
+  "ViewHeader.view-header-menu": "Başlık menüsünü görüntüle",
+  "ViewHeader.view-menu": "Menüyü görüntüle",
+  "ViewLimitDialog.Heading": "Bir panoyu görüntüleme sınırına ulaşıldı",
+  "ViewLimitDialog.PrimaryButton.Title.Admin": "Üst tarifeye geç",
+  "ViewLimitDialog.PrimaryButton.Title.RegularUser": "Yöneticiyi bilgilendir",
+  "ViewLimitDialog.Subtext.Admin": "Professional ya da Enterprise tarifemize geçin.",
+  "ViewLimitDialog.Subtext.Admin.PricingPageLink": "Tarifelerimiz hakkında ayrıntılı bilgi alın.",
+  "ViewLimitDialog.Subtext.RegularUser": "Yöneticinizi Professional ya da Enterprise tarifesine geçmesi hakkında bilgilendirin.",
+  "ViewLimitDialog.UpgradeImg.AltText": "üst tarifeye geçiş görseli",
+  "ViewLimitDialog.notifyAdmin.Success": "Yöneticiniz bilgilendirildi",
+  "ViewTitle.hide-description": "açıklamayı gizle",
+  "ViewTitle.pick-icon": "Simge seçin",
+  "ViewTitle.random-icon": "Rastgele",
+  "ViewTitle.remove-icon": "Simgeyi kaldır",
+  "ViewTitle.show-description": "açıklamayı görüntüle",
+  "ViewTitle.untitled-board": "Adlandırılmamış pano",
+  "WelcomePage.Description": "Pano, alışılmış Kanban panosu görünümünde takımların işleri tanımlamasını, düzenlemesini, izlemesi ve yönetmesini sağlayan bir proje yönetimi aracıdır.",
+  "WelcomePage.Explore.Button": "Tura çıkın",
+  "WelcomePage.Heading": "Panolara hoş geldiniz",
+  "WelcomePage.NoThanks.Text": "Hayır teşekkürler, kendim anlayacağım",
+  "WelcomePage.StartUsingIt.Text": "Kullanmaya başlayın",
+  "Workspace.editing-board-template": "Bir pano kalıbını düzenliyorsunuz.",
+  "badge.guest": "Konuk",
+  "boardPage.confirm-join-button": "Katıl",
+  "boardPage.confirm-join-text": "Bir özel kanala, pano yöneticisi tarafından açıkça eklenmeden katılmak üzeresiniz. Bu özel kanala katılmak istediğinize emin misiniz?",
+  "boardPage.confirm-join-title": "Özel kanala katıl",
+  "boardSelector.confirm-link-board": "Panoyu kanala bağla",
+  "boardSelector.confirm-link-board-button": "Evet, panoyu bağla",
+  "boardSelector.confirm-link-board-subtext": "\"{boardName}\" panosunu kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır. Bir pano ile bir kanalın bağlantısını istediğiniz zaman kaldırabilirsiniz.",
+  "boardSelector.confirm-link-board-subtext-with-other-channel": "\"{boardName}\" panosunu bir kanala bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konukl üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
+  "boardSelector.create-a-board": "Bir pano ekle",
+  "boardSelector.link": "Bağlantı",
+  "boardSelector.search-for-boards": "Pano arama",
+  "boardSelector.title": "Panoları bağla",
+  "boardSelector.unlink": "Bağlantıyı kaldır",
+  "calendar.month": "Ay",
+  "calendar.today": "Bugün",
+  "calendar.week": "Hafta",
+  "centerPanel.undefined": "{propertyName} yok",
+  "centerPanel.unknown-user": "Kullanıcı bilinmiyor",
+  "cloudMessage.learn-more": "Ayrıntılı bilgi alın",
+  "createImageBlock.failed": "Dosya boyutu sınırı aşıldığından bu dosya yüklenemedi.",
+  "default-properties.badges": "Yorumlar ve açıklama",
+  "default-properties.title": "Başlık",
+  "error.back-to-home": "Girişe dön",
+  "error.back-to-team": "Takıma dön",
+  "error.board-not-found": "Pano bulunamadı.",
+  "error.go-login": "Oturum aç",
+  "error.invalid-read-only-board": "Bu panoya erişme izniniz yok. Panolara erişmek için oturum açın.",
+  "error.not-logged-in": "Oturumunuzun süresi dolmuş ya da oturum açmamışsınız. Panolara erişmek için yeniden oturum açın.",
+  "error.page.title": "Bir şeyler ters gitti",
+  "error.team-undefined": "Geçerli bir takım değil.",
+  "error.unknown": "Bir sorun çıktı.",
+  "generic.previous": "Önceki",
+  "guest-no-board.subtitle": "Henüz bu takımdaki herhangi bir panoya erişme izniniz yok. Lütfen biri sizi bir panoya ekleyene kadar bekleyin.",
+  "guest-no-board.title": "Henüz bir pano yok",
+  "imagePaste.upload-failed": "Dosya boyutu sınırı aşıldığından bazı dosyalar yüklenemedi.",
+  "limitedCard.title": "Kartlar gizli",
+  "login.log-in-button": "Oturum aç",
+  "login.log-in-title": "Oturum açın",
+  "login.register-button": "ya da hesabınız yoksa bir hesap açın",
+  "new_channel_modal.create_board.empty_board_description": "Yeni boş bir pano oluştur",
+  "new_channel_modal.create_board.empty_board_title": "Boş pano",
+  "new_channel_modal.create_board.select_template_placeholder": "Bir kalıp seçin",
+  "new_channel_modal.create_board.title": "Bu kanal için bir pano oluştur",
+  "notification-box-card-limit-reached.close-tooltip": "10 gün için sustur",
+  "notification-box-card-limit-reached.contact-link": "yöneticinizi bilgilendirin",
+  "notification-box-card-limit-reached.link": "Ücretli bir tarifeye geçin",
+  "notification-box-card-limit-reached.title": "panoda {cards} kart gizli",
+  "notification-box-cards-hidden.title": "Bu işlem başka bir kartı gizledi",
+  "notification-box.card-limit-reached.not-admin.text": "Arşivlenmiş kartlara erişmek için {contactLink} ile görüşerek ücretli bir tarifeye geçmesini isteyin.",
+  "notification-box.card-limit-reached.text": "Kart sınırına ulaşıldı. Eski kartları görüntülemek için {link}",
+  "person.add-user-to-board": "{username} kullanıcısını panoya ekle",
+  "person.add-user-to-board-confirm-button": "Panoya ekle",
+  "person.add-user-to-board-permissions": "İzinler",
+  "person.add-user-to-board-question": "{username} kullanıcısını panoya eklemek ister misiniz?",
+  "person.add-user-to-board-warning": "{username} panonun bir üyesi değil ve pano ile ilgili herhangi bir bildirim almayacak.",
+  "register.login-button": "ya da bir hesabınız varsa oturum açın",
+  "register.signup-title": "Hesap açın",
+  "rhs-board-non-admin-msg": "Panonun yöneticilerinden değilsiniz",
+  "rhs-boards.add": "Ekle",
+  "rhs-boards.dm": "Dİ",
+  "rhs-boards.gm": "Gİ",
+  "rhs-boards.header.dm": "bu doğrudan ileti",
+  "rhs-boards.header.gm": "bu grup iletisi",
+  "rhs-boards.last-update-at": "Son güncelleme: {datetime}",
+  "rhs-boards.link-boards-to-channel": "Panoları {channelName} kanalına bağla",
+  "rhs-boards.linked-boards": "Bağlı panolar",
+  "rhs-boards.no-boards-linked-to-channel": "Henüz {channelName} kanalına bağlanmış bir pano yok",
+  "rhs-boards.no-boards-linked-to-channel-description": "Panolar, takımlar arasındaki çalışmaları tanımlamak, organize etmek, izlemek ve yönetmek için kullanılabilen kandan panosuna benzer bir proje yönetimi aracıdır.",
+  "rhs-boards.unlink-board": "Panonun bağlantısını kaldır",
+  "rhs-boards.unlink-board1": "Pano bağlantısını kaldır",
+  "rhs-channel-boards-header.title": "Panolar",
+  "share-board.publish": "Yayınla",
+  "share-board.share": "Paylaş",
+  "shareBoard.channels-select-group": "Kanallar",
+  "shareBoard.confirm-change-team-role.body": "Bu panoda izinleri \"{role}\" rolünden daha aşağıda olan herkes <b>{role} rolüne yükseltilecek</b>. Panonunen düşük rolünü değiştirmek istediğinize emin misiniz?",
+  "shareBoard.confirm-change-team-role.confirmBtnText": "Panonun en düşük rolünü değiştir",
+  "shareBoard.confirm-change-team-role.title": "Panonun en düşük rolünü değiştir",
+  "shareBoard.confirm-link-channel": "Panoyu kanala bağla",
+  "shareBoard.confirm-link-channel-button": "Kanalı bağla",
+  "shareBoard.confirm-link-channel-button-with-other-channel": "Eski bağlantıyı kes ve bu kanala bağla",
+  "shareBoard.confirm-link-channel-subtext": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.",
+  "shareBoard.confirm-link-channel-subtext-with-other-channel": "Bir kanalı bir panoya bağladığınızda, kanalın tüm üyeleri (var olan ve yeni) panoyu düzenleyebilir. Bu işlem konuk üyeleri kaldırır.{lineBreak}Bu pano şu anda başka bir kanal ile bağlantılı. Bu kanala bağlamayı seçerseniz diğer kanal ile bağlantısı kesilecek.",
+  "shareBoard.confirm-unlink.body": "Bir kanalın bir pano ile bağlantısını kaldırdığınızda, kanalın tüm üyeleri (var olan ve yeni), kendilerine özel olarak izin verilmedikçe, panoya erişimi kaybeder.",
+  "shareBoard.confirm-unlink.confirmBtnText": "Kanalın bağlantısını kaldır",
+  "shareBoard.confirm-unlink.title": "Kanalın pano ile bağlantısı kaldır",
+  "shareBoard.lastAdmin": "Panoların en az bir yöneticisi olmalıdır",
+  "shareBoard.members-select-group": "Üyeler",
+  "shareBoard.unknown-channel-display-name": "Kanal bilinmiyor",
+  "tutorial_tip.finish_tour": "Tamam",
+  "tutorial_tip.got_it": "Anladım",
+  "tutorial_tip.ok": "Sonraki",
+  "tutorial_tip.out": "Bu ipuçları görüntülenmesin.",
+  "tutorial_tip.seen": "Daha önce gördünüz mü?"
 }

From aa9e48587250af60311f333d8f604f4c109b6a0c Mon Sep 17 00:00:00 2001
From: Felipe Nogueira <contato.fnog@gmail.com>
Date: Fri, 14 Apr 2023 10:59:11 +0200
Subject: [PATCH 080/103] Translated using Weblate (Portuguese)

Currently translated at 21.1% (96 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/pt/
---
 webapp/boards/i18n/pt.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webapp/boards/i18n/pt.json b/webapp/boards/i18n/pt.json
index 6f70f2608e..654733b2f1 100644
--- a/webapp/boards/i18n/pt.json
+++ b/webapp/boards/i18n/pt.json
@@ -63,12 +63,15 @@
   "CardDetail.limited-button": "Atualizar",
   "CardDetail.new-comment-placeholder": "Adicionar um comentário...",
   "CardDetailProperty.delete-action-button": "Apagar",
+  "CardDetailProperty.property-change-action-button": "Alterar propriedade",
+  "CardDetailProperty.property-changed": "Propriedade alterada com sucesso!",
   "CardDialog.delete-confirmation-dialog-button-text": "Apagar",
   "Categories.CreateCategoryDialog.CancelText": "Cancelar",
   "Categories.CreateCategoryDialog.CreateText": "Criar",
   "Categories.CreateCategoryDialog.UpdateText": "Atualizar",
   "CenterPanel.Login": "Entrar",
   "CenterPanel.Share": "Compartilhar",
+  "ChannelIntro.CreateBoard": "Criar um quadro",
   "Comment.delete": "Apagar",
   "CommentsList.send": "Enviar",
   "ConfirmPerson.empty": "Vazio",

From 4d324c656dada9bc2d6ade29e6a0f62659379100 Mon Sep 17 00:00:00 2001
From: Pierre JENICOT <pierre.jenicot@ac-lille.fr>
Date: Fri, 14 Apr 2023 10:59:11 +0200
Subject: [PATCH 081/103] Translated using Weblate (French)

Currently translated at 98.8% (449 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/fr/
---
 webapp/boards/i18n/fr.json | 42 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/webapp/boards/i18n/fr.json b/webapp/boards/i18n/fr.json
index ad55293a0d..a94f4529f5 100644
--- a/webapp/boards/i18n/fr.json
+++ b/webapp/boards/i18n/fr.json
@@ -1,5 +1,14 @@
 {
+  "AdminBadge.SystemAdmin": "Administrateur",
+  "AdminBadge.TeamAdmin": "Administrateur d'équipe",
   "AppBar.Tooltip": "Activer les panneaux liés",
+  "Attachment.Attachment-title": "Pièce jointe",
+  "AttachmentBlock.DeleteAction": "supprimer",
+  "AttachmentBlock.addElement": "ajouter {type}",
+  "AttachmentBlock.delete": "Pièce jointe supprimée.",
+  "AttachmentBlock.failed": "Impossible de télécharger le fichier. Limite de taille de fichier atteinte.",
+  "AttachmentElement.delete-confirmation-dialog-button-text": "Supprimer",
+  "AttachmentElement.download": "Télécharger",
   "BoardComponent.add-a-group": "+ Ajouter un groupe",
   "BoardComponent.delete": "Supprimer",
   "BoardComponent.hidden-columns": "Colonnes cachées",
@@ -71,6 +80,7 @@
   "CardBadges.title-checkboxes": "Cases à cocher",
   "CardBadges.title-comments": "Commentaires",
   "CardBadges.title-description": "Cette carte a une description",
+  "CardDetail.Attach": "Joindre",
   "CardDetail.Follow": "Suivre",
   "CardDetail.Following": "Suivi",
   "CardDetail.add-content": "Ajouter du contenu",
@@ -92,6 +102,7 @@
   "CardDetailProperty.property-deleted": "{propertyName} supprimé avec succès !",
   "CardDetailProperty.property-name-change-subtext": "de \"{oldPropType}\" à \"{newPropType}\"",
   "CardDetial.limited-link": "En savoir plus sur nos offres.",
+  "CardDialog.delete-confirmation-dialog-attachment": "Confirmer la suppression de la pièce jointe",
   "CardDialog.delete-confirmation-dialog-button-text": "Supprimer",
   "CardDialog.delete-confirmation-dialog-heading": "Confirmer la suppression de la carte !",
   "CardDialog.editing-template": "Vous éditez un modèle.",
@@ -102,9 +113,12 @@
   "Categories.CreateCategoryDialog.UpdateText": "Mettre à jour",
   "CenterPanel.Login": "Connexion",
   "CenterPanel.Share": "Partager",
+  "ChannelIntro.CreateBoard": "Créer un tableau",
   "ColorOption.selectColor": "Choisir la couleur {color}",
   "Comment.delete": "Supprimer",
   "CommentsList.send": "Envoyer",
+  "ConfirmPerson.empty": "Vide",
+  "ConfirmPerson.search": "Recherche en cours…",
   "ConfirmationDialog.cancel-action": "Annuler",
   "ConfirmationDialog.confirm-action": "Confirmer",
   "ContentBlock.Delete": "Supprimer",
@@ -118,9 +132,11 @@
   "ContentBlock.editText": "Éditer le texte...",
   "ContentBlock.image": "image",
   "ContentBlock.insertAbove": "Insérer au-dessus",
+  "ContentBlock.moveBlock": "Déplacer le contenu de la carte",
   "ContentBlock.moveDown": "Déplacer vers le bas",
   "ContentBlock.moveUp": "Déplacer vers le haut",
   "ContentBlock.text": "texte",
+  "DateFilter.empty": "Vide",
   "DateRange.clear": "Supprimer",
   "DateRange.empty": "Vide",
   "DateRange.endDate": "Date de fin",
@@ -139,10 +155,14 @@
   "Filter.ends-with": "se termine par",
   "Filter.includes": "inclus",
   "Filter.is": "est",
+  "Filter.is-after": "est après",
+  "Filter.is-before": "est avant",
   "Filter.is-empty": "est vide",
   "Filter.is-not-empty": "n'est pas vide",
   "Filter.is-not-set": "n'est pas renseigné",
   "Filter.is-set": "est renseigné",
+  "Filter.isafter": "est après",
+  "Filter.isbefore": "est avant",
   "Filter.not-contains": "ne contient pas",
   "Filter.not-ends-with": "ne se termine pas par",
   "Filter.not-includes": "n'inclut pas",
@@ -151,6 +171,7 @@
   "FilterByText.placeholder": "filtre de texte",
   "FilterComponent.add-filter": "+ Ajouter un filtre",
   "FilterComponent.delete": "Supprimer",
+  "FilterValue.empty": "(vide)",
   "FindBoardsDialog.IntroText": "Rechercher des tableaux",
   "FindBoardsDialog.NoResultsFor": "Pas de résultats pour \"{searchQuery}\"",
   "FindBoardsDialog.NoResultsSubtext": "Vérifiez l'orthographe ou essayez une autre recherche.",
@@ -161,6 +182,7 @@
   "GroupBy.ungroup": "Dégrouper",
   "HideBoard.MenuOption": "Cacher le tableau",
   "KanbanCard.untitled": "Sans titre",
+  "MentionSuggestion.is-not-board-member": "(non membre du tableau)",
   "Mutator.new-board-from-template": "nouveau tableau à partir du modèle",
   "Mutator.new-card-from-template": "nouvelle carte depuis un modèle",
   "Mutator.new-template-from-card": "nouveau modèle depuis une carte",
@@ -178,6 +200,9 @@
   "OnboardingTour.OpenACard.Title": "Ouvrir une carte",
   "OnboardingTour.ShareBoard.Body": "Vous pouvez partager votre tableau en interne, au sein de votre équipe ou le publier publiquement pour une visibilité en dehors de votre organisation.",
   "OnboardingTour.ShareBoard.Title": "Partager un tableau",
+  "PersonProperty.board-members": "Membres du tableau",
+  "PersonProperty.me": "Moi",
+  "PersonProperty.non-board-members": "Non membres du tableau",
   "PropertyMenu.Delete": "Supprimer",
   "PropertyMenu.changeType": "Changer le type de la propriété",
   "PropertyMenu.selectType": "Sélectionner le type de propriété",
@@ -187,6 +212,7 @@
   "PropertyType.CreatedTime": "Date de création",
   "PropertyType.Date": "Date",
   "PropertyType.Email": "Adresse e-mail",
+  "PropertyType.MultiPerson": "Personne multiple",
   "PropertyType.MultiSelect": "Sélection multiple",
   "PropertyType.Number": "Nombre",
   "PropertyType.Person": "Personne",
@@ -230,6 +256,8 @@
   "Sidebar.import-archive": "Importer une archive",
   "Sidebar.invite-users": "Inviter des utilisateurs",
   "Sidebar.logout": "Se déconnecter",
+  "Sidebar.new-category.badge": "Nouveau",
+  "Sidebar.new-category.drag-boards-cta": "Déplacer les tableaux ici...",
   "Sidebar.no-boards-in-category": "Aucun tableaux",
   "Sidebar.product-tour": "Visite guidée",
   "Sidebar.random-icons": "Icônes aléatoires",
@@ -252,6 +280,8 @@
   "SidebarTour.SidebarCategories.Body": "Tous vos tableaux sont maintenant organisés sous votre nouvelle barre latérale. Plus besoin de basculer entre les espaces de travail. Des catégories personnalisées uniques basées sur vos espaces de travail précédents peuvent avoir été automatiquement créées pour vous dans le cadre de la mise à jour 7.2. Ceux-ci peuvent être supprimés ou modifiés selon vos préférences.",
   "SidebarTour.SidebarCategories.Link": "En savoir plus",
   "SidebarTour.SidebarCategories.Title": "Catégories de la barre latérale",
+  "SiteStats.total_boards": "Total des tableaux",
+  "SiteStats.total_cards": "Total des cartes",
   "TableComponent.add-icon": "Ajouter une icône",
   "TableComponent.name": "Nom",
   "TableComponent.plus-new": "+ Nouveau",
@@ -262,6 +292,8 @@
   "TableHeaderMenu.insert-right": "Insérer à droite",
   "TableHeaderMenu.sort-ascending": "Tri ascendant",
   "TableHeaderMenu.sort-descending": "Tri descendant",
+  "TableRow.DuplicateCard": "Dupliquer une carte",
+  "TableRow.MoreOption": "Plus d'actions",
   "TableRow.open": "Ouvrir",
   "TopBar.give-feedback": "Donner un avis",
   "URLProperty.copiedLink": "Copié !",
@@ -277,6 +309,7 @@
   "ValueSelector.valueSelector": "Sélecteur de value",
   "ValueSelectorLabel.openMenu": "Ouvrir le menu",
   "VersionMessage.help": "Découvrez les nouveautés de cette version.",
+  "VersionMessage.learn-more": "En savoir plus",
   "View.AddView": "Ajouter une vue",
   "View.Board": "Tableau",
   "View.DeleteView": "Supprimer la vue",
@@ -331,6 +364,9 @@
   "WelcomePage.StartUsingIt.Text": "Commencez à l'utiliser",
   "Workspace.editing-board-template": "Vous éditez un modèle de tableau.",
   "badge.guest": "Invité",
+  "boardPage.confirm-join-button": "Rejoindre",
+  "boardPage.confirm-join-text": "Vous êtes sur le point de rejoindre un forum privé sans avoir été explicitement ajouté par l'administrateur du forum. Êtes-vous sûr de vouloir rejoindre ce forum privé ?",
+  "boardPage.confirm-join-title": "Rejoindre un tableau privé",
   "boardSelector.confirm-link-board": "Lier la carte au canal",
   "boardSelector.confirm-link-board-button": "Oui, lier ce tableau",
   "boardSelector.confirm-link-board-subtext": "Lorsque vous liez \"{boardName}\" au canal, tous les membres du canal (existants et nouveaux) pourront le modifier. Vous pouvez dissocier un tableau d'un canal à tout moment.",
@@ -343,6 +379,8 @@
   "calendar.month": "Mois",
   "calendar.today": "AUJOURD'HUI",
   "calendar.week": "Semaine",
+  "centerPanel.undefined": "Pas de {propertyName}",
+  "centerPanel.unknown-user": "Utilisateur inconnu",
   "cloudMessage.learn-more": "En savoir plus",
   "createImageBlock.failed": "Impossible de télécharger le fichier. Limite de taille de fichier atteinte.",
   "default-properties.badges": "Commentaires et description",
@@ -364,6 +402,10 @@
   "login.log-in-button": "Connexion",
   "login.log-in-title": "Connexion",
   "login.register-button": "ou créez un compte si vous n'en avez pas",
+  "new_channel_modal.create_board.empty_board_description": "Créer un nouveau tableau vide",
+  "new_channel_modal.create_board.empty_board_title": "Tableau vide",
+  "new_channel_modal.create_board.select_template_placeholder": "Sélectionner un modèle",
+  "new_channel_modal.create_board.title": "Créer un tableau pour ce canal",
   "notification-box-card-limit-reached.close-tooltip": "Oublier pendant 10 jours",
   "notification-box-card-limit-reached.contact-link": "informez votre administrateur",
   "notification-box-card-limit-reached.link": "Passer à une offre payante",

From cc5057594a2435b36a1bee057d82aa1f35e2bc3e Mon Sep 17 00:00:00 2001
From: master7 <marcin.karkosz@rajska.info>
Date: Fri, 14 Apr 2023 10:59:12 +0200
Subject: [PATCH 082/103] Translated using Weblate (Polish)

Currently translated at 100.0% (5804 of 5804 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/pl/

Translated using Weblate (Polish)

Currently translated at 100.0% (5783 of 5783 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/pl/

Translated using Weblate (Polish)

Currently translated at 100.0% (605 of 605 strings)

Translation: mattermost-languages-shipped/mattermost-playbooks-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-playbooks-webapp-monorepo/pl/
---
 webapp/channels/src/i18n/pl.json | 74 +++++++++++++++++++++++++++++---
 webapp/playbooks/i18n/pl.json    |  2 +-
 2 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/webapp/channels/src/i18n/pl.json b/webapp/channels/src/i18n/pl.json
index 7196af04e3..2ce36827db 100644
--- a/webapp/channels/src/i18n/pl.json
+++ b/webapp/channels/src/i18n/pl.json
@@ -1,4 +1,10 @@
 {
+  "FIFTY_TO_100": "51-100",
+  "FIVE_HUNDRED_TO_1000": "501-1000",
+  "ONE_HUNDRED_TO_500": "101-500",
+  "ONE_THOUSAND_TO_2500": "1001-2500",
+  "ONE_TO_50": "1-50",
+  "TWO_THOUSAND_FIVE_HUNDRED_AND_UP": "2501-5000",
   "about.buildnumber": "Numer Kompilacji:",
   "about.cloudEdition": "Chmura",
   "about.copyright": "Copyright 2015 - {currentYear} Mattermost, Inc. Wszystkie prawa zastrzeżone",
@@ -264,11 +270,15 @@
   "admin.billing.history.allPaymentsShowHere": "Wszystkie Twoje faktury będą widoczne tutaj",
   "admin.billing.history.date": "Data",
   "admin.billing.history.description": "Opis",
+  "admin.billing.history.fractionalAndRatedSeats": "{fractionalSeats} miejsca opomiarowane, {fullSeats} miejsca po stawce pełnej, {partialSeats} miejsca z opłatą częściową",
+  "admin.billing.history.fractionalSeats": "{fractionalUsers} miejsca",
   "admin.billing.history.noBillingHistory": "W przyszłości w tym miejscu będzie widoczna historia Twoich rozliczeń.",
+  "admin.billing.history.onPremSeats": "{num} miejsca",
   "admin.billing.history.pageInfo": "{startRecord} - {endRecord} z {totalRecords}",
   "admin.billing.history.paid": "Płatne",
   "admin.billing.history.paymentFailed": "Płatność nie powiodła się",
   "admin.billing.history.pending": "Oczekiwanie",
+  "admin.billing.history.seatsAndRates": "{fullUsers} miejsca po stawce pełnej, {partialUsers} miejsca z opłatami częściowymi",
   "admin.billing.history.seeHowBillingWorks": "Zobacz jak działa rozliczenie",
   "admin.billing.history.status": "Stan",
   "admin.billing.history.title": "Historia rozliczeń",
@@ -300,6 +310,9 @@
   "admin.billing.subscription.cancelSubscriptionSection.description": "W chwili obecnej usunięcie obszaru roboczego może być wykonane tylko z pomocą przedstawiciela działu obsługi klienta.",
   "admin.billing.subscription.cancelSubscriptionSection.title": "Anuluj subskrypcję",
   "admin.billing.subscription.cloudMonthlyBadge": "Miesięcznie",
+  "admin.billing.subscription.cloudReverseTrial.daysLeftOnTrial": "{daysLeftOnTrial} dni pozostały do końca okresu próbnego. Wykup plan lub skontaktuj się z działem sprzedaży, aby zachować swój obszar roboczy.",
+  "admin.billing.subscription.cloudReverseTrial.lastDay": "To ostatni dzień okresu próbnego. Kup plan przed {userEndTrialHour} lub skontaktuj się z działem sprzedaży",
+  "admin.billing.subscription.cloudReverseTrial.subscribeButton": "Przejrzyj swoje opcje",
   "admin.billing.subscription.cloudTrial.daysLeftOnTrial": "Do końca bezpłatnego okresu próbnego pozostało {daysLeftOnTrial} dni",
   "admin.billing.subscription.cloudTrial.lastDay": "To jest ostatni dzień bezpłatnego okresu próbnego. Twój dostęp wygaśnie w dniu {userEndTrialDate} o godzinie {userEndTrialHour}.",
   "admin.billing.subscription.cloudTrial.moreThan3Days": "Twoja wersja testowa rozpoczęła! Pozostało jeszcze {daysLeftOnTrial} dni",
@@ -407,6 +420,8 @@
   "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "Płatne",
   "admin.billing.subscriptions.billing_summary.lastInvoice.partialCharges": "Opłaty częściowe",
   "admin.billing.subscriptions.billing_summary.lastInvoice.pending": "Oczekiwanie",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCount": " x {seats} miejsc",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.seatCountPartial": "{seats} miejsca",
   "admin.billing.subscriptions.billing_summary.lastInvoice.seeBillingHistory": "Zobacz historię rozliczeń",
   "admin.billing.subscriptions.billing_summary.lastInvoice.taxes": "Podatki",
   "admin.billing.subscriptions.billing_summary.lastInvoice.title": "Ostatnia faktura",
@@ -1353,6 +1368,7 @@
   "admin.license.upload-modal.file": "Plik",
   "admin.license.upload-modal.subtitle": "Prześlij klucz licencyjny dla Mattermost Enterprise Edition, aby uaktualnić ten serwer. ",
   "admin.license.upload-modal.successfulUpgrade": "Udana aktualizacja!",
+  "admin.license.upload-modal.successfulUpgradeText": "Dokonałeś aktualizacji do planu {skuName} dla {licensedUsersNum, number} miejsc . Obowiązuje to od {startsAt} do {expiresAt}. ",
   "admin.license.upload-modal.title": "Prześlij klucz licencyjny",
   "admin.license.uploadFile": "Prześlij plik",
   "admin.license.warn.renew": "Ponów",
@@ -2572,6 +2588,7 @@
   "analytics.system.postTypes": "Wiadomości, Pliki i Hashtagi",
   "analytics.system.privateGroups": "Kanały prywatne",
   "analytics.system.publicChannels": "Kanały publiczne",
+  "analytics.system.seatsPurchased": "Licencjonowane miejsca",
   "analytics.system.skippedIntensiveQueries": "Aby zmaksymalizować wydajność, niektóre statystyki są wyłączone. Możesz <link>ponownie je włączyć w config.json</link>.",
   "analytics.system.textPosts": "Wiadomości z samym tekstem",
   "analytics.system.title": "Statystyki systemu",
@@ -2591,6 +2608,7 @@
   "analytics.team.activeUsers": "Aktywni użytkownicy z wiadomościami",
   "analytics.team.newlyCreated": "Nowi użytkownicy",
   "analytics.team.noTeams": "Nie ma na tym serwerze zespołów dla których można zobaczyć statystyki.",
+  "analytics.team.overageUsersSeats": "Przekracza to łączną liczbę miejsc płatnych",
   "analytics.team.privateGroups": "Kanały prywatne",
   "analytics.team.publicChannels": "Kanały publiczne",
   "analytics.team.recentUsers": "Ostatnio Aktywni Użytkownicy",
@@ -3025,10 +3043,16 @@
   "cloud.startTrial.modal.btn": "Rozpoczęcie wersji trial",
   "cloud_archived.error.access": "Permalink należy do wiadomości, która została zarchiwizowana z powodu limitów {planName}. Uaktualnij, aby ponownie uzyskać dostęp do wiadomości.",
   "cloud_archived.error.title": "Wiadomość zarchiwizowana",
+  "cloud_billing.nudge_to_paid.contact_sales": "Kontakt ze sprzedażą",
+  "cloud_billing.nudge_to_paid.description": "Program Cloud Free zostanie wycofany z użytku za {days} dni. Uaktualnij do płatnego planu lub skontaktuj się z działem sprzedaży.",
+  "cloud_billing.nudge_to_paid.learn_more": "Aktualizuj",
+  "cloud_billing.nudge_to_paid.title": "Uaktualnij do płatnego planu, aby zachować swoją przestrzeń roboczą",
+  "cloud_billing.nudge_to_paid.view_plans": "Zobacz plany",
+  "cloud_billing.nudge_to_yearly.announcement_bar": "Rozliczenia miesięczne przestaną obowiązywać za {days} dni . Przejdź na rozliczenie roczne",
   "cloud_billing.nudge_to_yearly.contact_sales": "Kontakt ze sprzedażą",
-  "cloud_billing.nudge_to_yearly.description": "Uprość swoje rozliczenia, przechodząc na roczną subskrypcję.",
+  "cloud_billing.nudge_to_yearly.description": "Rozliczenia miesięczne przestaną obowiązywać {date}. Aby zachować swoją przestrzeń roboczą, przejdź na rozliczenie roczne.",
   "cloud_billing.nudge_to_yearly.learn_more": "Dowiedź się więcej",
-  "cloud_billing.nudge_to_yearly.title": "Przejdź na plan roczny już dziś",
+  "cloud_billing.nudge_to_yearly.title": "Wymagane działanie: Przełącz się na rozliczenie roczne, aby zachować swoją przestrzeń roboczą.",
   "cloud_billing_history_modal.title": "Faktura(y)",
   "cloud_delinquency.banner.buttonText": "Zaktualizuj rozliczenie teraz",
   "cloud_delinquency.banner.end_user_notify_admin_button": "Powiadom administratora",
@@ -3054,6 +3078,7 @@
   "cloud_delinquency.post_downgrade_banner.title": "Zaktualizuj teraz swoje informacje rozliczeniowe, aby ponownie aktywować płatne funkcje.",
   "cloud_signup.signup_consequences": "Twoja karta kredytowa zostanie obciążona już dziś. <a>Zobacz jak działa rozliczenie.</a>",
   "cloud_subscribe.contact_support": "Porównaj plany",
+  "cloud_upgrade.error_min_seats": "Wymagane minimum 10 miejsc",
   "collapsed_reply_threads_modal.confirm": "Jasne",
   "collapsed_reply_threads_modal.description": "Wątki zostały odświeżone, aby ułatwić Ci tworzenie zorganizowanych konwersacji wokół konkretnych wiadomości. Teraz kanały będą wyglądały na mniej zagracone, ponieważ odpowiedzi są zwinięte pod oryginalną wiadomością, a wszystkie wątki, które śledzisz, są dostępne w widoku **Wątki**. Przejdź się i zobacz, co nowego.",
   "collapsed_reply_threads_modal.skip_tour": "Pomiń Przewodnik",
@@ -4097,7 +4122,7 @@
   "marketplace_modal.list.update_confirmation.message.warning_major_version_with_release_notes": "Ta aktualizacja może zawierać duże zmiany. Przejrzyj [release notes](!{releaseNotesUrl}) przed aktualizacją.",
   "marketplace_modal.list.update_confirmation.title": "Potwierdź aktualizację wtyczki",
   "marketplace_modal.no_plugins": "Nie znaleziono żadnych wtyczek",
-  "marketplace_modal.no_plugins_installed": "Nie masz zainstalowanych żadnych wtyczek.",
+  "marketplace_modal.no_plugins_installed": "Nie masz zainstalowanych żadnych wtyczek",
   "marketplace_modal.search": "Szukaj w sklepie",
   "marketplace_modal.tabs.all_listing": "Wszystko",
   "marketplace_modal.tabs.installed_listing": "Zainstalowane ({count})",
@@ -4159,7 +4184,7 @@
   "more_channels.join": "Dołącz",
   "more_channels.joining": "Dołączanie...",
   "more_channels.next": "Dalej",
-  "more_channels.noMore": "Brak wyników dla \"{text}\"",
+  "more_channels.noMore": "Nie ma więcej kanałów do dołączenia",
   "more_channels.prev": "Wstecz",
   "more_channels.show_archived_channels": "Pokaż: Archiwizowane kanały",
   "more_channels.show_public_channels": "Pokaż: Publiczne kanały",
@@ -4245,6 +4270,9 @@
   "navbar_dropdown.viewMembers": "Wyświetl Użytkowników",
   "newChannelWithBoard.tutorialTip.description": "Do utworzonej właśnie tablicy można szybko przejść, klikając ikonę Tablica na pasku aplikacji. W prawym pasku bocznym możesz przeglądać tablice powiązane z tym kanałem, a także otworzyć jedną w pełnym widoku.",
   "newChannelWithBoard.tutorialTip.title": "Dostęp do połączonych tablic z Paska Aplikacji",
+  "newsletter_optin.checkmark.text": "<span>Chcę otrzymywać aktualizacje zabezpieczeń firmy Mattermost za pośrednictwem newslettera.</span> Zapisując się, wyrażam zgodę na otrzymywanie od Mattermost wiadomości e-mail z aktualizacjami produktów, promocjami i wiadomościami o firmie. Zapoznałem się z <a>Polityką prywatności</a> i rozumiem, że mogę <aa>zrezygnować z subskrypcji</aa> w dowolnym momencie",
+  "newsletter_optin.desc": "Zapisz się na stronie <a>{link}</a> .",
+  "newsletter_optin.title": "Chcesz otrzymywać za pośrednictwem newslettera informacje o bezpieczeństwie, produktach, promocjach i aktualizacjach firmy Mattermost?",
   "next_steps_view.welcomeToMattermost": "Witamy w Mattermost",
   "no_results.channel_files.subtitle": "Pliki umieszczone w tym kanale będą wyświetlane tutaj.",
   "no_results.channel_files.title": "Nie ma jeszcze plików",
@@ -4536,23 +4564,29 @@
   "pricing_modal.briefing.ssoWithGitLab": "SSO z Gitlabem",
   "pricing_modal.briefing.storageStarter": "{storage} limit przechowywania plików",
   "pricing_modal.briefing.title": "Główne właściwości",
+  "pricing_modal.briefing.title_large_scale": "Współpraca na dużą skalę",
+  "pricing_modal.briefing.title_no_limit": "Brak ograniczeń w korzystaniu przez Twój zespół",
   "pricing_modal.briefing.unlimitedPlaybookRuns": "Nieograniczona liczba playbooków i uruchomień",
   "pricing_modal.briefing.unlimitedWorkspaceTeams": "Nieograniczone zespoły przestrzeni roboczych",
   "pricing_modal.btn.contactSales": "Kontakt ze Sprzedażą",
   "pricing_modal.btn.contactSalesForQuote": "Kontakt ze Sprzedażą",
   "pricing_modal.btn.contactSupport": "Skontaktuj się ze Wsparciem",
   "pricing_modal.btn.downgrade": "Obniżenie licencji",
+  "pricing_modal.btn.purchase": "Kup",
   "pricing_modal.btn.switch_to_annual": "Przejście na rozliczenie roczne",
   "pricing_modal.btn.tooltip": "Widoczne tylko dla administratorów systemu",
   "pricing_modal.btn.tryDays": "Wypróbuj za darmo przez {days} dni",
   "pricing_modal.btn.upgrade": "Aktualizuj",
   "pricing_modal.btn.viewPlans": "Zobacz plany",
+  "pricing_modal.contact_us": "Skontaktuj się z nami",
   "pricing_modal.extra_briefing.cloud.free.calls": "Połączenia grupowe do 8 osób, połączenia 1:1 i współdzielenie ekranu",
   "pricing_modal.extra_briefing.enterprise.playBookAnalytics": "Pulpit analityczny Playbook",
   "pricing_modal.extra_briefing.free.calls": "Połączenia głosowe i współdzielenie ekranu",
   "pricing_modal.extra_briefing.professional.guestAccess": "Dostęp dla gości z egzekwowaniem MFA",
   "pricing_modal.extra_briefing.professional.ssoSaml": "SSO z SAML 2.0, w tym Okta, OneLogin, i ADFS",
   "pricing_modal.extra_briefing.professional.ssoadLdap": "Obsługa SSO z AD/LDAP, Google, O365, OpenID",
+  "pricing_modal.interested_self_hosting": "Interesuje Cię self-hosting?",
+  "pricing_modal.learn_more": "Dowiedź się więcej",
   "pricing_modal.lookingForCloudOption": "Szukasz opcji chmurowej?",
   "pricing_modal.lookingToSelfHost": "Szukasz samodzielnego hostingu?",
   "pricing_modal.noitfy_cta.request": "Poproś administratora o aktualizację",
@@ -4564,9 +4598,12 @@
   "pricing_modal.planLabel.mostPopular": "NAJPOPULARNIEJSZE",
   "pricing_modal.planSummary.enterprise": "Administracja, bezpieczeństwo i zgodność dla dużych zespołów",
   "pricing_modal.planSummary.free": "Zwiększona wydajność dla małych zespołów",
-  "pricing_modal.planSummary.professional": "Skalowalne rozwiązania dla rozwijających się zespołów",
+  "pricing_modal.planSummary.professional": "Skalowalne rozwiązania {br} dla rosnących zespołów",
   "pricing_modal.plan_label_trialDays": "{days} POZOSTAŁO DNI TESTOWYCH",
   "pricing_modal.price.freeForever": "Bezpłatny na zawsze",
+  "pricing_modal.questions": "Pytania?",
+  "pricing_modal.rate.seatPerMonth": "USD za miejsce/miesiąc {br}<b>(rozliczane rocznie)</b>",
+  "pricing_modal.reach_out": "Skontaktuj się z nami, a pomożemy Ci zdecydować, który plan jest odpowiedni dla Ciebie i Twojej organizacji.",
   "pricing_modal.reviewDeploymentOptions": "Zapoznaj się z opcjami rozmieszczania",
   "pricing_modal.start_trial.disclaimer": "Wybierając opcję <span>Wypróbuj przez 30 dni,</span> wyrażam zgodę na <linkAgreement>Mattermost Software and Services License Agreement</linkAgreement>, <linkPrivacy>Privacy Policy</linkPrivacy> oraz na otrzymywanie wiadomości e-mail dotyczących produktu.",
   "pricing_modal.subtitle": "Wybierz plan, aby rozpocząć pracę",
@@ -4704,9 +4741,12 @@
   "self_hosted_signup.cta": "Aktualizuj",
   "self_hosted_signup.disclaimer": "Zapoznałem się i akceptuję <a>warunki subskrypcji Enterprise Edition.</a>",
   "self_hosted_signup.error_invalid_number": "Wprowadź prawidłową liczbę miejsc",
+  "self_hosted_signup.error_max_seats": " zakup licencji obsługuje tylko zakupy do {num} miejsc",
+  "self_hosted_signup.error_min_seats": "W Twojej przestrzeni roboczej znajduje się obecnie {num} użytkowników",
   "self_hosted_signup.failed_export.subtitle": "Sprawdzimy wszystko po naszej stronie i skontaktujemy się z Tobą w ciągu 3 dni po zatwierdzeniu licencji. W międzyczasie prosimy o dalsze korzystanie z darmowej wersji naszego produktu.",
   "self_hosted_signup.failed_export.title": "Twoja transakcja jest sprawdzana",
   "self_hosted_signup.license_applied": "Twoja licencja {planName} została zastosowana. Funkcje {planName} są teraz dostępne i gotowe do użycia.",
+  "self_hosted_signup.line_item_subtotal": "{num} miejsca × 12 m-cy.",
   "self_hosted_signup.organization": "Nazwa organizacji",
   "self_hosted_signup.progress_step.applying_license": "Zastosowanie licencji {planName} do instancji Mattermost",
   "self_hosted_signup.progress_step.submitting_payment": "Przekazanie informacji o płatności",
@@ -4716,10 +4756,10 @@
   "self_hosted_signup.purchase_in_progress.by_self_restart": "Jeśli uważasz, że to błąd, zrestartuj swój zakup.",
   "self_hosted_signup.purchase_in_progress.reset": "Ponowne uruchomienie zakupu",
   "self_hosted_signup.purchase_in_progress.title": "Zakupy w toku",
-  "self_hosted_signup.error_min_seats": "W Twojej przestrzeni roboczej znajduje się obecnie {num} użytkowników",
   "self_hosted_signup.retry": "Spróbuj ponownie",
   "self_hosted_signup.screening_description": "Sprawdzimy wszystko po naszej stronie i skontaktujemy się z Tobą w ciągu 3 dni po zatwierdzeniu licencji. W międzyczasie prosimy o dalsze korzystanie z darmowej wersji naszego produktu.",
   "self_hosted_signup.screening_title": "Twoja transakcja jest sprawdzana",
+  "self_hosted_signup.seats": "Miejsca",
   "self_hosted_signup.signup_consequences": "Zostaniesz rozliczony dzisiaj. Twoja licencja zostanie zastosowana automatycznie. <a>Zobacz jak działa rozliczenie.</a>",
   "self_hosted_signup.total": "Ogółem",
   "setting_item_max.cancel": "Anuluj",
@@ -4971,6 +5011,18 @@
   "start_trial.modal_btn.start_free_trial": "Rozpocznij bezpłatny 30-dniowy okres próbny",
   "start_trial.tutorialTip.desc": "Zapoznaj się z naszymi najbardziej pożądanymi funkcjami premium. Określ dostęp użytkowników za pomocą kont gości, zautomatyzuj raporty zgodności i wysyłaj bezpieczne powiadomienia mobilne push z wykorzystaniem wyłącznie identyfikatorów.",
   "start_trial.tutorialTip.title": "Wypróbuj nasze funkcje premium za darmo",
+  "start_trial_form.company_name": "Nazwa organizacji",
+  "start_trial_form.company_size": "Wielkość Organizacji",
+  "start_trial_form.disclaimer": "Wybierając opcję Rozpocznij test, wyrażam zgodę na <agreement>Mattermost Software Evaluation Agreement</agreement>, <privacypolicy>Privacy Policy</privacypolicy> oraz na otrzymywanie wiadomości e-mail dotyczących produktu.",
+  "start_trial_form.email": "E-mail służbowy",
+  "start_trial_form.invalid_business_email": "Proszę wpisać prawidłowy służbowy adres e-mail.",
+  "start_trial_form.modal_body": "Kilka krótkich informacji, które pomogą nam dostosować się do Twoich potrzeb",
+  "start_trial_form.modal_btn.start": "Rozpoczęcie wersji trial",
+  "start_trial_form.modal_title": "Rozpoczęcie wersji Trial",
+  "start_trial_form.name": "Nazwa",
+  "start_trial_form_modal.failureModal.subtitle": "Wystąpił problem z przetworzeniem Twojego wniosku o wersję testową.",
+  "start_trial_form_modal.failureModal.subtitle2": "Proszę spróbować ponownie lub skontaktować się z pomocą techniczną.",
+  "start_trial_form_modal.failureModal.title": "Proszę spróbować ponownie",
   "status_dropdown.dnd_sub_menu_header": "Wyłącz powiadomienia do:",
   "status_dropdown.dnd_sub_menu_item.custom": "Niestandardowy",
   "status_dropdown.dnd_sub_menu_item.one_hour": "1 godzina",
@@ -5599,7 +5651,10 @@
   "user_groups_modal.viewGroup": "Wyświetl Grupę",
   "user_list.notFound": "Nie znaleziono użytkowników",
   "user_profile.account.editProfile": "Edytuj Profil",
+  "user_profile.account.hoursAhead": "({timeOffset} przed)",
+  "user_profile.account.hoursBehind": "({timeOffset} po)",
   "user_profile.account.localTime": "Czas Lokalny",
+  "user_profile.account.localTimeWithTimezone": "Czas lokalny ({timezone})",
   "user_profile.account.post_was_created": "Ten post został stworzony przez integrację z",
   "user_profile.add_user_to_channel": "Dodaj do kanału",
   "user_profile.add_user_to_channel.icon": "Dodaj Użytkownika do Ikony Kanału",
@@ -5654,6 +5709,7 @@
   "welcome_post_renderer.user_message.first_paragraph": "Mattermost to platforma open source do bezpiecznej komunikacji, współpracy i dostrojenia pracy między narzędziami i zespołami.",
   "welcome_post_renderer.user_message.second_paragraph": "Oto lista poleceń, których należy użyć, aby spróbować zapoznać się z platformą.",
   "welcome_post_renderer.user_message.title": "Witamy w Mattermost! :rocket:",
+  "widget.input.clear": "Wyczyść",
   "widget.input.required": "To pole jest wymagane",
   "widget.passwordInput.createPassword": "Wybierz hasło",
   "widget.passwordInput.password": "Hasło",
@@ -5670,9 +5726,13 @@
   "work_templates.customize.name_label_all": "Nazwij swój kanał, tablicę i playbook",
   "work_templates.customize.name_label_channels_boards": "Nazwij swój kanał i tablicę",
   "work_templates.customize.name_label_channels_playbooks": "Nazwij swój kanał i playbook",
+  "work_templates.customize.private_channel_permission_issue": "Nie masz uprawnień do tworzenia prywatnych kanałów.",
   "work_templates.customize.private_playbook_license_issue": "Prywatne playbooki wymagają licencji Enterprise.",
+  "work_templates.customize.private_playbook_permission_issue": "Nie masz uprawnień do tworzenia prywatnych playbooków.",
+  "work_templates.customize.public_channel_permission_issue": "Nie masz uprawnień do tworzenia kanałów publicznych.",
+  "work_templates.customize.public_playbook_permission_issue": "Nie masz uprawnień do tworzenia publicznych playbooków.",
   "work_templates.customize.visibility_title": "Kto powinien mieć do tego dostęp?",
-  "work_templates.menu.modal_title": "Zacznij od szablonu",
+  "work_templates.menu.modal_title": "Utwórz z szablonu",
   "work_templates.menu.quick_use": "Szybkie użycie",
   "work_templates.menu.template_title": "SZABLON",
   "work_templates.menu.usecase_boards_count": "{boardsCount, plural, =1 {# tablica} other {# tablic}}",
diff --git a/webapp/playbooks/i18n/pl.json b/webapp/playbooks/i18n/pl.json
index 4751ae50ce..550fd4797d 100644
--- a/webapp/playbooks/i18n/pl.json
+++ b/webapp/playbooks/i18n/pl.json
@@ -348,7 +348,7 @@
     "fuDLDJ": "Utwórz kanał",
     "UMoxP9": "Szablon nazwy kanału (opcjonalnie)",
     "3MSGcL": "Nazwa kanału jest nieprawidłowa.",
-    "cp7KUI": "Playbook",
+    "cp7KUI": "Playbok",
     "C6Oghd": "Edytuj podsumowanie uruchomienia",
     "cPIKU2": "Obserwowane",
     "d4g2r8": "Usunięto: {timestamp}",

From 2b7cfe3f2a93a31f659a5f878ec1ad1f47686ffc Mon Sep 17 00:00:00 2001
From: Yananeer <Yananeer@outlook.com>
Date: Fri, 14 Apr 2023 10:59:12 +0200
Subject: [PATCH 083/103] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.2% (446 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/zh_Hans/
---
 webapp/boards/i18n/zh_Hans.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webapp/boards/i18n/zh_Hans.json b/webapp/boards/i18n/zh_Hans.json
index 56dfdd2824..f3c7fb7bfc 100644
--- a/webapp/boards/i18n/zh_Hans.json
+++ b/webapp/boards/i18n/zh_Hans.json
@@ -1,5 +1,5 @@
 {
-  "AppBar.Tooltip": "切换链接的板块",
+  "AppBar.Tooltip": "切换已链接的板块",
   "Attachment.Attachment-title": "附件",
   "AttachmentBlock.DeleteAction": "删除",
   "AttachmentBlock.addElement": "添加 {type}",
@@ -137,6 +137,7 @@
   "ContentBlock.moveDown": "下移",
   "ContentBlock.moveUp": "上移",
   "ContentBlock.text": "文字",
+  "DateFilter.empty": "空",
   "DateRange.clear": "清除",
   "DateRange.empty": "空的",
   "DateRange.endDate": "结束日期",
@@ -305,6 +306,7 @@
   "ValueSelector.valueSelector": "值选择器",
   "ValueSelectorLabel.openMenu": "打开菜单",
   "VersionMessage.help": "了解查看新版本有什么新特性。",
+  "VersionMessage.learn-more": "了解更多",
   "View.AddView": "添加视图",
   "View.Board": "板块",
   "View.DeleteView": "删除视图",
@@ -359,6 +361,7 @@
   "WelcomePage.StartUsingIt.Text": "开始使用",
   "Workspace.editing-board-template": "您正在编辑版面模板。",
   "badge.guest": "访客",
+  "boardPage.confirm-join-button": "加入",
   "boardSelector.confirm-link-board": "连接板块到频道",
   "boardSelector.confirm-link-board-button": "是的，连接板块",
   "boardSelector.confirm-link-board-subtext": "当你连接“{boardName}”到频道时，所有频道的成员（现有的或新的）都可以编辑。这并不包括访客。你随时都可以取消板块与频道的连接。",

From 35f10ea277114b3f15f44e9ba5cd5b4999df43d8 Mon Sep 17 00:00:00 2001
From: Konstantin <eleferen@gmail.com>
Date: Fri, 14 Apr 2023 10:59:13 +0200
Subject: [PATCH 084/103] Translated using Weblate (Russian)

Currently translated at 100.0% (454 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/ru/

Translated using Weblate (Russian)

Currently translated at 99.0% (5726 of 5783 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/ru/
---
 webapp/boards/i18n/ru.json       | 32 ++++++++++++++++++++++++++++++++
 webapp/channels/src/i18n/ru.json | 14 +++++++-------
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/webapp/boards/i18n/ru.json b/webapp/boards/i18n/ru.json
index bcbcbdf899..382943683c 100644
--- a/webapp/boards/i18n/ru.json
+++ b/webapp/boards/i18n/ru.json
@@ -1,4 +1,6 @@
 {
+  "AdminBadge.SystemAdmin": "Администратор",
+  "AdminBadge.TeamAdmin": "Администратор Команды",
   "AppBar.Tooltip": "Переключить связанные доски",
   "Attachment.Attachment-title": "Вложение",
   "AttachmentBlock.DeleteAction": "Удалить",
@@ -137,6 +139,7 @@
   "ContentBlock.moveDown": "Опустить",
   "ContentBlock.moveUp": "Поднять",
   "ContentBlock.text": "текст",
+  "DateFilter.empty": "Пусто",
   "DateRange.clear": "Очистить",
   "DateRange.empty": "Пусто",
   "DateRange.endDate": "Дата окончания",
@@ -155,10 +158,14 @@
   "Filter.ends-with": "заканчивается",
   "Filter.includes": "содержит",
   "Filter.is": "является",
+  "Filter.is-after": "после",
+  "Filter.is-before": "раньше",
   "Filter.is-empty": "пусто",
   "Filter.is-not-empty": "не пусто",
   "Filter.is-not-set": "не установлен",
   "Filter.is-set": "установлен",
+  "Filter.isafter": "после",
+  "Filter.isbefore": "раньше",
   "Filter.not-contains": "не содержит",
   "Filter.not-ends-with": "не заканчивается",
   "Filter.not-includes": "не содержит",
@@ -197,6 +204,7 @@
   "OnboardingTour.ShareBoard.Body": "Вы можете поделиться своей доской внутри своей команды или опубликовать ее для общего доступа за пределами Вашей организации.",
   "OnboardingTour.ShareBoard.Title": "Поделиться доской",
   "PersonProperty.board-members": "Совет директоров",
+  "PersonProperty.me": "Я",
   "PersonProperty.non-board-members": "Не члены правления",
   "PropertyMenu.Delete": "Удалить",
   "PropertyMenu.changeType": "Изменить тип свойства",
@@ -304,6 +312,7 @@
   "ValueSelector.valueSelector": "Выбор значения",
   "ValueSelectorLabel.openMenu": "Открыть меню",
   "VersionMessage.help": "Узнайте, что нового в этой версии.",
+  "VersionMessage.learn-more": "Узнать больше",
   "View.AddView": "Добавить вид",
   "View.Board": "Доска",
   "View.DeleteView": "Удалить вид",
@@ -358,6 +367,9 @@
   "WelcomePage.StartUsingIt.Text": "Начать пользоваться",
   "Workspace.editing-board-template": "Вы редактируете шаблон доски.",
   "badge.guest": "Гость",
+  "boardPage.confirm-join-button": "Присоединиться",
+  "boardPage.confirm-join-text": "Вы собираетесь присоединиться к закрытой доске без явного добавления администратором доски. Вы уверены, что хотите присоединиться к этой закрытой доске?",
+  "boardPage.confirm-join-title": "Присоединиться к приватной доске",
   "boardSelector.confirm-link-board": "Привязать доску к каналу",
   "boardSelector.confirm-link-board-button": "Да, ссылка доски",
   "boardSelector.confirm-link-board-subtext": "Связывание доски \"{boardName}\" с каналом даст всем участникам канала доступ на редактирование доски. Вы можете в любое время отвязать доску о канала.",
@@ -386,6 +398,8 @@
   "error.team-undefined": "Не корректная команда.",
   "error.unknown": "Произошла ошибка.",
   "generic.previous": "Предыдущий",
+  "guest-no-board.subtitle": "У вас пока нет доступа ни к одной доске в этой команде, пожалуйста, подождите, пока кто-нибудь не добавит вас к любой из досок.",
+  "guest-no-board.title": "Пока нет досок",
   "imagePaste.upload-failed": "Некоторые файлы не загружены из-за превышения квоты на размер файла.",
   "limitedCard.title": "Карточки скрыты",
   "login.log-in-button": "Вход в систему",
@@ -406,22 +420,40 @@
   "person.add-user-to-board-confirm-button": "Добавить доску",
   "person.add-user-to-board-permissions": "Разрешения",
   "person.add-user-to-board-question": "Вы хотите добавить {username} на доску?",
+  "person.add-user-to-board-warning": "{username} не является участником доски и не получает никаких уведомлений о ней.",
   "register.login-button": "или войти в систему, если у вас уже есть аккаунт",
   "register.signup-title": "Зарегистрируйте свой аккаунт",
   "rhs-board-non-admin-msg": "Вы не являетесь администратором этой доски",
   "rhs-boards.add": "Добавить",
+  "rhs-boards.dm": "ЛС",
+  "rhs-boards.gm": "GM",
+  "rhs-boards.header.dm": "это личное сообщение",
+  "rhs-boards.header.gm": "это групповое сообщение",
   "rhs-boards.last-update-at": "Последнее обновление: {datetime}",
   "rhs-boards.link-boards-to-channel": "Связать доски с {channelName}",
   "rhs-boards.linked-boards": "Связанные доски",
   "rhs-boards.no-boards-linked-to-channel": "К каналу {channelName} пока не подключены доски",
   "rhs-boards.no-boards-linked-to-channel-description": "Доски — это инструмент управления проектами, который помогает определять, организовывать, отслеживать и управлять работой между командами, используя знакомое представление доски Канбан.",
   "rhs-boards.unlink-board": "Отвязать доску",
+  "rhs-boards.unlink-board1": "Отвязать доску",
   "rhs-channel-boards-header.title": "Доски",
   "share-board.publish": "Опубликовать",
   "share-board.share": "Поделиться",
   "shareBoard.channels-select-group": "Каналы",
+  "shareBoard.confirm-change-team-role.body": "Все на этой доске с правами ниже, чем роль \"{role}\" <b>теперь будут повышены до {role}</b>. Вы уверены, что хотите изменить минимальную роль для доски?",
+  "shareBoard.confirm-change-team-role.confirmBtnText": "Изменение минимальной роли доски",
+  "shareBoard.confirm-change-team-role.title": "Изменение минимальной роли доски",
+  "shareBoard.confirm-link-channel": "Привязать доску к каналу",
+  "shareBoard.confirm-link-channel-button": "Привязать канал",
+  "shareBoard.confirm-link-channel-button-with-other-channel": "Отвязать и привязать это",
+  "shareBoard.confirm-link-channel-subtext": "Когда вы связываете канал с доской, все участники канала (существующие и новые) смогут редактировать его. За исключением пользователей, которые являются гостями.",
+  "shareBoard.confirm-link-channel-subtext-with-other-channel": "Когда вы связываете канал с доской, все участники канала (существующие и новые) смогут редактировать его. За исключением пользователей, которые являются гостями.{lineBreak}Эта доска в настоящее время связана с другим каналом. Она будет удалена, если вы решите связать ее здесь.",
+  "shareBoard.confirm-unlink.body": "Когда вы отвязываете канал от доски, все участники канала (как существующие, так и новые) теряют к нему доступ, если им не дано отдельное разрешение.",
+  "shareBoard.confirm-unlink.confirmBtnText": "Отвязать канал",
+  "shareBoard.confirm-unlink.title": "Отвязать канал от доски",
   "shareBoard.lastAdmin": "Доски должны иметь хотя бы одного администратора",
   "shareBoard.members-select-group": "Участники",
+  "shareBoard.unknown-channel-display-name": "Неизвестный канал",
   "tutorial_tip.finish_tour": "Готово",
   "tutorial_tip.got_it": "Понятно",
   "tutorial_tip.ok": "Следующий",
diff --git a/webapp/channels/src/i18n/ru.json b/webapp/channels/src/i18n/ru.json
index 42b63942c6..4f73f0d4ec 100644
--- a/webapp/channels/src/i18n/ru.json
+++ b/webapp/channels/src/i18n/ru.json
@@ -3672,7 +3672,7 @@
   "help.formatting.supportedSyntax": "Поддерживаемые языки: `applescript`, `as`, `atom`, `bas`, `bash`, `boot`, `_coffee`, `c++`, `c`, `cake`, `cc`, `cl2`, `clj`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `cjsx`, `cson`, `coffee`, `cpp`, `cs`, `csharp`, `css`, `d`, `dart`, `dfm`, `di`, `delphi`, `diff`, `django`, `docker`, `dockerfile`, `dpr`, `erl`, `fortran`, `freepascal`, `fs`, `fsharp`, `gcode`, `gemspec`, `go`, `groovy`, `gyp`, `h++`, `h`, `handlebars`, `hbs`, `hic`, `hpp`, `html`, `html.handlebars`, `html.hbs`, `hs`, `hx`, `iced`, `irb`, `java`, `jinja`, `jl`, `js`, `json`, `jsp`, `jsx`, `kt`, `ktm`, `kts`, `latexcode`, `lazarus`, `less`, `lfm`, `lisp`, `lpr`, `lua`, `m`, `mak`, `matlab`, `md`, `mk`, `mkd`, `mkdown`, `ml`, `mm`, `nc`, `objc`, `obj-c`, `osascript`, `pas`, `pascal`, `perl`, `pgsql`, `php`, `php3`, `php4`, `php5`, `php6`, `pl`, `plist`, `podspec`, `postgres`, `postgresql`, `ps`, `ps1`, `pp`, `py`, `r`, `rb`, `rs`, `rss`, `ruby`, `scala`, `scm`, `scpt`, `scss`, `sh`, `sld`, `st`, `styl`, `sql`, `swift`, `tex`, `texcode`, `thor`, `ts`, `tsx`, `v`, `vb`, `vbnet`, `vbs`, `veo`, `xhtml`, `xml`, `xsl`, `yaml`, `zsh`.",
   "help.formatting.syntax.description": "Чтобы добавить подсветку синтаксиса, напишите язык после ``` в начале блока кода. Mattermost предлагает четыре темы оформления (GitHub, Solarized Dark, Solarized Light, Monokai), которые можно изменить в **Настройки учётной записи > Вид > Тема > Пользовательская тема > Стили ленты канала > Темы оформления**.",
   "help.formatting.syntax.title": "Подсветка синтаксиса",
-  "help.formatting.syntaxEx": "```goAA\npackage main\nimport \"fmt\"\nfunc main() {\n    fmt.Println(\"Привет, мир!\")\n}\n```",
+  "help.formatting.syntaxEx": "```goAA\npackage main\nimport \"fmt\"\nfunc main()\n{\n    fmt.Println(\"Привет, мир!\")\n}\n```",
   "help.formatting.tableExample": "| По левому краю  | По центру       | По правому краю |\n| :-------------- |:---------------:| ---------------:|\n| Строка 1        | этот текст      |            100₽ |\n| Строка 2        | выравнен        |             10₽ |\n| Строка 3        | по центру       |              1₽ |",
   "help.formatting.tables.description": "Создайте таблицу, разместив пунктирную линию ниже заголовка строки и разделите столбцы знаком `|`. (Не нужно разлиновывать, и так будет работать). Выравнивание колонок таблицы делается установкой знака \":\" в строке заголовка.",
   "help.formatting.tables.title": "Таблицы",
@@ -4087,11 +4087,11 @@
   "marketplace_modal.list.update_confirmation.message.warning_major_version": "Это обновление может содержать критические изменения.",
   "marketplace_modal.list.update_confirmation.message.warning_major_version_with_release_notes": "Это обновление может содержать критические изменения. Ознакомьтесь с [примечаниями к выпуску](!{releaseNotesUrl}) перед обновлением.",
   "marketplace_modal.list.update_confirmation.title": "Подтвердите обновление плагина",
-  "marketplace_modal.no_plugins": "На данный момент нет доступных плагинов.",
-  "marketplace_modal.no_plugins_installed": "У вас не установлены плагины.",
+  "marketplace_modal.no_plugins": "Плагины не найдены",
+  "marketplace_modal.no_plugins_installed": "У вас не установлены плагины",
   "marketplace_modal.search": "Поиск в Marketplace",
   "marketplace_modal.tabs.all_listing": "Все",
-  "marketplace_modal.tabs.installed_listing": "Установлено",
+  "marketplace_modal.tabs.installed_listing": "Установлено ({count})",
   "marketplace_modal.title": "Магазин плагинов",
   "members_popover.button.message": "сообщение",
   "menu.cloudFree.enterpriseTrialDescription": "Ваша пробная версия активна до {trialEndDay}. Откройте для себя наши лучшие Enterprise функции. <openModalLink>Узнать больше</openModalLink>",
@@ -4146,7 +4146,7 @@
   "more.details": "Подробнее",
   "more_channels.create": "Создать канал",
   "more_channels.next": "Далее",
-  "more_channels.noMore": "Нет результатов поиска для \"{text}\"",
+  "more_channels.noMore": "Доступных каналов не найдено",
   "more_channels.prev": "Предыдущая",
   "more_channels.show_archived_channels": "Показать: Архивированные каналы",
   "more_channels.show_public_channels": "Показать: Публичные каналы",
@@ -4272,7 +4272,7 @@
   "onboardingTask.checklist.main_subtitle": "Давайте вставать и работать.",
   "onboardingTask.checklist.start_enterprise_now": "Начните бесплатную пробную версию Enterprise прямо сейчас!",
   "onboardingTask.checklist.task_complete_your_profile": "Заполните свой профиль.",
-  "onboardingTask.checklist.task_create_from_work_template": "Создание на основе шаблона - установите канал с привязанными к нему досками и плейбуками.",
+  "onboardingTask.checklist.task_create_from_work_template": "Создание из шаблона",
   "onboardingTask.checklist.task_download_mm_apps": "Загрузите приложения для настольных компьютеров и мобильных устройств.",
   "onboardingTask.checklist.task_explore_other_tools_in_platform": "Изучите другие инструменты платформы.",
   "onboardingTask.checklist.task_invite_team_members": "Пригласите участников команды в рабочее пространство.",
@@ -4689,6 +4689,7 @@
   "self_hosted_signup.cta": "Обновить",
   "self_hosted_signup.disclaimer": "Я прочитал и согласен с условиями подписки на <a>Enterprise Edition.</a>",
   "self_hosted_signup.error_invalid_number": "Введите действительное количество рабочих мест",
+  "self_hosted_signup.error_min_seats": "В вашем рабочем пространстве в настоящее время {num} пользователей",
   "self_hosted_signup.failed_export.subtitle": "Мы проверим ситуацию на нашей стороне и свяжемся с вами в течение 3 дней, когда ваша лицензия будет одобрена. Тем временем, пожалуйста, продолжайте пользоваться бесплатной версией нашего продукта.",
   "self_hosted_signup.failed_export.title": "Ваша транзакция находится на рассмотрении",
   "self_hosted_signup.license_applied": "Ваша лицензия {planName} была применена. Функции {planName} теперь доступны и готовы к использованию.",
@@ -4701,7 +4702,6 @@
   "self_hosted_signup.purchase_in_progress.by_self_restart": "Если вы считаете, что это ошибка, перезапустите покупку.",
   "self_hosted_signup.purchase_in_progress.reset": "Перезапуск покупки",
   "self_hosted_signup.purchase_in_progress.title": "Покупка в процессе",
-  "self_hosted_signup.error_min_seats": "В вашем рабочем пространстве в настоящее время {num} пользователей",
   "self_hosted_signup.retry": "Попробовать снова",
   "self_hosted_signup.screening_description": "Мы проверим ситуацию на нашей стороне и свяжемся с вами в течение 3 дней, когда ваша лицензия будет одобрена. Тем временем, пожалуйста, продолжайте пользоваться бесплатной версией нашего продукта.",
   "self_hosted_signup.screening_title": "Ваша транзакция находится на рассмотрении",

From 420a0380a4172db556db6ed6729fd7978c0e3299 Mon Sep 17 00:00:00 2001
From: Kwangoh Moon <raymond.moon@gmail.com>
Date: Fri, 14 Apr 2023 10:59:13 +0200
Subject: [PATCH 085/103] Translated using Weblate (Korean)

Currently translated at 62.3% (3614 of 5794 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/ko/
---
 webapp/channels/src/i18n/ko.json | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/webapp/channels/src/i18n/ko.json b/webapp/channels/src/i18n/ko.json
index 362b962f18..bf98932ac1 100644
--- a/webapp/channels/src/i18n/ko.json
+++ b/webapp/channels/src/i18n/ko.json
@@ -5,10 +5,10 @@
   "about.database": "데이터베이스:",
   "about.date": "빌드 날짜:",
   "about.dbversion": "데이터베이스 스키마 버전:",
-  "about.enterpriseEditionLearn": "엔터프라이즈 에디션에 대한 자세한 정보 ",
+  "about.enterpriseEditionLearn": "다음에서 Enterprise Edition에 대해 더 알아보기 ",
   "about.enterpriseEditionSst": "엔터프라이즈에 적합한 신뢰도 높은 메시징",
   "about.enterpriseEditionSt": "보안 네트워크에 구축하는 현대적인 커뮤니케이션 플랫폼.",
-  "about.enterpriseEditione1": "엔터프라이즈 에디션",
+  "about.enterpriseEditione1": "Enterprise Edition",
   "about.hash": "빌드 해쉬:",
   "about.hashee": "EE 빌드 해쉬:",
   "about.licensed": "다음 사용자에게 허가되었습니다:",
@@ -254,6 +254,13 @@
   "admin.billing.company_info_edit.sameAsBillingAddress": "결제 주소와 동일",
   "admin.billing.company_info_edit.save": "정보 저장",
   "admin.billing.company_info_edit.title": "회사 정보 수정",
+  "admin.billing.deleteWorkspace.failureModal.buttonText": "다시 시도하세요",
+  "admin.billing.deleteWorkspace.failureModal.subtitle": "워크스페이스 삭제중에 문제가 발생했습니다. 다시 시도하거나 지원팀에 문의하세요.",
+  "admin.billing.deleteWorkspace.failureModal.title": "워크스페이스 삭제에 실패했습니다",
+  "admin.billing.deleteWorkspace.progressModal.title": "워크스페이스를 삭제합니다",
+  "admin.billing.deleteWorkspace.resultModal.ContactSupport": "지원팀에 문의",
+  "admin.billing.deleteWorkspace.successModal.subtitle": "워크스페이스가 삭제되었습니다. 고객이 되어 주셔서 감사했습니다.",
+  "admin.billing.deleteWorkspace.successModal.title": "워크스페이스가 삭제되었습니다",
   "admin.billing.history.allPaymentsShowHere": "모든 월별 결제 금액이 여기에 표시됩니다",
   "admin.billing.history.date": "날짜",
   "admin.billing.history.description": "설명",
@@ -288,16 +295,21 @@
   "admin.billing.purchaseModal.savedPaymentDetailsTitle": "저장된 결제 세부정보",
   "admin.billing.subscription.LearnMore": "더 보기",
   "admin.billing.subscription.billedFrom": "청구일: {beginDate}",
+  "admin.billing.subscription.byClickingYouAgree": "{buttonContent}을(를) 클릭하면 <linkAgreement>{legalText}</linkAgreement>에 동의하게 됩니다",
   "admin.billing.subscription.cancelSubscriptionSection.contactUs": "문의",
-  "admin.billing.subscription.cancelSubscriptionSection.description": "현재, 작업 공간 삭제는 고객 지원 담당자의 도움이 있어야만 가능합니다.",
+  "admin.billing.subscription.cancelSubscriptionSection.description": "현재, 워크스페이스 삭제는 고객 지원 담당자의 도움이 있어야만 가능합니다.",
   "admin.billing.subscription.cancelSubscriptionSection.title": "구독 취소",
   "admin.billing.subscription.cloudMonthlyBadge": "월간",
+  "admin.billing.subscription.cloudReverseTrial.daysLeftOnTrial": "평가 기간이 {daysLeftOnTrial}일 남았습니다. 워크스페이스를 유지하려면 플랜을 구매하거나 영업팀에 연락하세요.",
+  "admin.billing.subscription.cloudReverseTrial.lastDay": "평가기간 마지막 날입니다. {userEndTrialHour} 전에 플랜을 구매하거나 영업팀에 문의하세요",
+  "admin.billing.subscription.cloudReverseTrial.subscribeButton": "옵션을 검토하세요",
   "admin.billing.subscription.cloudTrial.daysLeftOnTrial": "무료 체험이 {daysLeftOnTrial} 일 남았습니다",
   "admin.billing.subscription.cloudTrial.lastDay": "무료 평가판의 마지막 날입니다. 귀하의 액세스는 {userEndTrialDate} {userEndTrialHour}에 만료됩니다.",
   "admin.billing.subscription.cloudTrial.moreThan3Days": "무료 체험이 시작되었습니다! 무료 체험 기간이 {daysLeftOnTrial}일 남았습니다",
   "admin.billing.subscription.cloudTrial.subscribeButton": "지금 구독하기",
   "admin.billing.subscription.cloudTrialBadge.daysLeftOnTrial": "평가판 사용 기간이 {daysLeftOnTrial}일 남았습니다",
   "admin.billing.subscription.cloudYearlyBadge": "연간",
+  "admin.billing.subscription.complianceScreenFailed.button": "Cloud Free로 계속합니다",
   "admin.billing.subscription.constCloudCard.contactSupport": "지원 담당자에게 연락",
   "admin.billing.subscription.creditCardExpired": "신용 카드가 만료되었습니다. 원할한 서비스 제공을 위해 결제 정보를 업데이트하세요.",
   "admin.billing.subscription.creditCardHasExpired": "신용 카드가 만료되었습니다",

From 5826ef26be8fb76b4b55846df43d7f41664e05bf Mon Sep 17 00:00:00 2001
From: dsa-t <dudesuchamazing@gmail.com>
Date: Fri, 14 Apr 2023 10:59:14 +0200
Subject: [PATCH 086/103] Translated using Weblate (Russian)

Currently translated at 98.7% (5724 of 5795 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/ru/

Translated using Weblate (Russian)

Currently translated at 98.8% (5726 of 5794 strings)

Translation: mattermost-languages-shipped/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/ru/
---
 webapp/channels/src/i18n/ru.json | 50 ++++++++++++++++----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/webapp/channels/src/i18n/ru.json b/webapp/channels/src/i18n/ru.json
index 4f73f0d4ec..ca412c7184 100644
--- a/webapp/channels/src/i18n/ru.json
+++ b/webapp/channels/src/i18n/ru.json
@@ -872,9 +872,9 @@
   "admin.experimental.clientSideCertCheck.title": "Метод авторизации на стороне клиента:",
   "admin.experimental.clientSideCertEnable.desc": "Включает сертификацию на стороне клиента для вашего сервера Mattermost. См. <link>Документация</link>, чтобы узнать больше.",
   "admin.experimental.clientSideCertEnable.title": "Включить сертификацию на стороне клиента:",
-  "admin.experimental.collapsedThreads.always_on": "Всегда включен",
-  "admin.experimental.collapsedThreads.default_off": "Включено (по умолчанию Выкл)",
-  "admin.experimental.collapsedThreads.default_on": "Включено (По умолчанию вкл.)",
+  "admin.experimental.collapsedThreads.always_on": "Всегда включено",
+  "admin.experimental.collapsedThreads.default_off": "Включено (по умолчанию Выкл.)",
+  "admin.experimental.collapsedThreads.default_on": "Включено (по умолчанию Вкл.)",
   "admin.experimental.collapsedThreads.desc": "Если этот параметр включен (по умолчанию выключен), пользователи могут включить функцию Свернутые Цепочки Обсуждений в Настройках аккаунта. Если этот параметр включен (включено по умолчанию), пользователи по умолчанию видят Свернутые Цепочки Обсуждений и могут отключить его в Настройках аккаунта. Когда он всегда включен, пользователи должны использовать Свернутые Цепочки Обсуждений и не могут его отключить.",
   "admin.experimental.collapsedThreads.off": "Выключено",
   "admin.experimental.collapsedThreads.title": "Свернутые цепочки ответов",
@@ -1422,10 +1422,10 @@
   "admin.nav.menuAriaLabel": "Меню консоли администратора",
   "admin.nav.switch": "Выбор команды",
   "admin.nav.troubleshootingForum": "Форум поддержки",
-  "admin.notices.enableAdminNoticesDescription": "Когда эта функция включена, системные администраторы будут получать уведомления о доступных обновлениях сервера и соответствующих функциях системного администрирования. <link>Узнайте больше об уведомлениях</link> в нашей документации.",
-  "admin.notices.enableAdminNoticesTitle": "Включить уведомления администратора: ",
-  "admin.notices.enableEndUserNoticesDescription": "Когда эта функция включена, все пользователи будут получать уведомления о доступных обновлениях клиентов и соответствующих функциях конечного пользователя для улучшения работы пользователей. <link>Узнайте больше об уведомлениях</link> в нашей документации.",
-  "admin.notices.enableEndUserNoticesTitle": "Включить уведомления конечных пользователей: ",
+  "admin.notices.enableAdminNoticesDescription": "Когда эта функция включена, системные администраторы будут получать объявления о доступных обновлениях сервера и соответствующих функциях системного администрирования. <link>Узнайте больше об объявлениях</link> в нашей документации.",
+  "admin.notices.enableAdminNoticesTitle": "Включить объявления для администраторов: ",
+  "admin.notices.enableEndUserNoticesDescription": "Когда эта функция включена, все пользователи будут получать объявления о доступных обновлениях клиентов и соответствующих функциях конечного пользователя для улучшения работы пользователей. <link>Узнайте больше об объявлениях</link> в нашей документации.",
+  "admin.notices.enableEndUserNoticesTitle": "Включить объявления для конечных пользователей: ",
   "admin.oauth.gitlab": "GitLab",
   "admin.oauth.google": "Google Apps",
   "admin.oauth.off": "Запретить вход через OAuth 2.0 поставщика",
@@ -1754,7 +1754,7 @@
   "admin.permissions.sysconsole_section_site_emoji.name": "Эмодзи",
   "admin.permissions.sysconsole_section_site_file_sharing_and_downloads.name": "Общий доступ к файлам и загрузка",
   "admin.permissions.sysconsole_section_site_localization.name": "Локализация",
-  "admin.permissions.sysconsole_section_site_notices.name": "Примечания",
+  "admin.permissions.sysconsole_section_site_notices.name": "Объявления",
   "admin.permissions.sysconsole_section_site_notifications.name": "Уведомления",
   "admin.permissions.sysconsole_section_site_posts.name": "Сообщения",
   "admin.permissions.sysconsole_section_site_public_links.name": "Публичные ссылки",
@@ -1935,7 +1935,7 @@
   "admin.reporting.workspace_optimization.access.title": "Доступ к рабочему пространству",
   "admin.reporting.workspace_optimization.chip_problems": "Проблемы: {count}",
   "admin.reporting.workspace_optimization.chip_suggestions": "Предложения: {count}",
-  "admin.reporting.workspace_optimization.chip_warnings": "Предупреждений: {count}",
+  "admin.reporting.workspace_optimization.chip_warnings": "Предупреждения: {count}",
   "admin.reporting.workspace_optimization.configuration.description": "У Вас имеются проблемы с конфигурацией, которые нужно решить",
   "admin.reporting.workspace_optimization.configuration.descriptionOk": "Кажется, у Вас хорошая конфигурация для SSL и длительности сеанса!",
   "admin.reporting.workspace_optimization.configuration.session_length.description": "Продолжительность Вашего сеанса по умолчанию составляет 30 дней. Более продолжительный сеанс обеспечивает удобство, а более короткий сеанс обеспечивает более строгую безопасность. Мы рекомендуем настроить это на основе политик безопасности Вашей организации.",
@@ -2244,7 +2244,7 @@
   "admin.sidebar.logs": "Журнал сервера",
   "admin.sidebar.metrics": "Мониторинг производительности",
   "admin.sidebar.mfa": "МФА",
-  "admin.sidebar.notices": "Уведомления",
+  "admin.sidebar.notices": "Объявления",
   "admin.sidebar.notifications": "Уведомления",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.openid": "OpenID Connect",
@@ -2281,7 +2281,7 @@
   "admin.site.emoji": "Смайлики",
   "admin.site.fileSharingDownloads": "Общий доступ к файлам и загрузка",
   "admin.site.localization": "Локализация",
-  "admin.site.notices": "Уведомления",
+  "admin.site.notices": "Объявления",
   "admin.site.posts": "Сообщения",
   "admin.site.public_links": "Публичные ссылки",
   "admin.site.usersAndTeams": "Пользователи и команды",
@@ -2919,7 +2919,7 @@
   "channel_members_rhs.action_bar.add_button": "Добавить",
   "channel_members_rhs.action_bar.done_button": "Готово",
   "channel_members_rhs.action_bar.manage_button": "Управление",
-  "channel_members_rhs.action_bar.managing_title": "Управляющие участники",
+  "channel_members_rhs.action_bar.managing_title": "Управление участниками",
   "channel_members_rhs.action_bar.members_count_title": "{members_count} участников",
   "channel_members_rhs.default_channel_moderation_restrictions": "В этом канале вы можете удалять только гостей. Только <link>администраторы канала</link> могут управлять другими участниками.",
   "channel_members_rhs.header.title": "Участники",
@@ -2960,17 +2960,17 @@
   "channel_notifications.levels.default": "По умолчанию",
   "channel_notifications.levels.mention": "Упоминание",
   "channel_notifications.levels.none": "Нет",
-  "channel_notifications.muteChannel.help": "Отключение уведомлений на рабочем столе, по электронной почте и через push-уведомления для этого канала. Канал не будет помечен как непрочитанный, если вы не упомянуты.",
+  "channel_notifications.muteChannel.help": "Отключение уведомлений на рабочем столе, по электронной почте и через push-уведомления для этого канала. Канал не будет помечен как непрочитанный, если вы не были упомянуты.",
   "channel_notifications.muteChannel.off.title": "Выкл",
   "channel_notifications.muteChannel.on.title": "Вкл",
-  "channel_notifications.muteChannel.on.title.collapse": "Приглушение включено. Рабочий стол, электронная почта и push-уведомления не будут отправляться по этому каналу.",
+  "channel_notifications.muteChannel.on.title.collapse": "Приглушение включено. Уведомления на раб. стол, по эл. почте и push не отправляются с этого канала.",
   "channel_notifications.muteChannel.settings": "Отключить уведомления",
   "channel_notifications.never": "Никогда",
   "channel_notifications.onlyMentions": "Только при упоминаниях",
   "channel_notifications.override": "При выборе настройки, отличной от \"По умолчанию\" перезапишутся глобальные настройки уведомлений. Уведомления на рабочий стол доступны в Firefox, Safari, и Chrome.",
   "channel_notifications.overridePush": "Выбор параметра, отличного от «По умолчанию», переопределит глобальные параметры уведомлений для мобильных push-уведомлений в настройках учетной записи. Push-уведомления должны быть включены системным администратором.",
   "channel_notifications.preferences": "Настройки уведомлений для ",
-  "channel_notifications.push": "Отправить мобильное push-уведомление",
+  "channel_notifications.push": "Отправлять мобильные push-уведомления",
   "channel_notifications.sendDesktop": "Отправлять уведомления на рабочий стол",
   "channel_select.placeholder": "--- Выбрать канал ---",
   "channel_switch_modal.deactivated": "Деактивирован",
@@ -3556,14 +3556,14 @@
   "get_public_link_modal.help": "Ссылка ниже позволяет видеть этот файл любому, не будучи зарегистрированным на этом сервере.",
   "get_public_link_modal.title": "Получить публичную ссылку",
   "gif_picker.gfycat": "Поиск Gfycat",
-  "globalThreads.heading": "Отслеживаемые треды",
+  "globalThreads.heading": "Отслеживаемые обсуждения",
   "globalThreads.noThreads.subtitle": "Здесь будут показаны все обсуждения, в которых вы упоминались или в которых вы участвовали, вместе с любыми обсуждениями, на которые вы подписаны.",
-  "globalThreads.noThreads.title": "Пока отслеживаемых тредов нет",
+  "globalThreads.noThreads.title": "Пока отслеживаемых обсуждений нет",
   "globalThreads.searchGuidance.subtitle": "Если вы ищете старые разговоры, попробуйте выполнить поиск с помощью {searchShortcut}",
   "globalThreads.searchGuidance.title": "Это конец списка",
-  "globalThreads.sidebarLink": "Треды",
-  "globalThreads.subtitle": "Треды, в которых вы участвуете, будут автоматически отображаться здесь",
-  "globalThreads.threadList.noUnreadThreads": "Нет непрочитанных тредов",
+  "globalThreads.sidebarLink": "Обсуждения",
+  "globalThreads.subtitle": "Обсуждения, в которых вы участвуете, будут автоматически отображаться здесь",
+  "globalThreads.threadList.noUnreadThreads": "Нет непрочитанных обсуждений",
   "globalThreads.threadPane.unreadMessageLink": "У вас {numUnread, plural, =0 {нет непрочитанных обсуждений} =1 {<link>{numUnread} обсуждение</link>} few {<link>{numUnread} обсуждения</link>} other {<link>{numUnread} обсуждений</link>}} {numUnread, plural, =0 {} other {с непрочитанными сообщениями}}",
   "globalThreads.threadPane.unselectedTitle": "{numUnread, plural, =0 {Похоже, вы все обсудили} other {Обсудите свои темы}}",
   "globalThreads.title": "{prefix}Обсуждения – {displayName} {siteName}",
@@ -4625,7 +4625,7 @@
   "rhs_header.closeTooltip.icon": "Значок закрытия боковой панели",
   "rhs_header.collapseSidebarTooltip": "Свернуть правую боковую панель",
   "rhs_header.collapseSidebarTooltip.icon": "значок сворачивания боковой панели",
-  "rhs_header.details": "Нить",
+  "rhs_header.details": "Обсуждение",
   "rhs_header.expandSidebarTooltip": "Раскрыть правую боковую панель",
   "rhs_header.expandSidebarTooltip.icon": "Значок раскрытия боковой панели",
   "rhs_root.mobile.add_reaction": "Добавить реакцию",
@@ -5065,11 +5065,11 @@
   "textbox.quote": ">цитата",
   "textbox.strike": "зачеркнутый",
   "threadFromArchivedChannelMessage": "Вы просматриваете обсуждение в **архивированном канале**. На этом канале нельзя опубликовать новые сообщения.",
-  "threading.filters.allThreads": "Все ваши треды",
+  "threading.filters.allThreads": "Все ваши обсуждения",
   "threading.filters.unreads": "Непрочитанное",
   "threading.following": "Отслеживается",
   "threading.footer.lastReplyAt": "Последний ответ {formatted}",
-  "threading.header.heading": "Тред",
+  "threading.header.heading": "Обсуждение",
   "threading.notFollowing": "Отслеживать",
   "threading.numNewMessages": "{newReplies, plural, =0 {Нет непрочитанных сообщений} =1 {Одно непрочитанное сообщение}=2{непрочитанных сообщения}=3{непрочитанных сообщения}=4{непрочитанных сообщения} other {# непрочитанных сообщений}}",
   "threading.numNewReplies": "{newReplies, plural, =1 {# новый ответ}=2 {# новых ответа}=3 {# новых ответа}=4 {# новых ответа} other {# новых ответов}}",
@@ -5078,14 +5078,14 @@
   "threading.threadItem.menu": "Действия",
   "threading.threadList.markRead": "Пометить всё как прочитанное",
   "threading.threadMenu.copy": "Скопировать ссылку",
-  "threading.threadMenu.follow": "Отслеживать тред",
+  "threading.threadMenu.follow": "Отслеживать обсуждение",
   "threading.threadMenu.followExtra": "Вы будете уведомлены об ответах",
   "threading.threadMenu.followMessage": "Подписаться на сообщение",
   "threading.threadMenu.markRead": "Отметить как прочитанное",
   "threading.threadMenu.markUnread": "Пометить как непрочитанное",
   "threading.threadMenu.openInChannel": "Открыт в канале",
   "threading.threadMenu.save": "Сохранить",
-  "threading.threadMenu.unfollow": "Прекратить отслеживание треда",
+  "threading.threadMenu.unfollow": "Не отслеживать обсуждение",
   "threading.threadMenu.unfollowExtra": "Вы не будете уведомлены об ответах",
   "threading.threadMenu.unfollowMessage": "Отписаться от сообщения",
   "threading.threadMenu.unsave": "Убрать из сохраненных",

From b42f5418de094fcf4f030670e7038323db3fd3b8 Mon Sep 17 00:00:00 2001
From: kaakaa <stooner.hoe@gmail.com>
Date: Fri, 14 Apr 2023 10:59:14 +0200
Subject: [PATCH 087/103] Translated using Weblate (Japanese)

Currently translated at 100.0% (454 of 454 strings)

Translation: mattermost-languages-shipped/mattermost-boards-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-boards-webapp-monorepo/ja/
---
 webapp/boards/i18n/ja.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/webapp/boards/i18n/ja.json b/webapp/boards/i18n/ja.json
index a4eae6f694..9d5b6fc20e 100644
--- a/webapp/boards/i18n/ja.json
+++ b/webapp/boards/i18n/ja.json
@@ -1,5 +1,7 @@
 {
-  "AppBar.Tooltip": "リンク先Boardの切替え",
+  "AdminBadge.SystemAdmin": "管理者",
+  "AdminBadge.TeamAdmin": "チーム管理者",
+  "AppBar.Tooltip": "リンク先Boardsの切替え",
   "Attachment.Attachment-title": "添付する",
   "AttachmentBlock.DeleteAction": "削除",
   "AttachmentBlock.addElement": "{type} を追加",
@@ -137,6 +139,7 @@
   "ContentBlock.moveDown": "下へ移動する",
   "ContentBlock.moveUp": "上へ移動する",
   "ContentBlock.text": "テキスト",
+  "DateFilter.empty": "空",
   "DateRange.clear": "クリア",
   "DateRange.empty": "空",
   "DateRange.endDate": "終了日",
@@ -155,10 +158,14 @@
   "Filter.ends-with": "で終わる",
   "Filter.includes": "を含む",
   "Filter.is": "と一致する",
+  "Filter.is-after": "が次の日付以降",
+  "Filter.is-before": "が次の日付以前",
   "Filter.is-empty": "が空である",
   "Filter.is-not-empty": "が空でない",
   "Filter.is-not-set": "が未設定",
   "Filter.is-set": "が設定済み",
+  "Filter.isafter": "が次の日付以降",
+  "Filter.isbefore": "が次の日付以前",
   "Filter.not-contains": "を含まない",
   "Filter.not-ends-with": "で終わらない",
   "Filter.not-includes": "を含まない",
@@ -305,6 +312,7 @@
   "ValueSelector.valueSelector": "値選択",
   "ValueSelectorLabel.openMenu": "メニューを開く",
   "VersionMessage.help": "このバージョンの新機能を確認する。",
+  "VersionMessage.learn-more": "詳しく",
   "View.AddView": "ビューを追加",
   "View.Board": "Board",
   "View.DeleteView": "ビューを削除",
@@ -359,6 +367,9 @@
   "WelcomePage.StartUsingIt.Text": "利用を開始する",
   "Workspace.editing-board-template": "Boardのテンプレートを編集しています。",
   "badge.guest": "ゲスト",
+  "boardPage.confirm-join-button": "参加",
+  "boardPage.confirm-join-text": "あなたは、ボード管理者によって明示的に追加されることなく、非公開のボードに参加しようとしています。本当にこの非公開ボードに参加しますか?",
+  "boardPage.confirm-join-title": "非公開ボードに参加",
   "boardSelector.confirm-link-board": "Boardをチャンネルへリンク",
   "boardSelector.confirm-link-board-button": "はい、Boardをリンクします",
   "boardSelector.confirm-link-board-subtext": "\"{boardName}\" をチャンネルにリンクすると、チャンネルの(既存/新規)メンバー全員がBoardを編集できるようになります。ただし、ゲストユーザーは除外されます。Boardとチャンネルのリンク解除はいつでも可能です。",

From 941ee8509aadf789dc28ed495cadeebf3cd340d1 Mon Sep 17 00:00:00 2001
From: codyhall <codyallen908@gmail.com>
Date: Mon, 17 Apr 2023 10:04:30 -0600
Subject: [PATCH 088/103] POST playbook api specification includes public
 boolean definition (#22986)

Automatic Merge
---
 server/playbooks/server/api/api.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/playbooks/server/api/api.yaml b/server/playbooks/server/api/api.yaml
index 69e74a44c7..538c03ca79 100644
--- a/server/playbooks/server/api/api.yaml
+++ b/server/playbooks/server/api/api.yaml
@@ -1405,6 +1405,10 @@ paths:
                   type: boolean
                   description: A boolean indicating whether the playbook runs created from this playbook should be public or private.
                   example: true
+                public:
+                  type: boolean
+                  description: A boolean indicating whether the playbook is licensed as public or private. Required 'true' for free tier.
+                  example: true
                 checklists:
                   type: array
                   description: The stages defined by this playbook.

From 5b42689529e156d5c70c3be51d14a3ef26759dbb Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Mon, 17 Apr 2023 14:24:58 -0400
Subject: [PATCH 089/103] Address code review comments (styling, clean-up css,
 re-org imports, math errors, etc).

---
 .../src/components/outlined_input/index.tsx   | 26 ++++++++
 .../error_page.tsx                            |  2 +-
 .../expansion_card.scss                       | 10 ---
 .../expansion_card.tsx                        | 63 +++++++++----------
 .../self_hosted_expansion_modal/index.tsx     | 62 +++++++++---------
 .../self_hosted_expansion_modal.scss          |  3 -
 .../submitting.tsx                            |  3 +-
 .../success_page.scss                         |  1 -
 .../success_page.tsx                          |  8 +--
 webapp/channels/src/i18n/en.json              |  1 -
 10 files changed, 90 insertions(+), 89 deletions(-)
 create mode 100644 webapp/channels/src/components/outlined_input/index.tsx

diff --git a/webapp/channels/src/components/outlined_input/index.tsx b/webapp/channels/src/components/outlined_input/index.tsx
new file mode 100644
index 0000000000..5644bf958c
--- /dev/null
+++ b/webapp/channels/src/components/outlined_input/index.tsx
@@ -0,0 +1,26 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {OutlinedInput as MUIOutlineInput, OutlinedInputProps} from '@mui/material';
+
+/**
+ * A horizontal separator for use in menus.
+ * @example
+ * <OutlineInput
+ *   data-testid='my-input'
+ *   size='small|medium
+ *   value=10
+ *   onChange={myChangeHandler}
+ *   error=true
+ *   disabled=false
+ * />
+ */
+
+export function OutlinedInput(props: OutlinedInputProps) {
+    return (
+        <MUIOutlineInput
+            {...props}
+        />
+    );
+}
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/error_page.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/error_page.tsx
index 2b1d0e93d9..e0ca48f22a 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/error_page.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/error_page.tsx
@@ -4,8 +4,8 @@
 import React from 'react';
 
 import {FormattedMessage} from 'react-intl';
-import {useOpenSelfHostedZendeskSupportForm} from 'components/common/hooks/useOpenZendeskForm';
 
+import {useOpenSelfHostedZendeskSupportForm} from 'components/common/hooks/useOpenZendeskForm';
 import PaymentFailedSvg from 'components/common/svg_images_components/payment_failed_svg';
 import IconMessage from 'components/purchase_modal/icon_message';
 
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.scss b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.scss
index f9d7ca4d36..089f296671 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.scss
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.scss
@@ -14,7 +14,6 @@
         display: block;
         margin-bottom: 12px;
         color: rgba(var(--sys-denim-center-channel-text-rgb), 0.72);
-        font-family: 'Open Sans';
         font-size: 14px;
         font-weight: 600;
         text-align: center;
@@ -24,7 +23,6 @@
     .seatsInput {
         width: 73px;
         margin-left: auto;
-        font-family: 'Open Sans';
         font-size: 14px;
         font-weight: 400;
 
@@ -46,7 +44,6 @@
 
         .planName {
             color: rgba(var(--sys-denim-center-channel-text-rgb), 0.72);
-            font-family: 'Metropolis';
             font-size: 20px;
             font-weight: 400;
             text-transform: capitalize;
@@ -54,7 +51,6 @@
 
         .usage {
             color: rgba(var(--sys-denim-center-channel-text-rgb), 0.56);
-            font-family: 'Open Sans';
             font-size: 12px;
             font-weight: 600;
 
@@ -78,13 +74,11 @@
         grid-template-columns: repeat(2, 1fr);
 
         .costPerUser > span:first-child {
-            font-family: 'Open Sans';
             font-size: 14px;
         }
 
         .costPerUser > span:last-child {
             color: rgba(var(--sys-denim-center-channel-text-rgb), 0.72);
-            font-family: 'Open Sans';
             font-size: 12px;
         }
 
@@ -94,14 +88,12 @@
 
         .totalCostWarning > span:first-child {
             color: var(--sys-denim-center-channel-text);
-            font-family: 'Open Sans';
             font-size: 14px;
             font-weight: 700;
         }
 
         .totalCostWarning > span:last-child {
             color: rgba(var(--sys-denim-center-channel-text-rgb), 0.72);
-            font-family: 'Open Sans';
             font-size: 12px;
         }
 
@@ -119,7 +111,6 @@
         height: 35px;
         margin-bottom: 15px;
         color: var(--dnd-indicator);
-        font-family: 'Open Sans';
         font-size: 12px;
         font-weight: 600;
         text-align: right;
@@ -134,7 +125,6 @@
 
     &__ChargedTodayDisclaimer {
         color: rgba(var(--sys-denim-center-channel-text-rgb), 0.72);
-        font-family: 'Open Sans';
         font-size: 12px;
         font-weight: 400;
     }
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
index 3cf1243e17..aa9a5edfb8 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
@@ -1,21 +1,22 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {OutlinedInput} from '@mui/material';
-
-import moment from 'moment-timezone';
-import React, {Fragment, useState} from 'react';
-import {FormattedMessage} from 'react-intl';
+import React, {useState} from 'react';
+import {FormattedMessage, useIntl} from 'react-intl';
 import {useSelector} from 'react-redux';
+import moment from 'moment-timezone';
 
 import {getLicense} from 'mattermost-redux/selectors/entities/general';
-import {DocLinks} from 'utils/constants';
+
 import WarningIcon from 'components/widgets/icons/fa_warning_icon';
+import useGetSelfHostedProducts from 'components/common/hooks/useGetSelfHostedProducts';
+import ExternalLink from 'components/external_link';
+import {OutlinedInput} from 'components/outlined_input';
+
+import {DocLinks} from 'utils/constants';
+import {findSelfHostedProductBySku} from 'utils/hosted_customer';
 
 import './expansion_card.scss';
-import useGetSelfHostedProducts from 'components/common/hooks/useGetSelfHostedProducts';
-import {findSelfHostedProductBySku} from 'utils/hosted_customer';
-import ExternalLink from 'components/external_link';
 
 const MONTHS_IN_YEAR = 12;
 const MAX_TRANSACTION_VALUE = 1_000_000 - 1;
@@ -29,6 +30,7 @@ interface Props {
 }
 
 export default function SelfHostedExpansionCard(props: Props) {
+    const intl = useIntl();
     const license = useSelector(getLicense);
     const startsAt = moment(parseInt(license.StartsAt, 10)).format('MMM. D, YYYY');
     const endsAt = moment(parseInt(license.ExpiresAt, 10)).format('MMM. D, YYYY');
@@ -46,14 +48,11 @@ export default function SelfHostedExpansionCard(props: Props) {
     };
 
     const getCostPerUser = () => {
-        if (isNaN(additionalSeats)) {
-            return 0;
-        }
         const monthsUntilExpiry = getMonthsUntilExpiry();
         return costPerMonth * monthsUntilExpiry;
     };
 
-    const getTotal = () => {
+    const getPaymentTotal = () => {
         if (isNaN(additionalSeats)) {
             return 0;
         }
@@ -63,25 +62,29 @@ export default function SelfHostedExpansionCard(props: Props) {
 
     // Finds the maximum number of additional seats that is possible, taking into account
     // the stripe transaction limit. The maximum number of seats will follow the formula:
-    // (StripeTransaction Limit - (Current_Seats * Price Per Seat)) / price_per_seat
+    // (StripeTransaction Limit - (current_seats * yearly_price_per_seat)) / yearly_price_per_seat
     const getMaximumAdditionalSeats = () => {
         if (currentProduct === null) {
             return 0;
         }
 
-        const currentPaymentPrice = costPerMonth * props.licensedSeats;
+        const currentPaymentPrice = costPerMonth * props.licensedSeats * 12;
         const remainingTransactionLimit = MAX_TRANSACTION_VALUE - currentPaymentPrice;
-        const remainingSeats = Math.floor(remainingTransactionLimit / costPerMonth);
+        const remainingSeats = Math.floor(remainingTransactionLimit / (costPerMonth * 12));
         return Math.max(0, remainingSeats);
     };
-
     const maxAdditionalSeats = getMaximumAdditionalSeats();
 
     const handleNewSeatsInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        setOverMaxSeats(false);
-
         const requestedSeats = parseInt(e.target.value, 10);
 
+        if (requestedSeats <= 0) {
+            e.preventDefault();
+            return;
+        }
+
+        setOverMaxSeats(false);
+
         const overMaxAdditionalSeats = requestedSeats > maxAdditionalSeats;
         setOverMaxSeats(overMaxAdditionalSeats);
 
@@ -91,6 +94,10 @@ export default function SelfHostedExpansionCard(props: Props) {
         props.updateSeats(finalSeatCount);
     };
 
+    const formatCurrency = (value: number) => {
+        return intl.formatNumber(value, {style: 'currency', currency: 'USD'});
+    };
+
     return (
         <div className='SelfHostedExpansionRHSCard'>
             <div className='SelfHostedExpansionRHSCard__RHSCardTitle'>
@@ -158,16 +165,6 @@ export default function SelfHostedExpansionCard(props: Props) {
                             }}
                         />
                     }
-                    {maxAdditionalSeats === 0 &&
-                        <FormattedMessage
-                            id='self_hosted_expansion_rhs_card_additional_seats_limit_warning'
-                            defaultMessage='{warningIcon} Transaction amount limit reached.{break}Please contact sales'
-                            values={{
-                                break: <br/>,
-                                warningIcon: <WarningIcon additionalClassName={'SelfHostedExpansionRHSCard__warning'}/>,
-                            }}
-                        />
-                    }
                 </div>
                 <div className='SelfHostedExpansionRHSCard__cost_breakdown'>
                     <div className='costPerUser'>
@@ -179,15 +176,15 @@ export default function SelfHostedExpansionCard(props: Props) {
                         <FormattedMessage
                             id='self_hosted_expansion_rhs_card_cost_per_user_breakdown'
                             /* eslint-disable no-template-curly-in-string*/
-                            defaultMessage='${costPerUser} x {monthsUntilExpiry} months'
+                            defaultMessage='{costPerUser} x {monthsUntilExpiry} months'
                             values={{
-                                costPerUser: costPerMonth.toFixed(2),
+                                costPerUser: formatCurrency(costPerMonth),
                                 monthsUntilExpiry: getMonthsUntilExpiry(),
                             }}
                         />
                     </div>
                     <div className='costAmount'>
-                        <span>{'$' + getCostPerUser().toFixed(2)}</span>
+                        <span>{formatCurrency(getCostPerUser())}</span>
                     </div>
                     <div className='totalCostWarning'>
                         <FormattedMessage
@@ -201,7 +198,7 @@ export default function SelfHostedExpansionCard(props: Props) {
                         />
                     </div>
                     <span className='totalCostAmount'>
-                        <span>{'$' + getTotal().toFixed(2)}</span>
+                        <span>{formatCurrency(getPaymentTotal()) }</span>
                     </span>
                 </div>
                 <button
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
index 88efd97956..20b87d862e 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
@@ -2,55 +2,51 @@
 // See LICENSE.txt for license information.
 
 import React, {useEffect, useRef, useState} from 'react';
-
 import {FormattedMessage, useIntl} from 'react-intl';
-
 import {useDispatch, useSelector} from 'react-redux';
+import classNames from 'classnames';
 
 import {StripeCardElementChangeEvent} from '@stripe/stripe-js';
 
+import {getLicenseConfig} from 'mattermost-redux/actions/general';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getLicense} from 'mattermost-redux/selectors/entities/general';
+import {getCurrentUser, getFilteredUsersStats} from 'mattermost-redux/selectors/entities/users';
+import {getSelfHostedSignupProgress} from 'mattermost-redux/selectors/entities/hosted_customer';
+import {DispatchFunc} from 'mattermost-redux/types/actions';
+import {HostedCustomerTypes} from 'mattermost-redux/action_types';
+import {Client4} from 'mattermost-redux/client';
+import {isDevModeEnabled} from 'selectors/general';
+
+import {closeModal} from 'actions/views/modals';
+import {pageVisited} from 'actions/telemetry_actions';
+import {confirmSelfHostedExpansion} from 'actions/hosted_customer';
+
+import {ValueOf} from '@mattermost/types/utilities';
+import {SelfHostedSignupCustomerResponse, SelfHostedSignupProgress} from '@mattermost/types/hosted_customer';
+
 import UpgradeSvg from 'components/common/svg_images_components/upgrade_svg';
 import RootPortal from 'components/root_portal';
 import ContactSalesLink from 'components/self_hosted_purchases/contact_sales_link';
 import ErrorPage from 'components/self_hosted_purchases/self_hosted_expansion_modal/error_page';
 import SuccessPage from 'components/self_hosted_purchases/self_hosted_expansion_modal/success_page';
-import Submitting from './submitting';
-
 import useLoadStripe from 'components/common/hooks/useLoadStripe';
 import CardInput, {CardInputType} from 'components/payment_form/card_input';
 import FullScreenModal from 'components/widgets/modals/full_screen_modal';
 import Input from 'components/widgets/inputs/input/input';
-
 import BackgroundSvg from 'components/common/svg_images_components/background_svg';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
-import StripeProvider from '../stripe_provider';
-
-import {closeModal} from 'actions/views/modals';
-import {ModalIdentifiers, TELEMETRY_CATEGORIES} from 'utils/constants';
-import {getLicense} from 'mattermost-redux/selectors/entities/general';
-import {getCurrentUser, getFilteredUsersStats} from 'mattermost-redux/selectors/entities/users';
-import {pageVisited} from 'actions/telemetry_actions';
-
-import {Client4} from 'mattermost-redux/client';
-import {HostedCustomerTypes} from 'mattermost-redux/action_types';
-import {getSelfHostedSignupProgress} from 'mattermost-redux/selectors/entities/hosted_customer';
-import {inferNames} from 'utils/hosted_customer';
-import {SelfHostedSignupCustomerResponse, SelfHostedSignupProgress} from '@mattermost/types/hosted_customer';
-import {isDevModeEnabled} from 'selectors/general';
-import {getLicenseConfig} from 'mattermost-redux/actions/general';
-import {confirmSelfHostedExpansion} from 'actions/hosted_customer';
-import {DispatchFunc} from 'mattermost-redux/types/actions';
-import {ValueOf} from '@mattermost/types/utilities';
-
-import SelfHostedExpansionCard from './expansion_card';
-
-import './self_hosted_expansion_modal.scss';
-
-import {STORAGE_KEY_EXPANSION_IN_PROGRESS} from '../constants';
+import Terms from 'components/self_hosted_purchases/self_hosted_purchase_modal/terms';
 import Address from 'components/self_hosted_purchases/address';
 import ChooseDifferentShipping from 'components/choose_different_shipping';
-import Terms from 'components/self_hosted_purchases/self_hosted_purchase_modal/terms';
-import classNames from 'classnames';
+
+import {ModalIdentifiers, TELEMETRY_CATEGORIES} from 'utils/constants';
+import {inferNames} from 'utils/hosted_customer';
+
+import Submitting from './submitting';
+import StripeProvider from '../stripe_provider';
+import {STORAGE_KEY_EXPANSION_IN_PROGRESS} from '../constants';
+import SelfHostedExpansionCard from './expansion_card';
+import './self_hosted_expansion_modal.scss';
 
 export interface FormState {
     cardName: string;
@@ -358,7 +354,7 @@ export default function SelfHostedExpansionModal() {
                             <div className='center'>
                                 <div
                                     className='form'
-                                    data-testid='shpm-form'
+                                    data-testid='expansion-modal'
                                 >
                                     <span className='section-title'>
                                         {intl.formatMessage({
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/self_hosted_expansion_modal.scss b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/self_hosted_expansion_modal.scss
index e0c4ccd007..5a98adfbbf 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/self_hosted_expansion_modal.scss
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/self_hosted_expansion_modal.scss
@@ -38,14 +38,12 @@
                 margin-right: 16px;
 
                 .DropdownInput {
-                    z-index: 99999;
                     margin-top: 0;
                 }
             }
 
             .DropdownInput {
                 position: relative;
-                z-index: 999999;
                 height: 36px;
                 margin-bottom: 24px;
 
@@ -73,7 +71,6 @@
                 background: var(--center-channel-bg);
 
                 .Input {
-                    height: 32px;
                     background: inherit;
                 }
 
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/submitting.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/submitting.tsx
index f734d5b82a..9dc1ce0620 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/submitting.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/submitting.tsx
@@ -2,12 +2,11 @@
 // See LICENSE.txt for license information.
 
 import React, {useEffect, useState} from 'react';
-
 import {FormattedMessage, useIntl} from 'react-intl';
-
 import {useSelector} from 'react-redux';
 
 import {getSelfHostedSignupProgress} from 'mattermost-redux/selectors/entities/hosted_customer';
+
 import {SelfHostedSignupProgress} from '@mattermost/types/hosted_customer';
 import {ValueOf} from '@mattermost/types/utilities';
 
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/success_page.scss b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/success_page.scss
index 7b4bab61f8..8986942706 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/success_page.scss
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/success_page.scss
@@ -10,7 +10,6 @@
     justify-content: center;
     padding: 77px 107px;
     color: var(--center-channel-color);
-    font-family: "Open Sans";
     font-size: 16px;
     font-weight: 600;
 }
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/success_page.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/success_page.tsx
index b87592dd74..9549ef2e24 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/success_page.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/success_page.tsx
@@ -3,14 +3,14 @@
 
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
-
 import {useHistory} from 'react-router-dom';
 
 import IconMessage from 'components/purchase_modal/icon_message';
 import PaymentSuccessStandardSvg from 'components/common/svg_images_components/payment_success_standard_svg';
-import {ConsolePages} from 'utils/constants';
 import BackgroundSvg from 'components/common/svg_images_components/background_svg';
 
+import {ConsolePages} from 'utils/constants';
+
 import './success_page.scss';
 
 interface Props {
@@ -69,9 +69,7 @@ export default function SelfHostedExpansionSuccessPage(props: Props) {
                 testId='selfHostedExpansionSuccess'
                 icon={icon}
                 formattedButtonText={formattedButtonText}
-                buttonHandler={() => {
-                    props.onClose();
-                }}
+                buttonHandler={props.onClose}
             />
             <div className='background-svg'>
                 <BackgroundSvg/>
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 230a776e60..fbef34e69d 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -4712,7 +4712,6 @@
   "select_team.join.icon": "Join Team Icon",
   "select_team.private.icon": "Private Team",
   "self_hosted_expansion_rhs_card_add_new_seats": "Add new seats",
-  "self_hosted_expansion_rhs_card_additional_seats_limit_warning": "{warningIcon} Transaction amount limit reached.{break}Please contact sales",
   "self_hosted_expansion_rhs_card_cost_per_user_breakdown": "{costPerUser} x {monthsUntilExpiry} months",
   "self_hosted_expansion_rhs_card_cost_per_user_title": "Cost per user",
   "self_hosted_expansion_rhs_card_license_date": "{startsAt} - {endsAt}",

From fa01ced588da2d9cdb550e73b5a16a623eed1b32 Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Mon, 17 Apr 2023 15:00:14 -0400
Subject: [PATCH 090/103] require a minimum number of seats to be purchased to
 continue.

---
 .../expansion_card.tsx                        | 25 +++++++++++++------
 .../self_hosted_expansion_modal/index.tsx     |  9 ++++---
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
index aa9a5edfb8..3bd91c348d 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
@@ -24,7 +24,7 @@ const MAX_TRANSACTION_VALUE = 1_000_000 - 1;
 interface Props {
     canSubmit: boolean;
     licensedSeats: number;
-    initialSeats: number;
+    minimumSeats: number;
     submit: () => void;
     updateSeats: (seats: number) => void;
 }
@@ -34,10 +34,10 @@ export default function SelfHostedExpansionCard(props: Props) {
     const license = useSelector(getLicense);
     const startsAt = moment(parseInt(license.StartsAt, 10)).format('MMM. D, YYYY');
     const endsAt = moment(parseInt(license.ExpiresAt, 10)).format('MMM. D, YYYY');
-    const [additionalSeats, setAdditionalSeats] = useState(props.initialSeats);
+    const [additionalSeats, setAdditionalSeats] = useState(props.minimumSeats);
     const [overMaxSeats, setOverMaxSeats] = useState(false);
     const licenseExpiry = new Date(parseInt(license.ExpiresAt, 10));
-    const invalidAdditionalSeats = additionalSeats === 0 || isNaN(additionalSeats);
+    const invalidAdditionalSeats = additionalSeats === 0 || isNaN(additionalSeats) || additionalSeats < props.minimumSeats;
     const [products] = useGetSelfHostedProducts();
     const currentProduct = findSelfHostedProductBySku(products, license.SkuShortName);
     const costPerMonth = currentProduct?.price_per_seat || 0;
@@ -76,9 +76,9 @@ export default function SelfHostedExpansionCard(props: Props) {
     const maxAdditionalSeats = getMaximumAdditionalSeats();
 
     const handleNewSeatsInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        const requestedSeats = parseInt(e.target.value, 10);
+        let requestedSeats = parseInt(e.target.value, 10);
 
-        if (requestedSeats <= 0) {
+        if (!isNaN(requestedSeats) && requestedSeats <= 0) {
             e.preventDefault();
             return;
         }
@@ -141,12 +141,11 @@ export default function SelfHostedExpansionCard(props: Props) {
                         type='number'
                         value={additionalSeats}
                         onChange={handleNewSeatsInputChange}
-                        error={invalidAdditionalSeats}
                         disabled={maxAdditionalSeats === 0}
                     />
                 </div>
                 <div className='SelfHostedExpansionRHSCard__AddSeatsWarning'>
-                    {invalidAdditionalSeats && !overMaxSeats &&
+                    {invalidAdditionalSeats && !overMaxSeats && isNaN(additionalSeats) &&
                         <FormattedMessage
                             id='self_hosted_expansion_rhs_card_must_add_seats_warning'
                             defaultMessage='{warningIcon} You must add a seat to continue'
@@ -155,6 +154,16 @@ export default function SelfHostedExpansionCard(props: Props) {
                             }}
                         />
                     }
+                    {invalidAdditionalSeats && additionalSeats < props.minimumSeats &&
+                        <FormattedMessage
+                            id='self_hosted_expansion_rhs_card_must_purchase_enough_seats'
+                            defaultMessage='{warningIcon} You must purchase at least {minimumSeats} seats to be compliant with your license'
+                            values={{
+                                warningIcon: <WarningIcon additionalClassName={'SelfHostedExpansionRHSCard__warning'}/>,
+                                minimumSeats: props.minimumSeats
+                            }}
+                        />
+                    }
                     {overMaxSeats && maxAdditionalSeats > 0 &&
                         <FormattedMessage
                             id='self_hosted_expansion_rhs_card_maximum_seats_warning'
@@ -203,7 +212,7 @@ export default function SelfHostedExpansionCard(props: Props) {
                 </div>
                 <button
                     className='btn btn-primary SelfHostedExpansionRHSCard__CompletePurchaseButton'
-                    disabled={!props.canSubmit || maxAdditionalSeats === 0}
+                    disabled={!props.canSubmit || maxAdditionalSeats === 0 || invalidAdditionalSeats}
                     onClick={props.submit}
                 >
                     <FormattedMessage
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
index 20b87d862e..48b1e276f8 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
@@ -175,12 +175,13 @@ export default function SelfHostedExpansionModal() {
     const licensedSeats = parseInt(license.Users, 10);
     const currentPlan = license.SkuName;
     const activeUsers = useSelector(getFilteredUsersStats)?.total_users_count || 0;
-    const [additionalSeats, setAdditionalSeats] = useState(activeUsers <= licensedSeats ? 1 : activeUsers - licensedSeats);
+    const [minimumSeats] = useState(activeUsers <= licensedSeats ? 1 : activeUsers - licensedSeats);
+    const [requestedSeats, setRequestedSeats] = useState(minimumSeats)
 
     const [stripeLoadHint, setStripeLoadHint] = useState(Math.random());
     const stripeRef = useLoadStripe(stripeLoadHint);
 
-    const initialState = makeInitialState(additionalSeats);
+    const initialState = makeInitialState(requestedSeats);
     const [formState, setFormState] = useState<FormState>(initialState);
     const [show] = useState(true);
     const canRetry = formState.error !== '422';
@@ -492,12 +493,12 @@ export default function SelfHostedExpansionModal() {
                                 <SelfHostedExpansionCard
                                     updateSeats={(seats: number) => {
                                         setFormState({...formState, seats});
-                                        setAdditionalSeats(seats);
+                                        setRequestedSeats(seats);
                                     }}
                                     canSubmit={canSubmitForm}
                                     submit={submit}
                                     licensedSeats={licensedSeats}
-                                    initialSeats={additionalSeats}
+                                    minimumSeats={minimumSeats}
                                 />
                             </div>
                         </div>

From aa7939264fccaf044fb4085ea66f9b69a87cf82b Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Mon, 17 Apr 2023 15:09:54 -0400
Subject: [PATCH 091/103] Check if telemetry is disable, and only submit the
 true up profile if it is disabled.

---
 server/channels/api4/license.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go
index a1b7806dbf..ff63704774 100644
--- a/server/channels/api4/license.go
+++ b/server/channels/api4/license.go
@@ -351,12 +351,15 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// True-up is only enabled when telemetry is disabled. When telemetry is enabled, we already have all the data necessary
-	// for true-up reviews to be completed.
-	err = c.App.Cloud().SubmitTrueUpReview(c.AppContext.Session().UserId, profileMap)
-	if err != nil {
-		c.Err = model.NewAppError("requestTrueUpReview", "api.license.true_up_review.failed_to_submit", nil, err.Error(), http.StatusInternalServerError)
-		return
+	// True-up is only enabled when telemetry is disabled.
+	// When telemetry is enabled, we already have all the data necessary for true-up reviews to be completed.
+	telemetryEnabled := c.App.Config().LogSettings.EnableDiagnostics
+	if telemetryEnabled != nil && !*telemetryEnabled {
+		err = c.App.Cloud().SubmitTrueUpReview(c.AppContext.Session().UserId, profileMap)
+		if err != nil {
+			c.Err = model.NewAppError("requestTrueUpReview", "api.license.true_up_review.failed_to_submit", nil, err.Error(), http.StatusInternalServerError)
+			return
+		}
 	}
 
 	// Update the review status to reflect the completion.

From 3f022e728facd52b3220cd5538269a4317da028b Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 17 Apr 2023 15:10:15 -0400
Subject: [PATCH 092/103] MM-49393 Begin splitting up utils.tsx (#22983)

* Add selectors/urls to Channels

* Create utils/notification_sounds in Channels

* Move Utils.isLinux to UserAgent.isLinux

* Remove Utils.isMac in favour of UserAgent.isMac

* Move cmdOrCtrlPressed and isKeyPressed into new utils/keyboard

* Remove eslint-disable for max-lines in utils.tsx
---
 .../src/actions/notification_actions.jsx      |   8 +-
 .../src/actions/notification_actions.test.js  |   8 +-
 .../advanced_create_comment.tsx               |  41 ++---
 .../advanced_create_post.tsx                  |  54 +++----
 .../src/components/at_mention/at_mention.tsx  |   3 +-
 .../at_mention/at_mention_group.tsx           |   3 +-
 .../channel_members_rhs/action_bar.tsx        |   2 +-
 .../custom_status/custom_status_modal.tsx     |   3 +-
 .../custom_status/date_time_input.tsx         |   3 +-
 .../dnd_custom_time_picker_modal.tsx          |   3 +-
 .../src/components/dot_menu/dot_menu.tsx      |  21 +--
 .../components/drafts/channel_draft/index.ts  |   2 +-
 .../edit_channel_header_modal.tsx             |   3 +-
 .../edit_channel_purpose_modal.tsx            |   5 +-
 .../src/components/edit_post/edit_post.tsx    |  15 +-
 .../components/edit_post/edit_post_footer.tsx |   2 +-
 .../file_preview_modal/file_preview_modal.tsx |   5 +-
 .../components/file_upload/file_upload.tsx    |   3 +-
 .../forward_post_comment_input.tsx            |  19 +--
 .../forward_post_modal/forward_post_modal.tsx |   5 +-
 .../global_search_nav/global_search_nav.tsx   |   6 +-
 .../keyboard_shortcuts_modal.tsx              |   4 +-
 .../keyboard_shortcuts_sequence.tsx           |   2 +-
 .../leave_team_modal/leave_team_modal.tsx     |   3 +-
 .../src/components/logged_in/index.ts         |   3 +-
 .../src/components/main_menu/main_menu.tsx    |   2 +-
 webapp/channels/src/components/menu/menu.tsx  |   2 +-
 .../src/components/menu/menu_item.tsx         |   2 +-
 .../channels/src/components/menu/sub_menu.tsx |   2 +-
 .../channels/src/components/mfa/confirm.tsx   |   2 +-
 .../multiselect/multiselect_list.tsx          |   2 +-
 .../new_replies_banner/new_replies_banner.tsx |   2 +-
 ...post_reminder_custom_time_picker_modal.tsx |   3 +-
 .../profile_popover/profile_popover.tsx       |   3 +-
 .../channels/src/components/search/search.tsx |   4 +-
 .../src/components/search_bar/search_bar.tsx  |  12 +-
 .../messages_or_files_selector.tsx            |   6 +-
 .../search_shortcut/search_shortcut.test.tsx  |  26 +---
 .../search_shortcut/search_shortcut.tsx       |   3 +-
 .../src/components/setting_item_max.tsx       |   3 +-
 .../settings_sidebar/settings_sidebar.tsx     |   3 +-
 .../sidebar/channel_filter/channel_filter.tsx |   4 +-
 .../channel_navigator/channel_navigator.tsx   |  12 +-
 .../src/components/sidebar/sidebar.tsx        |   9 +-
 .../sidebar_category/sidebar_category.tsx     |   2 +-
 .../sidebar_channel_link.tsx                  |   3 +-
 .../sidebar/sidebar_list/sidebar_list.tsx     |  11 +-
 .../sidebar_right/sidebar_right.tsx           |   3 +-
 .../app_command_parser_dependencies.ts        |   6 +-
 .../command_provider/command_provider.tsx     |   3 +-
 .../search_date_suggestion.tsx                |   5 +-
 .../suggestion_box/suggestion_box.jsx         |  11 +-
 .../team_controller/team_controller.tsx       |   2 +-
 .../components/team_sidebar/team_sidebar.tsx  |   7 +-
 .../thread_list/thread_list.tsx               |   8 +-
 .../toast_wrapper/toast_wrapper.tsx           |   3 +-
 .../collapsed_reply_threads_modal.tsx         |   4 +-
 .../update_user_group_modal.tsx               |   3 +-
 .../user_group_popover/user_group_popover.tsx |   4 +-
 .../advanced/user_settings_advanced.test.tsx  |   4 +-
 .../advanced/user_settings_advanced.tsx       |   3 +-
 .../manage_languages/manage_languages.tsx     |   2 +-
 .../modal/user_settings_modal.tsx             |   3 +-
 .../desktop_notification_settings.test.tsx    |   4 +-
 .../desktop_notification_settings.tsx         |   9 +-
 .../user_access_token_section.tsx             |   3 +-
 .../widgets/menu/menu_items/submenu_item.tsx  |   7 +-
 webapp/channels/src/selectors/urls.ts         |  53 +++++++
 webapp/channels/src/utils/a11y_controller.ts  |   4 +-
 webapp/channels/src/utils/keyboard.test.ts    | 145 ++++++++++++++++++
 webapp/channels/src/utils/keyboard.ts         |  35 +++++
 .../channels/src/utils/notification_sounds.ts |  40 +++++
 webapp/channels/src/utils/post_utils.ts       |   8 +-
 webapp/channels/src/utils/user_agent.tsx      |   4 +
 webapp/channels/src/utils/utils.test.tsx      | 141 -----------------
 webapp/channels/src/utils/utils.tsx           | 131 +---------------
 76 files changed, 508 insertions(+), 491 deletions(-)
 create mode 100644 webapp/channels/src/selectors/urls.ts
 create mode 100644 webapp/channels/src/utils/keyboard.test.ts
 create mode 100644 webapp/channels/src/utils/keyboard.ts
 create mode 100644 webapp/channels/src/utils/notification_sounds.ts

diff --git a/webapp/channels/src/actions/notification_actions.jsx b/webapp/channels/src/actions/notification_actions.jsx
index 95e3d450e2..088cf1aedb 100644
--- a/webapp/channels/src/actions/notification_actions.jsx
+++ b/webapp/channels/src/actions/notification_actions.jsx
@@ -14,9 +14,11 @@ import {isSystemMessage, isUserAddedInChannel} from 'mattermost-redux/utils/post
 import {displayUsername} from 'mattermost-redux/utils/user_utils';
 
 import {isThreadOpen} from 'selectors/views/threads';
+import {getChannelURL, getPermalinkURL} from 'selectors/urls';
 
 import {getHistory} from 'utils/browser_history';
 import Constants, {NotificationLevels, UserStatuses} from 'utils/constants';
+import * as NotificationSounds from 'utils/notification_sounds';
 import {showNotification} from 'utils/notifications';
 import {isDesktopApp, isMobileApp, isWindowsApp} from 'utils/user_agent';
 import * as Utils from 'utils/utils';
@@ -178,17 +180,17 @@ export function sendDesktopNotification(post, msgProps) {
 
         if (notify) {
             const updatedState = getState();
-            let url = Utils.getChannelURL(updatedState, channel, teamId);
+            let url = getChannelURL(updatedState, channel, teamId);
 
             if (isCrtReply) {
-                url = Utils.getPermalinkURL(updatedState, teamId, post.id);
+                url = getPermalinkURL(updatedState, teamId, post.id);
             }
 
             dispatch(notifyMe(title, body, channel, teamId, !sound, soundName, url));
 
             //Don't add extra sounds on native desktop clients
             if (sound && !isDesktopApp() && !isMobileApp()) {
-                Utils.ding(soundName);
+                NotificationSounds.ding(soundName);
             }
         }
     };
diff --git a/webapp/channels/src/actions/notification_actions.test.js b/webapp/channels/src/actions/notification_actions.test.js
index 56fbca06db..c8b5a70599 100644
--- a/webapp/channels/src/actions/notification_actions.test.js
+++ b/webapp/channels/src/actions/notification_actions.test.js
@@ -5,8 +5,8 @@ import testConfigureStore from 'tests/test_store';
 
 import {getHistory} from 'utils/browser_history';
 import Constants, {NotificationLevels, UserStatuses} from 'utils/constants';
+import * as NotificationSounds from 'utils/notification_sounds';
 import * as utils from 'utils/notifications';
-import * as baseUtils from 'utils/utils';
 
 import {sendDesktopNotification} from './notification_actions';
 
@@ -22,7 +22,7 @@ describe('notification_actions', () => {
 
         beforeEach(() => {
             spy = jest.spyOn(utils, 'showNotification');
-            baseUtils.ding = jest.fn();
+            NotificationSounds.ding = jest.fn();
 
             crt = {
                 user_id: 'current_user_id',
@@ -315,7 +315,7 @@ describe('notification_actions', () => {
         });
 
         test('should default sound when no sound is specified', () => {
-            const dingSpy = jest.spyOn(baseUtils, 'ding');
+            const dingSpy = jest.spyOn(NotificationSounds, 'ding');
             baseState.entities.users.profiles.current_user_id.notify_props.desktop_sound = 'true';
             const store = testConfigureStore(baseState);
             return store.dispatch(sendDesktopNotification(post, msgProps)).then(() => {
@@ -324,7 +324,7 @@ describe('notification_actions', () => {
         });
 
         test('should use specified sound when specified', () => {
-            const dingSpy = jest.spyOn(baseUtils, 'ding');
+            const dingSpy = jest.spyOn(NotificationSounds, 'ding');
             baseState.entities.users.profiles.current_user_id.notify_props.desktop_sound = 'true';
             baseState.entities.users.profiles.current_user_id.notify_props.desktop_notification_sound = 'Crackle';
             const store = testConfigureStore(baseState);
diff --git a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx
index b0679ea814..a484dc4bb2 100644
--- a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx
+++ b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx
@@ -13,6 +13,7 @@ import * as GlobalActions from 'actions/global_actions';
 
 import Constants, {AdvancedTextEditor as AdvancedTextEditorConst, Locations, ModalIdentifiers, Preferences} from 'utils/constants';
 import {PreferenceType} from '@mattermost/types/preferences';
+import * as Keyboard from 'utils/keyboard';
 import * as UserAgent from 'utils/user_agent';
 import * as Utils from 'utils/utils';
 import {
@@ -819,11 +820,11 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
 
     handleKeyDown = (e: React.KeyboardEvent<TextboxElement>) => {
         const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey;
-        const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Utils.isKeyPressed(e, KeyCodes.BACK_SLASH);
+        const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.BACK_SLASH);
 
-        const ctrlKeyCombo = Utils.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
-        const ctrlAltCombo = Utils.cmdOrCtrlPressed(e, true) && e.altKey;
-        const shiftAltCombo = !Utils.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey;
+        const ctrlKeyCombo = Keyboard.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
+        const ctrlAltCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.altKey;
+        const shiftAltCombo = !Keyboard.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey;
 
         // listen for line break key combo and insert new line character
         if (Utils.isUnhandledLineBreakKeyCombo(e)) {
@@ -838,7 +839,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
 
         if (
             (this.props.ctrlSend || this.props.codeBlockOnCtrlEnter) &&
-            Utils.isKeyPressed(e, KeyCodes.ENTER) &&
+            Keyboard.isKeyPressed(e, KeyCodes.ENTER) &&
             (e.ctrlKey || e.metaKey)
         ) {
             this.setShowPreview(false);
@@ -849,7 +850,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
         const draft = this.state.draft!;
         const {message} = draft;
 
-        if (Utils.isKeyPressed(e, KeyCodes.ESCAPE)) {
+        if (Keyboard.isKeyPressed(e, KeyCodes.ESCAPE)) {
             this.textboxRef.current?.blur();
         }
 
@@ -858,7 +859,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
             !e.metaKey &&
             !e.altKey &&
             !e.shiftKey &&
-            Utils.isKeyPressed(e, KeyCodes.UP) &&
+            Keyboard.isKeyPressed(e, KeyCodes.UP) &&
             message === ''
         ) {
             e.preventDefault();
@@ -879,13 +880,13 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
         } = e.target as TextboxElement;
 
         if (ctrlKeyCombo) {
-            if (Utils.isKeyPressed(e, KeyCodes.UP)) {
+            if (Keyboard.isKeyPressed(e, KeyCodes.UP)) {
                 e.preventDefault();
                 this.props.onMoveHistoryIndexBack();
-            } else if (Utils.isKeyPressed(e, KeyCodes.DOWN)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.DOWN)) {
                 e.preventDefault();
                 this.props.onMoveHistoryIndexForward();
-            } else if (Utils.isKeyPressed(e, KeyCodes.B)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.B)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.applyMarkdown({
@@ -894,7 +895,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.I)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.I)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.applyMarkdown({
@@ -905,7 +906,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
                 });
             }
         } else if (ctrlAltCombo) {
-            if (Utils.isKeyPressed(e, KeyCodes.K)) {
+            if (Keyboard.isKeyPressed(e, KeyCodes.K)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.applyMarkdown({
@@ -914,7 +915,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.C)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.C)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.applyMarkdown({
@@ -923,21 +924,21 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.E)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.E)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.toggleEmojiPicker();
-            } else if (Utils.isKeyPressed(e, KeyCodes.T)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.T)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.toggleAdvanceTextEditor();
-            } else if (Utils.isKeyPressed(e, KeyCodes.P) && draft.message.length) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.P) && draft.message.length) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.setShowPreview(!this.props.shouldShowPreview);
             }
         } else if (shiftAltCombo) {
-            if (Utils.isKeyPressed(e, KeyCodes.X)) {
+            if (Keyboard.isKeyPressed(e, KeyCodes.X)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.applyMarkdown({
@@ -946,7 +947,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.SEVEN)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.SEVEN)) {
                 e.preventDefault();
                 this.applyMarkdown({
                     markdownMode: 'ol',
@@ -954,7 +955,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.EIGHT)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.EIGHT)) {
                 e.preventDefault();
                 this.applyMarkdown({
                     markdownMode: 'ul',
@@ -962,7 +963,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.NINE)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.NINE)) {
                 e.preventDefault();
                 this.applyMarkdown({
                     markdownMode: 'quote',
diff --git a/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx b/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx
index 630ad71188..a8bcd5bbba 100644
--- a/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx
+++ b/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx
@@ -22,6 +22,7 @@ import Constants, {
     Preferences,
     AdvancedTextEditor as AdvancedTextEditorConst,
 } from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import {
     containsAtChannel,
     specialMentionsInText,
@@ -34,7 +35,6 @@ import {
 } from 'utils/post_utils';
 import {getTable, hasHtmlLink, formatMarkdownMessage, formatGithubCodePaste, isGitHubCodeBlock} from 'utils/paste';
 import * as UserAgent from 'utils/user_agent';
-import {isMac} from 'utils/utils';
 import * as Utils from 'utils/utils';
 import EmojiMap from 'utils/emoji_map';
 import {applyMarkdown, ApplyMarkdownOptions} from 'utils/markdown/apply_markdown';
@@ -1096,7 +1096,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
 
     documentKeyHandler = (e: KeyboardEvent) => {
         const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey;
-        const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Utils.isKeyPressed(e, KeyCodes.BACK_SLASH);
+        const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.BACK_SLASH);
         if (lastMessageReactionKeyCombo) {
             this.reactToLastMessage(e);
             return;
@@ -1134,12 +1134,12 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
 
         const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey;
         const ctrlEnterKeyCombo = (this.props.ctrlSend || this.props.codeBlockOnCtrlEnter) &&
-            Utils.isKeyPressed(e, KeyCodes.ENTER) &&
+            Keyboard.isKeyPressed(e, KeyCodes.ENTER) &&
             ctrlOrMetaKeyPressed;
 
-        const ctrlKeyCombo = Utils.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
-        const ctrlAltCombo = Utils.cmdOrCtrlPressed(e, true) && e.altKey;
-        const shiftAltCombo = !Utils.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey;
+        const ctrlKeyCombo = Keyboard.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
+        const ctrlAltCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.altKey;
+        const shiftAltCombo = !Keyboard.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey;
 
         // listen for line break key combo and insert new line character
         if (Utils.isUnhandledLineBreakKeyCombo(e)) {
@@ -1155,7 +1155,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
 
         const {message} = this.state;
 
-        if (Utils.isKeyPressed(e, KeyCodes.ESCAPE)) {
+        if (Keyboard.isKeyPressed(e, KeyCodes.ESCAPE)) {
             this.textboxRef.current?.blur();
         }
 
@@ -1164,7 +1164,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
             !e.metaKey &&
             !e.altKey &&
             !e.shiftKey &&
-            Utils.isKeyPressed(e, KeyCodes.UP) &&
+            Keyboard.isKeyPressed(e, KeyCodes.UP) &&
             message === ''
         ) {
             e.preventDefault();
@@ -1182,15 +1182,15 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
         } = e.target as TextboxElement;
 
         if (ctrlKeyCombo) {
-            if (draftMessageIsEmpty && Utils.isKeyPressed(e, KeyCodes.UP)) {
+            if (draftMessageIsEmpty && Keyboard.isKeyPressed(e, KeyCodes.UP)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.loadPrevMessage(e);
-            } else if (draftMessageIsEmpty && Utils.isKeyPressed(e, KeyCodes.DOWN)) {
+            } else if (draftMessageIsEmpty && Keyboard.isKeyPressed(e, KeyCodes.DOWN)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.loadNextMessage(e);
-            } else if (Utils.isKeyPressed(e, KeyCodes.B)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.B)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.applyMarkdown({
@@ -1199,7 +1199,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.I)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.I)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.applyMarkdown({
@@ -1210,7 +1210,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
                 });
             }
         } else if (ctrlAltCombo) {
-            if (Utils.isKeyPressed(e, KeyCodes.K)) {
+            if (Keyboard.isKeyPressed(e, KeyCodes.K)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.applyMarkdown({
@@ -1219,7 +1219,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.C)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.C)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.applyMarkdown({
@@ -1228,21 +1228,21 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.E)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.E)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.toggleEmojiPicker();
-            } else if (Utils.isKeyPressed(e, KeyCodes.T)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.T)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.toggleAdvanceTextEditor();
-            } else if (Utils.isKeyPressed(e, KeyCodes.P) && message.length) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.P) && message.length) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.setShowPreview(!this.props.shouldShowPreview);
             }
         } else if (shiftAltCombo) {
-            if (Utils.isKeyPressed(e, KeyCodes.X)) {
+            if (Keyboard.isKeyPressed(e, KeyCodes.X)) {
                 e.stopPropagation();
                 e.preventDefault();
                 this.applyMarkdown({
@@ -1251,7 +1251,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.SEVEN)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.SEVEN)) {
                 e.preventDefault();
                 this.applyMarkdown({
                     markdownMode: 'ol',
@@ -1259,7 +1259,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.EIGHT)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.EIGHT)) {
                 e.preventDefault();
                 this.applyMarkdown({
                     markdownMode: 'ul',
@@ -1267,7 +1267,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
                     selectionEnd,
                     message: value,
                 });
-            } else if (Utils.isKeyPressed(e, KeyCodes.NINE)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.NINE)) {
                 e.preventDefault();
                 this.applyMarkdown({
                     markdownMode: 'quote',
@@ -1277,21 +1277,21 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
                 });
             }
         }
-        const upKeyOnly = !ctrlOrMetaKeyPressed && !e.altKey && !e.shiftKey && Utils.isKeyPressed(e, KeyCodes.UP);
-        const shiftUpKeyCombo = !ctrlOrMetaKeyPressed && !e.altKey && e.shiftKey && Utils.isKeyPressed(e, KeyCodes.UP);
-        const ctrlShiftCombo = Utils.cmdOrCtrlPressed(e, true) && e.shiftKey;
+        const upKeyOnly = !ctrlOrMetaKeyPressed && !e.altKey && !e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.UP);
+        const shiftUpKeyCombo = !ctrlOrMetaKeyPressed && !e.altKey && e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.UP);
+        const ctrlShiftCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.shiftKey;
 
         if (upKeyOnly && messageIsEmpty) {
             this.editLastPost(e);
         } else if (shiftUpKeyCombo && messageIsEmpty) {
             this.replyToLastPost(e);
-        } else if (ctrlShiftCombo && Utils.isKeyPressed(e, KeyCodes.E)) {
+        } else if (ctrlShiftCombo && Keyboard.isKeyPressed(e, KeyCodes.E)) {
             e.stopPropagation();
             e.preventDefault();
             this.toggleEmojiPicker();
-        } else if (((isMac() && ctrlShiftCombo) || (!isMac() && ctrlAltCombo)) && Utils.isKeyPressed(e, KeyCodes.P) && this.state.message.length) {
+        } else if (((UserAgent.isMac() && ctrlShiftCombo) || (!UserAgent.isMac() && ctrlAltCombo)) && Keyboard.isKeyPressed(e, KeyCodes.P) && this.state.message.length) {
             this.setShowPreview(!this.props.shouldShowPreview);
-        } else if (ctrlAltCombo && Utils.isKeyPressed(e, KeyCodes.T)) {
+        } else if (ctrlAltCombo && Keyboard.isKeyPressed(e, KeyCodes.T)) {
             this.toggleAdvanceTextEditor();
         }
     };
diff --git a/webapp/channels/src/components/at_mention/at_mention.tsx b/webapp/channels/src/components/at_mention/at_mention.tsx
index 4bb914369f..e8e51ca423 100644
--- a/webapp/channels/src/components/at_mention/at_mention.tsx
+++ b/webapp/channels/src/components/at_mention/at_mention.tsx
@@ -12,9 +12,10 @@ import {Group} from '@mattermost/types/groups';
 import ProfilePopover from 'components/profile_popover';
 
 import {popOverOverlayPosition} from 'utils/position_utils';
+import {isKeyPressed} from 'utils/keyboard';
 import {getUserOrGroupFromMentionName} from 'utils/post_utils';
 import Constants from 'utils/constants';
-import {getViewportSize, isKeyPressed} from 'utils/utils';
+import {getViewportSize} from 'utils/utils';
 
 import AtMentionGroup from 'components/at_mention/at_mention_group';
 
diff --git a/webapp/channels/src/components/at_mention/at_mention_group.tsx b/webapp/channels/src/components/at_mention/at_mention_group.tsx
index aaa449eef9..fa1fd3abd5 100644
--- a/webapp/channels/src/components/at_mention/at_mention_group.tsx
+++ b/webapp/channels/src/components/at_mention/at_mention_group.tsx
@@ -12,8 +12,9 @@ import ProfilePopover from 'components/profile_popover';
 import UserGroupPopover from 'components/user_group_popover';
 
 import Constants, {A11yCustomEventTypes, A11yFocusEventDetail} from 'utils/constants';
+import {isKeyPressed} from 'utils/keyboard';
 import {popOverOverlayPosition} from 'utils/position_utils';
-import {getViewportSize, isKeyPressed} from 'utils/utils';
+import {getViewportSize} from 'utils/utils';
 
 import {MAX_LIST_HEIGHT, getListHeight, VIEWPORT_SCALE_FACTOR} from 'components/user_group_popover/group_member_list/group_member_list';
 
diff --git a/webapp/channels/src/components/channel_members_rhs/action_bar.tsx b/webapp/channels/src/components/channel_members_rhs/action_bar.tsx
index 90d08d9064..44e4d80796 100644
--- a/webapp/channels/src/components/channel_members_rhs/action_bar.tsx
+++ b/webapp/channels/src/components/channel_members_rhs/action_bar.tsx
@@ -6,7 +6,7 @@ import {FormattedMessage} from 'react-intl';
 import styled from 'styled-components';
 
 import Constants from 'utils/constants';
-import {isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
 
 const Title = styled.div`
     flex:1;
diff --git a/webapp/channels/src/components/custom_status/custom_status_modal.tsx b/webapp/channels/src/components/custom_status/custom_status_modal.tsx
index 28f2efd9aa..6f18e0415f 100644
--- a/webapp/channels/src/components/custom_status/custom_status_modal.tsx
+++ b/webapp/channels/src/components/custom_status/custom_status_modal.tsx
@@ -25,7 +25,8 @@ import {GlobalState} from 'types/store';
 import {getCurrentMomentForTimezone} from 'utils/timezone';
 import {A11yCustomEventTypes, A11yFocusEventDetail, Constants, ModalIdentifiers} from 'utils/constants';
 import {t} from 'utils/i18n';
-import {isKeyPressed, localizeMessage} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
+import {localizeMessage} from 'utils/utils';
 
 import CustomStatusSuggestion from 'components/custom_status/custom_status_suggestion';
 import ExpiryMenu from 'components/custom_status/expiry_menu';
diff --git a/webapp/channels/src/components/custom_status/date_time_input.tsx b/webapp/channels/src/components/custom_status/date_time_input.tsx
index 8dde00eded..8c1f83b3a8 100644
--- a/webapp/channels/src/components/custom_status/date_time_input.tsx
+++ b/webapp/channels/src/components/custom_status/date_time_input.tsx
@@ -17,7 +17,8 @@ import DatePicker from 'components/date_picker';
 import Menu from 'components/widgets/menu/menu';
 import Timestamp from 'components/timestamp';
 import {getCurrentLocale} from 'selectors/i18n';
-import {isKeyPressed, localizeMessage} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
+import {localizeMessage} from 'utils/utils';
 import {getCurrentMomentForTimezone} from 'utils/timezone';
 import Constants, {A11yCustomEventTypes, A11yFocusEventDetail} from 'utils/constants';
 
diff --git a/webapp/channels/src/components/dnd_custom_time_picker_modal/dnd_custom_time_picker_modal.tsx b/webapp/channels/src/components/dnd_custom_time_picker_modal/dnd_custom_time_picker_modal.tsx
index 8e83fb47cd..f4932ceb86 100644
--- a/webapp/channels/src/components/dnd_custom_time_picker_modal/dnd_custom_time_picker_modal.tsx
+++ b/webapp/channels/src/components/dnd_custom_time_picker_modal/dnd_custom_time_picker_modal.tsx
@@ -22,7 +22,8 @@ import MenuWrapper from 'components/widgets/menu/menu_wrapper';
 
 import './dnd_custom_time_picker_modal.scss';
 import {toUTCUnix} from 'utils/datetime';
-import {isKeyPressed, localizeMessage} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
+import {localizeMessage} from 'utils/utils';
 import Input from 'components/widgets/inputs/input/input';
 import DatePicker from 'components/date_picker';
 
diff --git a/webapp/channels/src/components/dot_menu/dot_menu.tsx b/webapp/channels/src/components/dot_menu/dot_menu.tsx
index 46067b6abe..89068ae450 100644
--- a/webapp/channels/src/components/dot_menu/dot_menu.tsx
+++ b/webapp/channels/src/components/dot_menu/dot_menu.tsx
@@ -28,6 +28,7 @@ import Permissions from 'mattermost-redux/constants/permissions';
 import {Locations, ModalIdentifiers, Constants, TELEMETRY_LABELS} from 'utils/constants';
 import DeletePostModal from 'components/delete_post_modal';
 import DelayedAction from 'utils/delayed_action';
+import * as Keyboard from 'utils/keyboard';
 import * as PostUtils from 'utils/post_utils';
 import * as Menu from 'components/menu';
 import * as Utils from 'utils/utils';
@@ -337,61 +338,61 @@ export class DotMenuClass extends React.PureComponent<Props, State> {
         const isShiftKeyPressed = e.shiftKey;
 
         switch (true) {
-        case Utils.isKeyPressed(e, Constants.KeyCodes.R):
+        case Keyboard.isKeyPressed(e, Constants.KeyCodes.R):
             this.handleCommentClick(e);
             this.handleDropdownOpened(false);
             break;
 
             // edit post
-        case Utils.isKeyPressed(e, Constants.KeyCodes.E):
+        case Keyboard.isKeyPressed(e, Constants.KeyCodes.E):
             this.handleEditMenuItemActivated(e);
             this.handleDropdownOpened(false);
             break;
 
             // follow thread
-        case Utils.isKeyPressed(e, Constants.KeyCodes.F) && !isShiftKeyPressed:
+        case Keyboard.isKeyPressed(e, Constants.KeyCodes.F) && !isShiftKeyPressed:
             this.handleSetThreadFollow(e);
             this.handleDropdownOpened(false);
             break;
 
             // forward post
-        case Utils.isKeyPressed(e, Constants.KeyCodes.F) && isShiftKeyPressed:
+        case Keyboard.isKeyPressed(e, Constants.KeyCodes.F) && isShiftKeyPressed:
             this.handleForwardMenuItemActivated(e);
             this.handleDropdownOpened(false);
             break;
 
             // copy link
-        case Utils.isKeyPressed(e, Constants.KeyCodes.K):
+        case Keyboard.isKeyPressed(e, Constants.KeyCodes.K):
             this.copyLink(e);
             this.handleDropdownOpened(false);
             break;
 
             // copy text
-        case Utils.isKeyPressed(e, Constants.KeyCodes.C):
+        case Keyboard.isKeyPressed(e, Constants.KeyCodes.C):
             this.copyText(e);
             this.handleDropdownOpened(false);
             break;
 
             // delete post
-        case Utils.isKeyPressed(e, Constants.KeyCodes.DELETE):
+        case Keyboard.isKeyPressed(e, Constants.KeyCodes.DELETE):
             this.handleDeleteMenuItemActivated(e);
             this.handleDropdownOpened(false);
             break;
 
             // pin / unpin
-        case Utils.isKeyPressed(e, Constants.KeyCodes.P):
+        case Keyboard.isKeyPressed(e, Constants.KeyCodes.P):
             this.handlePinMenuItemActivated(e);
             this.handleDropdownOpened(false);
             break;
 
             // save / unsave
-        case Utils.isKeyPressed(e, Constants.KeyCodes.S):
+        case Keyboard.isKeyPressed(e, Constants.KeyCodes.S):
             this.handleFlagMenuItemActivated(e);
             this.handleDropdownOpened(false);
             break;
 
             // mark as unread
-        case Utils.isKeyPressed(e, Constants.KeyCodes.U):
+        case Keyboard.isKeyPressed(e, Constants.KeyCodes.U):
             this.handleMarkPostAsUnread(e);
             this.handleDropdownOpened(false);
             break;
diff --git a/webapp/channels/src/components/drafts/channel_draft/index.ts b/webapp/channels/src/components/drafts/channel_draft/index.ts
index e34d66c351..b3722f1cdf 100644
--- a/webapp/channels/src/components/drafts/channel_draft/index.ts
+++ b/webapp/channels/src/components/drafts/channel_draft/index.ts
@@ -6,7 +6,7 @@ import {connect} from 'react-redux';
 import {makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 
-import {getChannelURL} from 'utils/utils';
+import {getChannelURL} from 'selectors/urls';
 
 import {GlobalState} from 'types/store';
 
diff --git a/webapp/channels/src/components/edit_channel_header_modal/edit_channel_header_modal.tsx b/webapp/channels/src/components/edit_channel_header_modal/edit_channel_header_modal.tsx
index c61e3a48db..655084b44c 100644
--- a/webapp/channels/src/components/edit_channel_header_modal/edit_channel_header_modal.tsx
+++ b/webapp/channels/src/components/edit_channel_header_modal/edit_channel_header_modal.tsx
@@ -13,8 +13,9 @@ import Textbox, {TextboxElement} from 'components/textbox';
 import TextboxClass from 'components/textbox/textbox';
 import TextboxLinks from 'components/textbox/textbox_links';
 import Constants from 'utils/constants';
+import {isKeyPressed} from 'utils/keyboard';
 import {isMobile} from 'utils/user_agent';
-import {insertLineBreakFromKeyEvent, isKeyPressed, isUnhandledLineBreakKeyCombo, localizeMessage} from 'utils/utils';
+import {insertLineBreakFromKeyEvent, isUnhandledLineBreakKeyCombo, localizeMessage} from 'utils/utils';
 
 const KeyCodes = Constants.KeyCodes;
 
diff --git a/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx b/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx
index 0f932581e0..e7fbc1abd6 100644
--- a/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx
+++ b/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx
@@ -9,6 +9,7 @@ import {Channel} from '@mattermost/types/channels';
 import {ActionResult} from 'mattermost-redux/types/actions';
 
 import Constants from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
 
 type Actions = {
@@ -68,10 +69,10 @@ export class EditChannelPurposeModal extends React.PureComponent<Props, State> {
         if (Utils.isUnhandledLineBreakKeyCombo(e)) {
             e.preventDefault();
             this.setState({purpose: Utils.insertLineBreakFromKeyEvent(e as React.KeyboardEvent<HTMLTextAreaElement>)});
-        } else if (ctrlSend && Utils.isKeyPressed(e, Constants.KeyCodes.ENTER) && e.ctrlKey) {
+        } else if (ctrlSend && Keyboard.isKeyPressed(e, Constants.KeyCodes.ENTER) && e.ctrlKey) {
             e.preventDefault();
             this.handleSave();
-        } else if (!ctrlSend && Utils.isKeyPressed(e, Constants.KeyCodes.ENTER) && !e.shiftKey && !e.altKey) {
+        } else if (!ctrlSend && Keyboard.isKeyPressed(e, Constants.KeyCodes.ENTER) && !e.shiftKey && !e.altKey) {
             e.preventDefault();
             this.handleSave();
         }
diff --git a/webapp/channels/src/components/edit_post/edit_post.tsx b/webapp/channels/src/components/edit_post/edit_post.tsx
index 3711dca85f..81c9ea4667 100644
--- a/webapp/channels/src/components/edit_post/edit_post.tsx
+++ b/webapp/channels/src/components/edit_post/edit_post.tsx
@@ -10,6 +10,7 @@ import {Post} from '@mattermost/types/posts';
 import {Emoji, SystemEmoji} from '@mattermost/types/emojis';
 
 import {AppEvents, Constants, ModalIdentifiers, StoragePrefixes} from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import {
     formatGithubCodePaste,
     formatMarkdownMessage,
@@ -308,13 +309,13 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft,
         const {ctrlSend, codeBlockOnCtrlEnter} = rest;
 
         const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey;
-        const ctrlKeyCombo = Utils.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
-        const ctrlAltCombo = Utils.cmdOrCtrlPressed(e, true) && e.altKey;
+        const ctrlKeyCombo = Keyboard.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
+        const ctrlAltCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.altKey;
         const ctrlEnterKeyCombo =
             (ctrlSend || codeBlockOnCtrlEnter) &&
-            Utils.isKeyPressed(e, KeyCodes.ENTER) &&
+            Keyboard.isKeyPressed(e, KeyCodes.ENTER) &&
             ctrlOrMetaKeyPressed;
-        const markdownLinkKey = Utils.isKeyPressed(e, KeyCodes.K);
+        const markdownLinkKey = Keyboard.isKeyPressed(e, KeyCodes.K);
 
         // listen for line break key combo and insert new line character
         if (Utils.isUnhandledLineBreakKeyCombo(e)) {
@@ -322,7 +323,7 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft,
             setEditText(Utils.insertLineBreakFromKeyEvent(e as React.KeyboardEvent<HTMLTextAreaElement>));
         } else if (ctrlEnterKeyCombo) {
             handleEdit();
-        } else if (Utils.isKeyPressed(e, KeyCodes.ESCAPE) && !showEmojiPicker) {
+        } else if (Keyboard.isKeyPressed(e, KeyCodes.ESCAPE) && !showEmojiPicker) {
             handleAutomatedRefocusAndExit();
         } else if (ctrlAltCombo && markdownLinkKey) {
             applyHotkeyMarkdown({
@@ -331,14 +332,14 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft,
                 selectionEnd: e.currentTarget.selectionEnd,
                 message: e.currentTarget.value,
             });
-        } else if (ctrlKeyCombo && Utils.isKeyPressed(e, KeyCodes.B)) {
+        } else if (ctrlKeyCombo && Keyboard.isKeyPressed(e, KeyCodes.B)) {
             applyHotkeyMarkdown({
                 markdownMode: 'bold',
                 selectionStart: e.currentTarget.selectionStart,
                 selectionEnd: e.currentTarget.selectionEnd,
                 message: e.currentTarget.value,
             });
-        } else if (ctrlKeyCombo && Utils.isKeyPressed(e, KeyCodes.I)) {
+        } else if (ctrlKeyCombo && Keyboard.isKeyPressed(e, KeyCodes.I)) {
             applyHotkeyMarkdown({
                 markdownMode: 'italic',
                 selectionStart: e.currentTarget.selectionStart,
diff --git a/webapp/channels/src/components/edit_post/edit_post_footer.tsx b/webapp/channels/src/components/edit_post/edit_post_footer.tsx
index 12971eb2cc..432c27eebe 100644
--- a/webapp/channels/src/components/edit_post/edit_post_footer.tsx
+++ b/webapp/channels/src/components/edit_post/edit_post_footer.tsx
@@ -8,7 +8,7 @@ import {FormattedMessage} from 'react-intl';
 import {getBool} from 'mattermost-redux/selectors/entities/preferences';
 import {Preferences} from 'mattermost-redux/constants';
 
-import {isMac} from 'utils/utils';
+import {isMac} from 'utils/user_agent';
 import {GlobalState} from 'types/store';
 
 type Props = {
diff --git a/webapp/channels/src/components/file_preview_modal/file_preview_modal.tsx b/webapp/channels/src/components/file_preview_modal/file_preview_modal.tsx
index eecca2d3fa..ec031aaef4 100644
--- a/webapp/channels/src/components/file_preview_modal/file_preview_modal.tsx
+++ b/webapp/channels/src/components/file_preview_modal/file_preview_modal.tsx
@@ -12,6 +12,7 @@ import {Post} from '@mattermost/types/posts';
 import {getFileDownloadUrl, getFilePreviewUrl, getFileUrl} from 'mattermost-redux/utils/file_utils';
 import LoadingImagePreview from 'components/loading_image_preview';
 import Constants, {FileTypes, ZoomSettings} from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
 import AudioVideoPreview from 'components/audio_video_preview';
 import CodePreview from 'components/code_preview';
@@ -115,9 +116,9 @@ export default class FilePreviewModal extends React.PureComponent<Props, State>
     };
 
     handleKeyPress = (e: KeyboardEvent) => {
-        if (Utils.isKeyPressed(e, KeyCodes.RIGHT)) {
+        if (Keyboard.isKeyPressed(e, KeyCodes.RIGHT)) {
             this.handleNext();
-        } else if (Utils.isKeyPressed(e, KeyCodes.LEFT)) {
+        } else if (Keyboard.isKeyPressed(e, KeyCodes.LEFT)) {
             this.handlePrev();
         }
     };
diff --git a/webapp/channels/src/components/file_upload/file_upload.tsx b/webapp/channels/src/components/file_upload/file_upload.tsx
index 50ccafc021..26513bb951 100644
--- a/webapp/channels/src/components/file_upload/file_upload.tsx
+++ b/webapp/channels/src/components/file_upload/file_upload.tsx
@@ -12,6 +12,7 @@ import dragster from 'utils/dragster';
 import Constants from 'utils/constants';
 import DelayedAction from 'utils/delayed_action';
 import {t} from 'utils/i18n';
+import {cmdOrCtrlPressed, isKeyPressed} from 'utils/keyboard';
 import {
     isIosChrome,
     isMobileApp,
@@ -19,8 +20,6 @@ import {
 import {getTable} from 'utils/paste';
 import {
     clearFileInput,
-    cmdOrCtrlPressed,
-    isKeyPressed,
     generateId,
     isFileTransfer,
     isUriDrop,
diff --git a/webapp/channels/src/components/forward_post_modal/forward_post_comment_input.tsx b/webapp/channels/src/components/forward_post_modal/forward_post_comment_input.tsx
index 4923cd7ac3..bca35dd1e6 100644
--- a/webapp/channels/src/components/forward_post_modal/forward_post_comment_input.tsx
+++ b/webapp/channels/src/components/forward_post_modal/forward_post_comment_input.tsx
@@ -12,6 +12,7 @@ import Textbox, {TextboxClass, TextboxElement} from 'components/textbox';
 
 import Constants from 'utils/constants';
 import {applyMarkdown, ApplyMarkdownOptions} from 'utils/markdown/apply_markdown';
+import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
 import {GlobalState} from 'types/store';
 
@@ -77,13 +78,13 @@ const ForwardPostCommentInput = ({channelId, canForwardPost, comment, permaLinkL
     };
 
     const handleKeyDown = (e: React.KeyboardEvent<TextboxElement>) => {
-        const ctrlKeyCombo = Utils.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
-        const ctrlAltCombo = Utils.cmdOrCtrlPressed(e, true) && e.altKey;
-        const ctrlShiftCombo = Utils.cmdOrCtrlPressed(e, true) && e.shiftKey;
-        const markdownLinkKey = Utils.isKeyPressed(e, KeyCodes.K);
+        const ctrlKeyCombo = Keyboard.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
+        const ctrlAltCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.altKey;
+        const ctrlShiftCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.shiftKey;
+        const markdownLinkKey = Keyboard.isKeyPressed(e, KeyCodes.K);
         const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey;
         const ctrlEnterKeyCombo =
-            Utils.isKeyPressed(e, KeyCodes.ENTER) && ctrlOrMetaKeyPressed;
+            Keyboard.isKeyPressed(e, KeyCodes.ENTER) && ctrlOrMetaKeyPressed;
 
         const {selectionStart, selectionEnd, value} =
             e.target as TextboxElement;
@@ -98,28 +99,28 @@ const ForwardPostCommentInput = ({channelId, canForwardPost, comment, permaLinkL
                 selectionEnd,
                 message: value,
             });
-        } else if (ctrlKeyCombo && Utils.isKeyPressed(e, KeyCodes.B)) {
+        } else if (ctrlKeyCombo && Keyboard.isKeyPressed(e, KeyCodes.B)) {
             applyMarkdownMode({
                 markdownMode: 'bold',
                 selectionStart,
                 selectionEnd,
                 message: value,
             });
-        } else if (ctrlKeyCombo && Utils.isKeyPressed(e, KeyCodes.I)) {
+        } else if (ctrlKeyCombo && Keyboard.isKeyPressed(e, KeyCodes.I)) {
             applyMarkdownMode({
                 markdownMode: 'italic',
                 selectionStart,
                 selectionEnd,
                 message: value,
             });
-        } else if (ctrlShiftCombo && Utils.isKeyPressed(e, KeyCodes.X)) {
+        } else if (ctrlShiftCombo && Keyboard.isKeyPressed(e, KeyCodes.X)) {
             applyMarkdownMode({
                 markdownMode: 'strike',
                 selectionStart,
                 selectionEnd,
                 message: value,
             });
-        } else if (ctrlShiftCombo && Utils.isKeyPressed(e, KeyCodes.E)) {
+        } else if (ctrlShiftCombo && Keyboard.isKeyPressed(e, KeyCodes.E)) {
             e.stopPropagation();
             e.preventDefault();
         } else if (ctrlEnterKeyCombo && canForwardPost) {
diff --git a/webapp/channels/src/components/forward_post_modal/forward_post_modal.tsx b/webapp/channels/src/components/forward_post_modal/forward_post_modal.tsx
index 2fbf206401..8759fddac2 100644
--- a/webapp/channels/src/components/forward_post_modal/forward_post_modal.tsx
+++ b/webapp/channels/src/components/forward_post_modal/forward_post_modal.tsx
@@ -16,6 +16,8 @@ import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams';
 
 import NotificationBox from 'components/notification_box';
 
+import {getPermalinkURL} from 'selectors/urls';
+
 import {GlobalState} from 'types/store';
 
 import {haveIChannelPermission} from 'mattermost-redux/selectors/entities/roles';
@@ -28,7 +30,6 @@ import GenericModal from 'components/generic_modal';
 
 import {PostPreviewMetadata} from '@mattermost/types/posts';
 import {getSiteURL} from '../../utils/url';
-import * as Utils from '../../utils/utils';
 
 import ForwardPostChannelSelect, {ChannelOption, makeSelectedChannelOption} from './forward_post_channel_select';
 import ForwardPostCommentInput from './forward_post_comment_input';
@@ -49,7 +50,7 @@ const ForwardPostModal = ({onExited, post, actions}: Props) => {
     const channel = useSelector((state: GlobalState) => getChannel(state, {id: post.channel_id}));
     const currentTeam = useSelector(getCurrentTeam);
 
-    const relativePermaLink = useSelector((state: GlobalState) => Utils.getPermalinkURL(state, currentTeam.id, post.id));
+    const relativePermaLink = useSelector((state: GlobalState) => getPermalinkURL(state, currentTeam.id, post.id));
     const permaLink = `${getSiteURL()}${relativePermaLink}`;
 
     const isPrivateConversation = channel.type !== Constants.OPEN_CHANNEL;
diff --git a/webapp/channels/src/components/global_header/center_controls/global_search_nav/global_search_nav.tsx b/webapp/channels/src/components/global_header/center_controls/global_search_nav/global_search_nav.tsx
index a3bcbd7155..39e0c62870 100644
--- a/webapp/channels/src/components/global_header/center_controls/global_search_nav/global_search_nav.tsx
+++ b/webapp/channels/src/components/global_header/center_controls/global_search_nav/global_search_nav.tsx
@@ -17,7 +17,7 @@ import {
     Constants,
     RHSStates,
 } from 'utils/constants';
-import * as Utils from 'utils/utils';
+import * as Keyboard from 'utils/keyboard';
 
 const GlobalSearchNav = (): JSX.Element => {
     const dispatch = useDispatch();
@@ -25,8 +25,8 @@ const GlobalSearchNav = (): JSX.Element => {
 
     useEffect(() => {
         const handleShortcut = (e: KeyboardEvent) => {
-            if (Utils.cmdOrCtrlPressed(e) && e.shiftKey) {
-                if (Utils.isKeyPressed(e, Constants.KeyCodes.M)) {
+            if (Keyboard.cmdOrCtrlPressed(e) && e.shiftKey) {
+                if (Keyboard.isKeyPressed(e, Constants.KeyCodes.M)) {
                     e.preventDefault();
                     if (rhsState === RHSStates.MENTION) {
                         dispatch(closeRightHandSide());
diff --git a/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_modal/keyboard_shortcuts_modal.tsx b/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_modal/keyboard_shortcuts_modal.tsx
index b65030dd15..0db9b68ae6 100644
--- a/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_modal/keyboard_shortcuts_modal.tsx
+++ b/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_modal/keyboard_shortcuts_modal.tsx
@@ -11,7 +11,7 @@ import {GlobalState} from 'types/store';
 import {suitePluginIds} from 'utils/constants';
 
 import {t} from 'utils/i18n';
-import * as Utils from 'utils/utils';
+import * as UserAgent from 'utils/user_agent';
 
 import KeyboardShortcutSequence, {
     KEYBOARD_SHORTCUTS,
@@ -91,7 +91,7 @@ const KeyboardShortcutsModal = ({onExited}: Props): JSX.Element => {
 
     const handleHide = useCallback(() => setShow(false), []);
 
-    const isLinux = Utils.isLinux();
+    const isLinux = UserAgent.isLinux();
 
     const isCallsEnabled = useSelector((state: GlobalState) => {
         return Boolean(state.plugins.plugins[suitePluginIds.calls]);
diff --git a/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_sequence/keyboard_shortcuts_sequence.tsx b/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_sequence/keyboard_shortcuts_sequence.tsx
index 21488238da..c5315e36cb 100644
--- a/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_sequence/keyboard_shortcuts_sequence.tsx
+++ b/webapp/channels/src/components/keyboard_shortcuts/keyboard_shortcuts_sequence/keyboard_shortcuts_sequence.tsx
@@ -6,7 +6,7 @@ import React, {memo} from 'react';
 import {useIntl} from 'react-intl';
 
 import {ShortcutKeyVariant, ShortcutKey} from 'components/shortcut_key';
-import {isMac} from 'utils/utils';
+import {isMac} from 'utils/user_agent';
 
 import {isMessageDescriptor, KeyboardShortcutDescriptor} from './keyboard_shortcuts';
 
diff --git a/webapp/channels/src/components/leave_team_modal/leave_team_modal.tsx b/webapp/channels/src/components/leave_team_modal/leave_team_modal.tsx
index 27db2843a3..b745a3e125 100644
--- a/webapp/channels/src/components/leave_team_modal/leave_team_modal.tsx
+++ b/webapp/channels/src/components/leave_team_modal/leave_team_modal.tsx
@@ -12,8 +12,7 @@ import * as UserUtils from 'mattermost-redux/utils/user_utils';
 import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 
 import Constants from 'utils/constants';
-
-import {isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
 
 type Props = {
     currentUser: UserProfile;
diff --git a/webapp/channels/src/components/logged_in/index.ts b/webapp/channels/src/components/logged_in/index.ts
index 1b377dc75a..01a2a6b17a 100644
--- a/webapp/channels/src/components/logged_in/index.ts
+++ b/webapp/channels/src/components/logged_in/index.ts
@@ -16,9 +16,10 @@ import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels'
 import {getLicense, getConfig} from 'mattermost-redux/selectors/entities/general';
 import {getCurrentUser, shouldShowTermsOfService} from 'mattermost-redux/selectors/entities/users';
 
+import {getChannelURL} from 'selectors/urls';
+
 import {getHistory} from 'utils/browser_history';
 import {checkIfMFARequired} from 'utils/route';
-import {getChannelURL} from 'utils/utils';
 import {isPermalinkURL} from 'utils/url';
 
 import LoggedIn from './logged_in';
diff --git a/webapp/channels/src/components/main_menu/main_menu.tsx b/webapp/channels/src/components/main_menu/main_menu.tsx
index 6b42d9c87d..7999bb7128 100644
--- a/webapp/channels/src/components/main_menu/main_menu.tsx
+++ b/webapp/channels/src/components/main_menu/main_menu.tsx
@@ -9,7 +9,7 @@ import {Permissions} from 'mattermost-redux/constants';
 import * as GlobalActions from 'actions/global_actions';
 import {FREEMIUM_TO_ENTERPRISE_TRIAL_LENGTH_DAYS} from 'utils/cloud_utils';
 import {Constants, LicenseSkus, ModalIdentifiers, MattermostFeatures} from 'utils/constants';
-import {cmdOrCtrlPressed, isKeyPressed} from 'utils/utils';
+import {cmdOrCtrlPressed, isKeyPressed} from 'utils/keyboard';
 import {makeUrlSafe} from 'utils/url';
 import * as UserAgent from 'utils/user_agent';
 import InvitationModal from 'components/invitation_modal';
diff --git a/webapp/channels/src/components/menu/menu.tsx b/webapp/channels/src/components/menu/menu.tsx
index 9e10805fbb..d41703c2a4 100644
--- a/webapp/channels/src/components/menu/menu.tsx
+++ b/webapp/channels/src/components/menu/menu.tsx
@@ -20,7 +20,7 @@ import {getIsMobileView} from 'selectors/views/browser';
 import {openModal, closeModal} from 'actions/views/modals';
 
 import Constants, {A11yClassNames} from 'utils/constants';
-import {isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
 
 import CompassDesignProvider from 'components/compass_design_provider';
 import Tooltip from 'components/tooltip';
diff --git a/webapp/channels/src/components/menu/menu_item.tsx b/webapp/channels/src/components/menu/menu_item.tsx
index 78d75d3324..157afe2a9b 100644
--- a/webapp/channels/src/components/menu/menu_item.tsx
+++ b/webapp/channels/src/components/menu/menu_item.tsx
@@ -7,7 +7,7 @@ import MuiMenuItem from '@mui/material/MenuItem';
 import type {MenuItemProps as MuiMenuItemProps} from '@mui/material/MenuItem';
 
 import Constants from 'utils/constants';
-import {isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
 
 export interface Props extends MuiMenuItemProps {
 
diff --git a/webapp/channels/src/components/menu/sub_menu.tsx b/webapp/channels/src/components/menu/sub_menu.tsx
index b63260f9e2..0a5f2061d1 100644
--- a/webapp/channels/src/components/menu/sub_menu.tsx
+++ b/webapp/channels/src/components/menu/sub_menu.tsx
@@ -14,7 +14,7 @@ import {isAnyModalOpen} from 'selectors/views/modals';
 import {openModal, closeModal} from 'actions/views/modals';
 
 import Constants, {A11yClassNames} from 'utils/constants';
-import {isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
 
 import CompassDesignProvider from 'components/compass_design_provider';
 import GenericModal from 'components/generic_modal';
diff --git a/webapp/channels/src/components/mfa/confirm.tsx b/webapp/channels/src/components/mfa/confirm.tsx
index 54932f3cc0..b912d65ae4 100644
--- a/webapp/channels/src/components/mfa/confirm.tsx
+++ b/webapp/channels/src/components/mfa/confirm.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
 import Constants from 'utils/constants';
-import {isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
 
 import {redirectUserToDefaultTeam} from 'actions/global_actions';
 
diff --git a/webapp/channels/src/components/multiselect/multiselect_list.tsx b/webapp/channels/src/components/multiselect/multiselect_list.tsx
index 4ca33a2b49..cc86ac97e3 100644
--- a/webapp/channels/src/components/multiselect/multiselect_list.tsx
+++ b/webapp/channels/src/components/multiselect/multiselect_list.tsx
@@ -8,7 +8,7 @@ import {getOptionValue} from 'react-select/src/builtins';
 import {FormattedMessage} from 'react-intl';
 
 import Constants from 'utils/constants';
-import {cmdOrCtrlPressed} from 'utils/utils';
+import {cmdOrCtrlPressed} from 'utils/keyboard';
 
 import LoadingScreen from 'components/loading_screen';
 
diff --git a/webapp/channels/src/components/new_replies_banner/new_replies_banner.tsx b/webapp/channels/src/components/new_replies_banner/new_replies_banner.tsx
index 49ff0f69d6..fcf9726300 100644
--- a/webapp/channels/src/components/new_replies_banner/new_replies_banner.tsx
+++ b/webapp/channels/src/components/new_replies_banner/new_replies_banner.tsx
@@ -5,7 +5,7 @@ import React, {memo, useEffect, useCallback} from 'react';
 import {FormattedMessage, useIntl} from 'react-intl';
 
 import Constants from 'utils/constants';
-import {isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
 
 import Toast from 'components/toast/toast';
 
diff --git a/webapp/channels/src/components/post_reminder_custom_time_picker_modal/post_reminder_custom_time_picker_modal.tsx b/webapp/channels/src/components/post_reminder_custom_time_picker_modal/post_reminder_custom_time_picker_modal.tsx
index bfb12cb0b0..6e73b8889e 100644
--- a/webapp/channels/src/components/post_reminder_custom_time_picker_modal/post_reminder_custom_time_picker_modal.tsx
+++ b/webapp/channels/src/components/post_reminder_custom_time_picker_modal/post_reminder_custom_time_picker_modal.tsx
@@ -6,7 +6,8 @@ import {FormattedMessage} from 'react-intl';
 import {Moment} from 'moment-timezone';
 
 import GenericModal from 'components/generic_modal';
-import {isKeyPressed, localizeMessage} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
+import {localizeMessage} from 'utils/utils';
 import DateTimeInput, {getRoundedTime} from 'components/custom_status/date_time_input';
 
 import {toUTCUnix} from 'utils/datetime';
diff --git a/webapp/channels/src/components/profile_popover/profile_popover.tsx b/webapp/channels/src/components/profile_popover/profile_popover.tsx
index 286cf45bba..8b2b687634 100644
--- a/webapp/channels/src/components/profile_popover/profile_popover.tsx
+++ b/webapp/channels/src/components/profile_popover/profile_popover.tsx
@@ -20,6 +20,7 @@ import {ModalData} from 'types/actions';
 import {getHistory} from 'utils/browser_history';
 import Constants, {A11yClassNames, A11yCustomEventTypes, A11yFocusEventDetail, ModalIdentifiers, UserStatuses} from 'utils/constants';
 import {t} from 'utils/i18n';
+import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
 import {shouldFocusMainTextbox} from 'utils/post_utils';
 
@@ -338,7 +339,7 @@ class ProfilePopover extends React.PureComponent<ProfilePopoverProps, ProfilePop
     handleKeyDown = (e: React.KeyboardEvent) => {
         if (shouldFocusMainTextbox(e, document.activeElement)) {
             this.props.hide?.();
-        } else if (Utils.isKeyPressed(e, Constants.KeyCodes.ESCAPE)) {
+        } else if (Keyboard.isKeyPressed(e, Constants.KeyCodes.ESCAPE)) {
             this.returnFocus();
         }
     };
diff --git a/webapp/channels/src/components/search/search.tsx b/webapp/channels/src/components/search/search.tsx
index 8b40d8300a..45b71dc13b 100644
--- a/webapp/channels/src/components/search/search.tsx
+++ b/webapp/channels/src/components/search/search.tsx
@@ -11,7 +11,7 @@ import {getCurrentChannelNameForSearchShortcut} from 'mattermost-redux/selectors
 import {isServerVersionGreaterThanOrEqualTo} from 'utils/server_version';
 import {isDesktopApp, getDesktopVersion, isMacApp} from 'utils/user_agent';
 import Constants, {searchHintOptions, RHSStates, searchFilesHintOptions} from 'utils/constants';
-import * as Utils from 'utils/utils';
+import * as Keyboard from 'utils/keyboard';
 
 import HeaderIconWrapper from 'components/channel_header/components/header_icon_wrapper';
 import SearchHint from 'components/search_hint/search_hint';
@@ -109,7 +109,7 @@ const Search: React.FC<Props> = (props: Props): JSX.Element => {
         }
 
         const handleKeyDown = (e: KeyboardEvent) => {
-            if (Utils.cmdOrCtrlPressed(e) && Utils.isKeyPressed(e, Constants.KeyCodes.F)) {
+            if (Keyboard.cmdOrCtrlPressed(e) && Keyboard.isKeyPressed(e, Constants.KeyCodes.F)) {
                 if (!isDesktop && !e.shiftKey) {
                     return;
                 }
diff --git a/webapp/channels/src/components/search_bar/search_bar.tsx b/webapp/channels/src/components/search_bar/search_bar.tsx
index 78f23e70a7..706ee5cded 100644
--- a/webapp/channels/src/components/search_bar/search_bar.tsx
+++ b/webapp/channels/src/components/search_bar/search_bar.tsx
@@ -6,7 +6,7 @@ import classNames from 'classnames';
 import {FormattedMessage, useIntl} from 'react-intl';
 
 import Constants from 'utils/constants';
-import * as Utils from 'utils/utils';
+import * as Keyboard from 'utils/keyboard';
 
 import SuggestionDate from 'components/suggestion/suggestion_date';
 import SearchSuggestionList from 'components/suggestion/search_suggestion_list';
@@ -71,27 +71,27 @@ const SearchBar: React.FunctionComponent<Props> = (props: Props): JSX.Element =>
     }, [searchTerms]);
 
     const handleKeyDown = (e: ChangeEvent<HTMLInputElement>): void => {
-        if (Utils.isKeyPressed(e as any, KeyCodes.ESCAPE)) {
+        if (Keyboard.isKeyPressed(e as any, KeyCodes.ESCAPE)) {
             searchRef.current?.blur();
             e.stopPropagation();
             e.preventDefault();
         }
 
-        if (Utils.isKeyPressed(e as any, KeyCodes.DOWN)) {
+        if (Keyboard.isKeyPressed(e as any, KeyCodes.DOWN)) {
             e.preventDefault();
             props.updateHighlightedSearchHint(1, true);
         }
 
-        if (Utils.isKeyPressed(e as any, KeyCodes.UP)) {
+        if (Keyboard.isKeyPressed(e as any, KeyCodes.UP)) {
             e.preventDefault();
             props.updateHighlightedSearchHint(-1, true);
         }
 
-        if (Utils.isKeyPressed(e as any, KeyCodes.ENTER)) {
+        if (Keyboard.isKeyPressed(e as any, KeyCodes.ENTER)) {
             props.handleEnterKey(e);
         }
 
-        if (Utils.isKeyPressed(e as any, KeyCodes.BACKSPACE) && !searchTerms) {
+        if (Keyboard.isKeyPressed(e as any, KeyCodes.BACKSPACE) && !searchTerms) {
             if (props.clearSearchType) {
                 props.clearSearchType();
             }
diff --git a/webapp/channels/src/components/search_results/messages_or_files_selector.tsx b/webapp/channels/src/components/search_results/messages_or_files_selector.tsx
index d65833c8cc..dbd1bbddbb 100644
--- a/webapp/channels/src/components/search_results/messages_or_files_selector.tsx
+++ b/webapp/channels/src/components/search_results/messages_or_files_selector.tsx
@@ -7,7 +7,7 @@ import {FormattedMessage} from 'react-intl';
 import {SearchFilterType} from '../search/types';
 import {SearchType} from 'types/store/rhs';
 
-import * as Utils from 'utils/utils';
+import * as Keyboard from 'utils/keyboard';
 import Constants from 'utils/constants';
 
 import FilesFilterMenu from './files_filter_menu';
@@ -32,7 +32,7 @@ export default function MessagesOrFilesSelector(props: Props): JSX.Element {
             <div className='buttons-container'>
                 <button
                     onClick={() => props.onChange('messages')}
-                    onKeyDown={(e: React.KeyboardEvent<HTMLSpanElement>) => Utils.isKeyPressed(e, KeyCodes.ENTER) && props.onChange('messages')}
+                    onKeyDown={(e: React.KeyboardEvent<HTMLSpanElement>) => Keyboard.isKeyPressed(e, KeyCodes.ENTER) && props.onChange('messages')}
                     className={props.selected === 'messages' ? 'active tab messages-tab' : 'tab messages-tab'}
                 >
                     <FormattedMessage
@@ -44,7 +44,7 @@ export default function MessagesOrFilesSelector(props: Props): JSX.Element {
                 {props.isFileAttachmentsEnabled &&
                     <button
                         onClick={() => props.onChange('files')}
-                        onKeyDown={(e: React.KeyboardEvent<HTMLSpanElement>) => Utils.isKeyPressed(e, KeyCodes.ENTER) && props.onChange('files')}
+                        onKeyDown={(e: React.KeyboardEvent<HTMLSpanElement>) => Keyboard.isKeyPressed(e, KeyCodes.ENTER) && props.onChange('files')}
                         className={props.selected === 'files' ? 'active tab files-tab' : 'tab files-tab'}
                     >
                         <FormattedMessage
diff --git a/webapp/channels/src/components/search_shortcut/search_shortcut.test.tsx b/webapp/channels/src/components/search_shortcut/search_shortcut.test.tsx
index 80562287d5..f56cbaca92 100644
--- a/webapp/channels/src/components/search_shortcut/search_shortcut.test.tsx
+++ b/webapp/channels/src/components/search_shortcut/search_shortcut.test.tsx
@@ -13,12 +13,6 @@ describe('components/SearchShortcut', () => {
             return {
                 ...original,
                 isDesktopApp: jest.fn(() => false),
-            };
-        });
-        jest.mock('utils/utils', () => {
-            const original = jest.requireActual('utils/utils');
-            return {
-                ...original,
                 isMac: jest.fn(() => false),
             };
         });
@@ -33,12 +27,6 @@ describe('components/SearchShortcut', () => {
             return {
                 ...original,
                 isDesktopApp: jest.fn(() => false),
-            };
-        });
-        jest.mock('utils/utils', () => {
-            const original = jest.requireActual('utils/utils');
-            return {
-                ...original,
                 isMac: jest.fn(() => true),
             };
         });
@@ -53,13 +41,7 @@ describe('components/SearchShortcut', () => {
             return {
                 ...original,
                 isDesktopApp: jest.fn(() => true),
-            };
-        });
-        jest.mock('utils/utils', () => {
-            const original = jest.requireActual('utils/utils');
-            return {
-                ...original,
-                isMac: jest.fn(() => false),
+                isMac: jest.fn(() => true),
             };
         });
 
@@ -73,12 +55,6 @@ describe('components/SearchShortcut', () => {
             return {
                 ...original,
                 isDesktopApp: jest.fn(() => true),
-            };
-        });
-        jest.mock('utils/utils', () => {
-            const original = jest.requireActual('utils/utils');
-            return {
-                ...original,
                 isMac: jest.fn(() => true),
             };
         });
diff --git a/webapp/channels/src/components/search_shortcut/search_shortcut.tsx b/webapp/channels/src/components/search_shortcut/search_shortcut.tsx
index 6eb19b7078..6a212ab079 100644
--- a/webapp/channels/src/components/search_shortcut/search_shortcut.tsx
+++ b/webapp/channels/src/components/search_shortcut/search_shortcut.tsx
@@ -6,8 +6,7 @@ import classNames from 'classnames';
 
 import {ShortcutKey, ShortcutKeyVariant} from 'components/shortcut_key';
 
-import {isMac} from 'utils/utils';
-import {isDesktopApp} from 'utils/user_agent';
+import {isDesktopApp, isMac} from 'utils/user_agent';
 
 import './search_shortcut.scss';
 
diff --git a/webapp/channels/src/components/setting_item_max.tsx b/webapp/channels/src/components/setting_item_max.tsx
index fb96b13bfa..0b98f5ed5e 100644
--- a/webapp/channels/src/components/setting_item_max.tsx
+++ b/webapp/channels/src/components/setting_item_max.tsx
@@ -6,7 +6,8 @@ import {FormattedMessage} from 'react-intl';
 
 import SaveButton from 'components/save_button';
 import Constants from 'utils/constants';
-import {a11yFocus, isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
+import {a11yFocus} from 'utils/utils';
 type Props = {
 
     // Array of inputs selection
diff --git a/webapp/channels/src/components/settings_sidebar/settings_sidebar.tsx b/webapp/channels/src/components/settings_sidebar/settings_sidebar.tsx
index df32607d70..650f4ff1be 100644
--- a/webapp/channels/src/components/settings_sidebar/settings_sidebar.tsx
+++ b/webapp/channels/src/components/settings_sidebar/settings_sidebar.tsx
@@ -5,7 +5,8 @@ import React, {RefObject} from 'react';
 
 import * as UserAgent from 'utils/user_agent';
 import Constants from 'utils/constants';
-import {a11yFocus, isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
+import {a11yFocus} from 'utils/utils';
 
 export type Tab = {
     icon: string;
diff --git a/webapp/channels/src/components/sidebar/channel_filter/channel_filter.tsx b/webapp/channels/src/components/sidebar/channel_filter/channel_filter.tsx
index 7b60be7507..efa5a26c30 100644
--- a/webapp/channels/src/components/sidebar/channel_filter/channel_filter.tsx
+++ b/webapp/channels/src/components/sidebar/channel_filter/channel_filter.tsx
@@ -9,7 +9,7 @@ import {injectIntl, IntlShape} from 'react-intl';
 import {trackEvent} from 'actions/telemetry_actions';
 import OverlayTrigger from 'components/overlay_trigger';
 import Tooltip from 'components/tooltip';
-import * as Utils from 'utils/utils';
+import * as Keyboard from 'utils/keyboard';
 import Constants from 'utils/constants';
 import KeyboardShortcutSequence, {KEYBOARD_SHORTCUTS} from 'components/keyboard_shortcuts/keyboard_shortcuts_sequence';
 
@@ -38,7 +38,7 @@ export class ChannelFilter extends React.PureComponent<Props> {
     };
 
     handleUnreadFilterKeyPress = (e: KeyboardEvent) => {
-        if (Utils.cmdOrCtrlPressed(e) && e.shiftKey && Utils.isKeyPressed(e, Constants.KeyCodes.U)) {
+        if (Keyboard.cmdOrCtrlPressed(e) && e.shiftKey && Keyboard.isKeyPressed(e, Constants.KeyCodes.U)) {
             e.preventDefault();
             e.stopPropagation();
             this.toggleUnreadFilter();
diff --git a/webapp/channels/src/components/sidebar/channel_navigator/channel_navigator.tsx b/webapp/channels/src/components/sidebar/channel_navigator/channel_navigator.tsx
index 34f1f94b9e..cc5b5f8d97 100644
--- a/webapp/channels/src/components/sidebar/channel_navigator/channel_navigator.tsx
+++ b/webapp/channels/src/components/sidebar/channel_navigator/channel_navigator.tsx
@@ -11,6 +11,8 @@ import QuickSwitchModal from 'components/quick_switch_modal';
 import {ModalData} from 'types/actions';
 
 import Constants, {ModalIdentifiers} from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
+import * as UserAgent from 'utils/user_agent';
 import * as Utils from 'utils/utils';
 
 import ChannelFilter from '../channel_filter';
@@ -64,12 +66,12 @@ export default class ChannelNavigator extends React.PureComponent<Props> {
     handleShortcut = (e: KeyboardEvent) => {
         const {actions: {closeModal}} = this.props;
 
-        if (Utils.cmdOrCtrlPressed(e) && e.shiftKey) {
-            if (Utils.isKeyPressed(e, Constants.KeyCodes.M)) {
+        if (Keyboard.cmdOrCtrlPressed(e) && e.shiftKey) {
+            if (Keyboard.isKeyPressed(e, Constants.KeyCodes.M)) {
                 e.preventDefault();
                 closeModal(ModalIdentifiers.QUICK_SWITCH);
             }
-            if (Utils.isKeyPressed(e, Constants.KeyCodes.L)) {
+            if (Keyboard.isKeyPressed(e, Constants.KeyCodes.L)) {
                 // just close the modal if it's open, but let someone else handle the shortcut
                 closeModal(ModalIdentifiers.QUICK_SWITCH);
             }
@@ -77,7 +79,7 @@ export default class ChannelNavigator extends React.PureComponent<Props> {
     };
 
     handleQuickSwitchKeyPress = (e: KeyboardEvent) => {
-        if (Utils.cmdOrCtrlPressed(e) && !e.shiftKey && Utils.isKeyPressed(e, Constants.KeyCodes.K)) {
+        if (Keyboard.cmdOrCtrlPressed(e) && !e.shiftKey && Keyboard.isKeyPressed(e, Constants.KeyCodes.K)) {
             if (!e.altKey) {
                 e.preventDefault();
                 this.toggleQuickSwitchModal();
@@ -123,7 +125,7 @@ export default class ChannelNavigator extends React.PureComponent<Props> {
                         defaultMessage='Find channel'
                     />
                     <div className={'SidebarChannelNavigator_shortcutText'}>
-                        {`${Utils.isMac() ? '⌘' : 'Ctrl+'}K`}
+                        {`${UserAgent.isMac() ? '⌘' : 'Ctrl+'}K`}
                     </div>
                 </button>
             </div>
diff --git a/webapp/channels/src/components/sidebar/sidebar.tsx b/webapp/channels/src/components/sidebar/sidebar.tsx
index 6473d9607c..30f2e72a61 100644
--- a/webapp/channels/src/components/sidebar/sidebar.tsx
+++ b/webapp/channels/src/components/sidebar/sidebar.tsx
@@ -19,6 +19,7 @@ import {ModalData} from 'types/actions';
 import {RhsState} from 'types/store/rhs';
 
 import Constants, {ModalIdentifiers, RHSStates} from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
 
 import CreateUserGroupsModal from 'components/create_user_groups_modal';
@@ -98,15 +99,15 @@ export default class Sidebar extends React.PureComponent<Props, State> {
     };
 
     handleKeyDownEvent = (event: KeyboardEvent) => {
-        if (Utils.isKeyPressed(event, Constants.KeyCodes.ESCAPE)) {
+        if (Keyboard.isKeyPressed(event, Constants.KeyCodes.ESCAPE)) {
             this.props.actions.clearChannelSelection();
             return;
         }
 
-        const ctrlOrMetaKeyPressed = Utils.cmdOrCtrlPressed(event, true);
+        const ctrlOrMetaKeyPressed = Keyboard.cmdOrCtrlPressed(event, true);
 
         if (ctrlOrMetaKeyPressed) {
-            if (Utils.isKeyPressed(event, Constants.KeyCodes.FORWARD_SLASH)) {
+            if (Keyboard.isKeyPressed(event, Constants.KeyCodes.FORWARD_SLASH)) {
                 event.preventDefault();
                 if (this.props.isKeyBoardShortcutModalOpen) {
                     this.props.actions.closeModal(ModalIdentifiers.KEYBOARD_SHORTCUTS_MODAL);
@@ -116,7 +117,7 @@ export default class Sidebar extends React.PureComponent<Props, State> {
                         dialogType: KeyboardShortcutsModal,
                     });
                 }
-            } else if (Utils.isKeyPressed(event, Constants.KeyCodes.A) && event.shiftKey) {
+            } else if (Keyboard.isKeyPressed(event, Constants.KeyCodes.A) && event.shiftKey) {
                 event.preventDefault();
 
                 this.props.actions.openModal({
diff --git a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category.tsx b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category.tsx
index 579341205f..a150e7005e 100644
--- a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category.tsx
+++ b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category.tsx
@@ -16,7 +16,7 @@ import Tooltip from 'components/tooltip';
 import {DraggingState} from 'types/store';
 import Constants, {A11yCustomEventTypes, DraggingStateTypes, DraggingStates, Preferences, Touched} from 'utils/constants';
 import {t} from 'utils/i18n';
-import {isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
 import SidebarChannel from '../sidebar_channel';
 import {SidebarCategoryHeader} from '../sidebar_category_header';
 import InviteMembersButton from '../invite_members_button';
diff --git a/webapp/channels/src/components/sidebar/sidebar_channel/sidebar_channel_link/sidebar_channel_link.tsx b/webapp/channels/src/components/sidebar/sidebar_channel/sidebar_channel_link/sidebar_channel_link.tsx
index 471d4aa329..6c41780368 100644
--- a/webapp/channels/src/components/sidebar/sidebar_channel/sidebar_channel_link/sidebar_channel_link.tsx
+++ b/webapp/channels/src/components/sidebar/sidebar_channel/sidebar_channel_link/sidebar_channel_link.tsx
@@ -15,8 +15,9 @@ import Tooltip from 'components/tooltip';
 
 import Constants, {RHSStates} from 'utils/constants';
 import {wrapEmojis} from 'utils/emoji_utils';
+import {cmdOrCtrlPressed} from 'utils/keyboard';
 import {isDesktopApp} from 'utils/user_agent';
-import {cmdOrCtrlPressed, localizeMessage} from 'utils/utils';
+import {localizeMessage} from 'utils/utils';
 import {ChannelsAndDirectMessagesTour} from 'components/tours/onboarding_tour';
 
 import CustomStatusEmoji from 'components/custom_status/custom_status_emoji';
diff --git a/webapp/channels/src/components/sidebar/sidebar_list/sidebar_list.tsx b/webapp/channels/src/components/sidebar/sidebar_list/sidebar_list.tsx
index e07152ce42..02eac11ace 100644
--- a/webapp/channels/src/components/sidebar/sidebar_list/sidebar_list.tsx
+++ b/webapp/channels/src/components/sidebar/sidebar_list/sidebar_list.tsx
@@ -17,6 +17,7 @@ import {General} from 'mattermost-redux/constants';
 import {trackEvent} from 'actions/telemetry_actions';
 import {DraggingState} from 'types/store';
 import {Constants, DraggingStates, DraggingStateTypes} from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
 import {StaticPage} from 'types/store/lhs';
 
@@ -314,7 +315,7 @@ export default class SidebarList extends React.PureComponent<Props, State> {
     };
 
     navigateChannelShortcut = (e: KeyboardEvent) => {
-        if (e.altKey && !e.shiftKey && !e.ctrlKey && !e.metaKey && (Utils.isKeyPressed(e, Constants.KeyCodes.UP) || Utils.isKeyPressed(e, Constants.KeyCodes.DOWN))) {
+        if (e.altKey && !e.shiftKey && !e.ctrlKey && !e.metaKey && (Keyboard.isKeyPressed(e, Constants.KeyCodes.UP) || Keyboard.isKeyPressed(e, Constants.KeyCodes.DOWN))) {
             e.preventDefault();
 
             const staticPageIds = this.getDisplayedStaticPageIds();
@@ -324,7 +325,7 @@ export default class SidebarList extends React.PureComponent<Props, State> {
             const curIndex = allIds.indexOf(curSelectedId);
 
             let nextIndex;
-            if (Utils.isKeyPressed(e, Constants.KeyCodes.DOWN)) {
+            if (Keyboard.isKeyPressed(e, Constants.KeyCodes.DOWN)) {
                 nextIndex = curIndex + 1;
             } else {
                 nextIndex = curIndex - 1;
@@ -335,13 +336,13 @@ export default class SidebarList extends React.PureComponent<Props, State> {
             if (nextIndex >= staticPageIds.length) {
                 this.scrollToChannel(nextId);
             }
-        } else if (Utils.cmdOrCtrlPressed(e) && e.shiftKey && Utils.isKeyPressed(e, Constants.KeyCodes.K)) {
+        } else if (Keyboard.cmdOrCtrlPressed(e) && e.shiftKey && Keyboard.isKeyPressed(e, Constants.KeyCodes.K)) {
             this.props.handleOpenMoreDirectChannelsModal(e);
         }
     };
 
     navigateUnreadChannelShortcut = (e: KeyboardEvent) => {
-        if (e.altKey && e.shiftKey && !e.ctrlKey && !e.metaKey && (Utils.isKeyPressed(e, Constants.KeyCodes.UP) || Utils.isKeyPressed(e, Constants.KeyCodes.DOWN))) {
+        if (e.altKey && e.shiftKey && !e.ctrlKey && !e.metaKey && (Keyboard.isKeyPressed(e, Constants.KeyCodes.UP) || Keyboard.isKeyPressed(e, Constants.KeyCodes.DOWN))) {
             e.preventDefault();
 
             const allChannelIds = this.getDisplayedChannelIds();
@@ -356,7 +357,7 @@ export default class SidebarList extends React.PureComponent<Props, State> {
             }
 
             let direction = 0;
-            if (Utils.isKeyPressed(e, Constants.KeyCodes.UP)) {
+            if (Keyboard.isKeyPressed(e, Constants.KeyCodes.UP)) {
                 direction = -1;
             } else {
                 direction = 1;
diff --git a/webapp/channels/src/components/sidebar_right/sidebar_right.tsx b/webapp/channels/src/components/sidebar_right/sidebar_right.tsx
index 69dbab0702..5399e083a3 100644
--- a/webapp/channels/src/components/sidebar_right/sidebar_right.tsx
+++ b/webapp/channels/src/components/sidebar_right/sidebar_right.tsx
@@ -13,7 +13,8 @@ import {RhsState} from 'types/store/rhs';
 import {trackEvent} from 'actions/telemetry_actions.jsx';
 
 import Constants from 'utils/constants';
-import {isMac, cmdOrCtrlPressed, isKeyPressed} from 'utils/utils';
+import {isMac} from 'utils/user_agent';
+import {cmdOrCtrlPressed, isKeyPressed} from 'utils/keyboard';
 
 import FileUploadOverlay from 'components/file_upload_overlay';
 import RhsThread from 'components/rhs_thread';
diff --git a/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies.ts b/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies.ts
index bb26212fb4..08a5a61e3a 100644
--- a/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies.ts
+++ b/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser_dependencies.ts
@@ -75,10 +75,8 @@ export {
     filterEmptyOptions,
 } from 'utils/apps';
 
-import {
-    isMac,
-    localizeAndFormatMessage,
-} from 'utils/utils';
+import {isMac} from 'utils/user_agent';
+import {localizeAndFormatMessage} from 'utils/utils';
 
 export type Store = {
     dispatch: DispatchFunc;
diff --git a/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx b/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx
index 0a5e73b6f2..81388a97d5 100644
--- a/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx
+++ b/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx
@@ -14,7 +14,6 @@ import {AutocompleteSuggestion, CommandArgs} from '@mattermost/types/integration
 import globalStore from 'stores/redux_store';
 
 import * as UserAgent from 'utils/user_agent';
-import * as Utils from 'utils/utils';
 import {Constants} from 'utils/constants';
 
 import Suggestion from '../suggestion';
@@ -229,7 +228,7 @@ export default class CommandProvider extends Provider {
                 let matches: AutocompleteSuggestion[] = [];
 
                 let cmd = 'Ctrl';
-                if (Utils.isMac()) {
+                if (UserAgent.isMac()) {
                     cmd = '⌘';
                 }
 
diff --git a/webapp/channels/src/components/suggestion/search_date_suggestion/search_date_suggestion.tsx b/webapp/channels/src/components/suggestion/search_date_suggestion/search_date_suggestion.tsx
index ab6ecf6f38..0de0c3239c 100644
--- a/webapp/channels/src/components/suggestion/search_date_suggestion/search_date_suggestion.tsx
+++ b/webapp/channels/src/components/suggestion/search_date_suggestion/search_date_suggestion.tsx
@@ -9,6 +9,7 @@ import type {Locale} from 'date-fns';
 
 import Suggestion from '../suggestion.jsx';
 
+import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
 import Constants from 'utils/constants';
 
@@ -27,9 +28,9 @@ export default class SearchDateSuggestion extends Suggestion {
     };
 
     handleKeyDown = (e: KeyboardEvent) => {
-        if (Utils.isKeyPressed(e, Constants.KeyCodes.DOWN) && document.activeElement?.id === 'searchBox') {
+        if (Keyboard.isKeyPressed(e, Constants.KeyCodes.DOWN) && document.activeElement?.id === 'searchBox') {
             this.setState({datePickerFocused: true});
-        } else if (Utils.isKeyPressed(e, Constants.KeyCodes.ESCAPE)) {
+        } else if (Keyboard.isKeyPressed(e, Constants.KeyCodes.ESCAPE)) {
             this.props.handleEscape();
         }
     };
diff --git a/webapp/channels/src/components/suggestion/suggestion_box/suggestion_box.jsx b/webapp/channels/src/components/suggestion/suggestion_box/suggestion_box.jsx
index 73cc071e88..71456f1512 100644
--- a/webapp/channels/src/components/suggestion/suggestion_box/suggestion_box.jsx
+++ b/webapp/channels/src/components/suggestion/suggestion_box/suggestion_box.jsx
@@ -8,6 +8,7 @@ import EventEmitter from 'mattermost-redux/utils/event_emitter';
 
 import QuickInput from 'components/quick_input';
 import Constants, {A11yCustomEventTypes} from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import * as UserAgent from 'utils/user_agent';
 import * as Utils from 'utils/utils';
 
@@ -497,7 +498,7 @@ export default class SuggestionBox extends React.PureComponent {
 
         if (finish && this.props.onKeyPress) {
             let ke = e;
-            if (!e || Utils.isKeyPressed(e, Constants.KeyCodes.TAB)) {
+            if (!e || Keyboard.isKeyPressed(e, Constants.KeyCodes.TAB)) {
                 ke = new KeyboardEvent('keydown', {
                     bubbles: true, cancelable: true, keyCode: 13,
                 });
@@ -582,13 +583,13 @@ export default class SuggestionBox extends React.PureComponent {
     handleKeyDown = (e) => {
         if ((this.props.openWhenEmpty || this.props.value) && this.hasSuggestions()) {
             const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey;
-            if (Utils.isKeyPressed(e, KeyCodes.UP)) {
+            if (Keyboard.isKeyPressed(e, KeyCodes.UP)) {
                 this.selectPrevious();
                 e.preventDefault();
-            } else if (Utils.isKeyPressed(e, KeyCodes.DOWN)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.DOWN)) {
                 this.selectNext();
                 e.preventDefault();
-            } else if ((Utils.isKeyPressed(e, KeyCodes.ENTER) && !ctrlOrMetaKeyPressed) || (this.props.completeOnTab && Utils.isKeyPressed(e, KeyCodes.TAB))) {
+            } else if ((Keyboard.isKeyPressed(e, KeyCodes.ENTER) && !ctrlOrMetaKeyPressed) || (this.props.completeOnTab && Keyboard.isKeyPressed(e, KeyCodes.TAB))) {
                 let matchedPretext = '';
                 for (let i = 0; i < this.state.terms.length; i++) {
                     if (this.state.terms[i] === this.state.selection) {
@@ -611,7 +612,7 @@ export default class SuggestionBox extends React.PureComponent {
                     this.props.onKeyDown(e);
                 }
                 e.preventDefault();
-            } else if (Utils.isKeyPressed(e, KeyCodes.ESCAPE)) {
+            } else if (Keyboard.isKeyPressed(e, KeyCodes.ESCAPE)) {
                 this.clear();
                 this.setState({presentationType: 'text'});
                 e.preventDefault();
diff --git a/webapp/channels/src/components/team_controller/team_controller.tsx b/webapp/channels/src/components/team_controller/team_controller.tsx
index 256f9d8d13..a520697214 100644
--- a/webapp/channels/src/components/team_controller/team_controller.tsx
+++ b/webapp/channels/src/components/team_controller/team_controller.tsx
@@ -10,8 +10,8 @@ import {ActionResult} from 'mattermost-redux/types/actions';
 import {reconnect} from 'actions/websocket_actions.jsx';
 
 import Constants from 'utils/constants';
+import {cmdOrCtrlPressed, isKeyPressed} from 'utils/keyboard';
 import {isIosSafari} from 'utils/user_agent';
-import {cmdOrCtrlPressed, isKeyPressed} from 'utils/utils';
 
 import {makeAsyncComponent} from 'components/async_load';
 import ChannelController from 'components/channel_layout/channel_controller';
diff --git a/webapp/channels/src/components/team_sidebar/team_sidebar.tsx b/webapp/channels/src/components/team_sidebar/team_sidebar.tsx
index cbe9f90113..2abafac9d3 100644
--- a/webapp/channels/src/components/team_sidebar/team_sidebar.tsx
+++ b/webapp/channels/src/components/team_sidebar/team_sidebar.tsx
@@ -13,6 +13,7 @@ import {Team} from '@mattermost/types/teams';
 import Permissions from 'mattermost-redux/constants/permissions';
 
 import {Constants} from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import {filterAndSortTeamsByDisplayName} from 'utils/team_utils';
 import * as Utils from 'utils/utils';
 
@@ -71,9 +72,9 @@ export default class TeamSidebar extends React.PureComponent<Props, State> {
     }
 
     switchToPrevOrNextTeam = (e: KeyboardEvent, currentTeamId: string, teams: Team[]) => {
-        if (Utils.isKeyPressed(e, Constants.KeyCodes.UP) || Utils.isKeyPressed(e, Constants.KeyCodes.DOWN)) {
+        if (Keyboard.isKeyPressed(e, Constants.KeyCodes.UP) || Keyboard.isKeyPressed(e, Constants.KeyCodes.DOWN)) {
             e.preventDefault();
-            const delta = Utils.isKeyPressed(e, Constants.KeyCodes.DOWN) ? 1 : -1;
+            const delta = Keyboard.isKeyPressed(e, Constants.KeyCodes.DOWN) ? 1 : -1;
             const pos = teams.findIndex((team: Team) => team.id === currentTeamId);
             const newPos = pos + delta;
 
@@ -107,7 +108,7 @@ export default class TeamSidebar extends React.PureComponent<Props, State> {
         ];
 
         for (const idx in digits) {
-            if (Utils.isKeyPressed(e, digits[idx]) && parseInt(idx, 10) < teams.length) {
+            if (Keyboard.isKeyPressed(e, digits[idx]) && parseInt(idx, 10) < teams.length) {
                 e.preventDefault();
 
                 // prevents reloading the current team, while still capturing the keyboard shortcut
diff --git a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx
index 06a3d7dd7b..c49571f1c9 100644
--- a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx
+++ b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx
@@ -8,7 +8,7 @@ import {isEmpty} from 'lodash';
 
 import {PlaylistCheckIcon} from '@mattermost/compass-icons/components';
 
-import * as Utils from 'utils/utils';
+import * as Keyboard from 'utils/keyboard';
 import {getThreadCountsInCurrentTeam} from 'mattermost-redux/selectors/entities/threads';
 import {getThreads, markAllThreadsInTeamRead} from 'mattermost-redux/actions/threads';
 import {trackEvent} from 'actions/telemetry_actions';
@@ -80,7 +80,7 @@ const ThreadList = ({
             return;
         }
         const comboKeyPressed = e.altKey || e.metaKey || e.shiftKey || e.ctrlKey;
-        if (comboKeyPressed || (!Utils.isKeyPressed(e, Constants.KeyCodes.DOWN) && !Utils.isKeyPressed(e, Constants.KeyCodes.UP))) {
+        if (comboKeyPressed || (!Keyboard.isKeyPressed(e, Constants.KeyCodes.DOWN) && !Keyboard.isKeyPressed(e, Constants.KeyCodes.UP))) {
             return;
         }
 
@@ -94,7 +94,7 @@ const ThreadList = ({
         let threadIdToSelect = 0;
         if (selectedThreadId) {
             const selectedThreadIndex = data.indexOf(selectedThreadId);
-            if (Utils.isKeyPressed(e, Constants.KeyCodes.DOWN)) {
+            if (Keyboard.isKeyPressed(e, Constants.KeyCodes.DOWN)) {
                 if (selectedThreadIndex < data.length - 1) {
                     threadIdToSelect = selectedThreadIndex + 1;
                 }
@@ -104,7 +104,7 @@ const ThreadList = ({
                 }
             }
 
-            if (Utils.isKeyPressed(e, Constants.KeyCodes.UP)) {
+            if (Keyboard.isKeyPressed(e, Constants.KeyCodes.UP)) {
                 if (selectedThreadIndex > 0) {
                     threadIdToSelect = selectedThreadIndex - 1;
                 } else {
diff --git a/webapp/channels/src/components/toast_wrapper/toast_wrapper.tsx b/webapp/channels/src/components/toast_wrapper/toast_wrapper.tsx
index 45f0033ffa..11b37d203d 100644
--- a/webapp/channels/src/components/toast_wrapper/toast_wrapper.tsx
+++ b/webapp/channels/src/components/toast_wrapper/toast_wrapper.tsx
@@ -7,8 +7,9 @@ import {RouteComponentProps} from 'react-router-dom';
 
 import {Preferences} from 'mattermost-redux/constants';
 
+import {isKeyPressed} from 'utils/keyboard';
 import {isIdNotPost, getNewMessageIndex} from 'utils/post_utils';
-import {isKeyPressed, localizeMessage} from 'utils/utils';
+import {localizeMessage} from 'utils/utils';
 import {isToday} from 'utils/datetime';
 import Constants from 'utils/constants';
 import {getHistory} from 'utils/browser_history';
diff --git a/webapp/channels/src/components/tours/crt_tour/collapsed_reply_threads_modal/collapsed_reply_threads_modal.tsx b/webapp/channels/src/components/tours/crt_tour/collapsed_reply_threads_modal/collapsed_reply_threads_modal.tsx
index 8f529e9df0..106cccae55 100644
--- a/webapp/channels/src/components/tours/crt_tour/collapsed_reply_threads_modal/collapsed_reply_threads_modal.tsx
+++ b/webapp/channels/src/components/tours/crt_tour/collapsed_reply_threads_modal/collapsed_reply_threads_modal.tsx
@@ -13,7 +13,7 @@ import GenericModal from 'components/generic_modal';
 import NextIcon from 'components/widgets/icons/fa_next_icon';
 import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 import {Constants, ModalIdentifiers, Preferences} from 'utils/constants';
-import * as Utils from 'utils/utils';
+import * as Keyboard from 'utils/keyboard';
 
 import './collapsed_reply_threads_modal.scss';
 import {AutoTourStatus, TTNameMapToATStatusKey, TutorialTourName} from '../../constant';
@@ -26,7 +26,7 @@ function CollapsedReplyThreadsModal(props: Props) {
     const dispatch = useDispatch();
     const currentUserId = useSelector(getCurrentUserId);
     const handleKeyDown = useCallback((e: KeyboardEvent) => {
-        if (Utils.isKeyPressed(e, Constants.KeyCodes.ENTER)) {
+        if (Keyboard.isKeyPressed(e, Constants.KeyCodes.ENTER)) {
             onNext();
         }
     }, []);
diff --git a/webapp/channels/src/components/update_user_group_modal/update_user_group_modal.tsx b/webapp/channels/src/components/update_user_group_modal/update_user_group_modal.tsx
index aeae2f4969..e82b9c802f 100644
--- a/webapp/channels/src/components/update_user_group_modal/update_user_group_modal.tsx
+++ b/webapp/channels/src/components/update_user_group_modal/update_user_group_modal.tsx
@@ -7,6 +7,7 @@ import {Modal} from 'react-bootstrap';
 
 import {FormattedMessage} from 'react-intl';
 
+import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
 import {CustomGroupPatch, Group} from '@mattermost/types/groups';
 
@@ -52,7 +53,7 @@ const UpdateUserGroupModal = (props: Props) => {
     }, [name, mention, hasUpdated, saving]);
 
     const handleKeyDown = useCallback((e: KeyboardEvent) => {
-        if (Utils.isKeyPressed(e, Constants.KeyCodes.ENTER) && isSaveEnabled()) {
+        if (Keyboard.isKeyPressed(e, Constants.KeyCodes.ENTER) && isSaveEnabled()) {
             patchGroup();
         }
     }, [name, mention, hasUpdated, saving]);
diff --git a/webapp/channels/src/components/user_group_popover/user_group_popover.tsx b/webapp/channels/src/components/user_group_popover/user_group_popover.tsx
index e543e9ff86..523df8f013 100644
--- a/webapp/channels/src/components/user_group_popover/user_group_popover.tsx
+++ b/webapp/channels/src/components/user_group_popover/user_group_popover.tsx
@@ -14,7 +14,7 @@ import {Group} from '@mattermost/types/groups';
 import {ActionResult} from 'mattermost-redux/types/actions';
 
 import {shouldFocusMainTextbox} from 'utils/post_utils';
-import * as Utils from 'utils/utils';
+import * as Keyboard from 'utils/keyboard';
 import Constants, {A11yClassNames, A11yCustomEventTypes, A11yFocusEventDetail, ModalIdentifiers} from 'utils/constants';
 
 import {QuickInput} from 'components/quick_input/quick_input';
@@ -169,7 +169,7 @@ const UserGroupPopover = (props: Props) => {
     const handleKeyDown = (e: React.KeyboardEvent) => {
         if (shouldFocusMainTextbox(e, document.activeElement)) {
             hide();
-        } else if (Utils.isKeyPressed(e, Constants.KeyCodes.ESCAPE)) {
+        } else if (Keyboard.isKeyPressed(e, Constants.KeyCodes.ESCAPE)) {
             returnFocus();
         }
     };
diff --git a/webapp/channels/src/components/user_settings/advanced/user_settings_advanced.test.tsx b/webapp/channels/src/components/user_settings/advanced/user_settings_advanced.test.tsx
index 03854f35ef..9ef4be1ef2 100644
--- a/webapp/channels/src/components/user_settings/advanced/user_settings_advanced.test.tsx
+++ b/webapp/channels/src/components/user_settings/advanced/user_settings_advanced.test.tsx
@@ -8,10 +8,10 @@ import AdvancedSettingsDisplay from 'components/user_settings/advanced/user_sett
 
 import {Preferences} from 'utils/constants';
 import {TestHelper} from 'utils/test_helper';
-import {isMac} from 'utils/utils';
+import {isMac} from 'utils/user_agent';
 
 jest.mock('actions/global_actions');
-jest.mock('utils/utils');
+jest.mock('utils/user_agent');
 
 describe('components/user_settings/display/UserSettingsDisplay', () => {
     const user = TestHelper.getUserMock({
diff --git a/webapp/channels/src/components/user_settings/advanced/user_settings_advanced.tsx b/webapp/channels/src/components/user_settings/advanced/user_settings_advanced.tsx
index 660ca1e8ae..c4dc2b556e 100644
--- a/webapp/channels/src/components/user_settings/advanced/user_settings_advanced.tsx
+++ b/webapp/channels/src/components/user_settings/advanced/user_settings_advanced.tsx
@@ -10,7 +10,8 @@ import {emitUserLoggedOutEvent} from 'actions/global_actions';
 
 import Constants, {AdvancedSections, Preferences} from 'utils/constants';
 import {t} from 'utils/i18n';
-import {a11yFocus, isMac, localizeMessage} from 'utils/utils';
+import {isMac} from 'utils/user_agent';
+import {a11yFocus, localizeMessage} from 'utils/utils';
 
 import SettingItemMax from 'components/setting_item_max';
 import ConfirmModal from 'components/confirm_modal';
diff --git a/webapp/channels/src/components/user_settings/display/manage_languages/manage_languages.tsx b/webapp/channels/src/components/user_settings/display/manage_languages/manage_languages.tsx
index 98c30d1668..1ed2d04de9 100644
--- a/webapp/channels/src/components/user_settings/display/manage_languages/manage_languages.tsx
+++ b/webapp/channels/src/components/user_settings/display/manage_languages/manage_languages.tsx
@@ -10,7 +10,7 @@ import SettingItemMax from 'components/setting_item_max';
 import {ActionResult} from 'mattermost-redux/types/actions';
 
 import * as I18n from 'i18n/i18n.jsx';
-import {isKeyPressed} from 'utils/utils';
+import {isKeyPressed} from 'utils/keyboard';
 import Constants from 'utils/constants';
 
 import {UserProfile} from '@mattermost/types/users';
diff --git a/webapp/channels/src/components/user_settings/modal/user_settings_modal.tsx b/webapp/channels/src/components/user_settings/modal/user_settings_modal.tsx
index 1c0fc6f932..bdba21b1e6 100644
--- a/webapp/channels/src/components/user_settings/modal/user_settings_modal.tsx
+++ b/webapp/channels/src/components/user_settings/modal/user_settings_modal.tsx
@@ -15,6 +15,7 @@ import {UserProfile} from '@mattermost/types/users';
 import {StatusOK} from '@mattermost/types/client4';
 import store from 'stores/redux_store.jsx';
 import Constants from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
 import {t} from 'utils/i18n';
 import ConfirmModal from 'components/confirm_modal';
@@ -146,7 +147,7 @@ class UserSettingsModal extends React.PureComponent<Props, State> {
     }
 
     handleKeyDown = (e: KeyboardEvent) => {
-        if (Utils.cmdOrCtrlPressed(e) && e.shiftKey && Utils.isKeyPressed(e, Constants.KeyCodes.A)) {
+        if (Keyboard.cmdOrCtrlPressed(e) && e.shiftKey && Keyboard.isKeyPressed(e, Constants.KeyCodes.A)) {
             e.preventDefault();
             this.handleHide();
         }
diff --git a/webapp/channels/src/components/user_settings/notifications/desktop_notification_setting/desktop_notification_settings.test.tsx b/webapp/channels/src/components/user_settings/notifications/desktop_notification_setting/desktop_notification_settings.test.tsx
index d703d781ed..722e917ac2 100644
--- a/webapp/channels/src/components/user_settings/notifications/desktop_notification_setting/desktop_notification_settings.test.tsx
+++ b/webapp/channels/src/components/user_settings/notifications/desktop_notification_setting/desktop_notification_settings.test.tsx
@@ -8,8 +8,8 @@ import {NotificationLevels} from 'utils/constants';
 
 import DesktopNotificationSettings from './desktop_notification_settings';
 
-jest.mock('utils/utils', () => {
-    const original = jest.requireActual('utils/utils');
+jest.mock('utils/notification_sounds', () => {
+    const original = jest.requireActual('utils/notification_sounds');
     return {
         ...original,
         hasSoundOptions: jest.fn(() => true),
diff --git a/webapp/channels/src/components/user_settings/notifications/desktop_notification_setting/desktop_notification_settings.tsx b/webapp/channels/src/components/user_settings/notifications/desktop_notification_setting/desktop_notification_settings.tsx
index 9c0d3eefa2..56a7e711ba 100644
--- a/webapp/channels/src/components/user_settings/notifications/desktop_notification_setting/desktop_notification_settings.tsx
+++ b/webapp/channels/src/components/user_settings/notifications/desktop_notification_setting/desktop_notification_settings.tsx
@@ -8,6 +8,7 @@ import {FormattedMessage} from 'react-intl';
 import semver from 'semver';
 
 import {NotificationLevels} from 'utils/constants';
+import * as NotificationSounds from 'utils/notification_sounds';
 import * as Utils from 'utils/utils';
 import {t} from 'utils/i18n';
 import {isDesktopApp} from 'utils/user_agent';
@@ -86,7 +87,7 @@ export default class DesktopNotificationSettings extends React.PureComponent<Pro
         if (selectedOption && 'value' in selectedOption) {
             this.props.setParentState('desktopNotificationSound', selectedOption.value);
             this.setState({selectedOption});
-            Utils.tryNotificationSound(selectedOption.value);
+            NotificationSounds.tryNotificationSound(selectedOption.value);
         }
     };
 
@@ -123,7 +124,7 @@ export default class DesktopNotificationSettings extends React.PureComponent<Pro
             }
 
             if (this.props.sound === 'true') {
-                const sounds = Array.from(Utils.notificationSounds.keys());
+                const sounds = Array.from(NotificationSounds.notificationSounds.keys());
                 const options = sounds.map((sound) => {
                     return {value: sound, label: sound};
                 });
@@ -144,7 +145,7 @@ export default class DesktopNotificationSettings extends React.PureComponent<Pro
                 }
             }
 
-            if (Utils.hasSoundOptions()) {
+            if (NotificationSounds.hasSoundOptions()) {
                 soundSection = (
                     <fieldset>
                         <legend className='form-legend'>
@@ -344,7 +345,7 @@ export default class DesktopNotificationSettings extends React.PureComponent<Pro
 
     buildMinimizedSetting = () => {
         let formattedMessageProps;
-        const hasSoundOption = Utils.hasSoundOptions();
+        const hasSoundOption = NotificationSounds.hasSoundOptions();
         if (this.props.activity === NotificationLevels.MENTION) {
             if (hasSoundOption && this.props.sound !== 'false') {
                 formattedMessageProps = {
diff --git a/webapp/channels/src/components/user_settings/security/user_access_token_section/user_access_token_section.tsx b/webapp/channels/src/components/user_settings/security/user_access_token_section/user_access_token_section.tsx
index 8305f05080..261cbe2bd1 100644
--- a/webapp/channels/src/components/user_settings/security/user_access_token_section/user_access_token_section.tsx
+++ b/webapp/channels/src/components/user_settings/security/user_access_token_section/user_access_token_section.tsx
@@ -8,6 +8,7 @@ import * as UserUtils from 'mattermost-redux/utils/user_utils';
 
 import {trackEvent} from 'actions/telemetry_actions.jsx';
 import Constants from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import {isMobile} from 'utils/user_agent';
 import * as Utils from 'utils/utils';
 import ConfirmModal from 'components/confirm_modal';
@@ -263,7 +264,7 @@ export default class UserAccessTokenSection extends React.PureComponent<Props, S
     };
 
     saveTokenKeyPress = (e: React.KeyboardEvent) => {
-        if (Utils.isKeyPressed(e, Constants.KeyCodes.ENTER)) {
+        if (Keyboard.isKeyPressed(e, Constants.KeyCodes.ENTER)) {
             this.confirmCreateToken();
         }
     };
diff --git a/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.tsx b/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.tsx
index 3f3308aedc..3e9b58eef1 100644
--- a/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.tsx
+++ b/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.tsx
@@ -4,6 +4,7 @@
 import React, {CSSProperties} from 'react';
 import classNames from 'classnames';
 
+import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
 import {showMobileSubMenuModal} from 'actions/global_actions';
 
@@ -113,7 +114,7 @@ export default class SubMenuItem extends React.PureComponent<Props, State> {
     };
 
     handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
-        if (Utils.isKeyPressed(event, Constants.KeyCodes.ENTER)) {
+        if (Keyboard.isKeyPressed(event, Constants.KeyCodes.ENTER)) {
             if (this.props.action) {
                 this.onClick(event);
             } else {
@@ -121,7 +122,7 @@ export default class SubMenuItem extends React.PureComponent<Props, State> {
             }
         }
 
-        if (Utils.isKeyPressed(event, Constants.KeyCodes.RIGHT)) {
+        if (Keyboard.isKeyPressed(event, Constants.KeyCodes.RIGHT)) {
             if (this.props.direction === 'right') {
                 this.show();
             } else {
@@ -129,7 +130,7 @@ export default class SubMenuItem extends React.PureComponent<Props, State> {
             }
         }
 
-        if (Utils.isKeyPressed(event, Constants.KeyCodes.LEFT)) {
+        if (Keyboard.isKeyPressed(event, Constants.KeyCodes.LEFT)) {
             if (this.props.direction === 'left') {
                 this.show();
             } else {
diff --git a/webapp/channels/src/selectors/urls.ts b/webapp/channels/src/selectors/urls.ts
new file mode 100644
index 0000000000..02773eec18
--- /dev/null
+++ b/webapp/channels/src/selectors/urls.ts
@@ -0,0 +1,53 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Post} from '@mattermost/types/posts';
+import {Channel} from '@mattermost/types/channels';
+import {Team} from '@mattermost/types/teams';
+
+import {getRedirectChannelNameForTeam} from 'mattermost-redux/selectors/entities/channels';
+import {
+    getCurrentRelativeTeamUrl,
+    getCurrentTeam,
+    getCurrentTeamId,
+    getTeam,
+} from 'mattermost-redux/selectors/entities/teams';
+
+import {GlobalState} from 'types/store';
+
+import Constants from 'utils/constants';
+
+function getTeamRelativeUrl(team: Team | undefined) {
+    if (!team) {
+        return '';
+    }
+
+    return '/' + team.name;
+}
+
+export function getPermalinkURL(state: GlobalState, teamId: Team['id'], postId: Post['id']): string {
+    let team = getTeam(state, teamId);
+    if (!team) {
+        team = getCurrentTeam(state);
+    }
+    return `${getTeamRelativeUrl(team)}/pl/${postId}`;
+}
+
+export function getChannelURL(state: GlobalState, channel: Channel, teamId: string): string {
+    let notificationURL;
+    if (channel && (channel.type === Constants.DM_CHANNEL || channel.type === Constants.GM_CHANNEL)) {
+        notificationURL = getCurrentRelativeTeamUrl(state) + '/channels/' + channel.name;
+    } else if (channel) {
+        const team = getTeam(state, teamId);
+        notificationURL = getTeamRelativeUrl(team) + '/channels/' + channel.name;
+    } else if (teamId) {
+        const team = getTeam(state, teamId);
+        const redirectChannel = getRedirectChannelNameForTeam(state, teamId);
+        notificationURL = getTeamRelativeUrl(team) + `/channels/${redirectChannel}`;
+    } else {
+        const currentTeamId = getCurrentTeamId(state);
+        const redirectChannel = getRedirectChannelNameForTeam(state, currentTeamId);
+        notificationURL = getCurrentRelativeTeamUrl(state) + `/channels/${redirectChannel}`;
+    }
+    return notificationURL;
+}
diff --git a/webapp/channels/src/utils/a11y_controller.ts b/webapp/channels/src/utils/a11y_controller.ts
index 404c721106..96b655df72 100644
--- a/webapp/channels/src/utils/a11y_controller.ts
+++ b/webapp/channels/src/utils/a11y_controller.ts
@@ -2,8 +2,8 @@
 // See LICENSE.txt for license information.
 
 import Constants, {EventTypes, A11yClassNames, A11yAttributeNames, A11yCustomEventTypes, isA11yFocusEventDetail} from 'utils/constants';
-import {isKeyPressed, cmdOrCtrlPressed, isMac} from 'utils/utils';
-import {isDesktopApp} from 'utils/user_agent';
+import {isKeyPressed, cmdOrCtrlPressed} from 'utils/keyboard';
+import {isDesktopApp, isMac} from 'utils/user_agent';
 
 const listenerOptions = {
     capture: true,
diff --git a/webapp/channels/src/utils/keyboard.test.ts b/webapp/channels/src/utils/keyboard.test.ts
new file mode 100644
index 0000000000..e72c93c598
--- /dev/null
+++ b/webapp/channels/src/utils/keyboard.test.ts
@@ -0,0 +1,145 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import * as Keyboard from './keyboard';
+
+describe('isKeyPressed', () => {
+    test('Key match is used over keyCode if it exists', () => {
+        for (const data of [
+            {
+                event: new KeyboardEvent('keydown', {key: '/', keyCode: 55}),
+                key: ['/', 191],
+                valid: true,
+            },
+            {
+                event: new KeyboardEvent('keydown', {key: 'ù', keyCode: 191}),
+                key: ['/', 191],
+                valid: true,
+            },
+        ]) {
+            expect(Keyboard.isKeyPressed(data.event, data.key as [string, number])).toEqual(data.valid);
+        }
+    });
+
+    test('Key match works for both uppercase and lower case', () => {
+        for (const data of [
+            {
+                event: new KeyboardEvent('keydown', {key: 'A', keyCode: 65, code: 'KeyA'}),
+                key: ['a', 65],
+                valid: true,
+            },
+            {
+                event: new KeyboardEvent('keydown', {key: 'a', keyCode: 65, code: 'KeyA'}),
+                key: ['a', 65],
+                valid: true,
+            },
+        ]) {
+            expect(Keyboard.isKeyPressed(data.event, data.key as [string, number])).toEqual(data.valid);
+        }
+    });
+
+    test('KeyCode is used for dead letter keys', () => {
+        for (const data of [
+            {
+                event: new KeyboardEvent('keydown', {key: 'Dead', keyCode: 222}),
+                key: ['', 222],
+                valid: true,
+            },
+            {
+                event: new KeyboardEvent('keydown', {key: 'Dead', keyCode: 222}),
+                key: ['not-used-field', 222],
+                valid: true,
+            },
+            {
+                event: new KeyboardEvent('keydown', {key: 'Dead', keyCode: 222}),
+                key: [null, 222],
+                valid: true,
+            },
+            {
+                event: new KeyboardEvent('keydown', {key: 'Dead', keyCode: 222}),
+                key: [null, 223],
+                valid: false,
+            },
+        ]) {
+            expect(Keyboard.isKeyPressed(data.event, data.key as [string, number])).toEqual(data.valid);
+        }
+    });
+
+    test('KeyCode is used for unidentified keys', () => {
+        for (const data of [
+            {
+                event: new KeyboardEvent('keydown', {key: 'Unidentified', keyCode: 2220, code: 'Unidentified'}),
+                key: ['', 2220],
+                valid: true,
+            },
+            {
+                event: new KeyboardEvent('keydown', {key: 'Unidentified', keyCode: 2220, code: 'Unidentified'}),
+                key: ['not-used-field', 2220],
+                valid: true,
+            },
+            {
+                event: new KeyboardEvent('keydown', {key: 'Unidentified', keyCode: 2220, code: 'Unidentified'}),
+                key: [null, 2220],
+                valid: true,
+            },
+            {
+                event: new KeyboardEvent('keydown', {key: 'Unidentified', keyCode: 2220, code: 'Unidentified'}),
+                key: [null, 2221],
+                valid: false,
+            },
+        ]) {
+            expect(Keyboard.isKeyPressed(data.event, data.key as [string, number])).toEqual(data.valid);
+        }
+    });
+
+    test('KeyCode is used for undefined keys', () => {
+        for (const data of [
+            {
+                event: {keyCode: 2221},
+                key: ['', 2221],
+                valid: true,
+            },
+            {
+                event: {keyCode: 2221},
+                key: ['not-used-field', 2221],
+                valid: true,
+            },
+            {
+                event: {keyCode: 2221},
+                key: [null, 2221],
+                valid: true,
+            },
+            {
+                event: {keyCode: 2221},
+                key: [null, 2222],
+                valid: false,
+            },
+        ]) {
+            expect(Keyboard.isKeyPressed(data.event as KeyboardEvent, data.key as [string, number])).toEqual(data.valid);
+        }
+    });
+
+    test('keyCode is used for determining if it exists', () => {
+        for (const data of [
+            {
+                event: {key: 'a', keyCode: 65},
+                key: ['k', 65],
+                valid: true,
+            },
+            {
+                event: {key: 'b', keyCode: 66},
+                key: ['y', 66],
+                valid: true,
+            },
+        ]) {
+            expect(Keyboard.isKeyPressed(data.event as KeyboardEvent, data.key as [string, number])).toEqual(data.valid);
+        }
+    });
+
+    test('key should be tested as fallback for different layout of english keyboards', () => {
+        //key will be k for keyboards like dvorak but code will be keyV as `v` is pressed
+        const event = {key: 'k', code: 'KeyV'};
+        const key: [string, number] = ['k', 2221];
+        expect(Keyboard.isKeyPressed(event as KeyboardEvent, key)).toEqual(true);
+    });
+});
diff --git a/webapp/channels/src/utils/keyboard.ts b/webapp/channels/src/utils/keyboard.ts
new file mode 100644
index 0000000000..4a978d44db
--- /dev/null
+++ b/webapp/channels/src/utils/keyboard.ts
@@ -0,0 +1,35 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import Constants from 'utils/constants';
+import * as UserAgent from 'utils/user_agent';
+
+export function cmdOrCtrlPressed(e: React.KeyboardEvent | KeyboardEvent, allowAlt = false) {
+    const isMac = UserAgent.isMac();
+
+    if (allowAlt) {
+        return (isMac && e.metaKey) || (!isMac && e.ctrlKey);
+    }
+    return (isMac && e.metaKey) || (!isMac && e.ctrlKey && !e.altKey);
+}
+
+export function isKeyPressed(event: React.KeyboardEvent | KeyboardEvent, key: [string, number]) {
+    // There are two types of keyboards
+    // 1. English with different layouts(Ex: Dvorak)
+    // 2. Different language keyboards(Ex: Russian)
+
+    if (event.keyCode === Constants.KeyCodes.COMPOSING[1]) {
+        return false;
+    }
+
+    // checks for event.key for older browsers and also for the case of different English layout keyboards.
+    if (typeof event.key !== 'undefined' && event.key !== 'Unidentified' && event.key !== 'Dead') {
+        const isPressedByCode = event.key === key[0] || event.key === key[0].toUpperCase();
+        if (isPressedByCode) {
+            return true;
+        }
+    }
+
+    // used for different language keyboards to detect the position of keys
+    return event.keyCode === key[1];
+}
diff --git a/webapp/channels/src/utils/notification_sounds.ts b/webapp/channels/src/utils/notification_sounds.ts
new file mode 100644
index 0000000000..b2f8cf0e24
--- /dev/null
+++ b/webapp/channels/src/utils/notification_sounds.ts
@@ -0,0 +1,40 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import bing from 'sounds/bing.mp3';
+import crackle from 'sounds/crackle.mp3';
+import down from 'sounds/down.mp3';
+import hello from 'sounds/hello.mp3';
+import ripple from 'sounds/ripple.mp3';
+import upstairs from 'sounds/upstairs.mp3';
+
+import * as UserAgent from 'utils/user_agent';
+
+export const notificationSounds = new Map([
+    ['Bing', bing],
+    ['Crackle', crackle],
+    ['Down', down],
+    ['Hello', hello],
+    ['Ripple', ripple],
+    ['Upstairs', upstairs],
+]);
+
+let canDing = true;
+export function ding(name: string) {
+    if (hasSoundOptions() && canDing) {
+        tryNotificationSound(name);
+        canDing = false;
+        setTimeout(() => {
+            canDing = true;
+        }, 3000);
+    }
+}
+
+export function tryNotificationSound(name: string) {
+    const audio = new Audio(notificationSounds.get(name) ?? notificationSounds.get('Bing'));
+    audio.play();
+}
+
+export function hasSoundOptions() {
+    return (!UserAgent.isEdge());
+}
diff --git a/webapp/channels/src/utils/post_utils.ts b/webapp/channels/src/utils/post_utils.ts
index 07e613d45e..fea73c028d 100644
--- a/webapp/channels/src/utils/post_utils.ts
+++ b/webapp/channels/src/utils/post_utils.ts
@@ -42,11 +42,11 @@ import {getIsMobileView} from 'selectors/views/browser';
 import {GlobalState} from 'types/store';
 
 import Constants, {PostListRowListIds, Preferences} from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
 import {formatWithRenderer} from 'utils/markdown';
 import MentionableRenderer from 'utils/markdown/mentionable_renderer';
 import {allAtMentions} from 'utils/text_formatting';
 import {isMobile} from 'utils/user_agent';
-import * as Utils from 'utils/utils';
 
 import EmojiMap from './emoji_map';
 import * as Emoticons from './emoticons';
@@ -236,7 +236,7 @@ export function shouldFocusMainTextbox(e: React.KeyboardEvent | KeyboardEvent, a
     }
 
     // Focus if it is an attempted paste
-    if (Utils.cmdOrCtrlPressed(e) && Utils.isKeyPressed(e, Constants.KeyCodes.V)) {
+    if (Keyboard.cmdOrCtrlPressed(e) && Keyboard.isKeyPressed(e, Constants.KeyCodes.V)) {
         return true;
     }
 
@@ -257,7 +257,7 @@ export function shouldFocusMainTextbox(e: React.KeyboardEvent | KeyboardEvent, a
 
     // Do not focus when pressing space on link elements
     const spaceKeepFocusTags = ['BUTTON', 'A'];
-    if (Utils.isKeyPressed(e, Constants.KeyCodes.SPACE) && spaceKeepFocusTags.includes(activeElement.tagName)) {
+    if (Keyboard.isKeyPressed(e, Constants.KeyCodes.SPACE) && spaceKeepFocusTags.includes(activeElement.tagName)) {
         return false;
     }
 
@@ -311,7 +311,7 @@ export function postMessageOnKeyPress(
     }
 
     // Only ENTER sends, unless shift or alt key pressed.
-    if (!Utils.isKeyPressed(event, Constants.KeyCodes.ENTER) || event.shiftKey || event.altKey) {
+    if (!Keyboard.isKeyPressed(event, Constants.KeyCodes.ENTER) || event.shiftKey || event.altKey) {
         return {allowSending: false};
     }
 
diff --git a/webapp/channels/src/utils/user_agent.tsx b/webapp/channels/src/utils/user_agent.tsx
index 6a25b2d3b2..11f61f7676 100644
--- a/webapp/channels/src/utils/user_agent.tsx
+++ b/webapp/channels/src/utils/user_agent.tsx
@@ -142,6 +142,10 @@ export function isMac(): boolean {
     return userAgent().indexOf('Macintosh') !== -1;
 }
 
+export function isLinux(): boolean {
+    return navigator.platform.toUpperCase().indexOf('LINUX') >= 0;
+}
+
 export function isWindows7(): boolean {
     const appVersion = navigator.appVersion;
 
diff --git a/webapp/channels/src/utils/utils.test.tsx b/webapp/channels/src/utils/utils.test.tsx
index 56bcea6a5e..f271a282f2 100644
--- a/webapp/channels/src/utils/utils.test.tsx
+++ b/webapp/channels/src/utils/utils.test.tsx
@@ -292,147 +292,6 @@ describe('Utils.isValidUsername', () => {
     });
 });
 
-describe('Utils.isKeyPressed', () => {
-    test('Key match is used over keyCode if it exists', () => {
-        for (const data of [
-            {
-                event: new KeyboardEvent('keydown', {key: '/', keyCode: 55}),
-                key: ['/', 191],
-                valid: true,
-            },
-            {
-                event: new KeyboardEvent('keydown', {key: 'ù', keyCode: 191}),
-                key: ['/', 191],
-                valid: true,
-            },
-        ]) {
-            expect(Utils.isKeyPressed(data.event, data.key as [string, number])).toEqual(data.valid);
-        }
-    });
-
-    test('Key match works for both uppercase and lower case', () => {
-        for (const data of [
-            {
-                event: new KeyboardEvent('keydown', {key: 'A', keyCode: 65, code: 'KeyA'}),
-                key: ['a', 65],
-                valid: true,
-            },
-            {
-                event: new KeyboardEvent('keydown', {key: 'a', keyCode: 65, code: 'KeyA'}),
-                key: ['a', 65],
-                valid: true,
-            },
-        ]) {
-            expect(Utils.isKeyPressed(data.event, data.key as [string, number])).toEqual(data.valid);
-        }
-    });
-
-    test('KeyCode is used for dead letter keys', () => {
-        for (const data of [
-            {
-                event: new KeyboardEvent('keydown', {key: 'Dead', keyCode: 222}),
-                key: ['', 222],
-                valid: true,
-            },
-            {
-                event: new KeyboardEvent('keydown', {key: 'Dead', keyCode: 222}),
-                key: ['not-used-field', 222],
-                valid: true,
-            },
-            {
-                event: new KeyboardEvent('keydown', {key: 'Dead', keyCode: 222}),
-                key: [null, 222],
-                valid: true,
-            },
-            {
-                event: new KeyboardEvent('keydown', {key: 'Dead', keyCode: 222}),
-                key: [null, 223],
-                valid: false,
-            },
-        ]) {
-            expect(Utils.isKeyPressed(data.event, data.key as [string, number])).toEqual(data.valid);
-        }
-    });
-
-    test('KeyCode is used for unidentified keys', () => {
-        for (const data of [
-            {
-                event: new KeyboardEvent('keydown', {key: 'Unidentified', keyCode: 2220, code: 'Unidentified'}),
-                key: ['', 2220],
-                valid: true,
-            },
-            {
-                event: new KeyboardEvent('keydown', {key: 'Unidentified', keyCode: 2220, code: 'Unidentified'}),
-                key: ['not-used-field', 2220],
-                valid: true,
-            },
-            {
-                event: new KeyboardEvent('keydown', {key: 'Unidentified', keyCode: 2220, code: 'Unidentified'}),
-                key: [null, 2220],
-                valid: true,
-            },
-            {
-                event: new KeyboardEvent('keydown', {key: 'Unidentified', keyCode: 2220, code: 'Unidentified'}),
-                key: [null, 2221],
-                valid: false,
-            },
-        ]) {
-            expect(Utils.isKeyPressed(data.event, data.key as [string, number])).toEqual(data.valid);
-        }
-    });
-
-    test('KeyCode is used for undefined keys', () => {
-        for (const data of [
-            {
-                event: {keyCode: 2221},
-                key: ['', 2221],
-                valid: true,
-            },
-            {
-                event: {keyCode: 2221},
-                key: ['not-used-field', 2221],
-                valid: true,
-            },
-            {
-                event: {keyCode: 2221},
-                key: [null, 2221],
-                valid: true,
-            },
-            {
-                event: {keyCode: 2221},
-                key: [null, 2222],
-                valid: false,
-            },
-        ]) {
-            expect(Utils.isKeyPressed(data.event as KeyboardEvent, data.key as [string, number])).toEqual(data.valid);
-        }
-    });
-
-    test('keyCode is used for determining if it exists', () => {
-        for (const data of [
-            {
-                event: {key: 'a', keyCode: 65},
-                key: ['k', 65],
-                valid: true,
-            },
-            {
-                event: {key: 'b', keyCode: 66},
-                key: ['y', 66],
-                valid: true,
-            },
-        ]) {
-            expect(Utils.isKeyPressed(data.event as KeyboardEvent, data.key as [string, number])).toEqual(data.valid);
-        }
-    });
-
-    test('key should be tested as fallback for different layout of english keyboards', () => {
-        //key will be k for keyboards like dvorak but code will be keyV as `v` is pressed
-        const event = {key: 'k', code: 'KeyV'};
-        const key: [string, number] = ['k', 2221];
-        expect(Utils.isKeyPressed(event as KeyboardEvent, key)).toEqual(true);
-    });
-});
-
 describe('Utils.localizeMessage', () => {
     const originalGetState = store.getState;
 
diff --git a/webapp/channels/src/utils/utils.tsx b/webapp/channels/src/utils/utils.tsx
index 9f71b304d5..10f5c6283e 100644
--- a/webapp/channels/src/utils/utils.tsx
+++ b/webapp/channels/src/utils/utils.tsx
@@ -1,8 +1,6 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-/* eslint-disable max-lines */
-
 import React, {LinkHTMLAttributes} from 'react';
 import {FormattedMessage, IntlShape} from 'react-intl';
 
@@ -30,7 +28,6 @@ import {
     getChannel,
     getChannelsNameMapInTeam,
     getMyChannelMemberships,
-    getRedirectChannelNameForTeam,
 } from 'mattermost-redux/selectors/entities/channels';
 import {getPost} from 'mattermost-redux/selectors/entities/posts';
 import {getBool, getTeammateNameDisplaySetting, Theme, isCollapsedThreadsEnabled} from 'mattermost-redux/selectors/entities/preferences';
@@ -38,10 +35,6 @@ import {getCurrentUser, getCurrentUserId, isFirstAdmin} from 'mattermost-redux/s
 import {blendColors, changeOpacity} from 'mattermost-redux/utils/theme_utils';
 import {displayUsername, isSystemAdmin} from 'mattermost-redux/utils/user_utils';
 import {
-    getCurrentRelativeTeamUrl,
-    getCurrentTeam,
-    getCurrentTeamId,
-    getTeam,
     getTeamByName,
     getTeamMemberships,
     isTeamSameWithCurrentTeam,
@@ -50,14 +43,9 @@ import {
 import {addUserToTeam} from 'actions/team_actions';
 import {searchForTerm} from 'actions/post_actions';
 import {getHistory} from 'utils/browser_history';
+import * as Keyboard from 'utils/keyboard';
 import * as UserAgent from 'utils/user_agent';
 import {isDesktopApp} from 'utils/user_agent';
-import bing from 'sounds/bing.mp3';
-import crackle from 'sounds/crackle.mp3';
-import down from 'sounds/down.mp3';
-import hello from 'sounds/hello.mp3';
-import ripple from 'sounds/ripple.mp3';
-import upstairs from 'sounds/upstairs.mp3';
 import {t} from 'utils/i18n';
 import store from 'stores/redux_store.jsx';
 
@@ -108,14 +96,6 @@ export enum TimeInformation {
 export type TimeUnit = Exclude<TimeInformation, TimeInformation.FUTURE | TimeInformation.PAST>;
 export type TimeDirection = TimeInformation.FUTURE | TimeInformation.PAST;
 
-export function isMac() {
-    return navigator.platform.toUpperCase().indexOf('MAC') >= 0;
-}
-
-export function isLinux() {
-    return navigator.platform.toUpperCase().indexOf('LINUX') >= 0;
-}
-
 export function createSafeId(prop: {props: {defaultMessage: string}} | string): string | undefined {
     let str = '';
 
@@ -128,42 +108,14 @@ export function createSafeId(prop: {props: {defaultMessage: string}} | string):
     return str.replace(new RegExp(' ', 'g'), '_');
 }
 
-export function cmdOrCtrlPressed(e: React.KeyboardEvent | KeyboardEvent, allowAlt = false) {
-    if (allowAlt) {
-        return (isMac() && e.metaKey) || (!isMac() && e.ctrlKey);
-    }
-    return (isMac() && e.metaKey) || (!isMac() && e.ctrlKey && !e.altKey);
-}
-
-export function isKeyPressed(event: React.KeyboardEvent | KeyboardEvent, key: [string, number]) {
-    // There are two types of keyboards
-    // 1. English with different layouts(Ex: Dvorak)
-    // 2. Different language keyboards(Ex: Russian)
-
-    if (event.keyCode === Constants.KeyCodes.COMPOSING[1]) {
-        return false;
-    }
-
-    // checks for event.key for older browsers and also for the case of different English layout keyboards.
-    if (typeof event.key !== 'undefined' && event.key !== 'Unidentified' && event.key !== 'Dead') {
-        const isPressedByCode = event.key === key[0] || event.key === key[0].toUpperCase();
-        if (isPressedByCode) {
-            return true;
-        }
-    }
-
-    // used for different language keyboards to detect the position of keys
-    return event.keyCode === key[1];
-}
-
 /**
  * check keydown event for line break combo. Should catch alt/option + enter not all browsers except Safari
  */
 export function isUnhandledLineBreakKeyCombo(e: React.KeyboardEvent | KeyboardEvent): boolean {
     return Boolean(
-        isKeyPressed(e, Constants.KeyCodes.ENTER) &&
+        Keyboard.isKeyPressed(e, Constants.KeyCodes.ENTER) &&
         !e.shiftKey && // shift + enter is already handled everywhere, so don't handle again
-        (e.altKey && !UserAgent.isSafari() && !cmdOrCtrlPressed(e)), // alt/option + enter is already handled in Safari, so don't handle again
+        (e.altKey && !UserAgent.isSafari() && !Keyboard.cmdOrCtrlPressed(e)), // alt/option + enter is already handled in Safari, so don't handle again
     );
 }
 
@@ -186,83 +138,6 @@ export function insertLineBreakFromKeyEvent(e: React.KeyboardEvent<TextboxElemen
     return newValue;
 }
 
-export function isInRole(roles: string, inRole: string): boolean {
-    if (roles) {
-        const parts = roles.split(' ');
-        for (let i = 0; i < parts.length; i++) {
-            if (parts[i] === inRole) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-export function getTeamRelativeUrl(team: Team) {
-    if (!team) {
-        return '';
-    }
-
-    return '/' + team.name;
-}
-
-export function getPermalinkURL(state: GlobalState, teamId: Team['id'], postId: Post['id']): string {
-    let team = getTeam(state, teamId);
-    if (!team) {
-        team = getCurrentTeam(state);
-    }
-    return `${getTeamRelativeUrl(team)}/pl/${postId}`;
-}
-
-export function getChannelURL(state: GlobalState, channel: Channel, teamId: string): string {
-    let notificationURL;
-    if (channel && (channel.type === Constants.DM_CHANNEL || channel.type === Constants.GM_CHANNEL)) {
-        notificationURL = getCurrentRelativeTeamUrl(state) + '/channels/' + channel.name;
-    } else if (channel) {
-        const team = getTeam(state, teamId);
-        notificationURL = getTeamRelativeUrl(team) + '/channels/' + channel.name;
-    } else if (teamId) {
-        const team = getTeam(state, teamId);
-        const redirectChannel = getRedirectChannelNameForTeam(state, teamId);
-        notificationURL = getTeamRelativeUrl(team) + `/channels/${redirectChannel}`;
-    } else {
-        const currentTeamId = getCurrentTeamId(state);
-        const redirectChannel = getRedirectChannelNameForTeam(state, currentTeamId);
-        notificationURL = getCurrentRelativeTeamUrl(state) + `/channels/${redirectChannel}`;
-    }
-    return notificationURL;
-}
-
-export const notificationSounds = new Map([
-    ['Bing', bing],
-    ['Crackle', crackle],
-    ['Down', down],
-    ['Hello', hello],
-    ['Ripple', ripple],
-    ['Upstairs', upstairs],
-]);
-
-let canDing = true;
-export function ding(name: string) {
-    if (hasSoundOptions() && canDing) {
-        tryNotificationSound(name);
-        canDing = false;
-        setTimeout(() => {
-            canDing = true;
-        }, 3000);
-    }
-}
-
-export function tryNotificationSound(name: string) {
-    const audio = new Audio(notificationSounds.get(name) ?? notificationSounds.get('Bing'));
-    audio.play();
-}
-
-export function hasSoundOptions() {
-    return (!UserAgent.isEdge());
-}
-
 export function getDateForUnixTicks(ticks: number): Date {
     return new Date(ticks);
 }

From adff327b9c16acab7daea0391dd4fc7b357cf5a0 Mon Sep 17 00:00:00 2001
From: M-ZubairAhmed <m-zubairahmed@protonmail.com>
Date: Tue, 18 Apr 2023 01:04:45 +0530
Subject: [PATCH 093/103] MM-51977 : Remove inconsistencies of the duplicate
 IDs with different defaultMessages (#22965)

* eslint format lib to root

* eslint fixes

* no id rule removed

* same rectintl

* try 1

* eslint format lib to root

* eslint fixes

* no id rule removed

* same rectintl

* react intl in root

* type fix

* add back version to components

* missing translations added

* remove type casting

* a

* type fix formatjs

* snaps updated

* Update package-lock.json

* Update package-lock.json

* rem

* snapshot updates

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 webapp/channels/src/actions/command.ts        |   4 +-
 .../setting_picture.test.tsx.snap             |  16 +-
 .../top_channels_line_chart.test.tsx.snap     |   4 +-
 .../top_channels_line_chart.tsx               |   2 +-
 .../trial_banner/trial_banner.tsx             |  21 +-
 .../request_button.test.tsx.snap              |  36 +-
 .../request_button/request_button.test.tsx    |  28 +-
 .../admin_console/server_logs/log_list.tsx    |   2 +-
 .../cloud_trial_announcement_bar.tsx          |   2 +-
 .../apps_form/apps_form_component.tsx         |   6 +-
 .../apps_form/apps_form_container.tsx         |   6 +-
 .../channel_groups_manage_modal.tsx           |   2 +-
 .../cloud_start_trial_btn.tsx                 |  24 +-
 .../src/components/dot_menu/dot_menu.tsx      |   4 +-
 .../__snapshots__/panel_body.test.tsx.snap    |   4 +-
 .../components/emoji_picker_preview.tsx       |   2 +-
 .../src/components/error_page/error_page.tsx  |   4 +-
 .../file_preview_modal_main_nav.test.tsx.snap |   2 +-
 .../file_preview_modal_main_nav.tsx           |   2 +-
 .../header_footer_template.test.tsx.snap      |   8 +
 .../header_footer_template.tsx                |  20 +-
 .../abstract_incoming_hook.test.tsx.snap      |  12 +-
 .../abstract_outgoing_webhook.test.jsx.snap   |   2 +-
 .../installed_outgoing_webhook.test.jsx.snap  |   2 +-
 .../abstract_incoming_webhook.tsx             |   2 +-
 .../abstract_outgoing_webhook.jsx             |   2 +-
 .../__snapshots__/add_bot.test.tsx.snap       | 362 ++++++++++++++++++
 .../bots/add_bot/add_bot.test.tsx             |   8 +-
 .../integrations/bots/add_bot/add_bot.tsx     |   6 +-
 .../confirm_integration.test.tsx.snap         |   8 +-
 .../confirm_integration.tsx                   |   8 +-
 .../installed_oauth_apps.test.tsx.snap        |   2 +-
 .../installed_oauth_apps.tsx                  |   2 +-
 .../installed_outgoing_webhook.tsx            |   2 +-
 .../post_priority/post_priority_label.tsx     |   4 +-
 .../profile_popover.test.tsx.snap             |  20 +-
 .../profile_popover/profile_popover.tsx       |   2 +-
 .../success_page.tsx                          |   2 +-
 .../src/components/setting_picture.test.tsx   |   2 +-
 .../add_channels_cta_button.test.tsx.snap     |   4 +-
 .../sidebar/add_channels_cta_button.tsx       |   2 +-
 .../app_command_parser/app_command_parser.ts  |  12 +-
 .../team_groups_manage_modal.tsx              |   2 +-
 .../general/user_settings_general.tsx         |   2 +-
 .../email_notification_setting.test.tsx.snap  |   4 +-
 .../email_notification_setting.tsx            |   2 +-
 .../view_user_group_modal_header.tsx          |   2 +-
 webapp/channels/src/i18n/en.json              |  25 +-
 .../src/plugins/call_button/call_button.tsx   |   2 +-
 49 files changed, 565 insertions(+), 139 deletions(-)
 create mode 100644 webapp/channels/src/components/integrations/bots/add_bot/__snapshots__/add_bot.test.tsx.snap

diff --git a/webapp/channels/src/actions/command.ts b/webapp/channels/src/actions/command.ts
index 62195ac6dc..8b86ec2f43 100644
--- a/webapp/channels/src/actions/command.ts
+++ b/webapp/channels/src/actions/command.ts
@@ -175,7 +175,7 @@ export function executeCommand(message: string, args: CommandArgs): ActionFunc {
                         const errorResponse = res.error;
                         return createErrorMessage(errorResponse.text || intlShim.formatMessage({
                             id: 'apps.error.unknown',
-                            defaultMessage: 'Unknown error.',
+                            defaultMessage: 'Unknown error occurred.',
                         }));
                     }
 
@@ -201,7 +201,7 @@ export function executeCommand(message: string, args: CommandArgs): ActionFunc {
                         ));
                     }
                 } catch (err: any) {
-                    return createErrorMessage(err.message || localizeMessage('apps.error.unknown', 'Unknown error.'));
+                    return createErrorMessage(err.message || localizeMessage('apps.error.unknown', 'Unknown error occurred.'));
                 }
             }
         }
diff --git a/webapp/channels/src/components/__snapshots__/setting_picture.test.tsx.snap b/webapp/channels/src/components/__snapshots__/setting_picture.test.tsx.snap
index 0b9111bc4c..df524dcda4 100644
--- a/webapp/channels/src/components/__snapshots__/setting_picture.test.tsx.snap
+++ b/webapp/channels/src/components/__snapshots__/setting_picture.test.tsx.snap
@@ -34,7 +34,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
       >
         <MemoizedFormattedMessage
           defaultMessage="Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}"
-          id="setting_picture.help.profile"
+          id="setting_picture.help.profile.example"
           values={
             Object {
               "max": 52428800,
@@ -139,7 +139,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
       >
         <MemoizedFormattedMessage
           defaultMessage="Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}"
-          id="setting_picture.help.profile"
+          id="setting_picture.help.profile.example"
           values={
             Object {
               "max": 52428800,
@@ -254,7 +254,7 @@ exports[`components/SettingItemMin should match snapshot, on loading picture 1`]
       >
         <MemoizedFormattedMessage
           defaultMessage="Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}"
-          id="setting_picture.help.profile"
+          id="setting_picture.help.profile.example"
           values={
             Object {
               "max": 52428800,
@@ -381,7 +381,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on fil
       >
         <MemoizedFormattedMessage
           defaultMessage="Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}"
-          id="setting_picture.help.profile"
+          id="setting_picture.help.profile.example"
           values={
             Object {
               "max": 52428800,
@@ -496,7 +496,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on sou
       >
         <MemoizedFormattedMessage
           defaultMessage="Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}"
-          id="setting_picture.help.profile"
+          id="setting_picture.help.profile.example"
           values={
             Object {
               "max": 52428800,
@@ -623,7 +623,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on file 1`]
       >
         <MemoizedFormattedMessage
           defaultMessage="Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}"
-          id="setting_picture.help.profile"
+          id="setting_picture.help.profile.example"
           values={
             Object {
               "max": 52428800,
@@ -792,7 +792,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on source 1`
       >
         <MemoizedFormattedMessage
           defaultMessage="Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}"
-          id="setting_picture.help.profile"
+          id="setting_picture.help.profile.example"
           values={
             Object {
               "max": 52428800,
@@ -961,7 +961,7 @@ exports[`components/SettingItemMin should match snapshot, user icon on source 1`
       >
         <MemoizedFormattedMessage
           defaultMessage="Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}"
-          id="setting_picture.help.profile"
+          id="setting_picture.help.profile.example"
           values={
             Object {
               "max": 52428800,
diff --git a/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/__snapshots__/top_channels_line_chart.test.tsx.snap b/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/__snapshots__/top_channels_line_chart.test.tsx.snap
index 84b74087f6..7ece176a46 100644
--- a/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/__snapshots__/top_channels_line_chart.test.tsx.snap
+++ b/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/__snapshots__/top_channels_line_chart.test.tsx.snap
@@ -222,7 +222,7 @@ exports[`components/activity_and_insights/insights/top_channels should match sna
           title={
             <Memo(MemoizedFormattedMessage)
               defaultMessage="Top Channels"
-              id="analytics.system.totalBotPosts"
+              id="analytics.system.topChannels"
             />
           }
         >
@@ -237,7 +237,7 @@ exports[`components/activity_and_insights/insights/top_channels should match sna
               >
                 <FormattedMessage
                   defaultMessage="Top Channels"
-                  id="analytics.system.totalBotPosts"
+                  id="analytics.system.topChannels"
                 >
                   <span>
                     Top Channels
diff --git a/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/top_channels_line_chart.tsx b/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/top_channels_line_chart.tsx
index 8acab322b3..aa2d3d5bb4 100644
--- a/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/top_channels_line_chart.tsx
+++ b/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/top_channels_line_chart.tsx
@@ -115,7 +115,7 @@ const TopChannelsLineChart = ({topChannels, timeFrame, channelLineChartData, tim
         <LineChart
             title={
                 <FormattedMessage
-                    id='analytics.system.totalBotPosts'
+                    id='analytics.system.topChannels'
                     defaultMessage='Top Channels'
                 />
             }
diff --git a/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx b/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx
index ba97c6a2f0..17f13e3861 100644
--- a/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx
+++ b/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useState, ReactNode} from 'react';
 import {FormattedMessage, useIntl} from 'react-intl';
 import {useDispatch, useSelector} from 'react-redux';
 
@@ -106,7 +106,7 @@ const TrialBanner = ({
 
     const dispatch = useDispatch();
 
-    const btnText = (status: TrialLoadStatus): string => {
+    const btnText = (status: TrialLoadStatus) => {
         switch (status) {
         case TrialLoadStatus.Started:
             return formatMessage({id: 'start_trial.modal.gettingTrial', defaultMessage: 'Getting Trial...'});
@@ -115,7 +115,22 @@ const TrialBanner = ({
         case TrialLoadStatus.Failed:
             return formatMessage({id: 'start_trial.modal.failed', defaultMessage: 'Failed'});
         case TrialLoadStatus.Embargoed:
-            return formatMessage({id: 'admin.license.trial-request.embargoed'});
+            return formatMessage<ReactNode>(
+                {
+                    id: 'admin.license.trial-request.embargoed',
+                    defaultMessage: 'We were unable to process the request due to limitations for embargoed countries. <link>Learn more in our documentation</link>, or reach out to legal@mattermost.com for questions around export limitations.',
+                },
+                {
+                    link: (text: string) => (
+                        <ExternalLink
+                            location='trial_banner'
+                            href={LicenseLinks.EMBARGOED_COUNTRIES}
+                        >
+                            {text}
+                        </ExternalLink>
+                    ),
+                },
+            );
         default:
             return formatMessage({id: 'admin.license.trial-request.startTrial', defaultMessage: 'Start trial'});
         }
diff --git a/webapp/channels/src/components/admin_console/request_button/__snapshots__/request_button.test.tsx.snap b/webapp/channels/src/components/admin_console/request_button/__snapshots__/request_button.test.tsx.snap
index a13c3bb7ec..142bbd54a4 100644
--- a/webapp/channels/src/components/admin_console/request_button/__snapshots__/request_button.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/request_button/__snapshots__/request_button.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
         >
           <MemoizedFormattedMessage
             defaultMessage="Button Text"
-            id="test"
+            id="test2"
           />
         </LoadingWrapper>
       </button>
@@ -30,7 +30,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
     >
       <MemoizedFormattedMessage
         defaultMessage="Help Text"
-        id="test"
+        id="test1"
       />
     </div>
   </div>
@@ -42,7 +42,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
   buttonText={
     <Memo(MemoizedFormattedMessage)
       defaultMessage="Button Text"
-      id="test"
+      id="test2"
     />
   }
   disabled={false}
@@ -55,7 +55,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
   helpText={
     <Memo(MemoizedFormattedMessage)
       defaultMessage="Help Text"
-      id="test"
+      id="test1"
     />
   }
   includeDetailedError={true}
@@ -103,7 +103,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
           >
             <FormattedMessage
               defaultMessage="Button Text"
-              id="test"
+              id="test2"
             >
               <span>
                 Button Text
@@ -154,7 +154,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
       >
         <FormattedMessage
           defaultMessage="Help Text"
-          id="test"
+          id="test1"
         >
           <span>
             Help Text
@@ -171,7 +171,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
   buttonText={
     <Memo(MemoizedFormattedMessage)
       defaultMessage="Button Text"
-      id="test"
+      id="test2"
     />
   }
   disabled={false}
@@ -184,7 +184,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
   helpText={
     <Memo(MemoizedFormattedMessage)
       defaultMessage="Help Text"
-      id="test"
+      id="test1"
     />
   }
   includeDetailedError={false}
@@ -240,7 +240,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
           >
             <FormattedMessage
               defaultMessage="Button Text"
-              id="test"
+              id="test2"
             >
               <span>
                 Button Text
@@ -291,7 +291,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
       >
         <FormattedMessage
           defaultMessage="Help Text"
-          id="test"
+          id="test1"
         >
           <span>
             Help Text
@@ -308,7 +308,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
   buttonText={
     <Memo(MemoizedFormattedMessage)
       defaultMessage="Button Text"
-      id="test"
+      id="test2"
     />
   }
   disabled={false}
@@ -321,7 +321,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
   helpText={
     <Memo(MemoizedFormattedMessage)
       defaultMessage="Help Text"
-      id="test"
+      id="test1"
     />
   }
   includeDetailedError={false}
@@ -369,7 +369,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
           >
             <FormattedMessage
               defaultMessage="Button Text"
-              id="test"
+              id="test2"
             >
               <span>
                 Button Text
@@ -413,7 +413,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
       >
         <FormattedMessage
           defaultMessage="Help Text"
-          id="test"
+          id="test1"
         >
           <span>
             Help Text
@@ -430,7 +430,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
   buttonText={
     <Memo(MemoizedFormattedMessage)
       defaultMessage="Button Text"
-      id="test"
+      id="test2"
     />
   }
   disabled={false}
@@ -443,7 +443,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
   helpText={
     <Memo(MemoizedFormattedMessage)
       defaultMessage="Help Text"
-      id="test"
+      id="test1"
     />
   }
   includeDetailedError={false}
@@ -499,7 +499,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
           >
             <FormattedMessage
               defaultMessage="Button Text"
-              id="test"
+              id="test2"
             >
               <span>
                 Button Text
@@ -513,7 +513,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
       >
         <FormattedMessage
           defaultMessage="Help Text"
-          id="test"
+          id="test1"
         >
           <span>
             Help Text
diff --git a/webapp/channels/src/components/admin_console/request_button/request_button.test.tsx b/webapp/channels/src/components/admin_console/request_button/request_button.test.tsx
index f4ec173212..176669253f 100644
--- a/webapp/channels/src/components/admin_console/request_button/request_button.test.tsx
+++ b/webapp/channels/src/components/admin_console/request_button/request_button.test.tsx
@@ -18,13 +18,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => {
                 requestAction={emptyFunction}
                 helpText={
                     <FormattedMessage
-                        id='test'
+                        id='test1'
                         defaultMessage='Help Text'
                     />
                 }
                 buttonText={
                     <FormattedMessage
-                        id='test'
+                        id='test2'
                         defaultMessage='Button Text'
                     />
                 }
@@ -42,13 +42,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => {
                 requestAction={requestActionSuccess}
                 helpText={
                     <FormattedMessage
-                        id='test'
+                        id='test1'
                         defaultMessage='Help Text'
                     />
                 }
                 buttonText={
                     <FormattedMessage
-                        id='test'
+                        id='test2'
                         defaultMessage='Button Text'
                     />
                 }
@@ -72,13 +72,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => {
                 requestAction={requestActionSuccess}
                 helpText={
                     <FormattedMessage
-                        id='test'
+                        id='test1'
                         defaultMessage='Help Text'
                     />
                 }
                 buttonText={
                     <FormattedMessage
-                        id='test'
+                        id='test2'
                         defaultMessage='Button Text'
                     />
                 }
@@ -102,13 +102,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => {
                 requestAction={requestActionSuccess}
                 helpText={
                     <FormattedMessage
-                        id='test'
+                        id='test1'
                         defaultMessage='Help Text'
                     />
                 }
                 buttonText={
                     <FormattedMessage
-                        id='test'
+                        id='test2'
                         defaultMessage='Button Text'
                     />
                 }
@@ -129,13 +129,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => {
                 requestAction={requestActionSuccess}
                 helpText={
                     <FormattedMessage
-                        id='test'
+                        id='test1'
                         defaultMessage='Help Text'
                     />
                 }
                 buttonText={
                     <FormattedMessage
-                        id='test'
+                        id='test2'
                         defaultMessage='Button Text'
                     />
                 }
@@ -164,13 +164,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => {
                 requestAction={requestActionFailure}
                 helpText={
                     <FormattedMessage
-                        id='test'
+                        id='test1'
                         defaultMessage='Help Text'
                     />
                 }
                 buttonText={
                     <FormattedMessage
-                        id='test'
+                        id='test2'
                         defaultMessage='Button Text'
                     />
                 }
@@ -191,13 +191,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => {
                 requestAction={requestActionFailure}
                 helpText={
                     <FormattedMessage
-                        id='test'
+                        id='test1'
                         defaultMessage='Help Text'
                     />
                 }
                 buttonText={
                     <FormattedMessage
-                        id='test'
+                        id='test2'
                         defaultMessage='Button Text'
                     />
                 }
diff --git a/webapp/channels/src/components/admin_console/server_logs/log_list.tsx b/webapp/channels/src/components/admin_console/server_logs/log_list.tsx
index d73d3d4b4e..ce8fa09e16 100644
--- a/webapp/channels/src/components/admin_console/server_logs/log_list.tsx
+++ b/webapp/channels/src/components/admin_console/server_logs/log_list.tsx
@@ -95,7 +95,7 @@ export default class LogList extends React.PureComponent<Props, State> {
         );
         const level: JSX.Element = (
             <FormattedMessage
-                id='admin.log.logLevel'
+                id='admin.log.Level'
                 defaultMessage='Level'
             />
         );
diff --git a/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx b/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx
index 8224463d43..f03effb517 100644
--- a/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx
+++ b/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx
@@ -137,7 +137,7 @@ class CloudTrialAnnouncementBar extends React.PureComponent<Props> {
 
         let trialMoreThan7DaysMsg = (
             <FormattedMessage
-                id='admin.billing.subscription.cloudTrial.moreThan3Days'
+                id='admin.billing.subscription.cloudTrial.daysLeft'
                 defaultMessage='Your trial has started! There are {daysLeftOnTrial} days left'
                 values={{daysLeftOnTrial}}
             />
diff --git a/webapp/channels/src/components/apps_form/apps_form_component.tsx b/webapp/channels/src/components/apps_form/apps_form_component.tsx
index a83eb11274..f682058ece 100644
--- a/webapp/channels/src/components/apps_form/apps_form_component.tsx
+++ b/webapp/channels/src/components/apps_form/apps_form_component.tsx
@@ -234,7 +234,7 @@ export class AppsForm extends React.PureComponent<Props, State> {
             const errorResponse = res.error;
             const errMsg = errorResponse.text || intl.formatMessage({
                 id: 'apps.error.unknown',
-                defaultMessage: 'Unknown error.',
+                defaultMessage: 'Unknown error occurred.',
             });
             this.setState({
                 fieldErrors: {
@@ -256,7 +256,7 @@ export class AppsForm extends React.PureComponent<Props, State> {
         case AppCallResponseTypes.NAVIGATE: {
             const errMsg = intl.formatMessage({
                 id: 'apps.error.responses.unexpected_type',
-                defaultMessage: 'App response type was not expected. Response type: {type}.',
+                defaultMessage: 'App response type was not expected. Response type: {type}',
             }, {
                 type: callResp.type,
             },
@@ -338,7 +338,7 @@ export class AppsForm extends React.PureComponent<Props, State> {
                 case AppCallResponseTypes.NAVIGATE:
                     this.updateErrors([], undefined, this.props.intl.formatMessage({
                         id: 'apps.error.responses.unexpected_type',
-                        defaultMessage: 'App response type was not expected. Response type: {type}.',
+                        defaultMessage: 'App response type was not expected. Response type: {type}',
                     }, {
                         type: callResponse.type,
                     }));
diff --git a/webapp/channels/src/components/apps_form/apps_form_container.tsx b/webapp/channels/src/components/apps_form/apps_form_container.tsx
index 2a816bb5d8..3e018f2e81 100644
--- a/webapp/channels/src/components/apps_form/apps_form_container.tsx
+++ b/webapp/channels/src/components/apps_form/apps_form_container.tsx
@@ -48,7 +48,7 @@ class AppsFormContainer extends React.PureComponent<Props, State> {
         };
         const {form} = this.state;
         if (!form) {
-            const errMsg = this.props.intl.formatMessage({id: 'apps.error.form.no_form', defaultMessage: '`form` is not defined'});
+            const errMsg = this.props.intl.formatMessage({id: 'apps.error.form.no_form', defaultMessage: '`form` is not defined.'});
             return {error: makeCallErrorResponse(makeErrorMsg(errMsg))};
         }
         if (!form.submit) {
@@ -97,7 +97,7 @@ class AppsFormContainer extends React.PureComponent<Props, State> {
     refreshOnSelect = async (field: AppField, values: AppFormValues): Promise<DoAppCallResult<FormResponseData>> => {
         const makeErrMsg = (message: string) => this.props.intl.formatMessage(
             {
-                id: 'apps.error.form.refresh',
+                id: 'apps.error.form.update',
                 defaultMessage: 'There has been an error updating the modal. Contact the app developer. Details: {details}',
             },
             {details: message},
@@ -144,7 +144,7 @@ class AppsFormContainer extends React.PureComponent<Props, State> {
         case AppCallResponseTypes.NAVIGATE:
             return {error: makeCallErrorResponse(makeErrMsg(this.props.intl.formatMessage({
                 id: 'apps.error.responses.unexpected_type',
-                defaultMessage: 'App response type was not expected. Response type: {type}.',
+                defaultMessage: 'App response type was not expected. Response type: {type}',
             }, {
                 type: callResp.type,
             },
diff --git a/webapp/channels/src/components/channel_groups_manage_modal/channel_groups_manage_modal.tsx b/webapp/channels/src/components/channel_groups_manage_modal/channel_groups_manage_modal.tsx
index 9bcf5d106e..5bcec33c60 100644
--- a/webapp/channels/src/components/channel_groups_manage_modal/channel_groups_manage_modal.tsx
+++ b/webapp/channels/src/components/channel_groups_manage_modal/channel_groups_manage_modal.tsx
@@ -145,7 +145,7 @@ class ChannelGroupsManageModal extends React.PureComponent<Props> {
         const {formatMessage} = this.props.intl;
         return (
             <ListModal
-                titleText={formatMessage({id: 'groups', defaultMessage: '{channel} Groups'}, {channel: this.props.channel.display_name})}
+                titleText={formatMessage({id: 'channel_groups', defaultMessage: '{channel} Groups'}, {channel: this.props.channel.display_name})}
                 searchPlaceholderText={formatMessage({id: 'manage_channel_groups_modal.search_placeholder', defaultMessage: 'Search groups'})}
                 renderRow={this.renderRow}
                 loadItems={this.loadItems}
diff --git a/webapp/channels/src/components/cloud_start_trial/cloud_start_trial_btn.tsx b/webapp/channels/src/components/cloud_start_trial/cloud_start_trial_btn.tsx
index 83bf4c715a..f511e36bb7 100644
--- a/webapp/channels/src/components/cloud_start_trial/cloud_start_trial_btn.tsx
+++ b/webapp/channels/src/components/cloud_start_trial/cloud_start_trial_btn.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useState, ReactNode} from 'react';
 import {useIntl} from 'react-intl';
 import {useDispatch} from 'react-redux';
 
@@ -14,8 +14,9 @@ import {trackEvent} from 'actions/telemetry_actions';
 import {openModal, closeModal} from 'actions/views/modals';
 
 import TrialBenefitsModal from 'components/trial_benefits_modal/trial_benefits_modal';
+import ExternalLink from 'components/external_link';
 
-import {ModalIdentifiers, TELEMETRY_CATEGORIES} from 'utils/constants';
+import {ModalIdentifiers, TELEMETRY_CATEGORIES, LicenseLinks} from 'utils/constants';
 
 import RequestBusinessEmailModal from './request_business_email_modal';
 import './cloud_start_trial_btn.scss';
@@ -129,7 +130,7 @@ const CloudStartTrialButton = ({
         }));
     };
 
-    const btnText = (status: TrialLoadStatus): string => {
+    const btnText = (status: TrialLoadStatus) => {
         switch (status) {
         case TrialLoadStatus.Started:
             return formatMessage({id: 'start_cloud_trial.modal.gettingTrial', defaultMessage: 'Getting Trial...'});
@@ -138,7 +139,22 @@ const CloudStartTrialButton = ({
         case TrialLoadStatus.Failed:
             return formatMessage({id: 'start_cloud_trial.modal.failed', defaultMessage: 'Failed'});
         case TrialLoadStatus.Embargoed:
-            return formatMessage({id: 'admin.license.trial-request.embargoed'});
+            return formatMessage<ReactNode>(
+                {
+                    id: 'admin.license.trial-request.embargoed',
+                    defaultMessage: 'We were unable to process the request due to limitations for embargoed countries. <link>Learn more in our documentation</link>, or reach out to legal@mattermost.com for questions around export limitations.',
+                },
+                {
+                    link: (text: string) => (
+                        <ExternalLink
+                            location='trial_banner'
+                            href={LicenseLinks.EMBARGOED_COUNTRIES}
+                        >
+                            {text}
+                        </ExternalLink>
+                    ),
+                },
+            );
         default:
             return message;
         }
diff --git a/webapp/channels/src/components/dot_menu/dot_menu.tsx b/webapp/channels/src/components/dot_menu/dot_menu.tsx
index 89068ae450..be3d6afa13 100644
--- a/webapp/channels/src/components/dot_menu/dot_menu.tsx
+++ b/webapp/channels/src/components/dot_menu/dot_menu.tsx
@@ -497,7 +497,7 @@ export class DotMenuClass extends React.PureComponent<Props, State> {
                     class: classNames('post-menu__item', {
                         'post-menu__item--active': this.props.isMenuOpen,
                     }),
-                    'aria-label': formatMessage({id: 'post_info.dot_menu.tooltip.more_actions', defaultMessage: 'Actions'}),
+                    'aria-label': formatMessage({id: 'post_info.dot_menu.tooltip.actions', defaultMessage: 'Actions'}),
                     children: <DotsHorizontalIcon size={16}/>,
                 }}
                 menu={{
@@ -510,7 +510,7 @@ export class DotMenuClass extends React.PureComponent<Props, State> {
                 }}
                 menuButtonTooltip={{
                     id: `PostDotMenu-ButtonTooltip-${this.props.post.id}`,
-                    text: formatMessage({id: 'post_info.dot_menu.tooltip.more_actions', defaultMessage: 'More'}),
+                    text: formatMessage({id: 'post_info.dot_menu.tooltip.more', defaultMessage: 'More'}),
                     class: 'hidden-xs',
                 }}
             >
diff --git a/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap b/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap
index b173fc6031..45e0bcc69f 100644
--- a/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap
+++ b/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap
@@ -786,7 +786,7 @@ exports[`components/drafts/panel/panel_body should match snapshot for priority 1
                 <Memo(Tag)
                   icon="alert-circle-outline"
                   size="xs"
-                  text="IMPORTANT"
+                  text="Important"
                   uppercase={true}
                   variant="info"
                 >
@@ -818,7 +818,7 @@ exports[`components/drafts/panel/panel_body should match snapshot for priority 1
                         <span
                           className="TagText-bWgUzx kzWPbz"
                         >
-                          IMPORTANT
+                          Important
                         </span>
                       </TagText>
                     </div>
diff --git a/webapp/channels/src/components/emoji_picker/components/emoji_picker_preview.tsx b/webapp/channels/src/components/emoji_picker/components/emoji_picker_preview.tsx
index 12e0905332..b52a3a8ace 100644
--- a/webapp/channels/src/components/emoji_picker/components/emoji_picker_preview.tsx
+++ b/webapp/channels/src/components/emoji_picker/components/emoji_picker_preview.tsx
@@ -18,7 +18,7 @@ function EmojiPickerPreview({emoji}: Props) {
         return (
             <div className='emoji-picker__preview emoji-picker__preview-placeholder'>
                 <FormattedMessage
-                    id='emoji_picker.emojiPicker'
+                    id='emoji_picker.emojiPicker.previewPlaceholder'
                     defaultMessage='Select an Emoji'
                 />
             </div>
diff --git a/webapp/channels/src/components/error_page/error_page.tsx b/webapp/channels/src/components/error_page/error_page.tsx
index 349f978d7c..d180549721 100644
--- a/webapp/channels/src/components/error_page/error_page.tsx
+++ b/webapp/channels/src/components/error_page/error_page.tsx
@@ -79,7 +79,7 @@ export default class ErrorPage extends React.PureComponent<Props> {
             backButton = (
                 <Link to='/'>
                     <FormattedMessage
-                        id='error.generic.link'
+                        id='error.generic.siteLink'
                         defaultMessage='Back to {siteName}'
                         values={{
                             siteName: this.props.siteName,
@@ -123,7 +123,7 @@ export default class ErrorPage extends React.PureComponent<Props> {
             backButton = (
                 <Link to='/'>
                     <FormattedMessage
-                        id='error.generic.link'
+                        id='error.generic.siteLink'
                         defaultMessage='Back to {siteName}'
                         values={{
                             siteName: this.props.siteName,
diff --git a/webapp/channels/src/components/file_preview_modal/file_preview_modal_main_nav/__snapshots__/file_preview_modal_main_nav.test.tsx.snap b/webapp/channels/src/components/file_preview_modal/file_preview_modal_main_nav/__snapshots__/file_preview_modal_main_nav.test.tsx.snap
index 257b5c6d24..2d162de260 100644
--- a/webapp/channels/src/components/file_preview_modal/file_preview_modal_main_nav/__snapshots__/file_preview_modal_main_nav.test.tsx.snap
+++ b/webapp/channels/src/components/file_preview_modal/file_preview_modal_main_nav/__snapshots__/file_preview_modal_main_nav.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`components/file_preview_modal/file_preview_modal_main_nav/FilePreviewMo
       >
         <Memo(MemoizedFormattedMessage)
           defaultMessage="Close"
-          id="generic.previous"
+          id="generic.close"
         />
       </Tooltip>
     }
diff --git a/webapp/channels/src/components/file_preview_modal/file_preview_modal_main_nav/file_preview_modal_main_nav.tsx b/webapp/channels/src/components/file_preview_modal/file_preview_modal_main_nav/file_preview_modal_main_nav.tsx
index 4f97c4e7a8..ebb6cf5d59 100644
--- a/webapp/channels/src/components/file_preview_modal/file_preview_modal_main_nav/file_preview_modal_main_nav.tsx
+++ b/webapp/channels/src/components/file_preview_modal/file_preview_modal_main_nav/file_preview_modal_main_nav.tsx
@@ -26,7 +26,7 @@ const FilePreviewModalMainNav: React.FC<Props> = (props: Props) => {
             overlay={
                 <Tooltip id='close-icon-tooltip'>
                     <FormattedMessage
-                        id='generic.previous'
+                        id='generic.close'
                         defaultMessage='Close'
                     />
                 </Tooltip>
diff --git a/webapp/channels/src/components/header_footer_template/__snapshots__/header_footer_template.test.tsx.snap b/webapp/channels/src/components/header_footer_template/__snapshots__/header_footer_template.test.tsx.snap
index bb4dd6479b..1b51b5dbbd 100644
--- a/webapp/channels/src/components/header_footer_template/__snapshots__/header_footer_template.test.tsx.snap
+++ b/webapp/channels/src/components/header_footer_template/__snapshots__/header_footer_template.test.tsx.snap
@@ -44,6 +44,7 @@ exports[`components/HeaderFooterTemplate should match snapshot with about link 1
             location="header_footer_template"
           >
             <MemoizedFormattedMessage
+              defaultMessage="About"
               id="web.footer.about"
             />
           </ExternalLink>
@@ -98,6 +99,7 @@ exports[`components/HeaderFooterTemplate should match snapshot with all links 1`
             location="header_footer_template"
           >
             <MemoizedFormattedMessage
+              defaultMessage="About"
               id="web.footer.about"
             />
           </ExternalLink>
@@ -109,6 +111,7 @@ exports[`components/HeaderFooterTemplate should match snapshot with all links 1`
             location="header_footer_template"
           >
             <MemoizedFormattedMessage
+              defaultMessage="Privacy Policy"
               id="web.footer.privacy"
             />
           </ExternalLink>
@@ -120,6 +123,7 @@ exports[`components/HeaderFooterTemplate should match snapshot with all links 1`
             location="header_footer_template"
           >
             <MemoizedFormattedMessage
+              defaultMessage="Terms"
               id="web.footer.terms"
             />
           </ExternalLink>
@@ -131,6 +135,7 @@ exports[`components/HeaderFooterTemplate should match snapshot with all links 1`
             location="header_footer_template"
           >
             <MemoizedFormattedMessage
+              defaultMessage="Help"
               id="web.footer.help"
             />
           </ExternalLink>
@@ -231,6 +236,7 @@ exports[`components/HeaderFooterTemplate should match snapshot with help link 1`
             location="header_footer_template"
           >
             <MemoizedFormattedMessage
+              defaultMessage="Help"
               id="web.footer.help"
             />
           </ExternalLink>
@@ -285,6 +291,7 @@ exports[`components/HeaderFooterTemplate should match snapshot with privacy poli
             location="header_footer_template"
           >
             <MemoizedFormattedMessage
+              defaultMessage="Privacy Policy"
               id="web.footer.privacy"
             />
           </ExternalLink>
@@ -339,6 +346,7 @@ exports[`components/HeaderFooterTemplate should match snapshot with term of serv
             location="header_footer_template"
           >
             <MemoizedFormattedMessage
+              defaultMessage="Terms"
               id="web.footer.terms"
             />
           </ExternalLink>
diff --git a/webapp/channels/src/components/header_footer_template/header_footer_template.tsx b/webapp/channels/src/components/header_footer_template/header_footer_template.tsx
index 66dc865749..e5be8d3d19 100644
--- a/webapp/channels/src/components/header_footer_template/header_footer_template.tsx
+++ b/webapp/channels/src/components/header_footer_template/header_footer_template.tsx
@@ -57,7 +57,10 @@ export default class NotLoggedIn extends React.PureComponent<Props> {
                     location='header_footer_template'
                     href={this.props.config.AboutLink}
                 >
-                    <FormattedMessage id='web.footer.about'/>
+                    <FormattedMessage
+                        id='web.footer.about'
+                        defaultMessage='About'
+                    />
                 </ExternalLink>,
             );
         }
@@ -71,7 +74,10 @@ export default class NotLoggedIn extends React.PureComponent<Props> {
                     location='header_footer_template'
                     href={this.props.config.PrivacyPolicyLink}
                 >
-                    <FormattedMessage id='web.footer.privacy'/>
+                    <FormattedMessage
+                        id='web.footer.privacy'
+                        defaultMessage='Privacy Policy'
+                    />
                 </ExternalLink>,
             );
         }
@@ -85,7 +91,10 @@ export default class NotLoggedIn extends React.PureComponent<Props> {
                     location='header_footer_template'
                     href={this.props.config.TermsOfServiceLink}
                 >
-                    <FormattedMessage id='web.footer.terms'/>
+                    <FormattedMessage
+                        id='web.footer.terms'
+                        defaultMessage='Terms'
+                    />
                 </ExternalLink>,
             );
         }
@@ -99,7 +108,10 @@ export default class NotLoggedIn extends React.PureComponent<Props> {
                     location='header_footer_template'
                     href={this.props.config.HelpLink}
                 >
-                    <FormattedMessage id='web.footer.help'/>
+                    <FormattedMessage
+                        id='web.footer.help'
+                        defaultMessage='Help'
+                    />
                 </ExternalLink>,
             );
         }
diff --git a/webapp/channels/src/components/integrations/__snapshots__/abstract_incoming_hook.test.tsx.snap b/webapp/channels/src/components/integrations/__snapshots__/abstract_incoming_hook.test.tsx.snap
index b8fb192a10..45678e2f48 100644
--- a/webapp/channels/src/components/integrations/__snapshots__/abstract_incoming_hook.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/__snapshots__/abstract_incoming_hook.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`components/integrations/AbstractIncomingWebhook should call action func
     >
       <MemoizedFormattedMessage
         defaultMessage="Incoming Webhooks"
-        id="installed_incoming_webhooks.header"
+        id="incoming_webhooks.header"
       />
     </Link>
     <MemoizedFormattedMessage
@@ -271,7 +271,7 @@ exports[`components/integrations/AbstractIncomingWebhook should match snapshot 1
     >
       <MemoizedFormattedMessage
         defaultMessage="Incoming Webhooks"
-        id="installed_incoming_webhooks.header"
+        id="incoming_webhooks.header"
       />
     </Link>
     <MemoizedFormattedMessage
@@ -532,7 +532,7 @@ exports[`components/integrations/AbstractIncomingWebhook should match snapshot,
     >
       <MemoizedFormattedMessage
         defaultMessage="Incoming Webhooks"
-        id="installed_incoming_webhooks.header"
+        id="incoming_webhooks.header"
       />
     </Link>
     <MemoizedFormattedMessage
@@ -796,7 +796,7 @@ exports[`components/integrations/AbstractIncomingWebhook should match snapshot,
     >
       <MemoizedFormattedMessage
         defaultMessage="Incoming Webhooks"
-        id="installed_incoming_webhooks.header"
+        id="incoming_webhooks.header"
       />
     </Link>
     <MemoizedFormattedMessage
@@ -1024,7 +1024,7 @@ exports[`components/integrations/AbstractIncomingWebhook should match snapshot,
     >
       <MemoizedFormattedMessage
         defaultMessage="Incoming Webhooks"
-        id="installed_incoming_webhooks.header"
+        id="incoming_webhooks.header"
       />
     </Link>
     <MemoizedFormattedMessage
@@ -1252,7 +1252,7 @@ exports[`components/integrations/AbstractIncomingWebhook should match snapshot,
     >
       <MemoizedFormattedMessage
         defaultMessage="Incoming Webhooks"
-        id="installed_incoming_webhooks.header"
+        id="incoming_webhooks.header"
       />
     </Link>
     <MemoizedFormattedMessage
diff --git a/webapp/channels/src/components/integrations/__snapshots__/abstract_outgoing_webhook.test.jsx.snap b/webapp/channels/src/components/integrations/__snapshots__/abstract_outgoing_webhook.test.jsx.snap
index 6e6c4bb413..a0581d2dfd 100644
--- a/webapp/channels/src/components/integrations/__snapshots__/abstract_outgoing_webhook.test.jsx.snap
+++ b/webapp/channels/src/components/integrations/__snapshots__/abstract_outgoing_webhook.test.jsx.snap
@@ -10,7 +10,7 @@ exports[`components/integrations/AbstractOutgoingWebhook should match snapshot 1
     >
       <MemoizedFormattedMessage
         defaultMessage="Outgoing Webhooks"
-        id="installed_outgoing_webhooks.header"
+        id="add_outgoing_webhook.header"
       />
     </Link>
     <MemoizedFormattedMessage
diff --git a/webapp/channels/src/components/integrations/__snapshots__/installed_outgoing_webhook.test.jsx.snap b/webapp/channels/src/components/integrations/__snapshots__/installed_outgoing_webhook.test.jsx.snap
index 759ca5c5bc..70f505133e 100644
--- a/webapp/channels/src/components/integrations/__snapshots__/installed_outgoing_webhook.test.jsx.snap
+++ b/webapp/channels/src/components/integrations/__snapshots__/installed_outgoing_webhook.test.jsx.snap
@@ -34,7 +34,7 @@ exports[`components/integrations/InstalledOutgoingWebhook should match snapshot
           onClick={[Function]}
         >
           <MemoizedFormattedMessage
-            defaultMessage="Regen Token"
+            defaultMessage="Regenerate Token"
             id="installed_integrations.regenToken"
           />
         </button>
diff --git a/webapp/channels/src/components/integrations/abstract_incoming_webhook.tsx b/webapp/channels/src/components/integrations/abstract_incoming_webhook.tsx
index c3079b1f7f..cfeb445fff 100644
--- a/webapp/channels/src/components/integrations/abstract_incoming_webhook.tsx
+++ b/webapp/channels/src/components/integrations/abstract_incoming_webhook.tsx
@@ -184,7 +184,7 @@ export default class AbstractIncomingWebhook extends PureComponent<Props, State>
                 <BackstageHeader>
                     <Link to={`/${this.props.team.name}/integrations/incoming_webhooks`}>
                         <FormattedMessage
-                            id='installed_incoming_webhooks.header'
+                            id='incoming_webhooks.header'
                             defaultMessage='Incoming Webhooks'
                         />
                     </Link>
diff --git a/webapp/channels/src/components/integrations/abstract_outgoing_webhook.jsx b/webapp/channels/src/components/integrations/abstract_outgoing_webhook.jsx
index dff8215612..ff25337f81 100644
--- a/webapp/channels/src/components/integrations/abstract_outgoing_webhook.jsx
+++ b/webapp/channels/src/components/integrations/abstract_outgoing_webhook.jsx
@@ -249,7 +249,7 @@ export default class AbstractOutgoingWebhook extends React.PureComponent {
                 <BackstageHeader>
                     <Link to={`/${this.props.team.name}/integrations/outgoing_webhooks`}>
                         <FormattedMessage
-                            id='installed_outgoing_webhooks.header'
+                            id='add_outgoing_webhook.header'
                             defaultMessage='Outgoing Webhooks'
                         />
                     </Link>
diff --git a/webapp/channels/src/components/integrations/bots/add_bot/__snapshots__/add_bot.test.tsx.snap b/webapp/channels/src/components/integrations/bots/add_bot/__snapshots__/add_bot.test.tsx.snap
new file mode 100644
index 0000000000..f5cf10dd4e
--- /dev/null
+++ b/webapp/channels/src/components/integrations/bots/add_bot/__snapshots__/add_bot.test.tsx.snap
@@ -0,0 +1,362 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`components/integrations/bots/AddBot blank 1`] = `
+<div
+  className="backstage-content"
+>
+  <BackstageHeader>
+    <Link
+      to="/DN/integrations/bots"
+    >
+      <MemoizedFormattedMessage
+        defaultMessage="Bot Accounts"
+        id="bots.manage.header"
+      />
+    </Link>
+    <MemoizedFormattedMessage
+      defaultMessage="Add"
+      id="bots.manage.add.add"
+    />
+  </BackstageHeader>
+  <div
+    className="backstage-form"
+  >
+    <form
+      className="form-horizontal"
+      onSubmit={[Function]}
+    >
+      <div
+        className="form-group"
+      >
+        <label
+          className="control-label col-sm-4"
+          htmlFor="username"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="Username"
+            id="bots.add.username"
+          />
+        </label>
+        <div
+          className="col-md-5 col-sm-8"
+        >
+          <input
+            className="form-control"
+            id="username"
+            maxLength={22}
+            onChange={[Function]}
+            type="text"
+            value=""
+          />
+          <div
+            className="form__help"
+          >
+            <MemoizedFormattedMessage
+              defaultMessage="You can use lowercase letters, numbers, periods, dashes, and underscores."
+              id="bot.add.username.help"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        className="form-group"
+      >
+        <label
+          className="control-label col-sm-4"
+          htmlFor="boticon"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="Bot Icon"
+            id="bots.add.icon"
+          />
+        </label>
+        <div
+          className="col-md-5 col-sm-8"
+        >
+          <div
+            className="bot-img-container"
+          >
+            <img
+              alt="bot image"
+              className="bot-img"
+              src={null}
+              style={
+                Object {
+                  "transform": "",
+                  "transformOrigin": "",
+                }
+              }
+            />
+          </div>
+          <div
+            className="btn btn-sm btn-primary btn-file sel-btn"
+          >
+            <MemoizedFormattedMessage
+              defaultMessage="Upload Image"
+              id="bots.image.upload"
+            />
+            <input
+              accept=".jpeg,.jpg,.png,.bmp"
+              onChange={[Function]}
+              type="file"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        className="form-group"
+      >
+        <label
+          className="control-label col-sm-4"
+          htmlFor="displayName"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="Display Name"
+            id="bots.add.displayName"
+          />
+        </label>
+        <div
+          className="col-md-5 col-sm-8"
+        >
+          <input
+            className="form-control"
+            id="displayName"
+            maxLength={64}
+            onChange={[Function]}
+            type="text"
+            value=""
+          />
+          <div
+            className="form__help"
+          >
+            <MemoizedFormattedMessage
+              defaultMessage="(Optional) You can choose to display your bot's full name rather than its username."
+              id="bot.add.display_name.help"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        className="form-group"
+      >
+        <label
+          className="control-label col-sm-4"
+          htmlFor="description"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="Description"
+            id="bot.add.description"
+          />
+        </label>
+        <div
+          className="col-md-5 col-sm-8"
+        >
+          <input
+            className="form-control"
+            id="description"
+            maxLength={1024}
+            onChange={[Function]}
+            type="text"
+            value=""
+          />
+          <div
+            className="form__help"
+          >
+            <MemoizedFormattedMessage
+              defaultMessage="(Optional) Let others know what this bot does."
+              id="bot.add.description.help"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        className="form-group"
+      >
+        <label
+          className="control-label col-sm-4"
+          htmlFor="role"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="Role"
+            id="bot.add.role"
+          />
+        </label>
+        <div
+          className="col-md-5 col-sm-8"
+        >
+          <select
+            className="form-control"
+            disabled={false}
+            onChange={[Function]}
+            value="Member"
+          >
+            <option
+              value="Member"
+            >
+              Member
+            </option>
+            <option
+              value="System Admin"
+            >
+              System Admin
+            </option>
+          </select>
+          <div
+            className="form__help"
+          >
+            <MemoizedFormattedMessage
+              defaultMessage="Choose what role the bot should have."
+              id="bot.add.role.help"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        className="row bot-profile__section"
+      >
+        <div
+          className="col-md-5 col-sm-8 col-sm-offset-4"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="Select additional permissions for the account. <link>Read more about roles and permissions</link>."
+            id="admin.manage_roles.botAdditionalRoles"
+            values={
+              Object {
+                "link": [Function],
+              }
+            }
+          />
+        </div>
+      </div>
+      <div
+        className="form-group"
+      >
+        <label
+          className="control-label col-sm-4"
+          htmlFor="postAll"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="post:all"
+            id="bot.add.post_all"
+          />
+        </label>
+        <div
+          className="col-md-5 col-sm-8 checkbox"
+        >
+          <div
+            className="checkbox no-padding"
+          >
+            <label
+              htmlFor="postAll"
+            >
+              <input
+                checked={false}
+                disabled={false}
+                id="postAll"
+                onChange={[Function]}
+                type="checkbox"
+              />
+              <MemoizedFormattedMessage
+                defaultMessage="Enabled"
+                id="bot.add.post_all.enabled"
+              />
+            </label>
+          </div>
+          <div
+            className="form__help"
+          >
+            <MemoizedFormattedMessage
+              defaultMessage="Bot will have access to post to all Mattermost channels including direct messages."
+              id="bot.add.post_all.help"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        className="form-group"
+      >
+        <label
+          className="control-label col-sm-4"
+          htmlFor="postChannels"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="post:channels"
+            id="bot.add.post_channels"
+          />
+        </label>
+        <div
+          className="col-md-5 col-sm-8 checkbox"
+        >
+          <div
+            className="checkbox no-padding"
+          >
+            <label
+              htmlFor="postChannels"
+            >
+              <input
+                checked={false}
+                disabled={false}
+                id="postChannels"
+                onChange={[Function]}
+                type="checkbox"
+              />
+              <MemoizedFormattedMessage
+                defaultMessage="Enabled"
+                id="bot.add.post_channels.enabled"
+              />
+            </label>
+          </div>
+          <div
+            className="form__help"
+          >
+            <MemoizedFormattedMessage
+              defaultMessage="Bot will have access to post to all Mattermost public channels."
+              id="bot.add.post_channels.help"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        className="backstage-form__footer"
+      >
+        <FormError
+          error={null}
+          errors={
+            Array [
+              "",
+            ]
+          }
+          type="backstage"
+        />
+        <Link
+          className="btn btn-link btn-sm"
+          to="/DN/integrations/bots"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="Cancel"
+            id="bots.manage.add.cancel"
+          />
+        </Link>
+        <SpinnerButton
+          className="btn btn-primary"
+          id="saveBot"
+          onClick={[Function]}
+          spinning={false}
+          spinningText={
+            <Memo(MemoizedFormattedMessage)
+              defaultMessage="Creating..."
+              id="bots.manage.add.creating"
+            />
+          }
+          type="submit"
+        >
+          <MemoizedFormattedMessage
+            defaultMessage="Create Bot Account"
+            id="bots.manage.add.create"
+          />
+        </SpinnerButton>
+      </div>
+    </form>
+  </div>
+</div>
+`;
diff --git a/webapp/channels/src/components/integrations/bots/add_bot/add_bot.test.tsx b/webapp/channels/src/components/integrations/bots/add_bot/add_bot.test.tsx
index 5b3b646558..6ad0083e04 100644
--- a/webapp/channels/src/components/integrations/bots/add_bot/add_bot.test.tsx
+++ b/webapp/channels/src/components/integrations/bots/add_bot/add_bot.test.tsx
@@ -3,9 +3,7 @@
 
 import React from 'react';
 import {shallow} from 'enzyme';
-import {FormattedMessage} from 'react-intl';
 
-// import TestHelper from 'mattermost-redux/test/test_helper';
 import {TestHelper} from 'utils/test_helper';
 
 import AddBot from './add_bot';
@@ -49,11 +47,7 @@ describe('components/integrations/bots/AddBot', () => {
                 value={''}
             />,
         )).toEqual(true);
-        expect(wrapper.containsMatchingElement(
-            <FormattedMessage
-                id='admin.manage_roles.additionalRoles'
-            />,
-        )).toEqual(true);
+        expect(wrapper).toMatchSnapshot();
     });
 
     it('edit bot', () => {
diff --git a/webapp/channels/src/components/integrations/bots/add_bot/add_bot.tsx b/webapp/channels/src/components/integrations/bots/add_bot/add_bot.tsx
index 00c31afd06..3aade0e6ec 100644
--- a/webapp/channels/src/components/integrations/bots/add_bot/add_bot.tsx
+++ b/webapp/channels/src/components/integrations/bots/add_bot/add_bot.tsx
@@ -322,7 +322,7 @@ export default class AddBot extends React.PureComponent<Props, State> {
                         error: (
                             <FormattedMessage
                                 id='bots.manage.add.invalid_username'
-                                defaultMessage='Usernames must begin with a lowercase letter and be 3-22 characters long. You can use lowercase letters, numbers, periods, dashes, and underscores.'
+                                defaultMessage='Usernames have to begin with a lowercase letter and be 3-22 characters long. You can use lowercase letters, numbers, periods, dashes, and underscores.'
                             />
                         ),
                     };
@@ -383,7 +383,7 @@ export default class AddBot extends React.PureComponent<Props, State> {
     render() {
         let subtitle = (
             <FormattedMessage
-                id='bots.manage.add'
+                id='bots.manage.add.add'
                 defaultMessage='Add'
             />
         );
@@ -630,7 +630,7 @@ export default class AddBot extends React.PureComponent<Props, State> {
                         <div className='row bot-profile__section'>
                             <div className='col-md-5 col-sm-8 col-sm-offset-4'>
                                 <FormattedMessage
-                                    id='admin.manage_roles.additionalRoles'
+                                    id='admin.manage_roles.botAdditionalRoles'
                                     defaultMessage='Select additional permissions for the account. <link>Read more about roles and permissions</link>.'
                                     values={{
                                         link: (msg: React.ReactNode) => (
diff --git a/webapp/channels/src/components/integrations/confirm_integration/__snapshots__/confirm_integration.test.tsx.snap b/webapp/channels/src/components/integrations/confirm_integration/__snapshots__/confirm_integration.test.tsx.snap
index 1c3a97c154..551911427b 100644
--- a/webapp/channels/src/components/integrations/confirm_integration/__snapshots__/confirm_integration.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/confirm_integration/__snapshots__/confirm_integration.test.tsx.snap
@@ -12,7 +12,7 @@ exports[`components/integrations/ConfirmIntegration should match snapshot, comma
     >
       <MemoizedFormattedMessage
         defaultMessage="Slash Commands"
-        id="installed_commands.header"
+        id="slash_commands.header"
       />
     </Link>
     <MemoizedFormattedMessage
@@ -90,7 +90,7 @@ exports[`components/integrations/ConfirmIntegration should match snapshot, incom
     >
       <MemoizedFormattedMessage
         defaultMessage="Incoming Webhooks"
-        id="installed_incoming_webhooks.header"
+        id="incoming_webhooks.header"
       />
     </Link>
     <MemoizedFormattedMessage
@@ -168,7 +168,7 @@ exports[`components/integrations/ConfirmIntegration should match snapshot, oauth
     >
       <MemoizedFormattedMessage
         defaultMessage="OAuth 2.0 Applications"
-        id="installed_oauth_apps.header"
+        id="installed_oauth2_apps.header"
       />
     </Link>
     <MemoizedFormattedMessage
@@ -286,7 +286,7 @@ exports[`components/integrations/ConfirmIntegration should match snapshot, outgo
     >
       <MemoizedFormattedMessage
         defaultMessage="Outgoing Webhooks"
-        id="installed_outgoing_webhooks.header"
+        id="add_outgoing_webhook.header"
       />
     </Link>
     <MemoizedFormattedMessage
diff --git a/webapp/channels/src/components/integrations/confirm_integration/confirm_integration.tsx b/webapp/channels/src/components/integrations/confirm_integration/confirm_integration.tsx
index a7c93ecf3c..5d2e6911df 100644
--- a/webapp/channels/src/components/integrations/confirm_integration/confirm_integration.tsx
+++ b/webapp/channels/src/components/integrations/confirm_integration/confirm_integration.tsx
@@ -63,7 +63,7 @@ const ConfirmIntegration = ({team, location, commands, oauthApps, incomingHooks,
 
         headerText = (
             <FormattedMessage
-                id={'installed_commands.header'}
+                id={'slash_commands.header'}
                 defaultMessage='Slash Commands'
             />
         );
@@ -100,7 +100,7 @@ const ConfirmIntegration = ({team, location, commands, oauthApps, incomingHooks,
 
         headerText = (
             <FormattedMessage
-                id={'installed_incoming_webhooks.header'}
+                id={'incoming_webhooks.header'}
                 defaultMessage='Incoming Webhooks'
             />
         );
@@ -137,7 +137,7 @@ const ConfirmIntegration = ({team, location, commands, oauthApps, incomingHooks,
 
         headerText = (
             <FormattedMessage
-                id={'installed_outgoing_webhooks.header'}
+                id={'add_outgoing_webhook.header'}
                 defaultMessage='Outgoing Webhooks'
             />
         );
@@ -175,7 +175,7 @@ const ConfirmIntegration = ({team, location, commands, oauthApps, incomingHooks,
 
         headerText = (
             <FormattedMessage
-                id={'installed_oauth_apps.header'}
+                id={'installed_oauth2_apps.header'}
                 defaultMessage='OAuth 2.0 Applications'
             />
         );
diff --git a/webapp/channels/src/components/integrations/installed_oauth_apps/__snapshots__/installed_oauth_apps.test.tsx.snap b/webapp/channels/src/components/integrations/installed_oauth_apps/__snapshots__/installed_oauth_apps.test.tsx.snap
index fa20d79ce1..38c7aef4c9 100644
--- a/webapp/channels/src/components/integrations/installed_oauth_apps/__snapshots__/installed_oauth_apps.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/installed_oauth_apps/__snapshots__/installed_oauth_apps.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`components/integrations/InstalledOAuthApps should match snapshot 1`] =
   header={
     <Memo(MemoizedFormattedMessage)
       defaultMessage="OAuth 2.0 Applications"
-      id="installed_oauth_apps.header"
+      id="installed_oauth2_apps.header"
     />
   }
   helpText={
diff --git a/webapp/channels/src/components/integrations/installed_oauth_apps/installed_oauth_apps.tsx b/webapp/channels/src/components/integrations/installed_oauth_apps/installed_oauth_apps.tsx
index 1a068e8366..2abeaef631 100644
--- a/webapp/channels/src/components/integrations/installed_oauth_apps/installed_oauth_apps.tsx
+++ b/webapp/channels/src/components/integrations/installed_oauth_apps/installed_oauth_apps.tsx
@@ -134,7 +134,7 @@ export default class InstalledOAuthApps extends React.PureComponent<Props, State
             <BackstageList
                 header={
                     <FormattedMessage
-                        id='installed_oauth_apps.header'
+                        id='installed_oauth2_apps.header'
                         defaultMessage='OAuth 2.0 Applications'
                     />
                 }
diff --git a/webapp/channels/src/components/integrations/installed_outgoing_webhook.tsx b/webapp/channels/src/components/integrations/installed_outgoing_webhook.tsx
index 0c01d69962..a07e3e63e5 100644
--- a/webapp/channels/src/components/integrations/installed_outgoing_webhook.tsx
+++ b/webapp/channels/src/components/integrations/installed_outgoing_webhook.tsx
@@ -167,7 +167,7 @@ export default class InstalledOutgoingWebhook extends React.PureComponent<Props>
                     >
                         <FormattedMessage
                             id='installed_integrations.regenToken'
-                            defaultMessage='Regen Token'
+                            defaultMessage='Regenerate Token'
                         />
                     </button>
                     {' - '}
diff --git a/webapp/channels/src/components/post_priority/post_priority_label.tsx b/webapp/channels/src/components/post_priority/post_priority_label.tsx
index 770c857cc7..a11c0deda3 100644
--- a/webapp/channels/src/components/post_priority/post_priority_label.tsx
+++ b/webapp/channels/src/components/post_priority/post_priority_label.tsx
@@ -26,7 +26,7 @@ export default function PriorityLabel({
                 {...rest}
                 variant='danger'
                 icon={'alert-outline'}
-                text={formatMessage({id: 'post_priority.priority.urgent', defaultMessage: 'URGENT'})}
+                text={formatMessage({id: 'post_priority.priority.urgent', defaultMessage: 'Urgent'})}
                 uppercase={true}
             />
         );
@@ -38,7 +38,7 @@ export default function PriorityLabel({
                 {...rest}
                 variant='info'
                 icon={'alert-circle-outline'}
-                text={formatMessage({id: 'post_priority.priority.important', defaultMessage: 'IMPORTANT'})}
+                text={formatMessage({id: 'post_priority.priority.important', defaultMessage: 'Important'})}
                 uppercase={true}
             />
         );
diff --git a/webapp/channels/src/components/profile_popover/__snapshots__/profile_popover.test.tsx.snap b/webapp/channels/src/components/profile_popover/__snapshots__/profile_popover.test.tsx.snap
index aba8e516d7..3f98bb1301 100644
--- a/webapp/channels/src/components/profile_popover/__snapshots__/profile_popover.test.tsx.snap
+++ b/webapp/channels/src/components/profile_popover/__snapshots__/profile_popover.test.tsx.snap
@@ -79,7 +79,7 @@ exports[`components/ProfilePopover should disable start call button when user is
       >
         <MemoizedFormattedMessage
           defaultMessage="Last online {timestamp}"
-          id="channel_header.lastActive"
+          id="channel_header.lastOnline"
           values={
             Object {
               "timestamp": <Memo(Connect(injectIntl(Timestamp)))
@@ -424,7 +424,7 @@ exports[`components/ProfilePopover should hide add-to-channel option if not on t
       >
         <MemoizedFormattedMessage
           defaultMessage="Last online {timestamp}"
-          id="channel_header.lastActive"
+          id="channel_header.lastOnline"
           values={
             Object {
               "timestamp": <Memo(Connect(injectIntl(Timestamp)))
@@ -690,7 +690,7 @@ exports[`components/ProfilePopover should match snapshot 1`] = `
       >
         <MemoizedFormattedMessage
           defaultMessage="Last online {timestamp}"
-          id="channel_header.lastActive"
+          id="channel_header.lastOnline"
           values={
             Object {
               "timestamp": <Memo(Connect(injectIntl(Timestamp)))
@@ -1039,7 +1039,7 @@ exports[`components/ProfilePopover should match snapshot for shared user 1`] = `
       >
         <MemoizedFormattedMessage
           defaultMessage="Last online {timestamp}"
-          id="channel_header.lastActive"
+          id="channel_header.lastOnline"
           values={
             Object {
               "timestamp": <Memo(Connect(injectIntl(Timestamp)))
@@ -1406,7 +1406,7 @@ exports[`components/ProfilePopover should match snapshot when calls are disabled
       >
         <MemoizedFormattedMessage
           defaultMessage="Last online {timestamp}"
-          id="channel_header.lastActive"
+          id="channel_header.lastOnline"
           values={
             Object {
               "timestamp": <Memo(Connect(injectIntl(Timestamp)))
@@ -1728,7 +1728,7 @@ exports[`components/ProfilePopover should match snapshot with custom status 1`]
       >
         <MemoizedFormattedMessage
           defaultMessage="Last online {timestamp}"
-          id="channel_header.lastActive"
+          id="channel_header.lastOnline"
           values={
             Object {
               "timestamp": <Memo(Connect(injectIntl(Timestamp)))
@@ -2122,7 +2122,7 @@ exports[`components/ProfilePopover should match snapshot with custom status expi
       >
         <MemoizedFormattedMessage
           defaultMessage="Last online {timestamp}"
-          id="channel_header.lastActive"
+          id="channel_header.lastOnline"
           values={
             Object {
               "timestamp": <Memo(Connect(injectIntl(Timestamp)))
@@ -2471,7 +2471,7 @@ exports[`components/ProfilePopover should match snapshot with custom status not
       >
         <MemoizedFormattedMessage
           defaultMessage="Last online {timestamp}"
-          id="channel_header.lastActive"
+          id="channel_header.lastOnline"
           values={
             Object {
               "timestamp": <Memo(Connect(injectIntl(Timestamp)))
@@ -2757,7 +2757,7 @@ exports[`components/ProfilePopover should match snapshot with last active displa
       >
         <MemoizedFormattedMessage
           defaultMessage="Last online {timestamp}"
-          id="channel_header.lastActive"
+          id="channel_header.lastOnline"
           values={
             Object {
               "timestamp": <Memo(Connect(injectIntl(Timestamp)))
@@ -3753,7 +3753,7 @@ exports[`components/ProfilePopover should show the start call button when isCall
                   >
                     <FormattedMessage
                       defaultMessage="Last online {timestamp}"
-                      id="channel_header.lastActive"
+                      id="channel_header.lastOnline"
                       values={
                         Object {
                           "timestamp": <Memo(Connect(injectIntl(Timestamp)))
diff --git a/webapp/channels/src/components/profile_popover/profile_popover.tsx b/webapp/channels/src/components/profile_popover/profile_popover.tsx
index 8b2b687634..f436ac4e6b 100644
--- a/webapp/channels/src/components/profile_popover/profile_popover.tsx
+++ b/webapp/channels/src/components/profile_popover/profile_popover.tsx
@@ -463,7 +463,7 @@ class ProfilePopover extends React.PureComponent<ProfilePopoverProps, ProfilePop
                     key='user-popover-last-active'
                 >
                     <FormattedMessage
-                        id='channel_header.lastActive'
+                        id='channel_header.lastOnline'
                         defaultMessage='Last online {timestamp}'
                         values={{
                             timestamp: (
diff --git a/webapp/channels/src/components/self_hosted_purchase_modal/success_page.tsx b/webapp/channels/src/components/self_hosted_purchase_modal/success_page.tsx
index 840dba7432..279b835e98 100644
--- a/webapp/channels/src/components/self_hosted_purchase_modal/success_page.tsx
+++ b/webapp/channels/src/components/self_hosted_purchase_modal/success_page.tsx
@@ -17,7 +17,7 @@ import './success_page.scss';
 export default function SuccessPage(props: Props) {
     const title = (
         <FormattedMessage
-            id={'admin.billing.subscription.upgradedSuccess'}
+            id={'admin.billing.subscription.subscribedSuccess'}
             defaultMessage={'You\'re now subscribed to {productName}'}
             values={{productName: props.planName}}
         />
diff --git a/webapp/channels/src/components/setting_picture.test.tsx b/webapp/channels/src/components/setting_picture.test.tsx
index 828ff3c024..ab7d85d9de 100644
--- a/webapp/channels/src/components/setting_picture.test.tsx
+++ b/webapp/channels/src/components/setting_picture.test.tsx
@@ -10,7 +10,7 @@ import SettingPicture from 'components/setting_picture';
 
 const helpText: ReactNode = (
     <FormattedMessage
-        id={'setting_picture.help.profile'}
+        id={'setting_picture.help.profile.example'}
         defaultMessage='Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}'
         values={{max: 52428800}}
     />
diff --git a/webapp/channels/src/components/sidebar/__snapshots__/add_channels_cta_button.test.tsx.snap b/webapp/channels/src/components/sidebar/__snapshots__/add_channels_cta_button.test.tsx.snap
index 893aaa0ffe..f89d1c3fb8 100644
--- a/webapp/channels/src/components/sidebar/__snapshots__/add_channels_cta_button.test.tsx.snap
+++ b/webapp/channels/src/components/sidebar/__snapshots__/add_channels_cta_button.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`components/new_channel_modal should match snapshot 1`] = `
   open={false}
 >
   <button
-    aria-label="Add Channels Dropdown"
+    aria-label="Add Channel Dropdown"
     className="SidebarChannelNavigator__addChannelsCtaLhsButton SidebarChannelNavigator__addChannelsCtaLhsButton--untouched"
     id="addChannelsCta"
     onClick={[Function]}
@@ -48,7 +48,7 @@ exports[`components/new_channel_modal should match snapshot 1`] = `
 
 exports[`components/new_channel_modal should match snapshot when user has only join channel permissions 1`] = `
 <button
-  aria-label="Add Channels Dropdown"
+  aria-label="Add Channel Dropdown"
   className="SidebarChannelNavigator__addChannelsCtaLhsButton SidebarChannelNavigator__addChannelsCtaLhsButton--untouched"
   id="addChannelsCta"
   onClick={[Function]}
diff --git a/webapp/channels/src/components/sidebar/add_channels_cta_button.tsx b/webapp/channels/src/components/sidebar/add_channels_cta_button.tsx
index d3f1244edd..7b85084a8e 100644
--- a/webapp/channels/src/components/sidebar/add_channels_cta_button.tsx
+++ b/webapp/channels/src/components/sidebar/add_channels_cta_button.tsx
@@ -112,7 +112,7 @@ const AddChannelsCtaButton = (): JSX.Element | null => {
             <button
                 className={buttonClass}
                 id={'addChannelsCta'}
-                aria-label={intl.formatMessage({id: 'sidebar_left.add_channel_dropdown.dropdownAriaLabel', defaultMessage: 'Add Channels Dropdown'})}
+                aria-label={intl.formatMessage({id: 'sidebar_left.add_channel_dropdown.dropdownAriaLabel', defaultMessage: 'Add Channel Dropdown'})}
                 onClick={handleClick}
             >
                 <li
diff --git a/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.ts b/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.ts
index c91d3df07c..13357b689f 100644
--- a/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.ts
+++ b/webapp/channels/src/components/suggestion/command_provider/app_command_parser/app_command_parser.ts
@@ -541,7 +541,7 @@ export class ParsedCommand {
                     if (this.incompleteStart === this.i - 1) {
                         return this.asError(this.intl.formatMessage({
                             id: 'apps.error.parser.empty_value',
-                            defaultMessage: 'Empty values are not allowed.',
+                            defaultMessage: 'Empty values are not allowed',
                         }));
                     }
                     this.i++;
@@ -581,7 +581,7 @@ export class ParsedCommand {
                     if (this.incompleteStart === this.i - 1) {
                         return this.asError(this.intl.formatMessage({
                             id: 'apps.error.parser.empty_value',
-                            defaultMessage: 'Empty values are not allowed.',
+                            defaultMessage: 'Empty values are not allowed',
                         }));
                     }
                     this.i++;
@@ -730,7 +730,7 @@ export class ParsedCommand {
                     if (this.incompleteStart === this.i - 1) {
                         return this.asError(this.intl.formatMessage({
                             id: 'apps.error.parser.empty_value',
-                            defaultMessage: 'empty values are not allowed',
+                            defaultMessage: 'Empty values are not allowed',
                         }));
                     }
                     this.i++;
@@ -770,7 +770,7 @@ export class ParsedCommand {
                     if (this.incompleteStart === this.i - 1) {
                         return this.asError(this.intl.formatMessage({
                             id: 'apps.error.parser.empty_value',
-                            defaultMessage: 'empty values are not allowed',
+                            defaultMessage: 'Empty values are not allowed',
                         }));
                     }
                     this.i++;
@@ -1506,7 +1506,7 @@ export class AppCommandParser {
             const errorResponse = res.error;
             return {error: errorResponse.text || this.intl.formatMessage({
                 id: 'apps.error.unknown',
-                defaultMessage: 'Unknown error.',
+                defaultMessage: 'Unknown error occurred.',
             })};
         }
 
@@ -1822,7 +1822,7 @@ export class AppCommandParser {
             const errorResponse = res.error;
             return this.makeDynamicSelectSuggestionError(errorResponse.text || this.intl.formatMessage({
                 id: 'apps.error.unknown',
-                defaultMessage: 'Unknown error.',
+                defaultMessage: 'Unknown error occurred.',
             }));
         }
 
diff --git a/webapp/channels/src/components/team_groups_manage_modal/team_groups_manage_modal.tsx b/webapp/channels/src/components/team_groups_manage_modal/team_groups_manage_modal.tsx
index 3bb7bf8ef0..96387f567c 100644
--- a/webapp/channels/src/components/team_groups_manage_modal/team_groups_manage_modal.tsx
+++ b/webapp/channels/src/components/team_groups_manage_modal/team_groups_manage_modal.tsx
@@ -195,7 +195,7 @@ class TeamGroupsManageModal extends React.PureComponent<Props, State> {
             <>
                 <ListModal
                     show={!this.state.showConfirmModal}
-                    titleText={formatMessage({id: 'groups', defaultMessage: '{team} Groups'}, {team: this.props.team.display_name})}
+                    titleText={formatMessage({id: 'team_groups', defaultMessage: '{team} Groups'}, {team: this.props.team.display_name})}
                     searchPlaceholderText={formatMessage({id: 'manage_team_groups_modal.search_placeholder', defaultMessage: 'Search groups'})}
                     renderRow={this.renderRow}
                     loadItems={this.loadItems}
diff --git a/webapp/channels/src/components/user_settings/general/user_settings_general.tsx b/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
index a0d3d9f4dd..e6aa6758da 100644
--- a/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
+++ b/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
@@ -1301,7 +1301,7 @@ export class UserSettingsGeneralTab extends React.Component<Props, State> {
                 imgSrc = Utils.imageURLForUser(user.id, user.last_picture_update);
                 helpText = (
                     <FormattedMessage
-                        id={'setting_picture.help.profile'}
+                        id='setting_picture.help.profile'
                         defaultMessage='Upload a picture in BMP, JPG, JPEG, or PNG format. Maximum file size: {max}'
                         values={{max: Utils.fileSizeToString(this.props.maxFileSize)}}
                     />
diff --git a/webapp/channels/src/components/user_settings/notifications/email_notification_setting/__snapshots__/email_notification_setting.test.tsx.snap b/webapp/channels/src/components/user_settings/notifications/email_notification_setting/__snapshots__/email_notification_setting.test.tsx.snap
index ca2c06f3e5..1886d010a7 100644
--- a/webapp/channels/src/components/user_settings/notifications/email_notification_setting/__snapshots__/email_notification_setting.test.tsx.snap
+++ b/webapp/channels/src/components/user_settings/notifications/email_notification_setting/__snapshots__/email_notification_setting.test.tsx.snap
@@ -378,7 +378,7 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
                   type="radio"
                 />
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="Every {count} minutes"
+                  defaultMessage="Every {count, plural, one {minute} other {{count, number} minutes}}"
                   id="user.settings.notifications.email.everyXMinutes"
                   values={
                     Object {
@@ -523,7 +523,7 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
                       type="radio"
                     />
                     <FormattedMessage
-                      defaultMessage="Every {count} minutes"
+                      defaultMessage="Every {count, plural, one {minute} other {{count, number} minutes}}"
                       id="user.settings.notifications.email.everyXMinutes"
                       values={
                         Object {
diff --git a/webapp/channels/src/components/user_settings/notifications/email_notification_setting/email_notification_setting.tsx b/webapp/channels/src/components/user_settings/notifications/email_notification_setting/email_notification_setting.tsx
index 685839ca99..f0ddb955f9 100644
--- a/webapp/channels/src/components/user_settings/notifications/email_notification_setting/email_notification_setting.tsx
+++ b/webapp/channels/src/components/user_settings/notifications/email_notification_setting/email_notification_setting.tsx
@@ -284,7 +284,7 @@ export default class EmailNotificationSetting extends React.PureComponent<Props,
                             />
                             <FormattedMessage
                                 id='user.settings.notifications.email.everyXMinutes'
-                                defaultMessage='Every {count} minutes'
+                                defaultMessage='Every {count, plural, one {minute} other {{count, number} minutes}}'
                                 values={{count: Preferences.INTERVAL_FIFTEEN_MINUTES / SECONDS_PER_MINUTE}}
                             />
                         </label>
diff --git a/webapp/channels/src/components/view_user_group_modal/view_user_group_modal_header/view_user_group_modal_header.tsx b/webapp/channels/src/components/view_user_group_modal/view_user_group_modal_header/view_user_group_modal_header.tsx
index eec0f34342..c911f3fc01 100644
--- a/webapp/channels/src/components/view_user_group_modal/view_user_group_modal_header/view_user_group_modal_header.tsx
+++ b/webapp/channels/src/components/view_user_group_modal/view_user_group_modal_header/view_user_group_modal_header.tsx
@@ -90,7 +90,7 @@ const ViewUserGroupModalHeader = (props: Props) => {
                 >
                     <FormattedMessage
                         id='user_groups_modal.addPeople'
-                        defaultMessage='AddPeople'
+                        defaultMessage='Add People'
                     />
                 </button>
             );
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 238b42172d..792ca8cf0d 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -184,6 +184,7 @@
   "add_outgoing_webhook.displayName": "Title",
   "add_outgoing_webhook.displayName.help": "Specify a title for the webhook settings page. The title can contain up to 64 characters.",
   "add_outgoing_webhook.doneHelp": "Your outgoing webhook is set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (details at  <link>Outgoing Webhooks</link>).",
+  "add_outgoing_webhook.header": "Outgoing Webhooks",
   "add_outgoing_webhook.icon_url": "Profile Picture",
   "add_outgoing_webhook.icon_url.help": "Enter the URL of a .png or .jpg file for this integration to use as the profile picture when posting. The file should be at least 128 pixels by 128 pixels. If left blank, the profile picture specified by the webhook creator is used.",
   "add_outgoing_webhook.save": "Save",
@@ -307,6 +308,7 @@
   "admin.billing.subscription.cloudReverseTrial.daysLeftOnTrial": "{daysLeftOnTrial} days left on your trial. Purchase a plan or contact sales to keep your workspace.",
   "admin.billing.subscription.cloudReverseTrial.lastDay": "This is the last day of your trial. Purchase a plan before {userEndTrialHour} or contact sales",
   "admin.billing.subscription.cloudReverseTrial.subscribeButton": "Review your options",
+  "admin.billing.subscription.cloudTrial.daysLeft": "Your trial has started! There are {daysLeftOnTrial} days left",
   "admin.billing.subscription.cloudTrial.daysLeftOnTrial": "There are {daysLeftOnTrial} days left on your free trial",
   "admin.billing.subscription.cloudTrial.lastDay": "This is the last day of your free trial. Your access will expire on {userEndTrialDate} at {userEndTrialHour}.",
   "admin.billing.subscription.cloudTrial.moreThan3Days": "Your trial has started! There are {daysLeftOnTrial} days left",
@@ -400,6 +402,7 @@
   "admin.billing.subscription.providePaymentDetails": "Provide your payment details",
   "admin.billing.subscription.returnToTeam": "Return to {team}",
   "admin.billing.subscription.stateprovince": "State/Province",
+  "admin.billing.subscription.subscribedSuccess": "You're now subscribed to {productName}",
   "admin.billing.subscription.switchedToAnnual.title": "You're now switched to {selectedProductName} annual",
   "admin.billing.subscription.title": "Subscription",
   "admin.billing.subscription.updatePaymentInfo": "Update Payment Information",
@@ -1384,6 +1387,7 @@
   "admin.log.fileLevelTitle": "File Log Level:",
   "admin.log.fileTitle": "Output logs to file: ",
   "admin.log.jsonDescription": "When true, logged events are written in a machine readable JSON format. Otherwise they are printed as plain text. Changing this setting requires a server restart before taking effect.",
+  "admin.log.Level": "Level",
   "admin.log.levelDescription": "This setting determines the level of detail at which log events are written to the console. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
   "admin.log.levelTitle": "Console Log Level:",
   "admin.log.locationDescription": "The location of the log files. If blank, they are stored in the ./logs directory. The path that you set must exist and Mattermost must have write permissions in it. Changing this setting requires a server restart before taking effect.",
@@ -1405,6 +1409,7 @@
   "admin.manage_roles.additionalRoles": "Select additional permissions for the account. <link>Read more about roles and permissions</link>.",
   "admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <link>personal access tokens</link>.",
   "admin.manage_roles.allowUserAccessTokensDesc": "Removing this permission doesn't delete existing tokens. To delete them, go to the user's Manage Tokens menu.",
+  "admin.manage_roles.botAdditionalRoles": "Select additional permissions for the account. <link>Read more about roles and permissions</link>.",
   "admin.manage_roles.cancel": "Cancel",
   "admin.manage_roles.manageRolesTitle": "Manage Roles",
   "admin.manage_roles.postAllPublicRole": "Access to post to all Mattermost public channels.",
@@ -2588,6 +2593,7 @@
   "analytics.system.skippedIntensiveQueries": "To maximize performance, some statistics are disabled. You can <link>re-enable them in config.json</link>.",
   "analytics.system.textPosts": "Posts with Text-only",
   "analytics.system.title": "System Statistics",
+  "analytics.system.topChannels": "Top Channels",
   "analytics.system.totalBotPosts": "Total Posts from Bots",
   "analytics.system.totalChannels": "Total Channels",
   "analytics.system.totalCommands": "Total Commands",
@@ -2673,6 +2679,7 @@
   "apps.error.form.refresh_no_refresh": "Called refresh on no refresh field.",
   "apps.error.form.required_fields_empty": "Please fix all field errors",
   "apps.error.form.submit.pretext": "There has been an error submitting the modal. Contact the app developer. Details: {details}",
+  "apps.error.form.update": "There has been an error updating the modal. Contact the app developer. Details: {details}",
   "apps.error.lookup.error_preparing_request": "Error preparing lookup request: {errorMessage}",
   "apps.error.malformed_binding": "This binding is not properly formed. Contact the App developer.",
   "apps.error.parser": "Parsing error: {error}",
@@ -2817,6 +2824,7 @@
   "bots.disabled": "Disabled",
   "bots.image.upload": "Upload Image",
   "bots.manage.add": "Add Bot Account",
+  "bots.manage.add.add": "Add",
   "bots.manage.add.cancel": "Cancel",
   "bots.manage.add.create": "Create Bot Account",
   "bots.manage.add.creating": "Creating...",
@@ -2853,6 +2861,7 @@
   "change_url.shorter": "URLs must have maximum 64 characters.",
   "change_url.startAndEndWithLetter": "URLs must start and end with a lowercase letter or number.",
   "change_url.startWithLetter": "URLs must start with a lowercase letter or number.",
+  "channel_groups": "{channel} Groups",
   "channel_header.addChannelHeader": "Add a channel header",
   "channel_header.channelFiles": "Channel files",
   "channel_header.channelHasGuests": "This channel has guests",
@@ -2865,6 +2874,7 @@
   "channel_header.flagged": "Saved posts",
   "channel_header.groupMessageHasGuests": "This group message has guests",
   "channel_header.lastActive": "Last online {timestamp}",
+  "channel_header.lastOnline": "Last online {timestamp}",
   "channel_header.leave": "Leave Channel",
   "channel_header.manageMembers": "Manage Members",
   "channel_header.menuAriaLabel": "Channel Menu",
@@ -3345,6 +3355,7 @@
   "emoji_picker.custom": "Custom",
   "emoji_picker.custom_emoji": "Custom Emoji",
   "emoji_picker.emojiPicker": "Select an Emoji",
+  "emoji_picker.emojiPicker.previewPlaceholder": "Select an Emoji",
   "emoji_picker.flags": "Flags",
   "emoji_picker.food-drink": "Food & Drink",
   "emoji_picker.header": "Emoji Picker",
@@ -3377,6 +3388,7 @@
   "error.generic.link": "Back to {siteName}",
   "error.generic.link_login": "Back to Login Page",
   "error.generic.message": "An error has occurred.",
+  "error.generic.siteLink": "Back to {siteName}",
   "error.generic.title": "Error",
   "error.local_storage.help1": "Enable cookies",
   "error.local_storage.help2": "Turn off private browsing",
@@ -3564,6 +3576,7 @@
   "generic_icons.warning": "Warning Icon",
   "generic_modal.cancel": "Cancel",
   "generic_modal.confirm": "Confirm",
+  "generic.close": "Close",
   "generic.done": "Done",
   "generic.next": "Next",
   "generic.previous": "Previous",
@@ -3607,7 +3620,6 @@
   "group_member_list.searchError": "There was a problem getting results. Clear your search term and try again.",
   "group_member_list.sendMessageButton": "Send message to {user}",
   "group_member_list.sendMessageTooltip": "Send message",
-  "groups": "{team} Groups",
   "help.attaching.downloading.description": "Download an attached file by selecting the Download icon next to the file thumbnail, or by opening the file previewer and selecting **Download**.",
   "help.attaching.downloading.title": "Download Files",
   "help.attaching.dragdrop.description": "Upload a file, or a selection of files, by dragging the files from your computer into the right-hand sidebar or center pane. Dragging and dropping attaches the files to the message input box, then you can optionally type a message and press **ENTER** to post the message.",
@@ -3737,6 +3749,7 @@
   "help.messaging.reply": "**Reply to Messages:** Select the **Reply Arrow** icon next to the text input box.",
   "help.messaging.title": "Messaging Basics",
   "help.messaging.write": "**Write Messages:** Use the text input box at the bottom of the Mattermost interface to write a message. Press **ENTER** to send the message. Use **SHIFT+ENTER** to create a new line without sending a message.",
+  "incoming_webhooks.header": "Incoming Webhooks",
   "inProduct_notices.adminOnlyMessage": "Visible to Admins only",
   "input.clear": "Clear",
   "insights.accessModal.cloudFreeTrial": "During your trial you are able to view Team Insights.",
@@ -3884,6 +3897,7 @@
   "installed_oauth_apps.trusted": "Is Trusted",
   "installed_oauth_apps.trusted.no": "No",
   "installed_oauth_apps.trusted.yes": "Yes",
+  "installed_oauth2_apps.header": "OAuth 2.0 Applications",
   "installed_outgoing_webhooks.add": "Add Outgoing Webhook",
   "installed_outgoing_webhooks.delete.confirm": "This action permanently deletes the outgoing webhook and breaks any integrations using it. Are you sure you want to delete it?",
   "installed_outgoing_webhooks.empty": "No outgoing webhooks found",
@@ -4448,7 +4462,8 @@
   "post_info.comment_icon.tooltip.reply": "Reply",
   "post_info.copy": "Copy Text",
   "post_info.del": "Delete",
-  "post_info.dot_menu.tooltip.more_actions": "More",
+  "post_info.dot_menu.tooltip.actions": "Actions",
+  "post_info.dot_menu.tooltip.more": "More",
   "post_info.edit": "Edit",
   "post_info.edit.aria_label": "Select to restore an old message.",
   "post_info.edit.current_version": "Current Version",
@@ -4767,6 +4782,7 @@
   "setting_item_min.edit": "Edit",
   "setting_picture.cancel": "Cancel",
   "setting_picture.help.profile": "Upload a picture in BMP, JPG, JPEG, or PNG format. Maximum file size: {max}",
+  "setting_picture.help.profile.example": "Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}",
   "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.\nSquare images with a solid background color are recommended.",
   "setting_picture.remove": "Remove This Icon",
   "setting_picture.remove_profile_picture": "Remove Profile Picture",
@@ -4996,6 +5012,7 @@
   "single_image_view.copied_link_tooltip": "Copied",
   "single_image_view.copy_link_tooltip": "Copy link",
   "single_image_view.download_tooltip": "Download",
+  "slash_commands.header": "Slash Commands",
   "someting.string": "defaultString",
   "start_cloud_trial.modal.enter_trial_email.description": "Start a trial and enter a business email to get started. ",
   "start_cloud_trial.modal.enter_trial_email.input.label": "Enter business email",
@@ -5090,6 +5107,7 @@
   "tag.default.guest": "GUEST",
   "tag.default.new": "NEW",
   "team_channel_settings.group.group_user_row.numberOfGroups": "{amount, number} {amount, plural, one {Group} other {Groups}}",
+  "team_groups": "{team} Groups",
   "team_member_modal.invitePeople": "Invite People",
   "team_member_modal.members": "{team} Members",
   "team_members_dropdown.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
@@ -5125,7 +5143,8 @@
   "terms_of_service.agreeButton": "I Agree",
   "terms_of_service.api_error": "Unable to complete the request. If this issue persists, contact your System Administrator.",
   "terms_of_service.disagreeButton": "I Disagree",
-  "test": "Button Text",
+  "test1": "Help Text",
+  "test2": "Button Text",
   "textbox.bold": "**bold**",
   "textbox.edit": "Edit message",
   "textbox.help": "Help",
diff --git a/webapp/channels/src/plugins/call_button/call_button.tsx b/webapp/channels/src/plugins/call_button/call_button.tsx
index 0baf551f08..2336ef3c45 100644
--- a/webapp/channels/src/plugins/call_button/call_button.tsx
+++ b/webapp/channels/src/plugins/call_button/call_button.tsx
@@ -96,7 +96,7 @@ export default function CallButton({pluginCallComponents, currentChannel, channe
                     <span className='call-button-label'>{'Call'}</span>
                     <ChevronDownIcon
                         color='inherit'
-                        aria-label={formatMessage({id: 'generic_icons.dropdown', defaultMessage: 'Dropdown icon'}).toLowerCase()}
+                        aria-label={formatMessage({id: 'generic_icons.dropdown', defaultMessage: 'Dropdown Icon'}).toLowerCase()}
                     />
                 </button>
                 <Menu

From 093a17db7074da96502d1966cfbbdb84510c09f0 Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Mon, 17 Apr 2023 15:37:09 -0400
Subject: [PATCH 094/103] lint.

---
 .../self_hosted_expansion_modal/expansion_card.tsx            | 4 ++--
 .../self_hosted_expansion_modal/index.tsx                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
index 3bd91c348d..b6440d986b 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
@@ -76,7 +76,7 @@ export default function SelfHostedExpansionCard(props: Props) {
     const maxAdditionalSeats = getMaximumAdditionalSeats();
 
     const handleNewSeatsInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        let requestedSeats = parseInt(e.target.value, 10);
+        const requestedSeats = parseInt(e.target.value, 10);
 
         if (!isNaN(requestedSeats) && requestedSeats <= 0) {
             e.preventDefault();
@@ -160,7 +160,7 @@ export default function SelfHostedExpansionCard(props: Props) {
                             defaultMessage='{warningIcon} You must purchase at least {minimumSeats} seats to be compliant with your license'
                             values={{
                                 warningIcon: <WarningIcon additionalClassName={'SelfHostedExpansionRHSCard__warning'}/>,
-                                minimumSeats: props.minimumSeats
+                                minimumSeats: props.minimumSeats,
                             }}
                         />
                     }
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
index 48b1e276f8..b66a81f517 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
@@ -176,7 +176,7 @@ export default function SelfHostedExpansionModal() {
     const currentPlan = license.SkuName;
     const activeUsers = useSelector(getFilteredUsersStats)?.total_users_count || 0;
     const [minimumSeats] = useState(activeUsers <= licensedSeats ? 1 : activeUsers - licensedSeats);
-    const [requestedSeats, setRequestedSeats] = useState(minimumSeats)
+    const [requestedSeats, setRequestedSeats] = useState(minimumSeats);
 
     const [stripeLoadHint, setStripeLoadHint] = useState(Math.random());
     const stripeRef = useLoadStripe(stripeLoadHint);

From 7bfebcc80a7c77f5c4def02f75f4d6de42b7d9f4 Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Mon, 17 Apr 2023 15:38:52 -0400
Subject: [PATCH 095/103] Change confirm expand client request to hit a
 separate endpoint from self hosted purchases confirm.

---
 webapp/platform/client/src/client4.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/platform/client/src/client4.ts b/webapp/platform/client/src/client4.ts
index b194c71946..47e6741b0e 100644
--- a/webapp/platform/client/src/client4.ts
+++ b/webapp/platform/client/src/client4.ts
@@ -3899,7 +3899,7 @@ export default class Client4 {
 
     confirmSelfHostedExpansion = (setupIntentId: string, expandRequest: SelfHostedExpansionRequest) => {
         return this.doFetch<SelfHostedSignupSuccessResponse>(
-            `${this.getHostedCustomerRoute()}/confirm?expand=true`,
+            `${this.getHostedCustomerRoute()}/confirm-expand`,
             {method: 'post', body: JSON.stringify({stripe_setup_intent_id: setupIntentId, expand_request: expandRequest})},
         );
     }

From f613c655e7af639c06f4beb8b5245dba9b450ecc Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Mon, 17 Apr 2023 16:11:43 -0400
Subject: [PATCH 096/103] remove self hosted expansion flag in favor of
 grouping hosted expansion with hosted purhcase and it's flag.

---
 e2e-tests/playwright/support/server/default_config.ts       | 1 -
 model/config.go                                             | 5 -----
 server/platform/services/telemetry/telemetry.go             | 1 -
 .../enterprise_edition_left_panel.test.tsx                  | 2 +-
 .../enterprise_edition/enterprise_edition_left_panel.tsx    | 6 +++---
 webapp/platform/types/src/config.ts                         | 1 -
 6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/e2e-tests/playwright/support/server/default_config.ts b/e2e-tests/playwright/support/server/default_config.ts
index a82775d783..a5b92aeb89 100644
--- a/e2e-tests/playwright/support/server/default_config.ts
+++ b/e2e-tests/playwright/support/server/default_config.ts
@@ -170,7 +170,6 @@ const defaultServerConfig: AdminConfig = {
         EnableCustomGroups: true,
         SelfHostedPurchase: true,
         AllowSyncedDrafts: true,
-        SelfHostedExpansion: false,
     },
     TeamSettings: {
         SiteName: 'Mattermost',
diff --git a/model/config.go b/model/config.go
index 4868229bbf..95c0b6514e 100644
--- a/model/config.go
+++ b/model/config.go
@@ -390,7 +390,6 @@ type ServiceSettings struct {
 	EnableCustomGroups                                *bool   `access:"site_users_and_teams"`
 	SelfHostedPurchase                                *bool   `access:"write_restrictable,cloud_restrictable"`
 	AllowSyncedDrafts                                 *bool   `access:"site_posts"`
-	SelfHostedExpansion                               *bool   `access:"write_restrictable,cloud_restrictable"`
 }
 
 func (s *ServiceSettings) SetDefaults(isUpdate bool) {
@@ -863,10 +862,6 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
 	if s.SelfHostedPurchase == nil {
 		s.SelfHostedPurchase = NewBool(true)
 	}
-
-	if s.SelfHostedExpansion == nil {
-		s.SelfHostedExpansion = NewBool(false)
-	}
 }
 
 type ClusterSettings struct {
diff --git a/server/platform/services/telemetry/telemetry.go b/server/platform/services/telemetry/telemetry.go
index a214911f20..157db35f48 100644
--- a/server/platform/services/telemetry/telemetry.go
+++ b/server/platform/services/telemetry/telemetry.go
@@ -476,7 +476,6 @@ func (ts *TelemetryService) trackConfig() {
 		"post_priority":                                           *cfg.ServiceSettings.PostPriority,
 		"self_hosted_purchase":                                    *cfg.ServiceSettings.SelfHostedPurchase,
 		"allow_synced_drafts":                                     *cfg.ServiceSettings.AllowSyncedDrafts,
-		"self_hosted_expansion":                                   *cfg.ServiceSettings.SelfHostedExpansion,
 	})
 
 	ts.SendTelemetry(TrackConfigTeam, map[string]any{
diff --git a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.test.tsx b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.test.tsx
index 3c8a8f4697..987a3421f5 100644
--- a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.test.tsx
+++ b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.test.tsx
@@ -69,7 +69,7 @@ describe('components/admin_console/license_settings/enterprise_edition/enterpris
             admin: {
                 config: {
                     ServiceSettings: {
-                        SelfHostedExpansion: true,
+                        SelfHostedPurchase: true,
                     },
                 },
             },
diff --git a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx
index 7cc45db259..1a09207a64 100644
--- a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx
+++ b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx
@@ -59,13 +59,13 @@ const EnterpriseEditionLeftPanel = ({
     const canExpand = useCanSelfHostedExpand();
     const selfHostedExpansionModal = useControlSelfHostedExpansionModal({trackingLocation: 'license_settings_add_seats'});
     const expandableLink = useSelector(getExpandSeatsLink);
-    const isSelfHostedExpansionEnabled = useSelector(getConfig)?.ServiceSettings?.SelfHostedExpansion;
+    const isSelfHostedPurchaseEnabled = useSelector(getConfig)?.ServiceSettings?.SelfHostedPurchase;
 
     const query = useQuery();
     const actionQueryParam = query.get('action');
 
     useEffect(() => {
-        if (actionQueryParam === 'show_expansion_modal' && canExpand && isSelfHostedExpansionEnabled) {
+        if (actionQueryParam === 'show_expansion_modal' && canExpand && isSelfHostedPurchaseEnabled) {
             selfHostedExpansionModal.open();
             query.set('action', '');
         }
@@ -100,7 +100,7 @@ const EnterpriseEditionLeftPanel = ({
     );
 
     const handleClickAddSeats = () => {
-        if (!isSelfHostedExpansionEnabled || !canExpand) {
+        if (!isSelfHostedPurchaseEnabled || !canExpand) {
             window.open(expandableLink(unsanitizedLicense.Id), '_blank');
         } else {
             selfHostedExpansionModal.open();
diff --git a/webapp/platform/types/src/config.ts b/webapp/platform/types/src/config.ts
index a9053a7a51..0a56b79b6a 100644
--- a/webapp/platform/types/src/config.ts
+++ b/webapp/platform/types/src/config.ts
@@ -369,7 +369,6 @@ export type ServiceSettings = {
     EnableCustomGroups: boolean;
     SelfHostedPurchase: boolean;
     AllowSyncedDrafts: boolean;
-    SelfHostedExpansion: boolean;
 };
 
 export type TeamSettings = {

From dd314373be184b69f313c1899f19e5897c4d2ce5 Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Mon, 17 Apr 2023 16:26:43 -0400
Subject: [PATCH 097/103] i18n.

---
 webapp/channels/src/i18n/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 92034bf68e..cde81b5186 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -4758,6 +4758,7 @@
   "self_hosted_expansion_rhs_card_licensed_seats": "{licensedSeats} LICENSES SEATS",
   "self_hosted_expansion_rhs_card_maximum_seats_warning": "{warningIcon} You may only expand by an additional {maxAdditionalSeats} seats",
   "self_hosted_expansion_rhs_card_must_add_seats_warning": "{warningIcon} You must add a seat to continue",
+  "self_hosted_expansion_rhs_card_must_purchase_enough_seats": "{warningIcon} You must purchase at least {minimumSeats} seats to be compliant with your license",
   "self_hosted_expansion_rhs_card_total_prorated_warning": "The total will be prorated",
   "self_hosted_expansion_rhs_card_total_title": "Total",
   "self_hosted_expansion_rhs_complete_button": "Complete purchase",

From 831ea38f7ef639bfe8c524e9d0484dc27f51a556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Peso?= <trilopin@users.noreply.github.com>
Date: Tue, 18 Apr 2023 04:46:49 +0200
Subject: [PATCH 098/103] Playwright upgrade and small addition to ChannelsPage
 helper (#22978)

* partial commit

* upgrade playwright to 1.32.3 (ui + project dependencies support)

* revert empty line

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 e2e-tests/playwright/package-lock.json        | 53 +++++++++++++------
 e2e-tests/playwright/package.json             |  2 +-
 e2e-tests/playwright/playwright.config.ts     |  2 +-
 .../ui/components/channels/post_create.ts     |  6 +++
 .../playwright/support/ui/pages/channels.ts   |  4 ++
 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/e2e-tests/playwright/package-lock.json b/e2e-tests/playwright/package-lock.json
index ef9a9a8578..6d5a200c81 100644
--- a/e2e-tests/playwright/package-lock.json
+++ b/e2e-tests/playwright/package-lock.json
@@ -8,7 +8,7 @@
             "dependencies": {
                 "@percy/cli": "1.18.0",
                 "@percy/playwright": "1.0.4",
-                "@playwright/test": "1.30.0",
+                "@playwright/test": "1.32.3",
                 "async-wait-until": "2.0.12",
                 "chalk": "4.1.2",
                 "deepmerge": "4.3.0",
@@ -428,18 +428,21 @@
             }
         },
         "node_modules/@playwright/test": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.30.0.tgz",
-            "integrity": "sha512-SVxkQw1xvn/Wk/EvBnqWIq6NLo1AppwbYOjNLmyU0R1RoQ3rLEBtmjTnElcnz8VEtn11fptj1ECxK0tgURhajw==",
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz",
+            "integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==",
             "dependencies": {
                 "@types/node": "*",
-                "playwright-core": "1.30.0"
+                "playwright-core": "1.32.3"
             },
             "bin": {
                 "playwright": "cli.js"
             },
             "engines": {
                 "node": ">=14"
+            },
+            "optionalDependencies": {
+                "fsevents": "2.3.2"
             }
         },
         "node_modules/@types/json-schema": {
@@ -1396,6 +1399,19 @@
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
             "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
         },
+        "node_modules/fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
         "node_modules/get-stream": {
             "version": "5.2.0",
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -1927,9 +1943,9 @@
             }
         },
         "node_modules/playwright-core": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.30.0.tgz",
-            "integrity": "sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g==",
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz",
+            "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg==",
             "bin": {
                 "playwright": "cli.js"
             },
@@ -2677,12 +2693,13 @@
             "integrity": "sha512-4cSkWqpu7uK9zzeVwtMWrgGbP34GUlvZsWdEEt98ep6ZECQA+iGB75pOpIVwcsHKXtkDRE6fgugtxNXs5uHpMg=="
         },
         "@playwright/test": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.30.0.tgz",
-            "integrity": "sha512-SVxkQw1xvn/Wk/EvBnqWIq6NLo1AppwbYOjNLmyU0R1RoQ3rLEBtmjTnElcnz8VEtn11fptj1ECxK0tgURhajw==",
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz",
+            "integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==",
             "requires": {
                 "@types/node": "*",
-                "playwright-core": "1.30.0"
+                "fsevents": "2.3.2",
+                "playwright-core": "1.32.3"
             }
         },
         "@types/json-schema": {
@@ -3366,6 +3383,12 @@
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
             "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
         },
+        "fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "optional": true
+        },
         "get-stream": {
             "version": "5.2.0",
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -3747,9 +3770,9 @@
             "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
         },
         "playwright-core": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.30.0.tgz",
-            "integrity": "sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g=="
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz",
+            "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg=="
         },
         "prelude-ls": {
             "version": "1.2.1",
diff --git a/e2e-tests/playwright/package.json b/e2e-tests/playwright/package.json
index 8ee95ffa63..d2c21cbc69 100644
--- a/e2e-tests/playwright/package.json
+++ b/e2e-tests/playwright/package.json
@@ -13,7 +13,7 @@
     "dependencies": {
         "@percy/cli": "1.18.0",
         "@percy/playwright": "1.0.4",
-        "@playwright/test": "1.30.0",
+        "@playwright/test": "1.32.3",
         "async-wait-until": "2.0.12",
         "chalk": "4.1.2",
         "deepmerge": "4.3.0",
diff --git a/e2e-tests/playwright/playwright.config.ts b/e2e-tests/playwright/playwright.config.ts
index a014c9cb3b..56fcbd2c30 100644
--- a/e2e-tests/playwright/playwright.config.ts
+++ b/e2e-tests/playwright/playwright.config.ts
@@ -6,7 +6,7 @@ import {defineConfig, devices} from '@playwright/test';
 import {duration} from '@e2e-support/util';
 import testConfig from '@e2e-test.config';
 
-const defaultOutputFolder = 'playwright-report';
+const defaultOutputFolder = './playwright-report';
 
 export default defineConfig({
     globalSetup: require.resolve('./global_setup'),
diff --git a/e2e-tests/playwright/support/ui/components/channels/post_create.ts b/e2e-tests/playwright/support/ui/components/channels/post_create.ts
index 2a8be0ec6d..912fcad80e 100644
--- a/e2e-tests/playwright/support/ui/components/channels/post_create.ts
+++ b/e2e-tests/playwright/support/ui/components/channels/post_create.ts
@@ -9,6 +9,7 @@ export default class ChannelsPostCreate {
     readonly input;
     readonly attachmentButton;
     readonly emojiButton;
+    readonly sendButton: Locator;
 
     constructor(container: Locator) {
         this.container = container;
@@ -16,12 +17,17 @@ export default class ChannelsPostCreate {
         this.input = container.getByTestId('post_textbox');
         this.attachmentButton = container.getByLabel('attachment');
         this.emojiButton = container.getByLabel('select an emoji');
+        this.sendButton = container.getByTestId('SendMessageButton');
     }
 
     async postMessage(message: string) {
         await this.input.fill(message);
     }
 
+    async sendMessage() {
+        await this.sendButton.click();
+    }
+
     async toBeVisible() {
         await expect(this.container).toBeVisible();
         await expect(this.input).toBeVisible();
diff --git a/e2e-tests/playwright/support/ui/pages/channels.ts b/e2e-tests/playwright/support/ui/pages/channels.ts
index 948cb673c5..b9c76ffc4c 100644
--- a/e2e-tests/playwright/support/ui/pages/channels.ts
+++ b/e2e-tests/playwright/support/ui/pages/channels.ts
@@ -49,6 +49,10 @@ export default class ChannelsPage {
         await this.postCreate.postMessage(message);
     }
 
+    async sendMessage() {
+        await this.postCreate.sendMessage();
+    }
+
     async getFirstPost() {
         await this.page.getByTestId('postView').first().waitFor();
         const post = await this.page.getByTestId('postView').first();

From b200a078819ebe4e6467fb23a9e41460f9113f5d Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Tue, 18 Apr 2023 11:05:28 +0530
Subject: [PATCH 099/103] v8.0 module release (#22975)

https://mattermost.atlassian.net/browse/MM-52079

```release-note
We upgrade the module version to 8.0. The new module path is github.com/mattermost-server/server/v8.
```


Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
---
 server/Makefile                               |  66 ++--
 server/boards/api/admin.go                    |   6 +-
 server/boards/api/api.go                      |  10 +-
 server/boards/api/api_test.go                 |   4 +-
 server/boards/api/archive.go                  |   8 +-
 server/boards/api/audit.go                    |   4 +-
 server/boards/api/auth.go                     |  10 +-
 server/boards/api/blocks.go                   |   6 +-
 server/boards/api/boards.go                   |   6 +-
 server/boards/api/boards_and_blocks.go        |   6 +-
 server/boards/api/cards.go                    |   6 +-
 server/boards/api/categories.go               |   4 +-
 server/boards/api/channels.go                 |   8 +-
 server/boards/api/compliance.go               |   6 +-
 server/boards/api/content_blocks.go           |   4 +-
 server/boards/api/files.go                    |  12 +-
 server/boards/api/insights.go                 |   6 +-
 server/boards/api/limits.go                   |   2 +-
 server/boards/api/members.go                  |   6 +-
 server/boards/api/onboarding.go               |   2 +-
 server/boards/api/search.go                   |   6 +-
 server/boards/api/sharing.go                  |   6 +-
 server/boards/api/statistics.go               |   4 +-
 server/boards/api/subscriptions.go            |   6 +-
 server/boards/api/system_test.go              |   6 +-
 server/boards/api/teams.go                    |   6 +-
 server/boards/api/templates.go                |   6 +-
 server/boards/api/users.go                    |   6 +-
 server/boards/app/app.go                      |  24 +-
 server/boards/app/app_test.go                 |   2 +-
 server/boards/app/auth.go                     |   8 +-
 server/boards/app/auth_test.go                |   6 +-
 server/boards/app/blocks.go                   |   8 +-
 server/boards/app/blocks_test.go              |   4 +-
 server/boards/app/boards.go                   |   8 +-
 server/boards/app/boards_and_blocks.go        |   6 +-
 server/boards/app/boards_test.go              |   4 +-
 server/boards/app/cards.go                    |   4 +-
 server/boards/app/cards_test.go               |   4 +-
 server/boards/app/category.go                 |   4 +-
 server/boards/app/category_boards.go          |   2 +-
 server/boards/app/category_boards_test.go     |   4 +-
 server/boards/app/category_test.go            |   4 +-
 server/boards/app/clientConfig.go             |   2 +-
 server/boards/app/clientConfig_test.go        |   2 +-
 server/boards/app/cloud.go                    |   8 +-
 server/boards/app/cloud_test.go               |   6 +-
 server/boards/app/compliance.go               |   2 +-
 server/boards/app/content_blocks.go           |   2 +-
 server/boards/app/content_blocks_test.go      |   2 +-
 server/boards/app/export.go                   |   4 +-
 server/boards/app/files.go                    |  10 +-
 server/boards/app/files_test.go               |   8 +-
 server/boards/app/helper_test.go              |  22 +-
 server/boards/app/import.go                   |   6 +-
 server/boards/app/import_test.go              |   4 +-
 server/boards/app/initialize.go               |   2 +-
 server/boards/app/insights.go                 |   4 +-
 server/boards/app/insights_test.go            |   4 +-
 server/boards/app/onboarding.go               |   2 +-
 server/boards/app/onboarding_test.go          |   4 +-
 server/boards/app/permissions.go              |   2 +-
 server/boards/app/server_metadata.go          |   2 +-
 server/boards/app/server_metadata_test.go     |   2 +-
 server/boards/app/sharing.go                  |   2 +-
 server/boards/app/sharing_test.go             |   4 +-
 server/boards/app/subscriptions.go            |   6 +-
 server/boards/app/teams.go                    |   6 +-
 server/boards/app/teams_test.go               |   2 +-
 server/boards/app/templates.go                |   6 +-
 server/boards/app/templates_test.go           |   6 +-
 server/boards/app/user.go                     |   4 +-
 server/boards/app/user_test.go                |   4 +-
 server/boards/auth/auth.go                    |  10 +-
 server/boards/auth/auth_test.go               |  14 +-
 .../boards/auth/mocks/mockauth_interface.go   |   4 +-
 server/boards/client/client.go                |   6 +-
 server/boards/integrationtests/blocks_test.go |   4 +-
 server/boards/integrationtests/board_test.go  |   6 +-
 .../boards_and_blocks_test.go                 |   2 +-
 .../boards/integrationtests/boardsapp_test.go |   6 +-
 server/boards/integrationtests/cards_test.go  |   4 +-
 .../boards/integrationtests/clienttestlib.go  |  24 +-
 .../integrationtests/compliance_test.go       |   4 +-
 .../integrationtests/configuration_test.go    |  12 +-
 .../integrationtests/content_blocks_test.go   |   4 +-
 server/boards/integrationtests/export_test.go |   4 +-
 server/boards/integrationtests/file_test.go   |   2 +-
 .../integrationtests/permissions_test.go      |   4 +-
 .../integrationtests/pluginteststore.go       |   6 +-
 .../boards/integrationtests/sharing_test.go   |   4 +-
 .../boards/integrationtests/sidebar_test.go   |   2 +-
 .../integrationtests/statistics_test.go       |   4 +-
 .../integrationtests/subscriptions_test.go    |   6 +-
 server/boards/integrationtests/teststore.go   |   4 +-
 server/boards/integrationtests/user_test.go   |   4 +-
 server/boards/model/auth.go                   |   2 +-
 server/boards/model/block.go                  |   2 +-
 server/boards/model/block_test.go             |   4 +-
 server/boards/model/blockid.go                |   4 +-
 server/boards/model/blocktype.go              |   2 +-
 server/boards/model/board_insights.go         |   2 +-
 server/boards/model/boards_and_blocks.go      |   4 +-
 server/boards/model/boards_and_blocks_test.go |   2 +-
 server/boards/model/card.go                   |   2 +-
 server/boards/model/card_test.go              |   2 +-
 server/boards/model/category.go               |   2 +-
 server/boards/model/error.go                  |   2 +-
 server/boards/model/mocks/mockservicesapi.go  |   6 +-
 .../model/mocks/propValueResolverMock.go      |   4 +-
 server/boards/model/notification.go           |   2 +-
 server/boards/model/permission.go             |   2 +-
 server/boards/model/properties.go             |   2 +-
 server/boards/model/properties_test.go        |   2 +-
 server/boards/model/services_api.go           |   4 +-
 server/boards/model/util.go                   |   2 +-
 server/boards/model/version.go                |   2 +-
 server/boards/product/api_adapter.go          |   8 +-
 server/boards/product/boards_product.go       |  12 +-
 .../boards/product/imports/boards_imports.go  |   2 +-
 server/boards/server/boards_service.go        |  24 +-
 server/boards/server/boards_service_api.go    |   8 +-
 server/boards/server/boards_service_util.go   |   4 +-
 server/boards/server/data_retention_test.go   |  10 +-
 server/boards/server/notifications.go         |  16 +-
 server/boards/server/params.go                |  14 +-
 server/boards/server/post.go                  |   4 +-
 server/boards/server/server.go                |  38 +--
 server/boards/services/audit/audit.go         |   2 +-
 server/boards/services/audit/record.go        |   2 +-
 server/boards/services/metrics/service.go     |   2 +-
 .../notify/notifylogger/logger_backend.go     |   4 +-
 .../services/notify/notifymentions/app_api.go |   2 +-
 .../notify/notifymentions/delivery.go         |   4 +-
 .../notify/notifymentions/mentions.go         |   4 +-
 .../notify/notifymentions/mentions_backend.go |   8 +-
 .../notify/notifymentions/mentions_test.go    |   4 +-
 .../notify/notifysubscriptions/app_api.go     |   2 +-
 .../notify/notifysubscriptions/delivery.go    |   4 +-
 .../notify/notifysubscriptions/diff.go        |   4 +-
 .../notifysubscriptions/diff2markdown.go      |   2 +-
 .../diff2slackattachments.go                  |   6 +-
 .../notify/notifysubscriptions/notifier.go    |   8 +-
 .../subscriptions_backend.go                  |   8 +-
 .../notify/notifysubscriptions/util.go        |   2 +-
 .../notify/plugindelivery/mention_deliver.go  |   6 +-
 .../services/notify/plugindelivery/message.go |   2 +-
 .../notify/plugindelivery/plugin_delivery.go  |   2 +-
 .../plugindelivery/subscription_deliver.go    |   4 +-
 .../services/notify/plugindelivery/user.go    |   4 +-
 .../notify/plugindelivery/user_test.go        |   4 +-
 server/boards/services/notify/service.go      |   4 +-
 .../localpermissions/helpers_test.go          |   8 +-
 .../localpermissions/localpermissions.go      |   8 +-
 .../localpermissions/localpermissions_test.go |   4 +-
 .../permissions/mmpermissions/helpers_test.go |  10 +-
 .../mmpermissions/mmpermissions.go            |   8 +-
 .../mmpermissions/mmpermissions_test.go       |   6 +-
 .../mmpermissions/mocks/mockpluginapi.go      |   4 +-
 .../services/permissions/mocks/mockstore.go   |   4 +-
 .../services/permissions/permissions.go       |   4 +-
 .../generators/transactional_store.go.tmpl    |   6 +-
 .../mattermostauthlayer.go                    |  10 +-
 .../mattermostauthlayer_test.go               |   6 +-
 .../services/store/mockstore/mockstore.go     | 302 +++++++++---------
 .../boards/services/store/sqlstore/blocks.go  |   6 +-
 .../boards/services/store/sqlstore/board.go   |   6 +-
 .../services/store/sqlstore/board_insights.go |   6 +-
 .../store/sqlstore/boards_and_blocks.go       |   2 +-
 .../store/sqlstore/boards_migrator.go         |   8 +-
 .../services/store/sqlstore/category.go       |   6 +-
 .../store/sqlstore/category_boards.go         |   6 +-
 .../boards/services/store/sqlstore/cloud.go   |   4 +-
 .../services/store/sqlstore/compliance.go     |   4 +-
 .../store/sqlstore/data_migrations.go         |   6 +-
 .../store/sqlstore/data_migrations_test.go    |   4 +-
 .../services/store/sqlstore/data_retention.go |   4 +-
 server/boards/services/store/sqlstore/file.go |   6 +-
 .../services/store/sqlstore/legacy_blocks.go  |   6 +-
 .../boards/services/store/sqlstore/migrate.go |   8 +-
 ...eleted_membership_boards_migration_test.go |   2 +-
 .../migrationstests/migrate_34_test.go        |   2 +-
 .../migrationstests/migration35_test.go       |   2 +-
 .../migrationstests/migration36_test.go       |   2 +-
 .../migrationstests/migration37_test.go       |   2 +-
 .../migrationstests/migration38_test.go       |   2 +-
 .../migrationstests/migration_18_test.go      |   2 +-
 .../migrationstests/migration_28_test.go      |   2 +-
 .../migrationstests/migration_33_test.go      |   2 +-
 .../store/sqlstore/notificationhints.go       |   6 +-
 .../boards/services/store/sqlstore/params.go  |   4 +-
 .../services/store/sqlstore/public_methods.go |   6 +-
 .../store/sqlstore/schema_table_migration.go  |   4 +-
 .../boards/services/store/sqlstore/session.go |   4 +-
 .../boards/services/store/sqlstore/sharing.go |   4 +-
 .../services/store/sqlstore/sqlstore.go       |   8 +-
 .../services/store/sqlstore/sqlstore_test.go  |   4 +-
 .../services/store/sqlstore/subscriptions.go  |   4 +-
 .../boards/services/store/sqlstore/system.go  |   2 +-
 server/boards/services/store/sqlstore/team.go |   6 +-
 .../services/store/sqlstore/templates.go      |   4 +-
 .../boards/services/store/sqlstore/testlib.go |   8 +-
 server/boards/services/store/sqlstore/user.go |  10 +-
 server/boards/services/store/sqlstore/util.go |   6 +-
 server/boards/services/store/store.go         |   4 +-
 .../services/store/storetests/blocks.go       |   6 +-
 .../store/storetests/board_insights.go        |   4 +-
 .../services/store/storetests/boards.go       |   6 +-
 .../store/storetests/boards_and_blocks.go     |   6 +-
 .../services/store/storetests/category.go     |   6 +-
 .../store/storetests/categoryBoards.go        |   6 +-
 .../boards/services/store/storetests/cloud.go |   8 +-
 .../services/store/storetests/compliance.go   |   6 +-
 .../store/storetests/data_retention.go        |   6 +-
 .../boards/services/store/storetests/files.go |   8 +-
 .../services/store/storetests/helpers.go      |   4 +-
 .../store/storetests/notificationhints.go     |   6 +-
 .../services/store/storetests/session.go      |   4 +-
 .../services/store/storetests/sharing.go      |   4 +-
 .../store/storetests/subscriptions.go         |   4 +-
 .../services/store/storetests/system.go       |   2 +-
 .../boards/services/store/storetests/teams.go |   6 +-
 .../boards/services/store/storetests/users.go |   6 +-
 .../boards/services/store/storetests/util.go  |   6 +-
 .../services/telemetry/mocks/ServerIface.go   |   6 +-
 server/boards/services/telemetry/telemetry.go |   6 +-
 .../services/telemetry/telemetry_test.go      |   2 +-
 server/boards/services/webhook/webhook.go     |   6 +-
 .../boards/services/webhook/webhook_test.go   |   6 +-
 server/boards/utils/callbackqueue.go          |   2 +-
 server/boards/utils/callbackqueue_test.go     |   2 +-
 server/boards/utils/utils.go                  |   2 +-
 server/boards/web/webserver.go                |   2 +-
 server/boards/web/webserver_test.go           |   2 +-
 server/boards/ws/adapter.go                   |   2 +-
 server/boards/ws/common.go                    |   2 +-
 server/boards/ws/helpers_test.go              |   8 +-
 server/boards/ws/mocks/mockpluginapi.go       |   4 +-
 server/boards/ws/mocks/mockstore.go           |   4 +-
 server/boards/ws/plugin_adapter.go            |  12 +-
 server/boards/ws/plugin_adapter_client.go     |   2 +-
 server/boards/ws/plugin_adapter_cluster.go    |   4 +-
 server/boards/ws/plugin_adapter_test.go       |   4 +-
 server/boards/ws/server.go                    |   8 +-
 server/boards/ws/server_test.go               |   6 +-
 server/channels/api4/api.go                   |   6 +-
 server/channels/api4/apitestlib.go            |  24 +-
 server/channels/api4/bleve.go                 |   4 +-
 server/channels/api4/bleve_test.go            |   2 +-
 server/channels/api4/bot.go                   |   6 +-
 server/channels/api4/bot_test.go              |   2 +-
 server/channels/api4/brand.go                 |   4 +-
 server/channels/api4/brand_test.go            |   2 +-
 server/channels/api4/channel.go               |   8 +-
 server/channels/api4/channel_category.go      |   6 +-
 server/channels/api4/channel_category_test.go |   2 +-
 server/channels/api4/channel_local.go         |   8 +-
 server/channels/api4/channel_test.go          |  10 +-
 server/channels/api4/cloud.go                 |   8 +-
 server/channels/api4/cloud_test.go            |   4 +-
 server/channels/api4/cluster.go               |   2 +-
 server/channels/api4/cluster_test.go          |   2 +-
 server/channels/api4/command.go               |   6 +-
 server/channels/api4/command_help_test.go     |   2 +-
 server/channels/api4/command_local.go         |   6 +-
 server/channels/api4/command_test.go          |   4 +-
 server/channels/api4/commands_test.go         |   4 +-
 server/channels/api4/compliance.go            |   6 +-
 server/channels/api4/config.go                |  12 +-
 server/channels/api4/config_local.go          |  10 +-
 server/channels/api4/config_test.go           |   6 +-
 server/channels/api4/cors_test.go             |   4 +-
 server/channels/api4/data_retention.go        |   6 +-
 server/channels/api4/drafts.go                |   4 +-
 server/channels/api4/drafts_test.go           |   4 +-
 server/channels/api4/elasticsearch.go         |   6 +-
 server/channels/api4/elasticsearch_test.go    |   2 +-
 server/channels/api4/emoji.go                 |  10 +-
 server/channels/api4/emoji_test.go            |   8 +-
 server/channels/api4/export.go                |   4 +-
 server/channels/api4/export_test.go           |   4 +-
 server/channels/api4/file.go                  |  12 +-
 server/channels/api4/file_test.go             |   8 +-
 server/channels/api4/graphql.go               |   6 +-
 server/channels/api4/graphql_client.go        |   2 +-
 server/channels/api4/group.go                 |   6 +-
 server/channels/api4/group_test.go            |   2 +-
 server/channels/api4/handlers.go              |   4 +-
 server/channels/api4/handlers_test.go         |   2 +-
 server/channels/api4/hosted_customer.go       |   8 +-
 server/channels/api4/hosted_customer_test.go  |   4 +-
 server/channels/api4/image.go                 |   2 +-
 server/channels/api4/image_test.go            |   2 +-
 server/channels/api4/import.go                |   4 +-
 server/channels/api4/import_test.go           |   4 +-
 server/channels/api4/insights.go              |   2 +-
 server/channels/api4/insights_test.go         |   6 +-
 server/channels/api4/integration_action.go    |   4 +-
 .../channels/api4/integration_action_test.go  |   2 +-
 server/channels/api4/job.go                   |   8 +-
 server/channels/api4/job_test.go              |   2 +-
 server/channels/api4/ldap.go                  |   6 +-
 server/channels/api4/ldap_test.go             |   6 +-
 server/channels/api4/license.go               |   8 +-
 server/channels/api4/license_local.go         |   6 +-
 server/channels/api4/license_test.go          |  10 +-
 server/channels/api4/main_test.go             |   2 +-
 server/channels/api4/notify_admin.go          |   2 +-
 server/channels/api4/notify_admin_test.go     |   2 +-
 server/channels/api4/oauth.go                 |   6 +-
 server/channels/api4/oauth_test.go            |   2 +-
 server/channels/api4/openGraph.go             |   4 +-
 server/channels/api4/openGraph_test.go        |   2 +-
 server/channels/api4/permission.go            |   2 +-
 server/channels/api4/permissions_test.go      |   2 +-
 server/channels/api4/plugin.go                |   8 +-
 server/channels/api4/plugin_test.go           |   8 +-
 server/channels/api4/post.go                  |  10 +-
 server/channels/api4/post_test.go             |  14 +-
 server/channels/api4/preference.go            |   6 +-
 server/channels/api4/preference_test.go       |   2 +-
 server/channels/api4/reaction.go              |   4 +-
 server/channels/api4/reaction_test.go         |   2 +-
 server/channels/api4/remote_cluster.go        |  10 +-
 server/channels/api4/resolver.go              |   8 +-
 server/channels/api4/resolver_channel.go      |   4 +-
 .../channels/api4/resolver_channel_member.go  |   4 +-
 .../api4/resolver_channel_member_test.go      |   2 +-
 server/channels/api4/resolver_channel_test.go |   2 +-
 .../api4/resolver_sidebar_categories_test.go  |   2 +-
 server/channels/api4/resolver_team.go         |   4 +-
 server/channels/api4/resolver_team_member.go  |   2 +-
 .../api4/resolver_team_member_test.go         |   2 +-
 server/channels/api4/resolver_test.go         |   2 +-
 server/channels/api4/resolver_user.go         |   4 +-
 server/channels/api4/resolver_user_test.go    |   2 +-
 server/channels/api4/role.go                  |   6 +-
 server/channels/api4/role_test.go             |   2 +-
 server/channels/api4/saml.go                  |   6 +-
 server/channels/api4/saml_test.go             |   4 +-
 server/channels/api4/scheme.go                |   6 +-
 server/channels/api4/scheme_test.go           |   2 +-
 server/channels/api4/shared_channel.go        |   2 +-
 server/channels/api4/shared_channel_test.go   |   4 +-
 server/channels/api4/status.go                |   4 +-
 server/channels/api4/status_test.go           |   2 +-
 server/channels/api4/system.go                |  12 +-
 server/channels/api4/system_local.go          |   4 +-
 server/channels/api4/system_test.go           |   6 +-
 server/channels/api4/team.go                  |   6 +-
 server/channels/api4/team_local.go            |  10 +-
 server/channels/api4/team_test.go             |  16 +-
 server/channels/api4/terms_of_service.go      |   8 +-
 server/channels/api4/terms_of_service_test.go |   2 +-
 server/channels/api4/upload.go                |   8 +-
 server/channels/api4/upload_test.go           |   4 +-
 server/channels/api4/usage.go                 |   4 +-
 server/channels/api4/usage_test.go            |   2 +-
 server/channels/api4/user.go                  |  14 +-
 server/channels/api4/user_local.go            |  10 +-
 server/channels/api4/user_test.go             |  12 +-
 server/channels/api4/user_viewmembers_test.go |   2 +-
 server/channels/api4/webhook.go               |   6 +-
 server/channels/api4/webhook_local.go         |   6 +-
 server/channels/api4/webhook_test.go          |   2 +-
 server/channels/api4/websocket.go             |   6 +-
 server/channels/api4/websocket_norace_test.go |   2 +-
 server/channels/api4/websocket_test.go        |   6 +-
 server/channels/api4/work_templates.go        |   4 +-
 server/channels/app/admin.go                  |  10 +-
 server/channels/app/admin_advisor.go          |  10 +-
 server/channels/app/admin_test.go             |   2 +-
 server/channels/app/analytics.go              |   4 +-
 server/channels/app/app.go                    |  20 +-
 server/channels/app/app_iface.go              |  34 +-
 server/channels/app/app_test.go               |   4 +-
 server/channels/app/audit.go                  |  10 +-
 server/channels/app/authentication.go         |   8 +-
 server/channels/app/authentication_test.go    |   2 +-
 server/channels/app/authorization.go          |   6 +-
 server/channels/app/authorization_test.go     |   6 +-
 server/channels/app/auto_responder.go         |   4 +-
 server/channels/app/auto_responder_test.go    |   2 +-
 server/channels/app/bot.go                    |  12 +-
 server/channels/app/bot_test.go               |   2 +-
 server/channels/app/brand.go                  |   2 +-
 server/channels/app/busy.go                   |   4 +-
 server/channels/app/busy_test.go              |   4 +-
 server/channels/app/channel.go                |  18 +-
 server/channels/app/channel_category.go       |   8 +-
 server/channels/app/channel_category_test.go  |   2 +-
 server/channels/app/channel_test.go           |   6 +-
 server/channels/app/channels.go               |  20 +-
 server/channels/app/cloud.go                  |   8 +-
 server/channels/app/cluster_handlers.go       |   6 +-
 server/channels/app/collection.go             |   4 +-
 server/channels/app/command.go                |  10 +-
 server/channels/app/command_autocomplete.go   |   6 +-
 .../channels/app/command_autocomplete_test.go |   6 +-
 server/channels/app/compliance.go             |   6 +-
 server/channels/app/config.go                 |   8 +-
 server/channels/app/config_test.go            |   6 +-
 server/channels/app/context.go                |   6 +-
 server/channels/app/data_retention.go         |   2 +-
 server/channels/app/download.go               |   4 +-
 server/channels/app/download_test.go          |   2 +-
 server/channels/app/draft.go                  |   8 +-
 server/channels/app/draft_test.go             |   4 +-
 server/channels/app/email/email.go            |  10 +-
 server/channels/app/email/email_batching.go   |   6 +-
 .../channels/app/email/email_batching_test.go |   2 +-
 server/channels/app/email/email_test.go       |   4 +-
 server/channels/app/email/helper_test.go      |  18 +-
 server/channels/app/email/main_test.go        |   2 +-
 .../app/email/mocks/ServiceInterface.go       |   6 +-
 .../channels/app/email/notification_email.go  |   8 +-
 .../app/email/notification_email_test.go      |   2 +-
 server/channels/app/email/service.go          |  12 +-
 server/channels/app/email/utils.go            |   4 +-
 server/channels/app/email_test.go             |   2 +-
 server/channels/app/emoji.go                  |  10 +-
 server/channels/app/enterprise.go             |   4 +-
 server/channels/app/enterprise_test.go        |   8 +-
 server/channels/app/expirynotify.go           |   6 +-
 server/channels/app/expirynotify_test.go      |   2 +-
 server/channels/app/export.go                 |  10 +-
 server/channels/app/export_converters.go      |   4 +-
 server/channels/app/export_test.go            |   6 +-
 server/channels/app/extract_plugin_tar.go     |   2 +-
 .../app/featureflag/feature_flags_sync.go     |   4 +-
 .../featureflag/feature_flags_sync_test.go    |   2 +-
 .../channels/app/featureflag/split_logger.go  |   2 +-
 server/channels/app/file.go                   |  20 +-
 server/channels/app/file_bench_test.go        |   2 +-
 server/channels/app/file_helper.go            |   2 +-
 server/channels/app/file_helper_test.go       |   2 +-
 server/channels/app/file_test.go              |  14 +-
 server/channels/app/group.go                  |   4 +-
 server/channels/app/group_test.go             |   2 +-
 server/channels/app/helper_test.go            |  20 +-
 server/channels/app/hosted_customer.go        |   2 +-
 server/channels/app/image.go                  |   2 +-
 .../channels/app/imaging/decode_bench_test.go |   2 +-
 server/channels/app/imaging/decode_test.go    |   2 +-
 server/channels/app/imaging/utils_test.go     |   2 +-
 server/channels/app/import.go                 |   8 +-
 server/channels/app/import_functions.go       |  16 +-
 server/channels/app/import_functions_test.go  |  14 +-
 server/channels/app/import_test.go            |  12 +-
 server/channels/app/imports/import_types.go   |   2 +-
 .../channels/app/imports/import_validators.go |   4 +-
 .../app/imports/import_validators_test.go     |   4 +-
 server/channels/app/integration_action.go     |  12 +-
 .../channels/app/integration_action_test.go   |  12 +-
 server/channels/app/job.go                    |   4 +-
 server/channels/app/job_test.go               |   4 +-
 server/channels/app/ldap.go                   |   6 +-
 server/channels/app/license.go                |   6 +-
 server/channels/app/license_test.go           |   2 +-
 server/channels/app/login.go                  |  12 +-
 server/channels/app/login_test.go             |   2 +-
 server/channels/app/main_test.go              |   2 +-
 server/channels/app/migrations.go             |   4 +-
 .../app/mocks/WorkTemplateExecutor.go         |   6 +-
 server/channels/app/notification.go           |  12 +-
 server/channels/app/notification_email.go     |  12 +-
 .../channels/app/notification_email_test.go   |   8 +-
 server/channels/app/notification_push.go      |  10 +-
 server/channels/app/notification_push_test.go |  16 +-
 server/channels/app/notification_test.go      |   6 +-
 server/channels/app/notify_admin.go           |  10 +-
 server/channels/app/notify_admin_test.go      |   4 +-
 server/channels/app/oauth.go                  |  16 +-
 server/channels/app/oauth_test.go             |  10 +-
 server/channels/app/onboarding.go             |   8 +-
 server/channels/app/opengraph.go              |   2 +-
 .../app/opentracing/opentracing_layer.go      |  38 +--
 server/channels/app/options.go                |  14 +-
 server/channels/app/permissions.go            |   6 +-
 server/channels/app/permissions_migrations.go |   6 +-
 .../app/permissions_migrations_test.go        |   4 +-
 server/channels/app/permissions_test.go       |   2 +-
 server/channels/app/platform/busy.go          |   4 +-
 server/channels/app/platform/busy_test.go     |   4 +-
 server/channels/app/platform/cluster.go       |  10 +-
 .../app/platform/cluster_discovery.go         |   4 +-
 .../app/platform/cluster_discovery_test.go    |   2 +-
 .../channels/app/platform/cluster_handlers.go |   6 +-
 server/channels/app/platform/config.go        |  12 +-
 server/channels/app/platform/config_test.go   |   6 +-
 server/channels/app/platform/enterprise.go    |   4 +-
 server/channels/app/platform/feature_flags.go |   4 +-
 server/channels/app/platform/helper_test.go   |  12 +-
 server/channels/app/platform/license.go       |  10 +-
 server/channels/app/platform/license_test.go  |   2 +-
 server/channels/app/platform/link_cache.go    |   2 +-
 server/channels/app/platform/log.go           |   6 +-
 server/channels/app/platform/main_test.go     |   2 +-
 server/channels/app/platform/metrics.go       |   6 +-
 .../channels/app/platform/mocks/SuiteIFace.go |   2 +-
 server/channels/app/platform/options.go       |  14 +-
 server/channels/app/platform/searchengine.go  |   4 +-
 server/channels/app/platform/service.go       |  34 +-
 server/channels/app/platform/service_test.go  |   8 +-
 server/channels/app/platform/session.go       |   6 +-
 server/channels/app/platform/session_test.go  |   2 +-
 .../app/platform/shared_channel_notifier.go   |   6 +-
 .../platform/shared_channel_notifier_test.go  |   6 +-
 .../platform/shared_channel_service_iface.go  |   4 +-
 server/channels/app/platform/status.go        |   6 +-
 server/channels/app/platform/status_test.go   |   2 +-
 server/channels/app/platform/web_conn.go      |   8 +-
 server/channels/app/platform/web_conn_test.go |   4 +-
 server/channels/app/platform/web_hub.go       |   4 +-
 server/channels/app/platform/web_hub_test.go  |  10 +-
 .../channels/app/platform/websocket_router.go |   6 +-
 server/channels/app/plugin.go                 |  16 +-
 server/channels/app/plugin_api.go             |   8 +-
 server/channels/app/plugin_api_test.go        |  46 +--
 .../manual.test_http_hijack_plugin/main.go    |   2 +-
 .../main.go                                   |   4 +-
 .../main.go                                   |   6 +-
 .../main.go                                   |   6 +-
 .../plugin_api_tests/test_bots_plugin/main.go |   6 +-
 .../test_call_log_api_plugin/main.go          |   4 +-
 .../plugin_api_tests/test_db_driver/main.go   |  12 +-
 .../test_get_bundle_path_plugin/main.go       |   6 +-
 .../main.go                                   |   6 +-
 .../test_get_direct_channel_plugin/main.go    |   6 +-
 .../test_get_plugin_status_plugin/main.go     |   6 +-
 .../test_get_profile_image_plugin/main.go     |   6 +-
 .../app/plugin_api_tests/test_kv/main.go      |   6 +-
 .../test_member_channels_plugin/main.go       |   6 +-
 .../test_members_plugin/main.go               |   6 +-
 .../test_search_channels_plugin/main.go       |   6 +-
 .../test_search_posts_in_team_plugin/main.go  |   6 +-
 .../test_search_teams_plugin/main.go          |   6 +-
 .../test_send_mail_plugin/main.go             |   8 +-
 .../test_sessions_plugin/main.go              |   6 +-
 .../test_set_profile_image_plugin/main.go     |   6 +-
 .../test_update_user_active_plugin/main.go    |   6 +-
 .../test_update_user_status_plugin/main.go    |   6 +-
 server/channels/app/plugin_commands.go        |   6 +-
 server/channels/app/plugin_commands_test.go   |  38 +--
 server/channels/app/plugin_db_driver.go       |   4 +-
 server/channels/app/plugin_deadlock_test.go   |  18 +-
 server/channels/app/plugin_event.go           |   2 +-
 .../channels/app/plugin_health_check_test.go  |   8 +-
 server/channels/app/plugin_hooks_test.go      | 114 +++----
 server/channels/app/plugin_install.go         |  10 +-
 server/channels/app/plugin_install_test.go    |   4 +-
 server/channels/app/plugin_key_value_store.go |   6 +-
 server/channels/app/plugin_requests.go        |   8 +-
 server/channels/app/plugin_requests_test.go   |   4 +-
 server/channels/app/plugin_shutdown_test.go   |   4 +-
 server/channels/app/plugin_signature.go       |   6 +-
 server/channels/app/plugin_signature_test.go  |   6 +-
 server/channels/app/plugin_statuses.go        |   2 +-
 server/channels/app/plugin_test.go            |  18 +-
 server/channels/app/post.go                   |  18 +-
 server/channels/app/post_acknowledgements.go  |   8 +-
 .../app/post_acknowledgements_test.go         |   2 +-
 server/channels/app/post_helpers.go           |   2 +-
 server/channels/app/post_helpers_test.go      |   2 +-
 server/channels/app/post_metadata.go          |  12 +-
 server/channels/app/post_metadata_test.go     |  14 +-
 server/channels/app/post_priority.go          |   2 +-
 server/channels/app/post_test.go              |  30 +-
 server/channels/app/preference.go             |   4 +-
 server/channels/app/product.go                |   2 +-
 server/channels/app/product_notices.go        |  12 +-
 server/channels/app/product_notices_test.go   |   4 +-
 server/channels/app/product_test.go           |   6 +-
 server/channels/app/ratelimit.go              |   8 +-
 server/channels/app/ratelimit_test.go         |   2 +-
 server/channels/app/reaction.go               |   8 +-
 server/channels/app/reaction_test.go          |   4 +-
 server/channels/app/remote_cluster.go         |   6 +-
 .../app/remote_cluster_service_mock.go        |   4 +-
 server/channels/app/remote_cluster_test.go    |   4 +-
 server/channels/app/request/context.go        |   6 +-
 server/channels/app/role.go                   |   6 +-
 server/channels/app/role_test.go              |   4 +-
 server/channels/app/saml.go                   |   2 +-
 server/channels/app/scheme.go                 |   4 +-
 server/channels/app/searchengine.go           |   4 +-
 server/channels/app/security_update_check.go  |   8 +-
 server/channels/app/server.go                 |  88 ++---
 server/channels/app/server_test.go            |  12 +-
 server/channels/app/session.go                |  12 +-
 server/channels/app/session_test.go           |   2 +-
 server/channels/app/shared_channel.go         |   6 +-
 .../app/shared_channel_service_iface.go       |   4 +-
 server/channels/app/shared_channel_test.go    |   2 +-
 server/channels/app/slack.go                  |   8 +-
 server/channels/app/slack_test.go             |   2 +-
 .../app/slashcommands/auto_channels.go        |   8 +-
 .../app/slashcommands/auto_constants.go       |   4 +-
 .../app/slashcommands/auto_environment.go     |   8 +-
 .../channels/app/slashcommands/auto_posts.go  |  10 +-
 .../channels/app/slashcommands/auto_teams.go  |   4 +-
 .../channels/app/slashcommands/auto_users.go  |  10 +-
 .../app/slashcommands/command_away.go         |   8 +-
 .../slashcommands/command_channel_header.go   |   8 +-
 .../command_channel_header_test.go            |   2 +-
 .../slashcommands/command_channel_purpose.go  |   8 +-
 .../command_channel_purpose_test.go           |   2 +-
 .../slashcommands/command_channel_rename.go   |   8 +-
 .../command_channel_rename_test.go            |   2 +-
 .../app/slashcommands/command_code.go         |   8 +-
 .../app/slashcommands/command_code_test.go    |   2 +-
 .../slashcommands/command_custom_status.go    |  10 +-
 .../command_custom_status_test.go             |   2 +-
 .../channels/app/slashcommands/command_dnd.go |   8 +-
 .../app/slashcommands/command_echo.go         |  10 +-
 .../slashcommands/command_expand_collapse.go  |   8 +-
 .../app/slashcommands/command_groupmsg.go     |  10 +-
 .../slashcommands/command_groupmsg_test.go    |   4 +-
 .../app/slashcommands/command_help.go         |   8 +-
 .../app/slashcommands/command_invite.go       |   8 +-
 .../slashcommands/command_invite_people.go    |  10 +-
 .../command_invite_people_test.go             |   2 +-
 .../app/slashcommands/command_invite_test.go  |   4 +-
 .../app/slashcommands/command_join.go         |   8 +-
 .../app/slashcommands/command_join_test.go    |   4 +-
 .../app/slashcommands/command_leave.go        |   8 +-
 .../app/slashcommands/command_leave_test.go   |   2 +-
 .../app/slashcommands/command_loadtest.go     |  12 +-
 .../app/slashcommands/command_logout.go       |   8 +-
 .../app/slashcommands/command_marketplace.go  |   8 +-
 .../slashcommands/command_marketplace_test.go |   2 +-
 .../channels/app/slashcommands/command_me.go  |   8 +-
 .../app/slashcommands/command_me_test.go      |   2 +-
 .../channels/app/slashcommands/command_msg.go |  12 +-
 .../app/slashcommands/command_msg_test.go     |   4 +-
 .../app/slashcommands/command_mute.go         |   8 +-
 .../app/slashcommands/command_mute_test.go    |   4 +-
 .../app/slashcommands/command_offline.go      |   8 +-
 .../app/slashcommands/command_online.go       |   8 +-
 .../app/slashcommands/command_open.go         |   6 +-
 .../app/slashcommands/command_remote.go       |   8 +-
 .../app/slashcommands/command_remove.go       |  10 +-
 .../app/slashcommands/command_remove_test.go  |   2 +-
 .../app/slashcommands/command_search.go       |   8 +-
 .../app/slashcommands/command_settings.go     |   8 +-
 .../app/slashcommands/command_share.go        |   8 +-
 .../app/slashcommands/command_share_test.go   |   8 +-
 .../app/slashcommands/command_shortcuts.go    |   8 +-
 .../app/slashcommands/command_shrug.go        |   8 +-
 .../app/slashcommands/command_templates.go    |   8 +-
 .../app/slashcommands/command_test.go         |   4 +-
 .../channels/app/slashcommands/helper_test.go |  12 +-
 .../channels/app/slashcommands/main_test.go   |   2 +-
 server/channels/app/slashcommands/util.go     |   4 +-
 server/channels/app/status.go                 |   6 +-
 server/channels/app/status_test.go            |   8 +-
 server/channels/app/support_packet.go         |   4 +-
 server/channels/app/support_packet_test.go    |   2 +-
 server/channels/app/syncables.go              |   6 +-
 server/channels/app/syncables_test.go         |   2 +-
 server/channels/app/team.go                   |  28 +-
 server/channels/app/team_test.go              |  18 +-
 server/channels/app/teams/helper_test.go      |   8 +-
 server/channels/app/teams/main_test.go        |   2 +-
 server/channels/app/teams/service.go          |   4 +-
 server/channels/app/teams/teams.go            |   4 +-
 server/channels/app/teams/teams_test.go       |   2 +-
 server/channels/app/teams/utils.go            |   2 +-
 server/channels/app/telemetry.go              |   2 +-
 server/channels/app/terms_of_service.go       |   4 +-
 server/channels/app/true_up.go                |   8 +-
 server/channels/app/upload.go                 |  10 +-
 server/channels/app/upload_test.go            |   6 +-
 server/channels/app/usage.go                  |   4 +-
 server/channels/app/usage_test.go             |   2 +-
 server/channels/app/user.go                   |  22 +-
 server/channels/app/user_terms_of_service.go  |   4 +-
 server/channels/app/user_test.go              |  22 +-
 server/channels/app/user_viewmembers_test.go  |   4 +-
 server/channels/app/users/helper_test.go      |   8 +-
 server/channels/app/users/main_test.go        |   2 +-
 server/channels/app/users/password.go         |   2 +-
 server/channels/app/users/password_test.go    |   2 +-
 server/channels/app/users/profile_picture.go  |   6 +-
 server/channels/app/users/service.go          |   6 +-
 server/channels/app/users/service_test.go     |   2 +-
 server/channels/app/users/users.go            |  10 +-
 server/channels/app/users/users_test.go       |   2 +-
 server/channels/app/users/utils.go            |   2 +-
 server/channels/app/web_conn.go               |   4 +-
 server/channels/app/web_conn_test.go          |   6 +-
 server/channels/app/web_hub.go                |   4 +-
 server/channels/app/webhook.go                |  10 +-
 server/channels/app/webhook_test.go           |   6 +-
 server/channels/app/webhub_fuzz.go            |   8 +-
 server/channels/app/websocket_router.go       |   6 +-
 server/channels/app/work_template_executor.go |  16 +-
 server/channels/app/work_templates.go         |   8 +-
 server/channels/app/work_templates_test.go    |  10 +-
 .../app/worktemplates/generator/main.go       |   2 +-
 server/channels/app/worktemplates/model.go    |   4 +-
 .../channels/app/worktemplates/model_test.go  |   4 +-
 server/channels/app/worktemplates/types.go    |   4 +-
 server/channels/audit/audit.go                |   2 +-
 server/channels/audit/audit_test.go           |   4 +-
 .../channels/einterfaces/account_migration.go |   2 +-
 server/channels/einterfaces/cloud.go          |   2 +-
 server/channels/einterfaces/cluster.go        |   2 +-
 server/channels/einterfaces/compliance.go     |   2 +-
 server/channels/einterfaces/data_retention.go |   2 +-
 .../einterfaces/jobs/cloud_interface.go       |   2 +-
 .../einterfaces/jobs/data_retention.go        |   2 +-
 .../einterfaces/jobs/elasticsearch.go         |   2 +-
 .../einterfaces/jobs/indexer_interface.go     |   2 +-
 server/channels/einterfaces/jobs/ldap_sync.go |   2 +-
 .../einterfaces/jobs/message_export.go        |   2 +-
 server/channels/einterfaces/ldap.go           |   4 +-
 server/channels/einterfaces/license.go        |   2 +-
 server/channels/einterfaces/message_export.go |   2 +-
 server/channels/einterfaces/metrics.go        |   4 +-
 server/channels/einterfaces/mfa.go            |   2 +-
 .../mocks/AccountMigrationInterface.go        |   2 +-
 .../einterfaces/mocks/AppContextInterface.go  |   2 +-
 .../einterfaces/mocks/CloudInterface.go       |   2 +-
 .../einterfaces/mocks/CloudJobInterface.go    |   2 +-
 .../einterfaces/mocks/ClusterInterface.go     |   4 +-
 .../mocks/ClusterMessageHandler.go            |   2 +-
 .../einterfaces/mocks/ComplianceInterface.go  |   2 +-
 .../mocks/DataRetentionInterface.go           |   2 +-
 .../mocks/DataRetentionJobInterface.go        |   2 +-
 .../mocks/ElasticsearchAggregatorInterface.go |   2 +-
 .../mocks/ElasticsearchIndexerInterface.go    |   2 +-
 .../einterfaces/mocks/IndexerJobInterface.go  |   2 +-
 .../einterfaces/mocks/LdapInterface.go        |   4 +-
 .../einterfaces/mocks/LdapSyncInterface.go    |   2 +-
 .../einterfaces/mocks/LicenseInterface.go     |   2 +-
 .../mocks/MessageExportInterface.go           |   2 +-
 .../mocks/MessageExportJobInterface.go        |   2 +-
 .../einterfaces/mocks/MetricsInterface.go     |   2 +-
 .../einterfaces/mocks/MfaInterface.go         |   2 +-
 .../mocks/NotificationInterface.go            |   2 +-
 .../einterfaces/mocks/OAuthProvider.go        |   2 +-
 .../ResendInvitationEmailJobInterface.go      |   2 +-
 .../einterfaces/mocks/SamlInterface.go        |   4 +-
 server/channels/einterfaces/notification.go   |   2 +-
 server/channels/einterfaces/oauthproviders.go |   2 +-
 server/channels/einterfaces/saml.go           |   4 +-
 server/channels/imports/boards_imports.go     |   2 +-
 server/channels/imports/playbooks_imports.go  |   2 +-
 .../channels/jobs/active_users/scheduler.go   |   4 +-
 server/channels/jobs/active_users/worker.go   |   8 +-
 server/channels/jobs/base_schedulers.go       |   2 +-
 server/channels/jobs/base_workers.go          |   4 +-
 .../channels/jobs/expirynotify/scheduler.go   |   4 +-
 server/channels/jobs/expirynotify/worker.go   |   4 +-
 .../channels/jobs/export_delete/scheduler.go  |   4 +-
 server/channels/jobs/export_delete/worker.go  |   8 +-
 server/channels/jobs/export_process/worker.go |  10 +-
 .../channels/jobs/extract_content/worker.go   |   8 +-
 .../hosted_purchase_screening/scheduler.go    |   4 +-
 .../jobs/hosted_purchase_screening/worker.go  |   4 +-
 .../channels/jobs/import_delete/scheduler.go  |   4 +-
 server/channels/jobs/import_delete/worker.go  |  10 +-
 server/channels/jobs/import_process/worker.go |  12 +-
 server/channels/jobs/jobs.go                  |   6 +-
 server/channels/jobs/jobs_test.go             |  10 +-
 server/channels/jobs/jobs_watcher.go          |   4 +-
 .../jobs/last_accessible_file/scheduler.go    |   6 +-
 .../jobs/last_accessible_file/worker.go       |   4 +-
 .../jobs/last_accessible_post/scheduler.go    |   6 +-
 .../jobs/last_accessible_post/worker.go       |   4 +-
 .../advanced_permissions_phase_2.go           |   4 +-
 .../channels/jobs/migrations/helper_test.go   |   4 +-
 server/channels/jobs/migrations/main_test.go  |   2 +-
 server/channels/jobs/migrations/migrations.go |   4 +-
 .../jobs/migrations/migrations_test.go        |   2 +-
 server/channels/jobs/migrations/scheduler.go  |   8 +-
 server/channels/jobs/migrations/worker.go     |   8 +-
 .../notify_admin/install_plugin_scheduler.go  |   6 +-
 .../channels/jobs/notify_admin/scheduler.go   |   6 +-
 server/channels/jobs/notify_admin/worker.go   |   4 +-
 .../jobs/product_notices/scheduler.go         |   4 +-
 .../channels/jobs/product_notices/worker.go   |   6 +-
 .../jobs/resend_invitation_email/worker.go    |  12 +-
 server/channels/jobs/schedulers.go            |   4 +-
 server/channels/jobs/schedulers_test.go       |   8 +-
 server/channels/jobs/server.go                |   8 +-
 server/channels/jobs/workers.go               |   6 +-
 .../channels/manualtesting/manual_testing.go  |  16 +-
 .../channels/manualtesting/test_autolink.go   |   4 +-
 server/channels/product/README.md             |   2 +-
 server/channels/product/api.go                |  10 +-
 server/channels/product/hooks.go              |   4 +-
 .../opentracing_layer.go.tmpl                 |   6 +-
 .../layer_generators/retry_layer.go.tmpl      |   4 +-
 .../layer_generators/timer_layer.go.tmpl      |   6 +-
 .../store/localcachelayer/channel_layer.go    |   4 +-
 .../localcachelayer/channel_layer_test.go     |   6 +-
 .../store/localcachelayer/emoji_layer.go      |   6 +-
 .../store/localcachelayer/emoji_layer_test.go |   6 +-
 .../store/localcachelayer/file_info_layer.go  |   4 +-
 .../localcachelayer/file_info_layer_test.go   |   6 +-
 .../channels/store/localcachelayer/layer.go   |   8 +-
 .../store/localcachelayer/layer_test.go       |   8 +-
 .../store/localcachelayer/main_test.go        |  14 +-
 .../store/localcachelayer/post_layer.go       |   4 +-
 .../store/localcachelayer/post_layer_test.go  |   6 +-
 .../store/localcachelayer/reaction_layer.go   |   4 +-
 .../localcachelayer/reaction_layer_test.go    |   6 +-
 .../store/localcachelayer/role_layer.go       |   4 +-
 .../store/localcachelayer/role_layer_test.go  |   6 +-
 .../store/localcachelayer/scheme_layer.go     |   4 +-
 .../localcachelayer/scheme_layer_test.go      |   6 +-
 .../store/localcachelayer/team_layer.go       |   4 +-
 .../store/localcachelayer/team_layer_test.go  |   4 +-
 .../localcachelayer/terms_of_service_layer.go |   4 +-
 .../terms_of_service_layer_test.go            |   6 +-
 .../store/localcachelayer/user_layer.go       |   6 +-
 .../store/localcachelayer/user_layer_test.go  |  10 +-
 .../store/localcachelayer/webhook_layer.go    |   4 +-
 .../localcachelayer/webhook_layer_test.go     |   6 +-
 .../opentracinglayer/opentracinglayer.go      |   6 +-
 .../channels/store/retrylayer/retrylayer.go   |   4 +-
 .../store/retrylayer/retrylayer_test.go       |   4 +-
 .../store/searchlayer/channel_layer.go        |   8 +-
 .../store/searchlayer/file_info_layer.go      |   8 +-
 server/channels/store/searchlayer/layer.go    |   8 +-
 .../channels/store/searchlayer/layer_test.go  |  12 +-
 .../channels/store/searchlayer/post_layer.go  |   8 +-
 .../channels/store/searchlayer/team_layer.go  |   4 +-
 .../channels/store/searchlayer/user_layer.go  |   8 +-
 .../store/searchtest/channel_layer.go         |   4 +-
 .../store/searchtest/file_info_layer.go       |   4 +-
 server/channels/store/searchtest/helper.go    |   4 +-
 .../channels/store/searchtest/post_layer.go   |   4 +-
 server/channels/store/searchtest/testlib.go   |   4 +-
 .../channels/store/searchtest/user_layer.go   |   4 +-
 server/channels/store/sqlstore/adapters.go    |   2 +-
 server/channels/store/sqlstore/audit_store.go |   4 +-
 .../store/sqlstore/audit_store_test.go        |   2 +-
 server/channels/store/sqlstore/bot_store.go   |   6 +-
 .../channels/store/sqlstore/bot_store_test.go |   2 +-
 .../sqlstore/channel_member_history_store.go  |   6 +-
 .../channel_member_history_store_test.go      |   2 +-
 .../channels/store/sqlstore/channel_store.go  |  10 +-
 .../sqlstore/channel_store_categories.go      |   4 +-
 .../sqlstore/channel_store_categories_test.go |   2 +-
 .../store/sqlstore/channel_store_test.go      |   8 +-
 .../store/sqlstore/cluster_discovery_store.go |   4 +-
 .../sqlstore/cluster_discovery_store_test.go  |   2 +-
 .../channels/store/sqlstore/command_store.go  |   4 +-
 .../store/sqlstore/command_store_test.go      |   2 +-
 .../store/sqlstore/command_webhook_store.go   |   6 +-
 .../sqlstore/command_webhook_store_test.go    |   2 +-
 .../store/sqlstore/compliance_store.go        |   4 +-
 .../store/sqlstore/compliance_store_test.go   |   2 +-
 server/channels/store/sqlstore/draft_store.go |   8 +-
 .../store/sqlstore/draft_store_test.go        |   2 +-
 server/channels/store/sqlstore/emoji_store.go |   6 +-
 .../store/sqlstore/emoji_store_test.go        |   2 +-
 .../store/sqlstore/file_info_store.go         |   8 +-
 .../store/sqlstore/file_info_store_test.go    |   4 +-
 server/channels/store/sqlstore/group_store.go |   4 +-
 .../store/sqlstore/group_store_test.go        |   2 +-
 server/channels/store/sqlstore/integrity.go   |   4 +-
 .../channels/store/sqlstore/integrity_test.go |   4 +-
 server/channels/store/sqlstore/job_store.go   |   4 +-
 .../channels/store/sqlstore/job_store_test.go |   2 +-
 .../channels/store/sqlstore/license_store.go  |   4 +-
 .../store/sqlstore/license_store_test.go      |   2 +-
 .../store/sqlstore/link_metadata_store.go     |   4 +-
 .../sqlstore/link_metadata_store_test.go      |   2 +-
 server/channels/store/sqlstore/main_test.go   |   4 +-
 .../store/sqlstore/notify_admin_store.go      |   4 +-
 .../store/sqlstore/notify_admin_store_test.go |   2 +-
 server/channels/store/sqlstore/oauth_store.go |   4 +-
 .../store/sqlstore/oauth_store_test.go        |   2 +-
 .../channels/store/sqlstore/plugin_store.go   |   4 +-
 .../store/sqlstore/plugin_store_test.go       |   2 +-
 .../sqlstore/post_acknowledgements_store.go   |   4 +-
 .../post_acknowledgements_store_test.go       |   2 +-
 .../store/sqlstore/post_priority_store.go     |   4 +-
 .../sqlstore/post_priority_store_test.go      |   2 +-
 server/channels/store/sqlstore/post_store.go  |  12 +-
 .../store/sqlstore/post_store_test.go         |   4 +-
 .../store/sqlstore/preference_store.go        |   6 +-
 .../store/sqlstore/preference_store_test.go   |   6 +-
 .../store/sqlstore/product_notices_store.go   |   4 +-
 .../sqlstore/product_notices_store_test.go    |   2 +-
 .../channels/store/sqlstore/reaction_store.go |   6 +-
 .../store/sqlstore/reaction_store_test.go     |   2 +-
 .../store/sqlstore/remote_cluster_store.go    |   4 +-
 .../sqlstore/remote_cluster_store_test.go     |   2 +-
 .../store/sqlstore/retention_policy_store.go  |   6 +-
 .../sqlstore/retention_policy_store_test.go   |   2 +-
 server/channels/store/sqlstore/role_store.go  |   4 +-
 .../store/sqlstore/role_store_test.go         |   2 +-
 .../channels/store/sqlstore/scheme_store.go   |   4 +-
 .../store/sqlstore/scheme_store_test.go       |   2 +-
 .../channels/store/sqlstore/session_store.go  |   4 +-
 .../store/sqlstore/session_store_test.go      |   2 +-
 .../store/sqlstore/shared_channel_store.go    |   4 +-
 .../sqlstore/shared_channel_store_test.go     |   2 +-
 .../channels/store/sqlstore/sqlx_wrapper.go   |   6 +-
 .../store/sqlstore/sqlx_wrapper_test.go       |   2 +-
 .../channels/store/sqlstore/status_store.go   |   4 +-
 .../store/sqlstore/status_store_test.go       |   2 +-
 server/channels/store/sqlstore/store.go       |  12 +-
 server/channels/store/sqlstore/store_test.go  |  14 +-
 .../channels/store/sqlstore/system_store.go   |   6 +-
 .../store/sqlstore/system_store_test.go       |   2 +-
 server/channels/store/sqlstore/team_store.go  |   6 +-
 .../store/sqlstore/team_store_test.go         |   4 +-
 .../store/sqlstore/terms_of_service_store.go  |   6 +-
 .../sqlstore/terms_of_service_store_test.go   |   2 +-
 .../channels/store/sqlstore/thread_store.go   |   6 +-
 .../store/sqlstore/thread_store_test.go       |   2 +-
 .../channels/store/sqlstore/tokens_store.go   |   6 +-
 .../store/sqlstore/tokens_store_test.go       |   2 +-
 .../store/sqlstore/true_up_review_store.go    |   4 +-
 .../sqlstore/true_up_review_store_test.go     |   2 +-
 .../store/sqlstore/upload_session_store.go    |   4 +-
 .../sqlstore/upload_session_store_test.go     |   2 +-
 .../store/sqlstore/user_access_token_store.go |   4 +-
 .../sqlstore/user_access_token_store_test.go  |   2 +-
 server/channels/store/sqlstore/user_store.go  |   8 +-
 .../store/sqlstore/user_store_test.go         |   4 +-
 .../store/sqlstore/user_terms_of_service.go   |   4 +-
 .../user_terms_of_service_store_test.go       |   2 +-
 server/channels/store/sqlstore/utils.go       |   4 +-
 server/channels/store/sqlstore/utils_test.go  |   2 +-
 .../channels/store/sqlstore/webhook_store.go  |   6 +-
 .../store/sqlstore/webhook_store_test.go      |   2 +-
 server/channels/store/store.go                |   4 +-
 .../channels/store/storetest/audit_store.go   |   4 +-
 server/channels/store/storetest/bot_store.go  |   4 +-
 .../storetest/channel_member_history_store.go |   4 +-
 .../channels/store/storetest/channel_store.go |   8 +-
 .../storetest/channel_store_categories.go     |   4 +-
 .../storetest/cluster_discovery_store.go      |   4 +-
 .../channels/store/storetest/command_store.go |   4 +-
 .../store/storetest/command_webhook_store.go  |   4 +-
 .../store/storetest/compliance_store.go       |   4 +-
 .../channels/store/storetest/draft_store.go   |   4 +-
 .../channels/store/storetest/emoji_store.go   |   4 +-
 .../store/storetest/file_info_store.go        |   6 +-
 .../channels/store/storetest/group_store.go   |   6 +-
 server/channels/store/storetest/job_store.go  |   4 +-
 .../channels/store/storetest/license_store.go |   4 +-
 .../store/storetest/link_metadata_store.go    |   4 +-
 .../store/storetest/mocks/AuditStore.go       |   2 +-
 .../store/storetest/mocks/BotStore.go         |   2 +-
 .../mocks/ChannelMemberHistoryStore.go        |   2 +-
 .../store/storetest/mocks/ChannelStore.go     |   4 +-
 .../storetest/mocks/ClusterDiscoveryStore.go  |   2 +-
 .../store/storetest/mocks/CommandStore.go     |   2 +-
 .../storetest/mocks/CommandWebhookStore.go    |   2 +-
 .../store/storetest/mocks/ComplianceStore.go  |   2 +-
 .../store/storetest/mocks/DraftStore.go       |   2 +-
 .../store/storetest/mocks/EmojiStore.go       |   2 +-
 .../store/storetest/mocks/FileInfoStore.go    |   2 +-
 .../store/storetest/mocks/GroupStore.go       |   2 +-
 .../store/storetest/mocks/JobStore.go         |   2 +-
 .../store/storetest/mocks/LicenseStore.go     |   2 +-
 .../storetest/mocks/LinkMetadataStore.go      |   2 +-
 .../store/storetest/mocks/NotifyAdminStore.go |   2 +-
 .../store/storetest/mocks/OAuthStore.go       |   2 +-
 .../store/storetest/mocks/PluginStore.go      |   2 +-
 .../mocks/PostAcknowledgementStore.go         |   2 +-
 .../storetest/mocks/PostPriorityStore.go      |   2 +-
 .../store/storetest/mocks/PostStore.go        |   4 +-
 .../store/storetest/mocks/PreferenceStore.go  |   2 +-
 .../storetest/mocks/ProductNoticesStore.go    |   2 +-
 .../store/storetest/mocks/ReactionStore.go    |   2 +-
 .../storetest/mocks/RemoteClusterStore.go     |   2 +-
 .../storetest/mocks/RetentionPolicyStore.go   |   2 +-
 .../store/storetest/mocks/RoleStore.go        |   2 +-
 .../store/storetest/mocks/SchemeStore.go      |   2 +-
 .../store/storetest/mocks/SessionStore.go     |   2 +-
 .../storetest/mocks/SharedChannelStore.go     |   2 +-
 .../store/storetest/mocks/StatusStore.go      |   2 +-
 .../channels/store/storetest/mocks/Store.go   |   4 +-
 .../store/storetest/mocks/SystemStore.go      |   2 +-
 .../store/storetest/mocks/TeamStore.go        |   2 +-
 .../storetest/mocks/TermsOfServiceStore.go    |   2 +-
 .../store/storetest/mocks/ThreadStore.go      |   4 +-
 .../store/storetest/mocks/TokenStore.go       |   2 +-
 .../storetest/mocks/TrueUpReviewStore.go      |   2 +-
 .../storetest/mocks/UploadSessionStore.go     |   2 +-
 .../storetest/mocks/UserAccessTokenStore.go   |   2 +-
 .../store/storetest/mocks/UserStore.go        |   4 +-
 .../mocks/UserTermsOfServiceStore.go          |   2 +-
 .../store/storetest/mocks/WebhookStore.go     |   2 +-
 .../store/storetest/notify_admin_store.go     |   4 +-
 .../channels/store/storetest/oauth_store.go   |   4 +-
 .../channels/store/storetest/plugin_store.go  |   4 +-
 .../storetest/post_acknowledgements_store.go  |   4 +-
 .../store/storetest/post_priority_store.go    |   4 +-
 server/channels/store/storetest/post_store.go |   6 +-
 .../store/storetest/preference_store.go       |   4 +-
 .../store/storetest/product_notices_store.go  |   4 +-
 .../store/storetest/reaction_store.go         |   6 +-
 .../store/storetest/remote_cluster_store.go   |   4 +-
 .../store/storetest/retention_policy_store.go |   4 +-
 server/channels/store/storetest/role_store.go |   4 +-
 .../channels/store/storetest/scheme_store.go  |   4 +-
 .../channels/store/storetest/session_store.go |   4 +-
 server/channels/store/storetest/settings.go   |   4 +-
 .../store/storetest/shared_channel_store.go   |   4 +-
 .../channels/store/storetest/status_store.go  |   4 +-
 server/channels/store/storetest/store.go      |   6 +-
 .../channels/store/storetest/storetestlib.go  |   2 +-
 .../channels/store/storetest/system_store.go  |   4 +-
 server/channels/store/storetest/team_store.go |   4 +-
 .../store/storetest/terms_of_service_store.go |   4 +-
 .../channels/store/storetest/thread_store.go  |   4 +-
 .../channels/store/storetest/tokens_store.go  |   4 +-
 .../store/storetest/true_up_review_store.go   |   6 +-
 .../store/storetest/upload_session_store.go   |   4 +-
 .../storetest/user_access_token_store.go      |   4 +-
 server/channels/store/storetest/user_store.go |   4 +-
 .../store/storetest/user_terms_of_service.go  |   4 +-
 server/channels/store/storetest/utils.go      |   2 +-
 .../channels/store/storetest/webhook_store.go |   4 +-
 .../channels/store/timerlayer/timerlayer.go   |   6 +-
 server/channels/testlib/cluster.go            |   4 +-
 server/channels/testlib/helper.go             |  14 +-
 server/channels/testlib/resources.go          |   8 +-
 server/channels/testlib/store.go              |   8 +-
 server/channels/utils/api.go                  |   4 +-
 server/channels/utils/api_test.go             |   2 +-
 server/channels/utils/archive_test.go         |   2 +-
 server/channels/utils/i18n.go                 |   4 +-
 server/channels/utils/imgutils/gif_test.go    |   2 +-
 server/channels/utils/jsonutils/json_test.go  |   2 +-
 server/channels/utils/license.go              |   6 +-
 server/channels/utils/merge_test.go           |   2 +-
 .../utils/mocks/LicenseValidatorIface.go      |   2 +-
 server/channels/utils/subpath.go              |   6 +-
 server/channels/utils/subpath_test.go         |   4 +-
 .../utils/testutils/static_config_service.go  |   2 +-
 server/channels/utils/testutils/testutils.go  |   4 +-
 server/channels/utils/utils.go                |   2 +-
 server/channels/web/context.go                |  14 +-
 server/channels/web/context_test.go           |   6 +-
 server/channels/web/handlers.go               |  18 +-
 server/channels/web/handlers_test.go          |  10 +-
 server/channels/web/main_test.go              |   2 +-
 server/channels/web/oauth.go                  |  14 +-
 server/channels/web/oauth_test.go             |  10 +-
 server/channels/web/params.go                 |   2 +-
 server/channels/web/params_test.go            |   2 +-
 server/channels/web/saml.go                   |   8 +-
 server/channels/web/static.go                 |  10 +-
 server/channels/web/unsupported_browser.go    |   4 +-
 server/channels/web/web.go                    |   8 +-
 server/channels/web/web_test.go               |  22 +-
 server/channels/web/webhook.go                |   4 +-
 server/channels/web/webhook_test.go           |   2 +-
 server/channels/wsapi/api.go                  |   4 +-
 server/channels/wsapi/status.go               |   4 +-
 server/channels/wsapi/system.go               |   2 +-
 server/channels/wsapi/user.go                 |   4 +-
 server/channels/wsapi/websocket_handler.go    |  10 +-
 server/cmd/mattermost/commands/cmdtestlib.go  |   8 +-
 server/cmd/mattermost/commands/db.go          |   8 +-
 server/cmd/mattermost/commands/export.go      |   8 +-
 server/cmd/mattermost/commands/export_test.go |   2 +-
 server/cmd/mattermost/commands/import.go      |   8 +-
 server/cmd/mattermost/commands/init.go        |  12 +-
 server/cmd/mattermost/commands/jobserver.go   |   8 +-
 server/cmd/mattermost/commands/main_test.go   |   6 +-
 server/cmd/mattermost/commands/server.go      |  16 +-
 server/cmd/mattermost/commands/server_test.go |   4 +-
 server/cmd/mattermost/commands/test.go        |  10 +-
 server/cmd/mattermost/commands/utils.go       |   2 +-
 server/cmd/mattermost/commands/version.go     |   2 +-
 server/cmd/mattermost/main.go                 |   8 +-
 server/config/client.go                       |   2 +-
 server/config/client_test.go                  |   2 +-
 server/config/common_test.go                  |   2 +-
 server/config/database.go                     |   6 +-
 server/config/database_test.go                |   2 +-
 server/config/diff.go                         |   2 +-
 server/config/diff_test.go                    |   2 +-
 server/config/emitter.go                      |   4 +-
 server/config/emitter_test.go                 |   4 +-
 server/config/environment.go                  |   2 +-
 server/config/environment_test.go             |   2 +-
 server/config/file.go                         |   6 +-
 server/config/file_test.go                    |   4 +-
 server/config/logconfigsrc.go                 |   2 +-
 server/config/logger.go                       |   6 +-
 server/config/logger_test.go                  |   4 +-
 server/config/main_test.go                    |   4 +-
 server/config/memory.go                       |   2 +-
 server/config/migrate_test.go                 |   2 +-
 server/config/store.go                        |   6 +-
 server/config/utils.go                        |   8 +-
 server/config/utils_test.go                   |   4 +-
 go.mod => server/go.mod                       |   2 +-
 go.sum => server/go.sum                       |   0
 {model => server/model}/access.go             |   0
 {model => server/model}/access_test.go        |   0
 {model => server/model}/analytics_row.go      |   0
 {model => server/model}/audit.go              |   0
 {model => server/model}/auditconv.go          |   0
 {model => server/model}/auditconv_test.go     |   0
 {model => server/model}/audits.go             |   0
 {model => server/model}/authorize.go          |   0
 {model => server/model}/authorize_test.go     |   0
 {model => server/model}/bot.go                |   0
 {model => server/model}/bot_test.go           |   0
 {model => server/model}/builtin.go            |   0
 {model => server/model}/bulk_export.go        |   0
 {model => server/model}/bundle_info.go        |   2 +-
 {model => server/model}/bundle_info_test.go   |   0
 {model => server/model}/channel.go            |   0
 {model => server/model}/channel_count.go      |   0
 {model => server/model}/channel_data.go       |   0
 {model => server/model}/channel_list.go       |   0
 {model => server/model}/channel_member.go     |   0
 .../model}/channel_member_history.go          |   0
 .../model}/channel_member_history_result.go   |   0
 .../model}/channel_member_test.go             |   0
 {model => server/model}/channel_mentions.go   |   0
 {model => server/model}/channel_search.go     |   0
 {model => server/model}/channel_sidebar.go    |   0
 .../model}/channel_sidebar_test.go            |   0
 {model => server/model}/channel_stats.go      |   0
 {model => server/model}/channel_test.go       |   0
 {model => server/model}/channel_view.go       |   0
 {model => server/model}/client4.go            |   0
 {model => server/model}/client4_test.go       |   2 +-
 {model => server/model}/cloud.go              |   4 +-
 {model => server/model}/cluster_discovery.go  |   0
 .../model}/cluster_discovery_test.go          |   0
 {model => server/model}/cluster_info.go       |   0
 {model => server/model}/cluster_message.go    |   0
 {model => server/model}/cluster_stats.go      |   0
 {model => server/model}/collection.go         |   0
 {model => server/model}/command.go            |   0
 {model => server/model}/command_args.go       |   2 +-
 {model => server/model}/command_args_test.go  |   0
 .../model}/command_autocomplete.go            |   0
 .../model}/command_autocomplete_test.go       |   0
 {model => server/model}/command_request.go    |   0
 {model => server/model}/command_response.go   |   2 +-
 .../model}/command_response_test.go           |   0
 {model => server/model}/command_test.go       |   0
 {model => server/model}/command_webhook.go    |   0
 .../model}/command_webhook_test.go            |   0
 {model => server/model}/compliance.go         |   0
 {model => server/model}/compliance_post.go    |   0
 .../model}/compliance_post_test.go            |   0
 {model => server/model}/config.go             |   4 +-
 {model => server/model}/config_test.go        |  59 ----
 {model => server/model}/custom_status.go      |   0
 .../model}/data_retention_policy.go           |   0
 {model => server/model}/draft.go              |   0
 {model => server/model}/draft_test.go         |   0
 {model => server/model}/emoji.go              |   0
 {model => server/model}/emoji_data.go         |   0
 {model => server/model}/emoji_search.go       |   0
 {model => server/model}/emoji_test.go         |   0
 {model => server/model}/feature_flags.go      |   0
 {model => server/model}/feature_flags_test.go |   0
 {model => server/model}/file.go               |   0
 {model => server/model}/file_info.go          |   2 +-
 {model => server/model}/file_info_list.go     |   0
 .../model}/file_info_search_results.go        |   0
 {model => server/model}/file_info_test.go     |   0
 {model => server/model}/github_release.go     |   0
 {model => server/model}/gitlab.go             |   0
 {model => server/model}/group.go              |   0
 {model => server/model}/group_member.go       |   0
 {model => server/model}/group_syncable.go     |   0
 .../model}/group_syncable_test.go             |   0
 {model => server/model}/guest_invite.go       |   0
 {model => server/model}/hosted_customer.go    |   0
 {model => server/model}/incoming_webhook.go   |   0
 .../model}/incoming_webhook_test.go           |   0
 {model => server/model}/initial_load.go       |   0
 {model => server/model}/insights.go           |   0
 {model => server/model}/insights_test.go      |   0
 {model => server/model}/integration_action.go |   0
 .../model}/integration_action_test.go         |   0
 {model => server/model}/integrity.go          |   0
 {model => server/model}/job.go                |   0
 {model => server/model}/job_test.go           |   0
 {model => server/model}/ldap.go               |   0
 {model => server/model}/license.go            |   0
 {model => server/model}/license_key.go        |   0
 .../model}/license_key_test_env.go            |   0
 {model => server/model}/license_test.go       |   0
 {model => server/model}/link_metadata.go      |   0
 {model => server/model}/link_metadata_test.go |   0
 {model => server/model}/manifest.go           |   0
 {model => server/model}/manifest_test.go      |   0
 {model => server/model}/marketplace_plugin.go |   0
 {model => server/model}/member_invite.go      |   0
 {model => server/model}/mention_map.go        |   0
 {model => server/model}/mention_map_test.go   |   0
 {model => server/model}/message_export.go     |   0
 {model => server/model}/mfa_secret.go         |   0
 {model => server/model}/migration.go          |   0
 {model => server/model}/modeltestlib_test.go  |   0
 {model => server/model}/notify_admin.go       |   0
 {model => server/model}/oauth.go              |   0
 {model => server/model}/oauth_test.go         |   0
 .../model}/oauthproviders/gitlab/gitlab.go    |   4 +-
 {model => server/model}/onboarding.go         |   0
 {model => server/model}/outgoing_webhook.go   |   0
 .../model}/outgoing_webhook_test.go           |   0
 {model => server/model}/permalink.go          |   0
 {model => server/model}/permission.go         |   0
 .../model}/plugin_cluster_event.go            |   0
 {model => server/model}/plugin_constants.go   |   0
 {model => server/model}/plugin_event_data.go  |   0
 {model => server/model}/plugin_key_value.go   |   0
 .../model}/plugin_key_value_test.go           |   0
 .../model}/plugin_kvset_options.go            |   0
 .../model}/plugin_on_install_event.go         |   0
 {model => server/model}/plugin_status.go      |   0
 {model => server/model}/plugin_valid.go       |   0
 {model => server/model}/plugin_valid_test.go  |   0
 {model => server/model}/plugins_response.go   |   0
 {model => server/model}/post.go               |   2 +-
 .../model}/post_acknowledgement.go            |   0
 {model => server/model}/post_embed.go         |   0
 {model => server/model}/post_info.go          |   0
 {model => server/model}/post_list.go          |   0
 {model => server/model}/post_list_test.go     |   0
 {model => server/model}/post_metadata.go      |   0
 .../model}/post_search_results.go             |   0
 {model => server/model}/post_test.go          |   0
 {model => server/model}/preference.go         |   0
 {model => server/model}/preference_test.go    |   0
 {model => server/model}/product_notices.go    |   0
 {model => server/model}/push_notification.go  |   0
 .../model}/push_notification_test.go          |   0
 {model => server/model}/push_response.go      |   0
 {model => server/model}/push_response_test.go |   0
 {model => server/model}/reaction.go           |   0
 {model => server/model}/reaction_test.go      |   0
 {model => server/model}/remote_cluster.go     |   0
 .../model}/remote_cluster_test.go             |   0
 {model => server/model}/role.go               |   0
 {model => server/model}/role_test.go          |   0
 {model => server/model}/saml.go               |   0
 {model => server/model}/scheduled_task.go     |   0
 .../model}/scheduled_task_test.go             |   0
 {model => server/model}/scheme.go             |   0
 {model => server/model}/search_params.go      |   0
 {model => server/model}/search_params_test.go |   0
 {model => server/model}/security_bulletin.go  |   0
 {model => server/model}/session.go            |   2 +-
 {model => server/model}/session_serial_gen.go |   0
 {model => server/model}/session_test.go       |   0
 {model => server/model}/shared_channel.go     |   0
 .../model}/shared_channel_test.go             |   0
 {model => server/model}/slack_attachment.go   |   0
 .../model}/slack_attachment_test.go           |   0
 .../model}/slack_compatibility.go             |   0
 .../model}/slack_compatibility_test.go        |   0
 {model => server/model}/status.go             |   0
 {model => server/model}/status_test.go        |   0
 {model => server/model}/suggest_command.go    |   0
 {model => server/model}/switch_request.go     |   0
 {model => server/model}/system.go             |   0
 {model => server/model}/team.go               |   0
 {model => server/model}/team_member.go        |   0
 .../model}/team_member_serial_gen.go          |   0
 {model => server/model}/team_member_test.go   |   0
 {model => server/model}/team_search.go        |   0
 {model => server/model}/team_stats.go         |   0
 {model => server/model}/team_test.go          |   0
 {model => server/model}/terms_of_service.go   |   0
 .../model}/terms_of_service_test.go           |   0
 ...rkdown-sample-with-rewritten-image-urls.md |   0
 .../model}/testdata/markdown-sample.md        |   0
 {model => server/model}/thread.go             |   0
 {model => server/model}/token.go              |   0
 .../model}/true_up_review_profile.go          |   0
 {model => server/model}/typing_request.go     |   0
 {model => server/model}/upload_session.go     |   0
 .../model}/upload_session_test.go             |   0
 {model => server/model}/usage.go              |   0
 {model => server/model}/user.go               |   4 +-
 {model => server/model}/user_access_token.go  |   0
 .../model}/user_access_token_search.go        |   0
 .../model}/user_access_token_test.go          |   0
 {model => server/model}/user_autocomplete.go  |   0
 {model => server/model}/user_count.go         |   0
 {model => server/model}/user_get.go           |   0
 {model => server/model}/user_search.go        |   0
 {model => server/model}/user_serial_gen.go    |   0
 .../model}/user_terms_of_service.go           |   0
 .../model}/user_terms_of_service_test.go      |   0
 {model => server/model}/user_test.go          |   0
 {model => server/model}/users_stats.go        |   0
 {model => server/model}/utils.go              |   2 +-
 {model => server/model}/utils_test.go         |   0
 {model => server/model}/version.go            |   0
 {model => server/model}/version_test.go       |   0
 {model => server/model}/websocket_client.go   |   2 +-
 .../model}/websocket_client_test.go           |   0
 {model => server/model}/websocket_message.go  |   0
 .../model}/websocket_message_test.go          |   0
 {model => server/model}/websocket_request.go  |   2 +-
 {model => server/model}/worktemplate.go       |   0
 server/platform/services/awsmeter/awsmeter.go |   6 +-
 .../services/awsmeter/awsmeter_test.go        |   6 +-
 server/platform/services/cache/cache.go       |   2 +-
 server/platform/services/cache/lru.go         |   2 +-
 server/platform/services/cache/lru_striped.go |   2 +-
 .../services/cache/lru_striped_bench_test.go  |   2 +-
 .../services/cache/lru_striped_test.go        |   2 +-
 server/platform/services/cache/lru_test.go    |   2 +-
 .../platform/services/cache/mocks/Provider.go |   2 +-
 server/platform/services/cache/provider.go    |   2 +-
 .../platform/services/cache/provider_test.go  |   2 +-
 .../services/configservice/configservice.go   |   2 +-
 .../platform/services/docextractor/combine.go |   2 +-
 .../docextractor/docextractor_test.go         |   2 +-
 .../services/docextractor/pdf_test.go         |   2 +-
 .../services/httpservice/httpservice.go       |   2 +-
 .../services/imageproxy/atmos_camo_test.go    |   6 +-
 .../services/imageproxy/imageproxy.go         |   8 +-
 server/platform/services/imageproxy/local.go  |   2 +-
 .../services/imageproxy/local_test.go         |   6 +-
 .../platform/services/marketplace/client.go   |   4 +-
 .../services/remotecluster/invitation.go      |   2 +-
 .../services/remotecluster/mocks_test.go      |  12 +-
 .../platform/services/remotecluster/ping.go   |   4 +-
 .../services/remotecluster/ping_test.go       |   2 +-
 .../platform/services/remotecluster/recv.go   |   4 +-
 .../services/remotecluster/send_test.go       |   2 +-
 .../services/remotecluster/sendfile.go        |   6 +-
 .../services/remotecluster/sendmsg.go         |   4 +-
 .../remotecluster/sendprofileImage.go         |   4 +-
 .../remotecluster/sendprofileImage_test.go    |   2 +-
 .../services/remotecluster/service.go         |   8 +-
 .../services/remotecluster/service_test.go    |   2 +-
 .../searchengine/bleveengine/bleve.go         |   4 +-
 .../searchengine/bleveengine/bleve_test.go    |  14 +-
 .../searchengine/bleveengine/common.go        |   4 +-
 .../bleveengine/indexer/indexing_job.go       |   8 +-
 .../bleveengine/indexer/indexing_job_test.go  |  10 +-
 .../searchengine/bleveengine/search.go        |   4 +-
 .../searchengine/bleveengine/testlib.go       |   2 +-
 .../services/searchengine/interface.go        |   2 +-
 .../mocks/SearchEngineInterface.go            |   2 +-
 .../services/searchengine/searchengine.go     |   2 +-
 .../searchengine/searchengine_test.go         |   4 +-
 .../platform/services/searchengine/utils.go   |   2 +-
 .../services/sharedchannel/attachment.go      |   8 +-
 .../services/sharedchannel/channelinvite.go   |   8 +-
 .../sharedchannel/channelinvite_test.go       |   8 +-
 .../sharedchannel/mock_AppIface_test.go       |   6 +-
 .../sharedchannel/mock_ServerIface_test.go    |   8 +-
 server/platform/services/sharedchannel/msg.go |   2 +-
 .../services/sharedchannel/permalink.go       |   6 +-
 .../services/sharedchannel/permalink_test.go  |  10 +-
 .../services/sharedchannel/service.go         |  12 +-
 .../services/sharedchannel/sync_recv.go       |   8 +-
 .../services/sharedchannel/sync_send.go       |  10 +-
 .../sharedchannel/sync_send_remote.go         |   8 +-
 .../platform/services/sharedchannel/util.go   |   2 +-
 .../services/slackimport/converters.go        |   2 +-
 .../platform/services/slackimport/parsers.go  |   4 +-
 .../services/slackimport/slackimport.go       |  12 +-
 .../services/slackimport/slackimport_test.go  |   8 +-
 .../services/telemetry/mocks/ServerIface.go   |   8 +-
 .../platform/services/telemetry/telemetry.go  |  18 +-
 .../services/telemetry/telemetry_test.go      |  20 +-
 server/platform/services/tracing/tracing.go   |   2 +-
 .../services/upgrader/upgrader_linux.go       |   4 +-
 .../services/upgrader/upgrader_linux_test.go  |   2 +-
 server/platform/shared/driver/conn.go         |   2 +-
 server/platform/shared/driver/driver.go       |   2 +-
 server/platform/shared/driver/objects.go      |   2 +-
 .../shared/filestore/filesstore_test.go       |   2 +-
 .../platform/shared/filestore/localstore.go   |   2 +-
 .../shared/filestore/mocks/FileBackend.go     |   2 +-
 server/platform/shared/filestore/s3store.go   |   2 +-
 server/platform/shared/i18n/i18n.go           |   2 +-
 server/platform/shared/mail/mail.go           |   4 +-
 server/platform/shared/mfa/mfa_test.go        |   4 +-
 server/platform/shared/mlog/global_test.go    |   2 +-
 server/platform/shared/templates/templates.go |   2 +-
 server/playbooks/client/client.go             |   2 +-
 server/playbooks/client/doc_test.go           |   4 +-
 server/playbooks/client/playbook_runs_test.go |   4 +-
 server/playbooks/client/playbooks_test.go     |   4 +-
 server/playbooks/product/api_adapter.go       |  12 +-
 .../product/imports/playbooks_imports.go      |   2 +-
 server/playbooks/product/logrus.go            |   2 +-
 server/playbooks/product/playbooks_product.go |  34 +-
 .../product/pluginapi/cluster/job.go          |   2 +-
 .../product/pluginapi/cluster/job_once.go     |   2 +-
 .../product/pluginapi/cluster/mutex.go        |   2 +-
 server/playbooks/product/pluginapi/license.go |   2 +-
 server/playbooks/server/api/actions.go        |   4 +-
 server/playbooks/server/api/api.go            |   2 +-
 server/playbooks/server/api/bot.go            |  10 +-
 server/playbooks/server/api/categories.go     |   6 +-
 server/playbooks/server/api/graphql.go        |   6 +-
 .../server/api/graphql_loader_favorite.go     |   2 +-
 .../server/api/graphql_loader_playbook.go     |   2 +-
 .../playbooks/server/api/graphql_playbook.go  |   2 +-
 .../server/api/graphql_root_playbook.go       |   4 +-
 .../playbooks/server/api/graphql_root_run.go  |   6 +-
 server/playbooks/server/api/graphql_run.go    |   2 +-
 server/playbooks/server/api/logger.go         |   2 +-
 server/playbooks/server/api/playbook_runs.go  |  12 +-
 server/playbooks/server/api/playbooks.go      |  10 +-
 server/playbooks/server/api/settings.go       |   6 +-
 server/playbooks/server/api/signal.go         |   6 +-
 server/playbooks/server/api/stats.go          |   8 +-
 server/playbooks/server/api/telemetry.go      |   6 +-
 server/playbooks/server/api/urls.go           |   4 +-
 server/playbooks/server/api_actions_test.go   |   4 +-
 server/playbooks/server/api_bot_test.go       |   2 +-
 .../server/api_graphql_playbooks_test.go      |   6 +-
 .../playbooks/server/api_graphql_runs_test.go |   8 +-
 server/playbooks/server/api_playbooks_test.go |   6 +-
 server/playbooks/server/api_runs_test.go      |   6 +-
 server/playbooks/server/api_settings_test.go  |   2 +-
 server/playbooks/server/api_stats_test.go     |   2 +-
 server/playbooks/server/app/action.go         |   2 +-
 .../playbooks/server/app/actions_service.go   |   8 +-
 .../playbooks/server/app/category_service.go  |   4 +-
 .../app/mocks/mock_job_once_scheduler.go      |   4 +-
 .../server/app/permissions_service.go         |   6 +-
 server/playbooks/server/app/playbook.go       |   2 +-
 server/playbooks/server/app/playbook_run.go   |   4 +-
 .../server/app/playbook_run_service.go        |  16 +-
 .../playbooks/server/app/playbook_run_test.go |   2 +-
 .../playbooks/server/app/playbook_service.go  |   8 +-
 .../playbooks/server/app/plugin_api_tools.go  |   2 +-
 server/playbooks/server/app/reminder.go       |   2 +-
 server/playbooks/server/app/task_actions.go   |   2 +-
 .../playbooks/server/app/task_actions_test.go |   2 +-
 server/playbooks/server/bot/bot.go            |   6 +-
 .../playbooks/server/bot/mocks/mock_poster.go |   4 +-
 server/playbooks/server/bot/poster.go         |   2 +-
 server/playbooks/server/command/command.go    |  14 +-
 server/playbooks/server/config/service.go     |   4 +-
 server/playbooks/server/enterprise/license.go |   4 +-
 server/playbooks/server/httptools/client.go   |   4 +-
 server/playbooks/server/main_test.go          |  33 +-
 .../playbooks/server/playbooks/service_api.go |   2 +-
 server/playbooks/server/sqlstore/actions.go   |   4 +-
 .../playbooks/server/sqlstore/actions_test.go |   6 +-
 server/playbooks/server/sqlstore/category.go  |   4 +-
 .../server/sqlstore/category_test.go          |   6 +-
 server/playbooks/server/sqlstore/migrate.go   |   2 +-
 .../playbooks/server/sqlstore/migrations.go   |   4 +-
 .../server/sqlstore/migrations_test.go        |   2 +-
 .../server/sqlstore/migrations_utils.go       |   2 +-
 .../sqlstore/mockmocks/mock_storeapi.go       |   2 +-
 .../sqlstore/mocks/mock_configurationapi.go   |   4 +-
 .../server/sqlstore/mocks/mock_kvapi.go       |   2 +-
 .../server/sqlstore/mocks/mock_storeapi.go    |   2 +-
 server/playbooks/server/sqlstore/playbook.go  |   4 +-
 .../playbooks/server/sqlstore/playbook_run.go |   4 +-
 .../server/sqlstore/playbook_run_test.go      |   6 +-
 .../server/sqlstore/playbook_test.go          |   6 +-
 .../server/sqlstore/pluginapi_client.go       |   4 +-
 server/playbooks/server/sqlstore/stats.go     |   2 +-
 .../playbooks/server/sqlstore/stats_test.go   |   6 +-
 server/playbooks/server/sqlstore/store.go     |   4 +-
 .../playbooks/server/sqlstore/store_test.go   |   6 +-
 .../server/sqlstore/support_for_test.go       |   8 +-
 server/playbooks/server/sqlstore/system.go    |   2 +-
 .../server/sqlstore/timeline_event_test.go    |   4 +-
 server/playbooks/server/sqlstore/user_info.go |   4 +-
 .../server/sqlstore/user_info_test.go         |   6 +-
 server/playbooks/server/telemetry/noop.go     |   2 +-
 server/playbooks/server/telemetry/rudder.go   |   2 +-
 .../playbooks/server/telemetry/rudder_test.go |   2 +-
 .../playbooks/server/timeutils/timeutils.go   |   2 +-
 {plugin => server/plugin}/api.go              |   2 +-
 .../plugin}/api_timer_layer_generated.go      |   4 +-
 .../plugin}/checker/check_api.go              |   4 +-
 .../plugin}/checker/check_api_test.go         |   8 +-
 .../checker/internal/asthelpers/helpers.go    |   0
 .../checker/internal/test/invalid/invalid.go  |   0
 .../checker/internal/test/missing/missing.go  |   0
 .../checker/internal/test/valid/valid.go      |   0
 .../checker/internal/version/comments.go      |   0
 .../checker/internal/version/comments_test.go |   0
 .../checker/internal/version/version.go       |   0
 .../checker/internal/version/version_test.go  |   0
 {plugin => server/plugin}/checker/main.go     |   2 +-
 {plugin => server/plugin}/checker/render.go   |   0
 {plugin => server/plugin}/client.go           |   0
 {plugin => server/plugin}/client_rpc.go       |   4 +-
 .../plugin}/client_rpc_generated.go           |   4 +-
 {plugin => server/plugin}/context.go          |   0
 {plugin => server/plugin}/db_rpc.go           |   0
 {plugin => server/plugin}/doc.go              |   0
 {plugin => server/plugin}/driver.go           |   0
 {plugin => server/plugin}/environment.go      |   8 +-
 {plugin => server/plugin}/environment_test.go |   4 +-
 .../plugin}/example_hello_world_test.go       |   2 +-
 .../plugin}/example_help_test.go              |   4 +-
 {plugin => server/plugin}/hclog_adapter.go    |   2 +-
 {plugin => server/plugin}/health_check.go     |   4 +-
 .../plugin}/health_check_test.go              |  12 +-
 {plugin => server/plugin}/hijack.go           |   0
 {plugin => server/plugin}/hooks.go            |   2 +-
 .../plugin}/hooks_timer_layer_generated.go    |   4 +-
 {plugin => server/plugin}/http.go             |   2 +-
 .../plugin}/interface_generator/main.go       |  10 +-
 {plugin => server/plugin}/io_rpc.go           |   0
 {plugin => server/plugin}/plugintest/api.go   |   2 +-
 {plugin => server/plugin}/plugintest/doc.go   |   2 +-
 .../plugin}/plugintest/driver.go              |   2 +-
 .../plugintest/example_hello_user_test.go     |   6 +-
 {plugin => server/plugin}/plugintest/hooks.go |   4 +-
 .../plugin}/plugintest/mock/mock.go           |   0
 {plugin => server/plugin}/product.go          |   0
 .../plugin}/product_hooks_generated.go        |   2 +-
 .../plugin}/scheduler/scheduler.go            |   4 +-
 {plugin => server/plugin}/scheduler/worker.go |   6 +-
 {plugin => server/plugin}/stringifier.go      |   0
 {plugin => server/plugin}/stringifier_test.go |   0
 {plugin => server/plugin}/supervisor.go       |   6 +-
 {plugin => server/plugin}/supervisor_test.go  |   6 +-
 server/scripts/config_generator/main.go       |   2 +-
 server/scripts/config_generator/main_test.go  |   2 +-
 server/scripts/setup_go_work.sh               |   9 +-
 1534 files changed, 3778 insertions(+), 3853 deletions(-)
 rename go.mod => server/go.mod (99%)
 rename go.sum => server/go.sum (100%)
 rename {model => server/model}/access.go (100%)
 rename {model => server/model}/access_test.go (100%)
 rename {model => server/model}/analytics_row.go (100%)
 rename {model => server/model}/audit.go (100%)
 rename {model => server/model}/auditconv.go (100%)
 rename {model => server/model}/auditconv_test.go (100%)
 rename {model => server/model}/audits.go (100%)
 rename {model => server/model}/authorize.go (100%)
 rename {model => server/model}/authorize_test.go (100%)
 rename {model => server/model}/bot.go (100%)
 rename {model => server/model}/bot_test.go (100%)
 rename {model => server/model}/builtin.go (100%)
 rename {model => server/model}/bulk_export.go (100%)
 rename {model => server/model}/bundle_info.go (92%)
 rename {model => server/model}/bundle_info_test.go (100%)
 rename {model => server/model}/channel.go (100%)
 rename {model => server/model}/channel_count.go (100%)
 rename {model => server/model}/channel_data.go (100%)
 rename {model => server/model}/channel_list.go (100%)
 rename {model => server/model}/channel_member.go (100%)
 rename {model => server/model}/channel_member_history.go (100%)
 rename {model => server/model}/channel_member_history_result.go (100%)
 rename {model => server/model}/channel_member_test.go (100%)
 rename {model => server/model}/channel_mentions.go (100%)
 rename {model => server/model}/channel_search.go (100%)
 rename {model => server/model}/channel_sidebar.go (100%)
 rename {model => server/model}/channel_sidebar_test.go (100%)
 rename {model => server/model}/channel_stats.go (100%)
 rename {model => server/model}/channel_test.go (100%)
 rename {model => server/model}/channel_view.go (100%)
 rename {model => server/model}/client4.go (100%)
 rename {model => server/model}/client4_test.go (97%)
 rename {model => server/model}/cloud.go (98%)
 rename {model => server/model}/cluster_discovery.go (100%)
 rename {model => server/model}/cluster_discovery_test.go (100%)
 rename {model => server/model}/cluster_info.go (100%)
 rename {model => server/model}/cluster_message.go (100%)
 rename {model => server/model}/cluster_stats.go (100%)
 rename {model => server/model}/collection.go (100%)
 rename {model => server/model}/command.go (100%)
 rename {model => server/model}/command_args.go (96%)
 rename {model => server/model}/command_args_test.go (100%)
 rename {model => server/model}/command_autocomplete.go (100%)
 rename {model => server/model}/command_autocomplete_test.go (100%)
 rename {model => server/model}/command_request.go (100%)
 rename {model => server/model}/command_response.go (96%)
 rename {model => server/model}/command_response_test.go (100%)
 rename {model => server/model}/command_test.go (100%)
 rename {model => server/model}/command_webhook.go (100%)
 rename {model => server/model}/command_webhook_test.go (100%)
 rename {model => server/model}/compliance.go (100%)
 rename {model => server/model}/compliance_post.go (100%)
 rename {model => server/model}/compliance_post_test.go (100%)
 rename {model => server/model}/config.go (99%)
 rename {model => server/model}/config_test.go (96%)
 rename {model => server/model}/custom_status.go (100%)
 rename {model => server/model}/data_retention_policy.go (100%)
 rename {model => server/model}/draft.go (100%)
 rename {model => server/model}/draft_test.go (100%)
 rename {model => server/model}/emoji.go (100%)
 rename {model => server/model}/emoji_data.go (100%)
 rename {model => server/model}/emoji_search.go (100%)
 rename {model => server/model}/emoji_test.go (100%)
 rename {model => server/model}/feature_flags.go (100%)
 rename {model => server/model}/feature_flags_test.go (100%)
 rename {model => server/model}/file.go (100%)
 rename {model => server/model}/file_info.go (99%)
 rename {model => server/model}/file_info_list.go (100%)
 rename {model => server/model}/file_info_search_results.go (100%)
 rename {model => server/model}/file_info_test.go (100%)
 rename {model => server/model}/github_release.go (100%)
 rename {model => server/model}/gitlab.go (100%)
 rename {model => server/model}/group.go (100%)
 rename {model => server/model}/group_member.go (100%)
 rename {model => server/model}/group_syncable.go (100%)
 rename {model => server/model}/group_syncable_test.go (100%)
 rename {model => server/model}/guest_invite.go (100%)
 rename {model => server/model}/hosted_customer.go (100%)
 rename {model => server/model}/incoming_webhook.go (100%)
 rename {model => server/model}/incoming_webhook_test.go (100%)
 rename {model => server/model}/initial_load.go (100%)
 rename {model => server/model}/insights.go (100%)
 rename {model => server/model}/insights_test.go (100%)
 rename {model => server/model}/integration_action.go (100%)
 rename {model => server/model}/integration_action_test.go (100%)
 rename {model => server/model}/integrity.go (100%)
 rename {model => server/model}/job.go (100%)
 rename {model => server/model}/job_test.go (100%)
 rename {model => server/model}/ldap.go (100%)
 rename {model => server/model}/license.go (100%)
 rename {model => server/model}/license_key.go (100%)
 rename {model => server/model}/license_key_test_env.go (100%)
 rename {model => server/model}/license_test.go (100%)
 rename {model => server/model}/link_metadata.go (100%)
 rename {model => server/model}/link_metadata_test.go (100%)
 rename {model => server/model}/manifest.go (100%)
 rename {model => server/model}/manifest_test.go (100%)
 rename {model => server/model}/marketplace_plugin.go (100%)
 rename {model => server/model}/member_invite.go (100%)
 rename {model => server/model}/mention_map.go (100%)
 rename {model => server/model}/mention_map_test.go (100%)
 rename {model => server/model}/message_export.go (100%)
 rename {model => server/model}/mfa_secret.go (100%)
 rename {model => server/model}/migration.go (100%)
 rename {model => server/model}/modeltestlib_test.go (100%)
 rename {model => server/model}/notify_admin.go (100%)
 rename {model => server/model}/oauth.go (100%)
 rename {model => server/model}/oauth_test.go (100%)
 rename {model => server/model}/oauthproviders/gitlab/gitlab.go (95%)
 rename {model => server/model}/onboarding.go (100%)
 rename {model => server/model}/outgoing_webhook.go (100%)
 rename {model => server/model}/outgoing_webhook_test.go (100%)
 rename {model => server/model}/permalink.go (100%)
 rename {model => server/model}/permission.go (100%)
 rename {model => server/model}/plugin_cluster_event.go (100%)
 rename {model => server/model}/plugin_constants.go (100%)
 rename {model => server/model}/plugin_event_data.go (100%)
 rename {model => server/model}/plugin_key_value.go (100%)
 rename {model => server/model}/plugin_key_value_test.go (100%)
 rename {model => server/model}/plugin_kvset_options.go (100%)
 rename {model => server/model}/plugin_on_install_event.go (100%)
 rename {model => server/model}/plugin_status.go (100%)
 rename {model => server/model}/plugin_valid.go (100%)
 rename {model => server/model}/plugin_valid_test.go (100%)
 rename {model => server/model}/plugins_response.go (100%)
 rename {model => server/model}/post.go (99%)
 rename {model => server/model}/post_acknowledgement.go (100%)
 rename {model => server/model}/post_embed.go (100%)
 rename {model => server/model}/post_info.go (100%)
 rename {model => server/model}/post_list.go (100%)
 rename {model => server/model}/post_list_test.go (100%)
 rename {model => server/model}/post_metadata.go (100%)
 rename {model => server/model}/post_search_results.go (100%)
 rename {model => server/model}/post_test.go (100%)
 rename {model => server/model}/preference.go (100%)
 rename {model => server/model}/preference_test.go (100%)
 rename {model => server/model}/product_notices.go (100%)
 rename {model => server/model}/push_notification.go (100%)
 rename {model => server/model}/push_notification_test.go (100%)
 rename {model => server/model}/push_response.go (100%)
 rename {model => server/model}/push_response_test.go (100%)
 rename {model => server/model}/reaction.go (100%)
 rename {model => server/model}/reaction_test.go (100%)
 rename {model => server/model}/remote_cluster.go (100%)
 rename {model => server/model}/remote_cluster_test.go (100%)
 rename {model => server/model}/role.go (100%)
 rename {model => server/model}/role_test.go (100%)
 rename {model => server/model}/saml.go (100%)
 rename {model => server/model}/scheduled_task.go (100%)
 rename {model => server/model}/scheduled_task_test.go (100%)
 rename {model => server/model}/scheme.go (100%)
 rename {model => server/model}/search_params.go (100%)
 rename {model => server/model}/search_params_test.go (100%)
 rename {model => server/model}/security_bulletin.go (100%)
 rename {model => server/model}/session.go (98%)
 rename {model => server/model}/session_serial_gen.go (100%)
 rename {model => server/model}/session_test.go (100%)
 rename {model => server/model}/shared_channel.go (100%)
 rename {model => server/model}/shared_channel_test.go (100%)
 rename {model => server/model}/slack_attachment.go (100%)
 rename {model => server/model}/slack_attachment_test.go (100%)
 rename {model => server/model}/slack_compatibility.go (100%)
 rename {model => server/model}/slack_compatibility_test.go (100%)
 rename {model => server/model}/status.go (100%)
 rename {model => server/model}/status_test.go (100%)
 rename {model => server/model}/suggest_command.go (100%)
 rename {model => server/model}/switch_request.go (100%)
 rename {model => server/model}/system.go (100%)
 rename {model => server/model}/team.go (100%)
 rename {model => server/model}/team_member.go (100%)
 rename {model => server/model}/team_member_serial_gen.go (100%)
 rename {model => server/model}/team_member_test.go (100%)
 rename {model => server/model}/team_search.go (100%)
 rename {model => server/model}/team_stats.go (100%)
 rename {model => server/model}/team_test.go (100%)
 rename {model => server/model}/terms_of_service.go (100%)
 rename {model => server/model}/terms_of_service_test.go (100%)
 rename {model => server/model}/testdata/markdown-sample-with-rewritten-image-urls.md (100%)
 rename {model => server/model}/testdata/markdown-sample.md (100%)
 rename {model => server/model}/thread.go (100%)
 rename {model => server/model}/token.go (100%)
 rename {model => server/model}/true_up_review_profile.go (100%)
 rename {model => server/model}/typing_request.go (100%)
 rename {model => server/model}/upload_session.go (100%)
 rename {model => server/model}/upload_session_test.go (100%)
 rename {model => server/model}/usage.go (100%)
 rename {model => server/model}/user.go (99%)
 rename {model => server/model}/user_access_token.go (100%)
 rename {model => server/model}/user_access_token_search.go (100%)
 rename {model => server/model}/user_access_token_test.go (100%)
 rename {model => server/model}/user_autocomplete.go (100%)
 rename {model => server/model}/user_count.go (100%)
 rename {model => server/model}/user_get.go (100%)
 rename {model => server/model}/user_search.go (100%)
 rename {model => server/model}/user_serial_gen.go (100%)
 rename {model => server/model}/user_terms_of_service.go (100%)
 rename {model => server/model}/user_terms_of_service_test.go (100%)
 rename {model => server/model}/user_test.go (100%)
 rename {model => server/model}/users_stats.go (100%)
 rename {model => server/model}/utils.go (99%)
 rename {model => server/model}/utils_test.go (100%)
 rename {model => server/model}/version.go (100%)
 rename {model => server/model}/version_test.go (100%)
 rename {model => server/model}/websocket_client.go (99%)
 rename {model => server/model}/websocket_client_test.go (100%)
 rename {model => server/model}/websocket_message.go (100%)
 rename {model => server/model}/websocket_message_test.go (100%)
 rename {model => server/model}/websocket_request.go (94%)
 rename {model => server/model}/worktemplate.go (100%)
 rename {plugin => server/plugin}/api.go (99%)
 rename {plugin => server/plugin}/api_timer_layer_generated.go (99%)
 rename {plugin => server/plugin}/checker/check_api.go (87%)
 rename {plugin => server/plugin}/checker/check_api_test.go (76%)
 rename {plugin => server/plugin}/checker/internal/asthelpers/helpers.go (100%)
 rename {plugin => server/plugin}/checker/internal/test/invalid/invalid.go (100%)
 rename {plugin => server/plugin}/checker/internal/test/missing/missing.go (100%)
 rename {plugin => server/plugin}/checker/internal/test/valid/valid.go (100%)
 rename {plugin => server/plugin}/checker/internal/version/comments.go (100%)
 rename {plugin => server/plugin}/checker/internal/version/comments_test.go (100%)
 rename {plugin => server/plugin}/checker/internal/version/version.go (100%)
 rename {plugin => server/plugin}/checker/internal/version/version_test.go (100%)
 rename {plugin => server/plugin}/checker/main.go (98%)
 rename {plugin => server/plugin}/checker/render.go (100%)
 rename {plugin => server/plugin}/client.go (100%)
 rename {plugin => server/plugin}/client_rpc.go (99%)
 rename {plugin => server/plugin}/client_rpc_generated.go (99%)
 rename {plugin => server/plugin}/context.go (100%)
 rename {plugin => server/plugin}/db_rpc.go (100%)
 rename {plugin => server/plugin}/doc.go (100%)
 rename {plugin => server/plugin}/driver.go (100%)
 rename {plugin => server/plugin}/environment.go (98%)
 rename {plugin => server/plugin}/environment_test.go (95%)
 rename {plugin => server/plugin}/example_hello_world_test.go (92%)
 rename {plugin => server/plugin}/example_help_test.go (96%)
 rename {plugin => server/plugin}/hclog_adapter.go (97%)
 rename {plugin => server/plugin}/health_check.go (97%)
 rename {plugin => server/plugin}/health_check_test.go (90%)
 rename {plugin => server/plugin}/hijack.go (100%)
 rename {plugin => server/plugin}/hooks.go (99%)
 rename {plugin => server/plugin}/hooks_timer_layer_generated.go (98%)
 rename {plugin => server/plugin}/http.go (97%)
 rename {plugin => server/plugin}/interface_generator/main.go (98%)
 rename {plugin => server/plugin}/io_rpc.go (100%)
 rename {plugin => server/plugin}/plugintest/api.go (99%)
 rename {plugin => server/plugin}/plugintest/doc.go (83%)
 rename {plugin => server/plugin}/plugintest/driver.go (99%)
 rename {plugin => server/plugin}/plugintest/example_hello_user_test.go (86%)
 rename {plugin => server/plugin}/plugintest/hooks.go (99%)
 rename {plugin => server/plugin}/plugintest/mock/mock.go (100%)
 rename {plugin => server/plugin}/product.go (100%)
 rename {plugin => server/plugin}/product_hooks_generated.go (99%)
 rename {plugin => server/plugin}/scheduler/scheduler.go (76%)
 rename {plugin => server/plugin}/scheduler/worker.go (93%)
 rename {plugin => server/plugin}/stringifier.go (100%)
 rename {plugin => server/plugin}/stringifier_test.go (100%)
 rename {plugin => server/plugin}/supervisor.go (95%)
 rename {plugin => server/plugin}/supervisor_test.go (92%)

diff --git a/server/Makefile b/server/Makefile
index 3271d4d4b9..e824d5129d 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -102,11 +102,11 @@ GOFLAGS ?= $(GOFLAGS:)
 export GOBIN ?= $(PWD)/bin
 GO=go
 DELVE=dlv
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"
 
 GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
 GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
@@ -132,9 +132,9 @@ DIST_PATH_WIN=$(DIST_ROOT)/windows/mattermost
 TESTS=.
 
 # Packages lists
-TE_PACKAGES=$(shell $(GO) list ./... | grep -vE 'v6/server/playbooks|v6/server/boards')
-BOARDS_PACKAGES=$(shell $(GO) list ./... | grep -E 'v6/server/boards')
-PLAYBOOKS_PACKAGES=$(shell $(GO) list ./... | grep -E 'v6/server/playbooks')
+TE_PACKAGES=$(shell $(GO) list ./... | grep -vE 'server/v8/playbooks|server/v8/boards')
+BOARDS_PACKAGES=$(shell $(GO) list ./... | grep -E 'server/v8/boards')
+PLAYBOOKS_PACKAGES=$(shell $(GO) list ./... | grep -E 'server/v8/playbooks')
 
 TEMPLATES_DIR=templates
 
@@ -189,7 +189,7 @@ endif
 include config.mk
 include build/*.mk
 
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.MockCWS=$(MM_ENABLE_CWS_MOCK)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.MockCWS=$(MM_ENABLE_CWS_MOCK)"
 
 RUN_IN_BACKGROUND ?=
 ifeq ($(RUN_SERVER_IN_BACKGROUND),true)
@@ -270,7 +270,7 @@ else
 endif
 
 plugin-checker:
-	$(GO) run $(GOFLAGS) ../plugin/checker
+	$(GO) run $(GOFLAGS) ./plugin/checker
 
 prepackaged-plugins: ## Populate the prepackaged-plugins directory
 	@echo Downloading prepackaged plugins
@@ -349,9 +349,9 @@ ldap-mocks: ## Creates mock files for ldap.
 
 plugin-mocks: ## Creates mock files for plugins.
 	$(GO) install github.com/vektra/mockery/v2/...@v2.23.2
-	$(GOBIN)/mockery --dir ../plugin --name API --output ../plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
-	$(GOBIN)/mockery --dir ../plugin --name Hooks --output ../plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
-	$(GOBIN)/mockery --dir ../plugin --name Driver --output ../plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
+	$(GOBIN)/mockery --dir ./plugin --name API --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
+	$(GOBIN)/mockery --dir ./plugin --name Hooks --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
+	$(GOBIN)/mockery --dir ./plugin --name Driver --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
 
 einterfaces-mocks: ## Creates mock files for einterfaces.
 	$(GO) install github.com/vektra/mockery/v2/...@v2.23.2
@@ -380,7 +380,7 @@ platform-mocks: ## Creates mocks for platform interfaces.
 	$(GOBIN)/mockery --dir channels/app/platform --name SuiteIFace --output channels/app/platform/mocks --note 'Regenerate this file using `make platform-mocks`.'
 
 pluginapi: ## Generates api and hooks glue code for plugins
-	$(GO) generate $(GOFLAGS) ../plugin
+	$(GO) generate $(GOFLAGS) ./plugin
 
 mocks: store-mocks telemetry-mocks filestore-mocks ldap-mocks plugin-mocks einterfaces-mocks searchengine-mocks sharedchannel-mocks misc-mocks email-mocks platform-mocks
 
@@ -552,20 +552,20 @@ run-server: setup-go-work prepackaged-binaries validate-go-version start-docker
 debug-server: start-docker ## Compile and start server using delve.
 	mkdir -p $(BUILD_WEBAPP_DIR)/channels/dist/files
 	$(DELVE) debug $(PLATFORM_FILES) --build-flags="-ldflags '\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)\
-		-X \"github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)\"\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)\
+		-X \"github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)\"\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
 
 debug-server-headless: start-docker ## Debug server from within an IDE like VSCode or IntelliJ.
 	mkdir -p $(BUILD_WEBAPP_DIR)/channels/dist/files
 	$(DELVE) debug --headless --listen=:2345 --api-version=2 --accept-multiclient $(PLATFORM_FILES) --build-flags="-ldflags '\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)\
-		-X \"github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)\"\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)\
+		-X \"github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)\"\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
 
 run-cli: start-docker ## Runs CLI.
 	@echo Running mattermost for development
@@ -733,18 +733,18 @@ gen-serialized: ## Generates serialization methods for hot structs
 	# would be to temporarily move all the structs to the same file,
 	# but that involves a lot of manual work.
 	$(GO) install github.com/tinylib/msgp@v1.1.6
-	$(GOBIN)/msgp -file=../model/session.go -tests=false -o=../model/session_serial_gen.go
+	$(GOBIN)/msgp -file=./model/session.go -tests=false -o=./model/session_serial_gen.go
 	@echo "$$LICENSE_HEADER" > tmp.go
-	@cat ../model/session_serial_gen.go >> tmp.go
-	@mv tmp.go ../model/session_serial_gen.go
-	$(GOBIN)/msgp -file=../model/user.go -tests=false -o=../model/user_serial_gen.go
+	@cat ./model/session_serial_gen.go >> tmp.go
+	@mv tmp.go ./model/session_serial_gen.go
+	$(GOBIN)/msgp -file=./model/user.go -tests=false -o=./model/user_serial_gen.go
 	@echo "$$LICENSE_HEADER" > tmp.go
-	@cat ../model/user_serial_gen.go >> tmp.go
-	@mv tmp.go ../model/user_serial_gen.go
-	$(GOBIN)/msgp -file=../model/team_member.go -tests=false -o=../model/team_member_serial_gen.go
+	@cat ./model/user_serial_gen.go >> tmp.go
+	@mv tmp.go ./model/user_serial_gen.go
+	$(GOBIN)/msgp -file=./model/team_member.go -tests=false -o=./model/team_member_serial_gen.go
 	@echo "$$LICENSE_HEADER" > tmp.go
-	@cat ../model/team_member_serial_gen.go >> tmp.go
-	@mv tmp.go ../model/team_member_serial_gen.go
+	@cat ./model/team_member_serial_gen.go >> tmp.go
+	@mv tmp.go ./model/team_member_serial_gen.go
 
 todo: ## Display TODO and FIXME items in the source code.
 	@! ag --ignore Makefile --ignore-dir runtime '(TODO|XXX|FIXME|"FIX ME")[: ]+'
diff --git a/server/boards/api/admin.go b/server/boards/api/admin.go
index 1c9acd73cc..cc2a277654 100644
--- a/server/boards/api/admin.go
+++ b/server/boards/api/admin.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type AdminSetPasswordData struct {
diff --git a/server/boards/api/api.go b/server/boards/api/api.go
index 063dd8fcbc..b800c84604 100644
--- a/server/boards/api/api.go
+++ b/server/boards/api/api.go
@@ -12,12 +12,12 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/app"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/app"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/api/api_test.go b/server/boards/api/api_test.go
index c8038799c1..4a31e36127 100644
--- a/server/boards/api/api_test.go
+++ b/server/boards/api/api_test.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestErrorResponse(t *testing.T) {
diff --git a/server/boards/api/archive.go b/server/boards/api/archive.go
index a8ec09d9b5..58377d9cd2 100644
--- a/server/boards/api/archive.go
+++ b/server/boards/api/archive.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/api/audit.go b/server/boards/api/audit.go
index 017b840638..766e166f58 100644
--- a/server/boards/api/audit.go
+++ b/server/boards/api/audit.go
@@ -6,8 +6,8 @@ package api
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 )
 
 // makeAuditRecord creates an audit record pre-populated with data from the request.
diff --git a/server/boards/api/auth.go b/server/boards/api/auth.go
index 3d01179db1..fb54d95d16 100644
--- a/server/boards/api/auth.go
+++ b/server/boards/api/auth.go
@@ -13,12 +13,12 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *API) registerAuthRoutes(r *mux.Router) {
diff --git a/server/boards/api/blocks.go b/server/boards/api/blocks.go
index c1b8f6a562..400ff624c1 100644
--- a/server/boards/api/blocks.go
+++ b/server/boards/api/blocks.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *API) registerBlocksRoutes(r *mux.Router) {
diff --git a/server/boards/api/boards.go b/server/boards/api/boards.go
index 038c62a35c..ee90a715fb 100644
--- a/server/boards/api/boards.go
+++ b/server/boards/api/boards.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *API) registerBoardsRoutes(r *mux.Router) {
diff --git a/server/boards/api/boards_and_blocks.go b/server/boards/api/boards_and_blocks.go
index 2ff5d6e4ca..acd1155227 100644
--- a/server/boards/api/boards_and_blocks.go
+++ b/server/boards/api/boards_and_blocks.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *API) registerBoardsAndBlocksRoutes(r *mux.Router) {
diff --git a/server/boards/api/cards.go b/server/boards/api/cards.go
index 98f74657c4..51da96cda2 100644
--- a/server/boards/api/cards.go
+++ b/server/boards/api/cards.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/api/categories.go b/server/boards/api/categories.go
index 6d21b7ed52..ef269e98ae 100644
--- a/server/boards/api/categories.go
+++ b/server/boards/api/categories.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 )
 
 func (a *API) registerCategoriesRoutes(r *mux.Router) {
diff --git a/server/boards/api/channels.go b/server/boards/api/channels.go
index 171db8ed72..e59aba7fc2 100644
--- a/server/boards/api/channels.go
+++ b/server/boards/api/channels.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *API) registerChannelsRoutes(r *mux.Router) {
diff --git a/server/boards/api/compliance.go b/server/boards/api/compliance.go
index 1c6db61bce..ac79bbf9a0 100644
--- a/server/boards/api/compliance.go
+++ b/server/boards/api/compliance.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/api/content_blocks.go b/server/boards/api/content_blocks.go
index d595958deb..18a1fd3663 100644
--- a/server/boards/api/content_blocks.go
+++ b/server/boards/api/content_blocks.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 )
 
 func (a *API) registerContentBlocksRoutes(r *mux.Router) {
diff --git a/server/boards/api/files.go b/server/boards/api/files.go
index 4a7eb5e6e7..2ca2102863 100644
--- a/server/boards/api/files.go
+++ b/server/boards/api/files.go
@@ -11,17 +11,17 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/app"
+	"github.com/mattermost/mattermost-server/server/v8/boards/app"
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/web"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/web"
 )
 
 // FileUploadResponse is the response to a file upload
diff --git a/server/boards/api/insights.go b/server/boards/api/insights.go
index 1553d13d8a..839b7c31c8 100644
--- a/server/boards/api/insights.go
+++ b/server/boards/api/insights.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *API) registerInsightsRoutes(r *mux.Router) {
diff --git a/server/boards/api/limits.go b/server/boards/api/limits.go
index 650505b6c0..bf08184990 100644
--- a/server/boards/api/limits.go
+++ b/server/boards/api/limits.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func (a *API) registerLimitsRoutes(r *mux.Router) {
diff --git a/server/boards/api/members.go b/server/boards/api/members.go
index 5aa0165075..353fb750b7 100644
--- a/server/boards/api/members.go
+++ b/server/boards/api/members.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *API) registerMembersRoutes(r *mux.Router) {
diff --git a/server/boards/api/onboarding.go b/server/boards/api/onboarding.go
index 48016f073e..4e96e9ecc6 100644
--- a/server/boards/api/onboarding.go
+++ b/server/boards/api/onboarding.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func (a *API) registerOnboardingRoutes(r *mux.Router) {
diff --git a/server/boards/api/search.go b/server/boards/api/search.go
index d617acc559..ee5f052591 100644
--- a/server/boards/api/search.go
+++ b/server/boards/api/search.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *API) registerSearchRoutes(r *mux.Router) {
diff --git a/server/boards/api/sharing.go b/server/boards/api/sharing.go
index 32cb30c22e..42bc405b81 100644
--- a/server/boards/api/sharing.go
+++ b/server/boards/api/sharing.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var ErrTurningOnSharing = errors.New("turning on sharing for board failed, see log for details")
diff --git a/server/boards/api/statistics.go b/server/boards/api/statistics.go
index ec019e4d29..b73cc6e801 100644
--- a/server/boards/api/statistics.go
+++ b/server/boards/api/statistics.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/gorilla/mux"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *API) registerStatisticsRoutes(r *mux.Router) {
diff --git a/server/boards/api/subscriptions.go b/server/boards/api/subscriptions.go
index 8ac1a59b9a..e8542334cd 100644
--- a/server/boards/api/subscriptions.go
+++ b/server/boards/api/subscriptions.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *API) registerSubscriptionsRoutes(r *mux.Router) {
diff --git a/server/boards/api/system_test.go b/server/boards/api/system_test.go
index 5b43b776e1..660db2f853 100644
--- a/server/boards/api/system_test.go
+++ b/server/boards/api/system_test.go
@@ -10,9 +10,9 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/app"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/boards/app"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestHello(t *testing.T) {
diff --git a/server/boards/api/teams.go b/server/boards/api/teams.go
index 640fbdff5a..9a93ec1dd7 100644
--- a/server/boards/api/teams.go
+++ b/server/boards/api/teams.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func (a *API) registerTeamsRoutes(r *mux.Router) {
diff --git a/server/boards/api/templates.go b/server/boards/api/templates.go
index 8ed915336e..ad3212e068 100644
--- a/server/boards/api/templates.go
+++ b/server/boards/api/templates.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *API) registerTemplatesRoutes(r *mux.Router) {
diff --git a/server/boards/api/users.go b/server/boards/api/users.go
index 3e1876b8bf..26e824afca 100644
--- a/server/boards/api/users.go
+++ b/server/boards/api/users.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func (a *API) registerUsersRoutes(r *mux.Router) {
diff --git a/server/boards/app/app.go b/server/boards/app/app.go
index b7a93adcf3..1e7ba4caea 100644
--- a/server/boards/app/app.go
+++ b/server/boards/app/app.go
@@ -8,19 +8,19 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/metrics"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/webhook"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
-	"github.com/mattermost/mattermost-server/v6/server/boards/ws"
+	"github.com/mattermost/mattermost-server/server/v8/boards/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/metrics"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/webhook"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/app/app_test.go b/server/boards/app/app_test.go
index e24dfd3b48..a938dfd1df 100644
--- a/server/boards/app/app_test.go
+++ b/server/boards/app/app_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
 )
 
 func TestSetConfig(t *testing.T) {
diff --git a/server/boards/app/auth.go b/server/boards/app/auth.go
index 6648c2f164..e05efa6747 100644
--- a/server/boards/app/auth.go
+++ b/server/boards/app/auth.go
@@ -4,11 +4,11 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/pkg/errors"
 )
diff --git a/server/boards/app/auth_test.go b/server/boards/app/auth_test.go
index 7e2d40db79..6f3093139a 100644
--- a/server/boards/app/auth_test.go
+++ b/server/boards/app/auth_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 var mockUser = &model.User{
diff --git a/server/boards/app/blocks.go b/server/boards/app/blocks.go
index 8db5ad5990..41de8d5736 100644
--- a/server/boards/app/blocks.go
+++ b/server/boards/app/blocks.go
@@ -9,11 +9,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var ErrBlocksFromMultipleBoards = errors.New("the block set contain blocks from multiple boards")
diff --git a/server/boards/app/blocks_test.go b/server/boards/app/blocks_test.go
index a810b064d5..e19ebdae66 100644
--- a/server/boards/app/blocks_test.go
+++ b/server/boards/app/blocks_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 type blockError struct {
diff --git a/server/boards/app/boards.go b/server/boards/app/boards.go
index b383164e76..ff81e81bff 100644
--- a/server/boards/app/boards.go
+++ b/server/boards/app/boards.go
@@ -7,11 +7,11 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var (
diff --git a/server/boards/app/boards_and_blocks.go b/server/boards/app/boards_and_blocks.go
index 8a37e980aa..d16188a759 100644
--- a/server/boards/app/boards_and_blocks.go
+++ b/server/boards/app/boards_and_blocks.go
@@ -4,10 +4,10 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) CreateBoardsAndBlocks(bab *model.BoardsAndBlocks, userID string, addMember bool) (*model.BoardsAndBlocks, error) {
diff --git a/server/boards/app/boards_test.go b/server/boards/app/boards_test.go
index 9ea4c4b59d..be672c418d 100644
--- a/server/boards/app/boards_test.go
+++ b/server/boards/app/boards_test.go
@@ -6,14 +6,14 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/assert"
 
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func TestAddMemberToBoard(t *testing.T) {
diff --git a/server/boards/app/cards.go b/server/boards/app/cards.go
index 23b6c97b77..dea4ed88c7 100644
--- a/server/boards/app/cards.go
+++ b/server/boards/app/cards.go
@@ -6,8 +6,8 @@ package app
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func (a *App) CreateCard(card *model.Card, boardID string, userID string, disableNotify bool) (*model.Card, error) {
diff --git a/server/boards/app/cards_test.go b/server/boards/app/cards_test.go
index 81a52fbae4..d1d4b76059 100644
--- a/server/boards/app/cards_test.go
+++ b/server/boards/app/cards_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func TestCreateCard(t *testing.T) {
diff --git a/server/boards/app/category.go b/server/boards/app/category.go
index 486b7811d8..ce48580d42 100644
--- a/server/boards/app/category.go
+++ b/server/boards/app/category.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 var errCategoryNotFound = errors.New("category ID specified in input does not exist for user")
diff --git a/server/boards/app/category_boards.go b/server/boards/app/category_boards.go
index 264f48b56c..eb142dea7e 100644
--- a/server/boards/app/category_boards.go
+++ b/server/boards/app/category_boards.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 const defaultCategoryBoards = "Boards"
diff --git a/server/boards/app/category_boards_test.go b/server/boards/app/category_boards_test.go
index 93b56df8c6..a158e62292 100644
--- a/server/boards/app/category_boards_test.go
+++ b/server/boards/app/category_boards_test.go
@@ -6,11 +6,11 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func TestGetUserCategoryBoards(t *testing.T) {
diff --git a/server/boards/app/category_test.go b/server/boards/app/category_test.go
index 3b31e674b1..63e250d2bf 100644
--- a/server/boards/app/category_test.go
+++ b/server/boards/app/category_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func TestCreateCategory(t *testing.T) {
diff --git a/server/boards/app/clientConfig.go b/server/boards/app/clientConfig.go
index 7b806d3fde..5814cbc806 100644
--- a/server/boards/app/clientConfig.go
+++ b/server/boards/app/clientConfig.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func (a *App) GetClientConfig() *model.ClientConfig {
diff --git a/server/boards/app/clientConfig_test.go b/server/boards/app/clientConfig_test.go
index 3d43f4c9b1..6ec12fb50d 100644
--- a/server/boards/app/clientConfig_test.go
+++ b/server/boards/app/clientConfig_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
 )
 
 func TestGetClientConfig(t *testing.T) {
diff --git a/server/boards/app/cloud.go b/server/boards/app/cloud.go
index 4dc1b3af5f..8667856706 100644
--- a/server/boards/app/cloud.go
+++ b/server/boards/app/cloud.go
@@ -7,12 +7,12 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 var ErrNilPluginAPI = errors.New("server not running in plugin mode")
diff --git a/server/boards/app/cloud_test.go b/server/boards/app/cloud_test.go
index ee3b2d1cfb..5c0b7f7357 100644
--- a/server/boards/app/cloud_test.go
+++ b/server/boards/app/cloud_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	mockservicesapi "github.com/mattermost/mattermost-server/v6/server/boards/model/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks"
 )
 
 func TestIsCloud(t *testing.T) {
diff --git a/server/boards/app/compliance.go b/server/boards/app/compliance.go
index 205fca182c..f84c647bc4 100644
--- a/server/boards/app/compliance.go
+++ b/server/boards/app/compliance.go
@@ -3,7 +3,7 @@
 
 package app
 
-import "github.com/mattermost/mattermost-server/v6/server/boards/model"
+import "github.com/mattermost/mattermost-server/server/v8/boards/model"
 
 func (a *App) GetBoardsForCompliance(opts model.QueryBoardsForComplianceOptions) ([]*model.Board, bool, error) {
 	return a.store.GetBoardsForCompliance(opts)
diff --git a/server/boards/app/content_blocks.go b/server/boards/app/content_blocks.go
index fc6e77c6ca..b5711bb9bf 100644
--- a/server/boards/app/content_blocks.go
+++ b/server/boards/app/content_blocks.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func (a *App) MoveContentBlock(block *model.Block, dstBlock *model.Block, where string, userID string) error {
diff --git a/server/boards/app/content_blocks_test.go b/server/boards/app/content_blocks_test.go
index ce603e363b..8447eb3311 100644
--- a/server/boards/app/content_blocks_test.go
+++ b/server/boards/app/content_blocks_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 type contentOrderMatcher struct {
diff --git a/server/boards/app/export.go b/server/boards/app/export.go
index 60af732727..88cc95ab86 100644
--- a/server/boards/app/export.go
+++ b/server/boards/app/export.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var (
diff --git a/server/boards/app/files.go b/server/boards/app/files.go
index 97f3eda25c..9ca07ef323 100644
--- a/server/boards/app/files.go
+++ b/server/boards/app/files.go
@@ -10,12 +10,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const emptyString = "empty"
diff --git a/server/boards/app/files_test.go b/server/boards/app/files_test.go
index fc6a363da5..229712896b 100644
--- a/server/boards/app/files_test.go
+++ b/server/boards/app/files_test.go
@@ -15,10 +15,10 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore/mocks"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 const (
diff --git a/server/boards/app/helper_test.go b/server/boards/app/helper_test.go
index 75df2aa843..d337592a79 100644
--- a/server/boards/app/helper_test.go
+++ b/server/boards/app/helper_test.go
@@ -7,18 +7,18 @@ import (
 
 	"github.com/golang/mock/gomock"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/metrics"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions"
-	mmpermissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions/mocks"
-	permissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/mockstore"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/webhook"
-	"github.com/mattermost/mattermost-server/v6/server/boards/ws"
+	"github.com/mattermost/mattermost-server/server/v8/boards/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/metrics"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions"
+	mmpermissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions/mocks"
+	permissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/webhook"
+	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type TestHelper struct {
diff --git a/server/boards/app/import.go b/server/boards/app/import.go
index 7b4d5a1607..7f694e2717 100644
--- a/server/boards/app/import.go
+++ b/server/boards/app/import.go
@@ -16,10 +16,10 @@ import (
 
 	"github.com/krolaw/zipstream"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/app/import_test.go b/server/boards/app/import_test.go
index 2b4f7342c5..89d73335bf 100644
--- a/server/boards/app/import_test.go
+++ b/server/boards/app/import_test.go
@@ -7,12 +7,12 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func TestApp_ImportArchive(t *testing.T) {
diff --git a/server/boards/app/initialize.go b/server/boards/app/initialize.go
index 408c00bcac..0e63a3057f 100644
--- a/server/boards/app/initialize.go
+++ b/server/boards/app/initialize.go
@@ -6,7 +6,7 @@ package app
 import (
 	"context"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // initialize is called when the App is first created.
diff --git a/server/boards/app/insights.go b/server/boards/app/insights.go
index 2cc319a94d..b14c155cf9 100644
--- a/server/boards/app/insights.go
+++ b/server/boards/app/insights.go
@@ -6,8 +6,8 @@ package app
 import (
 	"github.com/pkg/errors"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetTeamBoardsInsights(userID string, teamID string, opts *mm_model.InsightsOpts) (*model.BoardInsightsList, error) {
diff --git a/server/boards/app/insights_test.go b/server/boards/app/insights_test.go
index fcd94a0a5f..ff87b31d7e 100644
--- a/server/boards/app/insights_test.go
+++ b/server/boards/app/insights_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var mockInsightsBoards = []*model.Board{
diff --git a/server/boards/app/onboarding.go b/server/boards/app/onboarding.go
index 4e4ea91999..b30b0d5f0f 100644
--- a/server/boards/app/onboarding.go
+++ b/server/boards/app/onboarding.go
@@ -6,7 +6,7 @@ package app
 import (
 	"errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 const (
diff --git a/server/boards/app/onboarding_test.go b/server/boards/app/onboarding_test.go
index a93b0ec034..97e7eef529 100644
--- a/server/boards/app/onboarding_test.go
+++ b/server/boards/app/onboarding_test.go
@@ -6,11 +6,11 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 const (
diff --git a/server/boards/app/permissions.go b/server/boards/app/permissions.go
index 0d340e3f0c..a1d7da51dd 100644
--- a/server/boards/app/permissions.go
+++ b/server/boards/app/permissions.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) HasPermissionToBoard(userID, boardID string, permission *mm_model.Permission) bool {
diff --git a/server/boards/app/server_metadata.go b/server/boards/app/server_metadata.go
index 1082057828..28a2a44bca 100644
--- a/server/boards/app/server_metadata.go
+++ b/server/boards/app/server_metadata.go
@@ -6,7 +6,7 @@ package app
 import (
 	"runtime"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 type ServerMetadata struct {
diff --git a/server/boards/app/server_metadata_test.go b/server/boards/app/server_metadata_test.go
index 08eab2cb82..76991bac20 100644
--- a/server/boards/app/server_metadata_test.go
+++ b/server/boards/app/server_metadata_test.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func TestGetServerMetadata(t *testing.T) {
diff --git a/server/boards/app/sharing.go b/server/boards/app/sharing.go
index ab73b41d6d..3dc7ede811 100644
--- a/server/boards/app/sharing.go
+++ b/server/boards/app/sharing.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func (a *App) GetSharing(boardID string) (*model.Sharing, error) {
diff --git a/server/boards/app/sharing_test.go b/server/boards/app/sharing_test.go
index ecda3b62b8..ebf6fea176 100644
--- a/server/boards/app/sharing_test.go
+++ b/server/boards/app/sharing_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func TestGetSharing(t *testing.T) {
diff --git a/server/boards/app/subscriptions.go b/server/boards/app/subscriptions.go
index c25fc436de..26bab3214b 100644
--- a/server/boards/app/subscriptions.go
+++ b/server/boards/app/subscriptions.go
@@ -4,10 +4,10 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) CreateSubscription(sub *model.Subscription) (*model.Subscription, error) {
diff --git a/server/boards/app/teams.go b/server/boards/app/teams.go
index 114a45e6df..83c998ee34 100644
--- a/server/boards/app/teams.go
+++ b/server/boards/app/teams.go
@@ -4,10 +4,10 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) GetRootTeam() (*model.Team, error) {
diff --git a/server/boards/app/teams_test.go b/server/boards/app/teams_test.go
index 48911f4d11..e418c1968a 100644
--- a/server/boards/app/teams_test.go
+++ b/server/boards/app/teams_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 var errInvalidTeam = errors.New("invalid team id")
diff --git a/server/boards/app/templates.go b/server/boards/app/templates.go
index 9cd0b1d1bc..0f17d3e08e 100644
--- a/server/boards/app/templates.go
+++ b/server/boards/app/templates.go
@@ -8,10 +8,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/assets"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/assets"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/app/templates_test.go b/server/boards/app/templates_test.go
index dee1e08ece..bb1eb9bd3a 100644
--- a/server/boards/app/templates_test.go
+++ b/server/boards/app/templates_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestApp_initializeTemplates(t *testing.T) {
diff --git a/server/boards/app/user.go b/server/boards/app/user.go
index 31ff2ee9cf..c798e7a333 100644
--- a/server/boards/app/user.go
+++ b/server/boards/app/user.go
@@ -4,8 +4,8 @@
 package app
 
 import (
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetTeamUsers(teamID string, asGuestID string) ([]*model.User, error) {
diff --git a/server/boards/app/user_test.go b/server/boards/app/user_test.go
index f9cc9890d3..e1aa8ee597 100644
--- a/server/boards/app/user_test.go
+++ b/server/boards/app/user_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSearchUsers(t *testing.T) {
diff --git a/server/boards/auth/auth.go b/server/boards/auth/auth.go
index 0e90c8ecbd..8e93c0cd44 100644
--- a/server/boards/auth/auth.go
+++ b/server/boards/auth/auth.go
@@ -7,11 +7,11 @@ package auth
 import (
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 type AuthInterface interface {
diff --git a/server/boards/auth/auth_test.go b/server/boards/auth/auth_test.go
index 99afcc9196..65491d37ca 100644
--- a/server/boards/auth/auth_test.go
+++ b/server/boards/auth/auth_test.go
@@ -10,14 +10,14 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/localpermissions"
-	mockpermissions "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/mockstore"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/localpermissions"
+	mockpermissions "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type TestHelper struct {
diff --git a/server/boards/auth/mocks/mockauth_interface.go b/server/boards/auth/mocks/mockauth_interface.go
index 082c22bc2e..45d151310d 100644
--- a/server/boards/auth/mocks/mockauth_interface.go
+++ b/server/boards/auth/mocks/mockauth_interface.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/boards/auth (interfaces: AuthInterface)
+// Source: github.com/mattermost/mattermost-server/server/v8/boards/auth (interfaces: AuthInterface)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -11,7 +11,7 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	model "github.com/mattermost/mattermost-server/v6/server/boards/model"
+	model "github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 // MockAuthInterface is a mock of AuthInterface interface.
diff --git a/server/boards/client/client.go b/server/boards/client/client.go
index d803e2e444..ea33a38c2b 100644
--- a/server/boards/client/client.go
+++ b/server/boards/client/client.go
@@ -12,10 +12,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/api"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/api"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/boards/integrationtests/blocks_test.go b/server/boards/integrationtests/blocks_test.go
index 8960129a04..16365fd034 100644
--- a/server/boards/integrationtests/blocks_test.go
+++ b/server/boards/integrationtests/blocks_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/integrationtests/board_test.go b/server/boards/integrationtests/board_test.go
index 0088e8433a..3f48b8f790 100644
--- a/server/boards/integrationtests/board_test.go
+++ b/server/boards/integrationtests/board_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/client"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/client"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/integrationtests/boards_and_blocks_test.go b/server/boards/integrationtests/boards_and_blocks_test.go
index 9ae48366f8..965b3f320f 100644
--- a/server/boards/integrationtests/boards_and_blocks_test.go
+++ b/server/boards/integrationtests/boards_and_blocks_test.go
@@ -6,7 +6,7 @@ package integrationtests
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/integrationtests/boardsapp_test.go b/server/boards/integrationtests/boardsapp_test.go
index f327520a7d..8faf4156d6 100644
--- a/server/boards/integrationtests/boardsapp_test.go
+++ b/server/boards/integrationtests/boardsapp_test.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/server"
+	"github.com/mattermost/mattermost-server/server/v8/boards/server"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestSetConfiguration(t *testing.T) {
diff --git a/server/boards/integrationtests/cards_test.go b/server/boards/integrationtests/cards_test.go
index aba146823a..e2290d46aa 100644
--- a/server/boards/integrationtests/cards_test.go
+++ b/server/boards/integrationtests/cards_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func TestCreateCard(t *testing.T) {
diff --git a/server/boards/integrationtests/clienttestlib.go b/server/boards/integrationtests/clienttestlib.go
index 10997b0b18..3c7f0ab003 100644
--- a/server/boards/integrationtests/clienttestlib.go
+++ b/server/boards/integrationtests/clienttestlib.go
@@ -10,19 +10,19 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/client"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/server"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/localpermissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/client"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/server"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/localpermissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/integrationtests/compliance_test.go b/server/boards/integrationtests/compliance_test.go
index 64ac6bb594..7ed89c3c7e 100644
--- a/server/boards/integrationtests/compliance_test.go
+++ b/server/boards/integrationtests/compliance_test.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 var (
diff --git a/server/boards/integrationtests/configuration_test.go b/server/boards/integrationtests/configuration_test.go
index 349e6df8a5..fd49036e4a 100644
--- a/server/boards/integrationtests/configuration_test.go
+++ b/server/boards/integrationtests/configuration_test.go
@@ -8,14 +8,14 @@ import (
 
 	"github.com/golang/mock/gomock"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/server"
-	"github.com/mattermost/mattermost-server/v6/server/boards/ws"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/server"
+	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
-	mockservicesapi "github.com/mattermost/mattermost-server/v6/server/boards/model/mocks"
+	mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/server/boards/integrationtests/content_blocks_test.go b/server/boards/integrationtests/content_blocks_test.go
index 8455ae5f4d..461bbd8da4 100644
--- a/server/boards/integrationtests/content_blocks_test.go
+++ b/server/boards/integrationtests/content_blocks_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/integrationtests/export_test.go b/server/boards/integrationtests/export_test.go
index da96ebf301..f896e83632 100644
--- a/server/boards/integrationtests/export_test.go
+++ b/server/boards/integrationtests/export_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func TestExportBoard(t *testing.T) {
diff --git a/server/boards/integrationtests/file_test.go b/server/boards/integrationtests/file_test.go
index fc66cf4c2f..f0598ce83e 100644
--- a/server/boards/integrationtests/file_test.go
+++ b/server/boards/integrationtests/file_test.go
@@ -7,7 +7,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/integrationtests/permissions_test.go b/server/boards/integrationtests/permissions_test.go
index e86f1d1c64..936e15bfea 100644
--- a/server/boards/integrationtests/permissions_test.go
+++ b/server/boards/integrationtests/permissions_test.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/client"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/client"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 type Clients struct {
diff --git a/server/boards/integrationtests/pluginteststore.go b/server/boards/integrationtests/pluginteststore.go
index 06e8f92b12..0f289252de 100644
--- a/server/boards/integrationtests/pluginteststore.go
+++ b/server/boards/integrationtests/pluginteststore.go
@@ -9,10 +9,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var errTestStore = errors.New("plugin test store error")
diff --git a/server/boards/integrationtests/sharing_test.go b/server/boards/integrationtests/sharing_test.go
index 44719679de..982f88c74f 100644
--- a/server/boards/integrationtests/sharing_test.go
+++ b/server/boards/integrationtests/sharing_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func TestSharing(t *testing.T) {
diff --git a/server/boards/integrationtests/sidebar_test.go b/server/boards/integrationtests/sidebar_test.go
index a2c3aed354..d62c3b48a3 100644
--- a/server/boards/integrationtests/sidebar_test.go
+++ b/server/boards/integrationtests/sidebar_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func TestSidebar(t *testing.T) {
diff --git a/server/boards/integrationtests/statistics_test.go b/server/boards/integrationtests/statistics_test.go
index 5123183b70..cb0e44b456 100644
--- a/server/boards/integrationtests/statistics_test.go
+++ b/server/boards/integrationtests/statistics_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/client"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/client"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func TestStatisticsLocalMode(t *testing.T) {
diff --git a/server/boards/integrationtests/subscriptions_test.go b/server/boards/integrationtests/subscriptions_test.go
index 0f4a09ab3a..cfd75a7019 100644
--- a/server/boards/integrationtests/subscriptions_test.go
+++ b/server/boards/integrationtests/subscriptions_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/client"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/client"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func createTestSubscriptions(client *client.Client, num int) ([]*model.Subscription, string, error) {
diff --git a/server/boards/integrationtests/teststore.go b/server/boards/integrationtests/teststore.go
index 134078c5da..bc2bed79d3 100644
--- a/server/boards/integrationtests/teststore.go
+++ b/server/boards/integrationtests/teststore.go
@@ -4,9 +4,9 @@
 package integrationtests
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type TestStore struct {
diff --git a/server/boards/integrationtests/user_test.go b/server/boards/integrationtests/user_test.go
index af494acd47..836bbbd0c5 100644
--- a/server/boards/integrationtests/user_test.go
+++ b/server/boards/integrationtests/user_test.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 const (
diff --git a/server/boards/model/auth.go b/server/boards/model/auth.go
index a667a56e63..f63acab92d 100644
--- a/server/boards/model/auth.go
+++ b/server/boards/model/auth.go
@@ -9,7 +9,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/auth"
 )
 
 const (
diff --git a/server/boards/model/block.go b/server/boards/model/block.go
index 02b633e840..972e564b0a 100644
--- a/server/boards/model/block.go
+++ b/server/boards/model/block.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 )
 
 // Block is the basic data unit
diff --git a/server/boards/model/block_test.go b/server/boards/model/block_test.go
index 05cede4395..f35239ac0a 100644
--- a/server/boards/model/block_test.go
+++ b/server/boards/model/block_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/model/blockid.go b/server/boards/model/blockid.go
index 521779a6ed..d0309a9021 100644
--- a/server/boards/model/blockid.go
+++ b/server/boards/model/blockid.go
@@ -6,9 +6,9 @@ package model
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // GenerateBlockIDs generates new IDs for all the blocks of the list,
diff --git a/server/boards/model/blocktype.go b/server/boards/model/blocktype.go
index 7fb868e700..6c1868898d 100644
--- a/server/boards/model/blocktype.go
+++ b/server/boards/model/blocktype.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 // BlockType represents a block type.
diff --git a/server/boards/model/board_insights.go b/server/boards/model/board_insights.go
index cd34ddc919..74fe283901 100644
--- a/server/boards/model/board_insights.go
+++ b/server/boards/model/board_insights.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"io"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // BoardInsightsList is a response type with pagination support.
diff --git a/server/boards/model/boards_and_blocks.go b/server/boards/model/boards_and_blocks.go
index 3ebe548d2b..159e091acf 100644
--- a/server/boards/model/boards_and_blocks.go
+++ b/server/boards/model/boards_and_blocks.go
@@ -9,9 +9,9 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var ErrNoBoardsInBoardsAndBlocks = errors.New("at least one board is required")
diff --git a/server/boards/model/boards_and_blocks_test.go b/server/boards/model/boards_and_blocks_test.go
index 0c6d0b0891..4c89496ae3 100644
--- a/server/boards/model/boards_and_blocks_test.go
+++ b/server/boards/model/boards_and_blocks_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestIsValidBoardsAndBlocks(t *testing.T) {
diff --git a/server/boards/model/card.go b/server/boards/model/card.go
index 377672dea9..f27c59af7e 100644
--- a/server/boards/model/card.go
+++ b/server/boards/model/card.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/rivo/uniseg"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 var ErrBoardIDMismatch = errors.New("Board IDs do not match")
diff --git a/server/boards/model/card_test.go b/server/boards/model/card_test.go
index 3274ac1e2e..96237ebfc8 100644
--- a/server/boards/model/card_test.go
+++ b/server/boards/model/card_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func TestBlock2Card(t *testing.T) {
diff --git a/server/boards/model/category.go b/server/boards/model/category.go
index ad925768ab..0d49b3b0a0 100644
--- a/server/boards/model/category.go
+++ b/server/boards/model/category.go
@@ -9,7 +9,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 const (
diff --git a/server/boards/model/error.go b/server/boards/model/error.go
index 0c1727904c..678520c87f 100644
--- a/server/boards/model/error.go
+++ b/server/boards/model/error.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"strings"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var (
diff --git a/server/boards/model/mocks/mockservicesapi.go b/server/boards/model/mocks/mockservicesapi.go
index 23da9096c7..724c0c9e28 100644
--- a/server/boards/model/mocks/mockservicesapi.go
+++ b/server/boards/model/mocks/mockservicesapi.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/boards/model (interfaces: ServicesAPI)
+// Source: github.com/mattermost/mattermost-server/server/v8/boards/model (interfaces: ServicesAPI)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -13,8 +13,8 @@ import (
 
 	gomock "github.com/golang/mock/gomock"
 	mux "github.com/gorilla/mux"
-	model "github.com/mattermost/mattermost-server/v6/model"
-	mlog "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
+	mlog "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // MockServicesAPI is a mock of ServicesAPI interface.
diff --git a/server/boards/model/mocks/propValueResolverMock.go b/server/boards/model/mocks/propValueResolverMock.go
index 6937de3c7d..0030038d46 100644
--- a/server/boards/model/mocks/propValueResolverMock.go
+++ b/server/boards/model/mocks/propValueResolverMock.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/boards/model (interfaces: PropValueResolver)
+// Source: github.com/mattermost/mattermost-server/server/v8/boards/model (interfaces: PropValueResolver)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -11,7 +11,7 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	model "github.com/mattermost/mattermost-server/v6/server/boards/model"
+	model "github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 // MockPropValueResolver is a mock of PropValueResolver interface.
diff --git a/server/boards/model/notification.go b/server/boards/model/notification.go
index 2cfc150b90..dfb2641aa4 100644
--- a/server/boards/model/notification.go
+++ b/server/boards/model/notification.go
@@ -6,7 +6,7 @@ package model
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
 )
 
 // NotificationHint provides a hint that a block has been modified and has subscribers that
diff --git a/server/boards/model/permission.go b/server/boards/model/permission.go
index 95998f4df8..544f131cfc 100644
--- a/server/boards/model/permission.go
+++ b/server/boards/model/permission.go
@@ -4,7 +4,7 @@
 package model
 
 import (
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var (
diff --git a/server/boards/model/properties.go b/server/boards/model/properties.go
index c10bd84178..c640d87d0a 100644
--- a/server/boards/model/properties.go
+++ b/server/boards/model/properties.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 var ErrInvalidBoardBlock = errors.New("invalid board block")
diff --git a/server/boards/model/properties_test.go b/server/boards/model/properties_test.go
index 0546c529b5..df24231779 100644
--- a/server/boards/model/properties_test.go
+++ b/server/boards/model/properties_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 type MockResolver struct{}
diff --git a/server/boards/model/services_api.go b/server/boards/model/services_api.go
index 6623adc80b..d1918f9217 100644
--- a/server/boards/model/services_api.go
+++ b/server/boards/model/services_api.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/gorilla/mux"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/model/util.go b/server/boards/model/util.go
index dcb2f96671..4d80a2a2e3 100644
--- a/server/boards/model/util.go
+++ b/server/boards/model/util.go
@@ -6,7 +6,7 @@ package model
 import (
 	"time"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // GetMillis is a convenience method to get milliseconds since epoch.
diff --git a/server/boards/model/version.go b/server/boards/model/version.go
index 12f5b5887b..be8a561634 100644
--- a/server/boards/model/version.go
+++ b/server/boards/model/version.go
@@ -4,7 +4,7 @@
 package model
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // This is a list of all the current versions including any patches.
diff --git a/server/boards/product/api_adapter.go b/server/boards/product/api_adapter.go
index 506c2ba91c..e0d2f1d276 100644
--- a/server/boards/product/api_adapter.go
+++ b/server/boards/product/api_adapter.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/gorilla/mux"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 // normalizeAppError returns a truly nil error if appErr is nil
diff --git a/server/boards/product/boards_product.go b/server/boards/product/boards_product.go
index 7e74c86349..9fc74101cb 100644
--- a/server/boards/product/boards_product.go
+++ b/server/boards/product/boards_product.go
@@ -7,13 +7,13 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/server"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/server"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const (
diff --git a/server/boards/product/imports/boards_imports.go b/server/boards/product/imports/boards_imports.go
index cf6081d414..e684480eaf 100644
--- a/server/boards/product/imports/boards_imports.go
+++ b/server/boards/product/imports/boards_imports.go
@@ -6,5 +6,5 @@ package imports
 import (
 	// Needed to ensure the init() method in the FocalBoard product is run.
 	// This file is copied to the mmserver imports package via makefile.
-	_ "github.com/mattermost/mattermost-server/v6/server/boards/product"
+	_ "github.com/mattermost/mattermost-server/server/v8/boards/product"
 )
diff --git a/server/boards/server/boards_service.go b/server/boards/server/boards_service.go
index a702c026a3..3eedabfc4e 100644
--- a/server/boards/server/boards_service.go
+++ b/server/boards/server/boards_service.go
@@ -8,19 +8,19 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/mattermostauthlayer"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/boards/ws"
+	"github.com/mattermost/mattermost-server/server/v8/boards/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/mattermostauthlayer"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const (
diff --git a/server/boards/server/boards_service_api.go b/server/boards/server/boards_service_api.go
index 9464a1309b..1ad34b3656 100644
--- a/server/boards/server/boards_service_api.go
+++ b/server/boards/server/boards_service_api.go
@@ -4,11 +4,11 @@
 package server
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/app"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/app"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // boardsServiceAPI provides a service API for other products such as Channels.
diff --git a/server/boards/server/boards_service_util.go b/server/boards/server/boards_service_util.go
index c1de21897e..2661d960ef 100644
--- a/server/boards/server/boards_service_util.go
+++ b/server/boards/server/boards_service_util.go
@@ -8,9 +8,9 @@ import (
 	"path"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const defaultS3Timeout = 60 * 1000 // 60 seconds
diff --git a/server/boards/server/data_retention_test.go b/server/boards/server/data_retention_test.go
index 927e6b5afa..18a731d918 100644
--- a/server/boards/server/data_retention_test.go
+++ b/server/boards/server/data_retention_test.go
@@ -11,12 +11,12 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/localpermissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/mockstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/localpermissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type TestHelperMockStore struct {
diff --git a/server/boards/server/notifications.go b/server/boards/server/notifications.go
index dba47ba45d..5f085d163d 100644
--- a/server/boards/server/notifications.go
+++ b/server/boards/server/notifications.go
@@ -7,15 +7,15 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify/notifymentions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify/notifysubscriptions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify/plugindelivery"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify/notifymentions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify/notifysubscriptions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify/plugindelivery"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type notifyBackendParams struct {
diff --git a/server/boards/server/params.go b/server/boards/server/params.go
index e5613fc349..3511620d07 100644
--- a/server/boards/server/params.go
+++ b/server/boards/server/params.go
@@ -6,14 +6,14 @@ package server
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/ws"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Params struct {
diff --git a/server/boards/server/post.go b/server/boards/server/post.go
index 755d2b70cf..fcafbcb8b5 100644
--- a/server/boards/server/post.go
+++ b/server/boards/server/post.go
@@ -9,8 +9,8 @@ import (
 	"net/url"
 	"strings"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/markdown"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown"
 )
 
 func postWithBoardsEmbed(post *mm_model.Post) *mm_model.Post {
diff --git a/server/boards/server/server.go b/server/boards/server/server.go
index d79f30129b..a66e2c3351 100644
--- a/server/boards/server/server.go
+++ b/server/boards/server/server.go
@@ -19,26 +19,26 @@ import (
 
 	"github.com/oklog/run"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/api"
-	"github.com/mattermost/mattermost-server/v6/server/boards/app"
-	"github.com/mattermost/mattermost-server/v6/server/boards/auth"
-	appModel "github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/metrics"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify/notifylogger"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/scheduler"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/telemetry"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/webhook"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
-	"github.com/mattermost/mattermost-server/v6/server/boards/web"
-	"github.com/mattermost/mattermost-server/v6/server/boards/ws"
+	"github.com/mattermost/mattermost-server/server/v8/boards/api"
+	"github.com/mattermost/mattermost-server/server/v8/boards/app"
+	"github.com/mattermost/mattermost-server/server/v8/boards/auth"
+	appModel "github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/metrics"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify/notifylogger"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/scheduler"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/telemetry"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/webhook"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/web"
+	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/services/audit/audit.go b/server/boards/services/audit/audit.go
index a965c977d8..d11dd0915e 100644
--- a/server/boards/services/audit/audit.go
+++ b/server/boards/services/audit/audit.go
@@ -4,7 +4,7 @@
 package audit
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/services/audit/record.go b/server/boards/services/audit/record.go
index 0987bde849..60b55b1293 100644
--- a/server/boards/services/audit/record.go
+++ b/server/boards/services/audit/record.go
@@ -3,7 +3,7 @@
 
 package audit
 
-import "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+import "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 // Meta represents metadata that can be added to a audit record as name/value pairs.
 type Meta struct {
diff --git a/server/boards/services/metrics/service.go b/server/boards/services/metrics/service.go
index bc3a97eb44..1ffcc7f9d9 100644
--- a/server/boards/services/metrics/service.go
+++ b/server/boards/services/metrics/service.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // Service prometheus to run the server.
diff --git a/server/boards/services/notify/notifylogger/logger_backend.go b/server/boards/services/notify/notifylogger/logger_backend.go
index 52ff8b6bd9..8370988498 100644
--- a/server/boards/services/notify/notifylogger/logger_backend.go
+++ b/server/boards/services/notify/notifylogger/logger_backend.go
@@ -4,9 +4,9 @@
 package notifylogger
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/services/notify/notifymentions/app_api.go b/server/boards/services/notify/notifymentions/app_api.go
index 1110b54458..ab66fb700f 100644
--- a/server/boards/services/notify/notifymentions/app_api.go
+++ b/server/boards/services/notify/notifymentions/app_api.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 package notifymentions
 
-import "github.com/mattermost/mattermost-server/v6/server/boards/model"
+import "github.com/mattermost/mattermost-server/server/v8/boards/model"
 
 type AppAPI interface {
 	GetMemberForBoard(boardID, userID string) (*model.BoardMember, error)
diff --git a/server/boards/services/notify/notifymentions/delivery.go b/server/boards/services/notify/notifymentions/delivery.go
index 7e097feb5c..499b582483 100644
--- a/server/boards/services/notify/notifymentions/delivery.go
+++ b/server/boards/services/notify/notifymentions/delivery.go
@@ -4,9 +4,9 @@
 package notifymentions
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // MentionDelivery provides an interface for delivering @mention notifications to other systems, such as
diff --git a/server/boards/services/notify/notifymentions/mentions.go b/server/boards/services/notify/notifymentions/mentions.go
index f6e60d95db..00e4a1835d 100644
--- a/server/boards/services/notify/notifymentions/mentions.go
+++ b/server/boards/services/notify/notifymentions/mentions.go
@@ -7,9 +7,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var atMentionRegexp = regexp.MustCompile(`\B@[[:alnum:]][[:alnum:]\.\-_:]*`)
diff --git a/server/boards/services/notify/notifymentions/mentions_backend.go b/server/boards/services/notify/notifymentions/mentions_backend.go
index fdb13b5342..9d0c84190e 100644
--- a/server/boards/services/notify/notifymentions/mentions_backend.go
+++ b/server/boards/services/notify/notifymentions/mentions_backend.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/services/notify/notifymentions/mentions_test.go b/server/boards/services/notify/notifymentions/mentions_test.go
index 758e116854..1529c7bc64 100644
--- a/server/boards/services/notify/notifymentions/mentions_test.go
+++ b/server/boards/services/notify/notifymentions/mentions_test.go
@@ -7,9 +7,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func Test_extractMentions(t *testing.T) {
diff --git a/server/boards/services/notify/notifysubscriptions/app_api.go b/server/boards/services/notify/notifysubscriptions/app_api.go
index b2b9333f73..cfbee71019 100644
--- a/server/boards/services/notify/notifysubscriptions/app_api.go
+++ b/server/boards/services/notify/notifysubscriptions/app_api.go
@@ -6,7 +6,7 @@ package notifysubscriptions
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 type AppAPI interface {
diff --git a/server/boards/services/notify/notifysubscriptions/delivery.go b/server/boards/services/notify/notifysubscriptions/delivery.go
index 449616efb7..59f0a82382 100644
--- a/server/boards/services/notify/notifysubscriptions/delivery.go
+++ b/server/boards/services/notify/notifysubscriptions/delivery.go
@@ -4,9 +4,9 @@
 package notifysubscriptions
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // SubscriptionDelivery provides an interface for delivering subscription notifications to other systems, such as
diff --git a/server/boards/services/notify/notifysubscriptions/diff.go b/server/boards/services/notify/notifysubscriptions/diff.go
index ede57d2949..1e36359799 100644
--- a/server/boards/services/notify/notifysubscriptions/diff.go
+++ b/server/boards/services/notify/notifysubscriptions/diff.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // Diff represents a difference between two versions of a block.
diff --git a/server/boards/services/notify/notifysubscriptions/diff2markdown.go b/server/boards/services/notify/notifysubscriptions/diff2markdown.go
index 4d7bc287f0..dfa0de1c03 100644
--- a/server/boards/services/notify/notifysubscriptions/diff2markdown.go
+++ b/server/boards/services/notify/notifysubscriptions/diff2markdown.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/sergi/go-diff/diffmatchpatch"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func generateMarkdownDiff(oldText string, newText string, logger mlog.LoggerIFace) string {
diff --git a/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go b/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go
index e94e96614a..fd8904774f 100644
--- a/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go
+++ b/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/services/notify/notifysubscriptions/notifier.go b/server/boards/services/notify/notifysubscriptions/notifier.go
index 22a0f1dde2..c2acb78336 100644
--- a/server/boards/services/notify/notifysubscriptions/notifier.go
+++ b/server/boards/services/notify/notifysubscriptions/notifier.go
@@ -11,11 +11,11 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go b/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go
index 881e9160cf..af020bea6b 100644
--- a/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go
+++ b/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go
@@ -11,11 +11,11 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/services/notify/notifysubscriptions/util.go b/server/boards/services/notify/notifysubscriptions/util.go
index 5494ceca9f..04f5b77433 100644
--- a/server/boards/services/notify/notifysubscriptions/util.go
+++ b/server/boards/services/notify/notifysubscriptions/util.go
@@ -6,7 +6,7 @@ package notifysubscriptions
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func getBoardDescription(board *model.Block) string {
diff --git a/server/boards/services/notify/plugindelivery/mention_deliver.go b/server/boards/services/notify/plugindelivery/mention_deliver.go
index 330b0b23c3..dbb12e3c3b 100644
--- a/server/boards/services/notify/plugindelivery/mention_deliver.go
+++ b/server/boards/services/notify/plugindelivery/mention_deliver.go
@@ -6,10 +6,10 @@ package plugindelivery
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // MentionDeliver notifies a user they have been mentioned in a blockv ia the plugin API.
diff --git a/server/boards/services/notify/plugindelivery/message.go b/server/boards/services/notify/plugindelivery/message.go
index 26983bb644..ebaa0f7020 100644
--- a/server/boards/services/notify/plugindelivery/message.go
+++ b/server/boards/services/notify/plugindelivery/message.go
@@ -6,7 +6,7 @@ package plugindelivery
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 const (
diff --git a/server/boards/services/notify/plugindelivery/plugin_delivery.go b/server/boards/services/notify/plugindelivery/plugin_delivery.go
index aa01ec3cb9..890118b3c9 100644
--- a/server/boards/services/notify/plugindelivery/plugin_delivery.go
+++ b/server/boards/services/notify/plugindelivery/plugin_delivery.go
@@ -4,7 +4,7 @@
 package plugindelivery
 
 import (
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type servicesAPI interface {
diff --git a/server/boards/services/notify/plugindelivery/subscription_deliver.go b/server/boards/services/notify/plugindelivery/subscription_deliver.go
index 21fc3d7db1..a9353eb442 100644
--- a/server/boards/services/notify/plugindelivery/subscription_deliver.go
+++ b/server/boards/services/notify/plugindelivery/subscription_deliver.go
@@ -7,9 +7,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var (
diff --git a/server/boards/services/notify/plugindelivery/user.go b/server/boards/services/notify/plugindelivery/user.go
index e7f16931ab..c705a39107 100644
--- a/server/boards/services/notify/plugindelivery/user.go
+++ b/server/boards/services/notify/plugindelivery/user.go
@@ -6,9 +6,9 @@ package plugindelivery
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/boards/services/notify/plugindelivery/user_test.go b/server/boards/services/notify/plugindelivery/user_test.go
index 4702988a87..1c5aeccf4c 100644
--- a/server/boards/services/notify/plugindelivery/user_test.go
+++ b/server/boards/services/notify/plugindelivery/user_test.go
@@ -7,9 +7,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var (
diff --git a/server/boards/services/notify/service.go b/server/boards/services/notify/service.go
index 3814920497..308b2e7459 100644
--- a/server/boards/services/notify/service.go
+++ b/server/boards/services/notify/service.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Action string
diff --git a/server/boards/services/permissions/localpermissions/helpers_test.go b/server/boards/services/permissions/localpermissions/helpers_test.go
index 26b0524088..13f0bfa389 100644
--- a/server/boards/services/permissions/localpermissions/helpers_test.go
+++ b/server/boards/services/permissions/localpermissions/helpers_test.go
@@ -6,11 +6,11 @@ package localpermissions
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	permissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	permissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
diff --git a/server/boards/services/permissions/localpermissions/localpermissions.go b/server/boards/services/permissions/localpermissions/localpermissions.go
index 00c76abeac..ef63b55353 100644
--- a/server/boards/services/permissions/localpermissions/localpermissions.go
+++ b/server/boards/services/permissions/localpermissions/localpermissions.go
@@ -4,11 +4,11 @@
 package localpermissions
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Service struct {
diff --git a/server/boards/services/permissions/localpermissions/localpermissions_test.go b/server/boards/services/permissions/localpermissions/localpermissions_test.go
index c141413225..8bc65bf49e 100644
--- a/server/boards/services/permissions/localpermissions/localpermissions_test.go
+++ b/server/boards/services/permissions/localpermissions/localpermissions_test.go
@@ -7,9 +7,9 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/server/boards/services/permissions/mmpermissions/helpers_test.go b/server/boards/services/permissions/mmpermissions/helpers_test.go
index 3ecfb8b93b..f8be25a1d6 100644
--- a/server/boards/services/permissions/mmpermissions/helpers_test.go
+++ b/server/boards/services/permissions/mmpermissions/helpers_test.go
@@ -6,12 +6,12 @@ package mmpermissions
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	mmpermissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions/mocks"
-	permissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mmpermissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions/mocks"
+	permissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
diff --git a/server/boards/services/permissions/mmpermissions/mmpermissions.go b/server/boards/services/permissions/mmpermissions/mmpermissions.go
index dba72213b1..671d9b10db 100644
--- a/server/boards/services/permissions/mmpermissions/mmpermissions.go
+++ b/server/boards/services/permissions/mmpermissions/mmpermissions.go
@@ -4,11 +4,11 @@
 package mmpermissions
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type APIInterface interface {
diff --git a/server/boards/services/permissions/mmpermissions/mmpermissions_test.go b/server/boards/services/permissions/mmpermissions/mmpermissions_test.go
index e2d48cf580..9e532f7b98 100644
--- a/server/boards/services/permissions/mmpermissions/mmpermissions_test.go
+++ b/server/boards/services/permissions/mmpermissions/mmpermissions_test.go
@@ -1,16 +1,16 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-//go:generate mockgen -copyright_file=../../../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost-server/v6/plugin API
+//go:generate mockgen -copyright_file=../../../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost-server/server/v8/plugin API
 package mmpermissions
 
 import (
 	"database/sql"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go b/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go
index 45cf40000b..612dd07d17 100644
--- a/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go
+++ b/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/plugin (interfaces: API)
+// Source: github.com/mattermost/mattermost-server/server/v8/plugin (interfaces: API)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -13,7 +13,7 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // MockAPI is a mock of API interface.
diff --git a/server/boards/services/permissions/mocks/mockstore.go b/server/boards/services/permissions/mocks/mockstore.go
index 3bab466231..39fe98f029 100644
--- a/server/boards/services/permissions/mocks/mockstore.go
+++ b/server/boards/services/permissions/mocks/mockstore.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/boards/services/permissions (interfaces: Store)
+// Source: github.com/mattermost/mattermost-server/server/v8/boards/services/permissions (interfaces: Store)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -11,7 +11,7 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	model "github.com/mattermost/mattermost-server/v6/server/boards/model"
+	model "github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 // MockStore is a mock of Store interface.
diff --git a/server/boards/services/permissions/permissions.go b/server/boards/services/permissions/permissions.go
index 3c8d8a94fb..2adfdd28a1 100644
--- a/server/boards/services/permissions/permissions.go
+++ b/server/boards/services/permissions/permissions.go
@@ -6,9 +6,9 @@
 package permissions
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type PermissionsService interface {
diff --git a/server/boards/services/store/generators/transactional_store.go.tmpl b/server/boards/services/store/generators/transactional_store.go.tmpl
index 517fbc1bf1..ff81becb83 100644
--- a/server/boards/services/store/generators/transactional_store.go.tmpl
+++ b/server/boards/services/store/generators/transactional_store.go.tmpl
@@ -16,10 +16,10 @@ import (
 	"context"
 	"time"
 
-    "github.com/mattermost/mattermost-server/v6/server/boards/model"
+    "github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-    "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+    "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 {{range $index, $element := .Methods}}
diff --git a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go
index e749d5d9cd..669305a076 100644
--- a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go
+++ b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go
@@ -11,15 +11,15 @@ import (
 	"net/http"
 	"strings"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var boardsBotID string
diff --git a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go
index caa6bc88c3..fed0665789 100644
--- a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go
+++ b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/golang/mock/gomock"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	mockservicesapi "github.com/mattermost/mattermost-server/v6/server/boards/model/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/mockstore/mockstore.go b/server/boards/services/store/mockstore/mockstore.go
index 5cd89f13eb..153b7aa7ca 100644
--- a/server/boards/services/store/mockstore/mockstore.go
+++ b/server/boards/services/store/mockstore/mockstore.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/boards/services/store (interfaces: Store)
+// Source: github.com/mattermost/mattermost-server/server/v8/boards/services/store (interfaces: Store)
 
 // Package mockstore is a generated GoMock package.
 package mockstore
@@ -12,8 +12,8 @@ import (
 	time "time"
 
 	gomock "github.com/golang/mock/gomock"
-	model "github.com/mattermost/mattermost-server/v6/model"
-	model0 "github.com/mattermost/mattermost-server/v6/server/boards/model"
+	model "github.com/mattermost/mattermost-server/server/v8/boards/model"
+	model0 "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // MockStore is a mock of Store interface.
@@ -83,10 +83,10 @@ func (mr *MockStoreMockRecorder) CleanUpSessions(arg0 interface{}) *gomock.Call
 }
 
 // CreateBoardsAndBlocks mocks base method.
-func (m *MockStore) CreateBoardsAndBlocks(arg0 *model0.BoardsAndBlocks, arg1 string) (*model0.BoardsAndBlocks, error) {
+func (m *MockStore) CreateBoardsAndBlocks(arg0 *model.BoardsAndBlocks, arg1 string) (*model.BoardsAndBlocks, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateBoardsAndBlocks", arg0, arg1)
-	ret0, _ := ret[0].(*model0.BoardsAndBlocks)
+	ret0, _ := ret[0].(*model.BoardsAndBlocks)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -98,11 +98,11 @@ func (mr *MockStoreMockRecorder) CreateBoardsAndBlocks(arg0, arg1 interface{}) *
 }
 
 // CreateBoardsAndBlocksWithAdmin mocks base method.
-func (m *MockStore) CreateBoardsAndBlocksWithAdmin(arg0 *model0.BoardsAndBlocks, arg1 string) (*model0.BoardsAndBlocks, []*model0.BoardMember, error) {
+func (m *MockStore) CreateBoardsAndBlocksWithAdmin(arg0 *model.BoardsAndBlocks, arg1 string) (*model.BoardsAndBlocks, []*model.BoardMember, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateBoardsAndBlocksWithAdmin", arg0, arg1)
-	ret0, _ := ret[0].(*model0.BoardsAndBlocks)
-	ret1, _ := ret[1].([]*model0.BoardMember)
+	ret0, _ := ret[0].(*model.BoardsAndBlocks)
+	ret1, _ := ret[1].([]*model.BoardMember)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
@@ -114,7 +114,7 @@ func (mr *MockStoreMockRecorder) CreateBoardsAndBlocksWithAdmin(arg0, arg1 inter
 }
 
 // CreateCategory mocks base method.
-func (m *MockStore) CreateCategory(arg0 model0.Category) error {
+func (m *MockStore) CreateCategory(arg0 model.Category) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateCategory", arg0)
 	ret0, _ := ret[0].(error)
@@ -128,7 +128,7 @@ func (mr *MockStoreMockRecorder) CreateCategory(arg0 interface{}) *gomock.Call {
 }
 
 // CreateSession mocks base method.
-func (m *MockStore) CreateSession(arg0 *model0.Session) error {
+func (m *MockStore) CreateSession(arg0 *model.Session) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateSession", arg0)
 	ret0, _ := ret[0].(error)
@@ -142,10 +142,10 @@ func (mr *MockStoreMockRecorder) CreateSession(arg0 interface{}) *gomock.Call {
 }
 
 // CreateSubscription mocks base method.
-func (m *MockStore) CreateSubscription(arg0 *model0.Subscription) (*model0.Subscription, error) {
+func (m *MockStore) CreateSubscription(arg0 *model.Subscription) (*model.Subscription, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateSubscription", arg0)
-	ret0, _ := ret[0].(*model0.Subscription)
+	ret0, _ := ret[0].(*model.Subscription)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -157,10 +157,10 @@ func (mr *MockStoreMockRecorder) CreateSubscription(arg0 interface{}) *gomock.Ca
 }
 
 // CreateUser mocks base method.
-func (m *MockStore) CreateUser(arg0 *model0.User) (*model0.User, error) {
+func (m *MockStore) CreateUser(arg0 *model.User) (*model.User, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateUser", arg0)
-	ret0, _ := ret[0].(*model0.User)
+	ret0, _ := ret[0].(*model.User)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -256,7 +256,7 @@ func (mr *MockStoreMockRecorder) DeleteBoardRecord(arg0, arg1 interface{}) *gomo
 }
 
 // DeleteBoardsAndBlocks mocks base method.
-func (m *MockStore) DeleteBoardsAndBlocks(arg0 *model0.DeleteBoardsAndBlocks, arg1 string) error {
+func (m *MockStore) DeleteBoardsAndBlocks(arg0 *model.DeleteBoardsAndBlocks, arg1 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "DeleteBoardsAndBlocks", arg0, arg1)
 	ret0, _ := ret[0].(error)
@@ -354,10 +354,10 @@ func (mr *MockStoreMockRecorder) DropAllTables() *gomock.Call {
 }
 
 // DuplicateBlock mocks base method.
-func (m *MockStore) DuplicateBlock(arg0, arg1, arg2 string, arg3 bool) ([]*model0.Block, error) {
+func (m *MockStore) DuplicateBlock(arg0, arg1, arg2 string, arg3 bool) ([]*model.Block, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "DuplicateBlock", arg0, arg1, arg2, arg3)
-	ret0, _ := ret[0].([]*model0.Block)
+	ret0, _ := ret[0].([]*model.Block)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -369,11 +369,11 @@ func (mr *MockStoreMockRecorder) DuplicateBlock(arg0, arg1, arg2, arg3 interface
 }
 
 // DuplicateBoard mocks base method.
-func (m *MockStore) DuplicateBoard(arg0, arg1, arg2 string, arg3 bool) (*model0.BoardsAndBlocks, []*model0.BoardMember, error) {
+func (m *MockStore) DuplicateBoard(arg0, arg1, arg2 string, arg3 bool) (*model.BoardsAndBlocks, []*model.BoardMember, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "DuplicateBoard", arg0, arg1, arg2, arg3)
-	ret0, _ := ret[0].(*model0.BoardsAndBlocks)
-	ret1, _ := ret[1].([]*model0.BoardMember)
+	ret0, _ := ret[0].(*model.BoardsAndBlocks)
+	ret1, _ := ret[1].([]*model.BoardMember)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
@@ -400,10 +400,10 @@ func (mr *MockStoreMockRecorder) GetActiveUserCount(arg0 interface{}) *gomock.Ca
 }
 
 // GetAllTeams mocks base method.
-func (m *MockStore) GetAllTeams() ([]*model0.Team, error) {
+func (m *MockStore) GetAllTeams() ([]*model.Team, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetAllTeams")
-	ret0, _ := ret[0].([]*model0.Team)
+	ret0, _ := ret[0].([]*model.Team)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -415,10 +415,10 @@ func (mr *MockStoreMockRecorder) GetAllTeams() *gomock.Call {
 }
 
 // GetBlock mocks base method.
-func (m *MockStore) GetBlock(arg0 string) (*model0.Block, error) {
+func (m *MockStore) GetBlock(arg0 string) (*model.Block, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBlock", arg0)
-	ret0, _ := ret[0].(*model0.Block)
+	ret0, _ := ret[0].(*model.Block)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -445,10 +445,10 @@ func (mr *MockStoreMockRecorder) GetBlockCountsByType() *gomock.Call {
 }
 
 // GetBlockHistory mocks base method.
-func (m *MockStore) GetBlockHistory(arg0 string, arg1 model0.QueryBlockHistoryOptions) ([]*model0.Block, error) {
+func (m *MockStore) GetBlockHistory(arg0 string, arg1 model.QueryBlockHistoryOptions) ([]*model.Block, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBlockHistory", arg0, arg1)
-	ret0, _ := ret[0].([]*model0.Block)
+	ret0, _ := ret[0].([]*model.Block)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -460,10 +460,10 @@ func (mr *MockStoreMockRecorder) GetBlockHistory(arg0, arg1 interface{}) *gomock
 }
 
 // GetBlockHistoryDescendants mocks base method.
-func (m *MockStore) GetBlockHistoryDescendants(arg0 string, arg1 model0.QueryBlockHistoryOptions) ([]*model0.Block, error) {
+func (m *MockStore) GetBlockHistoryDescendants(arg0 string, arg1 model.QueryBlockHistoryOptions) ([]*model.Block, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBlockHistoryDescendants", arg0, arg1)
-	ret0, _ := ret[0].([]*model0.Block)
+	ret0, _ := ret[0].([]*model.Block)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -475,10 +475,10 @@ func (mr *MockStoreMockRecorder) GetBlockHistoryDescendants(arg0, arg1 interface
 }
 
 // GetBlockHistoryNewestChildren mocks base method.
-func (m *MockStore) GetBlockHistoryNewestChildren(arg0 string, arg1 model0.QueryBlockHistoryChildOptions) ([]*model0.Block, bool, error) {
+func (m *MockStore) GetBlockHistoryNewestChildren(arg0 string, arg1 model.QueryBlockHistoryChildOptions) ([]*model.Block, bool, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBlockHistoryNewestChildren", arg0, arg1)
-	ret0, _ := ret[0].([]*model0.Block)
+	ret0, _ := ret[0].([]*model.Block)
 	ret1, _ := ret[1].(bool)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
@@ -491,10 +491,10 @@ func (mr *MockStoreMockRecorder) GetBlockHistoryNewestChildren(arg0, arg1 interf
 }
 
 // GetBlocks mocks base method.
-func (m *MockStore) GetBlocks(arg0 model0.QueryBlocksOptions) ([]*model0.Block, error) {
+func (m *MockStore) GetBlocks(arg0 model.QueryBlocksOptions) ([]*model.Block, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBlocks", arg0)
-	ret0, _ := ret[0].([]*model0.Block)
+	ret0, _ := ret[0].([]*model.Block)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -506,10 +506,10 @@ func (mr *MockStoreMockRecorder) GetBlocks(arg0 interface{}) *gomock.Call {
 }
 
 // GetBlocksByIDs mocks base method.
-func (m *MockStore) GetBlocksByIDs(arg0 []string) ([]*model0.Block, error) {
+func (m *MockStore) GetBlocksByIDs(arg0 []string) ([]*model.Block, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBlocksByIDs", arg0)
-	ret0, _ := ret[0].([]*model0.Block)
+	ret0, _ := ret[0].([]*model.Block)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -521,10 +521,10 @@ func (mr *MockStoreMockRecorder) GetBlocksByIDs(arg0 interface{}) *gomock.Call {
 }
 
 // GetBlocksComplianceHistory mocks base method.
-func (m *MockStore) GetBlocksComplianceHistory(arg0 model0.QueryBlocksComplianceHistoryOptions) ([]*model0.BlockHistory, bool, error) {
+func (m *MockStore) GetBlocksComplianceHistory(arg0 model.QueryBlocksComplianceHistoryOptions) ([]*model.BlockHistory, bool, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBlocksComplianceHistory", arg0)
-	ret0, _ := ret[0].([]*model0.BlockHistory)
+	ret0, _ := ret[0].([]*model.BlockHistory)
 	ret1, _ := ret[1].(bool)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
@@ -537,10 +537,10 @@ func (mr *MockStoreMockRecorder) GetBlocksComplianceHistory(arg0 interface{}) *g
 }
 
 // GetBoard mocks base method.
-func (m *MockStore) GetBoard(arg0 string) (*model0.Board, error) {
+func (m *MockStore) GetBoard(arg0 string) (*model.Board, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBoard", arg0)
-	ret0, _ := ret[0].(*model0.Board)
+	ret0, _ := ret[0].(*model.Board)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -552,11 +552,11 @@ func (mr *MockStoreMockRecorder) GetBoard(arg0 interface{}) *gomock.Call {
 }
 
 // GetBoardAndCard mocks base method.
-func (m *MockStore) GetBoardAndCard(arg0 *model0.Block) (*model0.Board, *model0.Block, error) {
+func (m *MockStore) GetBoardAndCard(arg0 *model.Block) (*model.Board, *model.Block, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBoardAndCard", arg0)
-	ret0, _ := ret[0].(*model0.Board)
-	ret1, _ := ret[1].(*model0.Block)
+	ret0, _ := ret[0].(*model.Board)
+	ret1, _ := ret[1].(*model.Block)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
@@ -568,11 +568,11 @@ func (mr *MockStoreMockRecorder) GetBoardAndCard(arg0 interface{}) *gomock.Call
 }
 
 // GetBoardAndCardByID mocks base method.
-func (m *MockStore) GetBoardAndCardByID(arg0 string) (*model0.Board, *model0.Block, error) {
+func (m *MockStore) GetBoardAndCardByID(arg0 string) (*model.Board, *model.Block, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBoardAndCardByID", arg0)
-	ret0, _ := ret[0].(*model0.Board)
-	ret1, _ := ret[1].(*model0.Block)
+	ret0, _ := ret[0].(*model.Board)
+	ret1, _ := ret[1].(*model.Block)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
@@ -599,10 +599,10 @@ func (mr *MockStoreMockRecorder) GetBoardCount() *gomock.Call {
 }
 
 // GetBoardHistory mocks base method.
-func (m *MockStore) GetBoardHistory(arg0 string, arg1 model0.QueryBoardHistoryOptions) ([]*model0.Board, error) {
+func (m *MockStore) GetBoardHistory(arg0 string, arg1 model.QueryBoardHistoryOptions) ([]*model.Board, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBoardHistory", arg0, arg1)
-	ret0, _ := ret[0].([]*model0.Board)
+	ret0, _ := ret[0].([]*model.Board)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -614,10 +614,10 @@ func (mr *MockStoreMockRecorder) GetBoardHistory(arg0, arg1 interface{}) *gomock
 }
 
 // GetBoardMemberHistory mocks base method.
-func (m *MockStore) GetBoardMemberHistory(arg0, arg1 string, arg2 uint64) ([]*model0.BoardMemberHistoryEntry, error) {
+func (m *MockStore) GetBoardMemberHistory(arg0, arg1 string, arg2 uint64) ([]*model.BoardMemberHistoryEntry, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBoardMemberHistory", arg0, arg1, arg2)
-	ret0, _ := ret[0].([]*model0.BoardMemberHistoryEntry)
+	ret0, _ := ret[0].([]*model.BoardMemberHistoryEntry)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -629,10 +629,10 @@ func (mr *MockStoreMockRecorder) GetBoardMemberHistory(arg0, arg1, arg2 interfac
 }
 
 // GetBoardsComplianceHistory mocks base method.
-func (m *MockStore) GetBoardsComplianceHistory(arg0 model0.QueryBoardsComplianceHistoryOptions) ([]*model0.BoardHistory, bool, error) {
+func (m *MockStore) GetBoardsComplianceHistory(arg0 model.QueryBoardsComplianceHistoryOptions) ([]*model.BoardHistory, bool, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBoardsComplianceHistory", arg0)
-	ret0, _ := ret[0].([]*model0.BoardHistory)
+	ret0, _ := ret[0].([]*model.BoardHistory)
 	ret1, _ := ret[1].(bool)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
@@ -645,10 +645,10 @@ func (mr *MockStoreMockRecorder) GetBoardsComplianceHistory(arg0 interface{}) *g
 }
 
 // GetBoardsForCompliance mocks base method.
-func (m *MockStore) GetBoardsForCompliance(arg0 model0.QueryBoardsForComplianceOptions) ([]*model0.Board, bool, error) {
+func (m *MockStore) GetBoardsForCompliance(arg0 model.QueryBoardsForComplianceOptions) ([]*model.Board, bool, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBoardsForCompliance", arg0)
-	ret0, _ := ret[0].([]*model0.Board)
+	ret0, _ := ret[0].([]*model.Board)
 	ret1, _ := ret[1].(bool)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
@@ -661,10 +661,10 @@ func (mr *MockStoreMockRecorder) GetBoardsForCompliance(arg0 interface{}) *gomoc
 }
 
 // GetBoardsForUserAndTeam mocks base method.
-func (m *MockStore) GetBoardsForUserAndTeam(arg0, arg1 string, arg2 bool) ([]*model0.Board, error) {
+func (m *MockStore) GetBoardsForUserAndTeam(arg0, arg1 string, arg2 bool) ([]*model.Board, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBoardsForUserAndTeam", arg0, arg1, arg2)
-	ret0, _ := ret[0].([]*model0.Board)
+	ret0, _ := ret[0].([]*model.Board)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -676,10 +676,10 @@ func (mr *MockStoreMockRecorder) GetBoardsForUserAndTeam(arg0, arg1, arg2 interf
 }
 
 // GetBoardsInTeamByIds mocks base method.
-func (m *MockStore) GetBoardsInTeamByIds(arg0 []string, arg1 string) ([]*model0.Board, error) {
+func (m *MockStore) GetBoardsInTeamByIds(arg0 []string, arg1 string) ([]*model.Board, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetBoardsInTeamByIds", arg0, arg1)
-	ret0, _ := ret[0].([]*model0.Board)
+	ret0, _ := ret[0].([]*model.Board)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -706,10 +706,10 @@ func (mr *MockStoreMockRecorder) GetCardLimitTimestamp() *gomock.Call {
 }
 
 // GetCategory mocks base method.
-func (m *MockStore) GetCategory(arg0 string) (*model0.Category, error) {
+func (m *MockStore) GetCategory(arg0 string) (*model.Category, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetCategory", arg0)
-	ret0, _ := ret[0].(*model0.Category)
+	ret0, _ := ret[0].(*model.Category)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -721,10 +721,10 @@ func (mr *MockStoreMockRecorder) GetCategory(arg0 interface{}) *gomock.Call {
 }
 
 // GetChannel mocks base method.
-func (m *MockStore) GetChannel(arg0, arg1 string) (*model.Channel, error) {
+func (m *MockStore) GetChannel(arg0, arg1 string) (*model0.Channel, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetChannel", arg0, arg1)
-	ret0, _ := ret[0].(*model.Channel)
+	ret0, _ := ret[0].(*model0.Channel)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -736,10 +736,10 @@ func (mr *MockStoreMockRecorder) GetChannel(arg0, arg1 interface{}) *gomock.Call
 }
 
 // GetCloudLimits mocks base method.
-func (m *MockStore) GetCloudLimits() (*model.ProductLimits, error) {
+func (m *MockStore) GetCloudLimits() (*model0.ProductLimits, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetCloudLimits")
-	ret0, _ := ret[0].(*model.ProductLimits)
+	ret0, _ := ret[0].(*model0.ProductLimits)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -751,10 +751,10 @@ func (mr *MockStoreMockRecorder) GetCloudLimits() *gomock.Call {
 }
 
 // GetFileInfo mocks base method.
-func (m *MockStore) GetFileInfo(arg0 string) (*model.FileInfo, error) {
+func (m *MockStore) GetFileInfo(arg0 string) (*model0.FileInfo, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetFileInfo", arg0)
-	ret0, _ := ret[0].(*model.FileInfo)
+	ret0, _ := ret[0].(*model0.FileInfo)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -766,10 +766,10 @@ func (mr *MockStoreMockRecorder) GetFileInfo(arg0 interface{}) *gomock.Call {
 }
 
 // GetLicense mocks base method.
-func (m *MockStore) GetLicense() *model.License {
+func (m *MockStore) GetLicense() *model0.License {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetLicense")
-	ret0, _ := ret[0].(*model.License)
+	ret0, _ := ret[0].(*model0.License)
 	return ret0
 }
 
@@ -780,10 +780,10 @@ func (mr *MockStoreMockRecorder) GetLicense() *gomock.Call {
 }
 
 // GetMemberForBoard mocks base method.
-func (m *MockStore) GetMemberForBoard(arg0, arg1 string) (*model0.BoardMember, error) {
+func (m *MockStore) GetMemberForBoard(arg0, arg1 string) (*model.BoardMember, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetMemberForBoard", arg0, arg1)
-	ret0, _ := ret[0].(*model0.BoardMember)
+	ret0, _ := ret[0].(*model.BoardMember)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -795,10 +795,10 @@ func (mr *MockStoreMockRecorder) GetMemberForBoard(arg0, arg1 interface{}) *gomo
 }
 
 // GetMembersForBoard mocks base method.
-func (m *MockStore) GetMembersForBoard(arg0 string) ([]*model0.BoardMember, error) {
+func (m *MockStore) GetMembersForBoard(arg0 string) ([]*model.BoardMember, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetMembersForBoard", arg0)
-	ret0, _ := ret[0].([]*model0.BoardMember)
+	ret0, _ := ret[0].([]*model.BoardMember)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -810,10 +810,10 @@ func (mr *MockStoreMockRecorder) GetMembersForBoard(arg0 interface{}) *gomock.Ca
 }
 
 // GetMembersForUser mocks base method.
-func (m *MockStore) GetMembersForUser(arg0 string) ([]*model0.BoardMember, error) {
+func (m *MockStore) GetMembersForUser(arg0 string) ([]*model.BoardMember, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetMembersForUser", arg0)
-	ret0, _ := ret[0].([]*model0.BoardMember)
+	ret0, _ := ret[0].([]*model.BoardMember)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -825,10 +825,10 @@ func (mr *MockStoreMockRecorder) GetMembersForUser(arg0 interface{}) *gomock.Cal
 }
 
 // GetNextNotificationHint mocks base method.
-func (m *MockStore) GetNextNotificationHint(arg0 bool) (*model0.NotificationHint, error) {
+func (m *MockStore) GetNextNotificationHint(arg0 bool) (*model.NotificationHint, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetNextNotificationHint", arg0)
-	ret0, _ := ret[0].(*model0.NotificationHint)
+	ret0, _ := ret[0].(*model.NotificationHint)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -840,10 +840,10 @@ func (mr *MockStoreMockRecorder) GetNextNotificationHint(arg0 interface{}) *gomo
 }
 
 // GetNotificationHint mocks base method.
-func (m *MockStore) GetNotificationHint(arg0 string) (*model0.NotificationHint, error) {
+func (m *MockStore) GetNotificationHint(arg0 string) (*model.NotificationHint, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetNotificationHint", arg0)
-	ret0, _ := ret[0].(*model0.NotificationHint)
+	ret0, _ := ret[0].(*model.NotificationHint)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -870,10 +870,10 @@ func (mr *MockStoreMockRecorder) GetRegisteredUserCount() *gomock.Call {
 }
 
 // GetSession mocks base method.
-func (m *MockStore) GetSession(arg0 string, arg1 int64) (*model0.Session, error) {
+func (m *MockStore) GetSession(arg0 string, arg1 int64) (*model.Session, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetSession", arg0, arg1)
-	ret0, _ := ret[0].(*model0.Session)
+	ret0, _ := ret[0].(*model.Session)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -885,10 +885,10 @@ func (mr *MockStoreMockRecorder) GetSession(arg0, arg1 interface{}) *gomock.Call
 }
 
 // GetSharing mocks base method.
-func (m *MockStore) GetSharing(arg0 string) (*model0.Sharing, error) {
+func (m *MockStore) GetSharing(arg0 string) (*model.Sharing, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetSharing", arg0)
-	ret0, _ := ret[0].(*model0.Sharing)
+	ret0, _ := ret[0].(*model.Sharing)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -900,10 +900,10 @@ func (mr *MockStoreMockRecorder) GetSharing(arg0 interface{}) *gomock.Call {
 }
 
 // GetSubTree2 mocks base method.
-func (m *MockStore) GetSubTree2(arg0, arg1 string, arg2 model0.QuerySubtreeOptions) ([]*model0.Block, error) {
+func (m *MockStore) GetSubTree2(arg0, arg1 string, arg2 model.QuerySubtreeOptions) ([]*model.Block, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetSubTree2", arg0, arg1, arg2)
-	ret0, _ := ret[0].([]*model0.Block)
+	ret0, _ := ret[0].([]*model.Block)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -930,10 +930,10 @@ func (mr *MockStoreMockRecorder) GetSubscribersCountForBlock(arg0 interface{}) *
 }
 
 // GetSubscribersForBlock mocks base method.
-func (m *MockStore) GetSubscribersForBlock(arg0 string) ([]*model0.Subscriber, error) {
+func (m *MockStore) GetSubscribersForBlock(arg0 string) ([]*model.Subscriber, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetSubscribersForBlock", arg0)
-	ret0, _ := ret[0].([]*model0.Subscriber)
+	ret0, _ := ret[0].([]*model.Subscriber)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -945,10 +945,10 @@ func (mr *MockStoreMockRecorder) GetSubscribersForBlock(arg0 interface{}) *gomoc
 }
 
 // GetSubscription mocks base method.
-func (m *MockStore) GetSubscription(arg0, arg1 string) (*model0.Subscription, error) {
+func (m *MockStore) GetSubscription(arg0, arg1 string) (*model.Subscription, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetSubscription", arg0, arg1)
-	ret0, _ := ret[0].(*model0.Subscription)
+	ret0, _ := ret[0].(*model.Subscription)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -960,10 +960,10 @@ func (mr *MockStoreMockRecorder) GetSubscription(arg0, arg1 interface{}) *gomock
 }
 
 // GetSubscriptions mocks base method.
-func (m *MockStore) GetSubscriptions(arg0 string) ([]*model0.Subscription, error) {
+func (m *MockStore) GetSubscriptions(arg0 string) ([]*model.Subscription, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetSubscriptions", arg0)
-	ret0, _ := ret[0].([]*model0.Subscription)
+	ret0, _ := ret[0].([]*model.Subscription)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1005,10 +1005,10 @@ func (mr *MockStoreMockRecorder) GetSystemSettings() *gomock.Call {
 }
 
 // GetTeam mocks base method.
-func (m *MockStore) GetTeam(arg0 string) (*model0.Team, error) {
+func (m *MockStore) GetTeam(arg0 string) (*model.Team, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetTeam", arg0)
-	ret0, _ := ret[0].(*model0.Team)
+	ret0, _ := ret[0].(*model.Team)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1020,10 +1020,10 @@ func (mr *MockStoreMockRecorder) GetTeam(arg0 interface{}) *gomock.Call {
 }
 
 // GetTeamBoardsInsights mocks base method.
-func (m *MockStore) GetTeamBoardsInsights(arg0 string, arg1 int64, arg2, arg3 int, arg4 []string) (*model0.BoardInsightsList, error) {
+func (m *MockStore) GetTeamBoardsInsights(arg0 string, arg1 int64, arg2, arg3 int, arg4 []string) (*model.BoardInsightsList, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetTeamBoardsInsights", arg0, arg1, arg2, arg3, arg4)
-	ret0, _ := ret[0].(*model0.BoardInsightsList)
+	ret0, _ := ret[0].(*model.BoardInsightsList)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1050,10 +1050,10 @@ func (mr *MockStoreMockRecorder) GetTeamCount() *gomock.Call {
 }
 
 // GetTeamsForUser mocks base method.
-func (m *MockStore) GetTeamsForUser(arg0 string) ([]*model0.Team, error) {
+func (m *MockStore) GetTeamsForUser(arg0 string) ([]*model.Team, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetTeamsForUser", arg0)
-	ret0, _ := ret[0].([]*model0.Team)
+	ret0, _ := ret[0].([]*model.Team)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1065,10 +1065,10 @@ func (mr *MockStoreMockRecorder) GetTeamsForUser(arg0 interface{}) *gomock.Call
 }
 
 // GetTemplateBoards mocks base method.
-func (m *MockStore) GetTemplateBoards(arg0, arg1 string) ([]*model0.Board, error) {
+func (m *MockStore) GetTemplateBoards(arg0, arg1 string) ([]*model.Board, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetTemplateBoards", arg0, arg1)
-	ret0, _ := ret[0].([]*model0.Board)
+	ret0, _ := ret[0].([]*model.Board)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1095,10 +1095,10 @@ func (mr *MockStoreMockRecorder) GetUsedCardsCount() *gomock.Call {
 }
 
 // GetUserBoardsInsights mocks base method.
-func (m *MockStore) GetUserBoardsInsights(arg0, arg1 string, arg2 int64, arg3, arg4 int, arg5 []string) (*model0.BoardInsightsList, error) {
+func (m *MockStore) GetUserBoardsInsights(arg0, arg1 string, arg2 int64, arg3, arg4 int, arg5 []string) (*model.BoardInsightsList, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetUserBoardsInsights", arg0, arg1, arg2, arg3, arg4, arg5)
-	ret0, _ := ret[0].(*model0.BoardInsightsList)
+	ret0, _ := ret[0].(*model.BoardInsightsList)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1110,10 +1110,10 @@ func (mr *MockStoreMockRecorder) GetUserBoardsInsights(arg0, arg1, arg2, arg3, a
 }
 
 // GetUserByEmail mocks base method.
-func (m *MockStore) GetUserByEmail(arg0 string) (*model0.User, error) {
+func (m *MockStore) GetUserByEmail(arg0 string) (*model.User, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetUserByEmail", arg0)
-	ret0, _ := ret[0].(*model0.User)
+	ret0, _ := ret[0].(*model.User)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1125,10 +1125,10 @@ func (mr *MockStoreMockRecorder) GetUserByEmail(arg0 interface{}) *gomock.Call {
 }
 
 // GetUserByID mocks base method.
-func (m *MockStore) GetUserByID(arg0 string) (*model0.User, error) {
+func (m *MockStore) GetUserByID(arg0 string) (*model.User, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetUserByID", arg0)
-	ret0, _ := ret[0].(*model0.User)
+	ret0, _ := ret[0].(*model.User)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1140,10 +1140,10 @@ func (mr *MockStoreMockRecorder) GetUserByID(arg0 interface{}) *gomock.Call {
 }
 
 // GetUserByUsername mocks base method.
-func (m *MockStore) GetUserByUsername(arg0 string) (*model0.User, error) {
+func (m *MockStore) GetUserByUsername(arg0 string) (*model.User, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetUserByUsername", arg0)
-	ret0, _ := ret[0].(*model0.User)
+	ret0, _ := ret[0].(*model.User)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1155,10 +1155,10 @@ func (mr *MockStoreMockRecorder) GetUserByUsername(arg0 interface{}) *gomock.Cal
 }
 
 // GetUserCategories mocks base method.
-func (m *MockStore) GetUserCategories(arg0, arg1 string) ([]model0.Category, error) {
+func (m *MockStore) GetUserCategories(arg0, arg1 string) ([]model.Category, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetUserCategories", arg0, arg1)
-	ret0, _ := ret[0].([]model0.Category)
+	ret0, _ := ret[0].([]model.Category)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1170,10 +1170,10 @@ func (mr *MockStoreMockRecorder) GetUserCategories(arg0, arg1 interface{}) *gomo
 }
 
 // GetUserCategoryBoards mocks base method.
-func (m *MockStore) GetUserCategoryBoards(arg0, arg1 string) ([]model0.CategoryBoards, error) {
+func (m *MockStore) GetUserCategoryBoards(arg0, arg1 string) ([]model.CategoryBoards, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetUserCategoryBoards", arg0, arg1)
-	ret0, _ := ret[0].([]model0.CategoryBoards)
+	ret0, _ := ret[0].([]model.CategoryBoards)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1185,10 +1185,10 @@ func (mr *MockStoreMockRecorder) GetUserCategoryBoards(arg0, arg1 interface{}) *
 }
 
 // GetUserPreferences mocks base method.
-func (m *MockStore) GetUserPreferences(arg0 string) (model.Preferences, error) {
+func (m *MockStore) GetUserPreferences(arg0 string) (model0.Preferences, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetUserPreferences", arg0)
-	ret0, _ := ret[0].(model.Preferences)
+	ret0, _ := ret[0].(model0.Preferences)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1215,10 +1215,10 @@ func (mr *MockStoreMockRecorder) GetUserTimezone(arg0 interface{}) *gomock.Call
 }
 
 // GetUsersByTeam mocks base method.
-func (m *MockStore) GetUsersByTeam(arg0, arg1 string, arg2, arg3 bool) ([]*model0.User, error) {
+func (m *MockStore) GetUsersByTeam(arg0, arg1 string, arg2, arg3 bool) ([]*model.User, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetUsersByTeam", arg0, arg1, arg2, arg3)
-	ret0, _ := ret[0].([]*model0.User)
+	ret0, _ := ret[0].([]*model.User)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1230,10 +1230,10 @@ func (mr *MockStoreMockRecorder) GetUsersByTeam(arg0, arg1, arg2, arg3 interface
 }
 
 // GetUsersList mocks base method.
-func (m *MockStore) GetUsersList(arg0 []string, arg1, arg2 bool) ([]*model0.User, error) {
+func (m *MockStore) GetUsersList(arg0 []string, arg1, arg2 bool) ([]*model.User, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetUsersList", arg0, arg1, arg2)
-	ret0, _ := ret[0].([]*model0.User)
+	ret0, _ := ret[0].([]*model.User)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1245,7 +1245,7 @@ func (mr *MockStoreMockRecorder) GetUsersList(arg0, arg1, arg2 interface{}) *gom
 }
 
 // InsertBlock mocks base method.
-func (m *MockStore) InsertBlock(arg0 *model0.Block, arg1 string) error {
+func (m *MockStore) InsertBlock(arg0 *model.Block, arg1 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "InsertBlock", arg0, arg1)
 	ret0, _ := ret[0].(error)
@@ -1259,7 +1259,7 @@ func (mr *MockStoreMockRecorder) InsertBlock(arg0, arg1 interface{}) *gomock.Cal
 }
 
 // InsertBlocks mocks base method.
-func (m *MockStore) InsertBlocks(arg0 []*model0.Block, arg1 string) error {
+func (m *MockStore) InsertBlocks(arg0 []*model.Block, arg1 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "InsertBlocks", arg0, arg1)
 	ret0, _ := ret[0].(error)
@@ -1273,10 +1273,10 @@ func (mr *MockStoreMockRecorder) InsertBlocks(arg0, arg1 interface{}) *gomock.Ca
 }
 
 // InsertBoard mocks base method.
-func (m *MockStore) InsertBoard(arg0 *model0.Board, arg1 string) (*model0.Board, error) {
+func (m *MockStore) InsertBoard(arg0 *model.Board, arg1 string) (*model.Board, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "InsertBoard", arg0, arg1)
-	ret0, _ := ret[0].(*model0.Board)
+	ret0, _ := ret[0].(*model.Board)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1288,11 +1288,11 @@ func (mr *MockStoreMockRecorder) InsertBoard(arg0, arg1 interface{}) *gomock.Cal
 }
 
 // InsertBoardWithAdmin mocks base method.
-func (m *MockStore) InsertBoardWithAdmin(arg0 *model0.Board, arg1 string) (*model0.Board, *model0.BoardMember, error) {
+func (m *MockStore) InsertBoardWithAdmin(arg0 *model.Board, arg1 string) (*model.Board, *model.BoardMember, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "InsertBoardWithAdmin", arg0, arg1)
-	ret0, _ := ret[0].(*model0.Board)
-	ret1, _ := ret[1].(*model0.BoardMember)
+	ret0, _ := ret[0].(*model.Board)
+	ret1, _ := ret[1].(*model.BoardMember)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
@@ -1304,7 +1304,7 @@ func (mr *MockStoreMockRecorder) InsertBoardWithAdmin(arg0, arg1 interface{}) *g
 }
 
 // PatchBlock mocks base method.
-func (m *MockStore) PatchBlock(arg0 string, arg1 *model0.BlockPatch, arg2 string) error {
+func (m *MockStore) PatchBlock(arg0 string, arg1 *model.BlockPatch, arg2 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "PatchBlock", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
@@ -1318,7 +1318,7 @@ func (mr *MockStoreMockRecorder) PatchBlock(arg0, arg1, arg2 interface{}) *gomoc
 }
 
 // PatchBlocks mocks base method.
-func (m *MockStore) PatchBlocks(arg0 *model0.BlockPatchBatch, arg1 string) error {
+func (m *MockStore) PatchBlocks(arg0 *model.BlockPatchBatch, arg1 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "PatchBlocks", arg0, arg1)
 	ret0, _ := ret[0].(error)
@@ -1332,10 +1332,10 @@ func (mr *MockStoreMockRecorder) PatchBlocks(arg0, arg1 interface{}) *gomock.Cal
 }
 
 // PatchBoard mocks base method.
-func (m *MockStore) PatchBoard(arg0 string, arg1 *model0.BoardPatch, arg2 string) (*model0.Board, error) {
+func (m *MockStore) PatchBoard(arg0 string, arg1 *model.BoardPatch, arg2 string) (*model.Board, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "PatchBoard", arg0, arg1, arg2)
-	ret0, _ := ret[0].(*model0.Board)
+	ret0, _ := ret[0].(*model.Board)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1347,10 +1347,10 @@ func (mr *MockStoreMockRecorder) PatchBoard(arg0, arg1, arg2 interface{}) *gomoc
 }
 
 // PatchBoardsAndBlocks mocks base method.
-func (m *MockStore) PatchBoardsAndBlocks(arg0 *model0.PatchBoardsAndBlocks, arg1 string) (*model0.BoardsAndBlocks, error) {
+func (m *MockStore) PatchBoardsAndBlocks(arg0 *model.PatchBoardsAndBlocks, arg1 string) (*model.BoardsAndBlocks, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "PatchBoardsAndBlocks", arg0, arg1)
-	ret0, _ := ret[0].(*model0.BoardsAndBlocks)
+	ret0, _ := ret[0].(*model.BoardsAndBlocks)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1362,10 +1362,10 @@ func (mr *MockStoreMockRecorder) PatchBoardsAndBlocks(arg0, arg1 interface{}) *g
 }
 
 // PatchUserPreferences mocks base method.
-func (m *MockStore) PatchUserPreferences(arg0 string, arg1 model0.UserPreferencesPatch) (model.Preferences, error) {
+func (m *MockStore) PatchUserPreferences(arg0 string, arg1 model.UserPreferencesPatch) (model0.Preferences, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "PatchUserPreferences", arg0, arg1)
-	ret0, _ := ret[0].(model.Preferences)
+	ret0, _ := ret[0].(model0.Preferences)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1391,7 +1391,7 @@ func (mr *MockStoreMockRecorder) PostMessage(arg0, arg1, arg2 interface{}) *gomo
 }
 
 // RefreshSession mocks base method.
-func (m *MockStore) RefreshSession(arg0 *model0.Session) error {
+func (m *MockStore) RefreshSession(arg0 *model.Session) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "RefreshSession", arg0)
 	ret0, _ := ret[0].(error)
@@ -1405,7 +1405,7 @@ func (mr *MockStoreMockRecorder) RefreshSession(arg0 interface{}) *gomock.Call {
 }
 
 // RemoveDefaultTemplates mocks base method.
-func (m *MockStore) RemoveDefaultTemplates(arg0 []*model0.Board) error {
+func (m *MockStore) RemoveDefaultTemplates(arg0 []*model.Board) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "RemoveDefaultTemplates", arg0)
 	ret0, _ := ret[0].(error)
@@ -1464,7 +1464,7 @@ func (mr *MockStoreMockRecorder) RunDataRetention(arg0, arg1 interface{}) *gomoc
 }
 
 // SaveFileInfo mocks base method.
-func (m *MockStore) SaveFileInfo(arg0 *model.FileInfo) error {
+func (m *MockStore) SaveFileInfo(arg0 *model0.FileInfo) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SaveFileInfo", arg0)
 	ret0, _ := ret[0].(error)
@@ -1478,10 +1478,10 @@ func (mr *MockStoreMockRecorder) SaveFileInfo(arg0 interface{}) *gomock.Call {
 }
 
 // SaveMember mocks base method.
-func (m *MockStore) SaveMember(arg0 *model0.BoardMember) (*model0.BoardMember, error) {
+func (m *MockStore) SaveMember(arg0 *model.BoardMember) (*model.BoardMember, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SaveMember", arg0)
-	ret0, _ := ret[0].(*model0.BoardMember)
+	ret0, _ := ret[0].(*model.BoardMember)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1493,10 +1493,10 @@ func (mr *MockStoreMockRecorder) SaveMember(arg0 interface{}) *gomock.Call {
 }
 
 // SearchBoardsForUser mocks base method.
-func (m *MockStore) SearchBoardsForUser(arg0 string, arg1 model0.BoardSearchField, arg2 string, arg3 bool) ([]*model0.Board, error) {
+func (m *MockStore) SearchBoardsForUser(arg0 string, arg1 model.BoardSearchField, arg2 string, arg3 bool) ([]*model.Board, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SearchBoardsForUser", arg0, arg1, arg2, arg3)
-	ret0, _ := ret[0].([]*model0.Board)
+	ret0, _ := ret[0].([]*model.Board)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1508,10 +1508,10 @@ func (mr *MockStoreMockRecorder) SearchBoardsForUser(arg0, arg1, arg2, arg3 inte
 }
 
 // SearchBoardsForUserInTeam mocks base method.
-func (m *MockStore) SearchBoardsForUserInTeam(arg0, arg1, arg2 string) ([]*model0.Board, error) {
+func (m *MockStore) SearchBoardsForUserInTeam(arg0, arg1, arg2 string) ([]*model.Board, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SearchBoardsForUserInTeam", arg0, arg1, arg2)
-	ret0, _ := ret[0].([]*model0.Board)
+	ret0, _ := ret[0].([]*model.Board)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1523,10 +1523,10 @@ func (mr *MockStoreMockRecorder) SearchBoardsForUserInTeam(arg0, arg1, arg2 inte
 }
 
 // SearchUserChannels mocks base method.
-func (m *MockStore) SearchUserChannels(arg0, arg1, arg2 string) ([]*model.Channel, error) {
+func (m *MockStore) SearchUserChannels(arg0, arg1, arg2 string) ([]*model0.Channel, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SearchUserChannels", arg0, arg1, arg2)
-	ret0, _ := ret[0].([]*model.Channel)
+	ret0, _ := ret[0].([]*model0.Channel)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1538,10 +1538,10 @@ func (mr *MockStoreMockRecorder) SearchUserChannels(arg0, arg1, arg2 interface{}
 }
 
 // SearchUsersByTeam mocks base method.
-func (m *MockStore) SearchUsersByTeam(arg0, arg1, arg2 string, arg3, arg4, arg5 bool) ([]*model0.User, error) {
+func (m *MockStore) SearchUsersByTeam(arg0, arg1, arg2 string, arg3, arg4, arg5 bool) ([]*model.User, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SearchUsersByTeam", arg0, arg1, arg2, arg3, arg4, arg5)
-	ret0, _ := ret[0].([]*model0.User)
+	ret0, _ := ret[0].([]*model.User)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1652,7 +1652,7 @@ func (mr *MockStoreMockRecorder) UpdateCardLimitTimestamp(arg0 interface{}) *gom
 }
 
 // UpdateCategory mocks base method.
-func (m *MockStore) UpdateCategory(arg0 model0.Category) error {
+func (m *MockStore) UpdateCategory(arg0 model.Category) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpdateCategory", arg0)
 	ret0, _ := ret[0].(error)
@@ -1666,7 +1666,7 @@ func (mr *MockStoreMockRecorder) UpdateCategory(arg0 interface{}) *gomock.Call {
 }
 
 // UpdateSession mocks base method.
-func (m *MockStore) UpdateSession(arg0 *model0.Session) error {
+func (m *MockStore) UpdateSession(arg0 *model.Session) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpdateSession", arg0)
 	ret0, _ := ret[0].(error)
@@ -1694,10 +1694,10 @@ func (mr *MockStoreMockRecorder) UpdateSubscribersNotifiedAt(arg0, arg1 interfac
 }
 
 // UpdateUser mocks base method.
-func (m *MockStore) UpdateUser(arg0 *model0.User) (*model0.User, error) {
+func (m *MockStore) UpdateUser(arg0 *model.User) (*model.User, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpdateUser", arg0)
-	ret0, _ := ret[0].(*model0.User)
+	ret0, _ := ret[0].(*model.User)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1737,10 +1737,10 @@ func (mr *MockStoreMockRecorder) UpdateUserPasswordByID(arg0, arg1 interface{})
 }
 
 // UpsertNotificationHint mocks base method.
-func (m *MockStore) UpsertNotificationHint(arg0 *model0.NotificationHint, arg1 time.Duration) (*model0.NotificationHint, error) {
+func (m *MockStore) UpsertNotificationHint(arg0 *model.NotificationHint, arg1 time.Duration) (*model.NotificationHint, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpsertNotificationHint", arg0, arg1)
-	ret0, _ := ret[0].(*model0.NotificationHint)
+	ret0, _ := ret[0].(*model.NotificationHint)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1752,7 +1752,7 @@ func (mr *MockStoreMockRecorder) UpsertNotificationHint(arg0, arg1 interface{})
 }
 
 // UpsertSharing mocks base method.
-func (m *MockStore) UpsertSharing(arg0 model0.Sharing) error {
+func (m *MockStore) UpsertSharing(arg0 model.Sharing) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpsertSharing", arg0)
 	ret0, _ := ret[0].(error)
@@ -1766,7 +1766,7 @@ func (mr *MockStoreMockRecorder) UpsertSharing(arg0 interface{}) *gomock.Call {
 }
 
 // UpsertTeamSettings mocks base method.
-func (m *MockStore) UpsertTeamSettings(arg0 model0.Team) error {
+func (m *MockStore) UpsertTeamSettings(arg0 model.Team) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpsertTeamSettings", arg0)
 	ret0, _ := ret[0].(error)
@@ -1780,7 +1780,7 @@ func (mr *MockStoreMockRecorder) UpsertTeamSettings(arg0 interface{}) *gomock.Ca
 }
 
 // UpsertTeamSignupToken mocks base method.
-func (m *MockStore) UpsertTeamSignupToken(arg0 model0.Team) error {
+func (m *MockStore) UpsertTeamSignupToken(arg0 model.Team) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpsertTeamSignupToken", arg0)
 	ret0, _ := ret[0].(error)
diff --git a/server/boards/services/store/sqlstore/blocks.go b/server/boards/services/store/sqlstore/blocks.go
index c20002963e..2e960f918c 100644
--- a/server/boards/services/store/sqlstore/blocks.go
+++ b/server/boards/services/store/sqlstore/blocks.go
@@ -9,14 +9,14 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	sq "github.com/Masterminds/squirrel"
 	_ "github.com/lib/pq" // postgres driver
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/services/store/sqlstore/board.go b/server/boards/services/store/sqlstore/board.go
index 15ed9dfb6e..f9bbb1188a 100644
--- a/server/boards/services/store/sqlstore/board.go
+++ b/server/boards/services/store/sqlstore/board.go
@@ -12,13 +12,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func boardFields(tableAlias string) []string {
diff --git a/server/boards/services/store/sqlstore/board_insights.go b/server/boards/services/store/sqlstore/board_insights.go
index 0e59b8b14c..03afbe2203 100644
--- a/server/boards/services/store/sqlstore/board_insights.go
+++ b/server/boards/services/store/sqlstore/board_insights.go
@@ -9,13 +9,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
 	sq "github.com/Masterminds/squirrel"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (s *SQLStore) getTeamBoardsInsights(db sq.BaseRunner, teamID string, since int64, offset int, limit int, boardIDs []string) (*model.BoardInsightsList, error) {
diff --git a/server/boards/services/store/sqlstore/boards_and_blocks.go b/server/boards/services/store/sqlstore/boards_and_blocks.go
index 6a88c78f2a..8221470d94 100644
--- a/server/boards/services/store/sqlstore/boards_and_blocks.go
+++ b/server/boards/services/store/sqlstore/boards_and_blocks.go
@@ -8,7 +8,7 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 type BlockDoesntBelongToBoardsErr struct {
diff --git a/server/boards/services/store/sqlstore/boards_migrator.go b/server/boards/services/store/sqlstore/boards_migrator.go
index 79afeddc66..6e8a93dbef 100644
--- a/server/boards/services/store/sqlstore/boards_migrator.go
+++ b/server/boards/services/store/sqlstore/boards_migrator.go
@@ -18,11 +18,11 @@ import (
 	embedded "github.com/mattermost/morph/sources/embedded"
 	"github.com/mgdelacroix/foundation"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/db"
-	mmSqlStore "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/db"
+	mmSqlStore "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 var tablePrefix = "focalboard_"
diff --git a/server/boards/services/store/sqlstore/category.go b/server/boards/services/store/sqlstore/category.go
index 98a00d23b4..9df553bd1f 100644
--- a/server/boards/services/store/sqlstore/category.go
+++ b/server/boards/services/store/sqlstore/category.go
@@ -9,10 +9,10 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const categorySortOrderGap = 10
diff --git a/server/boards/services/store/sqlstore/category_boards.go b/server/boards/services/store/sqlstore/category_boards.go
index 2b40b9998f..9009b6d242 100644
--- a/server/boards/services/store/sqlstore/category_boards.go
+++ b/server/boards/services/store/sqlstore/category_boards.go
@@ -9,10 +9,10 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (s *SQLStore) getUserCategoryBoards(db sq.BaseRunner, userID, teamID string) ([]model.CategoryBoards, error) {
diff --git a/server/boards/services/store/sqlstore/cloud.go b/server/boards/services/store/sqlstore/cloud.go
index 729c69494f..054d71a8f5 100644
--- a/server/boards/services/store/sqlstore/cloud.go
+++ b/server/boards/services/store/sqlstore/cloud.go
@@ -10,8 +10,8 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 )
 
 var ErrInvalidCardLimitValue = errors.New("card limit value is invalid")
diff --git a/server/boards/services/store/sqlstore/compliance.go b/server/boards/services/store/sqlstore/compliance.go
index cd7c468e23..33618ae5ec 100644
--- a/server/boards/services/store/sqlstore/compliance.go
+++ b/server/boards/services/store/sqlstore/compliance.go
@@ -8,9 +8,9 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (s *SQLStore) getBoardsForCompliance(db sq.BaseRunner, opts model.QueryBoardsForComplianceOptions) ([]*model.Board, bool, error) {
diff --git a/server/boards/services/store/sqlstore/data_migrations.go b/server/boards/services/store/sqlstore/data_migrations.go
index 8e18022319..46756dd412 100644
--- a/server/boards/services/store/sqlstore/data_migrations.go
+++ b/server/boards/services/store/sqlstore/data_migrations.go
@@ -12,10 +12,10 @@ import (
 	sq "github.com/Masterminds/squirrel"
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/services/store/sqlstore/data_migrations_test.go b/server/boards/services/store/sqlstore/data_migrations_test.go
index 5a44f9ca2e..f2dad54228 100644
--- a/server/boards/services/store/sqlstore/data_migrations_test.go
+++ b/server/boards/services/store/sqlstore/data_migrations_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore/migrationstests"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore/migrationstests"
 	"github.com/mgdelacroix/foundation"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/server/boards/services/store/sqlstore/data_retention.go b/server/boards/services/store/sqlstore/data_retention.go
index 3017cad048..414ad27275 100644
--- a/server/boards/services/store/sqlstore/data_retention.go
+++ b/server/boards/services/store/sqlstore/data_retention.go
@@ -12,9 +12,9 @@ import (
 	sq "github.com/Masterminds/squirrel"
 	_ "github.com/lib/pq" // postgres driver
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type RetentionTableDeletionInfo struct {
diff --git a/server/boards/services/store/sqlstore/file.go b/server/boards/services/store/sqlstore/file.go
index e8afc51e1d..abe3d98e48 100644
--- a/server/boards/services/store/sqlstore/file.go
+++ b/server/boards/services/store/sqlstore/file.go
@@ -9,10 +9,10 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (s *SQLStore) saveFileInfo(db sq.BaseRunner, fileInfo *mm_model.FileInfo) error {
diff --git a/server/boards/services/store/sqlstore/legacy_blocks.go b/server/boards/services/store/sqlstore/legacy_blocks.go
index 92714709ed..38609d6844 100644
--- a/server/boards/services/store/sqlstore/legacy_blocks.go
+++ b/server/boards/services/store/sqlstore/legacy_blocks.go
@@ -8,13 +8,13 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func legacyBoardFields(prefix string) []string {
diff --git a/server/boards/services/store/sqlstore/migrate.go b/server/boards/services/store/sqlstore/migrate.go
index 08da7df19a..1c876a5168 100644
--- a/server/boards/services/store/sqlstore/migrate.go
+++ b/server/boards/services/store/sqlstore/migrate.go
@@ -16,9 +16,9 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/mattermost/morph"
 	drivers "github.com/mattermost/morph/drivers"
@@ -28,7 +28,7 @@ import (
 
 	_ "github.com/lib/pq" // postgres driver
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 //go:embed migrations/*.sql
diff --git a/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go b/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go
index a494c9e307..d55b3e704e 100644
--- a/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go
+++ b/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go
@@ -6,7 +6,7 @@ package migrationstests
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 	"github.com/mgdelacroix/foundation"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go b/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go
index 9505df77e6..68ad2a04d2 100644
--- a/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go
+++ b/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go
@@ -6,7 +6,7 @@ package migrationstests
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 	"github.com/mgdelacroix/foundation"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/sqlstore/migrationstests/migration35_test.go b/server/boards/services/store/sqlstore/migrationstests/migration35_test.go
index ab0fbe4329..814e2b1734 100644
--- a/server/boards/services/store/sqlstore/migrationstests/migration35_test.go
+++ b/server/boards/services/store/sqlstore/migrationstests/migration35_test.go
@@ -6,7 +6,7 @@ package migrationstests
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 	"github.com/mgdelacroix/foundation"
 )
 
diff --git a/server/boards/services/store/sqlstore/migrationstests/migration36_test.go b/server/boards/services/store/sqlstore/migrationstests/migration36_test.go
index 409b521956..feedb2d8a6 100644
--- a/server/boards/services/store/sqlstore/migrationstests/migration36_test.go
+++ b/server/boards/services/store/sqlstore/migrationstests/migration36_test.go
@@ -6,7 +6,7 @@ package migrationstests
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 	"github.com/mgdelacroix/foundation"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/sqlstore/migrationstests/migration37_test.go b/server/boards/services/store/sqlstore/migrationstests/migration37_test.go
index 5bb35adf7d..1b9dd71a44 100644
--- a/server/boards/services/store/sqlstore/migrationstests/migration37_test.go
+++ b/server/boards/services/store/sqlstore/migrationstests/migration37_test.go
@@ -6,7 +6,7 @@ package migrationstests
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 	"github.com/mgdelacroix/foundation"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/sqlstore/migrationstests/migration38_test.go b/server/boards/services/store/sqlstore/migrationstests/migration38_test.go
index f76d9ae414..24b62866da 100644
--- a/server/boards/services/store/sqlstore/migrationstests/migration38_test.go
+++ b/server/boards/services/store/sqlstore/migrationstests/migration38_test.go
@@ -6,7 +6,7 @@ package migrationstests
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 	"github.com/mgdelacroix/foundation"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go b/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go
index cd788cd4b2..5abbf31e91 100644
--- a/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go
+++ b/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 	"github.com/mgdelacroix/foundation"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go b/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go
index 651d401895..1b65ef5d54 100644
--- a/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go
+++ b/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go
@@ -6,7 +6,7 @@ package migrationstests
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 	"github.com/mgdelacroix/foundation"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go b/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go
index 92f424635f..f0cbb51ece 100644
--- a/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go
+++ b/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/mgdelacroix/foundation"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 )
 
 func Test33RemoveDeletedCategoryBoards(t *testing.T) {
diff --git a/server/boards/services/store/sqlstore/notificationhints.go b/server/boards/services/store/sqlstore/notificationhints.go
index d19c236c26..ce0337cd02 100644
--- a/server/boards/services/store/sqlstore/notificationhints.go
+++ b/server/boards/services/store/sqlstore/notificationhints.go
@@ -10,10 +10,10 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var notificationHintFields = []string{
diff --git a/server/boards/services/store/sqlstore/params.go b/server/boards/services/store/sqlstore/params.go
index c75da0a9ed..f08e512eb0 100644
--- a/server/boards/services/store/sqlstore/params.go
+++ b/server/boards/services/store/sqlstore/params.go
@@ -7,9 +7,9 @@ import (
 	"database/sql"
 	"fmt"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // servicesAPI is the interface required my the Params to interact with the mattermost-server.
diff --git a/server/boards/services/store/sqlstore/public_methods.go b/server/boards/services/store/sqlstore/public_methods.go
index df4d3419ea..5947b283e7 100644
--- a/server/boards/services/store/sqlstore/public_methods.go
+++ b/server/boards/services/store/sqlstore/public_methods.go
@@ -16,10 +16,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (s *SQLStore) AddUpdateCategoryBoard(userID string, categoryID string, boardIDs []string) error {
diff --git a/server/boards/services/store/sqlstore/schema_table_migration.go b/server/boards/services/store/sqlstore/schema_table_migration.go
index 663e5d5026..cdb0f4d628 100644
--- a/server/boards/services/store/sqlstore/schema_table_migration.go
+++ b/server/boards/services/store/sqlstore/schema_table_migration.go
@@ -12,9 +12,9 @@ import (
 	sq "github.com/Masterminds/squirrel"
 	"github.com/mattermost/morph/models"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // EnsureSchemaMigrationFormat checks the schema migrations table
diff --git a/server/boards/services/store/sqlstore/session.go b/server/boards/services/store/sqlstore/session.go
index 6abe4e987c..967eed002d 100644
--- a/server/boards/services/store/sqlstore/session.go
+++ b/server/boards/services/store/sqlstore/session.go
@@ -8,8 +8,8 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 // GetActiveUserCount returns the number of users with active sessions within N seconds ago.
diff --git a/server/boards/services/store/sqlstore/sharing.go b/server/boards/services/store/sqlstore/sharing.go
index 9dc6176d72..2b7cd6faa7 100644
--- a/server/boards/services/store/sqlstore/sharing.go
+++ b/server/boards/services/store/sqlstore/sharing.go
@@ -4,8 +4,8 @@
 package sqlstore
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	sq "github.com/Masterminds/squirrel"
 )
diff --git a/server/boards/services/store/sqlstore/sqlstore.go b/server/boards/services/store/sqlstore/sqlstore.go
index b98befc5a9..8e9fe4b158 100644
--- a/server/boards/services/store/sqlstore/sqlstore.go
+++ b/server/boards/services/store/sqlstore/sqlstore.go
@@ -11,11 +11,11 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // SQLStore is a SQL database.
diff --git a/server/boards/services/store/sqlstore/sqlstore_test.go b/server/boards/services/store/sqlstore/sqlstore_test.go
index fe769a69ca..d0435f4c65 100644
--- a/server/boards/services/store/sqlstore/sqlstore_test.go
+++ b/server/boards/services/store/sqlstore/sqlstore_test.go
@@ -6,11 +6,11 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/storetests"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/storetests"
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func TestSQLStore(t *testing.T) {
diff --git a/server/boards/services/store/sqlstore/subscriptions.go b/server/boards/services/store/sqlstore/subscriptions.go
index a986cf11d5..5c7bfb93a5 100644
--- a/server/boards/services/store/sqlstore/subscriptions.go
+++ b/server/boards/services/store/sqlstore/subscriptions.go
@@ -9,9 +9,9 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var subscriptionFields = []string{
diff --git a/server/boards/services/store/sqlstore/system.go b/server/boards/services/store/sqlstore/system.go
index e6b6172f45..140fdef5ec 100644
--- a/server/boards/services/store/sqlstore/system.go
+++ b/server/boards/services/store/sqlstore/system.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 func (s *SQLStore) getSystemSetting(db sq.BaseRunner, key string) (string, error) {
diff --git a/server/boards/services/store/sqlstore/team.go b/server/boards/services/store/sqlstore/team.go
index c917b224a8..15b4b292f0 100644
--- a/server/boards/services/store/sqlstore/team.go
+++ b/server/boards/services/store/sqlstore/team.go
@@ -7,10 +7,10 @@ import (
 	"database/sql"
 	"encoding/json"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	sq "github.com/Masterminds/squirrel"
 )
diff --git a/server/boards/services/store/sqlstore/templates.go b/server/boards/services/store/sqlstore/templates.go
index d3febf9dd0..730071d0ee 100644
--- a/server/boards/services/store/sqlstore/templates.go
+++ b/server/boards/services/store/sqlstore/templates.go
@@ -9,9 +9,9 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var (
diff --git a/server/boards/services/store/sqlstore/testlib.go b/server/boards/services/store/sqlstore/testlib.go
index a79b2a1643..4a7af3661d 100644
--- a/server/boards/services/store/sqlstore/testlib.go
+++ b/server/boards/services/store/sqlstore/testlib.go
@@ -9,10 +9,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 	"github.com/mgdelacroix/foundation"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/sqlstore/user.go b/server/boards/services/store/sqlstore/user.go
index 5818b4ff6e..49113eb5af 100644
--- a/server/boards/services/store/sqlstore/user.go
+++ b/server/boards/services/store/sqlstore/user.go
@@ -8,15 +8,15 @@ import (
 	"errors"
 	"fmt"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var (
diff --git a/server/boards/services/store/sqlstore/util.go b/server/boards/services/store/sqlstore/util.go
index 0b9340d59c..2f9244f1fa 100644
--- a/server/boards/services/store/sqlstore/util.go
+++ b/server/boards/services/store/sqlstore/util.go
@@ -10,10 +10,10 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (s *SQLStore) CloseRows(rows *sql.Rows) {
diff --git a/server/boards/services/store/store.go b/server/boards/services/store/store.go
index 23b8a3d1c3..d3e994d9e5 100644
--- a/server/boards/services/store/store.go
+++ b/server/boards/services/store/store.go
@@ -8,9 +8,9 @@ package store
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const CardLimitTimestampSystemKey = "card_limit_timestamp"
diff --git a/server/boards/services/store/storetests/blocks.go b/server/boards/services/store/storetests/blocks.go
index 1df3ae288d..b3e48f560a 100644
--- a/server/boards/services/store/storetests/blocks.go
+++ b/server/boards/services/store/storetests/blocks.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/server/boards/services/store/storetests/board_insights.go b/server/boards/services/store/storetests/board_insights.go
index 304c57183b..0268178db4 100644
--- a/server/boards/services/store/storetests/board_insights.go
+++ b/server/boards/services/store/storetests/board_insights.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 )
 
 const (
diff --git a/server/boards/services/store/storetests/boards.go b/server/boards/services/store/storetests/boards.go
index 7e47e0dbeb..84bae5097d 100644
--- a/server/boards/services/store/storetests/boards.go
+++ b/server/boards/services/store/storetests/boards.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/storetests/boards_and_blocks.go b/server/boards/services/store/storetests/boards_and_blocks.go
index 1b58fc39b6..36be017610 100644
--- a/server/boards/services/store/storetests/boards_and_blocks.go
+++ b/server/boards/services/store/storetests/boards_and_blocks.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/storetests/category.go b/server/boards/services/store/storetests/category.go
index 2e1a849cd8..c7afabe2c4 100644
--- a/server/boards/services/store/storetests/category.go
+++ b/server/boards/services/store/storetests/category.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 type testFunc func(t *testing.T, store store.Store)
diff --git a/server/boards/services/store/storetests/categoryBoards.go b/server/boards/services/store/storetests/categoryBoards.go
index 5f77d461ec..a3552fb058 100644
--- a/server/boards/services/store/storetests/categoryBoards.go
+++ b/server/boards/services/store/storetests/categoryBoards.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func StoreTestCategoryBoardsStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) {
diff --git a/server/boards/services/store/storetests/cloud.go b/server/boards/services/store/storetests/cloud.go
index d29e53f7b3..792f852a17 100644
--- a/server/boards/services/store/storetests/cloud.go
+++ b/server/boards/services/store/storetests/cloud.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	storeservice "github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	storeservice "github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func StoreTestCloudStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) {
diff --git a/server/boards/services/store/storetests/compliance.go b/server/boards/services/store/storetests/compliance.go
index 4818aab0a9..1964b6257d 100644
--- a/server/boards/services/store/storetests/compliance.go
+++ b/server/boards/services/store/storetests/compliance.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func StoreTestComplianceHistoryStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) {
diff --git a/server/boards/services/store/storetests/data_retention.go b/server/boards/services/store/storetests/data_retention.go
index 47b67b05d7..df8ed9a028 100644
--- a/server/boards/services/store/storetests/data_retention.go
+++ b/server/boards/services/store/storetests/data_retention.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/storetests/files.go b/server/boards/services/store/storetests/files.go
index 9915f76467..52aa98954a 100644
--- a/server/boards/services/store/storetests/files.go
+++ b/server/boards/services/store/storetests/files.go
@@ -6,10 +6,10 @@ package storetests
 import (
 	"testing"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/services/store/storetests/helpers.go b/server/boards/services/store/storetests/helpers.go
index ec85d0c777..b7e85ca551 100644
--- a/server/boards/services/store/storetests/helpers.go
+++ b/server/boards/services/store/storetests/helpers.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 )
 
 func InsertBlocks(t *testing.T, s store.Store, blocks []*model.Block, userID string) {
diff --git a/server/boards/services/store/storetests/notificationhints.go b/server/boards/services/store/storetests/notificationhints.go
index e07d1f2429..07a31136bd 100644
--- a/server/boards/services/store/storetests/notificationhints.go
+++ b/server/boards/services/store/storetests/notificationhints.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func StoreTestNotificationHintsStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) {
diff --git a/server/boards/services/store/storetests/session.go b/server/boards/services/store/storetests/session.go
index 73876712b8..b15a71718d 100644
--- a/server/boards/services/store/storetests/session.go
+++ b/server/boards/services/store/storetests/session.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 )
 
 func StoreTestSessionStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) {
diff --git a/server/boards/services/store/storetests/sharing.go b/server/boards/services/store/storetests/sharing.go
index 94740df6eb..1bd492c5f8 100644
--- a/server/boards/services/store/storetests/sharing.go
+++ b/server/boards/services/store/storetests/sharing.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 )
 
 func StoreTestSharingStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) {
diff --git a/server/boards/services/store/storetests/subscriptions.go b/server/boards/services/store/storetests/subscriptions.go
index f21b72217f..833bcd4ca0 100644
--- a/server/boards/services/store/storetests/subscriptions.go
+++ b/server/boards/services/store/storetests/subscriptions.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 )
 
 //nolint:dupl
diff --git a/server/boards/services/store/storetests/system.go b/server/boards/services/store/storetests/system.go
index f3c16be6a4..2f0014bc78 100644
--- a/server/boards/services/store/storetests/system.go
+++ b/server/boards/services/store/storetests/system.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 )
 
 func StoreTestSystemStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) {
diff --git a/server/boards/services/store/storetests/teams.go b/server/boards/services/store/storetests/teams.go
index e3642f4f38..e2997c5008 100644
--- a/server/boards/services/store/storetests/teams.go
+++ b/server/boards/services/store/storetests/teams.go
@@ -6,14 +6,14 @@ package storetests
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 )
 
 func StoreTestTeamStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) {
diff --git a/server/boards/services/store/storetests/users.go b/server/boards/services/store/storetests/users.go
index 7fbe9ac032..73ff54ddbb 100644
--- a/server/boards/services/store/storetests/users.go
+++ b/server/boards/services/store/storetests/users.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 //nolint:dupl
diff --git a/server/boards/services/store/storetests/util.go b/server/boards/services/store/storetests/util.go
index ba8c4fd14e..976e60448e 100644
--- a/server/boards/services/store/storetests/util.go
+++ b/server/boards/services/store/storetests/util.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )
 
 func createTestUsers(t *testing.T, store store.Store, num int) []*model.User {
diff --git a/server/boards/services/telemetry/mocks/ServerIface.go b/server/boards/services/telemetry/mocks/ServerIface.go
index 3b237f22c0..54a00ab2a5 100644
--- a/server/boards/services/telemetry/mocks/ServerIface.go
+++ b/server/boards/services/telemetry/mocks/ServerIface.go
@@ -5,12 +5,12 @@
 package mocks
 
 import (
-	httpservice "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
+	httpservice "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
 	mock "github.com/stretchr/testify/mock"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	plugin "github.com/mattermost/mattermost-server/v6/plugin"
+	plugin "github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // ServerIface is an autogenerated mock type for the ServerIface type
diff --git a/server/boards/services/telemetry/telemetry.go b/server/boards/services/telemetry/telemetry.go
index 9719f76f78..256bde2bf6 100644
--- a/server/boards/services/telemetry/telemetry.go
+++ b/server/boards/services/telemetry/telemetry.go
@@ -10,10 +10,10 @@ import (
 
 	rudder "github.com/rudderlabs/analytics-go"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/scheduler"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/scheduler"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/boards/services/telemetry/telemetry_test.go b/server/boards/services/telemetry/telemetry_test.go
index f84a95affd..ec78a0587a 100644
--- a/server/boards/services/telemetry/telemetry_test.go
+++ b/server/boards/services/telemetry/telemetry_test.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func mockServer() (chan []byte, *httptest.Server) {
diff --git a/server/boards/services/webhook/webhook.go b/server/boards/services/webhook/webhook.go
index 4fbcc14bde..98c70f5ce6 100644
--- a/server/boards/services/webhook/webhook.go
+++ b/server/boards/services/webhook/webhook.go
@@ -9,10 +9,10 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // NotifyUpdate calls webhooks.
diff --git a/server/boards/services/webhook/webhook_test.go b/server/boards/services/webhook/webhook_test.go
index 60ccfad744..9d7c41ec1c 100644
--- a/server/boards/services/webhook/webhook_test.go
+++ b/server/boards/services/webhook/webhook_test.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestClientUpdateNotify(t *testing.T) {
diff --git a/server/boards/utils/callbackqueue.go b/server/boards/utils/callbackqueue.go
index 87772e18c4..cd1923bad2 100644
--- a/server/boards/utils/callbackqueue.go
+++ b/server/boards/utils/callbackqueue.go
@@ -9,7 +9,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // CallbackFunc is a func that can enqueued in the callback queue and will be
diff --git a/server/boards/utils/callbackqueue_test.go b/server/boards/utils/callbackqueue_test.go
index 2eaf16a3c2..5328fda269 100644
--- a/server/boards/utils/callbackqueue_test.go
+++ b/server/boards/utils/callbackqueue_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func Test_newChangeNotifier(t *testing.T) {
diff --git a/server/boards/utils/utils.go b/server/boards/utils/utils.go
index d9b2f4e2e3..a8220e4f62 100644
--- a/server/boards/utils/utils.go
+++ b/server/boards/utils/utils.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"time"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type IDType byte
diff --git a/server/boards/web/webserver.go b/server/boards/web/webserver.go
index 1b5594eb3f..457767a559 100644
--- a/server/boards/web/webserver.go
+++ b/server/boards/web/webserver.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // RoutedService defines the interface that is needed for any service to
diff --git a/server/boards/web/webserver_test.go b/server/boards/web/webserver_test.go
index 3dd0edcac2..24b0a04dba 100644
--- a/server/boards/web/webserver_test.go
+++ b/server/boards/web/webserver_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func Test_NewServer(t *testing.T) {
diff --git a/server/boards/ws/adapter.go b/server/boards/ws/adapter.go
index 8134da8271..be4160780a 100644
--- a/server/boards/ws/adapter.go
+++ b/server/boards/ws/adapter.go
@@ -5,7 +5,7 @@
 package ws
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 const (
diff --git a/server/boards/ws/common.go b/server/boards/ws/common.go
index ab1531eda4..4a5a1794b0 100644
--- a/server/boards/ws/common.go
+++ b/server/boards/ws/common.go
@@ -4,7 +4,7 @@
 package ws
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 // UpdateCategoryMessage is sent on block updates.
diff --git a/server/boards/ws/helpers_test.go b/server/boards/ws/helpers_test.go
index c8840131f5..997e5ef6eb 100644
--- a/server/boards/ws/helpers_test.go
+++ b/server/boards/ws/helpers_test.go
@@ -6,11 +6,11 @@ package ws
 import (
 	"testing"
 
-	authMocks "github.com/mattermost/mattermost-server/v6/server/boards/auth/mocks"
-	wsMocks "github.com/mattermost/mattermost-server/v6/server/boards/ws/mocks"
+	authMocks "github.com/mattermost/mattermost-server/server/v8/boards/auth/mocks"
+	wsMocks "github.com/mattermost/mattermost-server/server/v8/boards/ws/mocks"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/golang/mock/gomock"
 )
diff --git a/server/boards/ws/mocks/mockpluginapi.go b/server/boards/ws/mocks/mockpluginapi.go
index 45cf40000b..612dd07d17 100644
--- a/server/boards/ws/mocks/mockpluginapi.go
+++ b/server/boards/ws/mocks/mockpluginapi.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/plugin (interfaces: API)
+// Source: github.com/mattermost/mattermost-server/server/v8/plugin (interfaces: API)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -13,7 +13,7 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // MockAPI is a mock of API interface.
diff --git a/server/boards/ws/mocks/mockstore.go b/server/boards/ws/mocks/mockstore.go
index f8693f2dee..58aab276c3 100644
--- a/server/boards/ws/mocks/mockstore.go
+++ b/server/boards/ws/mocks/mockstore.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/boards/ws (interfaces: Store)
+// Source: github.com/mattermost/mattermost-server/server/v8/boards/ws (interfaces: Store)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -11,7 +11,7 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	model "github.com/mattermost/mattermost-server/v6/server/boards/model"
+	model "github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 // MockStore is a mock of Store interface.
diff --git a/server/boards/ws/plugin_adapter.go b/server/boards/ws/plugin_adapter.go
index d34a0c350f..c80f2d8e65 100644
--- a/server/boards/ws/plugin_adapter.go
+++ b/server/boards/ws/plugin_adapter.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-//go:generate mockgen -copyright_file=../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost-server/v6/plugin API
+//go:generate mockgen -copyright_file=../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost-server/server/v8/plugin API
 package ws
 
 import (
@@ -11,12 +11,12 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const websocketMessagePrefix = "custom_boards_"
diff --git a/server/boards/ws/plugin_adapter_client.go b/server/boards/ws/plugin_adapter_client.go
index 2286681aec..bb24ec5ccf 100644
--- a/server/boards/ws/plugin_adapter_client.go
+++ b/server/boards/ws/plugin_adapter_client.go
@@ -8,7 +8,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type PluginAdapterClient struct {
diff --git a/server/boards/ws/plugin_adapter_cluster.go b/server/boards/ws/plugin_adapter_cluster.go
index 636d86595b..df55772787 100644
--- a/server/boards/ws/plugin_adapter_cluster.go
+++ b/server/boards/ws/plugin_adapter_cluster.go
@@ -6,8 +6,8 @@ package ws
 import (
 	"encoding/json"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type ClusterMessage struct {
diff --git a/server/boards/ws/plugin_adapter_test.go b/server/boards/ws/plugin_adapter_test.go
index 29dfcf3a9c..88fe421842 100644
--- a/server/boards/ws/plugin_adapter_test.go
+++ b/server/boards/ws/plugin_adapter_test.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/boards/ws/server.go b/server/boards/ws/server.go
index 52a3c5a0fb..6c22f39ac3 100644
--- a/server/boards/ws/server.go
+++ b/server/boards/ws/server.go
@@ -11,11 +11,11 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (wss *websocketSession) WriteJSON(v interface{}) error {
diff --git a/server/boards/ws/server_test.go b/server/boards/ws/server_test.go
index 2b26208d97..337e0205f4 100644
--- a/server/boards/ws/server_test.go
+++ b/server/boards/ws/server_test.go
@@ -7,10 +7,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/boards/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/gorilla/websocket"
 	"github.com/stretchr/testify/require"
diff --git a/server/channels/api4/api.go b/server/channels/api4/api.go
index a5e89b5046..5240be9b39 100644
--- a/server/channels/api4/api.go
+++ b/server/channels/api4/api.go
@@ -10,9 +10,9 @@ import (
 	graphql "github.com/graph-gophers/graphql-go"
 	_ "github.com/mattermost/go-i18n/i18n"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type Routes struct {
diff --git a/server/channels/api4/apitestlib.go b/server/channels/api4/apitestlib.go
index 44d6540af5..e41bae3f38 100644
--- a/server/channels/api4/apitestlib.go
+++ b/server/channels/api4/apitestlib.go
@@ -26,18 +26,18 @@ import (
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
-	"github.com/mattermost/mattermost-server/v6/server/channels/wsapi"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/wsapi"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 type TestHelper struct {
diff --git a/server/channels/api4/bleve.go b/server/channels/api4/bleve.go
index 122882379d..022445ca82 100644
--- a/server/channels/api4/bleve.go
+++ b/server/channels/api4/bleve.go
@@ -6,8 +6,8 @@ package api4
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitBleve() {
diff --git a/server/channels/api4/bleve_test.go b/server/channels/api4/bleve_test.go
index f66aab45ed..29d873d022 100644
--- a/server/channels/api4/bleve_test.go
+++ b/server/channels/api4/bleve_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestBlevePurgeIndexes(t *testing.T) {
diff --git a/server/channels/api4/bot.go b/server/channels/api4/bot.go
index 024cd008be..e76ee02a53 100644
--- a/server/channels/api4/bot.go
+++ b/server/channels/api4/bot.go
@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitBot() {
diff --git a/server/channels/api4/bot_test.go b/server/channels/api4/bot_test.go
index 5a76d23f45..555b1b9fc5 100644
--- a/server/channels/api4/bot_test.go
+++ b/server/channels/api4/bot_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateBot(t *testing.T) {
diff --git a/server/channels/api4/brand.go b/server/channels/api4/brand.go
index a1dfbfb2c3..b5e9640a61 100644
--- a/server/channels/api4/brand.go
+++ b/server/channels/api4/brand.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitBrand() {
diff --git a/server/channels/api4/brand_test.go b/server/channels/api4/brand_test.go
index 2646191469..ec2e65ea8e 100644
--- a/server/channels/api4/brand_test.go
+++ b/server/channels/api4/brand_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
 )
 
 func TestGetBrandImage(t *testing.T) {
diff --git a/server/channels/api4/channel.go b/server/channels/api4/channel.go
index 78aab7f1cc..8425df21b1 100644
--- a/server/channels/api4/channel.go
+++ b/server/channels/api4/channel.go
@@ -10,10 +10,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitChannel() {
diff --git a/server/channels/api4/channel_category.go b/server/channels/api4/channel_category.go
index ce0625dacf..2eea5a5045 100644
--- a/server/channels/api4/channel_category.go
+++ b/server/channels/api4/channel_category.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func getCategoriesForTeamForUser(c *Context, w http.ResponseWriter, r *http.Request) {
diff --git a/server/channels/api4/channel_category_test.go b/server/channels/api4/channel_category_test.go
index e58a557ee6..527686d70c 100644
--- a/server/channels/api4/channel_category_test.go
+++ b/server/channels/api4/channel_category_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateCategoryForTeamForUser(t *testing.T) {
diff --git a/server/channels/api4/channel_local.go b/server/channels/api4/channel_local.go
index 7d85edf0c2..c5e6c6b355 100644
--- a/server/channels/api4/channel_local.go
+++ b/server/channels/api4/channel_local.go
@@ -7,10 +7,10 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitChannelLocal() {
diff --git a/server/channels/api4/channel_test.go b/server/channels/api4/channel_test.go
index 61a960b5aa..73ae52cf12 100644
--- a/server/channels/api4/channel_test.go
+++ b/server/channels/api4/channel_test.go
@@ -17,11 +17,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestCreateChannel(t *testing.T) {
diff --git a/server/channels/api4/cloud.go b/server/channels/api4/cloud.go
index 48a8ddf83f..fc1c6ce33a 100644
--- a/server/channels/api4/cloud.go
+++ b/server/channels/api4/cloud.go
@@ -11,10 +11,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/web"
 )
 
 func (api *API) InitCloud() {
diff --git a/server/channels/api4/cloud_test.go b/server/channels/api4/cloud_test.go
index 6b2067ec15..7cfe985df6 100644
--- a/server/channels/api4/cloud_test.go
+++ b/server/channels/api4/cloud_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func Test_getCloudLimits(t *testing.T) {
diff --git a/server/channels/api4/cluster.go b/server/channels/api4/cluster.go
index 74e6e2b26d..233a83f3a0 100644
--- a/server/channels/api4/cluster.go
+++ b/server/channels/api4/cluster.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitCluster() {
diff --git a/server/channels/api4/cluster_test.go b/server/channels/api4/cluster_test.go
index 8fe56ebbeb..175bfd1295 100644
--- a/server/channels/api4/cluster_test.go
+++ b/server/channels/api4/cluster_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetClusterStatus(t *testing.T) {
diff --git a/server/channels/api4/command.go b/server/channels/api4/command.go
index 5bce4b8169..cd2fe01d49 100644
--- a/server/channels/api4/command.go
+++ b/server/channels/api4/command.go
@@ -9,9 +9,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitCommand() {
diff --git a/server/channels/api4/command_help_test.go b/server/channels/api4/command_help_test.go
index ca255cc6a5..b7ba178a9c 100644
--- a/server/channels/api4/command_help_test.go
+++ b/server/channels/api4/command_help_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestHelpCommand(t *testing.T) {
diff --git a/server/channels/api4/command_local.go b/server/channels/api4/command_local.go
index 22d60acf0c..3c7f2d44b0 100644
--- a/server/channels/api4/command_local.go
+++ b/server/channels/api4/command_local.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitCommandLocal() {
diff --git a/server/channels/api4/command_test.go b/server/channels/api4/command_test.go
index e2fc67d8f0..8517a344fe 100644
--- a/server/channels/api4/command_test.go
+++ b/server/channels/api4/command_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestCreateCommand(t *testing.T) {
diff --git a/server/channels/api4/commands_test.go b/server/channels/api4/commands_test.go
index 44d3b45345..2ec4450759 100644
--- a/server/channels/api4/commands_test.go
+++ b/server/channels/api4/commands_test.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	_ "github.com/mattermost/mattermost-server/v6/server/channels/app/slashcommands"
+	_ "github.com/mattermost/mattermost-server/server/v8/channels/app/slashcommands"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestEchoCommand(t *testing.T) {
diff --git a/server/channels/api4/compliance.go b/server/channels/api4/compliance.go
index cdeb7d442d..8d86aa7030 100644
--- a/server/channels/api4/compliance.go
+++ b/server/channels/api4/compliance.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/avct/uasurfer"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitCompliance() {
diff --git a/server/channels/api4/config.go b/server/channels/api4/config.go
index 042636b17e..3d223424e0 100644
--- a/server/channels/api4/config.go
+++ b/server/channels/api4/config.go
@@ -10,12 +10,12 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var writeFilter func(c *Context, structField reflect.StructField) bool
diff --git a/server/channels/api4/config_local.go b/server/channels/api4/config_local.go
index c6f7a2dc55..33e4b9cc2f 100644
--- a/server/channels/api4/config_local.go
+++ b/server/channels/api4/config_local.go
@@ -8,11 +8,11 @@ import (
 	"net/http"
 	"reflect"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitConfigLocal() {
diff --git a/server/channels/api4/config_test.go b/server/channels/api4/config_test.go
index 5b6900d6a7..a248254253 100644
--- a/server/channels/api4/config_test.go
+++ b/server/channels/api4/config_test.go
@@ -15,9 +15,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetConfig(t *testing.T) {
diff --git a/server/channels/api4/cors_test.go b/server/channels/api4/cors_test.go
index 8fd130d0c2..f95b764495 100644
--- a/server/channels/api4/cors_test.go
+++ b/server/channels/api4/cors_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/api4/data_retention.go b/server/channels/api4/data_retention.go
index 73139ab7e0..9acb51b11a 100644
--- a/server/channels/api4/data_retention.go
+++ b/server/channels/api4/data_retention.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitDataRetention() {
diff --git a/server/channels/api4/drafts.go b/server/channels/api4/drafts.go
index bfd1112f94..d48c0b3964 100644
--- a/server/channels/api4/drafts.go
+++ b/server/channels/api4/drafts.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitDrafts() {
diff --git a/server/channels/api4/drafts_test.go b/server/channels/api4/drafts_test.go
index ed3d32c065..f9afe4eae8 100644
--- a/server/channels/api4/drafts_test.go
+++ b/server/channels/api4/drafts_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestUpsertDraft(t *testing.T) {
diff --git a/server/channels/api4/elasticsearch.go b/server/channels/api4/elasticsearch.go
index a8edfa4858..eaede8aa47 100644
--- a/server/channels/api4/elasticsearch.go
+++ b/server/channels/api4/elasticsearch.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitElasticsearch() {
diff --git a/server/channels/api4/elasticsearch_test.go b/server/channels/api4/elasticsearch_test.go
index b20bd74ab4..c814c61b5f 100644
--- a/server/channels/api4/elasticsearch_test.go
+++ b/server/channels/api4/elasticsearch_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestElasticsearchTest(t *testing.T) {
diff --git a/server/channels/api4/emoji.go b/server/channels/api4/emoji.go
index 0cbd7a0073..42db023009 100644
--- a/server/channels/api4/emoji.go
+++ b/server/channels/api4/emoji.go
@@ -8,11 +8,11 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/api4/emoji_test.go b/server/channels/api4/emoji_test.go
index b4237d2eb6..17f263e188 100644
--- a/server/channels/api4/emoji_test.go
+++ b/server/channels/api4/emoji_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateEmoji(t *testing.T) {
diff --git a/server/channels/api4/export.go b/server/channels/api4/export.go
index 47cd94a5f2..2f1110f031 100644
--- a/server/channels/api4/export.go
+++ b/server/channels/api4/export.go
@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitExport() {
diff --git a/server/channels/api4/export_test.go b/server/channels/api4/export_test.go
index 818493538d..b8c65b8ed8 100644
--- a/server/channels/api4/export_test.go
+++ b/server/channels/api4/export_test.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/channels/api4/file.go b/server/channels/api4/file.go
index 901160b3d5..b09d6d1491 100644
--- a/server/channels/api4/file.go
+++ b/server/channels/api4/file.go
@@ -14,12 +14,12 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/web"
 )
 
 const (
diff --git a/server/channels/api4/file_test.go b/server/channels/api4/file_test.go
index 05005e015e..5e412211ae 100644
--- a/server/channels/api4/file_test.go
+++ b/server/channels/api4/file_test.go
@@ -23,10 +23,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var testDir = ""
diff --git a/server/channels/api4/graphql.go b/server/channels/api4/graphql.go
index 138a004ab9..486fe117ff 100644
--- a/server/channels/api4/graphql.go
+++ b/server/channels/api4/graphql.go
@@ -13,9 +13,9 @@ import (
 	graphql "github.com/graph-gophers/graphql-go"
 	gqlerrors "github.com/graph-gophers/graphql-go/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type graphQLInput struct {
diff --git a/server/channels/api4/graphql_client.go b/server/channels/api4/graphql_client.go
index edc893eeee..571560665a 100644
--- a/server/channels/api4/graphql_client.go
+++ b/server/channels/api4/graphql_client.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // graphQLClient is an internal test client to run the tests.
diff --git a/server/channels/api4/group.go b/server/channels/api4/group.go
index d6dbfb0da3..0a465f4c00 100644
--- a/server/channels/api4/group.go
+++ b/server/channels/api4/group.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitGroup() {
diff --git a/server/channels/api4/group_test.go b/server/channels/api4/group_test.go
index 7fdf38147e..f08909dc2a 100644
--- a/server/channels/api4/group_test.go
+++ b/server/channels/api4/group_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetGroup(t *testing.T) {
diff --git a/server/channels/api4/handlers.go b/server/channels/api4/handlers.go
index 2c98381cfb..b7833fac87 100644
--- a/server/channels/api4/handlers.go
+++ b/server/channels/api4/handlers.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/mattermost/gziphandler"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type Context = web.Context
diff --git a/server/channels/api4/handlers_test.go b/server/channels/api4/handlers_test.go
index 9c2087cdaa..22a3757294 100644
--- a/server/channels/api4/handlers_test.go
+++ b/server/channels/api4/handlers_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func handlerForGzip(c *Context, w http.ResponseWriter, r *http.Request) {
diff --git a/server/channels/api4/hosted_customer.go b/server/channels/api4/hosted_customer.go
index ba791c28cc..da1a3fe545 100644
--- a/server/channels/api4/hosted_customer.go
+++ b/server/channels/api4/hosted_customer.go
@@ -15,10 +15,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/web"
 )
 
 // APIs for self-hosted workspaces to communicate with the backing customer & payments system.
diff --git a/server/channels/api4/hosted_customer_test.go b/server/channels/api4/hosted_customer_test.go
index 25bc35c779..671cc0f86e 100644
--- a/server/channels/api4/hosted_customer_test.go
+++ b/server/channels/api4/hosted_customer_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var valFalse = false
diff --git a/server/channels/api4/image.go b/server/channels/api4/image.go
index f6f67cd516..3884ed0954 100644
--- a/server/channels/api4/image.go
+++ b/server/channels/api4/image.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitImage() {
diff --git a/server/channels/api4/image_test.go b/server/channels/api4/image_test.go
index 4c552e7d86..5f188f77b8 100644
--- a/server/channels/api4/image_test.go
+++ b/server/channels/api4/image_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetImage(t *testing.T) {
diff --git a/server/channels/api4/import.go b/server/channels/api4/import.go
index 0e4d3d9c34..acb1ade270 100644
--- a/server/channels/api4/import.go
+++ b/server/channels/api4/import.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitImport() {
diff --git a/server/channels/api4/import_test.go b/server/channels/api4/import_test.go
index 2ae8b10b19..7ed85a0224 100644
--- a/server/channels/api4/import_test.go
+++ b/server/channels/api4/import_test.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestListImports(t *testing.T) {
diff --git a/server/channels/api4/insights.go b/server/channels/api4/insights.go
index dd9e204eae..48e3eee641 100644
--- a/server/channels/api4/insights.go
+++ b/server/channels/api4/insights.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitInsights() {
diff --git a/server/channels/api4/insights_test.go b/server/channels/api4/insights_test.go
index 1acb8496f4..88c40ffb1a 100644
--- a/server/channels/api4/insights_test.go
+++ b/server/channels/api4/insights_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // Top Reactions
diff --git a/server/channels/api4/integration_action.go b/server/channels/api4/integration_action.go
index f008ece921..bd9d65832f 100644
--- a/server/channels/api4/integration_action.go
+++ b/server/channels/api4/integration_action.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitAction() {
diff --git a/server/channels/api4/integration_action_test.go b/server/channels/api4/integration_action_test.go
index 92b4f2ccbe..d090b6c1ec 100644
--- a/server/channels/api4/integration_action_test.go
+++ b/server/channels/api4/integration_action_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type testHandler struct {
diff --git a/server/channels/api4/job.go b/server/channels/api4/job.go
index a7d0a1e3ed..63368eb1a1 100644
--- a/server/channels/api4/job.go
+++ b/server/channels/api4/job.go
@@ -10,10 +10,10 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/web"
 )
 
 func (api *API) InitJob() {
diff --git a/server/channels/api4/job_test.go b/server/channels/api4/job_test.go
index e80b1e2d14..2ff395202f 100644
--- a/server/channels/api4/job_test.go
+++ b/server/channels/api4/job_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateJob(t *testing.T) {
diff --git a/server/channels/api4/ldap.go b/server/channels/api4/ldap.go
index d914386a12..cfdfe154b0 100644
--- a/server/channels/api4/ldap.go
+++ b/server/channels/api4/ldap.go
@@ -8,9 +8,9 @@ import (
 	"mime/multipart"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type mixedUnlinkedGroup struct {
diff --git a/server/channels/api4/ldap_test.go b/server/channels/api4/ldap_test.go
index e3583f9293..4187bb25c8 100644
--- a/server/channels/api4/ldap_test.go
+++ b/server/channels/api4/ldap_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 var spPrivateKey = `-----BEGIN PRIVATE KEY-----
diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go
index ff63704774..065ff90fd6 100644
--- a/server/channels/api4/license.go
+++ b/server/channels/api4/license.go
@@ -11,11 +11,11 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitLicense() {
diff --git a/server/channels/api4/license_local.go b/server/channels/api4/license_local.go
index f2a30a972b..e1380b3f6f 100644
--- a/server/channels/api4/license_local.go
+++ b/server/channels/api4/license_local.go
@@ -9,9 +9,9 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitLicenseLocal() {
diff --git a/server/channels/api4/license_test.go b/server/channels/api4/license_test.go
index d673e13543..d580d6243d 100644
--- a/server/channels/api4/license_test.go
+++ b/server/channels/api4/license_test.go
@@ -10,11 +10,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	mocks2 "github.com/mattermost/mattermost-server/v6/server/channels/utils/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	mocks2 "github.com/mattermost/mattermost-server/server/v8/channels/utils/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
diff --git a/server/channels/api4/main_test.go b/server/channels/api4/main_test.go
index 85807f03db..e7b1bb91e3 100644
--- a/server/channels/api4/main_test.go
+++ b/server/channels/api4/main_test.go
@@ -7,7 +7,7 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 )
 
 var replicaFlag bool
diff --git a/server/channels/api4/notify_admin.go b/server/channels/api4/notify_admin.go
index 36af8263a0..e94f280de9 100644
--- a/server/channels/api4/notify_admin.go
+++ b/server/channels/api4/notify_admin.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func handleNotifyAdmin(c *Context, w http.ResponseWriter, r *http.Request) {
diff --git a/server/channels/api4/notify_admin_test.go b/server/channels/api4/notify_admin_test.go
index 2ba2640451..557ee3297c 100644
--- a/server/channels/api4/notify_admin_test.go
+++ b/server/channels/api4/notify_admin_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestNotifyAdmin(t *testing.T) {
diff --git a/server/channels/api4/oauth.go b/server/channels/api4/oauth.go
index bed603afe3..fb486cc7c2 100644
--- a/server/channels/api4/oauth.go
+++ b/server/channels/api4/oauth.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitOAuth() {
diff --git a/server/channels/api4/oauth_test.go b/server/channels/api4/oauth_test.go
index face6ca564..1ab7ea5191 100644
--- a/server/channels/api4/oauth_test.go
+++ b/server/channels/api4/oauth_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateOAuthApp(t *testing.T) {
diff --git a/server/channels/api4/openGraph.go b/server/channels/api4/openGraph.go
index 789afc3730..0eba8030a8 100644
--- a/server/channels/api4/openGraph.go
+++ b/server/channels/api4/openGraph.go
@@ -6,8 +6,8 @@ package api4
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitOpenGraph() {
diff --git a/server/channels/api4/openGraph_test.go b/server/channels/api4/openGraph_test.go
index 5faedfc9ae..5a038fb4da 100644
--- a/server/channels/api4/openGraph_test.go
+++ b/server/channels/api4/openGraph_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetOpenGraphMetadata(t *testing.T) {
diff --git a/server/channels/api4/permission.go b/server/channels/api4/permission.go
index a0aac0a6eb..f732f3afe9 100644
--- a/server/channels/api4/permission.go
+++ b/server/channels/api4/permission.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitPermissions() {
diff --git a/server/channels/api4/permissions_test.go b/server/channels/api4/permissions_test.go
index 1eb4b3d01e..16aa71d135 100644
--- a/server/channels/api4/permissions_test.go
+++ b/server/channels/api4/permissions_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetAncillaryPermissions(t *testing.T) {
diff --git a/server/channels/api4/plugin.go b/server/channels/api4/plugin.go
index e645a5822c..c6aa44961e 100644
--- a/server/channels/api4/plugin.go
+++ b/server/channels/api4/plugin.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/api4/plugin_test.go b/server/channels/api4/plugin_test.go
index 24c0d5d483..5793041423 100644
--- a/server/channels/api4/plugin_test.go
+++ b/server/channels/api4/plugin_test.go
@@ -22,10 +22,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 func TestPlugin(t *testing.T) {
diff --git a/server/channels/api4/post.go b/server/channels/api4/post.go
index 1588a3b913..8690aa4e32 100644
--- a/server/channels/api4/post.go
+++ b/server/channels/api4/post.go
@@ -9,11 +9,11 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitPost() {
diff --git a/server/channels/api4/post_test.go b/server/channels/api4/post_test.go
index fd480eb5d9..6be2cb3223 100644
--- a/server/channels/api4/post_test.go
+++ b/server/channels/api4/post_test.go
@@ -21,13 +21,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestCreatePost(t *testing.T) {
diff --git a/server/channels/api4/preference.go b/server/channels/api4/preference.go
index fa522de844..4483e00c22 100644
--- a/server/channels/api4/preference.go
+++ b/server/channels/api4/preference.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitPreference() {
diff --git a/server/channels/api4/preference_test.go b/server/channels/api4/preference_test.go
index 8f70c00445..b270995099 100644
--- a/server/channels/api4/preference_test.go
+++ b/server/channels/api4/preference_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetPreferences(t *testing.T) {
diff --git a/server/channels/api4/reaction.go b/server/channels/api4/reaction.go
index b2b65892a1..b58a71e8f9 100644
--- a/server/channels/api4/reaction.go
+++ b/server/channels/api4/reaction.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitReaction() {
diff --git a/server/channels/api4/reaction_test.go b/server/channels/api4/reaction_test.go
index 21aeaa3b0e..45d3aab9a3 100644
--- a/server/channels/api4/reaction_test.go
+++ b/server/channels/api4/reaction_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSaveReaction(t *testing.T) {
diff --git a/server/channels/api4/remote_cluster.go b/server/channels/api4/remote_cluster.go
index f469da5a60..75783f0c98 100644
--- a/server/channels/api4/remote_cluster.go
+++ b/server/channels/api4/remote_cluster.go
@@ -9,11 +9,11 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitRemoteCluster() {
diff --git a/server/channels/api4/resolver.go b/server/channels/api4/resolver.go
index 7148325e61..2e46e6d8b2 100644
--- a/server/channels/api4/resolver.go
+++ b/server/channels/api4/resolver.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/graph-gophers/dataloader/v6"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // cursorPrefix is used to categorize objects
diff --git a/server/channels/api4/resolver_channel.go b/server/channels/api4/resolver_channel.go
index 1061102b2d..0650248131 100644
--- a/server/channels/api4/resolver_channel.go
+++ b/server/channels/api4/resolver_channel.go
@@ -10,8 +10,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // channel is an internal graphQL wrapper struct to add resolver methods.
diff --git a/server/channels/api4/resolver_channel_member.go b/server/channels/api4/resolver_channel_member.go
index 22d6a2c380..e26aaca041 100644
--- a/server/channels/api4/resolver_channel_member.go
+++ b/server/channels/api4/resolver_channel_member.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/graph-gophers/dataloader/v6"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // channelMember is an internal graphQL wrapper struct to add resolver methods.
diff --git a/server/channels/api4/resolver_channel_member_test.go b/server/channels/api4/resolver_channel_member_test.go
index fc55454516..e1c5cc9699 100644
--- a/server/channels/api4/resolver_channel_member_test.go
+++ b/server/channels/api4/resolver_channel_member_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGraphQLChannelMembers(t *testing.T) {
diff --git a/server/channels/api4/resolver_channel_test.go b/server/channels/api4/resolver_channel_test.go
index 891d476393..6d1b535568 100644
--- a/server/channels/api4/resolver_channel_test.go
+++ b/server/channels/api4/resolver_channel_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGraphQLChannels(t *testing.T) {
diff --git a/server/channels/api4/resolver_sidebar_categories_test.go b/server/channels/api4/resolver_sidebar_categories_test.go
index a0882a88f5..5d4b3ee691 100644
--- a/server/channels/api4/resolver_sidebar_categories_test.go
+++ b/server/channels/api4/resolver_sidebar_categories_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGraphQLSidebarCategories(t *testing.T) {
diff --git a/server/channels/api4/resolver_team.go b/server/channels/api4/resolver_team.go
index 42ac606e2f..a94be2cc5a 100644
--- a/server/channels/api4/resolver_team.go
+++ b/server/channels/api4/resolver_team.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/graph-gophers/dataloader/v6"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func getGraphQLTeam(ctx context.Context, id string) (*model.Team, error) {
diff --git a/server/channels/api4/resolver_team_member.go b/server/channels/api4/resolver_team_member.go
index 0da4656aab..3036a4d146 100644
--- a/server/channels/api4/resolver_team_member.go
+++ b/server/channels/api4/resolver_team_member.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/graph-gophers/dataloader/v6"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // teamMember is an internal graphQL wrapper struct to add resolver methods.
diff --git a/server/channels/api4/resolver_team_member_test.go b/server/channels/api4/resolver_team_member_test.go
index 95d003df8e..42b7c9efe1 100644
--- a/server/channels/api4/resolver_team_member_test.go
+++ b/server/channels/api4/resolver_team_member_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGraphQLTeamMembers(t *testing.T) {
diff --git a/server/channels/api4/resolver_test.go b/server/channels/api4/resolver_test.go
index 7911154c08..17eba4b864 100644
--- a/server/channels/api4/resolver_test.go
+++ b/server/channels/api4/resolver_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGraphQLConfig(t *testing.T) {
diff --git a/server/channels/api4/resolver_user.go b/server/channels/api4/resolver_user.go
index 5fa364eeb4..588b961e7f 100644
--- a/server/channels/api4/resolver_user.go
+++ b/server/channels/api4/resolver_user.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/graph-gophers/dataloader/v6"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // user is an internal graphQL wrapper struct to add resolver methods.
diff --git a/server/channels/api4/resolver_user_test.go b/server/channels/api4/resolver_user_test.go
index 1a13f819a7..b6104a181d 100644
--- a/server/channels/api4/resolver_user_test.go
+++ b/server/channels/api4/resolver_user_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGraphQLUser(t *testing.T) {
diff --git a/server/channels/api4/role.go b/server/channels/api4/role.go
index b7ca855ef7..40d4527bf9 100644
--- a/server/channels/api4/role.go
+++ b/server/channels/api4/role.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var notAllowedPermissions = []string{
diff --git a/server/channels/api4/role_test.go b/server/channels/api4/role_test.go
index 0a1d3145cd..5bc281a21c 100644
--- a/server/channels/api4/role_test.go
+++ b/server/channels/api4/role_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetAllRoles(t *testing.T) {
diff --git a/server/channels/api4/saml.go b/server/channels/api4/saml.go
index d78b0449f5..4cae4f2d55 100644
--- a/server/channels/api4/saml.go
+++ b/server/channels/api4/saml.go
@@ -10,9 +10,9 @@ import (
 	"mime/multipart"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitSaml() {
diff --git a/server/channels/api4/saml_test.go b/server/channels/api4/saml_test.go
index 0ededf5ea4..2d41632fe5 100644
--- a/server/channels/api4/saml_test.go
+++ b/server/channels/api4/saml_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetSamlMetadata(t *testing.T) {
diff --git a/server/channels/api4/scheme.go b/server/channels/api4/scheme.go
index 7ff94d3e07..85dc095382 100644
--- a/server/channels/api4/scheme.go
+++ b/server/channels/api4/scheme.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitScheme() {
diff --git a/server/channels/api4/scheme_test.go b/server/channels/api4/scheme_test.go
index ba478a243e..13e4e631d3 100644
--- a/server/channels/api4/scheme_test.go
+++ b/server/channels/api4/scheme_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateScheme(t *testing.T) {
diff --git a/server/channels/api4/shared_channel.go b/server/channels/api4/shared_channel.go
index 5e53ee5f33..8bb40a82d5 100644
--- a/server/channels/api4/shared_channel.go
+++ b/server/channels/api4/shared_channel.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitSharedChannels() {
diff --git a/server/channels/api4/shared_channel_test.go b/server/channels/api4/shared_channel_test.go
index 0f15f6c965..befe9642b6 100644
--- a/server/channels/api4/shared_channel_test.go
+++ b/server/channels/api4/shared_channel_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var (
diff --git a/server/channels/api4/status.go b/server/channels/api4/status.go
index 8ff7eaa248..62a4c0e7ec 100644
--- a/server/channels/api4/status.go
+++ b/server/channels/api4/status.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitStatus() {
diff --git a/server/channels/api4/status_test.go b/server/channels/api4/status_test.go
index 61241a5718..bde3e695b4 100644
--- a/server/channels/api4/status_test.go
+++ b/server/channels/api4/status_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetUserStatus(t *testing.T) {
diff --git a/server/channels/api4/system.go b/server/channels/api4/system.go
index 00143beeb8..bb3442ba54 100644
--- a/server/channels/api4/system.go
+++ b/server/channels/api4/system.go
@@ -17,12 +17,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/upgrader"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/upgrader"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/web"
 )
 
 const (
diff --git a/server/channels/api4/system_local.go b/server/channels/api4/system_local.go
index dc7508c874..65e6d12b1c 100644
--- a/server/channels/api4/system_local.go
+++ b/server/channels/api4/system_local.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitSystemLocal() {
diff --git a/server/channels/api4/system_test.go b/server/channels/api4/system_test.go
index effce7253d..5921e32802 100644
--- a/server/channels/api4/system_test.go
+++ b/server/channels/api4/system_test.go
@@ -21,9 +21,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestGetPing(t *testing.T) {
diff --git a/server/channels/api4/team.go b/server/channels/api4/team.go
index 0049b47c38..bef7d2223d 100644
--- a/server/channels/api4/team.go
+++ b/server/channels/api4/team.go
@@ -14,9 +14,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/api4/team_local.go b/server/channels/api4/team_local.go
index d9b1019ef3..310ea0de84 100644
--- a/server/channels/api4/team_local.go
+++ b/server/channels/api4/team_local.go
@@ -12,11 +12,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/email"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/email"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitTeamLocal() {
diff --git a/server/channels/api4/team_test.go b/server/channels/api4/team_test.go
index f511ffe3f1..ee4a4ca74d 100644
--- a/server/channels/api4/team_test.go
+++ b/server/channels/api4/team_test.go
@@ -17,14 +17,14 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestCreateTeam(t *testing.T) {
diff --git a/server/channels/api4/terms_of_service.go b/server/channels/api4/terms_of_service.go
index a5906cc77e..d0d72604f8 100644
--- a/server/channels/api4/terms_of_service.go
+++ b/server/channels/api4/terms_of_service.go
@@ -7,10 +7,10 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitTermsOfService() {
diff --git a/server/channels/api4/terms_of_service_test.go b/server/channels/api4/terms_of_service_test.go
index e3699d14a4..eac3ed54fe 100644
--- a/server/channels/api4/terms_of_service_test.go
+++ b/server/channels/api4/terms_of_service_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetTermsOfService(t *testing.T) {
diff --git a/server/channels/api4/upload.go b/server/channels/api4/upload.go
index f94a351149..55850903db 100644
--- a/server/channels/api4/upload.go
+++ b/server/channels/api4/upload.go
@@ -10,10 +10,10 @@ import (
 	"mime/multipart"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitUpload() {
diff --git a/server/channels/api4/upload_test.go b/server/channels/api4/upload_test.go
index 9606d660bb..9ed6d1eaae 100644
--- a/server/channels/api4/upload_test.go
+++ b/server/channels/api4/upload_test.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateUpload(t *testing.T) {
diff --git a/server/channels/api4/usage.go b/server/channels/api4/usage.go
index d39ecbead4..fabf880a32 100644
--- a/server/channels/api4/usage.go
+++ b/server/channels/api4/usage.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitUsage() {
diff --git a/server/channels/api4/usage_test.go b/server/channels/api4/usage_test.go
index a8e93dc9f7..b85b2f0029 100644
--- a/server/channels/api4/usage_test.go
+++ b/server/channels/api4/usage_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetPostsUsage(t *testing.T) {
diff --git a/server/channels/api4/user.go b/server/channels/api4/user.go
index 11d4a71e0f..c259922e82 100644
--- a/server/channels/api4/user.go
+++ b/server/channels/api4/user.go
@@ -12,13 +12,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitUser() {
diff --git a/server/channels/api4/user_local.go b/server/channels/api4/user_local.go
index ec1d2d2aba..21cc0f800c 100644
--- a/server/channels/api4/user_local.go
+++ b/server/channels/api4/user_local.go
@@ -9,11 +9,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitUserLocal() {
diff --git a/server/channels/api4/user_test.go b/server/channels/api4/user_test.go
index b6dde5e2a1..95db64d720 100644
--- a/server/channels/api4/user_test.go
+++ b/server/channels/api4/user_test.go
@@ -20,13 +20,13 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
 
-	_ "github.com/mattermost/mattermost-server/v6/model/oauthproviders/gitlab"
+	_ "github.com/mattermost/mattermost-server/server/v8/model/oauthproviders/gitlab"
 )
 
 func TestCreateUser(t *testing.T) {
diff --git a/server/channels/api4/user_viewmembers_test.go b/server/channels/api4/user_viewmembers_test.go
index 1359873866..40c051b0ae 100644
--- a/server/channels/api4/user_viewmembers_test.go
+++ b/server/channels/api4/user_viewmembers_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestAPIRestrictedViewMembers(t *testing.T) {
diff --git a/server/channels/api4/webhook.go b/server/channels/api4/webhook.go
index 36b5aa113a..4d96e08a61 100644
--- a/server/channels/api4/webhook.go
+++ b/server/channels/api4/webhook.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitWebhook() {
diff --git a/server/channels/api4/webhook_local.go b/server/channels/api4/webhook_local.go
index dbe57deb06..eacdf2af88 100644
--- a/server/channels/api4/webhook_local.go
+++ b/server/channels/api4/webhook_local.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitWebhookLocal() {
diff --git a/server/channels/api4/webhook_test.go b/server/channels/api4/webhook_test.go
index 85335dbb35..468fd58082 100644
--- a/server/channels/api4/webhook_test.go
+++ b/server/channels/api4/webhook_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateIncomingWebhook(t *testing.T) {
diff --git a/server/channels/api4/websocket.go b/server/channels/api4/websocket.go
index e2fa25a565..54fea3f4aa 100644
--- a/server/channels/api4/websocket.go
+++ b/server/channels/api4/websocket.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/api4/websocket_norace_test.go b/server/channels/api4/websocket_norace_test.go
index 88d2a508c7..5be1d539c2 100644
--- a/server/channels/api4/websocket_norace_test.go
+++ b/server/channels/api4/websocket_norace_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // TestWebSocket is intentionally made to skip -race mode
diff --git a/server/channels/api4/websocket_test.go b/server/channels/api4/websocket_test.go
index c1a804f3bc..87eef66dbe 100644
--- a/server/channels/api4/websocket_test.go
+++ b/server/channels/api4/websocket_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestWebSocketTrailingSlash(t *testing.T) {
diff --git a/server/channels/api4/work_templates.go b/server/channels/api4/work_templates.go
index 2f6836682e..bf3d5860b7 100644
--- a/server/channels/api4/work_templates.go
+++ b/server/channels/api4/work_templates.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitWorkTemplate() {
diff --git a/server/channels/app/admin.go b/server/channels/app/admin.go
index fb3ab53000..b559dca1e0 100644
--- a/server/channels/app/admin.go
+++ b/server/channels/app/admin.go
@@ -10,11 +10,11 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
 )
 
 var latestVersionCache = cache.NewLRU(cache.LRUOptions{
diff --git a/server/channels/app/admin_advisor.go b/server/channels/app/admin_advisor.go
index 23397e1060..70fb4b4151 100644
--- a/server/channels/app/admin_advisor.go
+++ b/server/channels/app/admin_advisor.go
@@ -7,11 +7,11 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) GetWarnMetricsStatus() (map[string]*model.WarnMetricStatus, *model.AppError) {
diff --git a/server/channels/app/admin_test.go b/server/channels/app/admin_test.go
index 00c0175ead..a583a572e3 100644
--- a/server/channels/app/admin_test.go
+++ b/server/channels/app/admin_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetLatestVersion(t *testing.T) {
diff --git a/server/channels/app/analytics.go b/server/channels/app/analytics.go
index c4582df158..83b8eb043f 100644
--- a/server/channels/app/analytics.go
+++ b/server/channels/app/analytics.go
@@ -8,8 +8,8 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/app.go b/server/channels/app/app.go
index 20387b2234..f7f30c1936 100644
--- a/server/channels/app/app.go
+++ b/server/channels/app/app.go
@@ -9,16 +9,16 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/timezones"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/templates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/timezones"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/templates"
 )
 
 // App is a pure functional component that does not have any fields, except Server.
diff --git a/server/channels/app/app_iface.go b/server/channels/app/app_iface.go
index b402409be2..578699e941 100644
--- a/server/channels/app/app_iface.go
+++ b/server/channels/app/app_iface.go
@@ -18,23 +18,23 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/timezones"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/timezones"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // AppIface is extracted from App struct and contains all it's exported methods. It's provided to allow partial interface passing and app layers creation.
diff --git a/server/channels/app/app_test.go b/server/channels/app/app_test.go
index 291a4daa5f..16b6805276 100644
--- a/server/channels/app/app_test.go
+++ b/server/channels/app/app_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 /* Temporarily comment out until MM-11108
diff --git a/server/channels/app/audit.go b/server/channels/app/audit.go
index 00d441ddc7..e599d2e9d7 100644
--- a/server/channels/app/audit.go
+++ b/server/channels/app/audit.go
@@ -9,11 +9,11 @@ import (
 	"net/http"
 	"os/user"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var (
diff --git a/server/channels/app/authentication.go b/server/channels/app/authentication.go
index dbac2df81a..aac42c936c 100644
--- a/server/channels/app/authentication.go
+++ b/server/channels/app/authentication.go
@@ -8,10 +8,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mfa"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mfa"
 )
 
 type TokenLocation int
diff --git a/server/channels/app/authentication_test.go b/server/channels/app/authentication_test.go
index 38e83cc383..eb4ed1d4cf 100644
--- a/server/channels/app/authentication_test.go
+++ b/server/channels/app/authentication_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestParseAuthTokenFromRequest(t *testing.T) {
diff --git a/server/channels/app/authorization.go b/server/channels/app/authorization.go
index 5a115703ef..261dc39a34 100644
--- a/server/channels/app/authorization.go
+++ b/server/channels/app/authorization.go
@@ -9,9 +9,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) MakePermissionError(s *model.Session, permissions []*model.Permission) *model.AppError {
diff --git a/server/channels/app/authorization_test.go b/server/channels/app/authorization_test.go
index 9560e76e44..b326c22db7 100644
--- a/server/channels/app/authorization_test.go
+++ b/server/channels/app/authorization_test.go
@@ -16,9 +16,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestCheckIfRolesGrantPermission(t *testing.T) {
diff --git a/server/channels/app/auto_responder.go b/server/channels/app/auto_responder.go
index 849509e782..d002cf0ab5 100644
--- a/server/channels/app/auto_responder.go
+++ b/server/channels/app/auto_responder.go
@@ -7,8 +7,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // check if there is any auto_response type post in channel by the user in a calender day
diff --git a/server/channels/app/auto_responder_test.go b/server/channels/app/auto_responder_test.go
index a7acc6eca1..8bd9e8493a 100644
--- a/server/channels/app/auto_responder_test.go
+++ b/server/channels/app/auto_responder_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSetAutoResponderStatus(t *testing.T) {
diff --git a/server/channels/app/bot.go b/server/channels/app/bot.go
index 3f8db288b8..ae117a05da 100644
--- a/server/channels/app/bot.go
+++ b/server/channels/app/bot.go
@@ -9,12 +9,12 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/bot_test.go b/server/channels/app/bot_test.go
index 6b77b08fa0..c417678679 100644
--- a/server/channels/app/bot_test.go
+++ b/server/channels/app/bot_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateBot(t *testing.T) {
diff --git a/server/channels/app/brand.go b/server/channels/app/brand.go
index be3b6c32be..3c2abf3650 100644
--- a/server/channels/app/brand.go
+++ b/server/channels/app/brand.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/app/busy.go b/server/channels/app/busy.go
index 41b9c758db..a72bb2ce71 100644
--- a/server/channels/app/busy.go
+++ b/server/channels/app/busy.go
@@ -10,8 +10,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/app/busy_test.go b/server/channels/app/busy_test.go
index 87fe0df323..2b267fa443 100644
--- a/server/channels/app/busy_test.go
+++ b/server/channels/app/busy_test.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestBusySet(t *testing.T) {
diff --git a/server/channels/app/channel.go b/server/channels/app/channel.go
index e03e627487..09fb2ce1cc 100644
--- a/server/channels/app/channel.go
+++ b/server/channels/app/channel.go
@@ -14,15 +14,15 @@ import (
 
 	"github.com/mattermost/logr/v2"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // channelsWrapper provides an implementation of `product.ChannelService` to be used by products.
diff --git a/server/channels/app/channel_category.go b/server/channels/app/channel_category.go
index b9758c38d1..6b4ce964d2 100644
--- a/server/channels/app/channel_category.go
+++ b/server/channels/app/channel_category.go
@@ -8,10 +8,10 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) createInitialSidebarCategories(userID string, opts *store.SidebarCategorySearchOpts) (*model.OrderedSidebarCategories, *model.AppError) {
diff --git a/server/channels/app/channel_category_test.go b/server/channels/app/channel_category_test.go
index f9759742f6..f697f773d7 100644
--- a/server/channels/app/channel_category_test.go
+++ b/server/channels/app/channel_category_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSidebarCategory(t *testing.T) {
diff --git a/server/channels/app/channel_test.go b/server/channels/app/channel_test.go
index f06449368c..87ab389beb 100644
--- a/server/channels/app/channel_test.go
+++ b/server/channels/app/channel_test.go
@@ -18,9 +18,9 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPermanentDeleteChannel(t *testing.T) {
diff --git a/server/channels/app/channels.go b/server/channels/app/channels.go
index f2ae0e6d11..57252b403a 100644
--- a/server/channels/app/channels.go
+++ b/server/channels/app/channels.go
@@ -11,16 +11,16 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imaging"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imaging"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const ServerKey product.ServiceKey = "server"
diff --git a/server/channels/app/cloud.go b/server/channels/app/cloud.go
index 29cd5a50c1..3114368f1f 100644
--- a/server/channels/app/cloud.go
+++ b/server/channels/app/cloud.go
@@ -10,10 +10,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // Ensure cloud service wrapper implements `product.CloudService`
diff --git a/server/channels/app/cluster_handlers.go b/server/channels/app/cluster_handlers.go
index 896eee9eb1..7c5ce3b983 100644
--- a/server/channels/app/cluster_handlers.go
+++ b/server/channels/app/cluster_handlers.go
@@ -6,9 +6,9 @@ package app
 import (
 	"encoding/json"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 func (s *Server) clusterInstallPluginHandler(msg *model.ClusterMessage) {
diff --git a/server/channels/app/collection.go b/server/channels/app/collection.go
index f144fb3237..dbe7c0d8a3 100644
--- a/server/channels/app/collection.go
+++ b/server/channels/app/collection.go
@@ -6,8 +6,8 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) RegisterCollectionAndTopic(pluginID, collectionType, topicType string) error {
diff --git a/server/channels/app/command.go b/server/channels/app/command.go
index acf4e496c2..1e94e5cdad 100644
--- a/server/channels/app/command.go
+++ b/server/channels/app/command.go
@@ -14,11 +14,11 @@ import (
 	"sync"
 	"unicode"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/command_autocomplete.go b/server/channels/app/command_autocomplete.go
index 434fa3cd20..6132332d31 100644
--- a/server/channels/app/command_autocomplete.go
+++ b/server/channels/app/command_autocomplete.go
@@ -11,9 +11,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // AutocompleteDynamicArgProvider dynamically provides auto-completion args for built-in commands.
diff --git a/server/channels/app/command_autocomplete_test.go b/server/channels/app/command_autocomplete_test.go
index 19d8bc9817..99e5d40855 100644
--- a/server/channels/app/command_autocomplete_test.go
+++ b/server/channels/app/command_autocomplete_test.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func TestParseStaticListArgument(t *testing.T) {
diff --git a/server/channels/app/compliance.go b/server/channels/app/compliance.go
index 95c68ab9ba..40e333825f 100644
--- a/server/channels/app/compliance.go
+++ b/server/channels/app/compliance.go
@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) GetComplianceReports(page, perPage int) (model.Compliances, *model.AppError) {
diff --git a/server/channels/app/config.go b/server/channels/app/config.go
index 39961922c5..93719b3461 100644
--- a/server/channels/app/config.go
+++ b/server/channels/app/config.go
@@ -14,10 +14,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/config_test.go b/server/channels/app/config_test.go
index 65a3ae4d92..102de38754 100644
--- a/server/channels/app/config_test.go
+++ b/server/channels/app/config_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestAsymmetricSigningKey(t *testing.T) {
diff --git a/server/channels/app/context.go b/server/channels/app/context.go
index 5a289e6037..03cb895b37 100644
--- a/server/channels/app/context.go
+++ b/server/channels/app/context.go
@@ -6,9 +6,9 @@ package app
 import (
 	"context"
 
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // WithMaster adds the context value that master DB should be selected for this request.
diff --git a/server/channels/app/data_retention.go b/server/channels/app/data_retention.go
index e7b914e14d..dd2ef11dca 100644
--- a/server/channels/app/data_retention.go
+++ b/server/channels/app/data_retention.go
@@ -6,7 +6,7 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetGlobalRetentionPolicy() (*model.GlobalRetentionPolicy, *model.AppError) {
diff --git a/server/channels/app/download.go b/server/channels/app/download.go
index 9646c357f7..ec6ddf8b14 100644
--- a/server/channels/app/download.go
+++ b/server/channels/app/download.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/app/download_test.go b/server/channels/app/download_test.go
index 7830647d27..172c527c19 100644
--- a/server/channels/app/download_test.go
+++ b/server/channels/app/download_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestDownloadFromURL(t *testing.T) {
diff --git a/server/channels/app/draft.go b/server/channels/app/draft.go
index a8ca1ef9d2..83e9d748ff 100644
--- a/server/channels/app/draft.go
+++ b/server/channels/app/draft.go
@@ -9,10 +9,10 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) GetDraft(userID, channelID, rootID string) (*model.Draft, *model.AppError) {
diff --git a/server/channels/app/draft_test.go b/server/channels/app/draft_test.go
index 83c7d090d8..ac19cedac0 100644
--- a/server/channels/app/draft_test.go
+++ b/server/channels/app/draft_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetDraft(t *testing.T) {
diff --git a/server/channels/app/email/email.go b/server/channels/app/email/email.go
index bb64e6efd0..2b3fcacef8 100644
--- a/server/channels/app/email/email.go
+++ b/server/channels/app/email/email.go
@@ -15,11 +15,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/templates"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/templates"
 
 	"github.com/microcosm-cc/bluemonday"
 )
diff --git a/server/channels/app/email/email_batching.go b/server/channels/app/email/email_batching.go
index 91e4bd1204..1988a358cd 100644
--- a/server/channels/app/email/email_batching.go
+++ b/server/channels/app/email/email_batching.go
@@ -14,9 +14,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/email/email_batching_test.go b/server/channels/app/email/email_batching_test.go
index 4444bc253d..087351e6a3 100644
--- a/server/channels/app/email/email_batching_test.go
+++ b/server/channels/app/email/email_batching_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestHandleNewNotifications(t *testing.T) {
diff --git a/server/channels/app/email/email_test.go b/server/channels/app/email/email_test.go
index 3fb2e09a7a..7a8c87979e 100644
--- a/server/channels/app/email/email_test.go
+++ b/server/channels/app/email/email_test.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
 )
 
 func TestCondenseSiteURL(t *testing.T) {
diff --git a/server/channels/app/email/helper_test.go b/server/channels/app/email/helper_test.go
index b4c31cf134..52f97c0af7 100644
--- a/server/channels/app/email/helper_test.go
+++ b/server/channels/app/email/helper_test.go
@@ -9,15 +9,15 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/templates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/templates"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 type TestHelper struct {
diff --git a/server/channels/app/email/main_test.go b/server/channels/app/email/main_test.go
index fc9ea8f28d..a2bcf53cdb 100644
--- a/server/channels/app/email/main_test.go
+++ b/server/channels/app/email/main_test.go
@@ -7,7 +7,7 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/channels/app/email/mocks/ServiceInterface.go b/server/channels/app/email/mocks/ServiceInterface.go
index 04a6ddbf24..8dcf51de5d 100644
--- a/server/channels/app/email/mocks/ServiceInterface.go
+++ b/server/channels/app/email/mocks/ServiceInterface.go
@@ -7,13 +7,13 @@ package mocks
 import (
 	io "io"
 
-	i18n "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	i18n "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 
 	mock "github.com/stretchr/testify/mock"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	templates "github.com/mattermost/mattermost-server/v6/server/platform/shared/templates"
+	templates "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates"
 
 	throttled "github.com/throttled/throttled"
 )
diff --git a/server/channels/app/email/notification_email.go b/server/channels/app/email/notification_email.go
index 542f43aff5..5bf441be8c 100644
--- a/server/channels/app/email/notification_email.go
+++ b/server/channels/app/email/notification_email.go
@@ -10,10 +10,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type FieldRow struct {
diff --git a/server/channels/app/email/notification_email_test.go b/server/channels/app/email/notification_email_test.go
index ee599c988a..f9bf6e6ae1 100644
--- a/server/channels/app/email/notification_email_test.go
+++ b/server/channels/app/email/notification_email_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestProcessMessageAttachments(t *testing.T) {
diff --git a/server/channels/app/email/service.go b/server/channels/app/email/service.go
index 3aa0b658f4..0ddf55f35f 100644
--- a/server/channels/app/email/service.go
+++ b/server/channels/app/email/service.go
@@ -12,12 +12,12 @@ import (
 	"github.com/throttled/throttled"
 	"github.com/throttled/throttled/store/memstore"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/templates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/templates"
 )
 
 const (
diff --git a/server/channels/app/email/utils.go b/server/channels/app/email/utils.go
index e13d610ac2..225b9178f0 100644
--- a/server/channels/app/email/utils.go
+++ b/server/channels/app/email/utils.go
@@ -4,8 +4,8 @@
 package email
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
 )
 
 func (es *Service) mailServiceConfig(replyToAddress string) *mail.SMTPConfig {
diff --git a/server/channels/app/email_test.go b/server/channels/app/email_test.go
index c7d3c56e6e..d0969ccd67 100644
--- a/server/channels/app/email_test.go
+++ b/server/channels/app/email_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSendInviteEmailRateLimits(t *testing.T) {
diff --git a/server/channels/app/emoji.go b/server/channels/app/emoji.go
index 92a9662376..5a7a847d0a 100644
--- a/server/channels/app/emoji.go
+++ b/server/channels/app/emoji.go
@@ -22,11 +22,11 @@ import (
 	"github.com/disintegration/imaging"
 	_ "golang.org/x/image/webp"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/enterprise.go b/server/channels/app/enterprise.go
index f8e913a828..4edd75a534 100644
--- a/server/channels/app/enterprise.go
+++ b/server/channels/app/enterprise.go
@@ -4,8 +4,8 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	ejobs "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	ejobs "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/jobs"
 )
 
 var accountMigrationInterface func(*App) einterfaces.AccountMigrationInterface
diff --git a/server/channels/app/enterprise_test.go b/server/channels/app/enterprise_test.go
index e518b1b078..79ec61cc6d 100644
--- a/server/channels/app/enterprise_test.go
+++ b/server/channels/app/enterprise_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	storemocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSAMLSettings(t *testing.T) {
diff --git a/server/channels/app/expirynotify.go b/server/channels/app/expirynotify.go
index 16d56bacf4..6155815b54 100644
--- a/server/channels/app/expirynotify.go
+++ b/server/channels/app/expirynotify.go
@@ -6,9 +6,9 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/expirynotify_test.go b/server/channels/app/expirynotify_test.go
index 42b74e802b..3db5d09003 100644
--- a/server/channels/app/expirynotify_test.go
+++ b/server/channels/app/expirynotify_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestNotifySessionsExpired(t *testing.T) {
diff --git a/server/channels/app/export.go b/server/channels/app/export.go
index 5dd00a33eb..1ba7450bb1 100644
--- a/server/channels/app/export.go
+++ b/server/channels/app/export.go
@@ -18,11 +18,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imports"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imports"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // We use this map to identify the exportable preferences.
diff --git a/server/channels/app/export_converters.go b/server/channels/app/export_converters.go
index 23fd750ff2..10b943caef 100644
--- a/server/channels/app/export_converters.go
+++ b/server/channels/app/export_converters.go
@@ -6,8 +6,8 @@ package app
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imports"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imports"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func ImportLineFromTeam(team *model.TeamForExport) *imports.LineImportData {
diff --git a/server/channels/app/export_test.go b/server/channels/app/export_test.go
index 1d97d80826..5a6fa59752 100644
--- a/server/channels/app/export_test.go
+++ b/server/channels/app/export_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestReactionsOfPost(t *testing.T) {
diff --git a/server/channels/app/extract_plugin_tar.go b/server/channels/app/extract_plugin_tar.go
index 9640f5e906..5212e73e12 100644
--- a/server/channels/app/extract_plugin_tar.go
+++ b/server/channels/app/extract_plugin_tar.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // extractTarGz takes in an io.Reader containing the bytes for a .tar.gz file and
diff --git a/server/channels/app/featureflag/feature_flags_sync.go b/server/channels/app/featureflag/feature_flags_sync.go
index 8fb51fdb6a..7d1af97a7a 100644
--- a/server/channels/app/featureflag/feature_flags_sync.go
+++ b/server/channels/app/featureflag/feature_flags_sync.go
@@ -13,8 +13,8 @@ import (
 	"github.com/splitio/go-client/v6/splitio/client"
 	"github.com/splitio/go-client/v6/splitio/conf"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SyncParams struct {
diff --git a/server/channels/app/featureflag/feature_flags_sync_test.go b/server/channels/app/featureflag/feature_flags_sync_test.go
index dc4f59a501..eb967d00da 100644
--- a/server/channels/app/featureflag/feature_flags_sync_test.go
+++ b/server/channels/app/featureflag/feature_flags_sync_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetStructFields(t *testing.T) {
diff --git a/server/channels/app/featureflag/split_logger.go b/server/channels/app/featureflag/split_logger.go
index f806d75793..6a61a9a324 100644
--- a/server/channels/app/featureflag/split_logger.go
+++ b/server/channels/app/featureflag/split_logger.go
@@ -6,7 +6,7 @@ package featureflag
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type splitLogger struct {
diff --git a/server/channels/app/file.go b/server/channels/app/file.go
index 826f224dc8..bd7ce30577 100644
--- a/server/channels/app/file.go
+++ b/server/channels/app/file.go
@@ -24,16 +24,16 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imaging"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/docextractor"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imaging"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/docextractor"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 
 	"github.com/pkg/errors"
 )
diff --git a/server/channels/app/file_bench_test.go b/server/channels/app/file_bench_test.go
index 2ab58f51aa..315bc304ef 100644
--- a/server/channels/app/file_bench_test.go
+++ b/server/channels/app/file_bench_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var randomJPEG []byte
diff --git a/server/channels/app/file_helper.go b/server/channels/app/file_helper.go
index a3059ff30b..309867e3b6 100644
--- a/server/channels/app/file_helper.go
+++ b/server/channels/app/file_helper.go
@@ -6,7 +6,7 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // removeInaccessibleContentFromFilesSlice removes content from the files beyond the cloud plan's limit
diff --git a/server/channels/app/file_helper_test.go b/server/channels/app/file_helper_test.go
index b3de7be086..b1b26be527 100644
--- a/server/channels/app/file_helper_test.go
+++ b/server/channels/app/file_helper_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestFilterInaccessibleFiles(t *testing.T) {
diff --git a/server/channels/app/file_test.go b/server/channels/app/file_test.go
index 842e69fb55..5ba9acef39 100644
--- a/server/channels/app/file_test.go
+++ b/server/channels/app/file_test.go
@@ -16,13 +16,13 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	eMocks "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	storemocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/mocks"
-	filesStoreMocks "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore/mocks"
+	eMocks "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks"
+	filesStoreMocks "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks"
 )
 
 func TestGeneratePublicLinkHash(t *testing.T) {
diff --git a/server/channels/app/group.go b/server/channels/app/group.go
index 3faefa869c..d004e4d4d9 100644
--- a/server/channels/app/group.go
+++ b/server/channels/app/group.go
@@ -8,8 +8,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetGroup(id string, opts *model.GetGroupOpts, viewRestrictions *model.ViewUsersRestrictions) (*model.Group, *model.AppError) {
diff --git a/server/channels/app/group_test.go b/server/channels/app/group_test.go
index fb53d3e637..bf6b51eeec 100644
--- a/server/channels/app/group_test.go
+++ b/server/channels/app/group_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetGroup(t *testing.T) {
diff --git a/server/channels/app/helper_test.go b/server/channels/app/helper_test.go
index 1b45e5c1b2..ba17c9f0f0 100644
--- a/server/channels/app/helper_test.go
+++ b/server/channels/app/helper_test.go
@@ -15,16 +15,16 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type TestHelper struct {
diff --git a/server/channels/app/hosted_customer.go b/server/channels/app/hosted_customer.go
index d27945e85d..8b95353e7f 100644
--- a/server/channels/app/hosted_customer.go
+++ b/server/channels/app/hosted_customer.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) NotifySelfHostedSignupProgress(progress string, userId string) {
diff --git a/server/channels/app/image.go b/server/channels/app/image.go
index e65cf3527a..113402a768 100644
--- a/server/channels/app/image.go
+++ b/server/channels/app/image.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imaging"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imaging"
 )
 
 func checkImageResolutionLimit(w, h int, maxRes int64) error {
diff --git a/server/channels/app/imaging/decode_bench_test.go b/server/channels/app/imaging/decode_bench_test.go
index 88495c8f32..1fdec80414 100644
--- a/server/channels/app/imaging/decode_bench_test.go
+++ b/server/channels/app/imaging/decode_bench_test.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/channels/app/imaging/decode_test.go b/server/channels/app/imaging/decode_test.go
index 070f2ea780..6426999e28 100644
--- a/server/channels/app/imaging/decode_test.go
+++ b/server/channels/app/imaging/decode_test.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/channels/app/imaging/utils_test.go b/server/channels/app/imaging/utils_test.go
index a5330fbc09..e626ddffc1 100644
--- a/server/channels/app/imaging/utils_test.go
+++ b/server/channels/app/imaging/utils_test.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/channels/app/import.go b/server/channels/app/import.go
index 2f094ec788..ec00dc5325 100644
--- a/server/channels/app/import.go
+++ b/server/channels/app/import.go
@@ -14,10 +14,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imports"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imports"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type ReactionImportData = imports.ReactionImportData // part of the app interface
diff --git a/server/channels/app/import_functions.go b/server/channels/app/import_functions.go
index f266d2e30e..1a3bd3eb91 100644
--- a/server/channels/app/import_functions.go
+++ b/server/channels/app/import_functions.go
@@ -17,14 +17,14 @@ import (
 
 	"github.com/mattermost/logr/v2"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imports"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/teams"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imports"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/teams"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // -- Bulk Import Functions --
diff --git a/server/channels/app/import_functions_test.go b/server/channels/app/import_functions_test.go
index 89fa43b71a..95eb6ec64d 100644
--- a/server/channels/app/import_functions_test.go
+++ b/server/channels/app/import_functions_test.go
@@ -14,13 +14,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imports"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imports"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestImportImportScheme(t *testing.T) {
diff --git a/server/channels/app/import_test.go b/server/channels/app/import_test.go
index 7d972dd0bd..82ef27fe6a 100644
--- a/server/channels/app/import_test.go
+++ b/server/channels/app/import_test.go
@@ -16,12 +16,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imports"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imports"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func ptrStr(s string) *string {
diff --git a/server/channels/app/imports/import_types.go b/server/channels/app/imports/import_types.go
index 981a5dd8f8..19e2ad90fd 100644
--- a/server/channels/app/imports/import_types.go
+++ b/server/channels/app/imports/import_types.go
@@ -7,7 +7,7 @@ import (
 	"archive/zip"
 	"encoding/json"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // Import Data Models
diff --git a/server/channels/app/imports/import_validators.go b/server/channels/app/imports/import_validators.go
index 4b60f252b1..d0f98b1482 100644
--- a/server/channels/app/imports/import_validators.go
+++ b/server/channels/app/imports/import_validators.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func ValidateSchemeImportData(data *SchemeImportData) *model.AppError {
diff --git a/server/channels/app/imports/import_validators_test.go b/server/channels/app/imports/import_validators_test.go
index 6d57a72e97..318177e191 100644
--- a/server/channels/app/imports/import_validators_test.go
+++ b/server/channels/app/imports/import_validators_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestImportValidateSchemeImportData(t *testing.T) {
diff --git a/server/channels/app/integration_action.go b/server/channels/app/integration_action.go
index f221beb16d..7af3c21886 100644
--- a/server/channels/app/integration_action.go
+++ b/server/channels/app/integration_action.go
@@ -32,12 +32,12 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) DoPostAction(c *request.Context, postID, actionId, userID, selectedOption string) (string, *model.AppError) {
diff --git a/server/channels/app/integration_action_test.go b/server/channels/app/integration_action_test.go
index 0651f52ad4..0f69e05ea1 100644
--- a/server/channels/app/integration_action_test.go
+++ b/server/channels/app/integration_action_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // Test for MM-13598 where an invalid integration URL was causing a crash
@@ -541,8 +541,8 @@ func TestSubmitInteractiveDialog(t *testing.T) {
 			"net/http"
 			"encoding/json"
 
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -833,8 +833,8 @@ func TestPostActionRelativePluginURL(t *testing.T) {
 			"net/http"
 			"encoding/json" 
 
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -1035,7 +1035,7 @@ func TestDoPluginRequest(t *testing.T) {
 			"reflect"
 			"sort"
 
-			"github.com/mattermost/mattermost-server/v6/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
 		)
 
 		type MyPlugin struct {
diff --git a/server/channels/app/job.go b/server/channels/app/job.go
index 6d2e7c4d26..b3cc6697ce 100644
--- a/server/channels/app/job.go
+++ b/server/channels/app/job.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetJob(id string) (*model.Job, *model.AppError) {
diff --git a/server/channels/app/job_test.go b/server/channels/app/job_test.go
index 270250836d..1dd635f505 100644
--- a/server/channels/app/job_test.go
+++ b/server/channels/app/job_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetJob(t *testing.T) {
diff --git a/server/channels/app/ldap.go b/server/channels/app/ldap.go
index 3753f9cf7a..0735baa74b 100644
--- a/server/channels/app/ldap.go
+++ b/server/channels/app/ldap.go
@@ -8,9 +8,9 @@ import (
 	"mime/multipart"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // SyncLdap starts an LDAP sync job.
diff --git a/server/channels/app/license.go b/server/channels/app/license.go
index 4b05cf1cf1..3444f244bc 100644
--- a/server/channels/app/license.go
+++ b/server/channels/app/license.go
@@ -10,9 +10,9 @@ import (
 	"github.com/dgrijalva/jwt-go"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/app/license_test.go b/server/channels/app/license_test.go
index 996ac5cd58..7b32ee52e6 100644
--- a/server/channels/app/license_test.go
+++ b/server/channels/app/license_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestLoadLicense(t *testing.T) {
diff --git a/server/channels/app/login.go b/server/channels/app/login.go
index a33c31a869..27a7a0caf9 100644
--- a/server/channels/app/login.go
+++ b/server/channels/app/login.go
@@ -16,12 +16,12 @@ import (
 
 	"github.com/avct/uasurfer"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const cwsTokenEnv = "CWS_CLOUD_TOKEN"
diff --git a/server/channels/app/login_test.go b/server/channels/app/login_test.go
index 280b0df937..72e596b52b 100644
--- a/server/channels/app/login_test.go
+++ b/server/channels/app/login_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCheckForClientSideCert(t *testing.T) {
diff --git a/server/channels/app/main_test.go b/server/channels/app/main_test.go
index 9edfcf6b62..41e35701e0 100644
--- a/server/channels/app/main_test.go
+++ b/server/channels/app/main_test.go
@@ -7,7 +7,7 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/channels/app/migrations.go b/server/channels/app/migrations.go
index 70e61ca9b6..a90af5a333 100644
--- a/server/channels/app/migrations.go
+++ b/server/channels/app/migrations.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const EmojisPermissionsMigrationKey = "EmojisPermissionsMigrationComplete"
diff --git a/server/channels/app/mocks/WorkTemplateExecutor.go b/server/channels/app/mocks/WorkTemplateExecutor.go
index 4d2083d8dc..93fb2693c5 100644
--- a/server/channels/app/mocks/WorkTemplateExecutor.go
+++ b/server/channels/app/mocks/WorkTemplateExecutor.go
@@ -5,11 +5,11 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
-	request "github.com/mattermost/mattermost-server/v6/server/channels/app/request"
+	request "github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 
-	worktemplates "github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates"
+	worktemplates "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates"
 )
 
 // WorkTemplateExecutor is an autogenerated mock type for the WorkTemplateExecutor type
diff --git a/server/channels/app/notification.go b/server/channels/app/notification.go
index 54545b5301..d18aeb5b0f 100644
--- a/server/channels/app/notification.go
+++ b/server/channels/app/notification.go
@@ -15,12 +15,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/markdown"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) canSendPushNotifications() bool {
diff --git a/server/channels/app/notification_email.go b/server/channels/app/notification_email.go
index 4856affdb0..b540ac066c 100644
--- a/server/channels/app/notification_email.go
+++ b/server/channels/app/notification_email.go
@@ -14,12 +14,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	email "github.com/mattermost/mattermost-server/v6/server/channels/app/email"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	email "github.com/mattermost/mattermost-server/server/v8/channels/app/email"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) sendNotificationEmail(c request.CTX, notification *PostNotification, user *model.User, team *model.Team, senderProfileImage []byte) error {
diff --git a/server/channels/app/notification_email_test.go b/server/channels/app/notification_email_test.go
index 283e96244c..c6948f0ff5 100644
--- a/server/channels/app/notification_email_test.go
+++ b/server/channels/app/notification_email_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/timezones"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/timezones"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func TestGetDirectMessageNotificationEmailSubject(t *testing.T) {
diff --git a/server/channels/app/notification_push.go b/server/channels/app/notification_push.go
index 0e74dd3098..5c188322f0 100644
--- a/server/channels/app/notification_push.go
+++ b/server/channels/app/notification_push.go
@@ -14,11 +14,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type notificationType string
diff --git a/server/channels/app/notification_push_test.go b/server/channels/app/notification_push_test.go
index 8c42bdbbca..9d35aa2830 100644
--- a/server/channels/app/notification_push_test.go
+++ b/server/channels/app/notification_push_test.go
@@ -17,14 +17,14 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	fmocks "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	fmocks "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func TestDoesNotifyPropsAllowPushNotification(t *testing.T) {
diff --git a/server/channels/app/notification_test.go b/server/channels/app/notification_test.go
index e9cde44fa5..0fa390dc8d 100644
--- a/server/channels/app/notification_test.go
+++ b/server/channels/app/notification_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func getLicWithSkuShortName(skuShortName string) *model.License {
diff --git a/server/channels/app/notify_admin.go b/server/channels/app/notify_admin.go
index 87a294c55f..3437e392f2 100644
--- a/server/channels/app/notify_admin.go
+++ b/server/channels/app/notify_admin.go
@@ -11,11 +11,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const lastTrialNotificationTimeStamp = "LAST_TRIAL_NOTIFICATION_TIMESTAMP"
diff --git a/server/channels/app/notify_admin_test.go b/server/channels/app/notify_admin_test.go
index 2cd0ba719a..a521b3fa05 100644
--- a/server/channels/app/notify_admin_test.go
+++ b/server/channels/app/notify_admin_test.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const PluginIdGithub = "github"
diff --git a/server/channels/app/oauth.go b/server/channels/app/oauth.go
index b8f0ec4c52..6b3e937abb 100644
--- a/server/channels/app/oauth.go
+++ b/server/channels/app/oauth.go
@@ -18,14 +18,14 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/oauth_test.go b/server/channels/app/oauth_test.go
index 2167973391..8e9d591373 100644
--- a/server/channels/app/oauth_test.go
+++ b/server/channels/app/oauth_test.go
@@ -17,11 +17,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestGetOAuthAccessTokenForImplicitFlow(t *testing.T) {
diff --git a/server/channels/app/onboarding.go b/server/channels/app/onboarding.go
index e50ebe33d7..2dd85749d9 100644
--- a/server/channels/app/onboarding.go
+++ b/server/channels/app/onboarding.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) markAdminOnboardingComplete(c *request.Context) *model.AppError {
diff --git a/server/channels/app/opengraph.go b/server/channels/app/opengraph.go
index c0dd998f17..cf002e50c8 100644
--- a/server/channels/app/opengraph.go
+++ b/server/channels/app/opengraph.go
@@ -12,7 +12,7 @@ import (
 	"github.com/dyatlov/go-opengraph/opengraph"
 	"golang.org/x/net/html/charset"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/opentracing/opentracing_layer.go b/server/channels/app/opentracing/opentracing_layer.go
index 48ff40a0ca..440c7a297f 100644
--- a/server/channels/app/opentracing/opentracing_layer.go
+++ b/server/channels/app/opentracing/opentracing_layer.go
@@ -18,25 +18,25 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/timezones"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/tracing"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/timezones"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/tracing"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 	"github.com/opentracing/opentracing-go/ext"
 	spanlog "github.com/opentracing/opentracing-go/log"
 )
diff --git a/server/channels/app/options.go b/server/channels/app/options.go
index 04b663dd69..fc41523607 100644
--- a/server/channels/app/options.go
+++ b/server/channels/app/options.go
@@ -4,13 +4,13 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Option func(s *Server) error
diff --git a/server/channels/app/permissions.go b/server/channels/app/permissions.go
index 35aa5ba00e..374e44be37 100644
--- a/server/channels/app/permissions.go
+++ b/server/channels/app/permissions.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const permissionsExportBatchSize = 100
diff --git a/server/channels/app/permissions_migrations.go b/server/channels/app/permissions_migrations.go
index b6672ff29c..0e2e3135bc 100644
--- a/server/channels/app/permissions_migrations.go
+++ b/server/channels/app/permissions_migrations.go
@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type permissionTransformation struct {
diff --git a/server/channels/app/permissions_migrations_test.go b/server/channels/app/permissions_migrations_test.go
index 50fa179595..6f3418157c 100644
--- a/server/channels/app/permissions_migrations_test.go
+++ b/server/channels/app/permissions_migrations_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestApplyPermissionsMap(t *testing.T) {
diff --git a/server/channels/app/permissions_test.go b/server/channels/app/permissions_test.go
index cdfef0165e..9ae52a1605 100644
--- a/server/channels/app/permissions_test.go
+++ b/server/channels/app/permissions_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type testWriter struct {
diff --git a/server/channels/app/platform/busy.go b/server/channels/app/platform/busy.go
index 71be83b37d..7db12dc3ce 100644
--- a/server/channels/app/platform/busy.go
+++ b/server/channels/app/platform/busy.go
@@ -10,8 +10,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/app/platform/busy_test.go b/server/channels/app/platform/busy_test.go
index 8c249ff95e..475b8f1408 100644
--- a/server/channels/app/platform/busy_test.go
+++ b/server/channels/app/platform/busy_test.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestBusySet(t *testing.T) {
diff --git a/server/channels/app/platform/cluster.go b/server/channels/app/platform/cluster.go
index a53ed9870c..b953cd82f1 100644
--- a/server/channels/app/platform/cluster.go
+++ b/server/channels/app/platform/cluster.go
@@ -8,11 +8,11 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // ensure cluster service wrapper implements `product.ClusterService`
diff --git a/server/channels/app/platform/cluster_discovery.go b/server/channels/app/platform/cluster_discovery.go
index 5fad2bf6f8..200dfe734f 100644
--- a/server/channels/app/platform/cluster_discovery.go
+++ b/server/channels/app/platform/cluster_discovery.go
@@ -6,8 +6,8 @@ package platform
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/platform/cluster_discovery_test.go b/server/channels/app/platform/cluster_discovery_test.go
index b52739baab..d19ab0c4ad 100644
--- a/server/channels/app/platform/cluster_discovery_test.go
+++ b/server/channels/app/platform/cluster_discovery_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestClusterDiscoveryService(t *testing.T) {
diff --git a/server/channels/app/platform/cluster_handlers.go b/server/channels/app/platform/cluster_handlers.go
index 05b9c668a3..690d912ab0 100644
--- a/server/channels/app/platform/cluster_handlers.go
+++ b/server/channels/app/platform/cluster_handlers.go
@@ -9,9 +9,9 @@ import (
 	"fmt"
 	"runtime/debug"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (ps *PlatformService) RegisterClusterHandlers() {
diff --git a/server/channels/app/platform/config.go b/server/channels/app/platform/config.go
index 5c2ab0a05d..3f4f560209 100644
--- a/server/channels/app/platform/config.go
+++ b/server/channels/app/platform/config.go
@@ -17,12 +17,12 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // ServiceConfig is used to initialize the PlatformService.
diff --git a/server/channels/app/platform/config_test.go b/server/channels/app/platform/config_test.go
index b54ab03989..777396feb6 100644
--- a/server/channels/app/platform/config_test.go
+++ b/server/channels/app/platform/config_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	smocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	smocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestConfigListener(t *testing.T) {
diff --git a/server/channels/app/platform/enterprise.go b/server/channels/app/platform/enterprise.go
index 6780f894eb..19c0da9d03 100644
--- a/server/channels/app/platform/enterprise.go
+++ b/server/channels/app/platform/enterprise.go
@@ -4,8 +4,8 @@
 package platform
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
 )
 
 var clusterInterface func(*PlatformService) einterfaces.ClusterInterface
diff --git a/server/channels/app/platform/feature_flags.go b/server/channels/app/platform/feature_flags.go
index 62e130bfbc..eedee3b95c 100644
--- a/server/channels/app/platform/feature_flags.go
+++ b/server/channels/app/platform/feature_flags.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/featureflag"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/featureflag"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // SetupFeatureFlags called on startup and when the cluster leader changes.
diff --git a/server/channels/app/platform/helper_test.go b/server/channels/app/platform/helper_test.go
index 5049603f63..98bf1366b2 100644
--- a/server/channels/app/platform/helper_test.go
+++ b/server/channels/app/platform/helper_test.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type TestHelper struct {
diff --git a/server/channels/app/platform/license.go b/server/channels/app/platform/license.go
index cabe4d36d8..4531acfcc0 100644
--- a/server/channels/app/platform/license.go
+++ b/server/channels/app/platform/license.go
@@ -14,11 +14,11 @@ import (
 	"github.com/dgrijalva/jwt-go"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/platform/license_test.go b/server/channels/app/platform/license_test.go
index 8f875ea91d..6682348130 100644
--- a/server/channels/app/platform/license_test.go
+++ b/server/channels/app/platform/license_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestLoadLicense(t *testing.T) {
diff --git a/server/channels/app/platform/link_cache.go b/server/channels/app/platform/link_cache.go
index 3c44b11888..d13d30cfc7 100644
--- a/server/channels/app/platform/link_cache.go
+++ b/server/channels/app/platform/link_cache.go
@@ -6,7 +6,7 @@ package platform
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
 )
 
 const LinkCacheSize = 10000
diff --git a/server/channels/app/platform/log.go b/server/channels/app/platform/log.go
index f04725a04d..eee1b3096e 100644
--- a/server/channels/app/platform/log.go
+++ b/server/channels/app/platform/log.go
@@ -13,9 +13,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (ps *PlatformService) Log() mlog.LoggerIFace {
diff --git a/server/channels/app/platform/main_test.go b/server/channels/app/platform/main_test.go
index 5eb0ef8389..ca15d20c43 100644
--- a/server/channels/app/platform/main_test.go
+++ b/server/channels/app/platform/main_test.go
@@ -7,7 +7,7 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/channels/app/platform/metrics.go b/server/channels/app/platform/metrics.go
index a691a41649..9f753d269a 100644
--- a/server/channels/app/platform/metrics.go
+++ b/server/channels/app/platform/metrics.go
@@ -18,9 +18,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const TimeToWaitForConnectionsToCloseOnServerShutdown = time.Second
diff --git a/server/channels/app/platform/mocks/SuiteIFace.go b/server/channels/app/platform/mocks/SuiteIFace.go
index b919999f6e..8d437058d1 100644
--- a/server/channels/app/platform/mocks/SuiteIFace.go
+++ b/server/channels/app/platform/mocks/SuiteIFace.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/app/platform/options.go b/server/channels/app/platform/options.go
index 043f18b6ba..656a6d7932 100644
--- a/server/channels/app/platform/options.go
+++ b/server/channels/app/platform/options.go
@@ -8,13 +8,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/localcachelayer"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/localcachelayer"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Option func(ps *PlatformService) error
diff --git a/server/channels/app/platform/searchengine.go b/server/channels/app/platform/searchengine.go
index c64f12a805..5852965ec7 100644
--- a/server/channels/app/platform/searchengine.go
+++ b/server/channels/app/platform/searchengine.go
@@ -4,8 +4,8 @@
 package platform
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (ps *PlatformService) StartSearchEngine() (string, string) {
diff --git a/server/channels/app/platform/service.go b/server/channels/app/platform/service.go
index cccc5ef921..5fce0dcee0 100644
--- a/server/channels/app/platform/service.go
+++ b/server/channels/app/platform/service.go
@@ -11,23 +11,23 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/featureflag"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/localcachelayer"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/retrylayer"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchlayer"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/timerlayer"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/bleveengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/featureflag"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/localcachelayer"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/retrylayer"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/timerlayer"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // PlatformService is the service for the platform related tasks. It is
diff --git a/server/channels/app/platform/service_test.go b/server/channels/app/platform/service_test.go
index e79d335fe6..53b045ba3a 100644
--- a/server/channels/app/platform/service_test.go
+++ b/server/channels/app/platform/service_test.go
@@ -15,10 +15,10 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
diff --git a/server/channels/app/platform/session.go b/server/channels/app/platform/session.go
index d12127db41..1b09f5c583 100644
--- a/server/channels/app/platform/session.go
+++ b/server/channels/app/platform/session.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (ps *PlatformService) ReturnSessionToPool(session *model.Session) {
diff --git a/server/channels/app/platform/session_test.go b/server/channels/app/platform/session_test.go
index e33c2e8e50..6682fb7771 100644
--- a/server/channels/app/platform/session_test.go
+++ b/server/channels/app/platform/session_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/app/platform/shared_channel_notifier.go b/server/channels/app/platform/shared_channel_notifier.go
index bb8aff72b3..b04c57a7a9 100644
--- a/server/channels/app/platform/shared_channel_notifier.go
+++ b/server/channels/app/platform/shared_channel_notifier.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/sharedchannel"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var sharedChannelEventsForSync model.StringArray = []string{
diff --git a/server/channels/app/platform/shared_channel_notifier_test.go b/server/channels/app/platform/shared_channel_notifier_test.go
index a69bb8ab77..7a4ca14c89 100644
--- a/server/channels/app/platform/shared_channel_notifier_test.go
+++ b/server/channels/app/platform/shared_channel_notifier_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestServerSyncSharedChannelHandler(t *testing.T) {
diff --git a/server/channels/app/platform/shared_channel_service_iface.go b/server/channels/app/platform/shared_channel_service_iface.go
index 7406489c0d..7e00d874a1 100644
--- a/server/channels/app/platform/shared_channel_service_iface.go
+++ b/server/channels/app/platform/shared_channel_service_iface.go
@@ -4,8 +4,8 @@
 package platform
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/sharedchannel"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel"
 )
 
 // SharedChannelServiceIFace is the interface to the shared channel service
diff --git a/server/channels/app/platform/status.go b/server/channels/app/platform/status.go
index cd5fdd800e..eba8034838 100644
--- a/server/channels/app/platform/status.go
+++ b/server/channels/app/platform/status.go
@@ -8,9 +8,9 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (ps *PlatformService) AddStatusCacheSkipClusterSend(status *model.Status) {
diff --git a/server/channels/app/platform/status_test.go b/server/channels/app/platform/status_test.go
index c0dabc5c98..2f341f2f0b 100644
--- a/server/channels/app/platform/status_test.go
+++ b/server/channels/app/platform/status_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSaveStatus(t *testing.T) {
diff --git a/server/channels/app/platform/web_conn.go b/server/channels/app/platform/web_conn.go
index ac72c98cdf..6b770b8726 100644
--- a/server/channels/app/platform/web_conn.go
+++ b/server/channels/app/platform/web_conn.go
@@ -20,10 +20,10 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/vmihailenco/msgpack/v5"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const (
diff --git a/server/channels/app/platform/web_conn_test.go b/server/channels/app/platform/web_conn_test.go
index 149f7d019d..d0d0b3b350 100644
--- a/server/channels/app/platform/web_conn_test.go
+++ b/server/channels/app/platform/web_conn_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type hookRunner struct {
diff --git a/server/channels/app/platform/web_hub.go b/server/channels/app/platform/web_hub.go
index 02652adf58..341c2bf287 100644
--- a/server/channels/app/platform/web_hub.go
+++ b/server/channels/app/platform/web_hub.go
@@ -11,8 +11,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/platform/web_hub_test.go b/server/channels/app/platform/web_hub_test.go
index 0fc45e730c..de3e007fc1 100644
--- a/server/channels/app/platform/web_hub_test.go
+++ b/server/channels/app/platform/web_hub_test.go
@@ -17,11 +17,11 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	platform_mocks "github.com/mattermost/mattermost-server/v6/server/channels/app/platform/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	platform_mocks "github.com/mattermost/mattermost-server/server/v8/channels/app/platform/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func dummyWebsocketHandler(t *testing.T) http.HandlerFunc {
diff --git a/server/channels/app/platform/websocket_router.go b/server/channels/app/platform/websocket_router.go
index 563c72a3b4..d8b0c8167a 100644
--- a/server/channels/app/platform/websocket_router.go
+++ b/server/channels/app/platform/websocket_router.go
@@ -6,9 +6,9 @@ package platform
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type webSocketHandler interface {
diff --git a/server/channels/app/plugin.go b/server/channels/app/plugin.go
index 64e9d176f9..95c4fc5cae 100644
--- a/server/channels/app/plugin.go
+++ b/server/channels/app/plugin.go
@@ -20,14 +20,14 @@ import (
 	svg "github.com/h2non/go-is-svg"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/marketplace"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/marketplace"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const prepackagedPluginsDir = "prepackaged_plugins"
diff --git a/server/channels/app/plugin_api.go b/server/channels/app/plugin_api.go
index 6e202efb16..71fefaa2aa 100644
--- a/server/channels/app/plugin_api.go
+++ b/server/channels/app/plugin_api.go
@@ -14,10 +14,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type PluginAPI struct {
diff --git a/server/channels/app/plugin_api_test.go b/server/channels/app/plugin_api_test.go
index 0feb32df2a..877b019439 100644
--- a/server/channels/app/plugin_api_test.go
+++ b/server/channels/app/plugin_api_test.go
@@ -25,13 +25,13 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 func getDefaultPluginSettingsSchema() string {
@@ -143,7 +143,7 @@ func TestPublicFilesPathConfiguration(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
 		)
 
 		type MyPlugin struct {
@@ -759,7 +759,7 @@ func TestPluginAPILoadPluginConfiguration(t *testing.T) {
 		cfg.PluginSettings.Plugins["testloadpluginconfig"] = pluginJson
 	})
 
-	testFolder, found := fileutils.FindDir("mattermost-server/server/channels/app/plugin_api_tests")
+	testFolder, found := fileutils.FindDir("channels/app/plugin_api_tests")
 	require.True(t, found, "Cannot find tests folder")
 	fullPath := path.Join(testFolder, "manual.test_load_configuration_plugin", "main.go")
 
@@ -794,7 +794,7 @@ func TestPluginAPILoadPluginConfigurationDefaults(t *testing.T) {
 		cfg.PluginSettings.Plugins["testloadpluginconfig"] = pluginJson
 	})
 
-	testFolder, found := fileutils.FindDir("mattermost-server/server/channels/app/plugin_api_tests")
+	testFolder, found := fileutils.FindDir("channels/app/plugin_api_tests")
 	require.True(t, found, "Cannot find tests folder")
 	fullPath := path.Join(testFolder, "manual.test_load_configuration_defaults_plugin", "main.go")
 
@@ -830,7 +830,7 @@ func TestPluginAPIGetPlugins(t *testing.T) {
     package main
 
     import (
-      "github.com/mattermost/mattermost-server/v6/plugin"
+      "github.com/mattermost/mattermost-server/server/v8/plugin"
     )
 
     type MyPlugin struct {
@@ -982,7 +982,7 @@ func TestInstallPlugin(t *testing.T) {
 
 			"github.com/pkg/errors"
 
-			"github.com/mattermost/mattermost-server/v6/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
 		)
 
 		type configuration struct {
@@ -1160,7 +1160,7 @@ func pluginAPIHookTest(t *testing.T, th *TestHelper, fileName string, id string,
 
 func TestBasicAPIPlugins(t *testing.T) {
 	defaultSchema := getDefaultPluginSettingsSchema()
-	testFolder, found := fileutils.FindDir("mattermost-server/server/channels/app/plugin_api_tests")
+	testFolder, found := fileutils.FindDir("channels/app/plugin_api_tests")
 	require.True(t, found, "Cannot read find app folder")
 	dirs, err := os.ReadDir(testFolder)
 	require.NoError(t, err, "Cannot read test folder %v", testFolder)
@@ -1498,7 +1498,7 @@ func TestInterpluginPluginHTTP(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
 			"bytes"
 			"net/http"
 		)
@@ -1539,8 +1539,8 @@ func TestInterpluginPluginHTTP(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 			"bytes"
 			"net/http"
 			"io"
@@ -1644,8 +1644,8 @@ func TestAPIMetrics(t *testing.T) {
 	package main
 
 	import (
-		"github.com/mattermost/mattermost-server/v6/model"
-		"github.com/mattermost/mattermost-server/v6/plugin"
+		"github.com/mattermost/mattermost-server/server/v8/model"
+		"github.com/mattermost/mattermost-server/server/v8/plugin"
 	)
 
 	type MyPlugin struct {
@@ -1746,7 +1746,7 @@ func TestPluginHTTPConnHijack(t *testing.T) {
 	th := Setup(t)
 	defer th.TearDown()
 
-	testFolder, found := fileutils.FindDir("mattermost-server/server/channels/app/plugin_api_tests")
+	testFolder, found := fileutils.FindDir("channels/app/plugin_api_tests")
 	require.True(t, found, "Cannot find tests folder")
 	fullPath := path.Join(testFolder, "manual.test_http_hijack_plugin", "main.go")
 
@@ -1781,7 +1781,7 @@ func TestPluginHTTPUpgradeWebSocket(t *testing.T) {
 	th := Setup(t)
 	defer th.TearDown()
 
-	testFolder, found := fileutils.FindDir("mattermost-server/server/channels/app/plugin_api_tests")
+	testFolder, found := fileutils.FindDir("channels/app/plugin_api_tests")
 	require.True(t, found, "Cannot find tests folder")
 	fullPath := path.Join(testFolder, "manual.test_http_upgrade_websocket_plugin", "main.go")
 
@@ -2044,7 +2044,7 @@ func TestRegisterCollectionAndTopic(t *testing.T) {
 
     import (
 	  "github.com/pkg/errors"
-      "github.com/mattermost/mattermost-server/v6/plugin"
+      "github.com/mattermost/mattermost-server/server/v8/plugin"
     )
 
     type MyPlugin struct {
@@ -2112,8 +2112,8 @@ func TestPluginUploadsAPI(t *testing.T) {
 		  "fmt"
 			"bytes"
 
-      "github.com/mattermost/mattermost-server/v6/model"
-      "github.com/mattermost/mattermost-server/v6/plugin"
+      "github.com/mattermost/mattermost-server/server/v8/model"
+      "github.com/mattermost/mattermost-server/server/v8/plugin"
     )
 
     type TestPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go
index cb2ec08b94..4d9a744d13 100644
--- a/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go
@@ -6,7 +6,7 @@ package main
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type Plugin struct {
diff --git a/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go
index 96930d7fbe..2d301d192b 100644
--- a/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type Plugin struct {
diff --git a/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go
index 8c17342a13..03d9b4376a 100644
--- a/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type configuration struct {
diff --git a/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go
index d393c07ba2..287f526240 100644
--- a/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go
@@ -6,9 +6,9 @@ package main
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type configuration struct {
diff --git a/server/channels/app/plugin_api_tests/test_bots_plugin/main.go b/server/channels/app/plugin_api_tests/test_bots_plugin/main.go
index 694c20ae89..4b1660efad 100644
--- a/server/channels/app/plugin_api_tests/test_bots_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_bots_plugin/main.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go b/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go
index dc21bc3acf..fbe4c004b8 100644
--- a/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go
@@ -6,8 +6,8 @@ package main
 import (
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type PluginUsingLogAPI struct {
diff --git a/server/channels/app/plugin_api_tests/test_db_driver/main.go b/server/channels/app/plugin_api_tests/test_db_driver/main.go
index d99a64166a..010a906978 100644
--- a/server/channels/app/plugin_api_tests/test_db_driver/main.go
+++ b/server/channels/app/plugin_api_tests/test_db_driver/main.go
@@ -7,12 +7,12 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/driver"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/driver"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go
index 096aabe4c0..3a9aed3369 100644
--- a/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go
index d903985f47..04574a56c8 100644
--- a/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go
index 317164bd1f..cd2c7b402c 100644
--- a/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go
index 09297c8f90..b4c8857345 100644
--- a/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go
index 15bbc6e46b..95aad7da56 100644
--- a/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_kv/main.go b/server/channels/app/plugin_api_tests/test_kv/main.go
index 6c4338e5d6..0d9cf00fed 100644
--- a/server/channels/app/plugin_api_tests/test_kv/main.go
+++ b/server/channels/app/plugin_api_tests/test_kv/main.go
@@ -7,9 +7,9 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go b/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go
index 7d1907f627..901be0098b 100644
--- a/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_members_plugin/main.go b/server/channels/app/plugin_api_tests/test_members_plugin/main.go
index 18743f2b4f..2f34426b35 100644
--- a/server/channels/app/plugin_api_tests/test_members_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_members_plugin/main.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go b/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go
index 345c61f38e..f37e59700a 100644
--- a/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go b/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go
index ceab1b553b..fa9a252f99 100644
--- a/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go
@@ -6,9 +6,9 @@ package main
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go b/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go
index 1ab06341c2..225af48903 100644
--- a/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go
@@ -6,9 +6,9 @@ package main
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go b/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go
index 28248fe443..5b2d0e551e 100644
--- a/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go b/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go
index 0417d78bb8..2a3fd4bf76 100644
--- a/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go b/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go
index 4025fd6d72..0980ee2bfa 100644
--- a/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go
@@ -10,9 +10,9 @@ import (
 	"image/color"
 	"image/png"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go b/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go
index 863814c30f..1ada1da272 100644
--- a/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go b/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go
index fdd57ec8e9..dceee1f502 100644
--- a/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go
+++ b/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go
@@ -6,9 +6,9 @@ package main
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type MyPlugin struct {
diff --git a/server/channels/app/plugin_commands.go b/server/channels/app/plugin_commands.go
index ffb4f00d9d..fb47b6373d 100644
--- a/server/channels/app/plugin_commands.go
+++ b/server/channels/app/plugin_commands.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type PluginCommand struct {
diff --git a/server/channels/app/plugin_commands_test.go b/server/channels/app/plugin_commands_test.go
index 9d80070206..89516aa3b5 100644
--- a/server/channels/app/plugin_commands_test.go
+++ b/server/channels/app/plugin_commands_test.go
@@ -10,11 +10,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 func TestPluginCommand(t *testing.T) {
@@ -43,8 +43,8 @@ func TestPluginCommand(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type configuration struct {
@@ -124,8 +124,8 @@ func TestPluginCommand(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type configuration struct {
@@ -231,8 +231,8 @@ func TestPluginCommand(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type configuration struct {
@@ -296,8 +296,8 @@ func TestPluginCommand(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -341,8 +341,8 @@ func TestPluginCommand(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -392,8 +392,8 @@ func TestPluginCommand(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type configuration struct {
@@ -549,8 +549,8 @@ func TestProductCommands(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type configuration struct {
diff --git a/server/channels/app/plugin_db_driver.go b/server/channels/app/plugin_db_driver.go
index a29fa7467f..d13a7df35d 100644
--- a/server/channels/app/plugin_db_driver.go
+++ b/server/channels/app/plugin_db_driver.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // DriverImpl implements the plugin.Driver interface on the server-side.
diff --git a/server/channels/app/plugin_deadlock_test.go b/server/channels/app/plugin_deadlock_test.go
index 359b9c4f41..227f72c57e 100644
--- a/server/channels/app/plugin_deadlock_test.go
+++ b/server/channels/app/plugin_deadlock_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPluginDeadlock(t *testing.T) {
@@ -24,8 +24,8 @@ func TestPluginDeadlock(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -112,8 +112,8 @@ func TestPluginDeadlock(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -147,8 +147,8 @@ func TestPluginDeadlock(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -218,8 +218,8 @@ func TestPluginDeadlock(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
diff --git a/server/channels/app/plugin_event.go b/server/channels/app/plugin_event.go
index c30e2d1af5..3391a792aa 100644
--- a/server/channels/app/plugin_event.go
+++ b/server/channels/app/plugin_event.go
@@ -6,7 +6,7 @@ package app
 import (
 	"encoding/json"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (ch *Channels) notifyClusterPluginEvent(event model.ClusterEvent, data model.PluginEventData) {
diff --git a/server/channels/app/plugin_health_check_test.go b/server/channels/app/plugin_health_check_test.go
index 1c2d67f87f..73e0c31f21 100644
--- a/server/channels/app/plugin_health_check_test.go
+++ b/server/channels/app/plugin_health_check_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 func TestHealthCheckJob(t *testing.T) {
@@ -21,8 +21,8 @@ func TestHealthCheckJob(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/model"
-				"github.com/mattermost/mattermost-server/v6/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
 			)
 
 			type MyPlugin struct {
diff --git a/server/channels/app/plugin_hooks_test.go b/server/channels/app/plugin_hooks_test.go
index f6324908b0..4cb3134fc5 100644
--- a/server/channels/app/plugin_hooks_test.go
+++ b/server/channels/app/plugin_hooks_test.go
@@ -19,12 +19,12 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest"
 )
 
 func SetAppEnvironmentWithPlugins(t *testing.T, pluginCode []string, app *App, apiFunc func(*model.Manifest) plugin.API) (func(), []string, []error) {
@@ -72,8 +72,8 @@ func TestHookMessageWillBePosted(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -112,8 +112,8 @@ func TestHookMessageWillBePosted(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -153,8 +153,8 @@ func TestHookMessageWillBePosted(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -196,8 +196,8 @@ func TestHookMessageWillBePosted(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -240,8 +240,8 @@ func TestHookMessageWillBePosted(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -262,8 +262,8 @@ func TestHookMessageWillBePosted(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -308,8 +308,8 @@ func TestHookMessageHasBeenPosted(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -346,8 +346,8 @@ func TestHookMessageWillBeUpdated(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -394,8 +394,8 @@ func TestHookMessageHasBeenUpdated(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -442,8 +442,8 @@ func TestHookFileWillBeUploaded(t *testing.T) {
 
 			import (
 				"io"
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -487,8 +487,8 @@ func TestHookFileWillBeUploaded(t *testing.T) {
 			import (
 				"fmt"
 				"io"
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -536,8 +536,8 @@ func TestHookFileWillBeUploaded(t *testing.T) {
 
 			import (
 				"io"
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -593,8 +593,8 @@ func TestHookFileWillBeUploaded(t *testing.T) {
 				"io"
 				"fmt"
 				"bytes"
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -661,8 +661,8 @@ func TestUserWillLogIn_Blocked(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -700,8 +700,8 @@ func TestUserWillLogInIn_Passed(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -740,8 +740,8 @@ func TestUserHasLoggedIn(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -782,8 +782,8 @@ func TestUserHasBeenCreated(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -831,7 +831,7 @@ func TestErrorString(t *testing.T) {
 			import (
 				"errors"
 
-				"github.com/mattermost/mattermost-server/v6/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
 			)
 
 			type MyPlugin struct {
@@ -860,8 +860,8 @@ func TestErrorString(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -913,8 +913,8 @@ func TestHookContext(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -956,8 +956,8 @@ func TestActiveHooks(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/model"
-				"github.com/mattermost/mattermost-server/v6/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
 			)
 
 			type MyPlugin struct {
@@ -1042,8 +1042,8 @@ func TestHookMetrics(t *testing.T) {
 	package main
 
 	import (
-		"github.com/mattermost/mattermost-server/v6/model"
-		"github.com/mattermost/mattermost-server/v6/plugin"
+		"github.com/mattermost/mattermost-server/server/v8/model"
+		"github.com/mattermost/mattermost-server/server/v8/plugin"
 	)
 
 	type MyPlugin struct {
@@ -1129,8 +1129,8 @@ func TestHookReactionHasBeenAdded(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -1171,8 +1171,8 @@ func TestHookReactionHasBeenRemoved(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -1211,7 +1211,7 @@ func TestHookRunDataRetention(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
 		)
 
 		type MyPlugin struct {
@@ -1255,7 +1255,7 @@ func TestHookOnSendDailyTelemetry(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
 		)
 
 		type MyPlugin struct {
@@ -1298,8 +1298,8 @@ func TestHookOnCloudLimitsUpdated(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/model"
-			"github.com/mattermost/mattermost-server/v6/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
 		)
 
 		type MyPlugin struct {
diff --git a/server/channels/app/plugin_install.go b/server/channels/app/plugin_install.go
index 2d666c7d47..de40c6838a 100644
--- a/server/channels/app/plugin_install.go
+++ b/server/channels/app/plugin_install.go
@@ -45,11 +45,11 @@ import (
 
 	"github.com/blang/semver"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // managedPluginFileName is the file name of the flag file that marks
diff --git a/server/channels/app/plugin_install_test.go b/server/channels/app/plugin_install_test.go
index ecbb75e164..0b2b912ff3 100644
--- a/server/channels/app/plugin_install_test.go
+++ b/server/channels/app/plugin_install_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type nilReadSeeker struct {
diff --git a/server/channels/app/plugin_key_value_store.go b/server/channels/app/plugin_key_value_store.go
index adf3ab4bf8..a10d3fc3fb 100644
--- a/server/channels/app/plugin_key_value_store.go
+++ b/server/channels/app/plugin_key_value_store.go
@@ -9,9 +9,9 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func getKeyHash(key string) string {
diff --git a/server/channels/app/plugin_requests.go b/server/channels/app/plugin_requests.go
index 92475f4ed3..4db8b9b425 100644
--- a/server/channels/app/plugin_requests.go
+++ b/server/channels/app/plugin_requests.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 func (ch *Channels) ServePluginRequest(w http.ResponseWriter, r *http.Request) {
diff --git a/server/channels/app/plugin_requests_test.go b/server/channels/app/plugin_requests_test.go
index 143a23c7ef..cc869a72a2 100644
--- a/server/channels/app/plugin_requests_test.go
+++ b/server/channels/app/plugin_requests_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestServePluginPublicRequest(t *testing.T) {
diff --git a/server/channels/app/plugin_shutdown_test.go b/server/channels/app/plugin_shutdown_test.go
index 293d882f1f..193c2b9d1c 100644
--- a/server/channels/app/plugin_shutdown_test.go
+++ b/server/channels/app/plugin_shutdown_test.go
@@ -24,7 +24,7 @@ func TestPluginShutdownTest(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
 			)
 
 			type MyPlugin struct {
@@ -39,7 +39,7 @@ func TestPluginShutdownTest(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
 			)
 
 			type MyPlugin struct {
diff --git a/server/channels/app/plugin_signature.go b/server/channels/app/plugin_signature.go
index b27f2fe834..ed9a126105 100644
--- a/server/channels/app/plugin_signature.go
+++ b/server/channels/app/plugin_signature.go
@@ -13,9 +13,9 @@ import (
 	"golang.org/x/crypto/openpgp"       //nolint:staticcheck
 	"golang.org/x/crypto/openpgp/armor" //nolint:staticcheck
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // GetPublicKey will return the actual public key saved in the `name` file.
diff --git a/server/channels/app/plugin_signature_test.go b/server/channels/app/plugin_signature_test.go
index e38af4a7ea..10db749b03 100644
--- a/server/channels/app/plugin_signature_test.go
+++ b/server/channels/app/plugin_signature_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPluginPublicKeys(t *testing.T) {
diff --git a/server/channels/app/plugin_statuses.go b/server/channels/app/plugin_statuses.go
index 399d58e5b2..e3493199ba 100644
--- a/server/channels/app/plugin_statuses.go
+++ b/server/channels/app/plugin_statuses.go
@@ -6,7 +6,7 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // GetPluginStatus returns the status for a plugin installed on this server.
diff --git a/server/channels/app/plugin_test.go b/server/channels/app/plugin_test.go
index 0c8fb3e232..0df3f4d6ab 100644
--- a/server/channels/app/plugin_test.go
+++ b/server/channels/app/plugin_test.go
@@ -20,12 +20,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 func getHashedKey(key string) string {
@@ -729,8 +729,8 @@ func TestPluginPanicLogs(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
-			"github.com/mattermost/mattermost-server/v6/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
 		)
 
 		type MyPlugin struct {
@@ -778,7 +778,7 @@ func TestPluginStatusActivateError(t *testing.T) {
 		import (
 			"errors"
 
-			"github.com/mattermost/mattermost-server/v6/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
 		)
 
 		type MyPlugin struct {
diff --git a/server/channels/app/post.go b/server/channels/app/post.go
index 35d6f8b6d6..d0b7304ea1 100644
--- a/server/channels/app/post.go
+++ b/server/channels/app/post.go
@@ -15,15 +15,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const (
diff --git a/server/channels/app/post_acknowledgements.go b/server/channels/app/post_acknowledgements.go
index e170676638..259dea4f90 100644
--- a/server/channels/app/post_acknowledgements.go
+++ b/server/channels/app/post_acknowledgements.go
@@ -8,10 +8,10 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) SaveAcknowledgementForPost(c *request.Context, postID, userID string) (*model.PostAcknowledgement, *model.AppError) {
diff --git a/server/channels/app/post_acknowledgements_test.go b/server/channels/app/post_acknowledgements_test.go
index 86f95548d5..aa54200dcb 100644
--- a/server/channels/app/post_acknowledgements_test.go
+++ b/server/channels/app/post_acknowledgements_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPostAcknowledgementsApp(t *testing.T) {
diff --git a/server/channels/app/post_helpers.go b/server/channels/app/post_helpers.go
index d57a25a2da..625cfe458b 100644
--- a/server/channels/app/post_helpers.go
+++ b/server/channels/app/post_helpers.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"sort"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type filterPostOptions struct {
diff --git a/server/channels/app/post_helpers_test.go b/server/channels/app/post_helpers_test.go
index c8d479b352..8bcbbdcc84 100644
--- a/server/channels/app/post_helpers_test.go
+++ b/server/channels/app/post_helpers_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetTimeSortedPostAccessibleBounds(t *testing.T) {
diff --git a/server/channels/app/post_metadata.go b/server/channels/app/post_metadata.go
index 9048f3c5d3..33b50e00ff 100644
--- a/server/channels/app/post_metadata.go
+++ b/server/channels/app/post_metadata.go
@@ -19,12 +19,12 @@ import (
 	"github.com/dyatlov/go-opengraph/opengraph"
 	"golang.org/x/net/idna"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/imgutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/markdown"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/imgutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type linkMetadataCache struct {
diff --git a/server/channels/app/post_metadata_test.go b/server/channels/app/post_metadata_test.go
index 9b3e0602fa..caaa423818 100644
--- a/server/channels/app/post_metadata_test.go
+++ b/server/channels/app/post_metadata_test.go
@@ -18,8 +18,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
 	"github.com/stretchr/testify/mock"
 
 	"github.com/dyatlov/go-opengraph/opengraph"
@@ -27,11 +27,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy"
 )
 
 func TestPreparePostListForClient(t *testing.T) {
diff --git a/server/channels/app/post_priority.go b/server/channels/app/post_priority.go
index d4efd534b8..cc0a74f490 100644
--- a/server/channels/app/post_priority.go
+++ b/server/channels/app/post_priority.go
@@ -7,7 +7,7 @@ import (
 	"database/sql"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetPriorityForPost(postId string) (*model.PostPriority, *model.AppError) {
diff --git a/server/channels/app/post_test.go b/server/channels/app/post_test.go
index 6d9e044573..b894136848 100644
--- a/server/channels/app/post_test.go
+++ b/server/channels/app/post_test.go
@@ -16,17 +16,17 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	eMocks "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	storemocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	eMocks "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestCreatePostDeduplicate(t *testing.T) {
@@ -60,8 +60,8 @@ func TestCreatePostDeduplicate(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
@@ -109,8 +109,8 @@ func TestCreatePostDeduplicate(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 				"time"
 			)
 
diff --git a/server/channels/app/preference.go b/server/channels/app/preference.go
index f3fc58dca2..4fdf19cb66 100644
--- a/server/channels/app/preference.go
+++ b/server/channels/app/preference.go
@@ -8,8 +8,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // Ensure preferences service wrapper implements `product.PreferencesService`
diff --git a/server/channels/app/product.go b/server/channels/app/product.go
index f03a1c5446..4da937eefa 100644
--- a/server/channels/app/product.go
+++ b/server/channels/app/product.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
 )
 
 func (s *Server) initializeProducts(
diff --git a/server/channels/app/product_notices.go b/server/channels/app/product_notices.go
index 3c1c0a41de..1d4f47aa07 100644
--- a/server/channels/app/product_notices.go
+++ b/server/channels/app/product_notices.go
@@ -15,12 +15,12 @@ import (
 	"github.com/pkg/errors"
 	date_constraints "github.com/reflog/dateconstraints"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const MaxRepeatViewings = 3
diff --git a/server/channels/app/product_notices_test.go b/server/channels/app/product_notices_test.go
index a7d657b511..50959cc902 100644
--- a/server/channels/app/product_notices_test.go
+++ b/server/channels/app/product_notices_test.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestNoticeValidation(t *testing.T) {
diff --git a/server/channels/app/product_test.go b/server/channels/app/product_test.go
index 481f8bca6a..55942aea5f 100644
--- a/server/channels/app/product_test.go
+++ b/server/channels/app/product_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/config"
 )
 
 const (
diff --git a/server/channels/app/ratelimit.go b/server/channels/app/ratelimit.go
index 55644b670a..49c34930ba 100644
--- a/server/channels/app/ratelimit.go
+++ b/server/channels/app/ratelimit.go
@@ -13,10 +13,10 @@ import (
 	"github.com/throttled/throttled"
 	"github.com/throttled/throttled/store/memstore"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type RateLimiter struct {
diff --git a/server/channels/app/ratelimit_test.go b/server/channels/app/ratelimit_test.go
index 9e1818f6f6..d976816e45 100644
--- a/server/channels/app/ratelimit_test.go
+++ b/server/channels/app/ratelimit_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func genRateLimitSettings(useAuth, useIP bool, header string) *model.RateLimitSettings {
diff --git a/server/channels/app/reaction.go b/server/channels/app/reaction.go
index e4c6630dc9..6242b30b4d 100644
--- a/server/channels/app/reaction.go
+++ b/server/channels/app/reaction.go
@@ -8,10 +8,10 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 func (a *App) SaveReactionForPost(c *request.Context, reaction *model.Reaction) (*model.Reaction, *model.AppError) {
diff --git a/server/channels/app/reaction_test.go b/server/channels/app/reaction_test.go
index d9990d34c1..1d75d91003 100644
--- a/server/channels/app/reaction_test.go
+++ b/server/channels/app/reaction_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSharedChannelSyncForReactionActions(t *testing.T) {
diff --git a/server/channels/app/remote_cluster.go b/server/channels/app/remote_cluster.go
index 10ab821134..6c6c67dc93 100644
--- a/server/channels/app/remote_cluster.go
+++ b/server/channels/app/remote_cluster.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) AddRemoteCluster(rc *model.RemoteCluster) (*model.RemoteCluster, *model.AppError) {
diff --git a/server/channels/app/remote_cluster_service_mock.go b/server/channels/app/remote_cluster_service_mock.go
index b6409d7775..69fee0fd62 100644
--- a/server/channels/app/remote_cluster_service_mock.go
+++ b/server/channels/app/remote_cluster_service_mock.go
@@ -6,8 +6,8 @@ package app
 import (
 	"context"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
 )
 
 // MockOptionRemoteClusterService a mock of the remote cluster service
diff --git a/server/channels/app/remote_cluster_test.go b/server/channels/app/remote_cluster_test.go
index fe47ecaf85..508220ac40 100644
--- a/server/channels/app/remote_cluster_test.go
+++ b/server/channels/app/remote_cluster_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func TestAddRemoteCluster(t *testing.T) {
diff --git a/server/channels/app/request/context.go b/server/channels/app/request/context.go
index 96eb70accb..df3809ffe4 100644
--- a/server/channels/app/request/context.go
+++ b/server/channels/app/request/context.go
@@ -6,9 +6,9 @@ package request
 import (
 	"context"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Context struct {
diff --git a/server/channels/app/role.go b/server/channels/app/role.go
index 657efba69a..ca8a159eb7 100644
--- a/server/channels/app/role.go
+++ b/server/channels/app/role.go
@@ -11,9 +11,9 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetRole(id string) (*model.Role, *model.AppError) {
diff --git a/server/channels/app/role_test.go b/server/channels/app/role_test.go
index 835e5f0832..c9db5a8c27 100644
--- a/server/channels/app/role_test.go
+++ b/server/channels/app/role_test.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type permissionInheritanceTestData struct {
diff --git a/server/channels/app/saml.go b/server/channels/app/saml.go
index 7a995651c9..09cd1b0e12 100644
--- a/server/channels/app/saml.go
+++ b/server/channels/app/saml.go
@@ -13,7 +13,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/app/scheme.go b/server/channels/app/scheme.go
index d765938396..abe442195e 100644
--- a/server/channels/app/scheme.go
+++ b/server/channels/app/scheme.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetScheme(id string) (*model.Scheme, *model.AppError) {
diff --git a/server/channels/app/searchengine.go b/server/channels/app/searchengine.go
index 345edefb05..fb9539cb1a 100644
--- a/server/channels/app/searchengine.go
+++ b/server/channels/app/searchengine.go
@@ -6,8 +6,8 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
 )
 
 func (a *App) TestElasticsearch(cfg *model.Config) *model.AppError {
diff --git a/server/channels/app/security_update_check.go b/server/channels/app/security_update_check.go
index b2dcc37758..edd31cf48b 100644
--- a/server/channels/app/security_update_check.go
+++ b/server/channels/app/security_update_check.go
@@ -11,10 +11,10 @@ import (
 	"runtime"
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/server.go b/server/channels/app/server.go
index 65c3dbf371..7b8c1d2946 100644
--- a/server/channels/app/server.go
+++ b/server/channels/app/server.go
@@ -27,50 +27,50 @@ import (
 	"github.com/rs/cors"
 	"golang.org/x/crypto/acme/autocert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/scheduler"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/email"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/teams"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/active_users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/expirynotify"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/export_delete"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/export_process"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/extract_content"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/hosted_purchase_screening"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/import_delete"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/import_process"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/last_accessible_file"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/last_accessible_post"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/migrations"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/notify_admin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/product_notices"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs/resend_invitation_email"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/awsmeter"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/bleveengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/bleveengine/indexer"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/sharedchannel"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/timezones"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/tracing"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/upgrader"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mail"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/templates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/email"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/teams"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/active_users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/expirynotify"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/export_delete"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/export_process"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/extract_content"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/hosted_purchase_screening"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/import_delete"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/import_process"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/last_accessible_file"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/last_accessible_post"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/migrations"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/notify_admin"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/product_notices"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs/resend_invitation_email"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/awsmeter"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine/indexer"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/timezones"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/tracing"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/upgrader"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mail"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/templates"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/scheduler"
 )
 
 // declaring this as var to allow overriding in tests
diff --git a/server/channels/app/server_test.go b/server/channels/app/server_test.go
index 00d2c66f71..e9f08ba776 100644
--- a/server/channels/app/server_test.go
+++ b/server/channels/app/server_test.go
@@ -24,12 +24,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func newServerWithConfig(t *testing.T, f func(cfg *model.Config)) (*Server, error) {
diff --git a/server/channels/app/session.go b/server/channels/app/session.go
index b7fecbfd17..4fd1bfeffc 100644
--- a/server/channels/app/session.go
+++ b/server/channels/app/session.go
@@ -10,12 +10,12 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *App) CreateSession(session *model.Session) (*model.Session, *model.AppError) {
diff --git a/server/channels/app/session_test.go b/server/channels/app/session_test.go
index 7760bed82a..a4af3e93e4 100644
--- a/server/channels/app/session_test.go
+++ b/server/channels/app/session_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetSessionIdleTimeoutInMinutes(t *testing.T) {
diff --git a/server/channels/app/shared_channel.go b/server/channels/app/shared_channel.go
index e6c241b1d3..82ccb7a624 100644
--- a/server/channels/app/shared_channel.go
+++ b/server/channels/app/shared_channel.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) checkChannelNotShared(c request.CTX, channelId string) error {
diff --git a/server/channels/app/shared_channel_service_iface.go b/server/channels/app/shared_channel_service_iface.go
index c6b93359ce..c599b5f11d 100644
--- a/server/channels/app/shared_channel_service_iface.go
+++ b/server/channels/app/shared_channel_service_iface.go
@@ -5,8 +5,8 @@ package app
 
 // TODO: platform: remove this and use from platform package
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/sharedchannel"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel"
 )
 
 // SharedChannelServiceIFace is the interface to the shared channel service
diff --git a/server/channels/app/shared_channel_test.go b/server/channels/app/shared_channel_test.go
index d01269116c..44175c0f44 100644
--- a/server/channels/app/shared_channel_test.go
+++ b/server/channels/app/shared_channel_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestApp_CheckCanInviteToSharedChannel(t *testing.T) {
diff --git a/server/channels/app/slack.go b/server/channels/app/slack.go
index 7f956137ea..76e3dc96dd 100644
--- a/server/channels/app/slack.go
+++ b/server/channels/app/slack.go
@@ -13,10 +13,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/slackimport"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/slackimport"
 )
 
 func (a *App) SlackImport(c *request.Context, fileData multipart.File, fileSize int64, teamID string) (*model.AppError, *bytes.Buffer) {
diff --git a/server/channels/app/slack_test.go b/server/channels/app/slack_test.go
index e82eb097f1..21f968281e 100644
--- a/server/channels/app/slack_test.go
+++ b/server/channels/app/slack_test.go
@@ -6,7 +6,7 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestProcessSlackText(t *testing.T) {
diff --git a/server/channels/app/slashcommands/auto_channels.go b/server/channels/app/slashcommands/auto_channels.go
index a79ffd4985..073f281221 100644
--- a/server/channels/app/slashcommands/auto_channels.go
+++ b/server/channels/app/slashcommands/auto_channels.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type AutoChannelCreator struct {
diff --git a/server/channels/app/slashcommands/auto_constants.go b/server/channels/app/slashcommands/auto_constants.go
index 1a269dab96..880e06eee6 100644
--- a/server/channels/app/slashcommands/auto_constants.go
+++ b/server/channels/app/slashcommands/auto_constants.go
@@ -4,8 +4,8 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/app/slashcommands/auto_environment.go b/server/channels/app/slashcommands/auto_environment.go
index cba8fa02fe..f3e7d50957 100644
--- a/server/channels/app/slashcommands/auto_environment.go
+++ b/server/channels/app/slashcommands/auto_environment.go
@@ -7,10 +7,10 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type TestEnvironment struct {
diff --git a/server/channels/app/slashcommands/auto_posts.go b/server/channels/app/slashcommands/auto_posts.go
index 08abb4061e..e375f97403 100644
--- a/server/channels/app/slashcommands/auto_posts.go
+++ b/server/channels/app/slashcommands/auto_posts.go
@@ -9,11 +9,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type AutoPostCreator struct {
diff --git a/server/channels/app/slashcommands/auto_teams.go b/server/channels/app/slashcommands/auto_teams.go
index dea793cd76..30cd1ef97b 100644
--- a/server/channels/app/slashcommands/auto_teams.go
+++ b/server/channels/app/slashcommands/auto_teams.go
@@ -4,8 +4,8 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type TeamEnvironment struct {
diff --git a/server/channels/app/slashcommands/auto_users.go b/server/channels/app/slashcommands/auto_users.go
index 5e944b60cd..ed2125da79 100644
--- a/server/channels/app/slashcommands/auto_users.go
+++ b/server/channels/app/slashcommands/auto_users.go
@@ -7,11 +7,11 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type AutoUserCreator struct {
diff --git a/server/channels/app/slashcommands/command_away.go b/server/channels/app/slashcommands/command_away.go
index 6f8efaeebf..bc64e53461 100644
--- a/server/channels/app/slashcommands/command_away.go
+++ b/server/channels/app/slashcommands/command_away.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type AwayProvider struct {
diff --git a/server/channels/app/slashcommands/command_channel_header.go b/server/channels/app/slashcommands/command_channel_header.go
index 06f7bb0a04..5f8bad0dd5 100644
--- a/server/channels/app/slashcommands/command_channel_header.go
+++ b/server/channels/app/slashcommands/command_channel_header.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type HeaderProvider struct {
diff --git a/server/channels/app/slashcommands/command_channel_header_test.go b/server/channels/app/slashcommands/command_channel_header_test.go
index 1cf7d4d6a4..7f48a978b4 100644
--- a/server/channels/app/slashcommands/command_channel_header_test.go
+++ b/server/channels/app/slashcommands/command_channel_header_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestHeaderProviderDoCommand(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_channel_purpose.go b/server/channels/app/slashcommands/command_channel_purpose.go
index 31691d31e7..1477142ae0 100644
--- a/server/channels/app/slashcommands/command_channel_purpose.go
+++ b/server/channels/app/slashcommands/command_channel_purpose.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type PurposeProvider struct {
diff --git a/server/channels/app/slashcommands/command_channel_purpose_test.go b/server/channels/app/slashcommands/command_channel_purpose_test.go
index 3f6e9a71d9..5663690cac 100644
--- a/server/channels/app/slashcommands/command_channel_purpose_test.go
+++ b/server/channels/app/slashcommands/command_channel_purpose_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPurposeProviderDoCommand(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_channel_rename.go b/server/channels/app/slashcommands/command_channel_rename.go
index ee9a0edfe3..6cf8b1a139 100644
--- a/server/channels/app/slashcommands/command_channel_rename.go
+++ b/server/channels/app/slashcommands/command_channel_rename.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type RenameProvider struct {
diff --git a/server/channels/app/slashcommands/command_channel_rename_test.go b/server/channels/app/slashcommands/command_channel_rename_test.go
index ff8aabbb64..4530e6d917 100644
--- a/server/channels/app/slashcommands/command_channel_rename_test.go
+++ b/server/channels/app/slashcommands/command_channel_rename_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestRenameProviderDoCommand(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_code.go b/server/channels/app/slashcommands/command_code.go
index 085f89b55b..bb57353e94 100644
--- a/server/channels/app/slashcommands/command_code.go
+++ b/server/channels/app/slashcommands/command_code.go
@@ -6,10 +6,10 @@ package slashcommands
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type CodeProvider struct {
diff --git a/server/channels/app/slashcommands/command_code_test.go b/server/channels/app/slashcommands/command_code_test.go
index e43bd6d469..cdc0bc6d68 100644
--- a/server/channels/app/slashcommands/command_code_test.go
+++ b/server/channels/app/slashcommands/command_code_test.go
@@ -6,7 +6,7 @@ package slashcommands
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCodeProviderDoCommand(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_custom_status.go b/server/channels/app/slashcommands/command_custom_status.go
index 2a85e93b8c..c7a60acd2a 100644
--- a/server/channels/app/slashcommands/command_custom_status.go
+++ b/server/channels/app/slashcommands/command_custom_status.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type CustomStatusProvider struct {
diff --git a/server/channels/app/slashcommands/command_custom_status_test.go b/server/channels/app/slashcommands/command_custom_status_test.go
index 560ba2e181..359b8c11c9 100644
--- a/server/channels/app/slashcommands/command_custom_status_test.go
+++ b/server/channels/app/slashcommands/command_custom_status_test.go
@@ -6,7 +6,7 @@ package slashcommands
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetCustomStatus(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_dnd.go b/server/channels/app/slashcommands/command_dnd.go
index 5dca6ae9ad..f028f3eb22 100644
--- a/server/channels/app/slashcommands/command_dnd.go
+++ b/server/channels/app/slashcommands/command_dnd.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type DndProvider struct {
diff --git a/server/channels/app/slashcommands/command_echo.go b/server/channels/app/slashcommands/command_echo.go
index f2105ab1f4..58dd39e5f5 100644
--- a/server/channels/app/slashcommands/command_echo.go
+++ b/server/channels/app/slashcommands/command_echo.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var echoSem chan bool
diff --git a/server/channels/app/slashcommands/command_expand_collapse.go b/server/channels/app/slashcommands/command_expand_collapse.go
index f243cc76af..477a027935 100644
--- a/server/channels/app/slashcommands/command_expand_collapse.go
+++ b/server/channels/app/slashcommands/command_expand_collapse.go
@@ -7,10 +7,10 @@ import (
 	"encoding/json"
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type ExpandProvider struct {
diff --git a/server/channels/app/slashcommands/command_groupmsg.go b/server/channels/app/slashcommands/command_groupmsg.go
index 507fd524c6..4083b2f628 100644
--- a/server/channels/app/slashcommands/command_groupmsg.go
+++ b/server/channels/app/slashcommands/command_groupmsg.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type groupmsgProvider struct {
diff --git a/server/channels/app/slashcommands/command_groupmsg_test.go b/server/channels/app/slashcommands/command_groupmsg_test.go
index 5db0a977b3..6743a57de7 100644
--- a/server/channels/app/slashcommands/command_groupmsg_test.go
+++ b/server/channels/app/slashcommands/command_groupmsg_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func TestGroupMsgUsernames(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_help.go b/server/channels/app/slashcommands/command_help.go
index 15a53ed5f0..61b85dd7b9 100644
--- a/server/channels/app/slashcommands/command_help.go
+++ b/server/channels/app/slashcommands/command_help.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type HelpProvider struct {
diff --git a/server/channels/app/slashcommands/command_invite.go b/server/channels/app/slashcommands/command_invite.go
index 9fcf79de19..906b9596ae 100644
--- a/server/channels/app/slashcommands/command_invite.go
+++ b/server/channels/app/slashcommands/command_invite.go
@@ -6,10 +6,10 @@ package slashcommands
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type InviteProvider struct {
diff --git a/server/channels/app/slashcommands/command_invite_people.go b/server/channels/app/slashcommands/command_invite_people.go
index f1e895cc7c..11040ac74f 100644
--- a/server/channels/app/slashcommands/command_invite_people.go
+++ b/server/channels/app/slashcommands/command_invite_people.go
@@ -6,11 +6,11 @@ package slashcommands
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type InvitePeopleProvider struct {
diff --git a/server/channels/app/slashcommands/command_invite_people_test.go b/server/channels/app/slashcommands/command_invite_people_test.go
index 8956b884b5..09112b3f57 100644
--- a/server/channels/app/slashcommands/command_invite_people_test.go
+++ b/server/channels/app/slashcommands/command_invite_people_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestInvitePeopleProvider(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_invite_test.go b/server/channels/app/slashcommands/command_invite_test.go
index b2163fb4a7..b2e2532168 100644
--- a/server/channels/app/slashcommands/command_invite_test.go
+++ b/server/channels/app/slashcommands/command_invite_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestInviteProvider(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_join.go b/server/channels/app/slashcommands/command_join.go
index 3f2c1f6053..9b87073e27 100644
--- a/server/channels/app/slashcommands/command_join.go
+++ b/server/channels/app/slashcommands/command_join.go
@@ -6,10 +6,10 @@ package slashcommands
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type JoinProvider struct {
diff --git a/server/channels/app/slashcommands/command_join_test.go b/server/channels/app/slashcommands/command_join_test.go
index c30c0b1621..850a4bcc31 100644
--- a/server/channels/app/slashcommands/command_join_test.go
+++ b/server/channels/app/slashcommands/command_join_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func TestJoinCommandNoChannel(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_leave.go b/server/channels/app/slashcommands/command_leave.go
index e1868d24ea..2711d73c2b 100644
--- a/server/channels/app/slashcommands/command_leave.go
+++ b/server/channels/app/slashcommands/command_leave.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type LeaveProvider struct {
diff --git a/server/channels/app/slashcommands/command_leave_test.go b/server/channels/app/slashcommands/command_leave_test.go
index 1abbc9048f..e7e2d149cd 100644
--- a/server/channels/app/slashcommands/command_leave_test.go
+++ b/server/channels/app/slashcommands/command_leave_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestLeaveProviderDoCommand(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_loadtest.go b/server/channels/app/slashcommands/command_loadtest.go
index a0b02267b4..a3beb9bc23 100644
--- a/server/channels/app/slashcommands/command_loadtest.go
+++ b/server/channels/app/slashcommands/command_loadtest.go
@@ -14,12 +14,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var usage = `Mattermost testing commands to help configure the system
diff --git a/server/channels/app/slashcommands/command_logout.go b/server/channels/app/slashcommands/command_logout.go
index cda4db774f..a8df517bf9 100644
--- a/server/channels/app/slashcommands/command_logout.go
+++ b/server/channels/app/slashcommands/command_logout.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type LogoutProvider struct {
diff --git a/server/channels/app/slashcommands/command_marketplace.go b/server/channels/app/slashcommands/command_marketplace.go
index b33e987883..5ffbd49d2b 100644
--- a/server/channels/app/slashcommands/command_marketplace.go
+++ b/server/channels/app/slashcommands/command_marketplace.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type MarketplaceProvider struct {
diff --git a/server/channels/app/slashcommands/command_marketplace_test.go b/server/channels/app/slashcommands/command_marketplace_test.go
index e023869204..0b6fe14bdf 100644
--- a/server/channels/app/slashcommands/command_marketplace_test.go
+++ b/server/channels/app/slashcommands/command_marketplace_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestMarketplaceProviderGetCommand(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_me.go b/server/channels/app/slashcommands/command_me.go
index b557ed4a8d..8415d21d2c 100644
--- a/server/channels/app/slashcommands/command_me.go
+++ b/server/channels/app/slashcommands/command_me.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type MeProvider struct {
diff --git a/server/channels/app/slashcommands/command_me_test.go b/server/channels/app/slashcommands/command_me_test.go
index 20472e745b..467374f817 100644
--- a/server/channels/app/slashcommands/command_me_test.go
+++ b/server/channels/app/slashcommands/command_me_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestMeProviderDoCommand(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_msg.go b/server/channels/app/slashcommands/command_msg.go
index e336ace857..7daae35e74 100644
--- a/server/channels/app/slashcommands/command_msg.go
+++ b/server/channels/app/slashcommands/command_msg.go
@@ -7,12 +7,12 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type msgProvider struct {
diff --git a/server/channels/app/slashcommands/command_msg_test.go b/server/channels/app/slashcommands/command_msg_test.go
index 549f703b3f..4f8fd0d172 100644
--- a/server/channels/app/slashcommands/command_msg_test.go
+++ b/server/channels/app/slashcommands/command_msg_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func TestMsgProvider(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_mute.go b/server/channels/app/slashcommands/command_mute.go
index de2dfd4d6a..8b83b7fa5d 100644
--- a/server/channels/app/slashcommands/command_mute.go
+++ b/server/channels/app/slashcommands/command_mute.go
@@ -6,10 +6,10 @@ package slashcommands
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type MuteProvider struct {
diff --git a/server/channels/app/slashcommands/command_mute_test.go b/server/channels/app/slashcommands/command_mute_test.go
index 9d62c4b6cc..5cc43352b6 100644
--- a/server/channels/app/slashcommands/command_mute_test.go
+++ b/server/channels/app/slashcommands/command_mute_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func TestMuteCommandNoChannel(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_offline.go b/server/channels/app/slashcommands/command_offline.go
index ba8a2624e4..c11729cf62 100644
--- a/server/channels/app/slashcommands/command_offline.go
+++ b/server/channels/app/slashcommands/command_offline.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type OfflineProvider struct {
diff --git a/server/channels/app/slashcommands/command_online.go b/server/channels/app/slashcommands/command_online.go
index e17fb7fa18..df38029fd1 100644
--- a/server/channels/app/slashcommands/command_online.go
+++ b/server/channels/app/slashcommands/command_online.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type OnlineProvider struct {
diff --git a/server/channels/app/slashcommands/command_open.go b/server/channels/app/slashcommands/command_open.go
index e9003f48a1..904a5f50ac 100644
--- a/server/channels/app/slashcommands/command_open.go
+++ b/server/channels/app/slashcommands/command_open.go
@@ -4,9 +4,9 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type OpenProvider struct {
diff --git a/server/channels/app/slashcommands/command_remote.go b/server/channels/app/slashcommands/command_remote.go
index b86cf561c5..ca50466586 100644
--- a/server/channels/app/slashcommands/command_remote.go
+++ b/server/channels/app/slashcommands/command_remote.go
@@ -9,10 +9,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 const (
diff --git a/server/channels/app/slashcommands/command_remove.go b/server/channels/app/slashcommands/command_remove.go
index 0baf47c295..e021c976a6 100644
--- a/server/channels/app/slashcommands/command_remove.go
+++ b/server/channels/app/slashcommands/command_remove.go
@@ -6,11 +6,11 @@ package slashcommands
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type RemoveProvider struct {
diff --git a/server/channels/app/slashcommands/command_remove_test.go b/server/channels/app/slashcommands/command_remove_test.go
index 32fe1a2213..2d1c7821e6 100644
--- a/server/channels/app/slashcommands/command_remove_test.go
+++ b/server/channels/app/slashcommands/command_remove_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestRemoveProviderDoCommand(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_search.go b/server/channels/app/slashcommands/command_search.go
index a38327ceb4..1587ae46b1 100644
--- a/server/channels/app/slashcommands/command_search.go
+++ b/server/channels/app/slashcommands/command_search.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type SearchProvider struct {
diff --git a/server/channels/app/slashcommands/command_settings.go b/server/channels/app/slashcommands/command_settings.go
index bbc0acda94..dc19789e1f 100644
--- a/server/channels/app/slashcommands/command_settings.go
+++ b/server/channels/app/slashcommands/command_settings.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type SettingsProvider struct {
diff --git a/server/channels/app/slashcommands/command_share.go b/server/channels/app/slashcommands/command_share.go
index 510b1dac34..0827eaf733 100644
--- a/server/channels/app/slashcommands/command_share.go
+++ b/server/channels/app/slashcommands/command_share.go
@@ -8,10 +8,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type ShareProvider struct {
diff --git a/server/channels/app/slashcommands/command_share_test.go b/server/channels/app/slashcommands/command_share_test.go
index 66f9a3a548..1d4e6a8fdf 100644
--- a/server/channels/app/slashcommands/command_share_test.go
+++ b/server/channels/app/slashcommands/command_share_test.go
@@ -9,14 +9,14 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestShareProviderDoCommand(t *testing.T) {
diff --git a/server/channels/app/slashcommands/command_shortcuts.go b/server/channels/app/slashcommands/command_shortcuts.go
index 7c0591992e..cad9369d16 100644
--- a/server/channels/app/slashcommands/command_shortcuts.go
+++ b/server/channels/app/slashcommands/command_shortcuts.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type ShortcutsProvider struct {
diff --git a/server/channels/app/slashcommands/command_shrug.go b/server/channels/app/slashcommands/command_shrug.go
index 5653dd6714..019ed4e6c6 100644
--- a/server/channels/app/slashcommands/command_shrug.go
+++ b/server/channels/app/slashcommands/command_shrug.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type ShrugProvider struct {
diff --git a/server/channels/app/slashcommands/command_templates.go b/server/channels/app/slashcommands/command_templates.go
index 0dca8d6631..04fa5aaba1 100644
--- a/server/channels/app/slashcommands/command_templates.go
+++ b/server/channels/app/slashcommands/command_templates.go
@@ -4,10 +4,10 @@
 package slashcommands
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type TemplatesProvider struct {
diff --git a/server/channels/app/slashcommands/command_test.go b/server/channels/app/slashcommands/command_test.go
index 2de89a0feb..1ca8d861d6 100644
--- a/server/channels/app/slashcommands/command_test.go
+++ b/server/channels/app/slashcommands/command_test.go
@@ -16,8 +16,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
 )
 
 type InfiniteReader struct {
diff --git a/server/channels/app/slashcommands/helper_test.go b/server/channels/app/slashcommands/helper_test.go
index 1941b7c355..ec2f44727b 100644
--- a/server/channels/app/slashcommands/helper_test.go
+++ b/server/channels/app/slashcommands/helper_test.go
@@ -13,12 +13,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type TestHelper struct {
diff --git a/server/channels/app/slashcommands/main_test.go b/server/channels/app/slashcommands/main_test.go
index 6cbb4c352d..ab5797f831 100644
--- a/server/channels/app/slashcommands/main_test.go
+++ b/server/channels/app/slashcommands/main_test.go
@@ -6,7 +6,7 @@ package slashcommands
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/channels/app/slashcommands/util.go b/server/channels/app/slashcommands/util.go
index ee46154456..5ebd3273c2 100644
--- a/server/channels/app/slashcommands/util.go
+++ b/server/channels/app/slashcommands/util.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 const (
diff --git a/server/channels/app/status.go b/server/channels/app/status.go
index 828296babd..0ae8ea0a58 100644
--- a/server/channels/app/status.go
+++ b/server/channels/app/status.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // GetUserStatusesByIds used by apiV4
diff --git a/server/channels/app/status_test.go b/server/channels/app/status_test.go
index e4ffef4585..4b12665359 100644
--- a/server/channels/app/status_test.go
+++ b/server/channels/app/status_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCustomStatus(t *testing.T) {
diff --git a/server/channels/app/support_packet.go b/server/channels/app/support_packet.go
index 66e88eb7ea..96d5ccff07 100644
--- a/server/channels/app/support_packet.go
+++ b/server/channels/app/support_packet.go
@@ -13,8 +13,8 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GenerateSupportPacket() []model.FileData {
diff --git a/server/channels/app/support_packet_test.go b/server/channels/app/support_packet_test.go
index 8158db50e8..72a206b9fd 100644
--- a/server/channels/app/support_packet_test.go
+++ b/server/channels/app/support_packet_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v2"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreatePluginsFile(t *testing.T) {
diff --git a/server/channels/app/syncables.go b/server/channels/app/syncables.go
index 9e1024c0b6..f4ba78f235 100644
--- a/server/channels/app/syncables.go
+++ b/server/channels/app/syncables.go
@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // createDefaultChannelMemberships adds users to channels based on their group memberships and how those groups are
diff --git a/server/channels/app/syncables_test.go b/server/channels/app/syncables_test.go
index 0908a859a2..85dad92182 100644
--- a/server/channels/app/syncables_test.go
+++ b/server/channels/app/syncables_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateDefaultMemberships(t *testing.T) {
diff --git a/server/channels/app/team.go b/server/channels/app/team.go
index 4a08fcd9ab..c2dd10c606 100644
--- a/server/channels/app/team.go
+++ b/server/channels/app/team.go
@@ -18,20 +18,20 @@ import (
 	"sort"
 	"strings"
 
-	fb_model "github.com/mattermost/mattermost-server/v6/server/boards/model"
+	fb_model "github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/email"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imaging"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/teams"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/email"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imaging"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/teams"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // teamServiceWrapper provides an implementation of `product.TeamService` to be used by products.
@@ -207,7 +207,7 @@ func (a *App) shouldCreateOnboardingLinkedBoard(c request.CTX, teamId string) bo
 func (a *App) createOnboardingLinkedBoard(c request.CTX, teamId string) (*fb_model.Board, *model.AppError) {
 	const defaultTemplatesTeam = "0"
 
-	// see https://github.com/mattermost/mattermost-server/v6/server/boards/blob/main/server/services/store/sqlstore/board.go#L302
+	// see https://github.com/mattermost/mattermost-server/server/v8/boards/blob/main/server/services/store/sqlstore/board.go#L302
 	// and https://github.com/mattermost/mattermost-server/pull/22201#discussion_r1099536430
 	const defaultTemplateTitle = "Welcome to Boards!"
 	welcomeToBoardsTemplateId := fmt.Sprintf("%x", md5.Sum([]byte(defaultTemplateTitle)))
diff --git a/server/channels/app/team_test.go b/server/channels/app/team_test.go
index d29fdeda3b..14bda61c4c 100644
--- a/server/channels/app/team_test.go
+++ b/server/channels/app/team_test.go
@@ -18,15 +18,15 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/email"
-	emailmocks "github.com/mattermost/mattermost-server/v6/server/channels/app/email/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/teams"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/email"
+	emailmocks "github.com/mattermost/mattermost-server/server/v8/channels/app/email/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/teams"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateTeam(t *testing.T) {
diff --git a/server/channels/app/teams/helper_test.go b/server/channels/app/teams/helper_test.go
index 67f78fd45b..b7265d9d61 100644
--- a/server/channels/app/teams/helper_test.go
+++ b/server/channels/app/teams/helper_test.go
@@ -9,10 +9,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type TestHelper struct {
diff --git a/server/channels/app/teams/main_test.go b/server/channels/app/teams/main_test.go
index b17fb1528e..621c97f30d 100644
--- a/server/channels/app/teams/main_test.go
+++ b/server/channels/app/teams/main_test.go
@@ -7,7 +7,7 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/channels/app/teams/service.go b/server/channels/app/teams/service.go
index 76c773c06d..54336fa6b1 100644
--- a/server/channels/app/teams/service.go
+++ b/server/channels/app/teams/service.go
@@ -6,8 +6,8 @@ package teams
 import (
 	"errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type TeamService struct {
diff --git a/server/channels/app/teams/teams.go b/server/channels/app/teams/teams.go
index 71480a33e5..e5b12a3d57 100644
--- a/server/channels/app/teams/teams.go
+++ b/server/channels/app/teams/teams.go
@@ -6,8 +6,8 @@ package teams
 import (
 	"context"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func (ts *TeamService) CreateTeam(team *model.Team) (*model.Team, error) {
diff --git a/server/channels/app/teams/teams_test.go b/server/channels/app/teams/teams_test.go
index a573b729c7..04a01cf897 100644
--- a/server/channels/app/teams/teams_test.go
+++ b/server/channels/app/teams/teams_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateTeam(t *testing.T) {
diff --git a/server/channels/app/teams/utils.go b/server/channels/app/teams/utils.go
index 14bef9b549..a2e12a589f 100644
--- a/server/channels/app/teams/utils.go
+++ b/server/channels/app/teams/utils.go
@@ -6,7 +6,7 @@ package teams
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // By default the list will be (not necessarily in this order):
diff --git a/server/channels/app/telemetry.go b/server/channels/app/telemetry.go
index 423bbffc5b..2258d837fb 100644
--- a/server/channels/app/telemetry.go
+++ b/server/channels/app/telemetry.go
@@ -3,7 +3,7 @@
 
 package app
 
-import "github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry"
+import "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry"
 
 func (s *Server) GetTelemetryService() *telemetry.TelemetryService {
 	return s.telemetryService
diff --git a/server/channels/app/terms_of_service.go b/server/channels/app/terms_of_service.go
index a8f33d79d5..fca66abaa1 100644
--- a/server/channels/app/terms_of_service.go
+++ b/server/channels/app/terms_of_service.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) CreateTermsOfService(text, userID string) (*model.TermsOfService, *model.AppError) {
diff --git a/server/channels/app/true_up.go b/server/channels/app/true_up.go
index 02aefbdde9..ab90154fd7 100644
--- a/server/channels/app/true_up.go
+++ b/server/channels/app/true_up.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry"
 )
 
 func pluginActivated(pluginStates map[string]*model.PluginState, pluginId string) bool {
diff --git a/server/channels/app/upload.go b/server/channels/app/upload.go
index c534c53a7e..c8944eb27a 100644
--- a/server/channels/app/upload.go
+++ b/server/channels/app/upload.go
@@ -13,11 +13,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const minFirstPartSize = 5 * 1024 * 1024 // 5MB
diff --git a/server/channels/app/upload_test.go b/server/channels/app/upload_test.go
index 51a21ab7b7..7946d29b20 100644
--- a/server/channels/app/upload_test.go
+++ b/server/channels/app/upload_test.go
@@ -15,9 +15,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/imgutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/imgutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCreateUploadSession(t *testing.T) {
diff --git a/server/channels/app/usage.go b/server/channels/app/usage.go
index f3b132e757..31ba2257c9 100644
--- a/server/channels/app/usage.go
+++ b/server/channels/app/usage.go
@@ -6,8 +6,8 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // GetPostsUsage returns the total posts count rounded down to the most
diff --git a/server/channels/app/usage_test.go b/server/channels/app/usage_test.go
index 11e6b60809..9a561d9711 100644
--- a/server/channels/app/usage_test.go
+++ b/server/channels/app/usage_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
 )
 
 func TestGetPostsUsage(t *testing.T) {
diff --git a/server/channels/app/user.go b/server/channels/app/user.go
index f0b6b7c826..9e08824168 100644
--- a/server/channels/app/user.go
+++ b/server/channels/app/user.go
@@ -19,17 +19,17 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/email"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/imaging"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mfa"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/email"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/imaging"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mfa"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const (
diff --git a/server/channels/app/user_terms_of_service.go b/server/channels/app/user_terms_of_service.go
index a9c5152a23..73360d739d 100644
--- a/server/channels/app/user_terms_of_service.go
+++ b/server/channels/app/user_terms_of_service.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetUserTermsOfService(userID string) (*model.UserTermsOfService, *model.AppError) {
diff --git a/server/channels/app/user_test.go b/server/channels/app/user_test.go
index 2d52d1e19a..2cc279e62e 100644
--- a/server/channels/app/user_test.go
+++ b/server/channels/app/user_test.go
@@ -18,15 +18,15 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	oauthgitlab "github.com/mattermost/mattermost-server/v6/model/oauthproviders/gitlab"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/users"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	storemocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/users"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	oauthgitlab "github.com/mattermost/mattermost-server/server/v8/model/oauthproviders/gitlab"
 )
 
 func TestCreateOAuthUser(t *testing.T) {
@@ -255,8 +255,8 @@ func TestCreateUser(t *testing.T) {
 			package main
 
 			import (
-				"github.com/mattermost/mattermost-server/v6/plugin"
-				"github.com/mattermost/mattermost-server/v6/model"
+				"github.com/mattermost/mattermost-server/server/v8/plugin"
+				"github.com/mattermost/mattermost-server/server/v8/model"
 			)
 
 			type MyPlugin struct {
diff --git a/server/channels/app/user_viewmembers_test.go b/server/channels/app/user_viewmembers_test.go
index 9a14fc652c..4d57018516 100644
--- a/server/channels/app/user_viewmembers_test.go
+++ b/server/channels/app/user_viewmembers_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestRestrictedViewMembers(t *testing.T) {
diff --git a/server/channels/app/users/helper_test.go b/server/channels/app/users/helper_test.go
index de347336a6..c979ba2d08 100644
--- a/server/channels/app/users/helper_test.go
+++ b/server/channels/app/users/helper_test.go
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var initBasicOnce sync.Once
diff --git a/server/channels/app/users/main_test.go b/server/channels/app/users/main_test.go
index a2d3b828dc..6d731849d8 100644
--- a/server/channels/app/users/main_test.go
+++ b/server/channels/app/users/main_test.go
@@ -7,7 +7,7 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/channels/app/users/password.go b/server/channels/app/users/password.go
index b8c004231f..81dfa30529 100644
--- a/server/channels/app/users/password.go
+++ b/server/channels/app/users/password.go
@@ -9,7 +9,7 @@ import (
 
 	"golang.org/x/crypto/bcrypt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func CheckUserPassword(user *model.User, password string) error {
diff --git a/server/channels/app/users/password_test.go b/server/channels/app/users/password_test.go
index 500abb14a1..84ef4e2971 100644
--- a/server/channels/app/users/password_test.go
+++ b/server/channels/app/users/password_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestComparePassword(t *testing.T) {
diff --git a/server/channels/app/users/profile_picture.go b/server/channels/app/users/profile_picture.go
index 0d1fba9914..68eb890e0d 100644
--- a/server/channels/app/users/profile_picture.go
+++ b/server/channels/app/users/profile_picture.go
@@ -19,9 +19,9 @@ import (
 	"github.com/golang/freetype"
 	"github.com/golang/freetype/truetype"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
 )
 
 const (
diff --git a/server/channels/app/users/service.go b/server/channels/app/users/service.go
index cefc015f38..f1db3b2a35 100644
--- a/server/channels/app/users/service.go
+++ b/server/channels/app/users/service.go
@@ -6,9 +6,9 @@ package users
 import (
 	"errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type UserService struct {
diff --git a/server/channels/app/users/service_test.go b/server/channels/app/users/service_test.go
index 389037c63f..5d5d50e231 100644
--- a/server/channels/app/users/service_test.go
+++ b/server/channels/app/users/service_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestNew(t *testing.T) {
diff --git a/server/channels/app/users/users.go b/server/channels/app/users/users.go
index f424c88663..543be78956 100644
--- a/server/channels/app/users/users.go
+++ b/server/channels/app/users/users.go
@@ -8,11 +8,11 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mfa"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mfa"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/pkg/errors"
 )
diff --git a/server/channels/app/users/users_test.go b/server/channels/app/users/users_test.go
index 8dfd14dc1c..d68b223122 100644
--- a/server/channels/app/users/users_test.go
+++ b/server/channels/app/users/users_test.go
@@ -6,7 +6,7 @@ package users
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/channels/app/users/utils.go b/server/channels/app/users/utils.go
index 52545432bc..f4cb7017ca 100644
--- a/server/channels/app/users/utils.go
+++ b/server/channels/app/users/utils.go
@@ -6,7 +6,7 @@ package users
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // CheckUserDomain checks that a user's email domain matches a list of space-delimited domains as a string.
diff --git a/server/channels/app/web_conn.go b/server/channels/app/web_conn.go
index 43f1255cd9..2ec1537586 100644
--- a/server/channels/app/web_conn.go
+++ b/server/channels/app/web_conn.go
@@ -4,8 +4,8 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // PopulateWebConnConfig checks if the connection id already exists in the hub,
diff --git a/server/channels/app/web_conn_test.go b/server/channels/app/web_conn_test.go
index cd55ddf6a0..099caf6ca3 100644
--- a/server/channels/app/web_conn_test.go
+++ b/server/channels/app/web_conn_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func TestWebConnShouldSendEvent(t *testing.T) {
diff --git a/server/channels/app/web_hub.go b/server/channels/app/web_hub.go
index d65dfb4bf4..a064562039 100644
--- a/server/channels/app/web_hub.go
+++ b/server/channels/app/web_hub.go
@@ -4,8 +4,8 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) TotalWebsocketConnections() int {
diff --git a/server/channels/app/webhook.go b/server/channels/app/webhook.go
index dc94fd5bce..7395086130 100644
--- a/server/channels/app/webhook.go
+++ b/server/channels/app/webhook.go
@@ -14,11 +14,11 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/app/webhook_test.go b/server/channels/app/webhook_test.go
index f00c2d913f..caac38a08b 100644
--- a/server/channels/app/webhook_test.go
+++ b/server/channels/app/webhook_test.go
@@ -17,9 +17,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
 )
 
 func TestCreateIncomingWebhookForChannel(t *testing.T) {
diff --git a/server/channels/app/webhub_fuzz.go b/server/channels/app/webhub_fuzz.go
index eb88bb200f..829aeb2025 100644
--- a/server/channels/app/webhub_fuzz.go
+++ b/server/channels/app/webhub_fuzz.go
@@ -18,9 +18,9 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 // This is a file used to fuzz test the web_hub code.
@@ -41,7 +41,7 @@ import (
 // 1. go get -u github.com/dvyukov/go-fuzz/go-fuzz github.com/dvyukov/go-fuzz/go-fuzz-build
 // 2. mv app/helper_test.go app/helper.go
 // (Also reduce the number of push notification workers to 1 to debug stack traces easily.)
-// 3. go-fuzz-build github.com/mattermost/mattermost-server/v6/server/channels/app
+// 3. go-fuzz-build github.com/mattermost/mattermost-server/server/v8/channels/app
 // 4. Generate a corpus dir. It's just a directory with files containing random data
 // for go-fuzz to use as an initial seed. Use the generateInitialCorpus function for that.
 // 5. go-fuzz -bin=app-fuzz.zip -workdir=./workdir
diff --git a/server/channels/app/websocket_router.go b/server/channels/app/websocket_router.go
index ce15e90daa..e76223860f 100644
--- a/server/channels/app/websocket_router.go
+++ b/server/channels/app/websocket_router.go
@@ -6,9 +6,9 @@ package app
 // import (
 // 	"net/http"
 
-// 	"github.com/mattermost/mattermost-server/v6/model"
-// 	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-// 	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+// 	"github.com/mattermost/mattermost-server/server/v8/model"
+// 	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+// 	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 // )
 
 // type webSocketHandler interface {
diff --git a/server/channels/app/work_template_executor.go b/server/channels/app/work_template_executor.go
index a290434b37..360feb2427 100644
--- a/server/channels/app/work_template_executor.go
+++ b/server/channels/app/work_template_executor.go
@@ -10,16 +10,16 @@ import (
 	"regexp"
 	"strings"
 
-	pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 
-	fb_model "github.com/mattermost/mattermost-server/v6/server/boards/model"
+	fb_model "github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type WorkTemplateExecutor interface {
diff --git a/server/channels/app/work_templates.go b/server/channels/app/work_templates.go
index 43bff0dfee..c2754da849 100644
--- a/server/channels/app/work_templates.go
+++ b/server/channels/app/work_templates.go
@@ -6,10 +6,10 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func (a *App) GetWorkTemplateCategories(t i18n.TranslateFunc) ([]*model.WorkTemplateCategory, *model.AppError) {
diff --git a/server/channels/app/work_templates_test.go b/server/channels/app/work_templates_test.go
index 6d90b33665..1ca5332f3a 100644
--- a/server/channels/app/work_templates_test.go
+++ b/server/channels/app/work_templates_test.go
@@ -12,12 +12,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
-	pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 )
 
 func TestGetWorkTemplateCategories(t *testing.T) {
diff --git a/server/channels/app/worktemplates/generator/main.go b/server/channels/app/worktemplates/generator/main.go
index bc072fc7a5..1282ae416a 100644
--- a/server/channels/app/worktemplates/generator/main.go
+++ b/server/channels/app/worktemplates/generator/main.go
@@ -19,7 +19,7 @@ import (
 	"golang.org/x/tools/imports"
 	"gopkg.in/yaml.v3"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates"
 )
 
 type WorkTemplateWithMD5 struct {
diff --git a/server/channels/app/worktemplates/model.go b/server/channels/app/worktemplates/model.go
index 88223820d3..418df3b690 100644
--- a/server/channels/app/worktemplates/model.go
+++ b/server/channels/app/worktemplates/model.go
@@ -6,9 +6,9 @@ import (
 	"errors"
 	"net/http"
 
-	pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type ExecutionRequest struct {
diff --git a/server/channels/app/worktemplates/model_test.go b/server/channels/app/worktemplates/model_test.go
index 53e737a55c..fb131ffab6 100644
--- a/server/channels/app/worktemplates/model_test.go
+++ b/server/channels/app/worktemplates/model_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
-	pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 )
 
 func TestCanBeExecuted(t *testing.T) {
diff --git a/server/channels/app/worktemplates/types.go b/server/channels/app/worktemplates/types.go
index 2b4cbedbb1..a75db605aa 100644
--- a/server/channels/app/worktemplates/types.go
+++ b/server/channels/app/worktemplates/types.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type WorkTemplateCategory struct {
diff --git a/server/channels/audit/audit.go b/server/channels/audit/audit.go
index 098032c5f7..9259051919 100644
--- a/server/channels/audit/audit.go
+++ b/server/channels/audit/audit.go
@@ -6,7 +6,7 @@ package audit
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Audit struct {
diff --git a/server/channels/audit/audit_test.go b/server/channels/audit/audit_test.go
index b12a523971..ed526b3457 100644
--- a/server/channels/audit/audit_test.go
+++ b/server/channels/audit/audit_test.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestAudit_LogRecord(t *testing.T) {
diff --git a/server/channels/einterfaces/account_migration.go b/server/channels/einterfaces/account_migration.go
index 901bb73cd5..54c87458cf 100644
--- a/server/channels/einterfaces/account_migration.go
+++ b/server/channels/einterfaces/account_migration.go
@@ -4,7 +4,7 @@
 package einterfaces
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type AccountMigrationInterface interface {
diff --git a/server/channels/einterfaces/cloud.go b/server/channels/einterfaces/cloud.go
index fc5446cd34..231afc0d49 100644
--- a/server/channels/einterfaces/cloud.go
+++ b/server/channels/einterfaces/cloud.go
@@ -4,7 +4,7 @@
 package einterfaces
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type CloudInterface interface {
diff --git a/server/channels/einterfaces/cluster.go b/server/channels/einterfaces/cluster.go
index 6ba89cd299..1bea4f521b 100644
--- a/server/channels/einterfaces/cluster.go
+++ b/server/channels/einterfaces/cluster.go
@@ -4,7 +4,7 @@
 package einterfaces
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type ClusterMessageHandler func(msg *model.ClusterMessage)
diff --git a/server/channels/einterfaces/compliance.go b/server/channels/einterfaces/compliance.go
index ce607f79b6..5e895ab878 100644
--- a/server/channels/einterfaces/compliance.go
+++ b/server/channels/einterfaces/compliance.go
@@ -4,7 +4,7 @@
 package einterfaces
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type ComplianceInterface interface {
diff --git a/server/channels/einterfaces/data_retention.go b/server/channels/einterfaces/data_retention.go
index 9f317bd598..e64083b9fc 100644
--- a/server/channels/einterfaces/data_retention.go
+++ b/server/channels/einterfaces/data_retention.go
@@ -4,7 +4,7 @@
 package einterfaces
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type DataRetentionInterface interface {
diff --git a/server/channels/einterfaces/jobs/cloud_interface.go b/server/channels/einterfaces/jobs/cloud_interface.go
index 62619cbbd6..5f5e762c80 100644
--- a/server/channels/einterfaces/jobs/cloud_interface.go
+++ b/server/channels/einterfaces/jobs/cloud_interface.go
@@ -4,7 +4,7 @@
 package jobs
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type CloudJobInterface interface {
diff --git a/server/channels/einterfaces/jobs/data_retention.go b/server/channels/einterfaces/jobs/data_retention.go
index c00ad5b20e..aebc121bd1 100644
--- a/server/channels/einterfaces/jobs/data_retention.go
+++ b/server/channels/einterfaces/jobs/data_retention.go
@@ -4,7 +4,7 @@
 package jobs
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type DataRetentionJobInterface interface {
diff --git a/server/channels/einterfaces/jobs/elasticsearch.go b/server/channels/einterfaces/jobs/elasticsearch.go
index 2078895127..aed3df9ef6 100644
--- a/server/channels/einterfaces/jobs/elasticsearch.go
+++ b/server/channels/einterfaces/jobs/elasticsearch.go
@@ -4,7 +4,7 @@
 package jobs
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type ElasticsearchIndexerInterface interface {
diff --git a/server/channels/einterfaces/jobs/indexer_interface.go b/server/channels/einterfaces/jobs/indexer_interface.go
index 09035b84e0..5fa9f1ed06 100644
--- a/server/channels/einterfaces/jobs/indexer_interface.go
+++ b/server/channels/einterfaces/jobs/indexer_interface.go
@@ -4,7 +4,7 @@
 package jobs
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type IndexerJobInterface interface {
diff --git a/server/channels/einterfaces/jobs/ldap_sync.go b/server/channels/einterfaces/jobs/ldap_sync.go
index 01f855043e..e38824680f 100644
--- a/server/channels/einterfaces/jobs/ldap_sync.go
+++ b/server/channels/einterfaces/jobs/ldap_sync.go
@@ -4,7 +4,7 @@
 package jobs
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LdapSyncInterface interface {
diff --git a/server/channels/einterfaces/jobs/message_export.go b/server/channels/einterfaces/jobs/message_export.go
index 5d699d73bb..bfd9bd5d9c 100644
--- a/server/channels/einterfaces/jobs/message_export.go
+++ b/server/channels/einterfaces/jobs/message_export.go
@@ -4,7 +4,7 @@
 package jobs
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type MessageExportJobInterface interface {
diff --git a/server/channels/einterfaces/ldap.go b/server/channels/einterfaces/ldap.go
index 685ebfdf61..ba04eacccd 100644
--- a/server/channels/einterfaces/ldap.go
+++ b/server/channels/einterfaces/ldap.go
@@ -4,8 +4,8 @@
 package einterfaces
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LdapInterface interface {
diff --git a/server/channels/einterfaces/license.go b/server/channels/einterfaces/license.go
index 3a66ebe56f..864050577f 100644
--- a/server/channels/einterfaces/license.go
+++ b/server/channels/einterfaces/license.go
@@ -3,7 +3,7 @@
 
 package einterfaces
 
-import "github.com/mattermost/mattermost-server/v6/model"
+import "github.com/mattermost/mattermost-server/server/v8/model"
 
 type LicenseInterface interface {
 	CanStartTrial() (bool, error)
diff --git a/server/channels/einterfaces/message_export.go b/server/channels/einterfaces/message_export.go
index 27cc753a9d..d06f3f26c2 100644
--- a/server/channels/einterfaces/message_export.go
+++ b/server/channels/einterfaces/message_export.go
@@ -6,7 +6,7 @@ package einterfaces
 import (
 	"context"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type MessageExportInterface interface {
diff --git a/server/channels/einterfaces/metrics.go b/server/channels/einterfaces/metrics.go
index 6c260d6ab2..06f44f7b66 100644
--- a/server/channels/einterfaces/metrics.go
+++ b/server/channels/einterfaces/metrics.go
@@ -6,8 +6,8 @@ package einterfaces
 import (
 	"database/sql"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type MetricsInterface interface {
diff --git a/server/channels/einterfaces/mfa.go b/server/channels/einterfaces/mfa.go
index e3b89cabc0..b3315970e2 100644
--- a/server/channels/einterfaces/mfa.go
+++ b/server/channels/einterfaces/mfa.go
@@ -4,7 +4,7 @@
 package einterfaces
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type MfaInterface interface {
diff --git a/server/channels/einterfaces/mocks/AccountMigrationInterface.go b/server/channels/einterfaces/mocks/AccountMigrationInterface.go
index d8d9209476..edaafe5e76 100644
--- a/server/channels/einterfaces/mocks/AccountMigrationInterface.go
+++ b/server/channels/einterfaces/mocks/AccountMigrationInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/AppContextInterface.go b/server/channels/einterfaces/mocks/AppContextInterface.go
index 6dd47b04d4..6780bc23c2 100644
--- a/server/channels/einterfaces/mocks/AppContextInterface.go
+++ b/server/channels/einterfaces/mocks/AppContextInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/CloudInterface.go b/server/channels/einterfaces/mocks/CloudInterface.go
index 5800844da0..03d084411e 100644
--- a/server/channels/einterfaces/mocks/CloudInterface.go
+++ b/server/channels/einterfaces/mocks/CloudInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/CloudJobInterface.go b/server/channels/einterfaces/mocks/CloudJobInterface.go
index 5e08488c1b..ff5c7377c8 100644
--- a/server/channels/einterfaces/mocks/CloudJobInterface.go
+++ b/server/channels/einterfaces/mocks/CloudJobInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/ClusterInterface.go b/server/channels/einterfaces/mocks/ClusterInterface.go
index e957a860d2..4e4b0134f5 100644
--- a/server/channels/einterfaces/mocks/ClusterInterface.go
+++ b/server/channels/einterfaces/mocks/ClusterInterface.go
@@ -5,10 +5,10 @@
 package mocks
 
 import (
-	einterfaces "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
+	einterfaces "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
 	mock "github.com/stretchr/testify/mock"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // ClusterInterface is an autogenerated mock type for the ClusterInterface type
diff --git a/server/channels/einterfaces/mocks/ClusterMessageHandler.go b/server/channels/einterfaces/mocks/ClusterMessageHandler.go
index b29eb7ce1b..f280d52a0b 100644
--- a/server/channels/einterfaces/mocks/ClusterMessageHandler.go
+++ b/server/channels/einterfaces/mocks/ClusterMessageHandler.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/ComplianceInterface.go b/server/channels/einterfaces/mocks/ComplianceInterface.go
index ae4f1f772b..2cc9c75ccd 100644
--- a/server/channels/einterfaces/mocks/ComplianceInterface.go
+++ b/server/channels/einterfaces/mocks/ComplianceInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/DataRetentionInterface.go b/server/channels/einterfaces/mocks/DataRetentionInterface.go
index 5d5932b9ff..ff7f344445 100644
--- a/server/channels/einterfaces/mocks/DataRetentionInterface.go
+++ b/server/channels/einterfaces/mocks/DataRetentionInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/DataRetentionJobInterface.go b/server/channels/einterfaces/mocks/DataRetentionJobInterface.go
index 7e6d4769c3..b18fd3e5d1 100644
--- a/server/channels/einterfaces/mocks/DataRetentionJobInterface.go
+++ b/server/channels/einterfaces/mocks/DataRetentionJobInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go b/server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go
index 3c821c7603..722d2b7ed5 100644
--- a/server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go
+++ b/server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go b/server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go
index eea9855926..c68daf5c15 100644
--- a/server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go
+++ b/server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/IndexerJobInterface.go b/server/channels/einterfaces/mocks/IndexerJobInterface.go
index b040153342..639c245c3b 100644
--- a/server/channels/einterfaces/mocks/IndexerJobInterface.go
+++ b/server/channels/einterfaces/mocks/IndexerJobInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/LdapInterface.go b/server/channels/einterfaces/mocks/LdapInterface.go
index fa6173fb42..dd4d187884 100644
--- a/server/channels/einterfaces/mocks/LdapInterface.go
+++ b/server/channels/einterfaces/mocks/LdapInterface.go
@@ -5,8 +5,8 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
-	request "github.com/mattermost/mattermost-server/v6/server/channels/app/request"
+	request "github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/LdapSyncInterface.go b/server/channels/einterfaces/mocks/LdapSyncInterface.go
index 078cbe105f..4ded7caa1d 100644
--- a/server/channels/einterfaces/mocks/LdapSyncInterface.go
+++ b/server/channels/einterfaces/mocks/LdapSyncInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/LicenseInterface.go b/server/channels/einterfaces/mocks/LicenseInterface.go
index e7aa66322f..29595d46f5 100644
--- a/server/channels/einterfaces/mocks/LicenseInterface.go
+++ b/server/channels/einterfaces/mocks/LicenseInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/MessageExportInterface.go b/server/channels/einterfaces/mocks/MessageExportInterface.go
index 229aa48f13..770330ff89 100644
--- a/server/channels/einterfaces/mocks/MessageExportInterface.go
+++ b/server/channels/einterfaces/mocks/MessageExportInterface.go
@@ -9,7 +9,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // MessageExportInterface is an autogenerated mock type for the MessageExportInterface type
diff --git a/server/channels/einterfaces/mocks/MessageExportJobInterface.go b/server/channels/einterfaces/mocks/MessageExportJobInterface.go
index 50b3763035..9bad367308 100644
--- a/server/channels/einterfaces/mocks/MessageExportJobInterface.go
+++ b/server/channels/einterfaces/mocks/MessageExportJobInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/MetricsInterface.go b/server/channels/einterfaces/mocks/MetricsInterface.go
index 6d98d3607e..0d6f799ee5 100644
--- a/server/channels/einterfaces/mocks/MetricsInterface.go
+++ b/server/channels/einterfaces/mocks/MetricsInterface.go
@@ -8,7 +8,7 @@ import (
 	logr "github.com/mattermost/logr/v2"
 	mock "github.com/stretchr/testify/mock"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 
 	sql "database/sql"
 )
diff --git a/server/channels/einterfaces/mocks/MfaInterface.go b/server/channels/einterfaces/mocks/MfaInterface.go
index 3df6e4bb67..737da86700 100644
--- a/server/channels/einterfaces/mocks/MfaInterface.go
+++ b/server/channels/einterfaces/mocks/MfaInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/NotificationInterface.go b/server/channels/einterfaces/mocks/NotificationInterface.go
index 2c67239fca..06a155c285 100644
--- a/server/channels/einterfaces/mocks/NotificationInterface.go
+++ b/server/channels/einterfaces/mocks/NotificationInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/OAuthProvider.go b/server/channels/einterfaces/mocks/OAuthProvider.go
index 5568ebd5a3..3a8a563398 100644
--- a/server/channels/einterfaces/mocks/OAuthProvider.go
+++ b/server/channels/einterfaces/mocks/OAuthProvider.go
@@ -7,7 +7,7 @@ package mocks
 import (
 	io "io"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go b/server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go
index 8e69694e71..20853c78eb 100644
--- a/server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go
+++ b/server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/mocks/SamlInterface.go b/server/channels/einterfaces/mocks/SamlInterface.go
index f7908898c9..e7200b4ccf 100644
--- a/server/channels/einterfaces/mocks/SamlInterface.go
+++ b/server/channels/einterfaces/mocks/SamlInterface.go
@@ -5,8 +5,8 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
-	request "github.com/mattermost/mattermost-server/v6/server/channels/app/request"
+	request "github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/einterfaces/notification.go b/server/channels/einterfaces/notification.go
index 9a63d9da26..65d933d2dd 100644
--- a/server/channels/einterfaces/notification.go
+++ b/server/channels/einterfaces/notification.go
@@ -4,7 +4,7 @@
 package einterfaces
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type NotificationInterface interface {
diff --git a/server/channels/einterfaces/oauthproviders.go b/server/channels/einterfaces/oauthproviders.go
index de60c9459f..a095921e5b 100644
--- a/server/channels/einterfaces/oauthproviders.go
+++ b/server/channels/einterfaces/oauthproviders.go
@@ -6,7 +6,7 @@ package einterfaces
 import (
 	"io"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type OAuthProvider interface {
diff --git a/server/channels/einterfaces/saml.go b/server/channels/einterfaces/saml.go
index 41fb2bbd2b..81fab6b17b 100644
--- a/server/channels/einterfaces/saml.go
+++ b/server/channels/einterfaces/saml.go
@@ -4,8 +4,8 @@
 package einterfaces
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SamlInterface interface {
diff --git a/server/channels/imports/boards_imports.go b/server/channels/imports/boards_imports.go
index 6e79d935ee..ca7aa36124 100644
--- a/server/channels/imports/boards_imports.go
+++ b/server/channels/imports/boards_imports.go
@@ -5,5 +5,5 @@ package imports
 
 import (
 	// Needed to ensure the init() method in the FocalBoard product is run.
-	_ "github.com/mattermost/mattermost-server/v6/server/boards/product"
+	_ "github.com/mattermost/mattermost-server/server/v8/boards/product"
 )
diff --git a/server/channels/imports/playbooks_imports.go b/server/channels/imports/playbooks_imports.go
index 3ffc936df8..260e41af12 100644
--- a/server/channels/imports/playbooks_imports.go
+++ b/server/channels/imports/playbooks_imports.go
@@ -5,5 +5,5 @@ package imports
 
 import (
 	// Needed to ensure the init() method in the Playbooks product is run.
-	_ "github.com/mattermost/mattermost-server/v6/server/playbooks/product"
+	_ "github.com/mattermost/mattermost-server/server/v8/playbooks/product"
 )
diff --git a/server/channels/jobs/active_users/scheduler.go b/server/channels/jobs/active_users/scheduler.go
index bc6c55de92..e1cd95a93c 100644
--- a/server/channels/jobs/active_users/scheduler.go
+++ b/server/channels/jobs/active_users/scheduler.go
@@ -6,8 +6,8 @@ package active_users
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const schedFreq = 10 * time.Minute
diff --git a/server/channels/jobs/active_users/worker.go b/server/channels/jobs/active_users/worker.go
index 3d5fc3e65a..c078a87ad3 100644
--- a/server/channels/jobs/active_users/worker.go
+++ b/server/channels/jobs/active_users/worker.go
@@ -4,10 +4,10 @@
 package active_users
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/jobs/base_schedulers.go b/server/channels/jobs/base_schedulers.go
index 0de90b2d2f..5b198a59af 100644
--- a/server/channels/jobs/base_schedulers.go
+++ b/server/channels/jobs/base_schedulers.go
@@ -8,7 +8,7 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type PeriodicScheduler struct {
diff --git a/server/channels/jobs/base_workers.go b/server/channels/jobs/base_workers.go
index d8344b383a..92bd3041d0 100644
--- a/server/channels/jobs/base_workers.go
+++ b/server/channels/jobs/base_workers.go
@@ -6,8 +6,8 @@ package jobs
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SimpleWorker struct {
diff --git a/server/channels/jobs/expirynotify/scheduler.go b/server/channels/jobs/expirynotify/scheduler.go
index c22fb6a370..6cf302b239 100644
--- a/server/channels/jobs/expirynotify/scheduler.go
+++ b/server/channels/jobs/expirynotify/scheduler.go
@@ -6,8 +6,8 @@ package expirynotify
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const schedFreq = 10 * time.Minute
diff --git a/server/channels/jobs/expirynotify/worker.go b/server/channels/jobs/expirynotify/worker.go
index eef266a645..67662b8de2 100644
--- a/server/channels/jobs/expirynotify/worker.go
+++ b/server/channels/jobs/expirynotify/worker.go
@@ -4,8 +4,8 @@
 package expirynotify
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/jobs/export_delete/scheduler.go b/server/channels/jobs/export_delete/scheduler.go
index 651232891e..6348b88a10 100644
--- a/server/channels/jobs/export_delete/scheduler.go
+++ b/server/channels/jobs/export_delete/scheduler.go
@@ -6,8 +6,8 @@ package export_delete
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const schedFreq = 24 * time.Hour
diff --git a/server/channels/jobs/export_delete/worker.go b/server/channels/jobs/export_delete/worker.go
index e1c17dc913..372e6a3221 100644
--- a/server/channels/jobs/export_delete/worker.go
+++ b/server/channels/jobs/export_delete/worker.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/configservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/configservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const jobName = "ExportDelete"
diff --git a/server/channels/jobs/export_process/worker.go b/server/channels/jobs/export_process/worker.go
index dab103da6c..ef496a98c2 100644
--- a/server/channels/jobs/export_process/worker.go
+++ b/server/channels/jobs/export_process/worker.go
@@ -8,11 +8,11 @@ import (
 	"io"
 	"path/filepath"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/configservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/configservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const jobName = "ExportProcess"
diff --git a/server/channels/jobs/extract_content/worker.go b/server/channels/jobs/extract_content/worker.go
index 3e777e70ee..af2b819ccb 100644
--- a/server/channels/jobs/extract_content/worker.go
+++ b/server/channels/jobs/extract_content/worker.go
@@ -6,10 +6,10 @@ package extract_content
 import (
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var ignoredFiles = map[string]bool{
diff --git a/server/channels/jobs/hosted_purchase_screening/scheduler.go b/server/channels/jobs/hosted_purchase_screening/scheduler.go
index b7fd279a5d..612bc89188 100644
--- a/server/channels/jobs/hosted_purchase_screening/scheduler.go
+++ b/server/channels/jobs/hosted_purchase_screening/scheduler.go
@@ -6,8 +6,8 @@ package hosted_purchase_screening
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const schedFreq = 24 * time.Hour
diff --git a/server/channels/jobs/hosted_purchase_screening/worker.go b/server/channels/jobs/hosted_purchase_screening/worker.go
index 28037c3239..7a00705a2f 100644
--- a/server/channels/jobs/hosted_purchase_screening/worker.go
+++ b/server/channels/jobs/hosted_purchase_screening/worker.go
@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/jobs/import_delete/scheduler.go b/server/channels/jobs/import_delete/scheduler.go
index e81e0fc311..16191741a8 100644
--- a/server/channels/jobs/import_delete/scheduler.go
+++ b/server/channels/jobs/import_delete/scheduler.go
@@ -6,8 +6,8 @@ package import_delete
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const schedFreq = 24 * time.Hour
diff --git a/server/channels/jobs/import_delete/worker.go b/server/channels/jobs/import_delete/worker.go
index 257ab50904..9d4eb4c0b3 100644
--- a/server/channels/jobs/import_delete/worker.go
+++ b/server/channels/jobs/import_delete/worker.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/configservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/configservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const jobName = "ImportDelete"
diff --git a/server/channels/jobs/import_process/worker.go b/server/channels/jobs/import_process/worker.go
index 0437256f5c..e87e6792d2 100644
--- a/server/channels/jobs/import_process/worker.go
+++ b/server/channels/jobs/import_process/worker.go
@@ -12,12 +12,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/configservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/configservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const jobName = "ImportProcess"
diff --git a/server/channels/jobs/jobs.go b/server/channels/jobs/jobs.go
index a7b1c0912d..03322c9874 100644
--- a/server/channels/jobs/jobs.go
+++ b/server/channels/jobs/jobs.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/jobs/jobs_test.go b/server/channels/jobs/jobs_test.go
index f094fdda65..f3f05a9acf 100644
--- a/server/channels/jobs/jobs_test.go
+++ b/server/channels/jobs/jobs_test.go
@@ -11,11 +11,11 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func makeJobServer(t *testing.T) (*JobServer, *storetest.Store, *mocks.MetricsInterface) {
diff --git a/server/channels/jobs/jobs_watcher.go b/server/channels/jobs/jobs_watcher.go
index c17d870906..f28a816074 100644
--- a/server/channels/jobs/jobs_watcher.go
+++ b/server/channels/jobs/jobs_watcher.go
@@ -7,8 +7,8 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // Default polling interval for jobs termination.
diff --git a/server/channels/jobs/last_accessible_file/scheduler.go b/server/channels/jobs/last_accessible_file/scheduler.go
index 06a4ad8249..e31fd06983 100644
--- a/server/channels/jobs/last_accessible_file/scheduler.go
+++ b/server/channels/jobs/last_accessible_file/scheduler.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const schedFreq = 2 * time.Hour
diff --git a/server/channels/jobs/last_accessible_file/worker.go b/server/channels/jobs/last_accessible_file/worker.go
index 8ffa41ed7f..e11ff23797 100644
--- a/server/channels/jobs/last_accessible_file/worker.go
+++ b/server/channels/jobs/last_accessible_file/worker.go
@@ -4,8 +4,8 @@
 package last_accessible_file
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/jobs/last_accessible_post/scheduler.go b/server/channels/jobs/last_accessible_post/scheduler.go
index 0927a6df9e..f9195c5755 100644
--- a/server/channels/jobs/last_accessible_post/scheduler.go
+++ b/server/channels/jobs/last_accessible_post/scheduler.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const schedFreq = 30 * time.Minute
diff --git a/server/channels/jobs/last_accessible_post/worker.go b/server/channels/jobs/last_accessible_post/worker.go
index 0bf338b05c..0c7eb11695 100644
--- a/server/channels/jobs/last_accessible_post/worker.go
+++ b/server/channels/jobs/last_accessible_post/worker.go
@@ -4,8 +4,8 @@
 package last_accessible_post
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/jobs/migrations/advanced_permissions_phase_2.go b/server/channels/jobs/migrations/advanced_permissions_phase_2.go
index 9912679451..2fa16316ef 100644
--- a/server/channels/jobs/migrations/advanced_permissions_phase_2.go
+++ b/server/channels/jobs/migrations/advanced_permissions_phase_2.go
@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type AdvancedPermissionsPhase2Progress struct {
diff --git a/server/channels/jobs/migrations/helper_test.go b/server/channels/jobs/migrations/helper_test.go
index 90722b8e33..54f2e59ab5 100644
--- a/server/channels/jobs/migrations/helper_test.go
+++ b/server/channels/jobs/migrations/helper_test.go
@@ -6,8 +6,8 @@ package migrations
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func Setup(tb testing.TB) store.Store {
diff --git a/server/channels/jobs/migrations/main_test.go b/server/channels/jobs/migrations/main_test.go
index 3d6aabd776..abc6339e8c 100644
--- a/server/channels/jobs/migrations/main_test.go
+++ b/server/channels/jobs/migrations/main_test.go
@@ -6,7 +6,7 @@ package migrations
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/channels/jobs/migrations/migrations.go b/server/channels/jobs/migrations/migrations.go
index 1783fd58e7..2e38b827aa 100644
--- a/server/channels/jobs/migrations/migrations.go
+++ b/server/channels/jobs/migrations/migrations.go
@@ -6,8 +6,8 @@ package migrations
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/jobs/migrations/migrations_test.go b/server/channels/jobs/migrations/migrations_test.go
index fee7830c0d..73e7602d4e 100644
--- a/server/channels/jobs/migrations/migrations_test.go
+++ b/server/channels/jobs/migrations/migrations_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetMigrationState(t *testing.T) {
diff --git a/server/channels/jobs/migrations/scheduler.go b/server/channels/jobs/migrations/scheduler.go
index 52969f3f35..9607cb8381 100644
--- a/server/channels/jobs/migrations/scheduler.go
+++ b/server/channels/jobs/migrations/scheduler.go
@@ -6,10 +6,10 @@ package migrations
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/jobs/migrations/worker.go b/server/channels/jobs/migrations/worker.go
index dcfd8ef47d..bc3d340747 100644
--- a/server/channels/jobs/migrations/worker.go
+++ b/server/channels/jobs/migrations/worker.go
@@ -9,10 +9,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/jobs/notify_admin/install_plugin_scheduler.go b/server/channels/jobs/notify_admin/install_plugin_scheduler.go
index 91ebdb79c1..241697b9f9 100644
--- a/server/channels/jobs/notify_admin/install_plugin_scheduler.go
+++ b/server/channels/jobs/notify_admin/install_plugin_scheduler.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const installPluginSchedFreq = 24 * time.Hour
diff --git a/server/channels/jobs/notify_admin/scheduler.go b/server/channels/jobs/notify_admin/scheduler.go
index c2ba31f16e..84974bd87c 100644
--- a/server/channels/jobs/notify_admin/scheduler.go
+++ b/server/channels/jobs/notify_admin/scheduler.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const schedFreq = 24 * time.Hour
diff --git a/server/channels/jobs/notify_admin/worker.go b/server/channels/jobs/notify_admin/worker.go
index 283b1647dd..f6fa418204 100644
--- a/server/channels/jobs/notify_admin/worker.go
+++ b/server/channels/jobs/notify_admin/worker.go
@@ -4,8 +4,8 @@
 package notify_admin
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/jobs/product_notices/scheduler.go b/server/channels/jobs/product_notices/scheduler.go
index 4dee2b72db..a4008772b7 100644
--- a/server/channels/jobs/product_notices/scheduler.go
+++ b/server/channels/jobs/product_notices/scheduler.go
@@ -6,8 +6,8 @@ package product_notices
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type Scheduler struct {
diff --git a/server/channels/jobs/product_notices/worker.go b/server/channels/jobs/product_notices/worker.go
index e268735790..65bee0bcc2 100644
--- a/server/channels/jobs/product_notices/worker.go
+++ b/server/channels/jobs/product_notices/worker.go
@@ -4,9 +4,9 @@
 package product_notices
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const jobName = "ProductNotices"
diff --git a/server/channels/jobs/resend_invitation_email/worker.go b/server/channels/jobs/resend_invitation_email/worker.go
index 48a228795c..9bcdaf6473 100644
--- a/server/channels/jobs/resend_invitation_email/worker.go
+++ b/server/channels/jobs/resend_invitation_email/worker.go
@@ -8,12 +8,12 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/configservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/configservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const FourtyEightHoursInMillis int64 = 172800000
diff --git a/server/channels/jobs/schedulers.go b/server/channels/jobs/schedulers.go
index 03f3a18834..73afae178f 100644
--- a/server/channels/jobs/schedulers.go
+++ b/server/channels/jobs/schedulers.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Schedulers struct {
diff --git a/server/channels/jobs/schedulers_test.go b/server/channels/jobs/schedulers_test.go
index dc65c04f29..6bd51981ee 100644
--- a/server/channels/jobs/schedulers_test.go
+++ b/server/channels/jobs/schedulers_test.go
@@ -10,10 +10,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 type MockScheduler struct {
diff --git a/server/channels/jobs/server.go b/server/channels/jobs/server.go
index 7ddcf1eccc..90d045a68b 100644
--- a/server/channels/jobs/server.go
+++ b/server/channels/jobs/server.go
@@ -7,10 +7,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/configservice"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/configservice"
 )
 
 type JobServer struct {
diff --git a/server/channels/jobs/workers.go b/server/channels/jobs/workers.go
index ac77e5e82a..d09b783d5a 100644
--- a/server/channels/jobs/workers.go
+++ b/server/channels/jobs/workers.go
@@ -6,9 +6,9 @@ package jobs
 import (
 	"errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/configservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/configservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Workers struct {
diff --git a/server/channels/manualtesting/manual_testing.go b/server/channels/manualtesting/manual_testing.go
index b17114cf73..7e07d26bd2 100644
--- a/server/channels/manualtesting/manual_testing.go
+++ b/server/channels/manualtesting/manual_testing.go
@@ -12,14 +12,14 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/api4"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/slashcommands"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/api4"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/slashcommands"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // TestEnvironment is a helper struct used for tests in manualtesting.
diff --git a/server/channels/manualtesting/test_autolink.go b/server/channels/manualtesting/test_autolink.go
index 777c9b66dd..844b70858e 100644
--- a/server/channels/manualtesting/test_autolink.go
+++ b/server/channels/manualtesting/test_autolink.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const linkPostText = `
diff --git a/server/channels/product/README.md b/server/channels/product/README.md
index 494631f6c5..1134e7da7e 100644
--- a/server/channels/product/README.md
+++ b/server/channels/product/README.md
@@ -17,7 +17,7 @@ type Product interface {
 }
 ```
 
-The `app.Server` will take care of starting and stopping products. The product shall register itself via a function called `RegisterProduct` provided by `github.com/mattermost/mattermost-server/v6/server/app` package. To register a product,
+The `app.Server` will take care of starting and stopping products. The product shall register itself via a function called `RegisterProduct` provided by `github.com/mattermost/mattermost-server/server/v8/channels/app` package. To register a product,
 a product initializer is required. The signature of a product initializer is defined as following:
 
 ```Go
diff --git a/server/channels/product/api.go b/server/channels/product/api.go
index 663bab9487..73cff0a451 100644
--- a/server/channels/product/api.go
+++ b/server/channels/product/api.go
@@ -8,12 +8,12 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
-	fb_model "github.com/mattermost/mattermost-server/v6/server/boards/model"
+	fb_model "github.com/mattermost/mattermost-server/server/v8/boards/model"
 )
 
 // RouterService enables registering the product router to the server. After registering the
diff --git a/server/channels/product/hooks.go b/server/channels/product/hooks.go
index f5b5c30701..aa06b5e92f 100644
--- a/server/channels/product/hooks.go
+++ b/server/channels/product/hooks.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type HooksManager struct {
diff --git a/server/channels/store/layer_generators/opentracing_layer.go.tmpl b/server/channels/store/layer_generators/opentracing_layer.go.tmpl
index af3af10ce7..0215c6489f 100644
--- a/server/channels/store/layer_generators/opentracing_layer.go.tmpl
+++ b/server/channels/store/layer_generators/opentracing_layer.go.tmpl
@@ -10,9 +10,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/tracing"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/tracing"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
 	"github.com/opentracing/opentracing-go/ext"
 	spanlog "github.com/opentracing/opentracing-go/log"
 )
diff --git a/server/channels/store/layer_generators/retry_layer.go.tmpl b/server/channels/store/layer_generators/retry_layer.go.tmpl
index 327831895a..4f192b2b7f 100644
--- a/server/channels/store/layer_generators/retry_layer.go.tmpl
+++ b/server/channels/store/layer_generators/retry_layer.go.tmpl
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/lib/pq"
-	"github.com/mattermost/mattermost-server/v6/model"
-    "github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+    "github.com/mattermost/mattermost-server/server/v8/channels/store"
     "github.com/pkg/errors"
 	"github.com/go-sql-driver/mysql"
 )
diff --git a/server/channels/store/layer_generators/timer_layer.go.tmpl b/server/channels/store/layer_generators/timer_layer.go.tmpl
index 6942e68fce..6549449af4 100644
--- a/server/channels/store/layer_generators/timer_layer.go.tmpl
+++ b/server/channels/store/layer_generators/timer_layer.go.tmpl
@@ -10,9 +10,9 @@ import (
 	"context"
     "time"
 
-    "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+    "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
 )
 
 type {{.Name}} struct {
diff --git a/server/channels/store/localcachelayer/channel_layer.go b/server/channels/store/localcachelayer/channel_layer.go
index 3d26edaaaa..0dec2eb1bc 100644
--- a/server/channels/store/localcachelayer/channel_layer.go
+++ b/server/channels/store/localcachelayer/channel_layer.go
@@ -6,8 +6,8 @@ package localcachelayer
 import (
 	"bytes"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LocalCacheChannelStore struct {
diff --git a/server/channels/store/localcachelayer/channel_layer_test.go b/server/channels/store/localcachelayer/channel_layer_test.go
index ccbb1e4a8b..618db4cb92 100644
--- a/server/channels/store/localcachelayer/channel_layer_test.go
+++ b/server/channels/store/localcachelayer/channel_layer_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestChannelStore(t *testing.T) {
diff --git a/server/channels/store/localcachelayer/emoji_layer.go b/server/channels/store/localcachelayer/emoji_layer.go
index c552f42903..35cce34576 100644
--- a/server/channels/store/localcachelayer/emoji_layer.go
+++ b/server/channels/store/localcachelayer/emoji_layer.go
@@ -8,9 +8,9 @@ import (
 	"context"
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LocalCacheEmojiStore struct {
diff --git a/server/channels/store/localcachelayer/emoji_layer_test.go b/server/channels/store/localcachelayer/emoji_layer_test.go
index 237f0ee213..8882c26ef5 100644
--- a/server/channels/store/localcachelayer/emoji_layer_test.go
+++ b/server/channels/store/localcachelayer/emoji_layer_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestEmojiStore(t *testing.T) {
diff --git a/server/channels/store/localcachelayer/file_info_layer.go b/server/channels/store/localcachelayer/file_info_layer.go
index e09d0dd9b6..45017b45f4 100644
--- a/server/channels/store/localcachelayer/file_info_layer.go
+++ b/server/channels/store/localcachelayer/file_info_layer.go
@@ -6,8 +6,8 @@ package localcachelayer
 import (
 	"bytes"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LocalCacheFileInfoStore struct {
diff --git a/server/channels/store/localcachelayer/file_info_layer_test.go b/server/channels/store/localcachelayer/file_info_layer_test.go
index fffeecd850..313a2dbfea 100644
--- a/server/channels/store/localcachelayer/file_info_layer_test.go
+++ b/server/channels/store/localcachelayer/file_info_layer_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestFileInfoStore(t *testing.T) {
diff --git a/server/channels/store/localcachelayer/layer.go b/server/channels/store/localcachelayer/layer.go
index d534b5df09..66130657a0 100644
--- a/server/channels/store/localcachelayer/layer.go
+++ b/server/channels/store/localcachelayer/layer.go
@@ -7,10 +7,10 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
 )
 
 const (
diff --git a/server/channels/store/localcachelayer/layer_test.go b/server/channels/store/localcachelayer/layer_test.go
index b4ca7c1e52..4a94793ae1 100644
--- a/server/channels/store/localcachelayer/layer_test.go
+++ b/server/channels/store/localcachelayer/layer_test.go
@@ -8,10 +8,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type storeType struct {
diff --git a/server/channels/store/localcachelayer/main_test.go b/server/channels/store/localcachelayer/main_test.go
index 649990cb69..c76f6e9cbc 100644
--- a/server/channels/store/localcachelayer/main_test.go
+++ b/server/channels/store/localcachelayer/main_test.go
@@ -10,13 +10,13 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
-	cachemocks "github.com/mattermost/mattermost-server/v6/server/platform/services/cache/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
+	cachemocks "github.com/mattermost/mattermost-server/server/v8/platform/services/cache/mocks"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/channels/store/localcachelayer/post_layer.go b/server/channels/store/localcachelayer/post_layer.go
index 56de5cd5c9..80e0995a7f 100644
--- a/server/channels/store/localcachelayer/post_layer.go
+++ b/server/channels/store/localcachelayer/post_layer.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LocalCachePostStore struct {
diff --git a/server/channels/store/localcachelayer/post_layer_test.go b/server/channels/store/localcachelayer/post_layer_test.go
index 6a1cce2e30..9d2f1c6aec 100644
--- a/server/channels/store/localcachelayer/post_layer_test.go
+++ b/server/channels/store/localcachelayer/post_layer_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPostStore(t *testing.T) {
diff --git a/server/channels/store/localcachelayer/reaction_layer.go b/server/channels/store/localcachelayer/reaction_layer.go
index 9ef3d6142a..5dc191c2e2 100644
--- a/server/channels/store/localcachelayer/reaction_layer.go
+++ b/server/channels/store/localcachelayer/reaction_layer.go
@@ -6,8 +6,8 @@ package localcachelayer
 import (
 	"bytes"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LocalCacheReactionStore struct {
diff --git a/server/channels/store/localcachelayer/reaction_layer_test.go b/server/channels/store/localcachelayer/reaction_layer_test.go
index 377eb1a138..523bbd7d26 100644
--- a/server/channels/store/localcachelayer/reaction_layer_test.go
+++ b/server/channels/store/localcachelayer/reaction_layer_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestReactionStore(t *testing.T) {
diff --git a/server/channels/store/localcachelayer/role_layer.go b/server/channels/store/localcachelayer/role_layer.go
index 145465d84d..24525386fc 100644
--- a/server/channels/store/localcachelayer/role_layer.go
+++ b/server/channels/store/localcachelayer/role_layer.go
@@ -9,8 +9,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LocalCacheRoleStore struct {
diff --git a/server/channels/store/localcachelayer/role_layer_test.go b/server/channels/store/localcachelayer/role_layer_test.go
index 1a421ed0c4..9e709634d9 100644
--- a/server/channels/store/localcachelayer/role_layer_test.go
+++ b/server/channels/store/localcachelayer/role_layer_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestRoleStore(t *testing.T) {
diff --git a/server/channels/store/localcachelayer/scheme_layer.go b/server/channels/store/localcachelayer/scheme_layer.go
index b80837d6a4..1d32cfb5b3 100644
--- a/server/channels/store/localcachelayer/scheme_layer.go
+++ b/server/channels/store/localcachelayer/scheme_layer.go
@@ -6,8 +6,8 @@ package localcachelayer
 import (
 	"bytes"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LocalCacheSchemeStore struct {
diff --git a/server/channels/store/localcachelayer/scheme_layer_test.go b/server/channels/store/localcachelayer/scheme_layer_test.go
index 165ed4a765..414708a558 100644
--- a/server/channels/store/localcachelayer/scheme_layer_test.go
+++ b/server/channels/store/localcachelayer/scheme_layer_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSchemeStore(t *testing.T) {
diff --git a/server/channels/store/localcachelayer/team_layer.go b/server/channels/store/localcachelayer/team_layer.go
index 16712a24c4..88ddfb974a 100644
--- a/server/channels/store/localcachelayer/team_layer.go
+++ b/server/channels/store/localcachelayer/team_layer.go
@@ -6,8 +6,8 @@ package localcachelayer
 import (
 	"bytes"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LocalCacheTeamStore struct {
diff --git a/server/channels/store/localcachelayer/team_layer_test.go b/server/channels/store/localcachelayer/team_layer_test.go
index 8be69f494e..2a32f2fdd6 100644
--- a/server/channels/store/localcachelayer/team_layer_test.go
+++ b/server/channels/store/localcachelayer/team_layer_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
 )
 
 func TestTeamStore(t *testing.T) {
diff --git a/server/channels/store/localcachelayer/terms_of_service_layer.go b/server/channels/store/localcachelayer/terms_of_service_layer.go
index bba94f3d57..4589103795 100644
--- a/server/channels/store/localcachelayer/terms_of_service_layer.go
+++ b/server/channels/store/localcachelayer/terms_of_service_layer.go
@@ -6,8 +6,8 @@ package localcachelayer
 import (
 	"bytes"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/store/localcachelayer/terms_of_service_layer_test.go b/server/channels/store/localcachelayer/terms_of_service_layer_test.go
index 13c4575954..8a454f1385 100644
--- a/server/channels/store/localcachelayer/terms_of_service_layer_test.go
+++ b/server/channels/store/localcachelayer/terms_of_service_layer_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestTermsOfServiceStore(t *testing.T) {
diff --git a/server/channels/store/localcachelayer/user_layer.go b/server/channels/store/localcachelayer/user_layer.go
index df1d7d6dbc..a0170f1ec0 100644
--- a/server/channels/store/localcachelayer/user_layer.go
+++ b/server/channels/store/localcachelayer/user_layer.go
@@ -9,9 +9,9 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LocalCacheUserStore struct {
diff --git a/server/channels/store/localcachelayer/user_layer_test.go b/server/channels/store/localcachelayer/user_layer_test.go
index 3f50534662..f25fb84178 100644
--- a/server/channels/store/localcachelayer/user_layer_test.go
+++ b/server/channels/store/localcachelayer/user_layer_test.go
@@ -10,11 +10,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestUserStore(t *testing.T) {
diff --git a/server/channels/store/localcachelayer/webhook_layer.go b/server/channels/store/localcachelayer/webhook_layer.go
index 7b53dd71a8..19c4617348 100644
--- a/server/channels/store/localcachelayer/webhook_layer.go
+++ b/server/channels/store/localcachelayer/webhook_layer.go
@@ -6,8 +6,8 @@ package localcachelayer
 import (
 	"bytes"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type LocalCacheWebhookStore struct {
diff --git a/server/channels/store/localcachelayer/webhook_layer_test.go b/server/channels/store/localcachelayer/webhook_layer_test.go
index a09cc4cb85..b5a3ec4aca 100644
--- a/server/channels/store/localcachelayer/webhook_layer_test.go
+++ b/server/channels/store/localcachelayer/webhook_layer_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestWebhookStore(t *testing.T) {
diff --git a/server/channels/store/opentracinglayer/opentracinglayer.go b/server/channels/store/opentracinglayer/opentracinglayer.go
index 5a193bcb76..941704a2f4 100644
--- a/server/channels/store/opentracinglayer/opentracinglayer.go
+++ b/server/channels/store/opentracinglayer/opentracinglayer.go
@@ -10,9 +10,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/tracing"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/tracing"
 	"github.com/opentracing/opentracing-go/ext"
 	spanlog "github.com/opentracing/opentracing-go/log"
 )
diff --git a/server/channels/store/retrylayer/retrylayer.go b/server/channels/store/retrylayer/retrylayer.go
index f7ec2bfd27..91a3209c44 100644
--- a/server/channels/store/retrylayer/retrylayer.go
+++ b/server/channels/store/retrylayer/retrylayer.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/go-sql-driver/mysql"
 	"github.com/lib/pq"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/channels/store/retrylayer/retrylayer_test.go b/server/channels/store/retrylayer/retrylayer_test.go
index c052b48090..511cd70a02 100644
--- a/server/channels/store/retrylayer/retrylayer_test.go
+++ b/server/channels/store/retrylayer/retrylayer_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/lib/pq"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func genStore() *mocks.Store {
diff --git a/server/channels/store/searchlayer/channel_layer.go b/server/channels/store/searchlayer/channel_layer.go
index 1cd3eede1a..01022bf9d7 100644
--- a/server/channels/store/searchlayer/channel_layer.go
+++ b/server/channels/store/searchlayer/channel_layer.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SearchChannelStore struct {
diff --git a/server/channels/store/searchlayer/file_info_layer.go b/server/channels/store/searchlayer/file_info_layer.go
index 85253841aa..81d25cc1c4 100644
--- a/server/channels/store/searchlayer/file_info_layer.go
+++ b/server/channels/store/searchlayer/file_info_layer.go
@@ -4,10 +4,10 @@
 package searchlayer
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SearchFileInfoStore struct {
diff --git a/server/channels/store/searchlayer/layer.go b/server/channels/store/searchlayer/layer.go
index e2f68f3df0..a71cd011ac 100644
--- a/server/channels/store/searchlayer/layer.go
+++ b/server/channels/store/searchlayer/layer.go
@@ -7,10 +7,10 @@ import (
 	"context"
 	"sync/atomic"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SearchStore struct {
diff --git a/server/channels/store/searchlayer/layer_test.go b/server/channels/store/searchlayer/layer_test.go
index 3d5948c9c2..b3e7f5a86b 100644
--- a/server/channels/store/searchlayer/layer_test.go
+++ b/server/channels/store/searchlayer/layer_test.go
@@ -8,12 +8,12 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchlayer"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
 )
 
 // Test to verify race condition on UpdateConfig. The test must run with -race flag in order to verify
diff --git a/server/channels/store/searchlayer/post_layer.go b/server/channels/store/searchlayer/post_layer.go
index 451e990b2f..a7ad58da30 100644
--- a/server/channels/store/searchlayer/post_layer.go
+++ b/server/channels/store/searchlayer/post_layer.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SearchPostStore struct {
diff --git a/server/channels/store/searchlayer/team_layer.go b/server/channels/store/searchlayer/team_layer.go
index e80099752f..ed6e8bd124 100644
--- a/server/channels/store/searchlayer/team_layer.go
+++ b/server/channels/store/searchlayer/team_layer.go
@@ -4,8 +4,8 @@
 package searchlayer
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
-	store "github.com/mattermost/mattermost-server/v6/server/channels/store"
+	store "github.com/mattermost/mattermost-server/server/v8/channels/store"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SearchTeamStore struct {
diff --git a/server/channels/store/searchlayer/user_layer.go b/server/channels/store/searchlayer/user_layer.go
index fff37e0262..6de44b4213 100644
--- a/server/channels/store/searchlayer/user_layer.go
+++ b/server/channels/store/searchlayer/user_layer.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SearchUserStore struct {
diff --git a/server/channels/store/searchtest/channel_layer.go b/server/channels/store/searchtest/channel_layer.go
index e5f192412c..f27c2ec2e6 100644
--- a/server/channels/store/searchtest/channel_layer.go
+++ b/server/channels/store/searchtest/channel_layer.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var searchChannelStoreTests = []searchTest{
diff --git a/server/channels/store/searchtest/file_info_layer.go b/server/channels/store/searchtest/file_info_layer.go
index ff68961da2..09cab23b48 100644
--- a/server/channels/store/searchtest/file_info_layer.go
+++ b/server/channels/store/searchtest/file_info_layer.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var searchFileInfoStoreTests = []searchTest{
diff --git a/server/channels/store/searchtest/helper.go b/server/channels/store/searchtest/helper.go
index c43aaf8cfa..ff7cec449c 100644
--- a/server/channels/store/searchtest/helper.go
+++ b/server/channels/store/searchtest/helper.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SearchTestHelper struct {
diff --git a/server/channels/store/searchtest/post_layer.go b/server/channels/store/searchtest/post_layer.go
index f152d1e751..8201666dc8 100644
--- a/server/channels/store/searchtest/post_layer.go
+++ b/server/channels/store/searchtest/post_layer.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var searchPostStoreTests = []searchTest{
diff --git a/server/channels/store/searchtest/testlib.go b/server/channels/store/searchtest/testlib.go
index 0678aa2f35..470caa3113 100644
--- a/server/channels/store/searchtest/testlib.go
+++ b/server/channels/store/searchtest/testlib.go
@@ -6,8 +6,8 @@ package searchtest
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
 )
 
 const (
diff --git a/server/channels/store/searchtest/user_layer.go b/server/channels/store/searchtest/user_layer.go
index bb2684b011..7247a9200b 100644
--- a/server/channels/store/searchtest/user_layer.go
+++ b/server/channels/store/searchtest/user_layer.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var searchUserStoreTests = []searchTest{
diff --git a/server/channels/store/sqlstore/adapters.go b/server/channels/store/sqlstore/adapters.go
index bc05b93fd9..de7d55c787 100644
--- a/server/channels/store/sqlstore/adapters.go
+++ b/server/channels/store/sqlstore/adapters.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type jsonArray []string
diff --git a/server/channels/store/sqlstore/audit_store.go b/server/channels/store/sqlstore/audit_store.go
index 2af2fcf0d0..9e39499646 100644
--- a/server/channels/store/sqlstore/audit_store.go
+++ b/server/channels/store/sqlstore/audit_store.go
@@ -7,8 +7,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlAuditStore struct {
diff --git a/server/channels/store/sqlstore/audit_store_test.go b/server/channels/store/sqlstore/audit_store_test.go
index 19a9cf32bd..4205165717 100644
--- a/server/channels/store/sqlstore/audit_store_test.go
+++ b/server/channels/store/sqlstore/audit_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestAuditStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/bot_store.go b/server/channels/store/sqlstore/bot_store.go
index 5939f5a5f6..8066d90d27 100644
--- a/server/channels/store/sqlstore/bot_store.go
+++ b/server/channels/store/sqlstore/bot_store.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // bot is a subset of the model.Bot type, omitting the model.User fields.
diff --git a/server/channels/store/sqlstore/bot_store_test.go b/server/channels/store/sqlstore/bot_store_test.go
index bdc29504e7..725fc814f6 100644
--- a/server/channels/store/sqlstore/bot_store_test.go
+++ b/server/channels/store/sqlstore/bot_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestBotStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/channel_member_history_store.go b/server/channels/store/sqlstore/channel_member_history_store.go
index 30a56352d3..23e3b7ca26 100644
--- a/server/channels/store/sqlstore/channel_member_history_store.go
+++ b/server/channels/store/sqlstore/channel_member_history_store.go
@@ -10,9 +10,9 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SqlChannelMemberHistoryStore struct {
diff --git a/server/channels/store/sqlstore/channel_member_history_store_test.go b/server/channels/store/sqlstore/channel_member_history_store_test.go
index 325d22bfa0..645faf5f91 100644
--- a/server/channels/store/sqlstore/channel_member_history_store_test.go
+++ b/server/channels/store/sqlstore/channel_member_history_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestChannelMemberHistoryStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/channel_store.go b/server/channels/store/sqlstore/channel_store.go
index 76bd520457..2f8e91b9dc 100644
--- a/server/channels/store/sqlstore/channel_store.go
+++ b/server/channels/store/sqlstore/channel_store.go
@@ -15,11 +15,11 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/store/sqlstore/channel_store_categories.go b/server/channels/store/sqlstore/channel_store_categories.go
index 528bf26469..3f2f726a0f 100644
--- a/server/channels/store/sqlstore/channel_store_categories.go
+++ b/server/channels/store/sqlstore/channel_store_categories.go
@@ -10,8 +10,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // dbSelecter is an interface used to enable some internal store methods
diff --git a/server/channels/store/sqlstore/channel_store_categories_test.go b/server/channels/store/sqlstore/channel_store_categories_test.go
index 180104f1fd..5de3b55953 100644
--- a/server/channels/store/sqlstore/channel_store_categories_test.go
+++ b/server/channels/store/sqlstore/channel_store_categories_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestChannelStoreCategories(t *testing.T) {
diff --git a/server/channels/store/sqlstore/channel_store_test.go b/server/channels/store/sqlstore/channel_store_test.go
index f68e1573ba..d692b636ad 100644
--- a/server/channels/store/sqlstore/channel_store_test.go
+++ b/server/channels/store/sqlstore/channel_store_test.go
@@ -10,10 +10,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestChannelStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/cluster_discovery_store.go b/server/channels/store/sqlstore/cluster_discovery_store.go
index 1d996bda94..ade94f3da2 100644
--- a/server/channels/store/sqlstore/cluster_discovery_store.go
+++ b/server/channels/store/sqlstore/cluster_discovery_store.go
@@ -7,8 +7,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type sqlClusterDiscoveryStore struct {
diff --git a/server/channels/store/sqlstore/cluster_discovery_store_test.go b/server/channels/store/sqlstore/cluster_discovery_store_test.go
index 8bad17d86d..b17cc39ba6 100644
--- a/server/channels/store/sqlstore/cluster_discovery_store_test.go
+++ b/server/channels/store/sqlstore/cluster_discovery_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestClusterDiscoveryStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/command_store.go b/server/channels/store/sqlstore/command_store.go
index 6f086b346b..aa77b6fece 100644
--- a/server/channels/store/sqlstore/command_store.go
+++ b/server/channels/store/sqlstore/command_store.go
@@ -10,8 +10,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlCommandStore struct {
diff --git a/server/channels/store/sqlstore/command_store_test.go b/server/channels/store/sqlstore/command_store_test.go
index 095f0b1742..7d73561193 100644
--- a/server/channels/store/sqlstore/command_store_test.go
+++ b/server/channels/store/sqlstore/command_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestCommandStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/command_webhook_store.go b/server/channels/store/sqlstore/command_webhook_store.go
index c003390eb6..fd58b8ccf5 100644
--- a/server/channels/store/sqlstore/command_webhook_store.go
+++ b/server/channels/store/sqlstore/command_webhook_store.go
@@ -9,9 +9,9 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SqlCommandWebhookStore struct {
diff --git a/server/channels/store/sqlstore/command_webhook_store_test.go b/server/channels/store/sqlstore/command_webhook_store_test.go
index dc4d4320fc..9e36d26e59 100644
--- a/server/channels/store/sqlstore/command_webhook_store_test.go
+++ b/server/channels/store/sqlstore/command_webhook_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestCommandWebhookStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/compliance_store.go b/server/channels/store/sqlstore/compliance_store.go
index 31d0631f11..f9a997296c 100644
--- a/server/channels/store/sqlstore/compliance_store.go
+++ b/server/channels/store/sqlstore/compliance_store.go
@@ -12,8 +12,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlComplianceStore struct {
diff --git a/server/channels/store/sqlstore/compliance_store_test.go b/server/channels/store/sqlstore/compliance_store_test.go
index b042eb42cb..9e6df0304e 100644
--- a/server/channels/store/sqlstore/compliance_store_test.go
+++ b/server/channels/store/sqlstore/compliance_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestComplianceStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/draft_store.go b/server/channels/store/sqlstore/draft_store.go
index 7d4137a8e5..2e9c86ebfd 100644
--- a/server/channels/store/sqlstore/draft_store.go
+++ b/server/channels/store/sqlstore/draft_store.go
@@ -10,10 +10,10 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SqlDraftStore struct {
diff --git a/server/channels/store/sqlstore/draft_store_test.go b/server/channels/store/sqlstore/draft_store_test.go
index ade2221720..f767026621 100644
--- a/server/channels/store/sqlstore/draft_store_test.go
+++ b/server/channels/store/sqlstore/draft_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestDraftStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/emoji_store.go b/server/channels/store/sqlstore/emoji_store.go
index 6099fb78fb..7586ee8edc 100644
--- a/server/channels/store/sqlstore/emoji_store.go
+++ b/server/channels/store/sqlstore/emoji_store.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlEmojiStore struct {
diff --git a/server/channels/store/sqlstore/emoji_store_test.go b/server/channels/store/sqlstore/emoji_store_test.go
index 029bb82be0..a0e5ec46dc 100644
--- a/server/channels/store/sqlstore/emoji_store_test.go
+++ b/server/channels/store/sqlstore/emoji_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestEmojiStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/file_info_store.go b/server/channels/store/sqlstore/file_info_store.go
index b54efbe66e..0e804605c9 100644
--- a/server/channels/store/sqlstore/file_info_store.go
+++ b/server/channels/store/sqlstore/file_info_store.go
@@ -14,10 +14,10 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type fileInfoWithChannelID struct {
diff --git a/server/channels/store/sqlstore/file_info_store_test.go b/server/channels/store/sqlstore/file_info_store_test.go
index 70cfd9b12a..53f67be47c 100644
--- a/server/channels/store/sqlstore/file_info_store_test.go
+++ b/server/channels/store/sqlstore/file_info_store_test.go
@@ -6,8 +6,8 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestFileInfoStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/group_store.go b/server/channels/store/sqlstore/group_store.go
index d487b72c45..09f4bb464f 100644
--- a/server/channels/store/sqlstore/group_store.go
+++ b/server/channels/store/sqlstore/group_store.go
@@ -11,8 +11,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type selectType int
diff --git a/server/channels/store/sqlstore/group_store_test.go b/server/channels/store/sqlstore/group_store_test.go
index 7ff6286317..e03ab780af 100644
--- a/server/channels/store/sqlstore/group_store_test.go
+++ b/server/channels/store/sqlstore/group_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestGroupStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/integrity.go b/server/channels/store/sqlstore/integrity.go
index 7c9758b915..71c89d27f5 100644
--- a/server/channels/store/sqlstore/integrity.go
+++ b/server/channels/store/sqlstore/integrity.go
@@ -6,8 +6,8 @@ package sqlstore
 import (
 	sq "github.com/mattermost/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type relationalCheckConfig struct {
diff --git a/server/channels/store/sqlstore/integrity_test.go b/server/channels/store/sqlstore/integrity_test.go
index b61d325231..896c2911e8 100644
--- a/server/channels/store/sqlstore/integrity_test.go
+++ b/server/channels/store/sqlstore/integrity_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func createAudit(ss store.Store, userId, sessionId string) *model.Audit {
diff --git a/server/channels/store/sqlstore/job_store.go b/server/channels/store/sqlstore/job_store.go
index 6dc1e9be85..0543fc5f6e 100644
--- a/server/channels/store/sqlstore/job_store.go
+++ b/server/channels/store/sqlstore/job_store.go
@@ -13,8 +13,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/store/sqlstore/job_store_test.go b/server/channels/store/sqlstore/job_store_test.go
index 4c6ae721d4..a7028984df 100644
--- a/server/channels/store/sqlstore/job_store_test.go
+++ b/server/channels/store/sqlstore/job_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestJobStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/license_store.go b/server/channels/store/sqlstore/license_store.go
index 649009c37e..5b8308311e 100644
--- a/server/channels/store/sqlstore/license_store.go
+++ b/server/channels/store/sqlstore/license_store.go
@@ -7,8 +7,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // SqlLicenseStore encapsulates the database writes and reads for
diff --git a/server/channels/store/sqlstore/license_store_test.go b/server/channels/store/sqlstore/license_store_test.go
index bdd0f4af4f..9b9f2aaf71 100644
--- a/server/channels/store/sqlstore/license_store_test.go
+++ b/server/channels/store/sqlstore/license_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestLicenseStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/link_metadata_store.go b/server/channels/store/sqlstore/link_metadata_store.go
index 81014206de..1ffdcd118b 100644
--- a/server/channels/store/sqlstore/link_metadata_store.go
+++ b/server/channels/store/sqlstore/link_metadata_store.go
@@ -10,8 +10,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlLinkMetadataStore struct {
diff --git a/server/channels/store/sqlstore/link_metadata_store_test.go b/server/channels/store/sqlstore/link_metadata_store_test.go
index 4de01f0afc..f5c4dc4fc4 100644
--- a/server/channels/store/sqlstore/link_metadata_store_test.go
+++ b/server/channels/store/sqlstore/link_metadata_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestLinkMetadataStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/main_test.go b/server/channels/store/sqlstore/main_test.go
index 5e4a28467e..fede40f23b 100644
--- a/server/channels/store/sqlstore/main_test.go
+++ b/server/channels/store/sqlstore/main_test.go
@@ -6,8 +6,8 @@ package sqlstore_test
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/channels/store/sqlstore/notify_admin_store.go b/server/channels/store/sqlstore/notify_admin_store.go
index db415ea7dc..b9b15757c1 100644
--- a/server/channels/store/sqlstore/notify_admin_store.go
+++ b/server/channels/store/sqlstore/notify_admin_store.go
@@ -11,8 +11,8 @@ import (
 
 	sq "github.com/mattermost/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlNotifyAdminStore struct {
diff --git a/server/channels/store/sqlstore/notify_admin_store_test.go b/server/channels/store/sqlstore/notify_admin_store_test.go
index 2434667140..5737f3d030 100644
--- a/server/channels/store/sqlstore/notify_admin_store_test.go
+++ b/server/channels/store/sqlstore/notify_admin_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestNotifyAdminStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/oauth_store.go b/server/channels/store/sqlstore/oauth_store.go
index ba738b7aa8..7dc35d66b3 100644
--- a/server/channels/store/sqlstore/oauth_store.go
+++ b/server/channels/store/sqlstore/oauth_store.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlOAuthStore struct {
diff --git a/server/channels/store/sqlstore/oauth_store_test.go b/server/channels/store/sqlstore/oauth_store_test.go
index 2bef6bc121..d7b528514a 100644
--- a/server/channels/store/sqlstore/oauth_store_test.go
+++ b/server/channels/store/sqlstore/oauth_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestOAuthStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/plugin_store.go b/server/channels/store/sqlstore/plugin_store.go
index 8d8d4884c2..01afa87455 100644
--- a/server/channels/store/sqlstore/plugin_store.go
+++ b/server/channels/store/sqlstore/plugin_store.go
@@ -11,8 +11,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/store/sqlstore/plugin_store_test.go b/server/channels/store/sqlstore/plugin_store_test.go
index 09effe6d65..cc5d9a3884 100644
--- a/server/channels/store/sqlstore/plugin_store_test.go
+++ b/server/channels/store/sqlstore/plugin_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestPluginStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/post_acknowledgements_store.go b/server/channels/store/sqlstore/post_acknowledgements_store.go
index 6635082e97..6041109d9e 100644
--- a/server/channels/store/sqlstore/post_acknowledgements_store.go
+++ b/server/channels/store/sqlstore/post_acknowledgements_store.go
@@ -9,8 +9,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlPostAcknowledgementStore struct {
diff --git a/server/channels/store/sqlstore/post_acknowledgements_store_test.go b/server/channels/store/sqlstore/post_acknowledgements_store_test.go
index aa74e69768..55a80af132 100644
--- a/server/channels/store/sqlstore/post_acknowledgements_store_test.go
+++ b/server/channels/store/sqlstore/post_acknowledgements_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestPostAcknowledgementsStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/post_priority_store.go b/server/channels/store/sqlstore/post_priority_store.go
index 34e56488ed..9ac4ca3d0d 100644
--- a/server/channels/store/sqlstore/post_priority_store.go
+++ b/server/channels/store/sqlstore/post_priority_store.go
@@ -6,8 +6,8 @@ package sqlstore
 import (
 	sq "github.com/mattermost/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlPostPriorityStore struct {
diff --git a/server/channels/store/sqlstore/post_priority_store_test.go b/server/channels/store/sqlstore/post_priority_store_test.go
index 0c77ed2f5a..093394f3e7 100644
--- a/server/channels/store/sqlstore/post_priority_store_test.go
+++ b/server/channels/store/sqlstore/post_priority_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestPostPriorityStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/post_store.go b/server/channels/store/sqlstore/post_store.go
index 85854fdb90..e60583fe75 100644
--- a/server/channels/store/sqlstore/post_store.go
+++ b/server/channels/store/sqlstore/post_store.go
@@ -17,12 +17,12 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchlayer"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SqlPostStore struct {
diff --git a/server/channels/store/sqlstore/post_store_test.go b/server/channels/store/sqlstore/post_store_test.go
index 2a4c296001..72fdc51043 100644
--- a/server/channels/store/sqlstore/post_store_test.go
+++ b/server/channels/store/sqlstore/post_store_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestPostStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/preference_store.go b/server/channels/store/sqlstore/preference_store.go
index db426ebc8f..e68f4a3801 100644
--- a/server/channels/store/sqlstore/preference_store.go
+++ b/server/channels/store/sqlstore/preference_store.go
@@ -7,9 +7,9 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SqlPreferenceStore struct {
diff --git a/server/channels/store/sqlstore/preference_store_test.go b/server/channels/store/sqlstore/preference_store_test.go
index f91f1a6ce3..34e7f5fc1c 100644
--- a/server/channels/store/sqlstore/preference_store_test.go
+++ b/server/channels/store/sqlstore/preference_store_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPreferenceStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/product_notices_store.go b/server/channels/store/sqlstore/product_notices_store.go
index 4ff5bf5ca3..d1f3d2efab 100644
--- a/server/channels/store/sqlstore/product_notices_store.go
+++ b/server/channels/store/sqlstore/product_notices_store.go
@@ -9,8 +9,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlProductNoticesStore struct {
diff --git a/server/channels/store/sqlstore/product_notices_store_test.go b/server/channels/store/sqlstore/product_notices_store_test.go
index 7f0f4373d7..f30f7e15a2 100644
--- a/server/channels/store/sqlstore/product_notices_store_test.go
+++ b/server/channels/store/sqlstore/product_notices_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestProductNoticesStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/reaction_store.go b/server/channels/store/sqlstore/reaction_store.go
index 3b66228c22..220a1d33f7 100644
--- a/server/channels/store/sqlstore/reaction_store.go
+++ b/server/channels/store/sqlstore/reaction_store.go
@@ -6,9 +6,9 @@ package sqlstore
 import (
 	sq "github.com/mattermost/squirrel"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/pkg/errors"
 )
diff --git a/server/channels/store/sqlstore/reaction_store_test.go b/server/channels/store/sqlstore/reaction_store_test.go
index 3f458b61d1..e9ceb95df4 100644
--- a/server/channels/store/sqlstore/reaction_store_test.go
+++ b/server/channels/store/sqlstore/reaction_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestReactionStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/remote_cluster_store.go b/server/channels/store/sqlstore/remote_cluster_store.go
index e049e197db..11c7a8c138 100644
--- a/server/channels/store/sqlstore/remote_cluster_store.go
+++ b/server/channels/store/sqlstore/remote_cluster_store.go
@@ -10,8 +10,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type sqlRemoteClusterStore struct {
diff --git a/server/channels/store/sqlstore/remote_cluster_store_test.go b/server/channels/store/sqlstore/remote_cluster_store_test.go
index a5f5cf1b21..097343c42e 100644
--- a/server/channels/store/sqlstore/remote_cluster_store_test.go
+++ b/server/channels/store/sqlstore/remote_cluster_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestRemoteClusterStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/retention_policy_store.go b/server/channels/store/sqlstore/retention_policy_store.go
index 8ff793eb98..cc8b6280ff 100644
--- a/server/channels/store/sqlstore/retention_policy_store.go
+++ b/server/channels/store/sqlstore/retention_policy_store.go
@@ -14,9 +14,9 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlRetentionPolicyStore struct {
diff --git a/server/channels/store/sqlstore/retention_policy_store_test.go b/server/channels/store/sqlstore/retention_policy_store_test.go
index cabc49bca6..5ea674a5ab 100644
--- a/server/channels/store/sqlstore/retention_policy_store_test.go
+++ b/server/channels/store/sqlstore/retention_policy_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestRetentionPolicyStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/role_store.go b/server/channels/store/sqlstore/role_store.go
index 50f46c0304..df6095a40c 100644
--- a/server/channels/store/sqlstore/role_store.go
+++ b/server/channels/store/sqlstore/role_store.go
@@ -12,8 +12,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlRoleStore struct {
diff --git a/server/channels/store/sqlstore/role_store_test.go b/server/channels/store/sqlstore/role_store_test.go
index 63d0639bbd..c96bcb7dc1 100644
--- a/server/channels/store/sqlstore/role_store_test.go
+++ b/server/channels/store/sqlstore/role_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestRoleStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/scheme_store.go b/server/channels/store/sqlstore/scheme_store.go
index 99abeb220d..3a4541688f 100644
--- a/server/channels/store/sqlstore/scheme_store.go
+++ b/server/channels/store/sqlstore/scheme_store.go
@@ -10,8 +10,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/store/sqlstore/scheme_store_test.go b/server/channels/store/sqlstore/scheme_store_test.go
index 2b9b440b7d..cef9352193 100644
--- a/server/channels/store/sqlstore/scheme_store_test.go
+++ b/server/channels/store/sqlstore/scheme_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestSchemeStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/session_store.go b/server/channels/store/sqlstore/session_store.go
index 851336dbc6..474742feb8 100644
--- a/server/channels/store/sqlstore/session_store.go
+++ b/server/channels/store/sqlstore/session_store.go
@@ -12,8 +12,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/store/sqlstore/session_store_test.go b/server/channels/store/sqlstore/session_store_test.go
index c25c443f84..52d94b98f3 100644
--- a/server/channels/store/sqlstore/session_store_test.go
+++ b/server/channels/store/sqlstore/session_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestSessionStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/shared_channel_store.go b/server/channels/store/sqlstore/shared_channel_store.go
index f8afdfa4b2..85a6583fa4 100644
--- a/server/channels/store/sqlstore/shared_channel_store.go
+++ b/server/channels/store/sqlstore/shared_channel_store.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
diff --git a/server/channels/store/sqlstore/shared_channel_store_test.go b/server/channels/store/sqlstore/shared_channel_store_test.go
index 95532f1654..1133184659 100644
--- a/server/channels/store/sqlstore/shared_channel_store_test.go
+++ b/server/channels/store/sqlstore/shared_channel_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestSharedChannelStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/sqlx_wrapper.go b/server/channels/store/sqlstore/sqlx_wrapper.go
index 3e21ef3ab3..0dab579512 100644
--- a/server/channels/store/sqlstore/sqlx_wrapper.go
+++ b/server/channels/store/sqlstore/sqlx_wrapper.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type StoreTestWrapper struct {
diff --git a/server/channels/store/sqlstore/sqlx_wrapper_test.go b/server/channels/store/sqlstore/sqlx_wrapper_test.go
index 53490199c8..07c6391767 100644
--- a/server/channels/store/sqlstore/sqlx_wrapper_test.go
+++ b/server/channels/store/sqlstore/sqlx_wrapper_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSqlX(t *testing.T) {
diff --git a/server/channels/store/sqlstore/status_store.go b/server/channels/store/sqlstore/status_store.go
index 820db064eb..5791a6816a 100644
--- a/server/channels/store/sqlstore/status_store.go
+++ b/server/channels/store/sqlstore/status_store.go
@@ -11,8 +11,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlStatusStore struct {
diff --git a/server/channels/store/sqlstore/status_store_test.go b/server/channels/store/sqlstore/status_store_test.go
index 6d2f34c018..a40b93c9a6 100644
--- a/server/channels/store/sqlstore/status_store_test.go
+++ b/server/channels/store/sqlstore/status_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestStatusStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/store.go b/server/channels/store/sqlstore/store.go
index 8000384e95..9f587f1517 100644
--- a/server/channels/store/sqlstore/store.go
+++ b/server/channels/store/sqlstore/store.go
@@ -30,11 +30,11 @@ import (
 	mbindata "github.com/mattermost/morph/sources/embedded"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/db"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/db"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type migrationDirection string
@@ -117,7 +117,7 @@ type SqlStoreStores struct {
 
 type SqlStore struct {
 	// rrCounter and srCounter should be kept first.
-	// See https://github.com/mattermost/mattermost-server/v6/server/channels/pull/7281
+	// See https://github.com/mattermost/mattermost-server/server/v8/channels/pull/7281
 	rrCounter int64
 	srCounter int64
 
diff --git a/server/channels/store/sqlstore/store_test.go b/server/channels/store/sqlstore/store_test.go
index ba30e863f6..c218fa205d 100644
--- a/server/channels/store/sqlstore/store_test.go
+++ b/server/channels/store/sqlstore/store_test.go
@@ -21,13 +21,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/db"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/db"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 type storeType struct {
diff --git a/server/channels/store/sqlstore/system_store.go b/server/channels/store/sqlstore/system_store.go
index 5fcc45c0ac..c3006f13d6 100644
--- a/server/channels/store/sqlstore/system_store.go
+++ b/server/channels/store/sqlstore/system_store.go
@@ -13,9 +13,9 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlSystemStore struct {
diff --git a/server/channels/store/sqlstore/system_store_test.go b/server/channels/store/sqlstore/system_store_test.go
index fdc9e22304..8ac69416ea 100644
--- a/server/channels/store/sqlstore/system_store_test.go
+++ b/server/channels/store/sqlstore/system_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestSystemStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/team_store.go b/server/channels/store/sqlstore/team_store.go
index dd1262fbbf..ace7c4a7f5 100644
--- a/server/channels/store/sqlstore/team_store.go
+++ b/server/channels/store/sqlstore/team_store.go
@@ -12,9 +12,9 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/store/sqlstore/team_store_test.go b/server/channels/store/sqlstore/team_store_test.go
index 6aad9928f7..639c57b43b 100644
--- a/server/channels/store/sqlstore/team_store_test.go
+++ b/server/channels/store/sqlstore/team_store_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestTeamStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/terms_of_service_store.go b/server/channels/store/sqlstore/terms_of_service_store.go
index a40602a22d..41ebc7c86b 100644
--- a/server/channels/store/sqlstore/terms_of_service_store.go
+++ b/server/channels/store/sqlstore/terms_of_service_store.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlTermsOfServiceStore struct {
diff --git a/server/channels/store/sqlstore/terms_of_service_store_test.go b/server/channels/store/sqlstore/terms_of_service_store_test.go
index 080c7c57cc..a9b209adf8 100644
--- a/server/channels/store/sqlstore/terms_of_service_store_test.go
+++ b/server/channels/store/sqlstore/terms_of_service_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestTermsOfServiceStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/thread_store.go b/server/channels/store/sqlstore/thread_store.go
index 6a3e9ed4f8..b731b0b71c 100644
--- a/server/channels/store/sqlstore/thread_store.go
+++ b/server/channels/store/sqlstore/thread_store.go
@@ -13,9 +13,9 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // JoinedThread allows querying the Threads + Posts table in a single query, before looking up
diff --git a/server/channels/store/sqlstore/thread_store_test.go b/server/channels/store/sqlstore/thread_store_test.go
index 89ee4ccc9f..ded1cdc88c 100644
--- a/server/channels/store/sqlstore/thread_store_test.go
+++ b/server/channels/store/sqlstore/thread_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestThreadStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/tokens_store.go b/server/channels/store/sqlstore/tokens_store.go
index dd7614d318..d96d1ab44c 100644
--- a/server/channels/store/sqlstore/tokens_store.go
+++ b/server/channels/store/sqlstore/tokens_store.go
@@ -10,9 +10,9 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SqlTokenStore struct {
diff --git a/server/channels/store/sqlstore/tokens_store_test.go b/server/channels/store/sqlstore/tokens_store_test.go
index 67ecaf0a9b..b8a35a9415 100644
--- a/server/channels/store/sqlstore/tokens_store_test.go
+++ b/server/channels/store/sqlstore/tokens_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestTokensStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/true_up_review_store.go b/server/channels/store/sqlstore/true_up_review_store.go
index 2226e09a53..cc11fee86d 100644
--- a/server/channels/store/sqlstore/true_up_review_store.go
+++ b/server/channels/store/sqlstore/true_up_review_store.go
@@ -10,8 +10,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // SqlLicenseStore encapsulates the database writes and reads for
diff --git a/server/channels/store/sqlstore/true_up_review_store_test.go b/server/channels/store/sqlstore/true_up_review_store_test.go
index 7a886f6b03..2f824b20cf 100644
--- a/server/channels/store/sqlstore/true_up_review_store_test.go
+++ b/server/channels/store/sqlstore/true_up_review_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestTrueUpReviewStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/upload_session_store.go b/server/channels/store/sqlstore/upload_session_store.go
index 69f67a4c9b..5ee8eda235 100644
--- a/server/channels/store/sqlstore/upload_session_store.go
+++ b/server/channels/store/sqlstore/upload_session_store.go
@@ -10,8 +10,8 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlUploadSessionStore struct {
diff --git a/server/channels/store/sqlstore/upload_session_store_test.go b/server/channels/store/sqlstore/upload_session_store_test.go
index bcf1b56125..2db3de136c 100644
--- a/server/channels/store/sqlstore/upload_session_store_test.go
+++ b/server/channels/store/sqlstore/upload_session_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestUploadSessionStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/user_access_token_store.go b/server/channels/store/sqlstore/user_access_token_store.go
index de9cce52e3..04dac62367 100644
--- a/server/channels/store/sqlstore/user_access_token_store.go
+++ b/server/channels/store/sqlstore/user_access_token_store.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlUserAccessTokenStore struct {
diff --git a/server/channels/store/sqlstore/user_access_token_store_test.go b/server/channels/store/sqlstore/user_access_token_store_test.go
index 93cebf1960..61ad42c429 100644
--- a/server/channels/store/sqlstore/user_access_token_store_test.go
+++ b/server/channels/store/sqlstore/user_access_token_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestUserAccessTokenStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/user_store.go b/server/channels/store/sqlstore/user_store.go
index 293d78c9a4..9f063ad9e1 100644
--- a/server/channels/store/sqlstore/user_store.go
+++ b/server/channels/store/sqlstore/user_store.go
@@ -16,10 +16,10 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/store/sqlstore/user_store_test.go b/server/channels/store/sqlstore/user_store_test.go
index eabbbd93d2..56076ab1e5 100644
--- a/server/channels/store/sqlstore/user_store_test.go
+++ b/server/channels/store/sqlstore/user_store_test.go
@@ -6,8 +6,8 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestUserStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/user_terms_of_service.go b/server/channels/store/sqlstore/user_terms_of_service.go
index 1b8d5cf2b3..7c0a5b584f 100644
--- a/server/channels/store/sqlstore/user_terms_of_service.go
+++ b/server/channels/store/sqlstore/user_terms_of_service.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlUserTermsOfServiceStore struct {
diff --git a/server/channels/store/sqlstore/user_terms_of_service_store_test.go b/server/channels/store/sqlstore/user_terms_of_service_store_test.go
index 3192749a2d..d14a74eead 100644
--- a/server/channels/store/sqlstore/user_terms_of_service_store_test.go
+++ b/server/channels/store/sqlstore/user_terms_of_service_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestUserTermsOfServiceStore(t *testing.T) {
diff --git a/server/channels/store/sqlstore/utils.go b/server/channels/store/sqlstore/utils.go
index 5242f0c527..69d21ab824 100644
--- a/server/channels/store/sqlstore/utils.go
+++ b/server/channels/store/sqlstore/utils.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/go-sql-driver/mysql"
 )
diff --git a/server/channels/store/sqlstore/utils_test.go b/server/channels/store/sqlstore/utils_test.go
index 96468323bb..61e11e0cf5 100644
--- a/server/channels/store/sqlstore/utils_test.go
+++ b/server/channels/store/sqlstore/utils_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/channels/store/sqlstore/webhook_store.go b/server/channels/store/sqlstore/webhook_store.go
index e40a8a1845..e2d0ed18da 100644
--- a/server/channels/store/sqlstore/webhook_store.go
+++ b/server/channels/store/sqlstore/webhook_store.go
@@ -9,9 +9,9 @@ import (
 	sq "github.com/mattermost/squirrel"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SqlWebhookStore struct {
diff --git a/server/channels/store/sqlstore/webhook_store_test.go b/server/channels/store/sqlstore/webhook_store_test.go
index d887786cb6..e03720dd63 100644
--- a/server/channels/store/sqlstore/webhook_store_test.go
+++ b/server/channels/store/sqlstore/webhook_store_test.go
@@ -6,7 +6,7 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
 )
 
 func TestWebhookStore(t *testing.T) {
diff --git a/server/channels/store/store.go b/server/channels/store/store.go
index 52774d2e71..7da24fd24c 100644
--- a/server/channels/store/store.go
+++ b/server/channels/store/store.go
@@ -10,8 +10,8 @@ import (
 	"database/sql"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type StoreResult struct {
diff --git a/server/channels/store/storetest/audit_store.go b/server/channels/store/storetest/audit_store.go
index bbc7a41b94..f7e2fe3a10 100644
--- a/server/channels/store/storetest/audit_store.go
+++ b/server/channels/store/storetest/audit_store.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestAuditStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/bot_store.go b/server/channels/store/storetest/bot_store.go
index 4451456a54..cea0d1dd3f 100644
--- a/server/channels/store/storetest/bot_store.go
+++ b/server/channels/store/storetest/bot_store.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func makeBotWithUser(t *testing.T, ss store.Store, bot *model.Bot) (*model.Bot, *model.User) {
diff --git a/server/channels/store/storetest/channel_member_history_store.go b/server/channels/store/storetest/channel_member_history_store.go
index 37192c9133..e4092dbe58 100644
--- a/server/channels/store/storetest/channel_member_history_store.go
+++ b/server/channels/store/storetest/channel_member_history_store.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestChannelMemberHistoryStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/channel_store.go b/server/channels/store/storetest/channel_store.go
index 3d30089e17..69b9328ec8 100644
--- a/server/channels/store/storetest/channel_store.go
+++ b/server/channels/store/storetest/channel_store.go
@@ -18,10 +18,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/timezones"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/timezones"
 )
 
 type SqlStore interface {
diff --git a/server/channels/store/storetest/channel_store_categories.go b/server/channels/store/storetest/channel_store_categories.go
index 6b88cdff4a..ecd49ef8c2 100644
--- a/server/channels/store/storetest/channel_store_categories.go
+++ b/server/channels/store/storetest/channel_store_categories.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestChannelStoreCategories(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/cluster_discovery_store.go b/server/channels/store/storetest/cluster_discovery_store.go
index 5bea96960a..559c156dce 100644
--- a/server/channels/store/storetest/cluster_discovery_store.go
+++ b/server/channels/store/storetest/cluster_discovery_store.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestClusterDiscoveryStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/command_store.go b/server/channels/store/storetest/command_store.go
index 05e182e8d7..1b73543853 100644
--- a/server/channels/store/storetest/command_store.go
+++ b/server/channels/store/storetest/command_store.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCommandStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/command_webhook_store.go b/server/channels/store/storetest/command_webhook_store.go
index c809e238ad..88a1b6240a 100644
--- a/server/channels/store/storetest/command_webhook_store.go
+++ b/server/channels/store/storetest/command_webhook_store.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCommandWebhookStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/compliance_store.go b/server/channels/store/storetest/compliance_store.go
index b80a20509c..2840c39d89 100644
--- a/server/channels/store/storetest/compliance_store.go
+++ b/server/channels/store/storetest/compliance_store.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func cleanupStoreState(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/draft_store.go b/server/channels/store/storetest/draft_store.go
index 45eb33cae9..57a8d5654f 100644
--- a/server/channels/store/storetest/draft_store.go
+++ b/server/channels/store/storetest/draft_store.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestDraftStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/emoji_store.go b/server/channels/store/storetest/emoji_store.go
index b5c9b6e770..6d0c6d44b2 100644
--- a/server/channels/store/storetest/emoji_store.go
+++ b/server/channels/store/storetest/emoji_store.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/server/channels/store/storetest/file_info_store.go b/server/channels/store/storetest/file_info_store.go
index 21d65f649d..c5ba12acf6 100644
--- a/server/channels/store/storetest/file_info_store.go
+++ b/server/channels/store/storetest/file_info_store.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/server/channels/store/storetest/group_store.go b/server/channels/store/storetest/group_store.go
index fedcf5030a..0bbb39b494 100644
--- a/server/channels/store/storetest/group_store.go
+++ b/server/channels/store/storetest/group_store.go
@@ -15,9 +15,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGroupStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/job_store.go b/server/channels/store/storetest/job_store.go
index 5f3fae9051..22f91f098e 100644
--- a/server/channels/store/storetest/job_store.go
+++ b/server/channels/store/storetest/job_store.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestJobStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/license_store.go b/server/channels/store/storetest/license_store.go
index 43d5a404fc..f2e1d54bf5 100644
--- a/server/channels/store/storetest/license_store.go
+++ b/server/channels/store/storetest/license_store.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestLicenseStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/link_metadata_store.go b/server/channels/store/storetest/link_metadata_store.go
index 0250123d8d..d6abe09a96 100644
--- a/server/channels/store/storetest/link_metadata_store.go
+++ b/server/channels/store/storetest/link_metadata_store.go
@@ -13,8 +13,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // These tests are ran on the same store instance, so this provides easier unique, valid timestamps
diff --git a/server/channels/store/storetest/mocks/AuditStore.go b/server/channels/store/storetest/mocks/AuditStore.go
index a5d6e361c5..f254e47f75 100644
--- a/server/channels/store/storetest/mocks/AuditStore.go
+++ b/server/channels/store/storetest/mocks/AuditStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/BotStore.go b/server/channels/store/storetest/mocks/BotStore.go
index 857405adc3..2ee3f78efa 100644
--- a/server/channels/store/storetest/mocks/BotStore.go
+++ b/server/channels/store/storetest/mocks/BotStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go b/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go
index 6835c8c94e..6c2fe00f98 100644
--- a/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go
+++ b/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/ChannelStore.go b/server/channels/store/storetest/mocks/ChannelStore.go
index 97160c46c6..efff8cd0ce 100644
--- a/server/channels/store/storetest/mocks/ChannelStore.go
+++ b/server/channels/store/storetest/mocks/ChannelStore.go
@@ -7,10 +7,10 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 
-	store "github.com/mattermost/mattermost-server/v6/server/channels/store"
+	store "github.com/mattermost/mattermost-server/server/v8/channels/store"
 
 	time "time"
 )
diff --git a/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go b/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go
index 4616e646ed..d637ca27e4 100644
--- a/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go
+++ b/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/CommandStore.go b/server/channels/store/storetest/mocks/CommandStore.go
index 9b5f365ab5..fd323ae70c 100644
--- a/server/channels/store/storetest/mocks/CommandStore.go
+++ b/server/channels/store/storetest/mocks/CommandStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/CommandWebhookStore.go b/server/channels/store/storetest/mocks/CommandWebhookStore.go
index 09cae9b925..70e7055fc1 100644
--- a/server/channels/store/storetest/mocks/CommandWebhookStore.go
+++ b/server/channels/store/storetest/mocks/CommandWebhookStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/ComplianceStore.go b/server/channels/store/storetest/mocks/ComplianceStore.go
index f2e91037e7..1dd0e774b2 100644
--- a/server/channels/store/storetest/mocks/ComplianceStore.go
+++ b/server/channels/store/storetest/mocks/ComplianceStore.go
@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/DraftStore.go b/server/channels/store/storetest/mocks/DraftStore.go
index d7236b44a0..ff1c915bbc 100644
--- a/server/channels/store/storetest/mocks/DraftStore.go
+++ b/server/channels/store/storetest/mocks/DraftStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/EmojiStore.go b/server/channels/store/storetest/mocks/EmojiStore.go
index fc0fbf71e1..6058ee3a17 100644
--- a/server/channels/store/storetest/mocks/EmojiStore.go
+++ b/server/channels/store/storetest/mocks/EmojiStore.go
@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/FileInfoStore.go b/server/channels/store/storetest/mocks/FileInfoStore.go
index f9529ca258..b514fe2e31 100644
--- a/server/channels/store/storetest/mocks/FileInfoStore.go
+++ b/server/channels/store/storetest/mocks/FileInfoStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/GroupStore.go b/server/channels/store/storetest/mocks/GroupStore.go
index 65bfbf2703..c29e8a6a0f 100644
--- a/server/channels/store/storetest/mocks/GroupStore.go
+++ b/server/channels/store/storetest/mocks/GroupStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/JobStore.go b/server/channels/store/storetest/mocks/JobStore.go
index 1b51098ecf..3b927281b3 100644
--- a/server/channels/store/storetest/mocks/JobStore.go
+++ b/server/channels/store/storetest/mocks/JobStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/LicenseStore.go b/server/channels/store/storetest/mocks/LicenseStore.go
index b0a7947169..e0bb342cd6 100644
--- a/server/channels/store/storetest/mocks/LicenseStore.go
+++ b/server/channels/store/storetest/mocks/LicenseStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/LinkMetadataStore.go b/server/channels/store/storetest/mocks/LinkMetadataStore.go
index 5bf135f9d2..be97f3003a 100644
--- a/server/channels/store/storetest/mocks/LinkMetadataStore.go
+++ b/server/channels/store/storetest/mocks/LinkMetadataStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/NotifyAdminStore.go b/server/channels/store/storetest/mocks/NotifyAdminStore.go
index eceb2be8d9..e2f98f9ce2 100644
--- a/server/channels/store/storetest/mocks/NotifyAdminStore.go
+++ b/server/channels/store/storetest/mocks/NotifyAdminStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/OAuthStore.go b/server/channels/store/storetest/mocks/OAuthStore.go
index e368215b67..d333b42a8f 100644
--- a/server/channels/store/storetest/mocks/OAuthStore.go
+++ b/server/channels/store/storetest/mocks/OAuthStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/PluginStore.go b/server/channels/store/storetest/mocks/PluginStore.go
index d44435d8db..72229eba60 100644
--- a/server/channels/store/storetest/mocks/PluginStore.go
+++ b/server/channels/store/storetest/mocks/PluginStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/PostAcknowledgementStore.go b/server/channels/store/storetest/mocks/PostAcknowledgementStore.go
index 267ebf0bcf..5bff12cfab 100644
--- a/server/channels/store/storetest/mocks/PostAcknowledgementStore.go
+++ b/server/channels/store/storetest/mocks/PostAcknowledgementStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/PostPriorityStore.go b/server/channels/store/storetest/mocks/PostPriorityStore.go
index 5fc302066d..2697dbad92 100644
--- a/server/channels/store/storetest/mocks/PostPriorityStore.go
+++ b/server/channels/store/storetest/mocks/PostPriorityStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/PostStore.go b/server/channels/store/storetest/mocks/PostStore.go
index 2d16e519d6..434fd864e9 100644
--- a/server/channels/store/storetest/mocks/PostStore.go
+++ b/server/channels/store/storetest/mocks/PostStore.go
@@ -7,10 +7,10 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 
-	store "github.com/mattermost/mattermost-server/v6/server/channels/store"
+	store "github.com/mattermost/mattermost-server/server/v8/channels/store"
 )
 
 // PostStore is an autogenerated mock type for the PostStore type
diff --git a/server/channels/store/storetest/mocks/PreferenceStore.go b/server/channels/store/storetest/mocks/PreferenceStore.go
index 2d8c9a8dae..ed5db59dc4 100644
--- a/server/channels/store/storetest/mocks/PreferenceStore.go
+++ b/server/channels/store/storetest/mocks/PreferenceStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/ProductNoticesStore.go b/server/channels/store/storetest/mocks/ProductNoticesStore.go
index 15230fa626..4563f48379 100644
--- a/server/channels/store/storetest/mocks/ProductNoticesStore.go
+++ b/server/channels/store/storetest/mocks/ProductNoticesStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/ReactionStore.go b/server/channels/store/storetest/mocks/ReactionStore.go
index d1d7247921..f295676495 100644
--- a/server/channels/store/storetest/mocks/ReactionStore.go
+++ b/server/channels/store/storetest/mocks/ReactionStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/RemoteClusterStore.go b/server/channels/store/storetest/mocks/RemoteClusterStore.go
index 8f144e3572..caacd9a062 100644
--- a/server/channels/store/storetest/mocks/RemoteClusterStore.go
+++ b/server/channels/store/storetest/mocks/RemoteClusterStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/RetentionPolicyStore.go b/server/channels/store/storetest/mocks/RetentionPolicyStore.go
index 3af57249ff..46a68cb49a 100644
--- a/server/channels/store/storetest/mocks/RetentionPolicyStore.go
+++ b/server/channels/store/storetest/mocks/RetentionPolicyStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/RoleStore.go b/server/channels/store/storetest/mocks/RoleStore.go
index 29a7d1b303..fd4ca2232d 100644
--- a/server/channels/store/storetest/mocks/RoleStore.go
+++ b/server/channels/store/storetest/mocks/RoleStore.go
@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/SchemeStore.go b/server/channels/store/storetest/mocks/SchemeStore.go
index 4b20742404..e6a7e35b84 100644
--- a/server/channels/store/storetest/mocks/SchemeStore.go
+++ b/server/channels/store/storetest/mocks/SchemeStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/SessionStore.go b/server/channels/store/storetest/mocks/SessionStore.go
index 034313ba8d..acb486fe7c 100644
--- a/server/channels/store/storetest/mocks/SessionStore.go
+++ b/server/channels/store/storetest/mocks/SessionStore.go
@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/SharedChannelStore.go b/server/channels/store/storetest/mocks/SharedChannelStore.go
index 33d2599b47..c8e39da2c6 100644
--- a/server/channels/store/storetest/mocks/SharedChannelStore.go
+++ b/server/channels/store/storetest/mocks/SharedChannelStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/StatusStore.go b/server/channels/store/storetest/mocks/StatusStore.go
index 9959fa23cf..5f7deb0441 100644
--- a/server/channels/store/storetest/mocks/StatusStore.go
+++ b/server/channels/store/storetest/mocks/StatusStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/Store.go b/server/channels/store/storetest/mocks/Store.go
index c41ca9d1a9..bb06fb9005 100644
--- a/server/channels/store/storetest/mocks/Store.go
+++ b/server/channels/store/storetest/mocks/Store.go
@@ -7,12 +7,12 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 
 	sql "database/sql"
 
-	store "github.com/mattermost/mattermost-server/v6/server/channels/store"
+	store "github.com/mattermost/mattermost-server/server/v8/channels/store"
 
 	time "time"
 )
diff --git a/server/channels/store/storetest/mocks/SystemStore.go b/server/channels/store/storetest/mocks/SystemStore.go
index d84a3ad0ee..ff41ada483 100644
--- a/server/channels/store/storetest/mocks/SystemStore.go
+++ b/server/channels/store/storetest/mocks/SystemStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/TeamStore.go b/server/channels/store/storetest/mocks/TeamStore.go
index 5cf83f077e..7c8f038a0e 100644
--- a/server/channels/store/storetest/mocks/TeamStore.go
+++ b/server/channels/store/storetest/mocks/TeamStore.go
@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/TermsOfServiceStore.go b/server/channels/store/storetest/mocks/TermsOfServiceStore.go
index 17093293d2..2de7fbe85c 100644
--- a/server/channels/store/storetest/mocks/TermsOfServiceStore.go
+++ b/server/channels/store/storetest/mocks/TermsOfServiceStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/ThreadStore.go b/server/channels/store/storetest/mocks/ThreadStore.go
index b969e81460..60b9211db2 100644
--- a/server/channels/store/storetest/mocks/ThreadStore.go
+++ b/server/channels/store/storetest/mocks/ThreadStore.go
@@ -5,8 +5,8 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
-	store "github.com/mattermost/mattermost-server/v6/server/channels/store"
+	store "github.com/mattermost/mattermost-server/server/v8/channels/store"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/TokenStore.go b/server/channels/store/storetest/mocks/TokenStore.go
index 5f3f14922f..11d97ef20f 100644
--- a/server/channels/store/storetest/mocks/TokenStore.go
+++ b/server/channels/store/storetest/mocks/TokenStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/TrueUpReviewStore.go b/server/channels/store/storetest/mocks/TrueUpReviewStore.go
index f71c1a8eb3..153d12c9f0 100644
--- a/server/channels/store/storetest/mocks/TrueUpReviewStore.go
+++ b/server/channels/store/storetest/mocks/TrueUpReviewStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/UploadSessionStore.go b/server/channels/store/storetest/mocks/UploadSessionStore.go
index 8a4ea35009..43000d811b 100644
--- a/server/channels/store/storetest/mocks/UploadSessionStore.go
+++ b/server/channels/store/storetest/mocks/UploadSessionStore.go
@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/UserAccessTokenStore.go b/server/channels/store/storetest/mocks/UserAccessTokenStore.go
index 8ebac229cc..685582502e 100644
--- a/server/channels/store/storetest/mocks/UserAccessTokenStore.go
+++ b/server/channels/store/storetest/mocks/UserAccessTokenStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/UserStore.go b/server/channels/store/storetest/mocks/UserStore.go
index 0e7698809e..dd1e851456 100644
--- a/server/channels/store/storetest/mocks/UserStore.go
+++ b/server/channels/store/storetest/mocks/UserStore.go
@@ -7,10 +7,10 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 
-	store "github.com/mattermost/mattermost-server/v6/server/channels/store"
+	store "github.com/mattermost/mattermost-server/server/v8/channels/store"
 )
 
 // UserStore is an autogenerated mock type for the UserStore type
diff --git a/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go b/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go
index 41fc7925e2..6280d63e35 100644
--- a/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go
+++ b/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/mocks/WebhookStore.go b/server/channels/store/storetest/mocks/WebhookStore.go
index e78e63ec0a..3bbee2ff5c 100644
--- a/server/channels/store/storetest/mocks/WebhookStore.go
+++ b/server/channels/store/storetest/mocks/WebhookStore.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/store/storetest/notify_admin_store.go b/server/channels/store/storetest/notify_admin_store.go
index f235e71cff..3951fb0955 100644
--- a/server/channels/store/storetest/notify_admin_store.go
+++ b/server/channels/store/storetest/notify_admin_store.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const PluginIdJenkins = "jenkins"
diff --git a/server/channels/store/storetest/oauth_store.go b/server/channels/store/storetest/oauth_store.go
index 6f6008c218..9893d436fb 100644
--- a/server/channels/store/storetest/oauth_store.go
+++ b/server/channels/store/storetest/oauth_store.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestOAuthStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/plugin_store.go b/server/channels/store/storetest/plugin_store.go
index 04b1c8ec62..c3cc614cb6 100644
--- a/server/channels/store/storetest/plugin_store.go
+++ b/server/channels/store/storetest/plugin_store.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPluginStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/post_acknowledgements_store.go b/server/channels/store/storetest/post_acknowledgements_store.go
index f34f042294..8e9ef9f2e7 100644
--- a/server/channels/store/storetest/post_acknowledgements_store.go
+++ b/server/channels/store/storetest/post_acknowledgements_store.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPostAcknowledgementsStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/post_priority_store.go b/server/channels/store/storetest/post_priority_store.go
index 447fff7cd1..0fd5f87071 100644
--- a/server/channels/store/storetest/post_priority_store.go
+++ b/server/channels/store/storetest/post_priority_store.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPostPriorityStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/post_store.go b/server/channels/store/storetest/post_store.go
index a718eb76ac..8de594072a 100644
--- a/server/channels/store/storetest/post_store.go
+++ b/server/channels/store/storetest/post_store.go
@@ -15,9 +15,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPostStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/preference_store.go b/server/channels/store/storetest/preference_store.go
index 1f0b4ff14e..7816b0b7ae 100644
--- a/server/channels/store/storetest/preference_store.go
+++ b/server/channels/store/storetest/preference_store.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPreferenceStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/product_notices_store.go b/server/channels/store/storetest/product_notices_store.go
index ecb4e8ffda..9dbf43f011 100644
--- a/server/channels/store/storetest/product_notices_store.go
+++ b/server/channels/store/storetest/product_notices_store.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestProductNoticesStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/reaction_store.go b/server/channels/store/storetest/reaction_store.go
index 3b7c589c9f..f52ee6ac4a 100644
--- a/server/channels/store/storetest/reaction_store.go
+++ b/server/channels/store/storetest/reaction_store.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/retrylayer"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/retrylayer"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestReactionStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/remote_cluster_store.go b/server/channels/store/storetest/remote_cluster_store.go
index 2ff7885c38..b1d53f8611 100644
--- a/server/channels/store/storetest/remote_cluster_store.go
+++ b/server/channels/store/storetest/remote_cluster_store.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/server/channels/store/storetest/retention_policy_store.go b/server/channels/store/storetest/retention_policy_store.go
index 2223a41894..2ccb13916f 100644
--- a/server/channels/store/storetest/retention_policy_store.go
+++ b/server/channels/store/storetest/retention_policy_store.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestRetentionPolicyStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/role_store.go b/server/channels/store/storetest/role_store.go
index ba4e220369..70fb09b422 100644
--- a/server/channels/store/storetest/role_store.go
+++ b/server/channels/store/storetest/role_store.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestRoleStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/scheme_store.go b/server/channels/store/storetest/scheme_store.go
index 66f489b4f0..4d0607740a 100644
--- a/server/channels/store/storetest/scheme_store.go
+++ b/server/channels/store/storetest/scheme_store.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSchemeStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/session_store.go b/server/channels/store/storetest/session_store.go
index 3c8fba5504..8275d1e57c 100644
--- a/server/channels/store/storetest/session_store.go
+++ b/server/channels/store/storetest/session_store.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/store/storetest/settings.go b/server/channels/store/storetest/settings.go
index 3a289e3408..a1253f28bb 100644
--- a/server/channels/store/storetest/settings.go
+++ b/server/channels/store/storetest/settings.go
@@ -17,8 +17,8 @@ import (
 	_ "github.com/lib/pq"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/channels/store/storetest/shared_channel_store.go b/server/channels/store/storetest/shared_channel_store.go
index b5f0c6f6a4..58d82bba48 100644
--- a/server/channels/store/storetest/shared_channel_store.go
+++ b/server/channels/store/storetest/shared_channel_store.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSharedChannelStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/status_store.go b/server/channels/store/storetest/status_store.go
index 16c60991e2..ac14cc196f 100644
--- a/server/channels/store/storetest/status_store.go
+++ b/server/channels/store/storetest/status_store.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestStatusStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/store.go b/server/channels/store/storetest/store.go
index 1e35da7bfb..3883f7344b 100644
--- a/server/channels/store/storetest/store.go
+++ b/server/channels/store/storetest/store.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // Store can be used to provide mock stores for testing.
diff --git a/server/channels/store/storetest/storetestlib.go b/server/channels/store/storetest/storetestlib.go
index a0a2f9fdb0..f72115732e 100644
--- a/server/channels/store/storetest/storetestlib.go
+++ b/server/channels/store/storetest/storetestlib.go
@@ -4,7 +4,7 @@
 package storetest
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func MakeEmail() string {
diff --git a/server/channels/store/storetest/system_store.go b/server/channels/store/storetest/system_store.go
index c6c233af94..7b8a06a5b5 100644
--- a/server/channels/store/storetest/system_store.go
+++ b/server/channels/store/storetest/system_store.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSystemStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/team_store.go b/server/channels/store/storetest/team_store.go
index b0d9b855d8..b7eef90aa5 100644
--- a/server/channels/store/storetest/team_store.go
+++ b/server/channels/store/storetest/team_store.go
@@ -13,8 +13,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func cleanupTeamStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/terms_of_service_store.go b/server/channels/store/storetest/terms_of_service_store.go
index e58a4388a1..4977e47125 100644
--- a/server/channels/store/storetest/terms_of_service_store.go
+++ b/server/channels/store/storetest/terms_of_service_store.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestTermsOfServiceStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/thread_store.go b/server/channels/store/storetest/thread_store.go
index 7ba2baef19..4cd64c8f1e 100644
--- a/server/channels/store/storetest/thread_store.go
+++ b/server/channels/store/storetest/thread_store.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestThreadStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/tokens_store.go b/server/channels/store/storetest/tokens_store.go
index e89e2e3b24..78b026ba70 100644
--- a/server/channels/store/storetest/tokens_store.go
+++ b/server/channels/store/storetest/tokens_store.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestTokensStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/true_up_review_store.go b/server/channels/store/storetest/true_up_review_store.go
index 7ef149fa11..62491fb8b3 100644
--- a/server/channels/store/storetest/true_up_review_store.go
+++ b/server/channels/store/storetest/true_up_review_store.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestTrueUpReviewStatusStore(t *testing.T, ss store.Store, s SqlStore) {
diff --git a/server/channels/store/storetest/upload_session_store.go b/server/channels/store/storetest/upload_session_store.go
index 1629dff9f4..979b7036f1 100644
--- a/server/channels/store/storetest/upload_session_store.go
+++ b/server/channels/store/storetest/upload_session_store.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestUploadSessionStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/user_access_token_store.go b/server/channels/store/storetest/user_access_token_store.go
index d66ac38e41..5dc8d3e120 100644
--- a/server/channels/store/storetest/user_access_token_store.go
+++ b/server/channels/store/storetest/user_access_token_store.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestUserAccessTokenStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/user_store.go b/server/channels/store/storetest/user_store.go
index 86c8514c89..1a1c64bc49 100644
--- a/server/channels/store/storetest/user_store.go
+++ b/server/channels/store/storetest/user_store.go
@@ -13,8 +13,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/store/storetest/user_terms_of_service.go b/server/channels/store/storetest/user_terms_of_service.go
index e219dd8d0c..0aaaf32b46 100644
--- a/server/channels/store/storetest/user_terms_of_service.go
+++ b/server/channels/store/storetest/user_terms_of_service.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestUserTermsOfServiceStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/storetest/utils.go b/server/channels/store/storetest/utils.go
index 7b8f06c3fb..60704b0f52 100644
--- a/server/channels/store/storetest/utils.go
+++ b/server/channels/store/storetest/utils.go
@@ -4,7 +4,7 @@
 package storetest
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // This function has a copy of it in app/helper_test
diff --git a/server/channels/store/storetest/webhook_store.go b/server/channels/store/storetest/webhook_store.go
index b08a88e823..7c25472302 100644
--- a/server/channels/store/storetest/webhook_store.go
+++ b/server/channels/store/storetest/webhook_store.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestWebhookStore(t *testing.T, ss store.Store) {
diff --git a/server/channels/store/timerlayer/timerlayer.go b/server/channels/store/timerlayer/timerlayer.go
index 7c8c64a033..b52293e013 100644
--- a/server/channels/store/timerlayer/timerlayer.go
+++ b/server/channels/store/timerlayer/timerlayer.go
@@ -10,9 +10,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type TimerLayer struct {
diff --git a/server/channels/testlib/cluster.go b/server/channels/testlib/cluster.go
index ed41d61418..76cf134d13 100644
--- a/server/channels/testlib/cluster.go
+++ b/server/channels/testlib/cluster.go
@@ -6,8 +6,8 @@ package testlib
 import (
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type FakeClusterInterface struct {
diff --git a/server/channels/testlib/helper.go b/server/channels/testlib/helper.go
index 7618d6cfab..fd06e9b776 100644
--- a/server/channels/testlib/helper.go
+++ b/server/channels/testlib/helper.go
@@ -13,13 +13,13 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchlayer"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
 )
 
 type MainHelper struct {
diff --git a/server/channels/testlib/resources.go b/server/channels/testlib/resources.go
index 9d015d151a..7142b965e5 100644
--- a/server/channels/testlib/resources.go
+++ b/server/channels/testlib/resources.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
 )
 
 const (
diff --git a/server/channels/testlib/store.go b/server/channels/testlib/store.go
index bcd45a4f61..8fb8d39770 100644
--- a/server/channels/testlib/store.go
+++ b/server/channels/testlib/store.go
@@ -7,10 +7,10 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 type TestStore struct {
diff --git a/server/channels/utils/api.go b/server/channels/utils/api.go
index 4da0c301f8..5b9684b5c9 100644
--- a/server/channels/utils/api.go
+++ b/server/channels/utils/api.go
@@ -14,8 +14,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func CheckOrigin(r *http.Request, allowedOrigins string) bool {
diff --git a/server/channels/utils/api_test.go b/server/channels/utils/api_test.go
index d475ef5067..8624da2fd0 100644
--- a/server/channels/utils/api_test.go
+++ b/server/channels/utils/api_test.go
@@ -19,7 +19,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestRenderWebError(t *testing.T) {
diff --git a/server/channels/utils/archive_test.go b/server/channels/utils/archive_test.go
index a3797dfdf1..ae769a0f2b 100644
--- a/server/channels/utils/archive_test.go
+++ b/server/channels/utils/archive_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
 )
 
 func TestSanitizePath(t *testing.T) {
diff --git a/server/channels/utils/i18n.go b/server/channels/utils/i18n.go
index 0fa5398561..5e75445ec6 100644
--- a/server/channels/utils/i18n.go
+++ b/server/channels/utils/i18n.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 // this functions loads translations from filesystem if they are not
diff --git a/server/channels/utils/imgutils/gif_test.go b/server/channels/utils/imgutils/gif_test.go
index b1b08d71a8..5a560982a2 100644
--- a/server/channels/utils/imgutils/gif_test.go
+++ b/server/channels/utils/imgutils/gif_test.go
@@ -12,7 +12,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/server/channels/utils/jsonutils/json_test.go b/server/channels/utils/jsonutils/json_test.go
index 0027a725bf..30ed5f7104 100644
--- a/server/channels/utils/jsonutils/json_test.go
+++ b/server/channels/utils/jsonutils/json_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/jsonutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/jsonutils"
 )
 
 func TestHumanizeJsonError(t *testing.T) {
diff --git a/server/channels/utils/license.go b/server/channels/utils/license.go
index e1e940cbf2..b937662f35 100644
--- a/server/channels/utils/license.go
+++ b/server/channels/utils/license.go
@@ -17,9 +17,9 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var LicenseValidator LicenseValidatorIface
diff --git a/server/channels/utils/merge_test.go b/server/channels/utils/merge_test.go
index 57d92b5cac..bc3ceb3419 100644
--- a/server/channels/utils/merge_test.go
+++ b/server/channels/utils/merge_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
 )
 
 // Test merging maps alone. This isolates the complexity of merging maps from merging maps recursively in
diff --git a/server/channels/utils/mocks/LicenseValidatorIface.go b/server/channels/utils/mocks/LicenseValidatorIface.go
index ae7196b201..9abb3e9302 100644
--- a/server/channels/utils/mocks/LicenseValidatorIface.go
+++ b/server/channels/utils/mocks/LicenseValidatorIface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/server/channels/utils/subpath.go b/server/channels/utils/subpath.go
index cfa47d4467..e254a05991 100644
--- a/server/channels/utils/subpath.go
+++ b/server/channels/utils/subpath.go
@@ -16,9 +16,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // getSubpathScript renders the inline script that defines window.publicPath to change how webpack loads assets.
diff --git a/server/channels/utils/subpath_test.go b/server/channels/utils/subpath_test.go
index 6af6af1006..28cc23ea0c 100644
--- a/server/channels/utils/subpath_test.go
+++ b/server/channels/utils/subpath_test.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestUpdateAssetsSubpathFromConfig(t *testing.T) {
diff --git a/server/channels/utils/testutils/static_config_service.go b/server/channels/utils/testutils/static_config_service.go
index 6a4d4d2034..c6ea8b7bba 100644
--- a/server/channels/utils/testutils/static_config_service.go
+++ b/server/channels/utils/testutils/static_config_service.go
@@ -6,7 +6,7 @@ package testutils
 import (
 	"crypto/ecdsa"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type StaticConfigService struct {
diff --git a/server/channels/utils/testutils/testutils.go b/server/channels/utils/testutils/testutils.go
index cb31ac0f56..9d766e23a1 100644
--- a/server/channels/utils/testutils/testutils.go
+++ b/server/channels/utils/testutils/testutils.go
@@ -14,9 +14,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
 )
 
 func ReadTestFile(name string) ([]byte, error) {
diff --git a/server/channels/utils/utils.go b/server/channels/utils/utils.go
index cf53e19f55..bba3d52cac 100644
--- a/server/channels/utils/utils.go
+++ b/server/channels/utils/utils.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func StringInSlice(a string, slice []string) bool {
diff --git a/server/channels/web/context.go b/server/channels/web/context.go
index 46384a851e..1fbf57bb33 100644
--- a/server/channels/web/context.go
+++ b/server/channels/web/context.go
@@ -9,13 +9,13 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Context struct {
diff --git a/server/channels/web/context_test.go b/server/channels/web/context_test.go
index a2850ba2e9..60a9ef0579 100644
--- a/server/channels/web/context_test.go
+++ b/server/channels/web/context_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestRequireHookId(t *testing.T) {
diff --git a/server/channels/web/handlers.go b/server/channels/web/handlers.go
index 466619b61a..d10c085021 100644
--- a/server/channels/web/handlers.go
+++ b/server/channels/web/handlers.go
@@ -20,15 +20,15 @@ import (
 	"github.com/opentracing/opentracing-go/ext"
 	spanlog "github.com/opentracing/opentracing-go/log"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	app_opentracing "github.com/mattermost/mattermost-server/v6/server/channels/app/opentracing"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/opentracinglayer"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/tracing"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	app_opentracing "github.com/mattermost/mattermost-server/server/v8/channels/app/opentracing"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/opentracinglayer"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/tracing"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func GetHandlerName(h func(*Context, http.ResponseWriter, *http.Request)) string {
diff --git a/server/channels/web/handlers_test.go b/server/channels/web/handlers_test.go
index f94c03548a..842e062151 100644
--- a/server/channels/web/handlers_test.go
+++ b/server/channels/web/handlers_test.go
@@ -11,11 +11,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func handlerForHTTPErrors(c *Context, w http.ResponseWriter, r *http.Request) {
diff --git a/server/channels/web/main_test.go b/server/channels/web/main_test.go
index 8ed6c63a8c..06e4b6935a 100644
--- a/server/channels/web/main_test.go
+++ b/server/channels/web/main_test.go
@@ -6,7 +6,7 @@ package web
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/channels/web/oauth.go b/server/channels/web/oauth.go
index 9d98ce8c27..fe6e4ece8e 100644
--- a/server/channels/web/oauth.go
+++ b/server/channels/web/oauth.go
@@ -11,13 +11,13 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (w *Web) InitOAuth() {
diff --git a/server/channels/web/oauth_test.go b/server/channels/web/oauth_test.go
index 874c22d2c2..03838789fd 100644
--- a/server/channels/web/oauth_test.go
+++ b/server/channels/web/oauth_test.go
@@ -17,11 +17,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestOAuthComplete_AccessDenied(t *testing.T) {
diff --git a/server/channels/web/params.go b/server/channels/web/params.go
index 64e8227119..7dd205dc93 100644
--- a/server/channels/web/params.go
+++ b/server/channels/web/params.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/channels/web/params_test.go b/server/channels/web/params_test.go
index e95e8b6140..010714e252 100644
--- a/server/channels/web/params_test.go
+++ b/server/channels/web/params_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetPerPageFromQuery(t *testing.T) {
diff --git a/server/channels/web/saml.go b/server/channels/web/saml.go
index 438cf490e1..55bcfdfee0 100644
--- a/server/channels/web/saml.go
+++ b/server/channels/web/saml.go
@@ -10,10 +10,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const maxSAMLResponseSize = 2 * 1024 * 1024 // 2MB
diff --git a/server/channels/web/static.go b/server/channels/web/static.go
index bd091841a9..e8e111dbb5 100644
--- a/server/channels/web/static.go
+++ b/server/channels/web/static.go
@@ -15,11 +15,11 @@ import (
 
 	"github.com/mattermost/gziphandler"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/templates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/templates"
 )
 
 var robotsTxt = []byte("User-agent: *\nDisallow: /\n")
diff --git a/server/channels/web/unsupported_browser.go b/server/channels/web/unsupported_browser.go
index eea9fc93c3..fc3ea2fe26 100644
--- a/server/channels/web/unsupported_browser.go
+++ b/server/channels/web/unsupported_browser.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/avct/uasurfer"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/templates"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/templates"
 )
 
 // MattermostApp describes downloads for the Mattermost App
diff --git a/server/channels/web/web.go b/server/channels/web/web.go
index 64ff0221bf..1bae301a83 100644
--- a/server/channels/web/web.go
+++ b/server/channels/web/web.go
@@ -11,10 +11,10 @@ import (
 	"github.com/avct/uasurfer"
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type Web struct {
diff --git a/server/channels/web/web_test.go b/server/channels/web/web_test.go
index 3fcddc2023..2623dfb0bb 100644
--- a/server/channels/web/web_test.go
+++ b/server/channels/web/web_test.go
@@ -17,15 +17,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/localcachelayer"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/localcachelayer"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 var apiClient *model.Client4
@@ -204,7 +204,7 @@ func TestStaticFilesRequest(t *testing.T) {
 	package main
 
 	import (
-		"github.com/mattermost/mattermost-server/v6/plugin"
+		"github.com/mattermost/mattermost-server/server/v8/plugin"
 	)
 
 	type MyPlugin struct {
@@ -291,7 +291,7 @@ func TestPublicFilesRequest(t *testing.T) {
 	package main
 
 	import (
-		"github.com/mattermost/mattermost-server/v6/plugin"
+		"github.com/mattermost/mattermost-server/server/v8/plugin"
 	)
 
 	type MyPlugin struct {
diff --git a/server/channels/web/webhook.go b/server/channels/web/webhook.go
index 84a23b83b5..d75c98e94b 100644
--- a/server/channels/web/webhook.go
+++ b/server/channels/web/webhook.go
@@ -13,8 +13,8 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (w *Web) InitWebhooks() {
diff --git a/server/channels/web/webhook_test.go b/server/channels/web/webhook_test.go
index e0cd792c1e..17f5dbe718 100644
--- a/server/channels/web/webhook_test.go
+++ b/server/channels/web/webhook_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestIncomingWebhook(t *testing.T) {
diff --git a/server/channels/wsapi/api.go b/server/channels/wsapi/api.go
index 9da2d79ba5..fcfa5b07fd 100644
--- a/server/channels/wsapi/api.go
+++ b/server/channels/wsapi/api.go
@@ -4,8 +4,8 @@
 package wsapi
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
 )
 
 type API struct {
diff --git a/server/channels/wsapi/status.go b/server/channels/wsapi/status.go
index 375f65367e..db52eb50dd 100644
--- a/server/channels/wsapi/status.go
+++ b/server/channels/wsapi/status.go
@@ -4,8 +4,8 @@
 package wsapi
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) InitStatus() {
diff --git a/server/channels/wsapi/system.go b/server/channels/wsapi/system.go
index e119505f80..634df691b7 100644
--- a/server/channels/wsapi/system.go
+++ b/server/channels/wsapi/system.go
@@ -4,7 +4,7 @@
 package wsapi
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitSystem() {
diff --git a/server/channels/wsapi/user.go b/server/channels/wsapi/user.go
index 6389a99aea..940c2ae64a 100644
--- a/server/channels/wsapi/user.go
+++ b/server/channels/wsapi/user.go
@@ -4,8 +4,8 @@
 package wsapi
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (api *API) InitUser() {
diff --git a/server/channels/wsapi/websocket_handler.go b/server/channels/wsapi/websocket_handler.go
index 9ceb7354bb..4cd7d68bec 100644
--- a/server/channels/wsapi/websocket_handler.go
+++ b/server/channels/wsapi/websocket_handler.go
@@ -6,11 +6,11 @@ package wsapi
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/platform"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/platform"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (api *API) APIWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]any, *model.AppError)) webSocketHandler {
diff --git a/server/cmd/mattermost/commands/cmdtestlib.go b/server/cmd/mattermost/commands/cmdtestlib.go
index 9b526f18e6..1d57b71367 100644
--- a/server/cmd/mattermost/commands/cmdtestlib.go
+++ b/server/cmd/mattermost/commands/cmdtestlib.go
@@ -17,10 +17,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/api4"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/api4"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var coverprofileCounters map[string]int = make(map[string]int)
diff --git a/server/cmd/mattermost/commands/db.go b/server/cmd/mattermost/commands/db.go
index 4174f77c75..387d203d80 100644
--- a/server/cmd/mattermost/commands/db.go
+++ b/server/cmd/mattermost/commands/db.go
@@ -10,10 +10,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/config"
 )
 
 var DbCmd = &cobra.Command{
diff --git a/server/cmd/mattermost/commands/export.go b/server/cmd/mattermost/commands/export.go
index 90cfa317b7..70593379b2 100644
--- a/server/cmd/mattermost/commands/export.go
+++ b/server/cmd/mattermost/commands/export.go
@@ -10,10 +10,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
diff --git a/server/cmd/mattermost/commands/export_test.go b/server/cmd/mattermost/commands/export_test.go
index f6ebfeffb6..b2456d60cd 100644
--- a/server/cmd/mattermost/commands/export_test.go
+++ b/server/cmd/mattermost/commands/export_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // There are no tests that actually run the Message Export job, because it can take a long time to complete depending
diff --git a/server/cmd/mattermost/commands/import.go b/server/cmd/mattermost/commands/import.go
index a140af37aa..ecfcca5781 100644
--- a/server/cmd/mattermost/commands/import.go
+++ b/server/cmd/mattermost/commands/import.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var ImportCmd = &cobra.Command{
diff --git a/server/cmd/mattermost/commands/init.go b/server/cmd/mattermost/commands/init.go
index fa747ba99f..bae1181fa2 100644
--- a/server/cmd/mattermost/commands/init.go
+++ b/server/cmd/mattermost/commands/init.go
@@ -6,12 +6,12 @@ package commands
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 func initDBCommandContextCobra(command *cobra.Command, readOnlyConfigStore bool, options ...app.Option) (*app.App, error) {
diff --git a/server/cmd/mattermost/commands/jobserver.go b/server/cmd/mattermost/commands/jobserver.go
index 0f5663426c..206b660a9f 100644
--- a/server/cmd/mattermost/commands/jobserver.go
+++ b/server/cmd/mattermost/commands/jobserver.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/audit"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/audit"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var JobserverCmd = &cobra.Command{
diff --git a/server/cmd/mattermost/commands/main_test.go b/server/cmd/mattermost/commands/main_test.go
index 2a7df0a3c4..ace5a637db 100644
--- a/server/cmd/mattermost/commands/main_test.go
+++ b/server/cmd/mattermost/commands/main_test.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/api4"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/api4"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
diff --git a/server/cmd/mattermost/commands/server.go b/server/cmd/mattermost/commands/server.go
index ecb25552d2..3501047332 100644
--- a/server/cmd/mattermost/commands/server.go
+++ b/server/cmd/mattermost/commands/server.go
@@ -15,14 +15,14 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/api4"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/manualtesting"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/channels/web"
-	"github.com/mattermost/mattermost-server/v6/server/channels/wsapi"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/api4"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/manualtesting"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/web"
+	"github.com/mattermost/mattermost-server/server/v8/channels/wsapi"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var serverCmd = &cobra.Command{
diff --git a/server/cmd/mattermost/commands/server_test.go b/server/cmd/mattermost/commands/server_test.go
index eef8af50e7..276fb622dd 100644
--- a/server/cmd/mattermost/commands/server_test.go
+++ b/server/cmd/mattermost/commands/server_test.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/config"
 )
 
 const (
diff --git a/server/cmd/mattermost/commands/test.go b/server/cmd/mattermost/commands/test.go
index abacaa1163..a525f2bbdc 100644
--- a/server/cmd/mattermost/commands/test.go
+++ b/server/cmd/mattermost/commands/test.go
@@ -13,11 +13,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/api4"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/wsapi"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/api4"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/wsapi"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 var TestCmd = &cobra.Command{
diff --git a/server/cmd/mattermost/commands/utils.go b/server/cmd/mattermost/commands/utils.go
index fb7a56d262..d09def41fc 100644
--- a/server/cmd/mattermost/commands/utils.go
+++ b/server/cmd/mattermost/commands/utils.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const CustomDefaultsEnvVar = "MM_CUSTOM_DEFAULTS_PATH"
diff --git a/server/cmd/mattermost/commands/version.go b/server/cmd/mattermost/commands/version.go
index 2c318a72e2..daea544066 100644
--- a/server/cmd/mattermost/commands/version.go
+++ b/server/cmd/mattermost/commands/version.go
@@ -6,7 +6,7 @@ package commands
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var VersionCmd = &cobra.Command{
diff --git a/server/cmd/mattermost/main.go b/server/cmd/mattermost/main.go
index d0577694bf..c47df425ac 100644
--- a/server/cmd/mattermost/main.go
+++ b/server/cmd/mattermost/main.go
@@ -6,14 +6,14 @@ package main
 import (
 	"os"
 
-	"github.com/mattermost/mattermost-server/v6/server/cmd/mattermost/commands"
+	"github.com/mattermost/mattermost-server/server/v8/cmd/mattermost/commands"
 	// Import and register app layer slash commands
-	_ "github.com/mattermost/mattermost-server/v6/server/channels/app/slashcommands"
+	_ "github.com/mattermost/mattermost-server/server/v8/channels/app/slashcommands"
 	// Plugins
-	_ "github.com/mattermost/mattermost-server/v6/model/oauthproviders/gitlab"
+	_ "github.com/mattermost/mattermost-server/server/v8/model/oauthproviders/gitlab"
 
 	// Enterprise Imports
-	_ "github.com/mattermost/mattermost-server/v6/server/channels/imports"
+	_ "github.com/mattermost/mattermost-server/server/v8/channels/imports"
 )
 
 func main() {
diff --git a/server/config/client.go b/server/config/client.go
index df004b381f..50bb37cccd 100644
--- a/server/config/client.go
+++ b/server/config/client.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // GenerateClientConfig renders the given configuration for a client.
diff --git a/server/config/client_test.go b/server/config/client_test.go
index 9c92cfe329..4c3d3c9968 100644
--- a/server/config/client_test.go
+++ b/server/config/client_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGetClientConfig(t *testing.T) {
diff --git a/server/config/common_test.go b/server/config/common_test.go
index 06e4f90057..e601e63352 100644
--- a/server/config/common_test.go
+++ b/server/config/common_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var emptyConfig, readOnlyConfig, minimalConfig, minimalConfigNoFF, invalidConfig, fixesRequiredConfig, ldapConfig, testConfig, customConfigDefaults *model.Config
diff --git a/server/config/database.go b/server/config/database.go
index dd508d9c4f..58966e9d9e 100644
--- a/server/config/database.go
+++ b/server/config/database.go
@@ -25,9 +25,9 @@ import (
 
 	"github.com/mattermost/morph"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/mattermost/morph/drivers"
 	ms "github.com/mattermost/morph/drivers/mysql"
diff --git a/server/config/database_test.go b/server/config/database_test.go
index 6954461a08..d1fb8e18c4 100644
--- a/server/config/database_test.go
+++ b/server/config/database_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func getDsn(driver string, source string) string {
diff --git a/server/config/diff.go b/server/config/diff.go
index ac418ec8a6..d10025d4bd 100644
--- a/server/config/diff.go
+++ b/server/config/diff.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type ConfigDiffs []ConfigDiff
diff --git a/server/config/diff_test.go b/server/config/diff_test.go
index bf1a79ab37..36e3b2402b 100644
--- a/server/config/diff_test.go
+++ b/server/config/diff_test.go
@@ -6,7 +6,7 @@ package config
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/config/emitter.go b/server/config/emitter.go
index 80f8c72065..bd5b36d794 100644
--- a/server/config/emitter.go
+++ b/server/config/emitter.go
@@ -6,8 +6,8 @@ package config
 import (
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // Listener is a callback function invoked when the configuration changes.
diff --git a/server/config/emitter_test.go b/server/config/emitter_test.go
index 6700088b3b..417a168be2 100644
--- a/server/config/emitter_test.go
+++ b/server/config/emitter_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestEmitter(t *testing.T) {
diff --git a/server/config/environment.go b/server/config/environment.go
index 4ded8d7399..17ad38f34e 100644
--- a/server/config/environment.go
+++ b/server/config/environment.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func GetEnvironment() map[string]string {
diff --git a/server/config/environment_test.go b/server/config/environment_test.go
index e86bcc36e9..b45107ad39 100644
--- a/server/config/environment_test.go
+++ b/server/config/environment_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func modifiedDefault(modify func(*model.Config)) *model.Config {
diff --git a/server/config/file.go b/server/config/file.go
index 79d71bc6f1..082d77c9f9 100644
--- a/server/config/file.go
+++ b/server/config/file.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var (
diff --git a/server/config/file_test.go b/server/config/file_test.go
index 9094a2b200..51df708992 100644
--- a/server/config/file_test.go
+++ b/server/config/file_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func setupConfigFile(t *testing.T, cfg *model.Config) (string, func()) {
diff --git a/server/config/logconfigsrc.go b/server/config/logconfigsrc.go
index 8f75d62b44..dce35f6f24 100644
--- a/server/config/logconfigsrc.go
+++ b/server/config/logconfigsrc.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type LogSrcListener func(old, new mlog.LoggerConfiguration)
diff --git a/server/config/logger.go b/server/config/logger.go
index 36b6374603..ec64b98dc8 100644
--- a/server/config/logger.go
+++ b/server/config/logger.go
@@ -9,9 +9,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/config/logger_test.go b/server/config/logger_test.go
index c28f769d06..acd7fefe1e 100644
--- a/server/config/logger_test.go
+++ b/server/config/logger_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestMloggerConfigFromAuditConfig(t *testing.T) {
diff --git a/server/config/main_test.go b/server/config/main_test.go
index 09b38815d9..9a0979589b 100644
--- a/server/config/main_test.go
+++ b/server/config/main_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/lib/pq"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var mainHelper *testlib.MainHelper
diff --git a/server/config/memory.go b/server/config/memory.go
index d59b34bec8..7067f3bd55 100644
--- a/server/config/memory.go
+++ b/server/config/memory.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // MemoryStore implements the Store interface. It is meant primarily for testing.
diff --git a/server/config/migrate_test.go b/server/config/migrate_test.go
index 27a1b9ccda..a8f3565811 100644
--- a/server/config/migrate_test.go
+++ b/server/config/migrate_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type cleanUpFn func(store *Store)
diff --git a/server/config/store.go b/server/config/store.go
index b5fb315444..ca9cfca815 100644
--- a/server/config/store.go
+++ b/server/config/store.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/jsonutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/jsonutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 var (
diff --git a/server/config/utils.go b/server/config/utils.go
index f247ea4a43..d76fe55d52 100644
--- a/server/config/utils.go
+++ b/server/config/utils.go
@@ -10,10 +10,10 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // marshalConfig converts the given configuration into JSON bytes for persistence.
diff --git a/server/config/utils_test.go b/server/config/utils_test.go
index 9c8de20d23..50585eb550 100644
--- a/server/config/utils_test.go
+++ b/server/config/utils_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestDesanitize(t *testing.T) {
diff --git a/go.mod b/server/go.mod
similarity index 99%
rename from go.mod
rename to server/go.mod
index 2eb36199e3..20e82eb78b 100644
--- a/go.mod
+++ b/server/go.mod
@@ -1,4 +1,4 @@
-module github.com/mattermost/mattermost-server/v6
+module github.com/mattermost/mattermost-server/server/v8
 
 go 1.19
 
diff --git a/go.sum b/server/go.sum
similarity index 100%
rename from go.sum
rename to server/go.sum
diff --git a/model/access.go b/server/model/access.go
similarity index 100%
rename from model/access.go
rename to server/model/access.go
diff --git a/model/access_test.go b/server/model/access_test.go
similarity index 100%
rename from model/access_test.go
rename to server/model/access_test.go
diff --git a/model/analytics_row.go b/server/model/analytics_row.go
similarity index 100%
rename from model/analytics_row.go
rename to server/model/analytics_row.go
diff --git a/model/audit.go b/server/model/audit.go
similarity index 100%
rename from model/audit.go
rename to server/model/audit.go
diff --git a/model/auditconv.go b/server/model/auditconv.go
similarity index 100%
rename from model/auditconv.go
rename to server/model/auditconv.go
diff --git a/model/auditconv_test.go b/server/model/auditconv_test.go
similarity index 100%
rename from model/auditconv_test.go
rename to server/model/auditconv_test.go
diff --git a/model/audits.go b/server/model/audits.go
similarity index 100%
rename from model/audits.go
rename to server/model/audits.go
diff --git a/model/authorize.go b/server/model/authorize.go
similarity index 100%
rename from model/authorize.go
rename to server/model/authorize.go
diff --git a/model/authorize_test.go b/server/model/authorize_test.go
similarity index 100%
rename from model/authorize_test.go
rename to server/model/authorize_test.go
diff --git a/model/bot.go b/server/model/bot.go
similarity index 100%
rename from model/bot.go
rename to server/model/bot.go
diff --git a/model/bot_test.go b/server/model/bot_test.go
similarity index 100%
rename from model/bot_test.go
rename to server/model/bot_test.go
diff --git a/model/builtin.go b/server/model/builtin.go
similarity index 100%
rename from model/builtin.go
rename to server/model/builtin.go
diff --git a/model/bulk_export.go b/server/model/bulk_export.go
similarity index 100%
rename from model/bulk_export.go
rename to server/model/bulk_export.go
diff --git a/model/bundle_info.go b/server/model/bundle_info.go
similarity index 92%
rename from model/bundle_info.go
rename to server/model/bundle_info.go
index e602cc5daf..cfac1c8eb3 100644
--- a/model/bundle_info.go
+++ b/server/model/bundle_info.go
@@ -4,7 +4,7 @@
 package model
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type BundleInfo struct {
diff --git a/model/bundle_info_test.go b/server/model/bundle_info_test.go
similarity index 100%
rename from model/bundle_info_test.go
rename to server/model/bundle_info_test.go
diff --git a/model/channel.go b/server/model/channel.go
similarity index 100%
rename from model/channel.go
rename to server/model/channel.go
diff --git a/model/channel_count.go b/server/model/channel_count.go
similarity index 100%
rename from model/channel_count.go
rename to server/model/channel_count.go
diff --git a/model/channel_data.go b/server/model/channel_data.go
similarity index 100%
rename from model/channel_data.go
rename to server/model/channel_data.go
diff --git a/model/channel_list.go b/server/model/channel_list.go
similarity index 100%
rename from model/channel_list.go
rename to server/model/channel_list.go
diff --git a/model/channel_member.go b/server/model/channel_member.go
similarity index 100%
rename from model/channel_member.go
rename to server/model/channel_member.go
diff --git a/model/channel_member_history.go b/server/model/channel_member_history.go
similarity index 100%
rename from model/channel_member_history.go
rename to server/model/channel_member_history.go
diff --git a/model/channel_member_history_result.go b/server/model/channel_member_history_result.go
similarity index 100%
rename from model/channel_member_history_result.go
rename to server/model/channel_member_history_result.go
diff --git a/model/channel_member_test.go b/server/model/channel_member_test.go
similarity index 100%
rename from model/channel_member_test.go
rename to server/model/channel_member_test.go
diff --git a/model/channel_mentions.go b/server/model/channel_mentions.go
similarity index 100%
rename from model/channel_mentions.go
rename to server/model/channel_mentions.go
diff --git a/model/channel_search.go b/server/model/channel_search.go
similarity index 100%
rename from model/channel_search.go
rename to server/model/channel_search.go
diff --git a/model/channel_sidebar.go b/server/model/channel_sidebar.go
similarity index 100%
rename from model/channel_sidebar.go
rename to server/model/channel_sidebar.go
diff --git a/model/channel_sidebar_test.go b/server/model/channel_sidebar_test.go
similarity index 100%
rename from model/channel_sidebar_test.go
rename to server/model/channel_sidebar_test.go
diff --git a/model/channel_stats.go b/server/model/channel_stats.go
similarity index 100%
rename from model/channel_stats.go
rename to server/model/channel_stats.go
diff --git a/model/channel_test.go b/server/model/channel_test.go
similarity index 100%
rename from model/channel_test.go
rename to server/model/channel_test.go
diff --git a/model/channel_view.go b/server/model/channel_view.go
similarity index 100%
rename from model/channel_view.go
rename to server/model/channel_view.go
diff --git a/model/client4.go b/server/model/client4.go
similarity index 100%
rename from model/client4.go
rename to server/model/client4.go
diff --git a/model/client4_test.go b/server/model/client4_test.go
similarity index 97%
rename from model/client4_test.go
rename to server/model/client4_test.go
index 71a374fae6..bb9db34997 100644
--- a/model/client4_test.go
+++ b/server/model/client4_test.go
@@ -26,7 +26,7 @@ func TestClient4TrimTrailingSlash(t *testing.T) {
 	}
 }
 
-// https://github.com/mattermost/mattermost-server/v6/server/channels/issues/8205
+// https://github.com/mattermost/mattermost-server/server/v8/channels/issues/8205
 func TestClient4CreatePost(t *testing.T) {
 	post := &Post{
 		Props: map[string]any{
diff --git a/model/cloud.go b/server/model/cloud.go
similarity index 98%
rename from model/cloud.go
rename to server/model/cloud.go
index c8dd738b96..a2176f8bd9 100644
--- a/model/cloud.go
+++ b/server/model/cloud.go
@@ -274,7 +274,7 @@ type SubscriptionChange struct {
 // TODO remove BoardsLimits.
 // It is not used for real.
 // Focalboard has some lingering code using this struct
-// https://github.com/mattermost/mattermost-server/v6/server/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86
+// https://github.com/mattermost/mattermost-server/server/v8/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86
 // we should remove this struct once that code is removed.
 type BoardsLimits struct {
 	Cards *int `json:"cards"`
@@ -297,7 +297,7 @@ type ProductLimits struct {
 	// TODO remove Boards property.
 	// It is not used for real.
 	// Focalboard has some lingering code using this property
-	// https://github.com/mattermost/mattermost-server/v6/server/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86
+	// https://github.com/mattermost/mattermost-server/server/v8/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86
 	// we should remove this property once that code is removed.
 	Boards   *BoardsLimits   `json:"boards,omitempty"`
 	Files    *FilesLimits    `json:"files,omitempty"`
diff --git a/model/cluster_discovery.go b/server/model/cluster_discovery.go
similarity index 100%
rename from model/cluster_discovery.go
rename to server/model/cluster_discovery.go
diff --git a/model/cluster_discovery_test.go b/server/model/cluster_discovery_test.go
similarity index 100%
rename from model/cluster_discovery_test.go
rename to server/model/cluster_discovery_test.go
diff --git a/model/cluster_info.go b/server/model/cluster_info.go
similarity index 100%
rename from model/cluster_info.go
rename to server/model/cluster_info.go
diff --git a/model/cluster_message.go b/server/model/cluster_message.go
similarity index 100%
rename from model/cluster_message.go
rename to server/model/cluster_message.go
diff --git a/model/cluster_stats.go b/server/model/cluster_stats.go
similarity index 100%
rename from model/cluster_stats.go
rename to server/model/cluster_stats.go
diff --git a/model/collection.go b/server/model/collection.go
similarity index 100%
rename from model/collection.go
rename to server/model/collection.go
diff --git a/model/command.go b/server/model/command.go
similarity index 100%
rename from model/command.go
rename to server/model/command.go
diff --git a/model/command_args.go b/server/model/command_args.go
similarity index 96%
rename from model/command_args.go
rename to server/model/command_args.go
index a01b5db87a..6b147af0df 100644
--- a/model/command_args.go
+++ b/server/model/command_args.go
@@ -4,7 +4,7 @@
 package model
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 type CommandArgs struct {
diff --git a/model/command_args_test.go b/server/model/command_args_test.go
similarity index 100%
rename from model/command_args_test.go
rename to server/model/command_args_test.go
diff --git a/model/command_autocomplete.go b/server/model/command_autocomplete.go
similarity index 100%
rename from model/command_autocomplete.go
rename to server/model/command_autocomplete.go
diff --git a/model/command_autocomplete_test.go b/server/model/command_autocomplete_test.go
similarity index 100%
rename from model/command_autocomplete_test.go
rename to server/model/command_autocomplete_test.go
diff --git a/model/command_request.go b/server/model/command_request.go
similarity index 100%
rename from model/command_request.go
rename to server/model/command_request.go
diff --git a/model/command_response.go b/server/model/command_response.go
similarity index 96%
rename from model/command_response.go
rename to server/model/command_response.go
index cc5111506c..4fd810f373 100644
--- a/model/command_response.go
+++ b/server/model/command_response.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/jsonutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/jsonutils"
 )
 
 const (
diff --git a/model/command_response_test.go b/server/model/command_response_test.go
similarity index 100%
rename from model/command_response_test.go
rename to server/model/command_response_test.go
diff --git a/model/command_test.go b/server/model/command_test.go
similarity index 100%
rename from model/command_test.go
rename to server/model/command_test.go
diff --git a/model/command_webhook.go b/server/model/command_webhook.go
similarity index 100%
rename from model/command_webhook.go
rename to server/model/command_webhook.go
diff --git a/model/command_webhook_test.go b/server/model/command_webhook_test.go
similarity index 100%
rename from model/command_webhook_test.go
rename to server/model/command_webhook_test.go
diff --git a/model/compliance.go b/server/model/compliance.go
similarity index 100%
rename from model/compliance.go
rename to server/model/compliance.go
diff --git a/model/compliance_post.go b/server/model/compliance_post.go
similarity index 100%
rename from model/compliance_post.go
rename to server/model/compliance_post.go
diff --git a/model/compliance_post_test.go b/server/model/compliance_post_test.go
similarity index 100%
rename from model/compliance_post_test.go
rename to server/model/compliance_post_test.go
diff --git a/model/config.go b/server/model/config.go
similarity index 99%
rename from model/config.go
rename to server/model/config.go
index 4868229bbf..89a7a6da62 100644
--- a/model/config.go
+++ b/server/model/config.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/mattermost/ldap"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/model/config_test.go b/server/model/config_test.go
similarity index 96%
rename from model/config_test.go
rename to server/model/config_test.go
index cedffbcb08..f7972d3b67 100644
--- a/model/config_test.go
+++ b/server/model/config_test.go
@@ -316,41 +316,6 @@ func TestConfigDefaultNPSPluginState(t *testing.T) {
 	})
 }
 
-func TestConfigDefaultPlaybooksPluginState(t *testing.T) {
-	t.Run("should enable Playbooks plugin by default on enterprise-ready builds", func(t *testing.T) {
-		BuildEnterpriseReady = "true"
-		c1 := Config{}
-		c1.SetDefaults()
-
-		assert.True(t, c1.PluginSettings.PluginStates["playbooks"].Enable)
-	})
-
-	t.Run("should enable Playbooks plugin by default on non-enterprise-ready builds", func(t *testing.T) {
-		BuildEnterpriseReady = ""
-		c1 := Config{}
-		c1.SetDefaults()
-
-		assert.True(t, c1.PluginSettings.PluginStates["playbooks"].Enable)
-	})
-
-	t.Run("should not re-enable Playbooks plugin after it has been disabled", func(t *testing.T) {
-		BuildEnterpriseReady = ""
-		c1 := Config{
-			PluginSettings: PluginSettings{
-				PluginStates: map[string]*PluginState{
-					"playbooks": {
-						Enable: false,
-					},
-				},
-			},
-		}
-
-		c1.SetDefaults()
-
-		assert.False(t, c1.PluginSettings.PluginStates["playbooks"].Enable)
-	})
-}
-
 func TestConfigDefaultChannelExportPluginState(t *testing.T) {
 	t.Run("should enable ChannelExport plugin by default on enterprise-ready builds", func(t *testing.T) {
 		BuildEnterpriseReady = "true"
@@ -386,30 +351,6 @@ func TestConfigDefaultChannelExportPluginState(t *testing.T) {
 	})
 }
 
-func TestConfigDefaultFocalboardPluginState(t *testing.T) {
-	t.Run("should enable Focalboard plugin by default", func(t *testing.T) {
-		c1 := Config{}
-		c1.SetDefaults()
-
-		assert.True(t, c1.PluginSettings.PluginStates["focalboard"].Enable)
-	})
-
-	t.Run("should not re-enable focalboard plugin after it has been disabled", func(t *testing.T) {
-		c1 := Config{
-			PluginSettings: PluginSettings{
-				PluginStates: map[string]*PluginState{
-					"focalboard": {
-						Enable: false,
-					},
-				},
-			},
-		}
-
-		c1.SetDefaults()
-		assert.False(t, c1.PluginSettings.PluginStates["focalboard"].Enable)
-	})
-}
-
 func TestTeamSettingsIsValidSiteNameEmpty(t *testing.T) {
 	c1 := Config{}
 	c1.SetDefaults()
diff --git a/model/custom_status.go b/server/model/custom_status.go
similarity index 100%
rename from model/custom_status.go
rename to server/model/custom_status.go
diff --git a/model/data_retention_policy.go b/server/model/data_retention_policy.go
similarity index 100%
rename from model/data_retention_policy.go
rename to server/model/data_retention_policy.go
diff --git a/model/draft.go b/server/model/draft.go
similarity index 100%
rename from model/draft.go
rename to server/model/draft.go
diff --git a/model/draft_test.go b/server/model/draft_test.go
similarity index 100%
rename from model/draft_test.go
rename to server/model/draft_test.go
diff --git a/model/emoji.go b/server/model/emoji.go
similarity index 100%
rename from model/emoji.go
rename to server/model/emoji.go
diff --git a/model/emoji_data.go b/server/model/emoji_data.go
similarity index 100%
rename from model/emoji_data.go
rename to server/model/emoji_data.go
diff --git a/model/emoji_search.go b/server/model/emoji_search.go
similarity index 100%
rename from model/emoji_search.go
rename to server/model/emoji_search.go
diff --git a/model/emoji_test.go b/server/model/emoji_test.go
similarity index 100%
rename from model/emoji_test.go
rename to server/model/emoji_test.go
diff --git a/model/feature_flags.go b/server/model/feature_flags.go
similarity index 100%
rename from model/feature_flags.go
rename to server/model/feature_flags.go
diff --git a/model/feature_flags_test.go b/server/model/feature_flags_test.go
similarity index 100%
rename from model/feature_flags_test.go
rename to server/model/feature_flags_test.go
diff --git a/model/file.go b/server/model/file.go
similarity index 100%
rename from model/file.go
rename to server/model/file.go
diff --git a/model/file_info.go b/server/model/file_info.go
similarity index 99%
rename from model/file_info.go
rename to server/model/file_info.go
index 554ad2e588..99d9af8fed 100644
--- a/model/file_info.go
+++ b/server/model/file_info.go
@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/imgutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/imgutils"
 )
 
 const (
diff --git a/model/file_info_list.go b/server/model/file_info_list.go
similarity index 100%
rename from model/file_info_list.go
rename to server/model/file_info_list.go
diff --git a/model/file_info_search_results.go b/server/model/file_info_search_results.go
similarity index 100%
rename from model/file_info_search_results.go
rename to server/model/file_info_search_results.go
diff --git a/model/file_info_test.go b/server/model/file_info_test.go
similarity index 100%
rename from model/file_info_test.go
rename to server/model/file_info_test.go
diff --git a/model/github_release.go b/server/model/github_release.go
similarity index 100%
rename from model/github_release.go
rename to server/model/github_release.go
diff --git a/model/gitlab.go b/server/model/gitlab.go
similarity index 100%
rename from model/gitlab.go
rename to server/model/gitlab.go
diff --git a/model/group.go b/server/model/group.go
similarity index 100%
rename from model/group.go
rename to server/model/group.go
diff --git a/model/group_member.go b/server/model/group_member.go
similarity index 100%
rename from model/group_member.go
rename to server/model/group_member.go
diff --git a/model/group_syncable.go b/server/model/group_syncable.go
similarity index 100%
rename from model/group_syncable.go
rename to server/model/group_syncable.go
diff --git a/model/group_syncable_test.go b/server/model/group_syncable_test.go
similarity index 100%
rename from model/group_syncable_test.go
rename to server/model/group_syncable_test.go
diff --git a/model/guest_invite.go b/server/model/guest_invite.go
similarity index 100%
rename from model/guest_invite.go
rename to server/model/guest_invite.go
diff --git a/model/hosted_customer.go b/server/model/hosted_customer.go
similarity index 100%
rename from model/hosted_customer.go
rename to server/model/hosted_customer.go
diff --git a/model/incoming_webhook.go b/server/model/incoming_webhook.go
similarity index 100%
rename from model/incoming_webhook.go
rename to server/model/incoming_webhook.go
diff --git a/model/incoming_webhook_test.go b/server/model/incoming_webhook_test.go
similarity index 100%
rename from model/incoming_webhook_test.go
rename to server/model/incoming_webhook_test.go
diff --git a/model/initial_load.go b/server/model/initial_load.go
similarity index 100%
rename from model/initial_load.go
rename to server/model/initial_load.go
diff --git a/model/insights.go b/server/model/insights.go
similarity index 100%
rename from model/insights.go
rename to server/model/insights.go
diff --git a/model/insights_test.go b/server/model/insights_test.go
similarity index 100%
rename from model/insights_test.go
rename to server/model/insights_test.go
diff --git a/model/integration_action.go b/server/model/integration_action.go
similarity index 100%
rename from model/integration_action.go
rename to server/model/integration_action.go
diff --git a/model/integration_action_test.go b/server/model/integration_action_test.go
similarity index 100%
rename from model/integration_action_test.go
rename to server/model/integration_action_test.go
diff --git a/model/integrity.go b/server/model/integrity.go
similarity index 100%
rename from model/integrity.go
rename to server/model/integrity.go
diff --git a/model/job.go b/server/model/job.go
similarity index 100%
rename from model/job.go
rename to server/model/job.go
diff --git a/model/job_test.go b/server/model/job_test.go
similarity index 100%
rename from model/job_test.go
rename to server/model/job_test.go
diff --git a/model/ldap.go b/server/model/ldap.go
similarity index 100%
rename from model/ldap.go
rename to server/model/ldap.go
diff --git a/model/license.go b/server/model/license.go
similarity index 100%
rename from model/license.go
rename to server/model/license.go
diff --git a/model/license_key.go b/server/model/license_key.go
similarity index 100%
rename from model/license_key.go
rename to server/model/license_key.go
diff --git a/model/license_key_test_env.go b/server/model/license_key_test_env.go
similarity index 100%
rename from model/license_key_test_env.go
rename to server/model/license_key_test_env.go
diff --git a/model/license_test.go b/server/model/license_test.go
similarity index 100%
rename from model/license_test.go
rename to server/model/license_test.go
diff --git a/model/link_metadata.go b/server/model/link_metadata.go
similarity index 100%
rename from model/link_metadata.go
rename to server/model/link_metadata.go
diff --git a/model/link_metadata_test.go b/server/model/link_metadata_test.go
similarity index 100%
rename from model/link_metadata_test.go
rename to server/model/link_metadata_test.go
diff --git a/model/manifest.go b/server/model/manifest.go
similarity index 100%
rename from model/manifest.go
rename to server/model/manifest.go
diff --git a/model/manifest_test.go b/server/model/manifest_test.go
similarity index 100%
rename from model/manifest_test.go
rename to server/model/manifest_test.go
diff --git a/model/marketplace_plugin.go b/server/model/marketplace_plugin.go
similarity index 100%
rename from model/marketplace_plugin.go
rename to server/model/marketplace_plugin.go
diff --git a/model/member_invite.go b/server/model/member_invite.go
similarity index 100%
rename from model/member_invite.go
rename to server/model/member_invite.go
diff --git a/model/mention_map.go b/server/model/mention_map.go
similarity index 100%
rename from model/mention_map.go
rename to server/model/mention_map.go
diff --git a/model/mention_map_test.go b/server/model/mention_map_test.go
similarity index 100%
rename from model/mention_map_test.go
rename to server/model/mention_map_test.go
diff --git a/model/message_export.go b/server/model/message_export.go
similarity index 100%
rename from model/message_export.go
rename to server/model/message_export.go
diff --git a/model/mfa_secret.go b/server/model/mfa_secret.go
similarity index 100%
rename from model/mfa_secret.go
rename to server/model/mfa_secret.go
diff --git a/model/migration.go b/server/model/migration.go
similarity index 100%
rename from model/migration.go
rename to server/model/migration.go
diff --git a/model/modeltestlib_test.go b/server/model/modeltestlib_test.go
similarity index 100%
rename from model/modeltestlib_test.go
rename to server/model/modeltestlib_test.go
diff --git a/model/notify_admin.go b/server/model/notify_admin.go
similarity index 100%
rename from model/notify_admin.go
rename to server/model/notify_admin.go
diff --git a/model/oauth.go b/server/model/oauth.go
similarity index 100%
rename from model/oauth.go
rename to server/model/oauth.go
diff --git a/model/oauth_test.go b/server/model/oauth_test.go
similarity index 100%
rename from model/oauth_test.go
rename to server/model/oauth_test.go
diff --git a/model/oauthproviders/gitlab/gitlab.go b/server/model/oauthproviders/gitlab/gitlab.go
similarity index 95%
rename from model/oauthproviders/gitlab/gitlab.go
rename to server/model/oauthproviders/gitlab/gitlab.go
index 01b2aee728..8e41124b9d 100644
--- a/model/oauthproviders/gitlab/gitlab.go
+++ b/server/model/oauthproviders/gitlab/gitlab.go
@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type GitLabProvider struct {
diff --git a/model/onboarding.go b/server/model/onboarding.go
similarity index 100%
rename from model/onboarding.go
rename to server/model/onboarding.go
diff --git a/model/outgoing_webhook.go b/server/model/outgoing_webhook.go
similarity index 100%
rename from model/outgoing_webhook.go
rename to server/model/outgoing_webhook.go
diff --git a/model/outgoing_webhook_test.go b/server/model/outgoing_webhook_test.go
similarity index 100%
rename from model/outgoing_webhook_test.go
rename to server/model/outgoing_webhook_test.go
diff --git a/model/permalink.go b/server/model/permalink.go
similarity index 100%
rename from model/permalink.go
rename to server/model/permalink.go
diff --git a/model/permission.go b/server/model/permission.go
similarity index 100%
rename from model/permission.go
rename to server/model/permission.go
diff --git a/model/plugin_cluster_event.go b/server/model/plugin_cluster_event.go
similarity index 100%
rename from model/plugin_cluster_event.go
rename to server/model/plugin_cluster_event.go
diff --git a/model/plugin_constants.go b/server/model/plugin_constants.go
similarity index 100%
rename from model/plugin_constants.go
rename to server/model/plugin_constants.go
diff --git a/model/plugin_event_data.go b/server/model/plugin_event_data.go
similarity index 100%
rename from model/plugin_event_data.go
rename to server/model/plugin_event_data.go
diff --git a/model/plugin_key_value.go b/server/model/plugin_key_value.go
similarity index 100%
rename from model/plugin_key_value.go
rename to server/model/plugin_key_value.go
diff --git a/model/plugin_key_value_test.go b/server/model/plugin_key_value_test.go
similarity index 100%
rename from model/plugin_key_value_test.go
rename to server/model/plugin_key_value_test.go
diff --git a/model/plugin_kvset_options.go b/server/model/plugin_kvset_options.go
similarity index 100%
rename from model/plugin_kvset_options.go
rename to server/model/plugin_kvset_options.go
diff --git a/model/plugin_on_install_event.go b/server/model/plugin_on_install_event.go
similarity index 100%
rename from model/plugin_on_install_event.go
rename to server/model/plugin_on_install_event.go
diff --git a/model/plugin_status.go b/server/model/plugin_status.go
similarity index 100%
rename from model/plugin_status.go
rename to server/model/plugin_status.go
diff --git a/model/plugin_valid.go b/server/model/plugin_valid.go
similarity index 100%
rename from model/plugin_valid.go
rename to server/model/plugin_valid.go
diff --git a/model/plugin_valid_test.go b/server/model/plugin_valid_test.go
similarity index 100%
rename from model/plugin_valid_test.go
rename to server/model/plugin_valid_test.go
diff --git a/model/plugins_response.go b/server/model/plugins_response.go
similarity index 100%
rename from model/plugins_response.go
rename to server/model/plugins_response.go
diff --git a/model/post.go b/server/model/post.go
similarity index 99%
rename from model/post.go
rename to server/model/post.go
index 7447c91214..d047216735 100644
--- a/model/post.go
+++ b/server/model/post.go
@@ -15,7 +15,7 @@ import (
 	"sync"
 	"unicode/utf8"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/markdown"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown"
 )
 
 const (
diff --git a/model/post_acknowledgement.go b/server/model/post_acknowledgement.go
similarity index 100%
rename from model/post_acknowledgement.go
rename to server/model/post_acknowledgement.go
diff --git a/model/post_embed.go b/server/model/post_embed.go
similarity index 100%
rename from model/post_embed.go
rename to server/model/post_embed.go
diff --git a/model/post_info.go b/server/model/post_info.go
similarity index 100%
rename from model/post_info.go
rename to server/model/post_info.go
diff --git a/model/post_list.go b/server/model/post_list.go
similarity index 100%
rename from model/post_list.go
rename to server/model/post_list.go
diff --git a/model/post_list_test.go b/server/model/post_list_test.go
similarity index 100%
rename from model/post_list_test.go
rename to server/model/post_list_test.go
diff --git a/model/post_metadata.go b/server/model/post_metadata.go
similarity index 100%
rename from model/post_metadata.go
rename to server/model/post_metadata.go
diff --git a/model/post_search_results.go b/server/model/post_search_results.go
similarity index 100%
rename from model/post_search_results.go
rename to server/model/post_search_results.go
diff --git a/model/post_test.go b/server/model/post_test.go
similarity index 100%
rename from model/post_test.go
rename to server/model/post_test.go
diff --git a/model/preference.go b/server/model/preference.go
similarity index 100%
rename from model/preference.go
rename to server/model/preference.go
diff --git a/model/preference_test.go b/server/model/preference_test.go
similarity index 100%
rename from model/preference_test.go
rename to server/model/preference_test.go
diff --git a/model/product_notices.go b/server/model/product_notices.go
similarity index 100%
rename from model/product_notices.go
rename to server/model/product_notices.go
diff --git a/model/push_notification.go b/server/model/push_notification.go
similarity index 100%
rename from model/push_notification.go
rename to server/model/push_notification.go
diff --git a/model/push_notification_test.go b/server/model/push_notification_test.go
similarity index 100%
rename from model/push_notification_test.go
rename to server/model/push_notification_test.go
diff --git a/model/push_response.go b/server/model/push_response.go
similarity index 100%
rename from model/push_response.go
rename to server/model/push_response.go
diff --git a/model/push_response_test.go b/server/model/push_response_test.go
similarity index 100%
rename from model/push_response_test.go
rename to server/model/push_response_test.go
diff --git a/model/reaction.go b/server/model/reaction.go
similarity index 100%
rename from model/reaction.go
rename to server/model/reaction.go
diff --git a/model/reaction_test.go b/server/model/reaction_test.go
similarity index 100%
rename from model/reaction_test.go
rename to server/model/reaction_test.go
diff --git a/model/remote_cluster.go b/server/model/remote_cluster.go
similarity index 100%
rename from model/remote_cluster.go
rename to server/model/remote_cluster.go
diff --git a/model/remote_cluster_test.go b/server/model/remote_cluster_test.go
similarity index 100%
rename from model/remote_cluster_test.go
rename to server/model/remote_cluster_test.go
diff --git a/model/role.go b/server/model/role.go
similarity index 100%
rename from model/role.go
rename to server/model/role.go
diff --git a/model/role_test.go b/server/model/role_test.go
similarity index 100%
rename from model/role_test.go
rename to server/model/role_test.go
diff --git a/model/saml.go b/server/model/saml.go
similarity index 100%
rename from model/saml.go
rename to server/model/saml.go
diff --git a/model/scheduled_task.go b/server/model/scheduled_task.go
similarity index 100%
rename from model/scheduled_task.go
rename to server/model/scheduled_task.go
diff --git a/model/scheduled_task_test.go b/server/model/scheduled_task_test.go
similarity index 100%
rename from model/scheduled_task_test.go
rename to server/model/scheduled_task_test.go
diff --git a/model/scheme.go b/server/model/scheme.go
similarity index 100%
rename from model/scheme.go
rename to server/model/scheme.go
diff --git a/model/search_params.go b/server/model/search_params.go
similarity index 100%
rename from model/search_params.go
rename to server/model/search_params.go
diff --git a/model/search_params_test.go b/server/model/search_params_test.go
similarity index 100%
rename from model/search_params_test.go
rename to server/model/search_params_test.go
diff --git a/model/security_bulletin.go b/server/model/security_bulletin.go
similarity index 100%
rename from model/security_bulletin.go
rename to server/model/security_bulletin.go
diff --git a/model/session.go b/server/model/session.go
similarity index 98%
rename from model/session.go
rename to server/model/session.go
index d3f878004c..a41a018bfe 100644
--- a/model/session.go
+++ b/server/model/session.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/model/session_serial_gen.go b/server/model/session_serial_gen.go
similarity index 100%
rename from model/session_serial_gen.go
rename to server/model/session_serial_gen.go
diff --git a/model/session_test.go b/server/model/session_test.go
similarity index 100%
rename from model/session_test.go
rename to server/model/session_test.go
diff --git a/model/shared_channel.go b/server/model/shared_channel.go
similarity index 100%
rename from model/shared_channel.go
rename to server/model/shared_channel.go
diff --git a/model/shared_channel_test.go b/server/model/shared_channel_test.go
similarity index 100%
rename from model/shared_channel_test.go
rename to server/model/shared_channel_test.go
diff --git a/model/slack_attachment.go b/server/model/slack_attachment.go
similarity index 100%
rename from model/slack_attachment.go
rename to server/model/slack_attachment.go
diff --git a/model/slack_attachment_test.go b/server/model/slack_attachment_test.go
similarity index 100%
rename from model/slack_attachment_test.go
rename to server/model/slack_attachment_test.go
diff --git a/model/slack_compatibility.go b/server/model/slack_compatibility.go
similarity index 100%
rename from model/slack_compatibility.go
rename to server/model/slack_compatibility.go
diff --git a/model/slack_compatibility_test.go b/server/model/slack_compatibility_test.go
similarity index 100%
rename from model/slack_compatibility_test.go
rename to server/model/slack_compatibility_test.go
diff --git a/model/status.go b/server/model/status.go
similarity index 100%
rename from model/status.go
rename to server/model/status.go
diff --git a/model/status_test.go b/server/model/status_test.go
similarity index 100%
rename from model/status_test.go
rename to server/model/status_test.go
diff --git a/model/suggest_command.go b/server/model/suggest_command.go
similarity index 100%
rename from model/suggest_command.go
rename to server/model/suggest_command.go
diff --git a/model/switch_request.go b/server/model/switch_request.go
similarity index 100%
rename from model/switch_request.go
rename to server/model/switch_request.go
diff --git a/model/system.go b/server/model/system.go
similarity index 100%
rename from model/system.go
rename to server/model/system.go
diff --git a/model/team.go b/server/model/team.go
similarity index 100%
rename from model/team.go
rename to server/model/team.go
diff --git a/model/team_member.go b/server/model/team_member.go
similarity index 100%
rename from model/team_member.go
rename to server/model/team_member.go
diff --git a/model/team_member_serial_gen.go b/server/model/team_member_serial_gen.go
similarity index 100%
rename from model/team_member_serial_gen.go
rename to server/model/team_member_serial_gen.go
diff --git a/model/team_member_test.go b/server/model/team_member_test.go
similarity index 100%
rename from model/team_member_test.go
rename to server/model/team_member_test.go
diff --git a/model/team_search.go b/server/model/team_search.go
similarity index 100%
rename from model/team_search.go
rename to server/model/team_search.go
diff --git a/model/team_stats.go b/server/model/team_stats.go
similarity index 100%
rename from model/team_stats.go
rename to server/model/team_stats.go
diff --git a/model/team_test.go b/server/model/team_test.go
similarity index 100%
rename from model/team_test.go
rename to server/model/team_test.go
diff --git a/model/terms_of_service.go b/server/model/terms_of_service.go
similarity index 100%
rename from model/terms_of_service.go
rename to server/model/terms_of_service.go
diff --git a/model/terms_of_service_test.go b/server/model/terms_of_service_test.go
similarity index 100%
rename from model/terms_of_service_test.go
rename to server/model/terms_of_service_test.go
diff --git a/model/testdata/markdown-sample-with-rewritten-image-urls.md b/server/model/testdata/markdown-sample-with-rewritten-image-urls.md
similarity index 100%
rename from model/testdata/markdown-sample-with-rewritten-image-urls.md
rename to server/model/testdata/markdown-sample-with-rewritten-image-urls.md
diff --git a/model/testdata/markdown-sample.md b/server/model/testdata/markdown-sample.md
similarity index 100%
rename from model/testdata/markdown-sample.md
rename to server/model/testdata/markdown-sample.md
diff --git a/model/thread.go b/server/model/thread.go
similarity index 100%
rename from model/thread.go
rename to server/model/thread.go
diff --git a/model/token.go b/server/model/token.go
similarity index 100%
rename from model/token.go
rename to server/model/token.go
diff --git a/model/true_up_review_profile.go b/server/model/true_up_review_profile.go
similarity index 100%
rename from model/true_up_review_profile.go
rename to server/model/true_up_review_profile.go
diff --git a/model/typing_request.go b/server/model/typing_request.go
similarity index 100%
rename from model/typing_request.go
rename to server/model/typing_request.go
diff --git a/model/upload_session.go b/server/model/upload_session.go
similarity index 100%
rename from model/upload_session.go
rename to server/model/upload_session.go
diff --git a/model/upload_session_test.go b/server/model/upload_session_test.go
similarity index 100%
rename from model/upload_session_test.go
rename to server/model/upload_session_test.go
diff --git a/model/usage.go b/server/model/usage.go
similarity index 100%
rename from model/usage.go
rename to server/model/usage.go
diff --git a/model/user.go b/server/model/user.go
similarity index 99%
rename from model/user.go
rename to server/model/user.go
index 9466343bc6..5fbbd47d6f 100644
--- a/model/user.go
+++ b/server/model/user.go
@@ -17,8 +17,8 @@ import (
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/text/language"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/timezones"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/timezones"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/model/user_access_token.go b/server/model/user_access_token.go
similarity index 100%
rename from model/user_access_token.go
rename to server/model/user_access_token.go
diff --git a/model/user_access_token_search.go b/server/model/user_access_token_search.go
similarity index 100%
rename from model/user_access_token_search.go
rename to server/model/user_access_token_search.go
diff --git a/model/user_access_token_test.go b/server/model/user_access_token_test.go
similarity index 100%
rename from model/user_access_token_test.go
rename to server/model/user_access_token_test.go
diff --git a/model/user_autocomplete.go b/server/model/user_autocomplete.go
similarity index 100%
rename from model/user_autocomplete.go
rename to server/model/user_autocomplete.go
diff --git a/model/user_count.go b/server/model/user_count.go
similarity index 100%
rename from model/user_count.go
rename to server/model/user_count.go
diff --git a/model/user_get.go b/server/model/user_get.go
similarity index 100%
rename from model/user_get.go
rename to server/model/user_get.go
diff --git a/model/user_search.go b/server/model/user_search.go
similarity index 100%
rename from model/user_search.go
rename to server/model/user_search.go
diff --git a/model/user_serial_gen.go b/server/model/user_serial_gen.go
similarity index 100%
rename from model/user_serial_gen.go
rename to server/model/user_serial_gen.go
diff --git a/model/user_terms_of_service.go b/server/model/user_terms_of_service.go
similarity index 100%
rename from model/user_terms_of_service.go
rename to server/model/user_terms_of_service.go
diff --git a/model/user_terms_of_service_test.go b/server/model/user_terms_of_service_test.go
similarity index 100%
rename from model/user_terms_of_service_test.go
rename to server/model/user_terms_of_service_test.go
diff --git a/model/user_test.go b/server/model/user_test.go
similarity index 100%
rename from model/user_test.go
rename to server/model/user_test.go
diff --git a/model/users_stats.go b/server/model/users_stats.go
similarity index 100%
rename from model/users_stats.go
rename to server/model/users_stats.go
diff --git a/model/utils.go b/server/model/utils.go
similarity index 99%
rename from model/utils.go
rename to server/model/utils.go
index 51ae486a6d..a46bddabae 100644
--- a/model/utils.go
+++ b/server/model/utils.go
@@ -25,7 +25,7 @@ import (
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 )
 
 const (
diff --git a/model/utils_test.go b/server/model/utils_test.go
similarity index 100%
rename from model/utils_test.go
rename to server/model/utils_test.go
diff --git a/model/version.go b/server/model/version.go
similarity index 100%
rename from model/version.go
rename to server/model/version.go
diff --git a/model/version_test.go b/server/model/version_test.go
similarity index 100%
rename from model/version_test.go
rename to server/model/version_test.go
diff --git a/model/websocket_client.go b/server/model/websocket_client.go
similarity index 99%
rename from model/websocket_client.go
rename to server/model/websocket_client.go
index fa1ce5ffc1..58f6d62c58 100644
--- a/model/websocket_client.go
+++ b/server/model/websocket_client.go
@@ -11,7 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/gorilla/websocket"
 	"github.com/vmihailenco/msgpack/v5"
diff --git a/model/websocket_client_test.go b/server/model/websocket_client_test.go
similarity index 100%
rename from model/websocket_client_test.go
rename to server/model/websocket_client_test.go
diff --git a/model/websocket_message.go b/server/model/websocket_message.go
similarity index 100%
rename from model/websocket_message.go
rename to server/model/websocket_message.go
diff --git a/model/websocket_message_test.go b/server/model/websocket_message_test.go
similarity index 100%
rename from model/websocket_message_test.go
rename to server/model/websocket_message_test.go
diff --git a/model/websocket_request.go b/server/model/websocket_request.go
similarity index 94%
rename from model/websocket_request.go
rename to server/model/websocket_request.go
index 5ba72d8367..1abea988cb 100644
--- a/model/websocket_request.go
+++ b/server/model/websocket_request.go
@@ -4,7 +4,7 @@
 package model
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
 
 	"github.com/vmihailenco/msgpack/v5"
 )
diff --git a/model/worktemplate.go b/server/model/worktemplate.go
similarity index 100%
rename from model/worktemplate.go
rename to server/model/worktemplate.go
diff --git a/server/platform/services/awsmeter/awsmeter.go b/server/platform/services/awsmeter/awsmeter.go
index e0034cdfb9..7d506ba183 100644
--- a/server/platform/services/awsmeter/awsmeter.go
+++ b/server/platform/services/awsmeter/awsmeter.go
@@ -17,9 +17,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/marketplacemetering/marketplacemeteringiface"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type AwsMeter struct {
diff --git a/server/platform/services/awsmeter/awsmeter_test.go b/server/platform/services/awsmeter/awsmeter_test.go
index 6fdbce2898..2fbbdc8284 100644
--- a/server/platform/services/awsmeter/awsmeter_test.go
+++ b/server/platform/services/awsmeter/awsmeter_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 type mockMarketplaceMeteringClient struct {
diff --git a/server/platform/services/cache/cache.go b/server/platform/services/cache/cache.go
index 54323b2e97..60d003e93b 100644
--- a/server/platform/services/cache/cache.go
+++ b/server/platform/services/cache/cache.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // ErrKeyNotFound is the error when the given key is not found
diff --git a/server/platform/services/cache/lru.go b/server/platform/services/cache/lru.go
index 08852f02c4..ba7d6f98f2 100644
--- a/server/platform/services/cache/lru.go
+++ b/server/platform/services/cache/lru.go
@@ -11,7 +11,7 @@ import (
 	"github.com/tinylib/msgp/msgp"
 	"github.com/vmihailenco/msgpack/v5"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // LRU is a thread-safe fixed size LRU cache.
diff --git a/server/platform/services/cache/lru_striped.go b/server/platform/services/cache/lru_striped.go
index 5ce231b0c4..aecd89ffa7 100644
--- a/server/platform/services/cache/lru_striped.go
+++ b/server/platform/services/cache/lru_striped.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/cespare/xxhash/v2"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // LRUStriped keeps LRU caches in buckets in order to lower mutex contention.
diff --git a/server/platform/services/cache/lru_striped_bench_test.go b/server/platform/services/cache/lru_striped_bench_test.go
index 42fbc9f35b..8b88accf0b 100644
--- a/server/platform/services/cache/lru_striped_bench_test.go
+++ b/server/platform/services/cache/lru_striped_bench_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/cespare/xxhash/v2"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
 )
 
 const (
diff --git a/server/platform/services/cache/lru_striped_test.go b/server/platform/services/cache/lru_striped_test.go
index fe541c5b52..030b010e55 100644
--- a/server/platform/services/cache/lru_striped_test.go
+++ b/server/platform/services/cache/lru_striped_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func makeLRUPredictableTestData(num int) [][2]string {
diff --git a/server/platform/services/cache/lru_test.go b/server/platform/services/cache/lru_test.go
index 54b3cf814a..ecf03e1446 100644
--- a/server/platform/services/cache/lru_test.go
+++ b/server/platform/services/cache/lru_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestLRU(t *testing.T) {
diff --git a/server/platform/services/cache/mocks/Provider.go b/server/platform/services/cache/mocks/Provider.go
index 0e96ceb618..3fb26fb355 100644
--- a/server/platform/services/cache/mocks/Provider.go
+++ b/server/platform/services/cache/mocks/Provider.go
@@ -5,7 +5,7 @@ package mocks
 import (
 	mock "github.com/stretchr/testify/mock"
 
-	cache "github.com/mattermost/mattermost-server/v6/server/platform/services/cache"
+	cache "github.com/mattermost/mattermost-server/server/v8/platform/services/cache"
 )
 
 // Provider is an autogenerated mock type for the Provider type
diff --git a/server/platform/services/cache/provider.go b/server/platform/services/cache/provider.go
index a55dabf429..586a1265d8 100644
--- a/server/platform/services/cache/provider.go
+++ b/server/platform/services/cache/provider.go
@@ -6,7 +6,7 @@ package cache
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // CacheOptions contains options for initializing a cache
diff --git a/server/platform/services/cache/provider_test.go b/server/platform/services/cache/provider_test.go
index 9f9a4debb1..af5f86cbeb 100644
--- a/server/platform/services/cache/provider_test.go
+++ b/server/platform/services/cache/provider_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestNewCache(t *testing.T) {
diff --git a/server/platform/services/configservice/configservice.go b/server/platform/services/configservice/configservice.go
index 6bf2fb420e..82a4cc106b 100644
--- a/server/platform/services/configservice/configservice.go
+++ b/server/platform/services/configservice/configservice.go
@@ -4,7 +4,7 @@
 package configservice
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // An interface representing something that contains a Config, such as the app.App struct
diff --git a/server/platform/services/docextractor/combine.go b/server/platform/services/docextractor/combine.go
index f77be14938..209e36cbba 100644
--- a/server/platform/services/docextractor/combine.go
+++ b/server/platform/services/docextractor/combine.go
@@ -6,7 +6,7 @@ package docextractor
 import (
 	"io"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type combineExtractor struct {
diff --git a/server/platform/services/docextractor/docextractor_test.go b/server/platform/services/docextractor/docextractor_test.go
index 71cdc1da33..aa17f1fbb8 100644
--- a/server/platform/services/docextractor/docextractor_test.go
+++ b/server/platform/services/docextractor/docextractor_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
 )
 
 func TestExtract(t *testing.T) {
diff --git a/server/platform/services/docextractor/pdf_test.go b/server/platform/services/docextractor/pdf_test.go
index 65ca72603f..b6eea1a410 100644
--- a/server/platform/services/docextractor/pdf_test.go
+++ b/server/platform/services/docextractor/pdf_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
 )
 
 func TestPdfEmptyFile(t *testing.T) {
diff --git a/server/platform/services/httpservice/httpservice.go b/server/platform/services/httpservice/httpservice.go
index 36bfbd0fbc..6572b0f1b9 100644
--- a/server/platform/services/httpservice/httpservice.go
+++ b/server/platform/services/httpservice/httpservice.go
@@ -10,7 +10,7 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/configservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/configservice"
 )
 
 // HTTPService wraps the functionality for making http requests to provide some improvements to the default client
diff --git a/server/platform/services/imageproxy/atmos_camo_test.go b/server/platform/services/imageproxy/atmos_camo_test.go
index 8b5d321b51..aefd882a02 100644
--- a/server/platform/services/imageproxy/atmos_camo_test.go
+++ b/server/platform/services/imageproxy/atmos_camo_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
 )
 
 func makeTestAtmosCamoProxy() *ImageProxy {
diff --git a/server/platform/services/imageproxy/imageproxy.go b/server/platform/services/imageproxy/imageproxy.go
index a2b63229e7..87a7f2a6d4 100644
--- a/server/platform/services/imageproxy/imageproxy.go
+++ b/server/platform/services/imageproxy/imageproxy.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/configservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/configservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var ErrNotEnabled = Error{errors.New("imageproxy.ImageProxy: image proxy not enabled")}
diff --git a/server/platform/services/imageproxy/local.go b/server/platform/services/imageproxy/local.go
index 03e8271b13..4a45079260 100644
--- a/server/platform/services/imageproxy/local.go
+++ b/server/platform/services/imageproxy/local.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var imageContentTypes = []string{
diff --git a/server/platform/services/imageproxy/local_test.go b/server/platform/services/imageproxy/local_test.go
index b7681cdcf9..e97bad1bcd 100644
--- a/server/platform/services/imageproxy/local_test.go
+++ b/server/platform/services/imageproxy/local_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
 )
 
 func makeTestLocalProxy() *ImageProxy {
diff --git a/server/platform/services/marketplace/client.go b/server/platform/services/marketplace/client.go
index 37e6568d30..3003952792 100644
--- a/server/platform/services/marketplace/client.go
+++ b/server/platform/services/marketplace/client.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
 )
 
 // Client is the programmatic interface to the marketplace server API.
diff --git a/server/platform/services/remotecluster/invitation.go b/server/platform/services/remotecluster/invitation.go
index 73cbeb4fa2..3667470038 100644
--- a/server/platform/services/remotecluster/invitation.go
+++ b/server/platform/services/remotecluster/invitation.go
@@ -8,7 +8,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // AcceptInvitation is called when accepting an invitation to connect with a remote cluster.
diff --git a/server/platform/services/remotecluster/mocks_test.go b/server/platform/services/remotecluster/mocks_test.go
index 5e97f60a5d..83896b343b 100644
--- a/server/platform/services/remotecluster/mocks_test.go
+++ b/server/platform/services/remotecluster/mocks_test.go
@@ -6,12 +6,12 @@ package remotecluster
 import (
 	"context"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 type mockServer struct {
diff --git a/server/platform/services/remotecluster/ping.go b/server/platform/services/remotecluster/ping.go
index f12e759faf..18d3f6f196 100644
--- a/server/platform/services/remotecluster/ping.go
+++ b/server/platform/services/remotecluster/ping.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // pingLoop periodically sends a ping to all remote clusters.
diff --git a/server/platform/services/remotecluster/ping_test.go b/server/platform/services/remotecluster/ping_test.go
index 71e953b803..8e60cc98f0 100644
--- a/server/platform/services/remotecluster/ping_test.go
+++ b/server/platform/services/remotecluster/ping_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/platform/services/remotecluster/recv.go b/server/platform/services/remotecluster/recv.go
index 8eb9b95b44..39c30aab84 100644
--- a/server/platform/services/remotecluster/recv.go
+++ b/server/platform/services/remotecluster/recv.go
@@ -6,8 +6,8 @@ package remotecluster
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // ReceiveIncomingMsg is called by the Rest API layer, or websocket layer (future), when a Remote Cluster
diff --git a/server/platform/services/remotecluster/send_test.go b/server/platform/services/remotecluster/send_test.go
index 6d00b6e3c5..489bef0a74 100644
--- a/server/platform/services/remotecluster/send_test.go
+++ b/server/platform/services/remotecluster/send_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/platform/services/remotecluster/sendfile.go b/server/platform/services/remotecluster/sendfile.go
index dcc9c4a0e6..dec27083d7 100644
--- a/server/platform/services/remotecluster/sendfile.go
+++ b/server/platform/services/remotecluster/sendfile.go
@@ -13,9 +13,9 @@ import (
 	"path"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SendFileResultFunc func(us *model.UploadSession, rc *model.RemoteCluster, resp *Response, err error)
diff --git a/server/platform/services/remotecluster/sendmsg.go b/server/platform/services/remotecluster/sendmsg.go
index e4d708ec66..d31f172d28 100644
--- a/server/platform/services/remotecluster/sendmsg.go
+++ b/server/platform/services/remotecluster/sendmsg.go
@@ -17,8 +17,8 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SendMsgResultFunc func(msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response, err error)
diff --git a/server/platform/services/remotecluster/sendprofileImage.go b/server/platform/services/remotecluster/sendprofileImage.go
index 1a8891a9fe..6a852111ea 100644
--- a/server/platform/services/remotecluster/sendprofileImage.go
+++ b/server/platform/services/remotecluster/sendprofileImage.go
@@ -14,8 +14,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type SendProfileImageResultFunc func(userId string, rc *model.RemoteCluster, resp *Response, err error)
diff --git a/server/platform/services/remotecluster/sendprofileImage_test.go b/server/platform/services/remotecluster/sendprofileImage_test.go
index 48e7b3301f..7c09570aac 100644
--- a/server/platform/services/remotecluster/sendprofileImage_test.go
+++ b/server/platform/services/remotecluster/sendprofileImage_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/platform/services/remotecluster/service.go b/server/platform/services/remotecluster/service.go
index 8db28f7f42..ee6fb68ebe 100644
--- a/server/platform/services/remotecluster/service.go
+++ b/server/platform/services/remotecluster/service.go
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/platform/services/remotecluster/service_test.go b/server/platform/services/remotecluster/service_test.go
index 1e9bbd5b63..7b543757cc 100644
--- a/server/platform/services/remotecluster/service_test.go
+++ b/server/platform/services/remotecluster/service_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestService_AddTopicListener(t *testing.T) {
diff --git a/server/platform/services/searchengine/bleveengine/bleve.go b/server/platform/services/searchengine/bleveengine/bleve.go
index d26acd17cc..1b2efc7944 100644
--- a/server/platform/services/searchengine/bleveengine/bleve.go
+++ b/server/platform/services/searchengine/bleveengine/bleve.go
@@ -17,8 +17,8 @@ import (
 	"github.com/blevesearch/bleve/v2/analysis/analyzer/standard"
 	"github.com/blevesearch/bleve/v2/mapping"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/platform/services/searchengine/bleveengine/bleve_test.go b/server/platform/services/searchengine/bleveengine/bleve_test.go
index e33163f567..128db17e48 100644
--- a/server/platform/services/searchengine/bleveengine/bleve_test.go
+++ b/server/platform/services/searchengine/bleveengine/bleve_test.go
@@ -11,13 +11,13 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchlayer"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/testlib"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
 )
 
 type BleveEngineTestSuite struct {
diff --git a/server/platform/services/searchengine/bleveengine/common.go b/server/platform/services/searchengine/bleveengine/common.go
index 7bd1fee7df..fed7992bc8 100644
--- a/server/platform/services/searchengine/bleveengine/common.go
+++ b/server/platform/services/searchengine/bleveengine/common.go
@@ -6,8 +6,8 @@ package bleveengine
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
 )
 
 type BLVChannel struct {
diff --git a/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go b/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go
index 4eefe7b9b0..1dbdfc9a44 100644
--- a/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go
+++ b/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go
@@ -10,10 +10,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/bleveengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go b/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go
index 19f01e49e5..afe96b5283 100644
--- a/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go
+++ b/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/bleveengine"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine"
 )
 
 func TestBleveIndexer(t *testing.T) {
diff --git a/server/platform/services/searchengine/bleveengine/search.go b/server/platform/services/searchengine/bleveengine/search.go
index 069f1c6433..5c993c7fde 100644
--- a/server/platform/services/searchengine/bleveengine/search.go
+++ b/server/platform/services/searchengine/bleveengine/search.go
@@ -10,8 +10,8 @@ import (
 	"github.com/blevesearch/bleve/v2"
 	"github.com/blevesearch/bleve/v2/search/query"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const DeletePostsBatchSize = 500
diff --git a/server/platform/services/searchengine/bleveengine/testlib.go b/server/platform/services/searchengine/bleveengine/testlib.go
index 5c03856bb2..73b98b0d62 100644
--- a/server/platform/services/searchengine/bleveengine/testlib.go
+++ b/server/platform/services/searchengine/bleveengine/testlib.go
@@ -6,7 +6,7 @@ package bleveengine
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func createPost(userId string, channelId string) *model.Post {
diff --git a/server/platform/services/searchengine/interface.go b/server/platform/services/searchengine/interface.go
index ed83a0e5b3..2c2cf3f726 100644
--- a/server/platform/services/searchengine/interface.go
+++ b/server/platform/services/searchengine/interface.go
@@ -6,7 +6,7 @@ package searchengine
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type SearchEngineInterface interface {
diff --git a/server/platform/services/searchengine/mocks/SearchEngineInterface.go b/server/platform/services/searchengine/mocks/SearchEngineInterface.go
index db9ddfcb97..bed0ef16f2 100644
--- a/server/platform/services/searchengine/mocks/SearchEngineInterface.go
+++ b/server/platform/services/searchengine/mocks/SearchEngineInterface.go
@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 
 	time "time"
diff --git a/server/platform/services/searchengine/searchengine.go b/server/platform/services/searchengine/searchengine.go
index 6530b93723..a80defd6f3 100644
--- a/server/platform/services/searchengine/searchengine.go
+++ b/server/platform/services/searchengine/searchengine.go
@@ -4,7 +4,7 @@
 package searchengine
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func NewBroker(cfg *model.Config) *Broker {
diff --git a/server/platform/services/searchengine/searchengine_test.go b/server/platform/services/searchengine/searchengine_test.go
index 00f806f3df..6672b7c575 100644
--- a/server/platform/services/searchengine/searchengine_test.go
+++ b/server/platform/services/searchengine/searchengine_test.go
@@ -6,8 +6,8 @@ package searchengine
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/server/platform/services/searchengine/utils.go b/server/platform/services/searchengine/utils.go
index 71e3c4f3f4..4e19c698e9 100644
--- a/server/platform/services/searchengine/utils.go
+++ b/server/platform/services/searchengine/utils.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
 )
 
 var EmailRegex = regexp.MustCompile(`^[^\s"]+@[^\s"]+$`)
diff --git a/server/platform/services/sharedchannel/attachment.go b/server/platform/services/sharedchannel/attachment.go
index cd922f720e..951a821f8a 100644
--- a/server/platform/services/sharedchannel/attachment.go
+++ b/server/platform/services/sharedchannel/attachment.go
@@ -10,10 +10,10 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // postsToAttachments returns the file attachments for a slice of posts that need to be synchronized.
diff --git a/server/platform/services/sharedchannel/channelinvite.go b/server/platform/services/sharedchannel/channelinvite.go
index 2116da3a66..041434ba4e 100644
--- a/server/platform/services/sharedchannel/channelinvite.go
+++ b/server/platform/services/sharedchannel/channelinvite.go
@@ -9,10 +9,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // channelInviteMsg represents an invitation for a remote cluster to start sharing a channel.
diff --git a/server/platform/services/sharedchannel/channelinvite_test.go b/server/platform/services/sharedchannel/channelinvite_test.go
index aa813d510b..74e55d68e7 100644
--- a/server/platform/services/sharedchannel/channelinvite_test.go
+++ b/server/platform/services/sharedchannel/channelinvite_test.go
@@ -13,10 +13,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestOnReceiveChannelInvite(t *testing.T) {
diff --git a/server/platform/services/sharedchannel/mock_AppIface_test.go b/server/platform/services/sharedchannel/mock_AppIface_test.go
index eddbedf08a..a6f67f82ac 100644
--- a/server/platform/services/sharedchannel/mock_AppIface_test.go
+++ b/server/platform/services/sharedchannel/mock_AppIface_test.go
@@ -5,12 +5,12 @@
 package sharedchannel
 
 import (
-	filestore "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
+	filestore "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
 	mock "github.com/stretchr/testify/mock"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	request "github.com/mattermost/mattermost-server/v6/server/channels/app/request"
+	request "github.com/mattermost/mattermost-server/server/v8/channels/app/request"
 )
 
 // MockAppIface is an autogenerated mock type for the AppIface type
diff --git a/server/platform/services/sharedchannel/mock_ServerIface_test.go b/server/platform/services/sharedchannel/mock_ServerIface_test.go
index 9643eef0a0..214943a098 100644
--- a/server/platform/services/sharedchannel/mock_ServerIface_test.go
+++ b/server/platform/services/sharedchannel/mock_ServerIface_test.go
@@ -5,14 +5,14 @@
 package sharedchannel
 
 import (
-	mlog "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mlog "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 	mock "github.com/stretchr/testify/mock"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	remotecluster "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
+	remotecluster "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
 
-	store "github.com/mattermost/mattermost-server/v6/server/channels/store"
+	store "github.com/mattermost/mattermost-server/server/v8/channels/store"
 )
 
 // MockServerIface is an autogenerated mock type for the ServerIface type
diff --git a/server/platform/services/sharedchannel/msg.go b/server/platform/services/sharedchannel/msg.go
index 90d76d2c7e..a7f3b46665 100644
--- a/server/platform/services/sharedchannel/msg.go
+++ b/server/platform/services/sharedchannel/msg.go
@@ -6,7 +6,7 @@ package sharedchannel
 import (
 	"encoding/json"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // syncMsg represents a change in content (post add/edit/delete, reaction add/remove, users).
diff --git a/server/platform/services/sharedchannel/permalink.go b/server/platform/services/sharedchannel/permalink.go
index b33d70cdf2..5e4cfd5fcd 100644
--- a/server/platform/services/sharedchannel/permalink.go
+++ b/server/platform/services/sharedchannel/permalink.go
@@ -9,9 +9,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var (
diff --git a/server/platform/services/sharedchannel/permalink_test.go b/server/platform/services/sharedchannel/permalink_test.go
index cc3a9687d1..4728d79daf 100644
--- a/server/platform/services/sharedchannel/permalink_test.go
+++ b/server/platform/services/sharedchannel/permalink_test.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestProcessPermalinkToRemote(t *testing.T) {
diff --git a/server/platform/services/sharedchannel/service.go b/server/platform/services/sharedchannel/service.go
index b6da9fe5dc..fdf0c7a9eb 100644
--- a/server/platform/services/sharedchannel/service.go
+++ b/server/platform/services/sharedchannel/service.go
@@ -10,12 +10,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/platform/services/sharedchannel/sync_recv.go b/server/platform/services/sharedchannel/sync_recv.go
index 02ff7b14a3..0f5c493084 100644
--- a/server/platform/services/sharedchannel/sync_recv.go
+++ b/server/platform/services/sharedchannel/sync_recv.go
@@ -11,10 +11,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (scs *Service) onReceiveSyncMessage(msg model.RemoteClusterMsg, rc *model.RemoteCluster, response *remotecluster.Response) error {
diff --git a/server/platform/services/sharedchannel/sync_send.go b/server/platform/services/sharedchannel/sync_send.go
index 213808f509..883a4c73d9 100644
--- a/server/platform/services/sharedchannel/sync_send.go
+++ b/server/platform/services/sharedchannel/sync_send.go
@@ -8,11 +8,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type syncTask struct {
diff --git a/server/platform/services/sharedchannel/sync_send_remote.go b/server/platform/services/sharedchannel/sync_send_remote.go
index 09074a59af..d2886ab572 100644
--- a/server/platform/services/sharedchannel/sync_send_remote.go
+++ b/server/platform/services/sharedchannel/sync_send_remote.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/wiggin77/merror"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type sendSyncMsgResultFunc func(syncResp SyncResponse, err error)
diff --git a/server/platform/services/sharedchannel/util.go b/server/platform/services/sharedchannel/util.go
index b8c0b124ad..e21abd5144 100644
--- a/server/platform/services/sharedchannel/util.go
+++ b/server/platform/services/sharedchannel/util.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // fixMention replaces any mentions in a post for the user with the user's real username.
diff --git a/server/platform/services/slackimport/converters.go b/server/platform/services/slackimport/converters.go
index 9c90e98fad..041759f778 100644
--- a/server/platform/services/slackimport/converters.go
+++ b/server/platform/services/slackimport/converters.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func slackConvertTimeStamp(ts string) int64 {
diff --git a/server/platform/services/slackimport/parsers.go b/server/platform/services/slackimport/parsers.go
index d001c5e8ee..fa3b49bd32 100644
--- a/server/platform/services/slackimport/parsers.go
+++ b/server/platform/services/slackimport/parsers.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func slackParseChannels(data io.Reader, channelType model.ChannelType) ([]slackChannel, error) {
diff --git a/server/platform/services/slackimport/slackimport.go b/server/platform/services/slackimport/slackimport.go
index 3cc7a1f365..bddadb7db6 100644
--- a/server/platform/services/slackimport/slackimport.go
+++ b/server/platform/services/slackimport/slackimport.go
@@ -18,12 +18,12 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type slackChannel struct {
diff --git a/server/platform/services/slackimport/slackimport_test.go b/server/platform/services/slackimport/slackimport_test.go
index c25dcf96da..fd4ef1e4ea 100644
--- a/server/platform/services/slackimport/slackimport_test.go
+++ b/server/platform/services/slackimport/slackimport_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestSlackConvertTimeStamp(t *testing.T) {
diff --git a/server/platform/services/telemetry/mocks/ServerIface.go b/server/platform/services/telemetry/mocks/ServerIface.go
index df271fa334..dcc8dfc19b 100644
--- a/server/platform/services/telemetry/mocks/ServerIface.go
+++ b/server/platform/services/telemetry/mocks/ServerIface.go
@@ -7,14 +7,14 @@ package mocks
 import (
 	context "context"
 
-	httpservice "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
+	httpservice "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
 	mock "github.com/stretchr/testify/mock"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	plugin "github.com/mattermost/mattermost-server/v6/plugin"
+	plugin "github.com/mattermost/mattermost-server/server/v8/plugin"
 
-	product "github.com/mattermost/mattermost-server/v6/server/channels/product"
+	product "github.com/mattermost/mattermost-server/server/v8/channels/product"
 )
 
 // ServerIface is an autogenerated mock type for the ServerIface type
diff --git a/server/platform/services/telemetry/telemetry.go b/server/platform/services/telemetry/telemetry.go
index a214911f20..7f33181bd3 100644
--- a/server/platform/services/telemetry/telemetry.go
+++ b/server/platform/services/telemetry/telemetry.go
@@ -14,15 +14,15 @@ import (
 
 	rudder "github.com/rudderlabs/analytics-go"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/marketplace"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/marketplace"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const (
diff --git a/server/platform/services/telemetry/telemetry_test.go b/server/platform/services/telemetry/telemetry_test.go
index f869c9fe48..dce4935d39 100644
--- a/server/platform/services/telemetry/telemetry_test.go
+++ b/server/platform/services/telemetry/telemetry_test.go
@@ -21,16 +21,16 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	storeMocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	storeMocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest"
 )
 
 type FakeConfigService struct {
diff --git a/server/platform/services/tracing/tracing.go b/server/platform/services/tracing/tracing.go
index dd0563e231..f65c5d43f5 100644
--- a/server/platform/services/tracing/tracing.go
+++ b/server/platform/services/tracing/tracing.go
@@ -14,7 +14,7 @@ import (
 	"github.com/uber/jaeger-client-go/zipkin"
 	"github.com/uber/jaeger-lib/metrics"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // Tracer is a wrapper around Jaeger OpenTracing client, used to properly de-initialize jaeger on exit
diff --git a/server/platform/services/upgrader/upgrader_linux.go b/server/platform/services/upgrader/upgrader_linux.go
index db4f726722..df51c6321c 100644
--- a/server/platform/services/upgrader/upgrader_linux.go
+++ b/server/platform/services/upgrader/upgrader_linux.go
@@ -24,8 +24,8 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/openpgp" //nolint:staticcheck
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 //go:embed pubkey.gpg
diff --git a/server/platform/services/upgrader/upgrader_linux_test.go b/server/platform/services/upgrader/upgrader_linux_test.go
index 73853b3281..49b5d48365 100644
--- a/server/platform/services/upgrader/upgrader_linux_test.go
+++ b/server/platform/services/upgrader/upgrader_linux_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCanIUpgradeToE0(t *testing.T) {
diff --git a/server/platform/shared/driver/conn.go b/server/platform/shared/driver/conn.go
index 6acf8e8762..2a567c19db 100644
--- a/server/platform/shared/driver/conn.go
+++ b/server/platform/shared/driver/conn.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"database/sql/driver"
 
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // Conn is a DB driver conn implementation
diff --git a/server/platform/shared/driver/driver.go b/server/platform/shared/driver/driver.go
index 2f6f6c3b7a..a76903ba22 100644
--- a/server/platform/shared/driver/driver.go
+++ b/server/platform/shared/driver/driver.go
@@ -12,7 +12,7 @@ import (
 	"context"
 	"database/sql/driver"
 
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 var (
diff --git a/server/platform/shared/driver/objects.go b/server/platform/shared/driver/objects.go
index ff28cb2ed5..c07c8f7ad6 100644
--- a/server/platform/shared/driver/objects.go
+++ b/server/platform/shared/driver/objects.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"database/sql/driver"
 
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 type wrapperTx struct {
diff --git a/server/platform/shared/filestore/filesstore_test.go b/server/platform/shared/filestore/filesstore_test.go
index b14bdb8e03..0c2358e1bf 100644
--- a/server/platform/shared/filestore/filesstore_test.go
+++ b/server/platform/shared/filestore/filesstore_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"github.com/xtgo/uuid"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func randomString() string {
diff --git a/server/platform/shared/filestore/localstore.go b/server/platform/shared/filestore/localstore.go
index 68ea9ad66e..7c607bdab3 100644
--- a/server/platform/shared/filestore/localstore.go
+++ b/server/platform/shared/filestore/localstore.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/platform/shared/filestore/mocks/FileBackend.go b/server/platform/shared/filestore/mocks/FileBackend.go
index aecaee75fc..a12156a569 100644
--- a/server/platform/shared/filestore/mocks/FileBackend.go
+++ b/server/platform/shared/filestore/mocks/FileBackend.go
@@ -7,7 +7,7 @@ package mocks
 import (
 	io "io"
 
-	filestore "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
+	filestore "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
 
 	mock "github.com/stretchr/testify/mock"
 
diff --git a/server/platform/shared/filestore/s3store.go b/server/platform/shared/filestore/s3store.go
index 4986f28ce8..9d2eacfffa 100644
--- a/server/platform/shared/filestore/s3store.go
+++ b/server/platform/shared/filestore/s3store.go
@@ -19,7 +19,7 @@ import (
 	"github.com/minio/minio-go/v7/pkg/encrypt"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 // S3FileBackend contains all necessary information to communicate with
diff --git a/server/platform/shared/i18n/i18n.go b/server/platform/shared/i18n/i18n.go
index 00cdc1a704..605f0a13d4 100644
--- a/server/platform/shared/i18n/i18n.go
+++ b/server/platform/shared/i18n/i18n.go
@@ -15,7 +15,7 @@ import (
 	"github.com/mattermost/go-i18n/i18n"
 	"github.com/mattermost/go-i18n/i18n/bundle"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const defaultLocale = "en"
diff --git a/server/platform/shared/mail/mail.go b/server/platform/shared/mail/mail.go
index 2b8e97aea3..02944684e4 100644
--- a/server/platform/shared/mail/mail.go
+++ b/server/platform/shared/mail/mail.go
@@ -18,8 +18,8 @@ import (
 	"github.com/pkg/errors"
 	gomail "gopkg.in/mail.v2"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/server/platform/shared/mfa/mfa_test.go b/server/platform/shared/mfa/mfa_test.go
index bb820cfda4..e90c370569 100644
--- a/server/platform/shared/mfa/mfa_test.go
+++ b/server/platform/shared/mfa/mfa_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 func TestGenerateSecret(t *testing.T) {
diff --git a/server/platform/shared/mlog/global_test.go b/server/platform/shared/mlog/global_test.go
index 2383478aa6..8c661d7e77 100644
--- a/server/platform/shared/mlog/global_test.go
+++ b/server/platform/shared/mlog/global_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestLoggingBeforeInitialized(t *testing.T) {
diff --git a/server/platform/shared/templates/templates.go b/server/platform/shared/templates/templates.go
index 4bb8840f48..392c3f3dc4 100644
--- a/server/platform/shared/templates/templates.go
+++ b/server/platform/shared/templates/templates.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/fsnotify/fsnotify"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
 )
 
 // Container represents a set of templates that can be render
diff --git a/server/playbooks/client/client.go b/server/playbooks/client/client.go
index b9c0ed970d..e095c13323 100644
--- a/server/playbooks/client/client.go
+++ b/server/playbooks/client/client.go
@@ -16,7 +16,7 @@ import (
 	"strconv"
 
 	"github.com/google/go-querystring/query"
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 )
diff --git a/server/playbooks/client/doc_test.go b/server/playbooks/client/doc_test.go
index 059fcc1dc2..ab876bbebd 100644
--- a/server/playbooks/client/doc_test.go
+++ b/server/playbooks/client/doc_test.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 )
 
 func Example() {
diff --git a/server/playbooks/client/playbook_runs_test.go b/server/playbooks/client/playbook_runs_test.go
index 125b2fdef4..8f3489c866 100644
--- a/server/playbooks/client/playbook_runs_test.go
+++ b/server/playbooks/client/playbook_runs_test.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 )
 
 func ExamplePlaybookRunService_Get() {
diff --git a/server/playbooks/client/playbooks_test.go b/server/playbooks/client/playbooks_test.go
index 4b39f44dae..863b2ff652 100644
--- a/server/playbooks/client/playbooks_test.go
+++ b/server/playbooks/client/playbooks_test.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 )
 
 func ExamplePlaybooksService_Get() {
diff --git a/server/playbooks/product/api_adapter.go b/server/playbooks/product/api_adapter.go
index 7f073f3958..7a91df438e 100644
--- a/server/playbooks/product/api_adapter.go
+++ b/server/playbooks/product/api_adapter.go
@@ -14,12 +14,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 )
 
 // normalizeAppError returns a truly nil error if appErr is nil
diff --git a/server/playbooks/product/imports/playbooks_imports.go b/server/playbooks/product/imports/playbooks_imports.go
index a8c3935ec1..4e8a5aeaa5 100644
--- a/server/playbooks/product/imports/playbooks_imports.go
+++ b/server/playbooks/product/imports/playbooks_imports.go
@@ -6,5 +6,5 @@ package imports
 import (
 	// Needed to ensure the init() method in the Playbooks product is run.
 	// This file is copied to the mmserver imports package via makefile.
-	_ "github.com/mattermost/mattermost-server/v6/server/playbooks/product"
+	_ "github.com/mattermost/mattermost-server/server/v8/playbooks/product"
 )
diff --git a/server/playbooks/product/logrus.go b/server/playbooks/product/logrus.go
index a6b23d94e3..0090d979c2 100644
--- a/server/playbooks/product/logrus.go
+++ b/server/playbooks/product/logrus.go
@@ -8,7 +8,7 @@ import (
 	"io"
 
 	"github.com/mattermost/logr/v2"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/server/playbooks/product/playbooks_product.go b/server/playbooks/product/playbooks_product.go
index 9769c2d470..96ee88333a 100644
--- a/server/playbooks/product/playbooks_product.go
+++ b/server/playbooks/product/playbooks_product.go
@@ -10,23 +10,23 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	mmapp "github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/product"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/product/pluginapi/cluster"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/api"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/command"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/enterprise"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/metrics"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/scheduler"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/telemetry"
+	mmapp "github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi/cluster"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/api"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/command"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/enterprise"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/metrics"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/scheduler"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/telemetry"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/product/pluginapi/cluster/job.go b/server/playbooks/product/pluginapi/cluster/job.go
index bb71d34779..96c8385a79 100644
--- a/server/playbooks/product/pluginapi/cluster/job.go
+++ b/server/playbooks/product/pluginapi/cluster/job.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/product/pluginapi/cluster/job_once.go b/server/playbooks/product/pluginapi/cluster/job_once.go
index 855a412006..2599962546 100644
--- a/server/playbooks/product/pluginapi/cluster/job_once.go
+++ b/server/playbooks/product/pluginapi/cluster/job_once.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/product/pluginapi/cluster/mutex.go b/server/playbooks/product/pluginapi/cluster/mutex.go
index a32e299ebe..1f95ff3d4e 100644
--- a/server/playbooks/product/pluginapi/cluster/mutex.go
+++ b/server/playbooks/product/pluginapi/cluster/mutex.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/product/pluginapi/license.go b/server/playbooks/product/pluginapi/license.go
index d12a0fecfb..cac67f4da3 100644
--- a/server/playbooks/product/pluginapi/license.go
+++ b/server/playbooks/product/pluginapi/license.go
@@ -4,7 +4,7 @@
 package pluginapi
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/playbooks/server/api/actions.go b/server/playbooks/server/api/actions.go
index b35aa90cc4..6047ecff62 100644
--- a/server/playbooks/server/api/actions.go
+++ b/server/playbooks/server/api/actions.go
@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 	"github.com/pkg/errors"
 
 	"github.com/gorilla/mux"
diff --git a/server/playbooks/server/api/api.go b/server/playbooks/server/api/api.go
index 7c348c21dc..dc36fd606d 100644
--- a/server/playbooks/server/api/api.go
+++ b/server/playbooks/server/api/api.go
@@ -10,7 +10,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
 )
 
 // MaxRequestSize is the size limit for any incoming request
diff --git a/server/playbooks/server/api/bot.go b/server/playbooks/server/api/bot.go
index 331fcd960a..8bc80a9ec2 100644
--- a/server/playbooks/server/api/bot.go
+++ b/server/playbooks/server/api/bot.go
@@ -13,11 +13,11 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 )
 
 type BotHandler struct {
diff --git a/server/playbooks/server/api/categories.go b/server/playbooks/server/api/categories.go
index 8bfef8cfc8..cb2a205c62 100644
--- a/server/playbooks/server/api/categories.go
+++ b/server/playbooks/server/api/categories.go
@@ -9,9 +9,9 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/api/graphql.go b/server/playbooks/server/api/graphql.go
index 6507532948..d12211bdd0 100644
--- a/server/playbooks/server/api/graphql.go
+++ b/server/playbooks/server/api/graphql.go
@@ -12,9 +12,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/graph-gophers/dataloader/v7"
 	graphql "github.com/graph-gophers/graphql-go"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/server/api/graphql_loader_favorite.go b/server/playbooks/server/api/graphql_loader_favorite.go
index 15aaf88c56..325513f521 100644
--- a/server/playbooks/server/api/graphql_loader_favorite.go
+++ b/server/playbooks/server/api/graphql_loader_favorite.go
@@ -7,7 +7,7 @@ import (
 	"context"
 
 	"github.com/graph-gophers/dataloader/v7"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 )
 
 type favoriteInfo struct {
diff --git a/server/playbooks/server/api/graphql_loader_playbook.go b/server/playbooks/server/api/graphql_loader_playbook.go
index 934ec04cd2..95032810c9 100644
--- a/server/playbooks/server/api/graphql_loader_playbook.go
+++ b/server/playbooks/server/api/graphql_loader_playbook.go
@@ -7,7 +7,7 @@ import (
 	"context"
 
 	"github.com/graph-gophers/dataloader/v7"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 )
 
 type playbookInfo struct {
diff --git a/server/playbooks/server/api/graphql_playbook.go b/server/playbooks/server/api/graphql_playbook.go
index 40c0251ebc..128dbb5162 100644
--- a/server/playbooks/server/api/graphql_playbook.go
+++ b/server/playbooks/server/api/graphql_playbook.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/server/playbooks/server/api/graphql_root_playbook.go b/server/playbooks/server/api/graphql_root_playbook.go
index 987ead79fa..7933bde0f3 100644
--- a/server/playbooks/server/api/graphql_root_playbook.go
+++ b/server/playbooks/server/api/graphql_root_playbook.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 	"gopkg.in/guregu/null.v4"
 )
diff --git a/server/playbooks/server/api/graphql_root_run.go b/server/playbooks/server/api/graphql_root_run.go
index 9699cd2b82..a8c9274511 100644
--- a/server/playbooks/server/api/graphql_root_run.go
+++ b/server/playbooks/server/api/graphql_root_run.go
@@ -6,9 +6,9 @@ package api
 import (
 	"context"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/api/graphql_run.go b/server/playbooks/server/api/graphql_run.go
index 0bc6ddc70d..9f8e235635 100644
--- a/server/playbooks/server/api/graphql_run.go
+++ b/server/playbooks/server/api/graphql_run.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/api/logger.go b/server/playbooks/server/api/logger.go
index 759368f449..bdccd4958a 100644
--- a/server/playbooks/server/api/logger.go
+++ b/server/playbooks/server/api/logger.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/server/playbooks/server/api/playbook_runs.go b/server/playbooks/server/api/playbook_runs.go
index b78086f2e0..bd688c76ac 100644
--- a/server/playbooks/server/api/playbook_runs.go
+++ b/server/playbooks/server/api/playbook_runs.go
@@ -14,14 +14,14 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 )
 
 // PlaybookRunHandler is the API handler.
diff --git a/server/playbooks/server/api/playbooks.go b/server/playbooks/server/api/playbooks.go
index 2806a0f96d..af9f60a459 100644
--- a/server/playbooks/server/api/playbooks.go
+++ b/server/playbooks/server/api/playbooks.go
@@ -13,11 +13,11 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/timeutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/timeutils"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/server/api/settings.go b/server/playbooks/server/api/settings.go
index 242f8f4245..a9a33f389b 100644
--- a/server/playbooks/server/api/settings.go
+++ b/server/playbooks/server/api/settings.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 )
 
 // SettingsHandler is the API handler.
diff --git a/server/playbooks/server/api/signal.go b/server/playbooks/server/api/signal.go
index 94c9cf8a8f..f78a090e2e 100644
--- a/server/playbooks/server/api/signal.go
+++ b/server/playbooks/server/api/signal.go
@@ -9,9 +9,9 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/server/api/stats.go b/server/playbooks/server/api/stats.go
index 05c666db3d..8c0c6acc07 100644
--- a/server/playbooks/server/api/stats.go
+++ b/server/playbooks/server/api/stats.go
@@ -8,13 +8,13 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/api/telemetry.go b/server/playbooks/server/api/telemetry.go
index da7921c216..c7e28db181 100644
--- a/server/playbooks/server/api/telemetry.go
+++ b/server/playbooks/server/api/telemetry.go
@@ -10,9 +10,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 )
 
 // TelemetryHandler is the API handler.
diff --git a/server/playbooks/server/api/urls.go b/server/playbooks/server/api/urls.go
index fdc0af5031..ae4ccce881 100644
--- a/server/playbooks/server/api/urls.go
+++ b/server/playbooks/server/api/urls.go
@@ -8,8 +8,8 @@ import (
 	"net/url"
 	"path"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/server/api_actions_test.go b/server/playbooks/server/api_actions_test.go
index 26ba51d31b..b7a4cae7c5 100644
--- a/server/playbooks/server/api_actions_test.go
+++ b/server/playbooks/server/api_actions_test.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 	"github.com/mitchellh/mapstructure"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/server/playbooks/server/api_bot_test.go b/server/playbooks/server/api_bot_test.go
index 4ab0bd0196..f14eb984ac 100644
--- a/server/playbooks/server/api_bot_test.go
+++ b/server/playbooks/server/api_bot_test.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/server/playbooks/server/api_graphql_playbooks_test.go b/server/playbooks/server/api_graphql_playbooks_test.go
index bcb78c08a3..b44332aae6 100644
--- a/server/playbooks/server/api_graphql_playbooks_test.go
+++ b/server/playbooks/server/api_graphql_playbooks_test.go
@@ -12,9 +12,9 @@ import (
 	"testing"
 
 	"github.com/graph-gophers/graphql-go"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/api"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/api"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/server/playbooks/server/api_graphql_runs_test.go b/server/playbooks/server/api_graphql_runs_test.go
index 7a97b3be53..5b84ed47a4 100644
--- a/server/playbooks/server/api_graphql_runs_test.go
+++ b/server/playbooks/server/api_graphql_runs_test.go
@@ -11,10 +11,10 @@ import (
 	"testing"
 
 	"github.com/graph-gophers/graphql-go"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/playbooks/server/api_playbooks_test.go b/server/playbooks/server/api_playbooks_test.go
index d1c9e8ebed..1f20c10843 100644
--- a/server/playbooks/server/api_playbooks_test.go
+++ b/server/playbooks/server/api_playbooks_test.go
@@ -13,9 +13,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/server/playbooks/server/api_runs_test.go b/server/playbooks/server/api_runs_test.go
index 2cac09e2b3..1c2a277a14 100644
--- a/server/playbooks/server/api_runs_test.go
+++ b/server/playbooks/server/api_runs_test.go
@@ -11,9 +11,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/playbooks/server/api_settings_test.go b/server/playbooks/server/api_settings_test.go
index 4ef06b42c4..6c2db58a51 100644
--- a/server/playbooks/server/api_settings_test.go
+++ b/server/playbooks/server/api_settings_test.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/playbooks/server/api_stats_test.go b/server/playbooks/server/api_stats_test.go
index a005ca7212..ca575b9245 100644
--- a/server/playbooks/server/api_stats_test.go
+++ b/server/playbooks/server/api_stats_test.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v4"
diff --git a/server/playbooks/server/app/action.go b/server/playbooks/server/app/action.go
index d3b3881a25..ed62a71c41 100644
--- a/server/playbooks/server/app/action.go
+++ b/server/playbooks/server/app/action.go
@@ -3,7 +3,7 @@
 
 package app
 
-import "github.com/mattermost/mattermost-server/v6/model"
+import "github.com/mattermost/mattermost-server/server/v8/model"
 
 type GenericChannelActionWithoutPayload struct {
 	ID          string      `json:"id"`
diff --git a/server/playbooks/server/app/actions_service.go b/server/playbooks/server/app/actions_service.go
index d00e298d9b..56fb1b16f1 100644
--- a/server/playbooks/server/app/actions_service.go
+++ b/server/playbooks/server/app/actions_service.go
@@ -9,10 +9,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/server/playbooks/server/app/category_service.go b/server/playbooks/server/app/category_service.go
index bc9cb2e363..f213a760e2 100644
--- a/server/playbooks/server/app/category_service.go
+++ b/server/playbooks/server/app/category_service.go
@@ -6,8 +6,8 @@ package app
 import (
 	"database/sql"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/app/mocks/mock_job_once_scheduler.go b/server/playbooks/server/app/mocks/mock_job_once_scheduler.go
index fdfdc2184b..9ae41d0ba1 100644
--- a/server/playbooks/server/app/mocks/mock_job_once_scheduler.go
+++ b/server/playbooks/server/app/mocks/mock_job_once_scheduler.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/app (interfaces: JobOnceScheduler)
+// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/app (interfaces: JobOnceScheduler)
 
 // Package mock_app is a generated GoMock package.
 package mock_app
@@ -12,7 +12,7 @@ import (
 	time "time"
 
 	gomock "github.com/golang/mock/gomock"
-	cluster "github.com/mattermost/mattermost-server/v6/server/playbooks/product/pluginapi/cluster"
+	cluster "github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi/cluster"
 )
 
 // MockJobOnceScheduler is a mock of JobOnceScheduler interface.
diff --git a/server/playbooks/server/app/permissions_service.go b/server/playbooks/server/app/permissions_service.go
index cff8806fba..9a663cb91f 100644
--- a/server/playbooks/server/app/permissions_service.go
+++ b/server/playbooks/server/app/permissions_service.go
@@ -7,9 +7,9 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/server/app/playbook.go b/server/playbooks/server/app/playbook.go
index b0bb91f3e5..086be5a5a7 100644
--- a/server/playbooks/server/app/playbook.go
+++ b/server/playbooks/server/app/playbook.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/pkg/errors"
diff --git a/server/playbooks/server/app/playbook_run.go b/server/playbooks/server/app/playbook_run.go
index 24efefd839..276a54cc1f 100644
--- a/server/playbooks/server/app/playbook_run.go
+++ b/server/playbooks/server/app/playbook_run.go
@@ -10,10 +10,10 @@ import (
 
 	"gopkg.in/guregu/null.v4"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/product/pluginapi/cluster"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi/cluster"
 )
 
 const (
diff --git a/server/playbooks/server/app/playbook_run_service.go b/server/playbooks/server/app/playbook_run_service.go
index f4ac2506ff..6a736df24c 100644
--- a/server/playbooks/server/app/playbook_run_service.go
+++ b/server/playbooks/server/app/playbook_run_service.go
@@ -16,14 +16,14 @@ import (
 	"github.com/sirupsen/logrus"
 	stripmd "github.com/writeas/go-strip-markdown"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/httptools"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/metrics"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/timeutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/httptools"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/metrics"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/timeutils"
 )
 
 const checklistItemDescriptionCharLimit = 4000
diff --git a/server/playbooks/server/app/playbook_run_test.go b/server/playbooks/server/app/playbook_run_test.go
index 277f00b2c1..160dec7cc0 100644
--- a/server/playbooks/server/app/playbook_run_test.go
+++ b/server/playbooks/server/app/playbook_run_test.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/server/playbooks/server/app/playbook_service.go b/server/playbooks/server/app/playbook_service.go
index a870204987..a4cce88812 100644
--- a/server/playbooks/server/app/playbook_service.go
+++ b/server/playbooks/server/app/playbook_service.go
@@ -4,13 +4,13 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/metrics"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/metrics"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 )
 
 const (
diff --git a/server/playbooks/server/app/plugin_api_tools.go b/server/playbooks/server/app/plugin_api_tools.go
index 59e3589fcd..1910d9fe59 100644
--- a/server/playbooks/server/app/plugin_api_tools.go
+++ b/server/playbooks/server/app/plugin_api_tools.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/app/reminder.go b/server/playbooks/server/app/reminder.go
index b6120e2367..9436c055ae 100644
--- a/server/playbooks/server/app/reminder.go
+++ b/server/playbooks/server/app/reminder.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/server/app/task_actions.go b/server/playbooks/server/app/task_actions.go
index bc2d1e4bf2..8eba78404a 100644
--- a/server/playbooks/server/app/task_actions.go
+++ b/server/playbooks/server/app/task_actions.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/server/app/task_actions_test.go b/server/playbooks/server/app/task_actions_test.go
index 29c7a4bef4..e19479daf9 100644
--- a/server/playbooks/server/app/task_actions_test.go
+++ b/server/playbooks/server/app/task_actions_test.go
@@ -6,7 +6,7 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/server/playbooks/server/bot/bot.go b/server/playbooks/server/bot/bot.go
index 52be192cf1..b35912a253 100644
--- a/server/playbooks/server/bot/bot.go
+++ b/server/playbooks/server/bot/bot.go
@@ -4,9 +4,9 @@
 package bot
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 )
 
 // Bot stores the information for the plugin configuration, and implements the Poster interfaces.
diff --git a/server/playbooks/server/bot/mocks/mock_poster.go b/server/playbooks/server/bot/mocks/mock_poster.go
index f8e4aeb10b..a6c78d9a04 100644
--- a/server/playbooks/server/bot/mocks/mock_poster.go
+++ b/server/playbooks/server/bot/mocks/mock_poster.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot (interfaces: Poster)
+// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot (interfaces: Poster)
 
 // Package mock_bot is a generated GoMock package.
 package mock_bot
@@ -11,7 +11,7 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // MockPoster is a mock of Poster interface.
diff --git a/server/playbooks/server/bot/poster.go b/server/playbooks/server/bot/poster.go
index 17c1e545b6..a720dec395 100644
--- a/server/playbooks/server/bot/poster.go
+++ b/server/playbooks/server/bot/poster.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/server/command/command.go b/server/playbooks/server/command/command.go
index 782824de87..6188588b8a 100644
--- a/server/playbooks/server/command/command.go
+++ b/server/playbooks/server/command/command.go
@@ -10,13 +10,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/timeutils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/config"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/timeutils"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/server/config/service.go b/server/playbooks/server/config/service.go
index bb5ec8bc97..320b450427 100644
--- a/server/playbooks/server/config/service.go
+++ b/server/playbooks/server/config/service.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 )
 
 // const npsPluginID = "com.mattermost.nps"
diff --git a/server/playbooks/server/enterprise/license.go b/server/playbooks/server/enterprise/license.go
index 54c9af0a9e..4a83c4419c 100644
--- a/server/playbooks/server/enterprise/license.go
+++ b/server/playbooks/server/enterprise/license.go
@@ -4,8 +4,8 @@
 package enterprise
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/product/pluginapi"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 )
 
 type LicenseChecker struct {
diff --git a/server/playbooks/server/httptools/client.go b/server/playbooks/server/httptools/client.go
index e55ee47a5b..0ffde23be6 100644
--- a/server/playbooks/server/httptools/client.go
+++ b/server/playbooks/server/httptools/client.go
@@ -10,8 +10,8 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 )
 
 func MakeClient(api playbooks.ServicesAPI) *http.Client {
diff --git a/server/playbooks/server/main_test.go b/server/playbooks/server/main_test.go
index 3392c2cb1e..d08e028bb3 100644
--- a/server/playbooks/server/main_test.go
+++ b/server/playbooks/server/main_test.go
@@ -8,37 +8,26 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/api4"
-	sapp "github.com/mattermost/mattermost-server/v6/server/channels/app"
-	"github.com/mattermost/mattermost-server/v6/server/channels/app/request"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/config"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/client"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/api4"
+	sapp "github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/client"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v4"
 
-	_ "github.com/mattermost/mattermost-server/v6/server/playbooks/product"
+	_ "github.com/mattermost/mattermost-server/server/v8/playbooks/product"
 )
 
 func TestMain(m *testing.M) {
-	serverpathBytes, err := exec.Command("go", "list", "-f", "'{{.Dir}}'", "-m", "github.com/mattermost/mattermost-server/v6").Output()
-	if err != nil {
-		panic(err)
-	}
-	serverpath := string(serverpathBytes)
-	serverpath = strings.Trim(strings.TrimSpace(serverpath), "'")
-	os.Setenv("MM_SERVER_PATH", filepath.Join(serverpath, "server"))
-
 	// This actually runs the tests
 	status := m.Run()
 
diff --git a/server/playbooks/server/playbooks/service_api.go b/server/playbooks/server/playbooks/service_api.go
index c17cae4aa3..e148581fdc 100644
--- a/server/playbooks/server/playbooks/service_api.go
+++ b/server/playbooks/server/playbooks/service_api.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/gorilla/mux"
 
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (
diff --git a/server/playbooks/server/sqlstore/actions.go b/server/playbooks/server/sqlstore/actions.go
index 09b7743463..93d6589f3e 100644
--- a/server/playbooks/server/sqlstore/actions.go
+++ b/server/playbooks/server/sqlstore/actions.go
@@ -11,8 +11,8 @@ import (
 	sq "github.com/Masterminds/squirrel"
 	"github.com/go-sql-driver/mysql"
 	"github.com/lib/pq"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/sqlstore/actions_test.go b/server/playbooks/server/sqlstore/actions_test.go
index 65b9f0b34c..92db488041 100644
--- a/server/playbooks/server/sqlstore/actions_test.go
+++ b/server/playbooks/server/sqlstore/actions_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	mock_sqlstore "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks"
 )
 
 func setupChannelActionStore(t *testing.T, db *sqlx.DB) app.ChannelActionStore {
diff --git a/server/playbooks/server/sqlstore/category.go b/server/playbooks/server/sqlstore/category.go
index 955cc4fecf..4e8eab5742 100644
--- a/server/playbooks/server/sqlstore/category.go
+++ b/server/playbooks/server/sqlstore/category.go
@@ -7,8 +7,8 @@ import (
 	"database/sql"
 
 	sq "github.com/Masterminds/squirrel"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/sqlstore/category_test.go b/server/playbooks/server/sqlstore/category_test.go
index 6fed27c0d3..0e271ea9d5 100644
--- a/server/playbooks/server/sqlstore/category_test.go
+++ b/server/playbooks/server/sqlstore/category_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	mock_sqlstore "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks"
 )
 
 func setupCategoryStore(t *testing.T, db *sqlx.DB) app.CategoryStore {
diff --git a/server/playbooks/server/sqlstore/migrate.go b/server/playbooks/server/sqlstore/migrate.go
index 8de5710f80..b4b08e0cf0 100644
--- a/server/playbooks/server/sqlstore/migrate.go
+++ b/server/playbooks/server/sqlstore/migrate.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/blang/semver"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/mattermost/morph"
 	"github.com/mattermost/morph/drivers"
 	"github.com/mattermost/morph/sources"
diff --git a/server/playbooks/server/sqlstore/migrations.go b/server/playbooks/server/sqlstore/migrations.go
index 1c2f4f8f6e..d965c46743 100644
--- a/server/playbooks/server/sqlstore/migrations.go
+++ b/server/playbooks/server/sqlstore/migrations.go
@@ -13,8 +13,8 @@ import (
 	"github.com/blang/semver"
 	"github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/server/playbooks/server/sqlstore/migrations_test.go b/server/playbooks/server/sqlstore/migrations_test.go
index 04fdca9be6..913e6e8632 100644
--- a/server/playbooks/server/sqlstore/migrations_test.go
+++ b/server/playbooks/server/sqlstore/migrations_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/mattermost/morph"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type MigrationMapping struct {
diff --git a/server/playbooks/server/sqlstore/migrations_utils.go b/server/playbooks/server/sqlstore/migrations_utils.go
index 9f5c43f15c..61ae236ffa 100644
--- a/server/playbooks/server/sqlstore/migrations_utils.go
+++ b/server/playbooks/server/sqlstore/migrations_utils.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 
 	"github.com/jmoiron/sqlx"
diff --git a/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go b/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go
index 895d7f5134..10b706dde5 100644
--- a/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go
+++ b/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore (interfaces: StoreAPI)
+// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore (interfaces: StoreAPI)
 
 // Package mock_sqlstore is a generated GoMock package.
 package mock_sqlstore
diff --git a/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go b/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go
index c9980a13ca..50ffc09958 100644
--- a/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go
+++ b/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore (interfaces: ConfigurationAPI)
+// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore (interfaces: ConfigurationAPI)
 
 // Package mock_sqlstore is a generated GoMock package.
 package mock_sqlstore
@@ -11,7 +11,7 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // MockConfigurationAPI is a mock of ConfigurationAPI interface.
diff --git a/server/playbooks/server/sqlstore/mocks/mock_kvapi.go b/server/playbooks/server/sqlstore/mocks/mock_kvapi.go
index f121fe1a4e..398e6f7901 100644
--- a/server/playbooks/server/sqlstore/mocks/mock_kvapi.go
+++ b/server/playbooks/server/sqlstore/mocks/mock_kvapi.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore (interfaces: KVAPI)
+// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore (interfaces: KVAPI)
 
 // Package mock_sqlstore is a generated GoMock package.
 package mock_sqlstore
diff --git a/server/playbooks/server/sqlstore/mocks/mock_storeapi.go b/server/playbooks/server/sqlstore/mocks/mock_storeapi.go
index 6ba8846d39..ffd99fd491 100644
--- a/server/playbooks/server/sqlstore/mocks/mock_storeapi.go
+++ b/server/playbooks/server/sqlstore/mocks/mock_storeapi.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore (interfaces: StoreAPI)
+// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore (interfaces: StoreAPI)
 
 // Package mock_sqlstore is a generated GoMock package.
 package mock_sqlstore
diff --git a/server/playbooks/server/sqlstore/playbook.go b/server/playbooks/server/sqlstore/playbook.go
index 9c8bf48e36..dcb06a98fe 100644
--- a/server/playbooks/server/sqlstore/playbook.go
+++ b/server/playbooks/server/sqlstore/playbook.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	sq "github.com/Masterminds/squirrel"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/sqlstore/playbook_run.go b/server/playbooks/server/sqlstore/playbook_run.go
index e1f48e80df..061699d018 100644
--- a/server/playbooks/server/sqlstore/playbook_run.go
+++ b/server/playbooks/server/sqlstore/playbook_run.go
@@ -16,8 +16,8 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	sq "github.com/Masterminds/squirrel"
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/sqlstore/playbook_run_test.go b/server/playbooks/server/sqlstore/playbook_run_test.go
index 2dee055a78..d95b78fd0b 100644
--- a/server/playbooks/server/sqlstore/playbook_run_test.go
+++ b/server/playbooks/server/sqlstore/playbook_run_test.go
@@ -20,9 +20,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	mock_sqlstore "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks"
 )
 
 func TestCreateAndGetPlaybookRun(t *testing.T) {
diff --git a/server/playbooks/server/sqlstore/playbook_test.go b/server/playbooks/server/sqlstore/playbook_test.go
index d556ab5b7a..e61d7d62fa 100644
--- a/server/playbooks/server/sqlstore/playbook_test.go
+++ b/server/playbooks/server/sqlstore/playbook_test.go
@@ -16,9 +16,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	mock_sqlstore "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks"
 )
 
 func membersFromIds(ids []string) []app.PlaybookMember {
diff --git a/server/playbooks/server/sqlstore/pluginapi_client.go b/server/playbooks/server/sqlstore/pluginapi_client.go
index e2f069d7a5..699fd10513 100644
--- a/server/playbooks/server/sqlstore/pluginapi_client.go
+++ b/server/playbooks/server/sqlstore/pluginapi_client.go
@@ -6,9 +6,9 @@ package sqlstore
 import (
 	"database/sql"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // StoreAPI is the interface exposing the underlying database, provided by pluginapi
diff --git a/server/playbooks/server/sqlstore/stats.go b/server/playbooks/server/sqlstore/stats.go
index 54000c582f..4c101e25d8 100644
--- a/server/playbooks/server/sqlstore/stats.go
+++ b/server/playbooks/server/sqlstore/stats.go
@@ -15,7 +15,7 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	sq "github.com/Masterminds/squirrel"
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type StatsStore struct {
diff --git a/server/playbooks/server/sqlstore/stats_test.go b/server/playbooks/server/sqlstore/stats_test.go
index d516b3eb0d..5973f279bc 100644
--- a/server/playbooks/server/sqlstore/stats_test.go
+++ b/server/playbooks/server/sqlstore/stats_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v4"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
-	mock_sqlstore "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
+	mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks"
 )
 
 func setupStatsStore(t *testing.T, db *sqlx.DB) *StatsStore {
diff --git a/server/playbooks/server/sqlstore/store.go b/server/playbooks/server/sqlstore/store.go
index b2c1194813..fae12dd6c7 100644
--- a/server/playbooks/server/sqlstore/store.go
+++ b/server/playbooks/server/sqlstore/store.go
@@ -6,12 +6,12 @@ package sqlstore
 import (
 	"database/sql"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/sirupsen/logrus"
 
 	sq "github.com/Masterminds/squirrel"
 	"github.com/jmoiron/sqlx"
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/sqlstore/store_test.go b/server/playbooks/server/sqlstore/store_test.go
index 7956df70b9..cb33394f7f 100644
--- a/server/playbooks/server/sqlstore/store_test.go
+++ b/server/playbooks/server/sqlstore/store_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 
-	mock_app "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app/mocks"
+	mock_app "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app/mocks"
 
 	sq "github.com/Masterminds/squirrel"
 	"github.com/blang/semver"
@@ -18,7 +18,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestMigrations(t *testing.T) {
diff --git a/server/playbooks/server/sqlstore/support_for_test.go b/server/playbooks/server/sqlstore/support_for_test.go
index eb5b12a4d1..3035fe8dd5 100644
--- a/server/playbooks/server/sqlstore/support_for_test.go
+++ b/server/playbooks/server/sqlstore/support_for_test.go
@@ -10,16 +10,16 @@ import (
 
 	"github.com/blang/semver"
 
-	mock_app "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app/mocks"
+	mock_app "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app/mocks"
 
 	sq "github.com/Masterminds/squirrel"
 	"github.com/golang/mock/gomock"
 	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/store/storetest"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 )
 
 func getDriverName() string {
diff --git a/server/playbooks/server/sqlstore/system.go b/server/playbooks/server/sqlstore/system.go
index 584f7639ce..7be08ffb26 100644
--- a/server/playbooks/server/sqlstore/system.go
+++ b/server/playbooks/server/sqlstore/system.go
@@ -7,7 +7,7 @@ import (
 	"database/sql"
 
 	sq "github.com/Masterminds/squirrel"
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/sqlstore/timeline_event_test.go b/server/playbooks/server/sqlstore/timeline_event_test.go
index 78572c2229..2a22ce2cc6 100644
--- a/server/playbooks/server/sqlstore/timeline_event_test.go
+++ b/server/playbooks/server/sqlstore/timeline_event_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 )
 
 func TestPlaybookRunStore_CreateTimelineEvent(t *testing.T) {
diff --git a/server/playbooks/server/sqlstore/user_info.go b/server/playbooks/server/sqlstore/user_info.go
index 949c3440c8..211fcc90d2 100644
--- a/server/playbooks/server/sqlstore/user_info.go
+++ b/server/playbooks/server/sqlstore/user_info.go
@@ -7,10 +7,10 @@ import (
 	"database/sql"
 	"encoding/json"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	sq "github.com/Masterminds/squirrel"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/playbooks/server/sqlstore/user_info_test.go b/server/playbooks/server/sqlstore/user_info_test.go
index 0230268d19..3781d2f7a8 100644
--- a/server/playbooks/server/sqlstore/user_info_test.go
+++ b/server/playbooks/server/sqlstore/user_info_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	mock_app "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app/mocks"
+	mock_app "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app/mocks"
 
 	"github.com/pkg/errors"
 
@@ -16,8 +16,8 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 )
 
 func Test_userInfoStore_Get(t *testing.T) {
diff --git a/server/playbooks/server/telemetry/noop.go b/server/playbooks/server/telemetry/noop.go
index 37694ddfc1..c0a8521ec3 100644
--- a/server/playbooks/server/telemetry/noop.go
+++ b/server/playbooks/server/telemetry/noop.go
@@ -4,7 +4,7 @@
 package telemetry
 
 import (
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 )
 
 // NoopTelemetry satisfies the Telemetry interface with no-op implementations.
diff --git a/server/playbooks/server/telemetry/rudder.go b/server/playbooks/server/telemetry/rudder.go
index 081d5d518c..294a23b2a7 100644
--- a/server/playbooks/server/telemetry/rudder.go
+++ b/server/playbooks/server/telemetry/rudder.go
@@ -6,7 +6,7 @@ package telemetry
 import (
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 
 	"github.com/pkg/errors"
 	rudder "github.com/rudderlabs/analytics-go"
diff --git a/server/playbooks/server/telemetry/rudder_test.go b/server/playbooks/server/telemetry/rudder_test.go
index 3d0befeada..2f67254a60 100644
--- a/server/playbooks/server/telemetry/rudder_test.go
+++ b/server/playbooks/server/telemetry/rudder_test.go
@@ -13,7 +13,7 @@ import (
 
 	"gopkg.in/guregu/null.v4"
 
-	"github.com/mattermost/mattermost-server/v6/server/playbooks/server/app"
+	"github.com/mattermost/mattermost-server/server/v8/playbooks/server/app"
 
 	rudder "github.com/rudderlabs/analytics-go"
 	"github.com/stretchr/testify/require"
diff --git a/server/playbooks/server/timeutils/timeutils.go b/server/playbooks/server/timeutils/timeutils.go
index fb98a50eb6..efed974dd7 100644
--- a/server/playbooks/server/timeutils/timeutils.go
+++ b/server/playbooks/server/timeutils/timeutils.go
@@ -8,7 +8,7 @@ import (
 	"math"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func GetTimeForMillis(unixMillis int64) time.Time {
diff --git a/plugin/api.go b/server/plugin/api.go
similarity index 99%
rename from plugin/api.go
rename to server/plugin/api.go
index f777539d04..63be22ce43 100644
--- a/plugin/api.go
+++ b/server/plugin/api.go
@@ -9,7 +9,7 @@ import (
 
 	plugin "github.com/hashicorp/go-plugin"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // The API can be used to retrieve data or perform actions on behalf of the plugin. Most methods
diff --git a/plugin/api_timer_layer_generated.go b/server/plugin/api_timer_layer_generated.go
similarity index 99%
rename from plugin/api_timer_layer_generated.go
rename to server/plugin/api_timer_layer_generated.go
index c54c6ac7bb..0f1ab22ff7 100644
--- a/plugin/api_timer_layer_generated.go
+++ b/server/plugin/api_timer_layer_generated.go
@@ -11,8 +11,8 @@ import (
 	"net/http"
 	timePkg "time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type apiTimerLayer struct {
diff --git a/plugin/checker/check_api.go b/server/plugin/checker/check_api.go
similarity index 87%
rename from plugin/checker/check_api.go
rename to server/plugin/checker/check_api.go
index 707da34e9c..88c7a53775 100644
--- a/plugin/checker/check_api.go
+++ b/server/plugin/checker/check_api.go
@@ -8,8 +8,8 @@ import (
 	"go/ast"
 	"go/token"
 
-	"github.com/mattermost/mattermost-server/v6/plugin/checker/internal/asthelpers"
-	"github.com/mattermost/mattermost-server/v6/plugin/checker/internal/version"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/asthelpers"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/version"
 )
 
 func checkAPIVersionComments(pkgPath string) (result, error) {
diff --git a/plugin/checker/check_api_test.go b/server/plugin/checker/check_api_test.go
similarity index 76%
rename from plugin/checker/check_api_test.go
rename to server/plugin/checker/check_api_test.go
index c270399abc..5c22f4f231 100644
--- a/plugin/checker/check_api_test.go
+++ b/server/plugin/checker/check_api_test.go
@@ -17,24 +17,24 @@ func TestCheckAPIVersionComments(t *testing.T) {
 	}{
 		{
 			name:    "valid comments",
-			pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/valid",
+			pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/valid",
 			err:     "",
 		},
 		{
 			name:    "invalid comments",
-			pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/invalid",
+			pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/invalid",
 			expected: result{
 				Errors: []string{"internal/test/invalid/invalid.go:15:2: missing a minimum server version comment on method InvalidMethod"},
 			},
 		},
 		{
 			name:    "missing API interface",
-			pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/missing",
+			pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/missing",
 			err:     "could not find API interface",
 		},
 		{
 			name:    "non-existent package path",
-			pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/does_not_exist",
+			pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/does_not_exist",
 			err:     "could not find API interface",
 		},
 	}
diff --git a/plugin/checker/internal/asthelpers/helpers.go b/server/plugin/checker/internal/asthelpers/helpers.go
similarity index 100%
rename from plugin/checker/internal/asthelpers/helpers.go
rename to server/plugin/checker/internal/asthelpers/helpers.go
diff --git a/plugin/checker/internal/test/invalid/invalid.go b/server/plugin/checker/internal/test/invalid/invalid.go
similarity index 100%
rename from plugin/checker/internal/test/invalid/invalid.go
rename to server/plugin/checker/internal/test/invalid/invalid.go
diff --git a/plugin/checker/internal/test/missing/missing.go b/server/plugin/checker/internal/test/missing/missing.go
similarity index 100%
rename from plugin/checker/internal/test/missing/missing.go
rename to server/plugin/checker/internal/test/missing/missing.go
diff --git a/plugin/checker/internal/test/valid/valid.go b/server/plugin/checker/internal/test/valid/valid.go
similarity index 100%
rename from plugin/checker/internal/test/valid/valid.go
rename to server/plugin/checker/internal/test/valid/valid.go
diff --git a/plugin/checker/internal/version/comments.go b/server/plugin/checker/internal/version/comments.go
similarity index 100%
rename from plugin/checker/internal/version/comments.go
rename to server/plugin/checker/internal/version/comments.go
diff --git a/plugin/checker/internal/version/comments_test.go b/server/plugin/checker/internal/version/comments_test.go
similarity index 100%
rename from plugin/checker/internal/version/comments_test.go
rename to server/plugin/checker/internal/version/comments_test.go
diff --git a/plugin/checker/internal/version/version.go b/server/plugin/checker/internal/version/version.go
similarity index 100%
rename from plugin/checker/internal/version/version.go
rename to server/plugin/checker/internal/version/version.go
diff --git a/plugin/checker/internal/version/version_test.go b/server/plugin/checker/internal/version/version_test.go
similarity index 100%
rename from plugin/checker/internal/version/version_test.go
rename to server/plugin/checker/internal/version/version_test.go
diff --git a/plugin/checker/main.go b/server/plugin/checker/main.go
similarity index 98%
rename from plugin/checker/main.go
rename to server/plugin/checker/main.go
index 87c1f6b414..b7a2e76aa7 100644
--- a/plugin/checker/main.go
+++ b/server/plugin/checker/main.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 )
 
-const pluginPackagePath = "github.com/mattermost/mattermost-server/v6/plugin"
+const pluginPackagePath = "github.com/mattermost/mattermost-server/server/v8/plugin"
 
 type result struct {
 	Warnings []string
diff --git a/plugin/checker/render.go b/server/plugin/checker/render.go
similarity index 100%
rename from plugin/checker/render.go
rename to server/plugin/checker/render.go
diff --git a/plugin/client.go b/server/plugin/client.go
similarity index 100%
rename from plugin/client.go
rename to server/plugin/client.go
diff --git a/plugin/client_rpc.go b/server/plugin/client_rpc.go
similarity index 99%
rename from plugin/client_rpc.go
rename to server/plugin/client_rpc.go
index 699e8d967a..ec30c31ec6 100644
--- a/plugin/client_rpc.go
+++ b/server/plugin/client_rpc.go
@@ -24,8 +24,8 @@ import (
 	"github.com/hashicorp/go-plugin"
 	"github.com/lib/pq"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var hookNameToId map[string]int = make(map[string]int)
diff --git a/plugin/client_rpc_generated.go b/server/plugin/client_rpc_generated.go
similarity index 99%
rename from plugin/client_rpc_generated.go
rename to server/plugin/client_rpc_generated.go
index e0d3a5e814..3453a35578 100644
--- a/plugin/client_rpc_generated.go
+++ b/server/plugin/client_rpc_generated.go
@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func init() {
diff --git a/plugin/context.go b/server/plugin/context.go
similarity index 100%
rename from plugin/context.go
rename to server/plugin/context.go
diff --git a/plugin/db_rpc.go b/server/plugin/db_rpc.go
similarity index 100%
rename from plugin/db_rpc.go
rename to server/plugin/db_rpc.go
diff --git a/plugin/doc.go b/server/plugin/doc.go
similarity index 100%
rename from plugin/doc.go
rename to server/plugin/doc.go
diff --git a/plugin/driver.go b/server/plugin/driver.go
similarity index 100%
rename from plugin/driver.go
rename to server/plugin/driver.go
diff --git a/plugin/environment.go b/server/plugin/environment.go
similarity index 98%
rename from plugin/environment.go
rename to server/plugin/environment.go
index b32ef66519..20f612b5ab 100644
--- a/plugin/environment.go
+++ b/server/plugin/environment.go
@@ -15,10 +15,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var ErrNotFound = errors.New("Item not found")
diff --git a/plugin/environment_test.go b/server/plugin/environment_test.go
similarity index 95%
rename from plugin/environment_test.go
rename to server/plugin/environment_test.go
index 489d52ff8e..6a4afa138f 100644
--- a/plugin/environment_test.go
+++ b/server/plugin/environment_test.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestAvailablePlugins(t *testing.T) {
diff --git a/plugin/example_hello_world_test.go b/server/plugin/example_hello_world_test.go
similarity index 92%
rename from plugin/example_hello_world_test.go
rename to server/plugin/example_hello_world_test.go
index 59ed5a01cd..dff5c78d69 100644
--- a/plugin/example_hello_world_test.go
+++ b/server/plugin/example_hello_world_test.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // HelloWorldPlugin implements the interface expected by the Mattermost server to communicate
diff --git a/plugin/example_help_test.go b/server/plugin/example_help_test.go
similarity index 96%
rename from plugin/example_help_test.go
rename to server/plugin/example_help_test.go
index a1e55f7b2f..9b6f08f4d8 100644
--- a/plugin/example_help_test.go
+++ b/server/plugin/example_help_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // configuration represents the configuration for this plugin as exposed via the Mattermost
diff --git a/plugin/hclog_adapter.go b/server/plugin/hclog_adapter.go
similarity index 97%
rename from plugin/hclog_adapter.go
rename to server/plugin/hclog_adapter.go
index 3c63c66a58..b2be0eae29 100644
--- a/plugin/hclog_adapter.go
+++ b/server/plugin/hclog_adapter.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/hashicorp/go-hclog"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type hclogAdapter struct {
diff --git a/plugin/health_check.go b/server/plugin/health_check.go
similarity index 97%
rename from plugin/health_check.go
rename to server/plugin/health_check.go
index 38251d1c90..68ffd8b0f0 100644
--- a/plugin/health_check.go
+++ b/server/plugin/health_check.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (
diff --git a/plugin/health_check_test.go b/server/plugin/health_check_test.go
similarity index 90%
rename from plugin/health_check_test.go
rename to server/plugin/health_check_test.go
index 7a7cc872bc..36cb728545 100644
--- a/plugin/health_check_test.go
+++ b/server/plugin/health_check_test.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestPluginHealthCheck(t *testing.T) {
@@ -35,7 +35,7 @@ func testPluginHealthCheckSuccess(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
 		)
 
 		type MyPlugin struct {
@@ -73,8 +73,8 @@ func testPluginHealthCheckPanic(t *testing.T) {
 		package main
 
 		import (
-			"github.com/mattermost/mattermost-server/v6/model"
-			"github.com/mattermost/mattermost-server/v6/plugin"
+			"github.com/mattermost/mattermost-server/server/v8/model"
+			"github.com/mattermost/mattermost-server/server/v8/plugin"
 		)
 
 		type MyPlugin struct {
diff --git a/plugin/hijack.go b/server/plugin/hijack.go
similarity index 100%
rename from plugin/hijack.go
rename to server/plugin/hijack.go
diff --git a/plugin/hooks.go b/server/plugin/hooks.go
similarity index 99%
rename from plugin/hooks.go
rename to server/plugin/hooks.go
index a384dfbb2e..afe727d6a7 100644
--- a/plugin/hooks.go
+++ b/server/plugin/hooks.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // These assignments are part of the wire protocol used to trigger hook events in plugins.
diff --git a/plugin/hooks_timer_layer_generated.go b/server/plugin/hooks_timer_layer_generated.go
similarity index 98%
rename from plugin/hooks_timer_layer_generated.go
rename to server/plugin/hooks_timer_layer_generated.go
index 87e79ca7e6..393e6e6a91 100644
--- a/plugin/hooks_timer_layer_generated.go
+++ b/server/plugin/hooks_timer_layer_generated.go
@@ -11,8 +11,8 @@ import (
 	"net/http"
 	timePkg "time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type hooksTimerLayer struct {
diff --git a/plugin/http.go b/server/plugin/http.go
similarity index 97%
rename from plugin/http.go
rename to server/plugin/http.go
index ab9eab3f65..5480e4696a 100644
--- a/plugin/http.go
+++ b/server/plugin/http.go
@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"net/rpc"
 
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type hijackedResponse struct {
diff --git a/plugin/interface_generator/main.go b/server/plugin/interface_generator/main.go
similarity index 98%
rename from plugin/interface_generator/main.go
rename to server/plugin/interface_generator/main.go
index 95996f11be..2a02c26d41 100644
--- a/plugin/interface_generator/main.go
+++ b/server/plugin/interface_generator/main.go
@@ -453,8 +453,8 @@ import (
 	"net/http"
 	timePkg "time"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type apiTimerLayer struct {
@@ -495,8 +495,8 @@ import (
 	"net/http"
 	timePkg "time"
 
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type hooksTimerLayer struct {
@@ -676,7 +676,7 @@ func generatePluginTimerLayer(info *PluginInterfaceInfo) {
 }
 
 func getPluginPackageDir() string {
-	dirs, err := goList("github.com/mattermost/mattermost-server/v6/plugin")
+	dirs, err := goList("github.com/mattermost/mattermost-server/server/v8/plugin")
 	if err != nil {
 		panic(err)
 	} else if len(dirs) != 1 {
diff --git a/plugin/io_rpc.go b/server/plugin/io_rpc.go
similarity index 100%
rename from plugin/io_rpc.go
rename to server/plugin/io_rpc.go
diff --git a/plugin/plugintest/api.go b/server/plugin/plugintest/api.go
similarity index 99%
rename from plugin/plugintest/api.go
rename to server/plugin/plugintest/api.go
index b92bc3288d..9fa1420457 100644
--- a/plugin/plugintest/api.go
+++ b/server/plugin/plugintest/api.go
@@ -10,7 +10,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // API is an autogenerated mock type for the API type
diff --git a/plugin/plugintest/doc.go b/server/plugin/plugintest/doc.go
similarity index 83%
rename from plugin/plugintest/doc.go
rename to server/plugin/plugintest/doc.go
index b20f1a92c3..ebf514d766 100644
--- a/plugin/plugintest/doc.go
+++ b/server/plugin/plugintest/doc.go
@@ -7,5 +7,5 @@
 // https://godoc.org/github.com/stretchr/testify/mock
 //
 // If you need to import the mock package, you can import it with
-// "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock".
+// "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock".
 package plugintest
diff --git a/plugin/plugintest/driver.go b/server/plugin/plugintest/driver.go
similarity index 99%
rename from plugin/plugintest/driver.go
rename to server/plugin/plugintest/driver.go
index 398b334450..bd10226f76 100644
--- a/plugin/plugintest/driver.go
+++ b/server/plugin/plugintest/driver.go
@@ -9,7 +9,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	plugin "github.com/mattermost/mattermost-server/v6/plugin"
+	plugin "github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // Driver is an autogenerated mock type for the Driver type
diff --git a/plugin/plugintest/example_hello_user_test.go b/server/plugin/plugintest/example_hello_user_test.go
similarity index 86%
rename from plugin/plugintest/example_hello_user_test.go
rename to server/plugin/plugintest/example_hello_user_test.go
index 2095b914d3..0c475382d2 100644
--- a/plugin/plugintest/example_hello_user_test.go
+++ b/server/plugin/plugintest/example_hello_user_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/plugin"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest"
 )
 
 type HelloUserPlugin struct {
diff --git a/plugin/plugintest/hooks.go b/server/plugin/plugintest/hooks.go
similarity index 99%
rename from plugin/plugintest/hooks.go
rename to server/plugin/plugintest/hooks.go
index d5550e5ba0..29900351ea 100644
--- a/plugin/plugintest/hooks.go
+++ b/server/plugin/plugintest/hooks.go
@@ -10,9 +10,9 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	model "github.com/mattermost/mattermost-server/v6/model"
+	model "github.com/mattermost/mattermost-server/server/v8/model"
 
-	plugin "github.com/mattermost/mattermost-server/v6/plugin"
+	plugin "github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 // Hooks is an autogenerated mock type for the Hooks type
diff --git a/plugin/plugintest/mock/mock.go b/server/plugin/plugintest/mock/mock.go
similarity index 100%
rename from plugin/plugintest/mock/mock.go
rename to server/plugin/plugintest/mock/mock.go
diff --git a/plugin/product.go b/server/plugin/product.go
similarity index 100%
rename from plugin/product.go
rename to server/plugin/product.go
diff --git a/plugin/product_hooks_generated.go b/server/plugin/product_hooks_generated.go
similarity index 99%
rename from plugin/product_hooks_generated.go
rename to server/plugin/product_hooks_generated.go
index d3d51a930f..b81cc632a4 100644
--- a/plugin/product_hooks_generated.go
+++ b/server/plugin/product_hooks_generated.go
@@ -11,7 +11,7 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 type OnConfigurationChangeIFace interface {
diff --git a/plugin/scheduler/scheduler.go b/server/plugin/scheduler/scheduler.go
similarity index 76%
rename from plugin/scheduler/scheduler.go
rename to server/plugin/scheduler/scheduler.go
index 218d80beef..0640477a1c 100644
--- a/plugin/scheduler/scheduler.go
+++ b/server/plugin/scheduler/scheduler.go
@@ -6,8 +6,8 @@ package scheduler
 import (
 	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const schedFreq = 24 * time.Hour
diff --git a/plugin/scheduler/worker.go b/server/plugin/scheduler/worker.go
similarity index 93%
rename from plugin/scheduler/worker.go
rename to server/plugin/scheduler/worker.go
index 7b042130f4..a03e5795d0 100644
--- a/plugin/scheduler/worker.go
+++ b/server/plugin/scheduler/worker.go
@@ -4,9 +4,9 @@
 package scheduler
 
 import (
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/jobs"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/jobs"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type AppIface interface {
diff --git a/plugin/stringifier.go b/server/plugin/stringifier.go
similarity index 100%
rename from plugin/stringifier.go
rename to server/plugin/stringifier.go
diff --git a/plugin/stringifier_test.go b/server/plugin/stringifier_test.go
similarity index 100%
rename from plugin/stringifier_test.go
rename to server/plugin/stringifier_test.go
diff --git a/plugin/supervisor.go b/server/plugin/supervisor.go
similarity index 95%
rename from plugin/supervisor.go
rename to server/plugin/supervisor.go
index 5c5bd84cc3..415ee3820c 100644
--- a/plugin/supervisor.go
+++ b/server/plugin/supervisor.go
@@ -18,9 +18,9 @@ import (
 	plugin "github.com/hashicorp/go-plugin"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/einterfaces"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/einterfaces"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type supervisor struct {
diff --git a/plugin/supervisor_test.go b/server/plugin/supervisor_test.go
similarity index 92%
rename from plugin/supervisor_test.go
rename to server/plugin/supervisor_test.go
index 32d6cc6a0a..af9a55d759 100644
--- a/plugin/supervisor_test.go
+++ b/server/plugin/supervisor_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestSupervisor(t *testing.T) {
diff --git a/server/scripts/config_generator/main.go b/server/scripts/config_generator/main.go
index b7641cbbf0..6767d13912 100644
--- a/server/scripts/config_generator/main.go
+++ b/server/scripts/config_generator/main.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // generateDefaultConfig writes default config to outputFile.
diff --git a/server/scripts/config_generator/main_test.go b/server/scripts/config_generator/main_test.go
index 8dba358c44..da10cd3491 100644
--- a/server/scripts/config_generator/main_test.go
+++ b/server/scripts/config_generator/main_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/scripts/setup_go_work.sh b/server/scripts/setup_go_work.sh
index 5415351813..821a48588e 100755
--- a/server/scripts/setup_go_work.sh
+++ b/server/scripts/setup_go_work.sh
@@ -8,13 +8,8 @@ then
     
     if [ "$BUILD_ENTERPRISE_READY" == "true" ] 
     then
-        txt="${txt}use ../enterprise\n"
+        txt="${txt}use ../../enterprise\n"
     fi
     
-    if [ "$BUILD_PLAYBOOKS" == "true" ]
-    then
-        txt="${txt}use ../mattermost-plugin-playbooks\n"
-    fi
-
-    printf "$txt" > "../go.work"
+    printf "$txt" > "go.work"
 fi

From 0c375e1ebd63cf8e22b31e5e98f98736625a3775 Mon Sep 17 00:00:00 2001
From: Konstantinos Pittas <konstantinos.pittas@mattermost.com>
Date: Tue, 18 Apr 2023 10:56:41 +0300
Subject: [PATCH 100/103] [MM-48670] Fix persistence of placeholder text
 (#22820)

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../src/actions/views/create_comment.test.jsx |  7 +++---
 .../channels/src/actions/views/drafts.test.ts |  7 +++---
 webapp/channels/src/actions/views/drafts.ts   | 23 ++++++++++++++---
 .../src/actions/websocket_actions.jsx         | 21 ++++++----------
 .../advanced_create_comment.test.jsx          |  7 ++++--
 .../advanced_create_comment.tsx               | 16 +++++++++---
 .../advanced_create_comment/index.ts          |  6 +++--
 .../advanced_create_post.test.jsx             |  1 +
 .../advanced_create_post.tsx                  | 10 +++++---
 .../components/advanced_create_post/index.ts  |  9 +++----
 .../__snapshots__/draft_row.test.tsx.snap     |  2 ++
 .../drafts/__snapshots__/drafts.test.tsx.snap |  2 ++
 .../__snapshots__/channel_draft.test.tsx.snap |  2 ++
 .../channel_draft/channel_draft.test.tsx      |  1 +
 .../drafts/channel_draft/channel_draft.tsx    |  4 ++-
 .../src/components/drafts/draft_row.test.tsx  |  1 +
 .../src/components/drafts/draft_row.tsx       |  5 +++-
 .../src/components/drafts/drafts.test.tsx     |  1 +
 .../channels/src/components/drafts/drafts.tsx |  3 +++
 .../channels/src/components/drafts/index.ts   |  1 +
 .../__snapshots__/thread_draft.test.tsx.snap  |  2 ++
 .../drafts/thread_draft/thread_draft.test.tsx |  1 +
 .../drafts/thread_draft/thread_draft.tsx      |  4 ++-
 webapp/channels/src/reducers/storage.ts       |  1 -
 webapp/channels/src/reducers/views/drafts.ts  | 25 +++++++++++++++++++
 webapp/channels/src/reducers/views/index.ts   |  2 ++
 webapp/channels/src/types/store/draft.ts      |  1 -
 webapp/channels/src/types/store/views.ts      |  6 +++++
 webapp/channels/src/utils/constants.tsx       |  2 ++
 29 files changed, 128 insertions(+), 45 deletions(-)
 create mode 100644 webapp/channels/src/reducers/views/drafts.ts

diff --git a/webapp/channels/src/actions/views/create_comment.test.jsx b/webapp/channels/src/actions/views/create_comment.test.jsx
index 54b587902f..1f4ee9cc43 100644
--- a/webapp/channels/src/actions/views/create_comment.test.jsx
+++ b/webapp/channels/src/actions/views/create_comment.test.jsx
@@ -18,7 +18,7 @@ import {
     makeOnSubmit,
     makeOnEditLatestPost,
 } from 'actions/views/create_comment';
-import {removeDraft} from 'actions/views/drafts';
+import {removeDraft, setGlobalDraftSource} from 'actions/views/drafts';
 import {setGlobalItem, actionOnGlobalItemsWithPrefix} from 'actions/storage';
 import * as PostActions from 'actions/post_actions';
 import {executeCommand} from 'actions/command';
@@ -205,12 +205,13 @@ describe('rhs view actions', () => {
 
             const testStore = mockStore(initialState);
 
-            testStore.dispatch(setGlobalItem(`${StoragePrefixes.COMMENT_DRAFT}${rootId}`, {
+            const expectedKey = `${StoragePrefixes.COMMENT_DRAFT}${rootId}`;
+            testStore.dispatch(setGlobalItem(expectedKey, {
                 ...draft,
                 createAt: 42,
                 updateAt: 42,
-                remote: false,
             }));
+            testStore.dispatch(setGlobalDraftSource(expectedKey, false));
 
             expect(store.getActions()).toEqual(testStore.getActions());
             jest.useRealTimers();
diff --git a/webapp/channels/src/actions/views/drafts.test.ts b/webapp/channels/src/actions/views/drafts.test.ts
index 946dc560fa..7a95882237 100644
--- a/webapp/channels/src/actions/views/drafts.test.ts
+++ b/webapp/channels/src/actions/views/drafts.test.ts
@@ -13,7 +13,7 @@ import {getPreferenceKey} from 'mattermost-redux/utils/preference_utils';
 
 import {Client4} from 'mattermost-redux/client';
 
-import {removeDraft, updateDraft} from './drafts';
+import {removeDraft, setGlobalDraftSource, updateDraft} from './drafts';
 
 jest.mock('mattermost-redux/client', () => {
     const original = jest.requireActual('mattermost-redux/client');
@@ -146,12 +146,13 @@ describe('draft actions', () => {
 
             const testStore = mockStore(initialState);
 
-            testStore.dispatch(setGlobalItem(StoragePrefixes.DRAFT + channelId, {
+            const expectedKey = StoragePrefixes.DRAFT + channelId;
+            testStore.dispatch(setGlobalItem(expectedKey, {
                 ...draft,
                 createAt: 42,
                 updateAt: 42,
-                remote: false,
             }));
+            testStore.dispatch(setGlobalDraftSource(expectedKey, false));
 
             expect(store.getActions()).toEqual(testStore.getActions());
             jest.useRealTimers();
diff --git a/webapp/channels/src/actions/views/drafts.ts b/webapp/channels/src/actions/views/drafts.ts
index d883072137..8dc03cf1f7 100644
--- a/webapp/channels/src/actions/views/drafts.ts
+++ b/webapp/channels/src/actions/views/drafts.ts
@@ -15,7 +15,7 @@ import {PostDraft} from 'types/store/draft';
 import {getGlobalItem} from 'selectors/storage';
 import {makeGetDrafts} from 'selectors/drafts';
 
-import {StoragePrefixes} from 'utils/constants';
+import {ActionTypes, StoragePrefixes} from 'utils/constants';
 
 import type {Draft as ServerDraft} from '@mattermost/types/drafts';
 import type {UserProfile} from '@mattermost/types/users';
@@ -101,11 +101,10 @@ export function updateDraft(key: string, value: PostDraft|null, rootId = '', sav
                 ...value,
                 createAt: data.createAt || timestamp,
                 updateAt: timestamp,
-                remote: false,
             };
         }
 
-        dispatch(setGlobalItem(key, updatedValue));
+        dispatch(setGlobalDraft(key, updatedValue, false));
 
         if (syncedDraftsAreAllowedAndEnabled(state) && save && updatedValue) {
             const connectionId = getConnectionId(state);
@@ -153,6 +152,24 @@ export function setDraftsTourTipPreference(initializationState: Record<string, b
     };
 }
 
+export function setGlobalDraft(key: string, value: PostDraft|null, isRemote: boolean) {
+    return (dispatch: DispatchFunc) => {
+        dispatch(setGlobalItem(key, value));
+        dispatch(setGlobalDraftSource(key, isRemote));
+        return {data: true};
+    };
+}
+
+export function setGlobalDraftSource(key: string, isRemote: boolean) {
+    return {
+        type: ActionTypes.SET_DRAFT_SOURCE,
+        data: {
+            key,
+            isRemote,
+        },
+    };
+}
+
 export function transformServerDraft(draft: ServerDraft): Draft {
     let key: Draft['key'] = `${StoragePrefixes.DRAFT}${draft.channel_id}`;
 
diff --git a/webapp/channels/src/actions/websocket_actions.jsx b/webapp/channels/src/actions/websocket_actions.jsx
index 93069871bd..adb05f4215 100644
--- a/webapp/channels/src/actions/websocket_actions.jsx
+++ b/webapp/channels/src/actions/websocket_actions.jsx
@@ -68,7 +68,7 @@ import {
 } from 'mattermost-redux/actions/users';
 import {removeNotVisibleUsers} from 'mattermost-redux/actions/websocket';
 import {setGlobalItem} from 'actions/storage';
-import {transformServerDraft} from 'actions/views/drafts';
+import {setGlobalDraft, transformServerDraft} from 'actions/views/drafts';
 
 import {Client4} from 'mattermost-redux/client';
 import {getCurrentUser, getCurrentUserId, getUser, getIsManualStatusForUserId, isCurrentUserSystemAdmin} from 'mattermost-redux/selectors/entities/users';
@@ -89,7 +89,6 @@ import {getStandardAnalytics} from 'mattermost-redux/actions/admin';
 
 import {fetchAppBindings, fetchRHSAppsBindings} from 'mattermost-redux/actions/apps';
 
-import {getConnectionId} from 'selectors/general';
 import {getSelectedChannelId, getSelectedPost} from 'selectors/rhs';
 import {isThreadOpen, isThreadManuallyUnread} from 'selectors/views/threads';
 
@@ -1700,20 +1699,12 @@ function handlePostAcknowledgementRemoved(msg) {
 }
 
 function handleUpsertDraftEvent(msg) {
-    return async (doDispatch, doGetState) => {
-        const state = doGetState();
-        const connectionId = getConnectionId(state);
-
+    return async (doDispatch) => {
         const draft = JSON.parse(msg.data.draft);
         const {key, value} = transformServerDraft(draft);
         value.show = true;
-        value.remote = false;
 
-        if (msg.broadcast.omit_connection_id !== connectionId) {
-            value.remote = true;
-        }
-
-        doDispatch(setGlobalItem(key, value));
+        doDispatch(setGlobalDraft(key, value, true));
     };
 }
 
@@ -1722,7 +1713,11 @@ function handleDeleteDraftEvent(msg) {
         const draft = JSON.parse(msg.data.draft);
         const {key} = transformServerDraft(draft);
 
-        doDispatch(setGlobalItem(key, {message: '', fileInfos: [], uploadsInProgress: [], remote: true}));
+        doDispatch(setGlobalItem(key, {
+            message: '',
+            fileInfos: [],
+            uploadsInProgress: [],
+        }));
     };
 }
 
diff --git a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.test.jsx b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.test.jsx
index ef81ba5823..ee907be96f 100644
--- a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.test.jsx
+++ b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.test.jsx
@@ -40,6 +40,7 @@ describe('components/AdvancedCreateComment', () => {
             uploadsInProgress: [{}],
             fileInfos: [{}, {}, {}],
         },
+        isRemoteDraft: false,
         enableAddButton: true,
         ctrlSend: false,
         latestPostId,
@@ -84,9 +85,10 @@ describe('components/AdvancedCreateComment', () => {
 
     test('should match snapshot, empty comment', () => {
         const draft = emptyDraft;
+        const isRemoteDraft = false;
         const enableAddButton = false;
         const ctrlSend = true;
-        const props = {...baseProps, draft, enableAddButton, ctrlSend};
+        const props = {...baseProps, draft, isRemoteDraft, enableAddButton, ctrlSend};
 
         const wrapper = shallow(
             <AdvancedCreateComment {...props}/>,
@@ -104,8 +106,9 @@ describe('components/AdvancedCreateComment', () => {
             uploadsInProgress: [],
             fileInfos: [],
         };
+        const isRemoteDraft = false;
         const ctrlSend = true;
-        const props = {...baseProps, ctrlSend, draft, clearCommentDraftUploads, onResetHistoryIndex, getChannelMemberCountsByGroup};
+        const props = {...baseProps, ctrlSend, draft, isRemoteDraft, clearCommentDraftUploads, onResetHistoryIndex, getChannelMemberCountsByGroup};
 
         const wrapper = shallow(
             <AdvancedCreateComment {...props}/>,
diff --git a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx
index a484dc4bb2..63c2a57bd5 100644
--- a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx
+++ b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx
@@ -74,6 +74,9 @@ type Props = {
     // The current draft of the comment
     draft: PostDraft;
 
+    // Data used for knowing if the draft came from a WS event
+    isRemoteDraft: boolean;
+
     // Determines if the submit button should be rendered
     enableAddButton?: boolean;
 
@@ -233,8 +236,14 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
 
         const rootChanged = props.rootId !== state.rootId;
         const messageInHistoryChanged = props.messageInHistory !== state.messageInHistory;
-        if (rootChanged || messageInHistoryChanged || props.draft.remote) {
-            updatedState = {...updatedState, draft: {...props.draft, uploadsInProgress: rootChanged ? [] : props.draft.uploadsInProgress}};
+        if (rootChanged || messageInHistoryChanged || (props.isRemoteDraft && props.draft.message !== state.draft?.message)) {
+            updatedState = {
+                ...updatedState,
+                draft: {
+                    ...props.draft,
+                    uploadsInProgress: rootChanged ? [] : props.draft.uploadsInProgress,
+                },
+            };
         }
 
         return updatedState;
@@ -252,6 +261,7 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
             serverError: null,
             showFormat: false,
             isFormattingBarHidden: props.isFormattingBarHidden,
+            caretPosition: props.draft.caretPosition,
         };
 
         this.textboxRef = React.createRef();
@@ -343,7 +353,6 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
         const updatedDraft = {
             ...this.state.draft,
             show: !isDraftEmpty(this.state.draft),
-            remote: false,
         } as PostDraft;
 
         this.props.onUpdateCommentDraft(updatedDraft, true);
@@ -356,7 +365,6 @@ class AdvancedCreateComment extends React.PureComponent<Props, State> {
                     draft: {
                         ...prev.draft,
                         show: !isDraftEmpty(prev.draft),
-                        remote: false,
                     } as PostDraft,
                 };
             }
diff --git a/webapp/channels/src/components/advanced_create_comment/index.ts b/webapp/channels/src/components/advanced_create_comment/index.ts
index 75095246ec..065683f481 100644
--- a/webapp/channels/src/components/advanced_create_comment/index.ts
+++ b/webapp/channels/src/components/advanced_create_comment/index.ts
@@ -64,6 +64,7 @@ function makeMapStateToProps() {
         const err = state.requests.posts.createPost.error || {};
 
         const draft = getPostDraft(state, StoragePrefixes.COMMENT_DRAFT, ownProps.rootId);
+        const isRemoteDraft = state.views.drafts.remotes[`${StoragePrefixes.COMMENT_DRAFT}${ownProps.rootId}`] || false;
 
         const channelMembersCount = getAllChannelStats(state)[ownProps.channelId] ? getAllChannelStats(state)[ownProps.channelId].member_count : 1;
         const messageInHistory = getMessageInHistoryItem(state);
@@ -91,6 +92,7 @@ function makeMapStateToProps() {
         return {
             currentTeamId,
             draft,
+            isRemoteDraft,
             messageInHistory,
             channelMembersCount,
             currentUserId,
@@ -121,11 +123,11 @@ function makeMapStateToProps() {
 }
 
 function makeOnUpdateCommentDraft(rootId: string, channelId: string) {
-    return (draft?: PostDraft, save = false) => updateCommentDraft(rootId, draft ? {...draft, channelId, remote: false} : draft, save);
+    return (draft?: PostDraft, save = false) => updateCommentDraft(rootId, draft ? {...draft, channelId} : draft, save);
 }
 
 function makeUpdateCommentDraftWithRootId(channelId: string) {
-    return (rootId: string, draft?: PostDraft, save = false) => updateCommentDraft(rootId, draft ? {...draft, channelId, remote: false} : draft, save);
+    return (rootId: string, draft?: PostDraft, save = false) => updateCommentDraft(rootId, draft ? {...draft, channelId} : draft, save);
 }
 
 type Actions = {
diff --git a/webapp/channels/src/components/advanced_create_post/advanced_create_post.test.jsx b/webapp/channels/src/components/advanced_create_post/advanced_create_post.test.jsx
index 76ebc7bf4f..eb04b8a1d2 100644
--- a/webapp/channels/src/components/advanced_create_post/advanced_create_post.test.jsx
+++ b/webapp/channels/src/components/advanced_create_post/advanced_create_post.test.jsx
@@ -115,6 +115,7 @@ function advancedCreatePost({
             fullWidthTextBox={fullWidthTextBox}
             currentChannelMembersCount={currentChannelMembersCount}
             draft={draft}
+            isRemoteDraft={false}
             recentPostIdInChannel={recentPostIdInChannel}
             latestReplyablePostId={latestReplyablePostId}
             locale={locale}
diff --git a/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx b/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx
index a8bcd5bbba..bf333ccb43 100644
--- a/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx
+++ b/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx
@@ -124,6 +124,9 @@ type Props = {
     // Data used for populating message state from previous draft
     draft: PostDraft;
 
+    // Data used for knowing if the draft came from a WS event
+    isRemoteDraft: boolean;
+
     // Data used dispatching handleViewAction ex: edit post
     latestReplyablePostId?: string;
     locale: string;
@@ -279,7 +282,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
         };
         if (
             props.currentChannel.id !== state.currentChannel.id ||
-            (props.draft.remote && props.draft.message !== state.message)
+            (props.isRemoteDraft && props.draft.message !== state.message)
         ) {
             updatedState = {
                 ...updatedState,
@@ -294,8 +297,8 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
     constructor(props: Props) {
         super(props);
         this.state = {
-            message: this.props.draft.message,
-            caretPosition: this.props.draft.message.length,
+            message: props.draft.message,
+            caretPosition: props.draft.message.length,
             submitting: false,
             showEmojiPicker: false,
             uploadsProgressPercent: {},
@@ -387,7 +390,6 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
                 this.draftsForChannel[channelId] = {
                     ...draft,
                     show: !isDraftEmpty(draft),
-                    remote: false,
                 } as PostDraft;
             }
         }
diff --git a/webapp/channels/src/components/advanced_create_post/index.ts b/webapp/channels/src/components/advanced_create_post/index.ts
index e6559e9a5b..c582f2316b 100644
--- a/webapp/channels/src/components/advanced_create_post/index.ts
+++ b/webapp/channels/src/components/advanced_create_post/index.ts
@@ -77,6 +77,7 @@ function makeMapStateToProps() {
         const currentChannel = getCurrentChannel(state) || {};
         const currentChannelTeammateUsername = getUser(state, currentChannel.teammate_id || '')?.username;
         const draft = getChannelDraft(state, currentChannel.id);
+        const isRemoteDraft = state.views.drafts.remotes[`${StoragePrefixes.DRAFT}${currentChannel.id}`] || false;
         const latestReplyablePostId = getLatestReplyablePostId(state);
         const currentChannelMembersCount = getCurrentChannelStats(state) ? getCurrentChannelStats(state).member_count : 1;
         const enableEmojiPicker = config.EnableEmojiPicker === 'true';
@@ -117,6 +118,7 @@ function makeMapStateToProps() {
             showSendTutorialTip,
             messageInHistoryItem: getMessageInHistoryItem(state),
             draft,
+            isRemoteDraft,
             latestReplyablePostId,
             locale: getCurrentLocale(state),
             currentUsersLatestPost: getCurrentUsersLatestPost(state, ''),
@@ -181,12 +183,7 @@ function setDraft(key: string, value: PostDraft, draftChannelId: string, save =
         const channelId = draftChannelId || getCurrentChannelId(getState());
         let updatedValue = null;
         if (value) {
-            updatedValue = {...value};
-            updatedValue = {
-                ...value,
-                channelId,
-                remote: false,
-            };
+            updatedValue = {...value, channelId};
         }
         if (updatedValue) {
             return dispatch(updateDraft(key, updatedValue, '', save));
diff --git a/webapp/channels/src/components/drafts/__snapshots__/draft_row.test.tsx.snap b/webapp/channels/src/components/drafts/__snapshots__/draft_row.test.tsx.snap
index cde2a61f2c..e3407af6f6 100644
--- a/webapp/channels/src/components/drafts/__snapshots__/draft_row.test.tsx.snap
+++ b/webapp/channels/src/components/drafts/__snapshots__/draft_row.test.tsx.snap
@@ -39,6 +39,7 @@ exports[`components/drafts/drafts_row should match snapshot for channel draft 1`
         "type": "channel",
       }
     }
+    isRemote={false}
     status={Object {}}
     user={Object {}}
   />
@@ -84,6 +85,7 @@ exports[`components/drafts/drafts_row should match snapshot for thread draft 1`]
         "type": "thread",
       }
     }
+    isRemote={false}
     status={Object {}}
     user={Object {}}
   />
diff --git a/webapp/channels/src/components/drafts/__snapshots__/drafts.test.tsx.snap b/webapp/channels/src/components/drafts/__snapshots__/drafts.test.tsx.snap
index c77a7d5c70..c95826930d 100644
--- a/webapp/channels/src/components/drafts/__snapshots__/drafts.test.tsx.snap
+++ b/webapp/channels/src/components/drafts/__snapshots__/drafts.test.tsx.snap
@@ -34,6 +34,7 @@ exports[`components/drafts/drafts should match snapshot 1`] = `
 >
   <Memo(Drafts)
     displayName="display_name"
+    draftRemotes={Object {}}
     drafts={Array []}
     localDraftsAreEnabled={true}
     status={Object {}}
@@ -76,6 +77,7 @@ exports[`components/drafts/drafts should match snapshot for local drafts disable
 >
   <Memo(Drafts)
     displayName="display_name"
+    draftRemotes={Object {}}
     drafts={Array []}
     localDraftsAreEnabled={false}
     status={Object {}}
diff --git a/webapp/channels/src/components/drafts/channel_draft/__snapshots__/channel_draft.test.tsx.snap b/webapp/channels/src/components/drafts/channel_draft/__snapshots__/channel_draft.test.tsx.snap
index 03010ea2dc..89a01c85e5 100644
--- a/webapp/channels/src/components/drafts/channel_draft/__snapshots__/channel_draft.test.tsx.snap
+++ b/webapp/channels/src/components/drafts/channel_draft/__snapshots__/channel_draft.test.tsx.snap
@@ -42,6 +42,7 @@ exports[`components/drafts/drafts_row should match snapshot for channel draft 1`
     displayName=""
     draftId=""
     id={Object {}}
+    isRemote={false}
     status={Object {}}
     type="channel"
     user={Object {}}
@@ -88,6 +89,7 @@ exports[`components/drafts/drafts_row should match snapshot for undefined channe
     displayName=""
     draftId=""
     id={Object {}}
+    isRemote={false}
     status={Object {}}
     type="channel"
     user={Object {}}
diff --git a/webapp/channels/src/components/drafts/channel_draft/channel_draft.test.tsx b/webapp/channels/src/components/drafts/channel_draft/channel_draft.test.tsx
index 6b043d0808..eab2b86564 100644
--- a/webapp/channels/src/components/drafts/channel_draft/channel_draft.test.tsx
+++ b/webapp/channels/src/components/drafts/channel_draft/channel_draft.test.tsx
@@ -26,6 +26,7 @@ describe('components/drafts/drafts_row', () => {
         type: 'channel' as 'channel' | 'thread',
         user: {} as UserProfile,
         value: {} as PostDraft,
+        isRemote: false,
     };
 
     it('should match snapshot for channel draft', () => {
diff --git a/webapp/channels/src/components/drafts/channel_draft/channel_draft.tsx b/webapp/channels/src/components/drafts/channel_draft/channel_draft.tsx
index 4ac7c15608..3ec5dd72d1 100644
--- a/webapp/channels/src/components/drafts/channel_draft/channel_draft.tsx
+++ b/webapp/channels/src/components/drafts/channel_draft/channel_draft.tsx
@@ -29,6 +29,7 @@ type Props = {
     type: 'channel' | 'thread';
     user: UserProfile;
     value: PostDraft;
+    isRemote: boolean;
 }
 
 function ChannelDraft({
@@ -40,6 +41,7 @@ function ChannelDraft({
     type,
     user,
     value,
+    isRemote,
 }: Props) {
     const dispatch = useDispatch();
     const history = useHistory();
@@ -101,7 +103,7 @@ function ChannelDraft({
                             />
                         )}
                         timestamp={value.updateAt}
-                        remote={value.remote || false}
+                        remote={isRemote || false}
                     />
                     <PanelBody
                         channelId={channel.id}
diff --git a/webapp/channels/src/components/drafts/draft_row.test.tsx b/webapp/channels/src/components/drafts/draft_row.test.tsx
index 89cd429588..2c08fe68c1 100644
--- a/webapp/channels/src/components/drafts/draft_row.test.tsx
+++ b/webapp/channels/src/components/drafts/draft_row.test.tsx
@@ -21,6 +21,7 @@ describe('components/drafts/drafts_row', () => {
         user: {} as UserProfile,
         status: {} as UserStatus['status'],
         displayName: 'test',
+        isRemote: false,
     };
 
     it('should match snapshot for channel draft', () => {
diff --git a/webapp/channels/src/components/drafts/draft_row.tsx b/webapp/channels/src/components/drafts/draft_row.tsx
index 18913dd03e..004dbfb554 100644
--- a/webapp/channels/src/components/drafts/draft_row.tsx
+++ b/webapp/channels/src/components/drafts/draft_row.tsx
@@ -14,9 +14,10 @@ type Props = {
     status: UserStatus['status'];
     displayName: string;
     draft: Draft;
+    isRemote: boolean;
 }
 
-function DraftRow({draft, user, status, displayName}: Props) {
+function DraftRow({draft, user, status, displayName, isRemote}: Props) {
     switch (draft.type) {
     case 'channel':
         return (
@@ -26,6 +27,7 @@ function DraftRow({draft, user, status, displayName}: Props) {
                 user={user}
                 status={status}
                 displayName={displayName}
+                isRemote={isRemote}
             />
         );
     case 'thread':
@@ -37,6 +39,7 @@ function DraftRow({draft, user, status, displayName}: Props) {
                 user={user}
                 status={status}
                 displayName={displayName}
+                isRemote={isRemote}
             />
         );
     default:
diff --git a/webapp/channels/src/components/drafts/drafts.test.tsx b/webapp/channels/src/components/drafts/drafts.test.tsx
index 0c5527c743..3453780f41 100644
--- a/webapp/channels/src/components/drafts/drafts.test.tsx
+++ b/webapp/channels/src/components/drafts/drafts.test.tsx
@@ -20,6 +20,7 @@ describe('components/drafts/drafts', () => {
         displayName: 'display_name',
         status: {} as UserStatus['status'],
         localDraftsAreEnabled: true,
+        draftRemotes: {},
     };
 
     it('should match snapshot', () => {
diff --git a/webapp/channels/src/components/drafts/drafts.tsx b/webapp/channels/src/components/drafts/drafts.tsx
index b929e1cd17..a2f499fe11 100644
--- a/webapp/channels/src/components/drafts/drafts.tsx
+++ b/webapp/channels/src/components/drafts/drafts.tsx
@@ -27,11 +27,13 @@ type Props = {
     displayName: string;
     status: UserStatus['status'];
     localDraftsAreEnabled: boolean;
+    draftRemotes: Record<string, boolean>;
 }
 
 function Drafts({
     displayName,
     drafts,
+    draftRemotes,
     status,
     user,
     localDraftsAreEnabled,
@@ -75,6 +77,7 @@ function Drafts({
                         key={d.key}
                         displayName={displayName}
                         draft={d}
+                        isRemote={draftRemotes[d.key]}
                         user={user}
                         status={status}
                     />
diff --git a/webapp/channels/src/components/drafts/index.ts b/webapp/channels/src/components/drafts/index.ts
index 201f6102c1..11347f4d12 100644
--- a/webapp/channels/src/components/drafts/index.ts
+++ b/webapp/channels/src/components/drafts/index.ts
@@ -22,6 +22,7 @@ function makeMapStateToProps() {
         return {
             displayName: displayUsername(user, getTeammateNameDisplaySetting(state)),
             drafts: getDrafts(state),
+            draftRemotes: state.views.drafts.remotes,
             status,
             user,
             localDraftsAreEnabled: localDraftsAreEnabled(state),
diff --git a/webapp/channels/src/components/drafts/thread_draft/__snapshots__/thread_draft.test.tsx.snap b/webapp/channels/src/components/drafts/thread_draft/__snapshots__/thread_draft.test.tsx.snap
index 8881d2f961..b4e4330511 100644
--- a/webapp/channels/src/components/drafts/thread_draft/__snapshots__/thread_draft.test.tsx.snap
+++ b/webapp/channels/src/components/drafts/thread_draft/__snapshots__/thread_draft.test.tsx.snap
@@ -42,6 +42,7 @@ exports[`components/drafts/drafts_row should match snapshot for channel draft 1`
     displayName=""
     draftId=""
     id={Object {}}
+    isRemote={false}
     rootId=""
     status={Object {}}
     thread={
@@ -98,6 +99,7 @@ exports[`components/drafts/drafts_row should match snapshot for undefined thread
     displayName=""
     draftId=""
     id={Object {}}
+    isRemote={false}
     rootId=""
     status={Object {}}
     thread={null}
diff --git a/webapp/channels/src/components/drafts/thread_draft/thread_draft.test.tsx b/webapp/channels/src/components/drafts/thread_draft/thread_draft.test.tsx
index f35378ab58..30635e4aa9 100644
--- a/webapp/channels/src/components/drafts/thread_draft/thread_draft.test.tsx
+++ b/webapp/channels/src/components/drafts/thread_draft/thread_draft.test.tsx
@@ -31,6 +31,7 @@ describe('components/drafts/drafts_row', () => {
         type: 'thread' as 'channel' | 'thread',
         user: {} as UserProfile,
         value: {} as PostDraft,
+        isRemote: false,
     };
 
     it('should match snapshot for channel draft', () => {
diff --git a/webapp/channels/src/components/drafts/thread_draft/thread_draft.tsx b/webapp/channels/src/components/drafts/thread_draft/thread_draft.tsx
index 6856e135bf..e789ddc243 100644
--- a/webapp/channels/src/components/drafts/thread_draft/thread_draft.tsx
+++ b/webapp/channels/src/components/drafts/thread_draft/thread_draft.tsx
@@ -33,6 +33,7 @@ type Props = {
     type: 'channel' | 'thread';
     user: UserProfile;
     value: PostDraft;
+    isRemote: boolean;
 }
 
 function ThreadDraft({
@@ -45,6 +46,7 @@ function ThreadDraft({
     type,
     user,
     value,
+    isRemote,
 }: Props) {
     const dispatch = useDispatch();
 
@@ -107,7 +109,7 @@ function ThreadDraft({
                             />
                         )}
                         timestamp={value.updateAt}
-                        remote={value.remote || false}
+                        remote={isRemote || false}
                     />
                     <PanelBody
                         channelId={channel.id}
diff --git a/webapp/channels/src/reducers/storage.ts b/webapp/channels/src/reducers/storage.ts
index ad4d79f969..20ddf7722b 100644
--- a/webapp/channels/src/reducers/storage.ts
+++ b/webapp/channels/src/reducers/storage.ts
@@ -144,7 +144,6 @@ function migrateDrafts(state: any) {
                 createAt: timestamp.getTime(),
                 updateAt: timestamp.getTime(),
                 show: true,
-                remote: false,
             },
         };
 
diff --git a/webapp/channels/src/reducers/views/drafts.ts b/webapp/channels/src/reducers/views/drafts.ts
new file mode 100644
index 0000000000..344807b124
--- /dev/null
+++ b/webapp/channels/src/reducers/views/drafts.ts
@@ -0,0 +1,25 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {combineReducers} from 'redux';
+import {GenericAction} from 'mattermost-redux/types/actions';
+import {ActionTypes} from 'utils/constants';
+
+function remotes(state: Record<string, boolean> = {}, action: GenericAction) {
+    switch (action.type) {
+    case ActionTypes.SET_DRAFT_SOURCE:
+        return {
+            ...state,
+            [action.data.key]: action.data.isRemote,
+        };
+    default:
+        return state;
+    }
+}
+
+export default combineReducers({
+
+    // object that stores global draft keys indicating whether the draft came from a WebSocket event.
+    remotes,
+
+});
diff --git a/webapp/channels/src/reducers/views/index.ts b/webapp/channels/src/reducers/views/index.ts
index 6d305e40d8..903ca473e2 100644
--- a/webapp/channels/src/reducers/views/index.ts
+++ b/webapp/channels/src/reducers/views/index.ts
@@ -28,6 +28,7 @@ import addChannelDropdown from './add_channel_dropdown';
 import addChannelCtaDropdown from './add_channel_cta_dropdown';
 import threads from './threads';
 import onboardingTasks from './onboarding_tasks';
+import drafts from './drafts';
 
 export default combineReducers({
     admin,
@@ -55,4 +56,5 @@ export default combineReducers({
     onboardingTasks,
     threads,
     productMenu,
+    drafts,
 });
diff --git a/webapp/channels/src/types/store/draft.ts b/webapp/channels/src/types/store/draft.ts
index 3597fa3b12..a1b6b8380d 100644
--- a/webapp/channels/src/types/store/draft.ts
+++ b/webapp/channels/src/types/store/draft.ts
@@ -20,7 +20,6 @@ export type PostDraft = {
     createAt: number;
     updateAt: number;
     show?: boolean;
-    remote?: boolean;
     metadata?: {
         priority?: {
             priority: PostPriority|'';
diff --git a/webapp/channels/src/types/store/views.ts b/webapp/channels/src/types/store/views.ts
index 19f34b7744..a4379852ce 100644
--- a/webapp/channels/src/types/store/views.ts
+++ b/webapp/channels/src/types/store/views.ts
@@ -62,6 +62,12 @@ export type ViewsState = {
         toastStatus: boolean;
     };
 
+    drafts: {
+        remotes: {
+            [storageKey: string]: boolean;
+        };
+    };
+
     rhs: RhsViewState;
 
     rhsSuppressed: boolean;
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index 856cb071df..62fc2e8fdd 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -337,6 +337,8 @@ export const ActionTypes = keyMirror({
     RECEIVED_PLUGIN_INSIGHT: null,
     SET_EDIT_CHANNEL_MEMBERS: null,
     NEEDS_LOGGED_IN_LIMIT_REACHED_CHECK: null,
+
+    SET_DRAFT_SOURCE: null,
 });
 
 export const PostRequestTypes = keyMirror({

From a8d79ec3daec5795ab0fca0e97de3863378a2aec Mon Sep 17 00:00:00 2001
From: mattermod <dev-ops@mattermost.com>
Date: Tue, 18 Apr 2023 10:18:55 +0000
Subject: [PATCH 101/103] Update latest version to 7.9.2

---
 server/build/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/build/Dockerfile b/server/build/Dockerfile
index 2faf4af160..54bd19368a 100644
--- a/server/build/Dockerfile
+++ b/server/build/Dockerfile
@@ -8,7 +8,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ENV PATH="/mattermost/bin:${PATH}"
 ARG PUID=2000
 ARG PGID=2000
-ARG MM_PACKAGE="https://releases.mattermost.com/7.9.1/mattermost-7.9.1-linux-amd64.tar.gz?src=docker"
+ARG MM_PACKAGE="https://releases.mattermost.com/7.9.2/mattermost-7.9.2-linux-amd64.tar.gz?src=docker"
 
 # # Install needed packages and indirect dependencies
 RUN apt-get update \

From 067e36c23ca5ff50b592099e5091b7076a53c8d0 Mon Sep 17 00:00:00 2001
From: Miguel de la Cruz <miguel@mcrx.me>
Date: Tue, 18 Apr 2023 13:58:33 +0200
Subject: [PATCH 102/103] Enable products for tests (#22757)

* Enable products for channels tests

* increase unit test timeout; check IsConfigReadOnly

* make app-layers

* Avoid loading boards tempaltes between tests to improve speed

* Fix delete query to be compatible with both databases

* Avoid preserving the templates for boards store tests

* Run all tests in one command

* Revert "Run all tests in one command"

This reverts commit 0330f7cd8f96b47776770e8f80ba6ba18d98b8d1.

* concurrent pkg group tests in CI

* Revert "Revert "Run all tests in one command""

This reverts commit 73892fec772575ff054a99ba9e00a7b57ca74164.

* Revert "concurrent pkg group tests in CI"

This reverts commit 550fb6cdd4a7f14d9632f2626bc66f389173b5d9.

* try testing 3 subsets of packages concurrently to improve time taken

* Revert "try testing 3 subsets of packages concurrently to improve time taken"

This reverts commit 97475f3c4eafa8bbe047097e0841220884f68cdc.

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
Co-authored-by: wiggin77 <wiggin77@warpmail.net>
---
 server/Makefile                               | 28 +++-----
 server/boards/model/services_api.go           | 12 ++--
 server/boards/server/notifications.go         |  2 +-
 .../mattermostauthlayer.go                    |  7 +-
 .../mattermostauthlayer_test.go               |  4 +-
 .../services/store/sqlstore/sqlstore.go       |  4 ++
 server/channels/api4/apitestlib.go            | 22 ++++--
 server/channels/api4/bot_test.go              |  7 +-
 server/channels/api4/channel_test.go          | 13 +++-
 server/channels/api4/post_test.go             |  6 ++
 server/channels/api4/user_test.go             |  2 +-
 server/channels/app/app_iface.go              |  1 +
 server/channels/app/app_test.go               |  5 +-
 server/channels/app/authorization_test.go     |  6 ++
 server/channels/app/bot_test.go               |  2 +-
 server/channels/app/channel_test.go           |  2 +-
 server/channels/app/config.go                 |  4 ++
 server/channels/app/helper_test.go            | 22 ++++--
 server/channels/app/notification_push_test.go | 14 ++--
 .../app/opentracing/opentracing_layer.go      | 17 +++++
 server/channels/app/options.go                | 11 +++
 server/channels/app/platform/config.go        |  5 ++
 server/channels/app/platform/helper_test.go   |  2 +
 server/channels/app/platform/service_test.go  |  9 ---
 server/channels/app/platform/web_hub_test.go  |  1 +
 server/channels/app/plugin_api_test.go        |  4 +-
 server/channels/app/plugin_commands_test.go   | 12 ++--
 server/channels/app/plugin_hooks_test.go      |  2 +-
 server/channels/app/post_test.go              |  1 +
 server/channels/app/product.go                |  6 ++
 server/channels/app/product_test.go           | 28 ++------
 server/channels/app/server.go                 |  2 +
 server/channels/app/server_test.go            | 19 ++++--
 .../channels/app/slashcommands/helper_test.go |  2 +
 server/channels/app/user_test.go              |  2 +-
 server/channels/app/user_viewmembers_test.go  |  2 +-
 server/channels/store/sqlstore/store.go       | 44 +++++++++++-
 server/channels/testlib/helper.go             | 67 +++++++++++++++++++
 server/channels/testlib/store.go              |  4 ++
 .../boards_mysql_migration_warmup.sql         | 41 ++++++++++++
 .../boards_postgres_migration_warmup.sql      | 26 +++++++
 server/channels/web/web_test.go               |  9 +--
 server/cmd/mattermost/commands/server_test.go |  3 +
 43 files changed, 377 insertions(+), 105 deletions(-)
 create mode 100644 server/channels/testlib/testdata/boards_mysql_migration_warmup.sql
 create mode 100644 server/channels/testlib/testdata/boards_postgres_migration_warmup.sql

diff --git a/server/Makefile b/server/Makefile
index e824d5129d..83b4fd5531 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -132,9 +132,7 @@ DIST_PATH_WIN=$(DIST_ROOT)/windows/mattermost
 TESTS=.
 
 # Packages lists
-TE_PACKAGES=$(shell $(GO) list ./... | grep -vE 'server/v8/playbooks|server/v8/boards')
-BOARDS_PACKAGES=$(shell $(GO) list ./... | grep -E 'server/v8/boards')
-PLAYBOOKS_PACKAGES=$(shell $(GO) list ./... | grep -E 'server/v8/playbooks')
+SUITE_PACKAGES=$(shell $(GO) list ./...)
 
 TEMPLATES_DIR=templates
 
@@ -170,9 +168,9 @@ endif
 EE_PACKAGES=$(shell $(GO) list $(BUILD_ENTERPRISE_DIR)/...)
 
 ifeq ($(BUILD_ENTERPRISE_READY),true)
-  ALL_PACKAGES=$(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES) $(EE_PACKAGES)
+  ALL_PACKAGES=$(SUITE_PACKAGES) $(EE_PACKAGES)
 else
-  ALL_PACKAGES=$(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES)
+  ALL_PACKAGES=$(SUITE_PACKAGES)
 endif
 
 all: run ## Alias for 'run'.
@@ -412,7 +410,7 @@ go-junit-report:
 test-compile: ## Compile tests.
 	@echo COMPILE TESTS
 
-	for package in $(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES) $(EE_PACKAGES); do \
+	for package in $(SUITE_PACKAGES) $(EE_PACKAGES); do \
 		$(GO) test $(GOFLAGS) -c $$package; \
 	done
 
@@ -450,9 +448,7 @@ else
 endif
 
 test-server-race: test-server-pre
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(TE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic"
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(BOARDS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic"
-	MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(PLAYBOOKS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic"
+	./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(SUITE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic"
 ifneq ($(IS_CI),true)
   ifneq ($(MM_NO_DOCKER),true)
     ifneq ($(TEMP_DOCKER_SERVICES),)
@@ -463,9 +459,7 @@ ifneq ($(IS_CI),true)
 endif
 
 test-server: test-server-pre
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(TE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "45m" "count"
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(BOARDS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "45m" "count"
-	MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(PLAYBOOKS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "45m" "count"
+	./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(SUITE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "count"
 ifneq ($(IS_CI),true)
   ifneq ($(MM_NO_DOCKER),true)
     ifneq ($(TEMP_DOCKER_SERVICES),)
@@ -477,19 +471,15 @@ endif
 
 test-server-ee: check-prereqs-enterprise start-docker go-junit-report do-cover-file ## Runs EE tests.
 	@echo Running only EE tests
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "20m" "count"
+	./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "20m" "count"
 
 test-server-quick: check-prereqs-enterprise ## Runs only quick tests.
 ifeq ($(BUILD_ENTERPRISE_READY),true)
 	@echo Running all tests
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(TE_PACKAGES) $(EE_PACKAGES)
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false $(GO) test $(GOFLAGS) -short $(BOARDS_PACKAGES)
-	MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(PLAYBOOKS_PACKAGES)
+	$(GO) test $(GOFLAGS) -short $(SUITE_PACKAGES) $(EE_PACKAGES)
 else
 	@echo Running only TE tests
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(TE_PACKAGES)
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false $(GO) test $(GOFLAGS) -short $(BOARDS_PACKAGES)
-	MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(PLAYBOOKS_PACKAGES)
+	$(GO) test $(GOFLAGS) -short $(SUITE_PACKAGES)
 endif
 
 internal-test-web-client: ## Runs web client tests.
diff --git a/server/boards/model/services_api.go b/server/boards/model/services_api.go
index d1918f9217..0a8f106042 100644
--- a/server/boards/model/services_api.go
+++ b/server/boards/model/services_api.go
@@ -20,11 +20,13 @@ const (
 	botDescription = "Created by Boards plugin."
 )
 
-var FocalboardBot = &mm_model.Bot{
-	Username:    botUsername,
-	DisplayName: botDisplayname,
-	Description: botDescription,
-	OwnerId:     SystemUserID,
+func GetDefaultFocalboardBot() *mm_model.Bot {
+	return &mm_model.Bot{
+		Username:    botUsername,
+		DisplayName: botDisplayname,
+		Description: botDescription,
+		OwnerId:     SystemUserID,
+	}
 }
 
 type ServicesAPI interface {
diff --git a/server/boards/server/notifications.go b/server/boards/server/notifications.go
index 5f085d163d..656e37f999 100644
--- a/server/boards/server/notifications.go
+++ b/server/boards/server/notifications.go
@@ -66,7 +66,7 @@ func createSubscriptionsNotifyBackend(params notifyBackendParams) (*notifysubscr
 }
 
 func createDelivery(servicesAPI model.ServicesAPI, serverRoot string) (*plugindelivery.PluginDelivery, error) {
-	bot := model.FocalboardBot
+	bot := model.GetDefaultFocalboardBot()
 
 	botID, err := servicesAPI.EnsureBot(bot)
 	if err != nil {
diff --git a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go
index 669305a076..b024d5224a 100644
--- a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go
+++ b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go
@@ -70,9 +70,10 @@ func New(dbType string, db *sql.DB, store store.Store, logger mlog.LoggerIFace,
 	return layer, nil
 }
 
-// Shutdown close the connection with the store.
+// For MattermostAuthLayer we don't close the database connection
+// because it's directly managed by the platform
 func (s *MattermostAuthLayer) Shutdown() error {
-	return s.Store.Shutdown()
+	return nil
 }
 
 func (s *MattermostAuthLayer) GetRegisteredUserCount() (int, error) {
@@ -1218,7 +1219,7 @@ func (s *MattermostAuthLayer) GetChannel(teamID, channelID string) (*mm_model.Ch
 func (s *MattermostAuthLayer) getBoardsBotID() (string, error) {
 	if boardsBotID == "" {
 		var err error
-		boardsBotID, err = s.servicesAPI.EnsureBot(model.FocalboardBot)
+		boardsBotID, err = s.servicesAPI.EnsureBot(model.GetDefaultFocalboardBot())
 		if err != nil {
 			s.logger.Error("failed to ensure boards bot", mlog.Err(err))
 			return "", err
diff --git a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go
index fed0665789..88a936db9f 100644
--- a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go
+++ b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go
@@ -24,11 +24,11 @@ func TestGetBoardsBotID(t *testing.T) {
 
 	mmAuthLayer, _ := New("test", nil, nil, mlog.CreateConsoleTestLogger(true, mlog.LvlError), servicesAPI, "")
 
-	servicesAPI.EXPECT().EnsureBot(model.FocalboardBot).Return("", errTest)
+	servicesAPI.EXPECT().EnsureBot(model.GetDefaultFocalboardBot()).Return("", errTest)
 	_, err := mmAuthLayer.getBoardsBotID()
 	require.NotEmpty(t, err)
 
-	servicesAPI.EXPECT().EnsureBot(model.FocalboardBot).Return("TestBotID", nil).Times(1)
+	servicesAPI.EXPECT().EnsureBot(model.GetDefaultFocalboardBot()).Return("TestBotID", nil).Times(1)
 	botID, err := mmAuthLayer.getBoardsBotID()
 	require.Empty(t, err)
 	require.NotEmpty(t, botID)
diff --git a/server/boards/services/store/sqlstore/sqlstore.go b/server/boards/services/store/sqlstore/sqlstore.go
index 8e9fe4b158..34be3d446d 100644
--- a/server/boards/services/store/sqlstore/sqlstore.go
+++ b/server/boards/services/store/sqlstore/sqlstore.go
@@ -199,6 +199,10 @@ func (s *SQLStore) DBVersion() string {
 	return version
 }
 
+// dropAllTables deletes the contents of all the database tables
+// except the schema_migrations table with the intention of cleaning
+// the state for the next text to execute without having to run the
+// migrations.
 func (s *SQLStore) dropAllTables(db sq.BaseRunner) error {
 	if s.DBType() == model.PostgresDBType {
 		_, err := db.Exec(`DO
diff --git a/server/channels/api4/apitestlib.go b/server/channels/api4/apitestlib.go
index e41bae3f38..424445de5d 100644
--- a/server/channels/api4/apitestlib.go
+++ b/server/channels/api4/apitestlib.go
@@ -93,7 +93,9 @@ func setupTestHelper(dbStore store.Store, searchEngine *searchengine.Broker, ent
 		panic("failed to initialize memory store: " + err.Error())
 	}
 
-	memoryConfig := &model.Config{}
+	memoryConfig := &model.Config{
+		SqlSettings: *mainHelper.GetSQLSettings(),
+	}
 	memoryConfig.SetDefaults()
 	*memoryConfig.PluginSettings.Directory = filepath.Join(tempWorkspace, "plugins")
 	*memoryConfig.PluginSettings.ClientDirectory = filepath.Join(tempWorkspace, "webapp")
@@ -287,6 +289,7 @@ func SetupConfig(tb testing.TB, updateConfig func(cfg *model.Config)) *TestHelpe
 	dbStore := mainHelper.GetStore()
 	dbStore.DropAllTables()
 	dbStore.MarkSystemRanUnitTests()
+	mainHelper.PreloadBoardsMigrationsIfNeeded()
 	searchEngine := mainHelper.GetSearchEngine()
 	th := setupTestHelper(dbStore, searchEngine, false, true, updateConfig, nil)
 	th.InitLogin()
@@ -294,7 +297,8 @@ func SetupConfig(tb testing.TB, updateConfig func(cfg *model.Config)) *TestHelpe
 }
 
 func SetupConfigWithStoreMock(tb testing.TB, updateConfig func(cfg *model.Config)) *TestHelper {
-	th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, false, false, updateConfig, nil)
+	setupOptions := []app.Option{app.SkipProductsInitialization()}
+	th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, false, false, updateConfig, setupOptions)
 	statusMock := mocks.StatusStore{}
 	statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil)
 	statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil)
@@ -308,7 +312,8 @@ func SetupConfigWithStoreMock(tb testing.TB, updateConfig func(cfg *model.Config
 }
 
 func SetupWithStoreMock(tb testing.TB) *TestHelper {
-	th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, false, false, nil, nil)
+	setupOptions := []app.Option{app.SkipProductsInitialization()}
+	th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, false, false, nil, setupOptions)
 	statusMock := mocks.StatusStore{}
 	statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil)
 	statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil)
@@ -322,7 +327,8 @@ func SetupWithStoreMock(tb testing.TB) *TestHelper {
 }
 
 func SetupEnterpriseWithStoreMock(tb testing.TB, options ...app.Option) *TestHelper {
-	th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, true, false, nil, options)
+	setupOptions := append(options, app.SkipProductsInitialization())
+	th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, true, false, nil, setupOptions)
 	statusMock := mocks.StatusStore{}
 	statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil)
 	statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil)
@@ -479,6 +485,14 @@ func (th *TestHelper) InitBasic() *TestHelper {
 	return th
 }
 
+func (th *TestHelper) DeleteBots() *TestHelper {
+	preexistingBots, _ := th.App.GetBots(&model.BotGetOptions{Page: 0, PerPage: 100})
+	for _, bot := range preexistingBots {
+		th.App.PermanentDeleteBot(bot.UserId)
+	}
+	return th
+}
+
 func (th *TestHelper) waitForConnectivity() {
 	for i := 0; i < 1000; i++ {
 		conn, err := net.Dial("tcp", fmt.Sprintf("localhost:%v", th.App.Srv().ListenAddr.Port))
diff --git a/server/channels/api4/bot_test.go b/server/channels/api4/bot_test.go
index 555b1b9fc5..9c0cbb068d 100644
--- a/server/channels/api4/bot_test.go
+++ b/server/channels/api4/bot_test.go
@@ -297,11 +297,10 @@ func TestPatchBot(t *testing.T) {
 		require.NoError(t, err)
 		CheckOKStatus(t, resp)
 
-		bots, resp, err := th.Client.GetBots(0, 2, "")
+		bot, resp, err := th.Client.GetBot(createdBot.UserId, "")
 		require.NoError(t, err)
 		CheckOKStatus(t, resp)
-		require.Len(t, bots, 1)
-		require.Equal(t, []*model.Bot{patchedBot}, bots)
+		require.Equal(t, patchedBot, bot)
 	})
 
 	t.Run("patch my bot without permission", func(t *testing.T) {
@@ -630,7 +629,7 @@ func TestGetBot(t *testing.T) {
 }
 
 func TestGetBots(t *testing.T) {
-	th := Setup(t).InitBasic()
+	th := Setup(t).InitBasic().DeleteBots()
 	defer th.TearDown()
 
 	th.App.UpdateConfig(func(cfg *model.Config) {
diff --git a/server/channels/api4/channel_test.go b/server/channels/api4/channel_test.go
index 73ae52cf12..3afb21d731 100644
--- a/server/channels/api4/channel_test.go
+++ b/server/channels/api4/channel_test.go
@@ -4140,6 +4140,12 @@ func TestGetChannelModerations(t *testing.T) {
 		scheme.DefaultChannelGuestRole = ""
 
 		mockStore := mocks.Store{}
+
+		// Playbooks DB job requires a plugin mock
+		pluginStore := mocks.PluginStore{}
+		pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil)
+		mockStore.On("Plugin").Return(&pluginStore)
+
 		mockSchemeStore := mocks.SchemeStore{}
 		mockSchemeStore.On("Get", mock.Anything).Return(scheme, nil)
 		mockStore.On("Scheme").Return(&mockSchemeStore)
@@ -4282,6 +4288,12 @@ func TestPatchChannelModerations(t *testing.T) {
 		scheme.DefaultChannelGuestRole = ""
 
 		mockStore := mocks.Store{}
+
+		// Playbooks DB job requires a plugin mock
+		pluginStore := mocks.PluginStore{}
+		pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil)
+		mockStore.On("Plugin").Return(&pluginStore)
+
 		mockSchemeStore := mocks.SchemeStore{}
 		mockSchemeStore.On("Get", mock.Anything).Return(scheme, nil)
 		mockSchemeStore.On("Save", mock.Anything).Return(scheme, nil)
@@ -4340,7 +4352,6 @@ func TestPatchChannelModerations(t *testing.T) {
 			require.Equal(t, moderation.Roles.Members.Enabled, true)
 		}
 	})
-
 }
 
 func TestGetChannelMemberCountsByGroup(t *testing.T) {
diff --git a/server/channels/api4/post_test.go b/server/channels/api4/post_test.go
index 6be2cb3223..e3d3863049 100644
--- a/server/channels/api4/post_test.go
+++ b/server/channels/api4/post_test.go
@@ -1541,6 +1541,12 @@ func TestGetFlaggedPostsForUser(t *testing.T) {
 	mockStore.On("License").Return(th.App.Srv().Store().License())
 	mockStore.On("Role").Return(th.App.Srv().Store().Role())
 	mockStore.On("Close").Return(nil)
+
+	// Playbooks DB job requires a plugin mock
+	pluginStore := mocks.PluginStore{}
+	pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil)
+	mockStore.On("Plugin").Return(&pluginStore)
+
 	th.App.Srv().SetStore(&mockStore)
 
 	_, resp, err = th.SystemAdminClient.GetFlaggedPostsForUser(user.Id, 0, 10)
diff --git a/server/channels/api4/user_test.go b/server/channels/api4/user_test.go
index 95db64d720..8d9673ed9e 100644
--- a/server/channels/api4/user_test.go
+++ b/server/channels/api4/user_test.go
@@ -2714,7 +2714,7 @@ func TestGetUsersInTeam(t *testing.T) {
 }
 
 func TestGetUsersNotInTeam(t *testing.T) {
-	th := Setup(t).InitBasic()
+	th := Setup(t).InitBasic().DeleteBots()
 	defer th.TearDown()
 	teamId := th.BasicTeam.Id
 
diff --git a/server/channels/app/app_iface.go b/server/channels/app/app_iface.go
index 578699e941..2c38a3afd8 100644
--- a/server/channels/app/app_iface.go
+++ b/server/channels/app/app_iface.go
@@ -892,6 +892,7 @@ type AppIface interface {
 	InviteNewUsersToTeam(emailList []string, teamID, senderId string) *model.AppError
 	InviteNewUsersToTeamGracefully(memberInvite *model.MemberInvite, teamID, senderId string, reminderInterval string) ([]*model.EmailInviteWithError, *model.AppError)
 	IsCRTEnabledForUser(c request.CTX, userID string) bool
+	IsConfigReadOnly() bool
 	IsFirstAdmin(user *model.User) bool
 	IsFirstUserAccount() bool
 	IsLeader() bool
diff --git a/server/channels/app/app_test.go b/server/channels/app/app_test.go
index 16b6805276..22f221d47b 100644
--- a/server/channels/app/app_test.go
+++ b/server/channels/app/app_test.go
@@ -12,12 +12,13 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 
 	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
 	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
-/* Temporarily comment out until MM-11108
+/* TODO: Temporarily comment out until MM-11108
 func TestAppRace(t *testing.T) {
 	for i := 0; i < 10; i++ {
 		a, err := New()
@@ -61,6 +62,8 @@ func TestUnitUpdateConfig(t *testing.T) {
 
 	prev := *th.App.Config().ServiceSettings.SiteURL
 
+	require.False(t, th.App.IsConfigReadOnly())
+
 	var called int32
 	th.App.AddConfigListener(func(old, current *model.Config) {
 		atomic.AddInt32(&called, 1)
diff --git a/server/channels/app/authorization_test.go b/server/channels/app/authorization_test.go
index b326c22db7..4106cd1966 100644
--- a/server/channels/app/authorization_test.go
+++ b/server/channels/app/authorization_test.go
@@ -85,6 +85,12 @@ func TestSessionHasPermissionToChannel(t *testing.T) {
 		// Regression test for MM-29812
 		// Mock the channel store so getting the channel returns with an error, as per the bug report.
 		mockStore := mocks.Store{}
+
+		// Playbooks DB job requires a plugin mock
+		pluginStore := mocks.PluginStore{}
+		pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil)
+		mockStore.On("Plugin").Return(&pluginStore)
+
 		mockChannelStore := mocks.ChannelStore{}
 		mockChannelStore.On("Get", mock.Anything, mock.Anything).Return(nil, fmt.Errorf("arbitrary error"))
 		mockChannelStore.On("GetAllChannelMembersForUser", mock.Anything, mock.Anything, mock.Anything).Return(th.App.Srv().Store().Channel().GetAllChannelMembersForUser(th.BasicUser.Id, false, false))
diff --git a/server/channels/app/bot_test.go b/server/channels/app/bot_test.go
index c417678679..c55a01414e 100644
--- a/server/channels/app/bot_test.go
+++ b/server/channels/app/bot_test.go
@@ -278,7 +278,7 @@ func TestGetBot(t *testing.T) {
 }
 
 func TestGetBots(t *testing.T) {
-	th := Setup(t)
+	th := Setup(t).DeleteBots()
 	defer th.TearDown()
 
 	OwnerId1 := model.NewId()
diff --git a/server/channels/app/channel_test.go b/server/channels/app/channel_test.go
index 87ab389beb..eaf1171a6c 100644
--- a/server/channels/app/channel_test.go
+++ b/server/channels/app/channel_test.go
@@ -554,7 +554,7 @@ func TestGetDirectChannelCreatesChannelMemberHistoryRecord(t *testing.T) {
 }
 
 func TestAddUserToChannelCreatesChannelMemberHistoryRecord(t *testing.T) {
-	th := Setup(t).InitBasic()
+	th := Setup(t).InitBasic().DeleteBots()
 	defer th.TearDown()
 
 	// create a user and add it to a channel
diff --git a/server/channels/app/config.go b/server/channels/app/config.go
index 93719b3461..d7265935c3 100644
--- a/server/channels/app/config.go
+++ b/server/channels/app/config.go
@@ -40,6 +40,10 @@ func (a *App) UpdateConfig(f func(*model.Config)) {
 	a.Srv().platform.UpdateConfig(f)
 }
 
+func (a *App) IsConfigReadOnly() bool {
+	return a.Srv().platform.IsConfigReadOnly()
+}
+
 func (a *App) ReloadConfig() error {
 	return a.Srv().platform.ReloadConfig()
 }
diff --git a/server/channels/app/helper_test.go b/server/channels/app/helper_test.go
index ba17c9f0f0..294de97280 100644
--- a/server/channels/app/helper_test.go
+++ b/server/channels/app/helper_test.go
@@ -52,8 +52,8 @@ func setupTestHelper(dbStore store.Store, enterprise bool, includeCacheLayer boo
 	}
 
 	configStore := config.NewTestMemoryStore()
-
 	memoryConfig := configStore.Get()
+	memoryConfig.SqlSettings = *mainHelper.GetSQLSettings()
 	*memoryConfig.PluginSettings.Directory = filepath.Join(tempWorkspace, "plugins")
 	*memoryConfig.PluginSettings.ClientDirectory = filepath.Join(tempWorkspace, "webapp")
 	*memoryConfig.PluginSettings.AutomaticPrepackagedPlugins = false
@@ -138,7 +138,7 @@ func setupTestHelper(dbStore store.Store, enterprise bool, includeCacheLayer boo
 	return th
 }
 
-func Setup(tb testing.TB) *TestHelper {
+func Setup(tb testing.TB, options ...Option) *TestHelper {
 	if testing.Short() {
 		tb.SkipNow()
 	}
@@ -147,7 +147,7 @@ func Setup(tb testing.TB) *TestHelper {
 	dbStore.MarkSystemRanUnitTests()
 	mainHelper.PreloadMigrations()
 
-	return setupTestHelper(dbStore, false, true, nil, tb)
+	return setupTestHelper(dbStore, false, true, options, tb)
 }
 
 func SetupWithoutPreloadMigrations(tb testing.TB) *TestHelper {
@@ -157,13 +157,16 @@ func SetupWithoutPreloadMigrations(tb testing.TB) *TestHelper {
 	dbStore := mainHelper.GetStore()
 	dbStore.DropAllTables()
 	dbStore.MarkSystemRanUnitTests()
+	// Only boards migrations are applied
+	mainHelper.PreloadBoardsMigrationsIfNeeded()
 
 	return setupTestHelper(dbStore, false, true, nil, tb)
 }
 
 func SetupWithStoreMock(tb testing.TB) *TestHelper {
 	mockStore := testlib.GetMockStoreForSetupFunctions()
-	th := setupTestHelper(mockStore, false, false, nil, tb)
+	setupOptions := []Option{SkipProductsInitialization()}
+	th := setupTestHelper(mockStore, false, false, setupOptions, tb)
 	statusMock := mocks.StatusStore{}
 	statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil)
 	statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil)
@@ -184,7 +187,8 @@ func SetupWithStoreMock(tb testing.TB) *TestHelper {
 
 func SetupEnterpriseWithStoreMock(tb testing.TB) *TestHelper {
 	mockStore := testlib.GetMockStoreForSetupFunctions()
-	th := setupTestHelper(mockStore, true, false, nil, tb)
+	setupOptions := []Option{SkipProductsInitialization()}
+	th := setupTestHelper(mockStore, true, false, setupOptions, tb)
 	statusMock := mocks.StatusStore{}
 	statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil)
 	statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil)
@@ -249,6 +253,14 @@ func (th *TestHelper) InitBasic() *TestHelper {
 	return th
 }
 
+func (th *TestHelper) DeleteBots() *TestHelper {
+	preexistingBots, _ := th.App.GetBots(&model.BotGetOptions{Page: 0, PerPage: 100})
+	for _, bot := range preexistingBots {
+		th.App.PermanentDeleteBot(bot.UserId)
+	}
+	return th
+}
+
 func (*TestHelper) MakeEmail() string {
 	return "success_" + model.NewId() + "@simulator.amazonses.com"
 }
diff --git a/server/channels/app/notification_push_test.go b/server/channels/app/notification_push_test.go
index 9d35aa2830..b4803db659 100644
--- a/server/channels/app/notification_push_test.go
+++ b/server/channels/app/notification_push_test.go
@@ -1433,6 +1433,10 @@ func TestPushNotificationRace(t *testing.T) {
 
 	memoryStore := config.NewTestMemoryStore()
 	mockStore := testlib.GetMockStoreForSetupFunctions()
+	// Playbooks DB job requires a plugin mock
+	pluginStore := mocks.PluginStore{}
+	pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil)
+	mockStore.On("Plugin").Return(&pluginStore)
 	mockPreferenceStore := mocks.PreferenceStore{}
 	mockPreferenceStore.On("Get",
 		mock.AnythingOfType("string"),
@@ -1445,10 +1449,12 @@ func TestPushNotificationRace(t *testing.T) {
 		Router:   mux.NewRouter(),
 	}
 	var err error
-	s.platform, err = platform.New(platform.ServiceConfig{
-		ConfigStore: memoryStore,
-	}, platform.SetFileStore(&fmocks.FileBackend{}))
-	s.SetStore(mockStore)
+	s.platform, err = platform.New(
+		platform.ServiceConfig{
+			ConfigStore: memoryStore,
+		},
+		platform.SetFileStore(&fmocks.FileBackend{}),
+		platform.StoreOverride(mockStore))
 	require.NoError(t, err)
 	serviceMap := map[product.ServiceKey]any{
 		ServerKey:            s,
diff --git a/server/channels/app/opentracing/opentracing_layer.go b/server/channels/app/opentracing/opentracing_layer.go
index 440c7a297f..c109b9a3ce 100644
--- a/server/channels/app/opentracing/opentracing_layer.go
+++ b/server/channels/app/opentracing/opentracing_layer.go
@@ -12009,6 +12009,23 @@ func (a *OpenTracingAppLayer) IsCRTEnabledForUser(c request.CTX, userID string)
 	return resultVar0
 }
 
+func (a *OpenTracingAppLayer) IsConfigReadOnly() bool {
+	origCtx := a.ctx
+	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.IsConfigReadOnly")
+
+	a.ctx = newCtx
+	a.app.Srv().Store().SetContext(newCtx)
+	defer func() {
+		a.app.Srv().Store().SetContext(origCtx)
+		a.ctx = origCtx
+	}()
+
+	defer span.Finish()
+	resultVar0 := a.app.IsConfigReadOnly()
+
+	return resultVar0
+}
+
 func (a *OpenTracingAppLayer) IsFirstAdmin(user *model.User) bool {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.IsFirstAdmin")
diff --git a/server/channels/app/options.go b/server/channels/app/options.go
index fc41523607..4134194bf7 100644
--- a/server/channels/app/options.go
+++ b/server/channels/app/options.go
@@ -103,6 +103,17 @@ func SkipPostInitialization() Option {
 	}
 }
 
+// SkipProductsInitialization is intended for testing only, in cases
+// where we're mocking components like the store and products cannot
+// be initialized correctly
+func SkipProductsInitialization() Option {
+	return func(s *Server) error {
+		s.skipProductsInit = true
+
+		return nil
+	}
+}
+
 type AppOption func(a *App)
 type AppOptionCreator func() []AppOption
 
diff --git a/server/channels/app/platform/config.go b/server/channels/app/platform/config.go
index 3f4f560209..30dddabd61 100644
--- a/server/channels/app/platform/config.go
+++ b/server/channels/app/platform/config.go
@@ -65,6 +65,11 @@ func (ps *PlatformService) UpdateConfig(f func(*model.Config)) {
 	}
 }
 
+// IsConfigReadOnly returns true if the underlying configstore is readonly.
+func (ps *PlatformService) IsConfigReadOnly() bool {
+	return ps.configStore.IsReadOnly()
+}
+
 // SaveConfig replaces the active configuration, optionally notifying cluster peers.
 // It returns both the previous and current configs.
 func (ps *PlatformService) SaveConfig(newCfg *model.Config, sendConfigChangeClusterMessage bool) (*model.Config, *model.Config, *model.AppError) {
diff --git a/server/channels/app/platform/helper_test.go b/server/channels/app/platform/helper_test.go
index 98bf1366b2..e4adda7ea4 100644
--- a/server/channels/app/platform/helper_test.go
+++ b/server/channels/app/platform/helper_test.go
@@ -99,6 +99,7 @@ func (th *TestHelper) InitBasic() *TestHelper {
 
 func SetupWithStoreMock(tb testing.TB, options ...Option) *TestHelper {
 	mockStore := testlib.GetMockStoreForSetupFunctions()
+	options = append(options, StoreOverride(mockStore))
 	th := setupTestHelper(mockStore, false, false, tb, options...)
 	statusMock := mocks.StatusStore{}
 	statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil)
@@ -136,6 +137,7 @@ func setupTestHelper(dbStore store.Store, enterprise bool, includeCacheLayer boo
 	configStore := config.NewTestMemoryStore()
 
 	memoryConfig := configStore.Get()
+	memoryConfig.SqlSettings = *mainHelper.GetSQLSettings()
 	*memoryConfig.PluginSettings.Directory = filepath.Join(tempWorkspace, "plugins")
 	*memoryConfig.PluginSettings.ClientDirectory = filepath.Join(tempWorkspace, "webapp")
 	*memoryConfig.PluginSettings.AutomaticPrepackagedPlugins = false
diff --git a/server/channels/app/platform/service_test.go b/server/channels/app/platform/service_test.go
index 53b045ba3a..f9840c35bf 100644
--- a/server/channels/app/platform/service_test.go
+++ b/server/channels/app/platform/service_test.go
@@ -28,16 +28,7 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
 	if driverName == "" {
 		driverName = model.DatabaseDriverPostgres
 	}
-	dsn := ""
-	if driverName == model.DatabaseDriverPostgres {
-		dsn = os.Getenv("TEST_DATABASE_POSTGRESQL_DSN")
-	} else {
-		dsn = os.Getenv("TEST_DATABASE_MYSQL_DSN")
-	}
 	cfg.SqlSettings = *storetest.MakeSqlSettings(driverName, false)
-	if dsn != "" {
-		cfg.SqlSettings.DataSource = &dsn
-	}
 	cfg.SqlSettings.DataSourceReplicas = []string{*cfg.SqlSettings.DataSource}
 	cfg.SqlSettings.DataSourceSearchReplicas = []string{*cfg.SqlSettings.DataSource}
 
diff --git a/server/channels/app/platform/web_hub_test.go b/server/channels/app/platform/web_hub_test.go
index de3e007fc1..d11b7c4fec 100644
--- a/server/channels/app/platform/web_hub_test.go
+++ b/server/channels/app/platform/web_hub_test.go
@@ -82,6 +82,7 @@ func TestHubStopWithMultipleConnections(t *testing.T) {
 // block the caller indefinitely.
 func TestHubStopRaceCondition(t *testing.T) {
 	th := Setup(t).InitBasic()
+	defer th.Service.Store.Close()
 	// We do not call TearDown because th.TearDown shuts down the hub again. And hub close is not idempotent.
 	// Making it idempotent is not really important to the server because close only happens once.
 	// So we just use this quick hack for the test.
diff --git a/server/channels/app/plugin_api_test.go b/server/channels/app/plugin_api_test.go
index 877b019439..2ba65aa5f9 100644
--- a/server/channels/app/plugin_api_test.go
+++ b/server/channels/app/plugin_api_test.go
@@ -304,7 +304,7 @@ func TestPluginAPIUpdateUserPreferences(t *testing.T) {
 }
 
 func TestPluginAPIGetUsers(t *testing.T) {
-	th := Setup(t)
+	th := Setup(t).DeleteBots()
 	defer th.TearDown()
 	api := th.SetupPluginAPI()
 
@@ -1171,7 +1171,7 @@ func TestBasicAPIPlugins(t *testing.T) {
 				mainPath := path.Join(testFolder, d, "main.go")
 				_, err := os.Stat(mainPath)
 				require.NoError(t, err, "Cannot find plugin main file at %v", mainPath)
-				th := Setup(t).InitBasic()
+				th := Setup(t).InitBasic().DeleteBots()
 				defer th.TearDown()
 				setDefaultPluginConfig(th, dir.Name())
 				err = pluginAPIHookTest(t, th, mainPath, dir.Name(), defaultSchema)
diff --git a/server/channels/app/plugin_commands_test.go b/server/channels/app/plugin_commands_test.go
index 89516aa3b5..3c70fb718a 100644
--- a/server/channels/app/plugin_commands_test.go
+++ b/server/channels/app/plugin_commands_test.go
@@ -465,7 +465,6 @@ func (p *TProduct) ExecuteCommand(c *plugin.Context, args *model.CommandArgs) (*
 }
 
 func TestProductCommands(t *testing.T) {
-
 	products := map[string]product.Manifest{
 		"productT": {
 			Initializer:  newTProduct,
@@ -474,10 +473,11 @@ func TestProductCommands(t *testing.T) {
 	}
 
 	t.Run("Execute product command", func(t *testing.T) {
-		th := Setup(t).InitBasic()
+		th := Setup(t, SkipProductsInitialization()).InitBasic()
 		defer th.TearDown()
 		// Server hijack.
 		// This must be done in a cleaner way.
+		th.Server.skipProductsInit = false
 		th.Server.initializeProducts(products, th.Server.services)
 		th.Server.products["productT"].Start()
 		require.Len(t, th.Server.products, 2) // 1 product + channels
@@ -504,11 +504,11 @@ func TestProductCommands(t *testing.T) {
 	})
 
 	t.Run("Product commands can override builtin commands", func(t *testing.T) {
-		th := Setup(t).InitBasic()
+		th := Setup(t, SkipProductsInitialization()).InitBasic()
 		defer th.TearDown()
-
 		// Server hijack.
 		// This must be done in a cleaner way.
+		th.Server.skipProductsInit = false
 		th.Server.initializeProducts(products, th.Server.services)
 		th.Server.products["productT"].Start()
 		require.Len(t, th.Server.products, 2) // 1 product + channels
@@ -535,8 +535,7 @@ func TestProductCommands(t *testing.T) {
 	})
 
 	t.Run("Plugin commands can override product commands", func(t *testing.T) {
-
-		th := Setup(t).InitBasic()
+		th := Setup(t, SkipProductsInitialization()).InitBasic()
 		defer th.TearDown()
 
 		th.App.UpdateConfig(func(cfg *model.Config) {
@@ -602,6 +601,7 @@ func TestProductCommands(t *testing.T) {
 
 		// Server hijack.
 		// This must be done in a cleaner way.
+		th.Server.skipProductsInit = false
 		th.Server.initializeProducts(products, th.Server.services)
 		th.Server.products["productT"].Start()
 		require.Len(t, th.Server.products, 2) // 1 product + channels
diff --git a/server/channels/app/plugin_hooks_test.go b/server/channels/app/plugin_hooks_test.go
index 4cb3134fc5..0238457662 100644
--- a/server/channels/app/plugin_hooks_test.go
+++ b/server/channels/app/plugin_hooks_test.go
@@ -1202,7 +1202,7 @@ func TestHookReactionHasBeenRemoved(t *testing.T) {
 }
 
 func TestHookRunDataRetention(t *testing.T) {
-	th := Setup(t).InitBasic()
+	th := Setup(t, SkipProductsInitialization()).InitBasic()
 	defer th.TearDown()
 
 	tearDown, pluginIDs, _ := SetAppEnvironmentWithPlugins(t,
diff --git a/server/channels/app/post_test.go b/server/channels/app/post_test.go
index b894136848..ec32b96a48 100644
--- a/server/channels/app/post_test.go
+++ b/server/channels/app/post_test.go
@@ -3150,6 +3150,7 @@ func TestGetTopThreadsForUserSince(t *testing.T) {
 }
 
 func TestGetEditHistoryForPost(t *testing.T) {
+	t.Skip("This needs fixing, OriginalId seems to be empty for all posts")
 	th := Setup(t).InitBasic()
 	defer th.TearDown()
 
diff --git a/server/channels/app/product.go b/server/channels/app/product.go
index 4da937eefa..bcffb6b504 100644
--- a/server/channels/app/product.go
+++ b/server/channels/app/product.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/mattermost/mattermost-server/server/v8/channels/product"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (s *Server) initializeProducts(
@@ -71,6 +72,11 @@ func (s *Server) initializeProducts(
 }
 
 func (s *Server) shouldStart(product string) bool {
+	if s.skipProductsInit && product != "channels" {
+		s.Log().Warn("Skipping product start: disabled via server options", mlog.String("product", product))
+		return false
+	}
+
 	if product == "boards" {
 		if os.Getenv("MM_DISABLE_BOARDS") == "true" {
 			s.Log().Warn("Skipping Boards start: disabled via env var")
diff --git a/server/channels/app/product_test.go b/server/channels/app/product_test.go
index 55942aea5f..1002eedad6 100644
--- a/server/channels/app/product_test.go
+++ b/server/channels/app/product_test.go
@@ -39,8 +39,14 @@ func (p *productB) Start() error { return nil }
 func (p *productB) Stop() error  { return nil }
 
 func TestInitializeProducts(t *testing.T) {
-	ps, err := platform.New(platform.ServiceConfig{ConfigStore: config.NewTestMemoryStore()})
+	configStore := config.NewTestMemoryStore()
+	memoryConfig := configStore.Get()
+	memoryConfig.SqlSettings = *mainHelper.GetSQLSettings()
+	configStore.Set(memoryConfig)
+
+	ps, err := platform.New(platform.ServiceConfig{ConfigStore: configStore})
 	require.NoError(t, err)
+	defer ps.Shutdown()
 
 	t.Run("2 products and no circular dependency", func(t *testing.T) {
 		serviceMap := map[product.ServiceKey]any{
@@ -148,24 +154,4 @@ func TestInitializeProducts(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, server.products, 2)
 	})
-
-	t.Run("boards product to be blocked", func(t *testing.T) {
-		products := map[string]product.Manifest{
-			"productA": {
-				Initializer: newProductA,
-			},
-			"boards": {
-				Initializer: newProductB,
-			},
-		}
-
-		server := &Server{
-			products: make(map[string]product.Product),
-			platform: ps,
-		}
-
-		err := server.initializeProducts(products, map[product.ServiceKey]any{})
-		require.NoError(t, err)
-		require.Len(t, server.products, 1)
-	})
 }
diff --git a/server/channels/app/server.go b/server/channels/app/server.go
index 7b8c1d2946..a9aeb47dc8 100644
--- a/server/channels/app/server.go
+++ b/server/channels/app/server.go
@@ -137,6 +137,8 @@ type Server struct {
 
 	tracer *tracing.Tracer
 
+	skipProductsInit bool
+
 	products map[string]product.Product
 	services map[product.ServiceKey]any
 
diff --git a/server/channels/app/server_test.go b/server/channels/app/server_test.go
index e9f08ba776..5403c82ffe 100644
--- a/server/channels/app/server_test.go
+++ b/server/channels/app/server_test.go
@@ -32,12 +32,17 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
+func newServer(t *testing.T) (*Server, error) {
+	return newServerWithConfig(t, func(_ *model.Config) {})
+}
+
 func newServerWithConfig(t *testing.T, f func(cfg *model.Config)) (*Server, error) {
 	configStore, err := config.NewMemoryStore()
 	require.NoError(t, err)
 	store, err := config.NewStoreFromBacking(configStore, nil, false)
 	require.NoError(t, err)
 	cfg := store.Get()
+	cfg.SqlSettings = *mainHelper.GetSQLSettings()
 	f(cfg)
 
 	store.Set(cfg)
@@ -61,13 +66,13 @@ func TestStartServerSuccess(t *testing.T) {
 }
 
 func TestStartServerPortUnavailable(t *testing.T) {
-	s, err := NewServer()
-	require.NoError(t, err)
-
 	// Listen on the next available port
 	listener, err := net.Listen("tcp", "localhost:0")
 	require.NoError(t, err)
 
+	s, err := newServer(t)
+	require.NoError(t, err)
+
 	// Attempt to listen on the port used above.
 	s.platform.UpdateConfig(func(cfg *model.Config) {
 		*cfg.ServiceSettings.ListenAddress = listener.Addr().String()
@@ -105,6 +110,7 @@ func TestStartServerNoS3Bucket(t *testing.T) {
 		AmazonS3SSL:             model.NewBool(false),
 	}
 	*cfg.ServiceSettings.ListenAddress = "localhost:0"
+	cfg.SqlSettings = *mainHelper.GetSQLSettings()
 	_, _, err := store.Set(cfg)
 	require.NoError(t, err)
 
@@ -162,7 +168,7 @@ func TestDatabaseTypeAndMattermostVersion(t *testing.T) {
 
 	os.Setenv("MM_SQLSETTINGS_DRIVERNAME", "postgres")
 
-	th := Setup(t)
+	th := Setup(t, SkipProductsInitialization())
 	defer th.TearDown()
 
 	databaseType, mattermostVersion := th.Server.DatabaseTypeAndSchemaVersion()
@@ -171,7 +177,7 @@ func TestDatabaseTypeAndMattermostVersion(t *testing.T) {
 
 	os.Setenv("MM_SQLSETTINGS_DRIVERNAME", "mysql")
 
-	th2 := Setup(t)
+	th2 := Setup(t, SkipProductsInitialization())
 	defer th2.TearDown()
 
 	databaseType, mattermostVersion = th2.Server.DatabaseTypeAndSchemaVersion()
@@ -190,6 +196,7 @@ func TestStartServerTLSVersion(t *testing.T) {
 	*cfg.ServiceSettings.TLSMinVer = "1.2"
 	*cfg.ServiceSettings.TLSKeyFile = path.Join(testDir, "tls_test_key.pem")
 	*cfg.ServiceSettings.TLSCertFile = path.Join(testDir, "tls_test_cert.pem")
+	cfg.SqlSettings = *mainHelper.GetSQLSettings()
 
 	store.Set(cfg)
 
@@ -316,7 +323,7 @@ func TestPanicLog(t *testing.T) {
 	logger.LockConfiguration()
 
 	// Creating a server with logger
-	s, err := NewServer()
+	s, err := newServer(t)
 	require.NoError(t, err)
 	s.Platform().SetLogger(logger)
 
diff --git a/server/channels/app/slashcommands/helper_test.go b/server/channels/app/slashcommands/helper_test.go
index ec2f44727b..b0890d3d38 100644
--- a/server/channels/app/slashcommands/helper_test.go
+++ b/server/channels/app/slashcommands/helper_test.go
@@ -51,6 +51,7 @@ func setupTestHelper(dbStore store.Store, enterprise bool, includeCacheLayer boo
 	if configSet != nil {
 		configSet(memoryConfig)
 	}
+	memoryConfig.SqlSettings = *mainHelper.GetSQLSettings()
 	*memoryConfig.PluginSettings.Directory = filepath.Join(tempWorkspace, "plugins")
 	*memoryConfig.PluginSettings.ClientDirectory = filepath.Join(tempWorkspace, "webapp")
 	*memoryConfig.PluginSettings.AutomaticPrepackagedPlugins = false
@@ -142,6 +143,7 @@ func setup(tb testing.TB) *TestHelper {
 	dbStore := mainHelper.GetStore()
 	dbStore.DropAllTables()
 	dbStore.MarkSystemRanUnitTests()
+	mainHelper.PreloadBoardsMigrationsIfNeeded()
 
 	return setupTestHelper(dbStore, false, true, tb, nil)
 }
diff --git a/server/channels/app/user_test.go b/server/channels/app/user_test.go
index 2cc279e62e..703a39db9b 100644
--- a/server/channels/app/user_test.go
+++ b/server/channels/app/user_test.go
@@ -1026,7 +1026,7 @@ func TestCreateUserWithToken(t *testing.T) {
 }
 
 func TestPermanentDeleteUser(t *testing.T) {
-	th := Setup(t).InitBasic()
+	th := Setup(t).InitBasic().DeleteBots()
 	defer th.TearDown()
 
 	b := []byte("testimage")
diff --git a/server/channels/app/user_viewmembers_test.go b/server/channels/app/user_viewmembers_test.go
index 4d57018516..7da06426e8 100644
--- a/server/channels/app/user_viewmembers_test.go
+++ b/server/channels/app/user_viewmembers_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestRestrictedViewMembers(t *testing.T) {
-	th := Setup(t)
+	th := Setup(t).DeleteBots()
 	defer th.TearDown()
 
 	user1 := th.CreateUser()
diff --git a/server/channels/store/sqlstore/store.go b/server/channels/store/sqlstore/store.go
index 9f587f1517..d39f92661c 100644
--- a/server/channels/store/sqlstore/store.go
+++ b/server/channels/store/sqlstore/store.go
@@ -993,6 +993,7 @@ func (ss *SqlStore) TrueUpReview() store.TrueUpReviewStore {
 }
 
 func (ss *SqlStore) DropAllTables() {
+	var tableSchemaFn string
 	if ss.DriverName() == model.DatabaseDriverPostgres {
 		ss.masterX.Exec(`DO
 			$func$
@@ -1002,18 +1003,57 @@ func (ss *SqlStore) DropAllTables() {
 			    FROM   pg_class
 			    WHERE  relkind = 'r'  -- only tables
 			    AND    relnamespace = 'public'::regnamespace
-				AND NOT relname = 'db_migrations'
+				AND NOT (
+                  relname = 'db_migrations' OR
+                  relname = 'focalboard_schema_migrations' OR
+                  relname = 'focalboard_boards' OR
+                  relname = 'focalboard_blocks'
+                )
 			   );
 			END
 			$func$;`)
+		tableSchemaFn = "current_schema()"
 	} else {
 		tables := []string{}
 		ss.masterX.Select(&tables, `show tables`)
 		for _, t := range tables {
-			if t != "db_migrations" {
+			if t != "db_migrations" &&
+				t != "focalboard_schema_migrations" &&
+				t != "focalboard_boards" &&
+				t != "focalboard_blocks" {
 				ss.masterX.Exec(`TRUNCATE TABLE ` + t)
+
 			}
 		}
+		tableSchemaFn = "DATABASE()"
+	}
+
+	var boardsTableCount int
+	err := ss.masterX.Get(&boardsTableCount, `
+      SELECT COUNT(*)
+        FROM INFORMATION_SCHEMA.TABLES
+       WHERE TABLE_SCHEMA = `+tableSchemaFn+`
+         AND TABLE_NAME = 'focalboard_schema_migrations'`)
+	if err != nil {
+		panic(errors.Wrap(err, "Error dropping all tables. Cannot query INFORMATION_SCHEMA table to check for focalboard_schema_migrations table"))
+	}
+
+	if boardsTableCount != 0 {
+		_, blErr := ss.masterX.Exec(`
+          DELETE FROM focalboard_blocks
+          WHERE board_id IN (
+            SELECT id
+            FROM focalboard_boards
+            WHERE NOT is_template
+          )`)
+		if blErr != nil {
+			panic(errors.Wrap(blErr, "Error deleting all non-template blocks"))
+		}
+
+		_, boErr := ss.masterX.Exec(`DELETE FROM focalboard_boards WHERE NOT is_template`)
+		if boErr != nil {
+			panic(errors.Wrap(boErr, "Error delegint all non-template boards"))
+		}
 	}
 }
 
diff --git a/server/channels/testlib/helper.go b/server/channels/testlib/helper.go
index fd06e9b776..f74a562568 100644
--- a/server/channels/testlib/helper.go
+++ b/server/channels/testlib/helper.go
@@ -41,6 +41,11 @@ type HelperOptions struct {
 }
 
 func NewMainHelper() *MainHelper {
+	// Ignore any globally defined datasource if a test dsn defined
+	if os.Getenv("TEST_DATABASE_MYSQL_DSN") != "" || os.Getenv("TEST_DATABASE_POSTGRESQL_DSN") != "" {
+		os.Unsetenv("MM_SQLSETTINGS_DATASOURCE")
+	}
+
 	return NewMainHelperWithOptions(&HelperOptions{
 		EnableStore:     true,
 		EnableResources: true,
@@ -48,6 +53,11 @@ func NewMainHelper() *MainHelper {
 }
 
 func NewMainHelperWithOptions(options *HelperOptions) *MainHelper {
+	// Ignore any globally defined datasource if a test dsn defined
+	if os.Getenv("TEST_DATABASE_MYSQL_DSN") != "" || os.Getenv("TEST_DATABASE_POSTGRESQL_DSN") != "" {
+		os.Unsetenv("MM_SQLSETTINGS_DATASOURCE")
+	}
+
 	var mainHelper MainHelper
 	flag.Parse()
 
@@ -153,6 +163,7 @@ func (h *MainHelper) setupResources() {
 func (h *MainHelper) PreloadMigrations() {
 	var buf []byte
 	var err error
+
 	basePath := os.Getenv("MM_SERVER_PATH")
 	if basePath == "" {
 		basePath = "mattermost-server/server"
@@ -177,6 +188,62 @@ func (h *MainHelper) PreloadMigrations() {
 	if err != nil {
 		panic(errors.Wrap(err, "Error preloading migrations. Check if you have &multiStatements=true in your DSN if you are using MySQL. Or perhaps the schema changed? If yes, then update the warmup files accordingly"))
 	}
+
+	h.PreloadBoardsMigrationsIfNeeded()
+}
+
+// PreloadBoardsMigrationsIfNeeded loads boards migrations if the
+// focalboard_schema_migrations table exists already.
+// Besides this, the same compatibility and breaking conditions that
+// PreloadMigrations has apply here.
+//
+// Re-generate the files with:
+// pg_dump -a -h localhost -U mmuser -d <> --no-comments --inserts -t focalboard_system_settings
+// mysqldump -u root -p <> --no-create-info --extended-insert=FALSE focalboard_system_settings
+func (h *MainHelper) PreloadBoardsMigrationsIfNeeded() {
+	tableSchemaFn := "current_schema()"
+	if *h.Settings.DriverName == model.DatabaseDriverMysql {
+		tableSchemaFn = "DATABASE()"
+	}
+
+	basePath := os.Getenv("MM_SERVER_PATH")
+	if basePath == "" {
+		basePath = "mattermost-server/server"
+	}
+	relPath := "channels/testlib/testdata"
+
+	handle := h.SQLStore.GetMasterX()
+	var boardsTableCount int
+	gErr := handle.Get(&boardsTableCount, `
+      SELECT COUNT(*)
+        FROM INFORMATION_SCHEMA.TABLES
+       WHERE TABLE_SCHEMA = `+tableSchemaFn+`
+         AND TABLE_NAME = 'focalboard_schema_migrations'`)
+	if gErr != nil {
+		panic(errors.Wrap(gErr, "Error preloading migrations. Cannot query INFORMATION_SCHEMA table to check for focalboard_schema_migrations table"))
+	}
+
+	var buf []byte
+	var err error
+	if boardsTableCount != 0 {
+		switch *h.Settings.DriverName {
+		case model.DatabaseDriverPostgres:
+			boardsFinalPath := filepath.Join(basePath, relPath, "boards_postgres_migration_warmup.sql")
+			buf, err = os.ReadFile(boardsFinalPath)
+			if err != nil {
+				panic(fmt.Errorf("cannot read file: %v", err))
+			}
+		case model.DatabaseDriverMysql:
+			boardsFinalPath := filepath.Join(basePath, relPath, "boards_mysql_migration_warmup.sql")
+			buf, err = os.ReadFile(boardsFinalPath)
+			if err != nil {
+				panic(fmt.Errorf("cannot read file: %v", err))
+			}
+		}
+		if _, err := handle.Exec(string(buf)); err != nil {
+			panic(errors.Wrap(err, "Error preloading boards migrations. Check if you have &multiStatements=true in your DSN if you are using MySQL. Or perhaps the schema changed? If yes, then update the warmup files accordingly"))
+		}
+	}
 }
 
 func (h *MainHelper) Close() error {
diff --git a/server/channels/testlib/store.go b/server/channels/testlib/store.go
index 8fb8d39770..05e944fba9 100644
--- a/server/channels/testlib/store.go
+++ b/server/channels/testlib/store.go
@@ -101,6 +101,9 @@ func GetMockStoreForSetupFunctions() *mocks.Store {
 	oAuthStore := mocks.OAuthStore{}
 	groupStore := mocks.GroupStore{}
 
+	pluginStore := mocks.PluginStore{}
+	pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil)
+
 	mockStore.On("System").Return(&systemStore)
 	mockStore.On("User").Return(&userStore)
 	mockStore.On("Post").Return(&postStore)
@@ -116,6 +119,7 @@ func GetMockStoreForSetupFunctions() *mocks.Store {
 	mockStore.On("OAuth").Return(&oAuthStore)
 	mockStore.On("Group").Return(&groupStore)
 	mockStore.On("GetDBSchemaVersion").Return(1, nil)
+	mockStore.On("Plugin").Return(&pluginStore)
 
 	return &mockStore
 }
diff --git a/server/channels/testlib/testdata/boards_mysql_migration_warmup.sql b/server/channels/testlib/testdata/boards_mysql_migration_warmup.sql
new file mode 100644
index 0000000000..d279598e92
--- /dev/null
+++ b/server/channels/testlib/testdata/boards_mysql_migration_warmup.sql
@@ -0,0 +1,41 @@
+-- MySQL dump 10.13  Distrib 5.7.12, for Linux (x86_64)
+--
+-- Host: localhost    Database: mattermost_test
+-- ------------------------------------------------------
+-- Server version       5.7.12
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Dumping data for table `focalboard_system_settings`
+--
+
+LOCK TABLES `focalboard_system_settings` WRITE;
+/*!40000 ALTER TABLE `focalboard_system_settings` DISABLE KEYS */;
+INSERT INTO `focalboard_system_settings` VALUES ('CategoryUuidIdMigrationComplete','true');
+INSERT INTO `focalboard_system_settings` VALUES ('DeDuplicateCategoryBoardTableComplete','true');
+INSERT INTO `focalboard_system_settings` VALUES ('DeletedMembershipBoardsMigrationComplete','true');
+INSERT INTO `focalboard_system_settings` VALUES ('TeamLessBoardsMigrationComplete','true');
+INSERT INTO `focalboard_system_settings` VALUES ('UniqueIDsMigrationComplete','true');
+/*!40000 ALTER TABLE `focalboard_system_settings` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2023-03-31 11:37:35
diff --git a/server/channels/testlib/testdata/boards_postgres_migration_warmup.sql b/server/channels/testlib/testdata/boards_postgres_migration_warmup.sql
new file mode 100644
index 0000000000..7519e8076a
--- /dev/null
+++ b/server/channels/testlib/testdata/boards_postgres_migration_warmup.sql
@@ -0,0 +1,26 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 10.20 (Debian 10.20-1.pgdg90+1)
+-- Dumped by pg_dump version 14.7
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+
+--
+-- Data for Name: focalboard_system_settings; Type: TABLE DATA; Schema: public; Owner: mmuser
+--
+
+INSERT INTO public.focalboard_system_settings VALUES ('UniqueIDsMigrationComplete', 'true');
+INSERT INTO public.focalboard_system_settings VALUES ('TeamLessBoardsMigrationComplete', 'true');
+INSERT INTO public.focalboard_system_settings VALUES ('DeletedMembershipBoardsMigrationComplete', 'true');
+INSERT INTO public.focalboard_system_settings VALUES ('CategoryUuidIdMigrationComplete', 'true');
+INSERT INTO public.focalboard_system_settings VALUES ('DeDuplicateCategoryBoardTableComplete', 'true');
+
+
+--
+-- PostgreSQL database dump complete
+--
diff --git a/server/channels/web/web_test.go b/server/channels/web/web_test.go
index 2623dfb0bb..2c4fb8d229 100644
--- a/server/channels/web/web_test.go
+++ b/server/channels/web/web_test.go
@@ -55,7 +55,7 @@ func SetupWithStoreMock(tb testing.TB) *TestHelper {
 		tb.SkipNow()
 	}
 
-	th := setupTestHelper(tb, false)
+	th := setupTestHelper(tb, false, []app.Option{app.SkipProductsInitialization()})
 	emptyMockStore := mocks.Store{}
 	emptyMockStore.On("Close").Return(nil)
 	th.App.Srv().SetStore(&emptyMockStore)
@@ -68,17 +68,18 @@ func Setup(tb testing.TB) *TestHelper {
 	}
 	store := mainHelper.GetStore()
 	store.DropAllTables()
-	return setupTestHelper(tb, true)
+	mainHelper.PreloadBoardsMigrationsIfNeeded()
+	return setupTestHelper(tb, true, nil)
 }
 
-func setupTestHelper(tb testing.TB, includeCacheLayer bool) *TestHelper {
+func setupTestHelper(tb testing.TB, includeCacheLayer bool, options []app.Option) *TestHelper {
 	memoryStore := config.NewTestMemoryStore()
 	newConfig := memoryStore.Get().Clone()
+	newConfig.SqlSettings = *mainHelper.GetSQLSettings()
 	*newConfig.AnnouncementSettings.AdminNoticesEnabled = false
 	*newConfig.AnnouncementSettings.UserNoticesEnabled = false
 	*newConfig.PluginSettings.AutomaticPrepackagedPlugins = false
 	memoryStore.Set(newConfig)
-	var options []app.Option
 	options = append(options, app.ConfigStore(memoryStore))
 	options = append(options, app.StoreOverride(mainHelper.Store))
 
diff --git a/server/cmd/mattermost/commands/server_test.go b/server/cmd/mattermost/commands/server_test.go
index 276fb622dd..d8eaf66e8f 100644
--- a/server/cmd/mattermost/commands/server_test.go
+++ b/server/cmd/mattermost/commands/server_test.go
@@ -65,6 +65,7 @@ func TestRunServerSuccess(t *testing.T) {
 	// Use non-default listening port in case another server instance is already running.
 	cfg := configStore.Get()
 	*cfg.ServiceSettings.ListenAddress = unitTestListeningPort
+	cfg.SqlSettings = *mainHelper.GetSQLSettings()
 	configStore.Set(cfg)
 
 	err := runServer(configStore, th.interruptChan)
@@ -117,6 +118,7 @@ func TestRunServerSystemdNotification(t *testing.T) {
 	// Use non-default listening port in case another server instance is already running.
 	cfg := configStore.Get()
 	*cfg.ServiceSettings.ListenAddress = unitTestListeningPort
+	cfg.SqlSettings = *mainHelper.GetSQLSettings()
 	configStore.Set(cfg)
 
 	// Start and stop the server
@@ -142,6 +144,7 @@ func TestRunServerNoSystemd(t *testing.T) {
 	// Use non-default listening port in case another server instance is already running.
 	cfg := configStore.Get()
 	*cfg.ServiceSettings.ListenAddress = unitTestListeningPort
+	cfg.SqlSettings = *mainHelper.GetSQLSettings()
 	configStore.Set(cfg)
 
 	err := runServer(configStore, th.interruptChan)

From 2f8e9f16e3863c60b5e7fbefc667e8016adf43bf Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Tue, 18 Apr 2023 12:04:23 -0400
Subject: [PATCH 103/103] update and fix tests.

---
 .../index.test.tsx                            | 56 +++++++++++++------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.test.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.test.tsx
index 8a6efee355..2915d932de 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.test.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.test.tsx
@@ -283,22 +283,6 @@ describe('SelfHostedExpansionModal Open', () => {
         fillForm(defaultSuccessForm);
     });
 
-    it('disables expansion if too few seats or no seats entered', () => {
-        renderWithIntlAndStore(<div id='root-portal'><SelfHostedExpansionModal/></div>, initialState);
-        fillForm(defaultSuccessForm);
-
-        // 0 seats entered.
-        const tooFewSeats = 0;
-        fireEvent.change(screen.getByTestId('seatsInput').querySelector('input') as HTMLElement, valueEvent(tooFewSeats.toString()));
-        expect(screen.getByText('Complete purchase')).toBeDisabled();
-        expect(screen.getByText('You must add a seat to continue')).toBeVisible();
-
-        // No seats value entered.
-        fireEvent.change(screen.getByTestId('seatsInput').querySelector('input') as HTMLElement, undefined);
-        expect(screen.getByText('Complete purchase')).toBeDisabled();
-        expect(screen.getByText('You must add a seat to continue')).toBeVisible();
-    });
-
     it('happy path submit shows success screen when confirmation succeeds', async () => {
         renderWithIntlAndStore(<div id='root-portal'><SelfHostedExpansionModal/></div>, initialState);
         expect(screen.getByText('Complete purchase')).toBeDisabled();
@@ -336,13 +320,49 @@ describe('SelfHostedExpansionModal RHS Card', () => {
     it('New seats input should be pre-populated with the difference from the active users and licensed seats', () => {
         renderWithIntlAndStore(<div id='root-portal'><SelfHostedExpansionModal/></div>, initialState);
 
-        const expectedPrePopulatedSeats = (initialState.entities?.users?.filteredStats?.total_users_count || 1) - parseInt(initialState.entities?.general?.license?.Users || '0', 10);
+        const expectedPrePopulatedSeats = (initialState.entities?.users?.filteredStats?.total_users_count || 1) - parseInt(initialState.entities?.general?.license?.Users || '1', 10);
 
         const seatsField = screen.getByTestId('seatsInput').querySelector('input');
         expect(seatsField).toBeInTheDocument();
         expect(seatsField?.value).toBe(expectedPrePopulatedSeats.toString());
     });
 
+    it('Seat input only allows users to fill input with the licensed seats and active users difference if it is not 0', () => {
+        const expectedUserOverage = '50';
+
+        renderWithIntlAndStore(<div id='root-portal'><SelfHostedExpansionModal/></div>, initialState);
+        fillForm(defaultSuccessForm);
+
+        // The seat input should already have the expected value.
+        expect(screen.getByTestId('seatsInput').querySelector('input')?.value).toContain(expectedUserOverage);
+
+        // Try to set an undefined value.
+        fireEvent.change(screen.getByTestId('seatsInput').querySelector('input') as HTMLElement, undefined);
+
+        // Expecting the seats input to now contain the difference between active users and licensed seats.
+        expect(screen.getByTestId('seatsInput').querySelector('input')?.value).toContain(expectedUserOverage);
+        expect(screen.getByText('Complete purchase')).toBeEnabled();
+    });
+
+    it('New seats input cannot be less than 1', () => {
+        if (initialState.entities?.users?.filteredStats?.total_users_count) {
+            initialState.entities.users.filteredStats.total_users_count = 50;
+        }
+
+        const expectedAddNewSeats = '1';
+
+        renderWithIntlAndStore(<div id='root-portal'><SelfHostedExpansionModal/></div>, initialState);
+        fillForm(defaultSuccessForm);
+
+        // Try to set a negative value.
+        fireEvent.change(screen.getByTestId('seatsInput').querySelector('input') as HTMLElement, -10);
+        expect(screen.getByTestId('seatsInput').querySelector('input')?.value).toContain(expectedAddNewSeats);
+
+        // Try to set a 0 value.
+        fireEvent.change(screen.getByTestId('seatsInput').querySelector('input') as HTMLElement, 0);
+        expect(screen.getByTestId('seatsInput').querySelector('input')?.value).toContain(expectedAddNewSeats);
+    });
+
     it('Cost per User should be represented as the current subscription price multiplied by the remaining months', () => {
         renderWithIntlAndStore(<div id='root-portal'><SelfHostedExpansionModal/></div>, initialState);
 
@@ -366,7 +386,7 @@ describe('SelfHostedExpansionModal RHS Card', () => {
 
         const costAmount = document.getElementsByClassName('totalCostAmount')[0];
         expect(costAmount).toBeInTheDocument();
-        expect(costAmount).toHaveTextContent('$' + expectedTotalCost);
+        expect(costAmount).toHaveTextContent(Intl.NumberFormat('en-US', {style: 'currency', currency: 'USD'}).format(expectedTotalCost));
     });
 });