diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b5e3077a3c..d59ade4a9a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -37,8 +37,8 @@ Any related Github issue should be linked by adding its URL to this section.
 <!--
 
 In this section, you should describe any changes to be made to the GraphQL
-schema file (located https://github.com/coralproject/talk/blob/main/src/core/server/graph/schema/schema.graphql) or any
-database model (located as types in the https://github.com/coralproject/talk/blob/main/src/core/server/models directory).
+schema file (located https://github.com/coralproject/talk/blob/main/server/src/core/server/graph/schema/schema.graphql) or any
+database model (located as types in the https://github.com/coralproject/talk/tree/main/server/src/core/server/models directory).
 
 If no changes were added to the GraphQL/Database Schema as a part of this PR,
 simply write "None".
@@ -70,7 +70,7 @@ verify features introduced or bugs fixed in this PR.
 
  -->
 
-## Where any tests migrated to React Testing Library?
+## Were any tests migrated to React Testing Library?
 
 <!--
 In this section, you should list the paths to and test names of any tests that were migrated to RTL.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c6c991d532..07f322ba49 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -126,8 +126,8 @@ This can ensure that code reviews contain more meaningful feedback tied to the
 contribution rather than nit-picking on stylistic choices.
 
 Reviewers must ensure that linting and tests pass in CI and locally prior to a
-review taking place. You can do this by running `npm run generate` followed by
-`npm run lint` and `npm run test`.
+review taking place. You can do this by running `sh scripts/generate.sh` followed by
+`sh scripts/lint.sh`. You can run `npm run test` in `/server` and `/client`.
 
 ### Review the feature/fixes
 
@@ -186,7 +186,7 @@ the API and the runtime on the server that powers resolving data from data
 sources. This heavily influences a lot of the decisions around how we create and
 consume it's API internally and how we expose it to others to interact with.
 
-There are many GraphQL types in our [`schema.graphql`](https://github.com/coralproject/talk/blob/main/src/core/server/graph/schema/schema.graphql)
+There are many GraphQL types in our [`schema.graphql`](https://github.com/coralproject/talk/blob/main/server/src/core/server/graph/schema/schema.graphql)
 that define the way we handle data in our API. We'll try to outline a few of
 them here with examples to help you understand their uses.
 
@@ -433,7 +433,7 @@ fragment on Comment {
 ```
 
 Here we see the `@auth` directive. It has documentation describing the various
-parameters allowed located in the [`schema.graphql`](https://github.com/coralproject/talk/blob/main/src/core/server/graph/schema/schema.graphql)
+parameters allowed located in the [`schema.graphql`](https://github.com/coralproject/talk/blob/main/server/src/core/server/graph/schema/schema.graphql)
 file, we'll discuss below what this particular set of parameters can be read as:
 
 - The roles that are allowed to access this information are `MODERATOR` and
diff --git a/client/package-lock.json b/client/package-lock.json
index d1b04e9cac..836cf0fda8 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@coralproject/talk",
-      "version": "8.6.2",
+      "version": "8.6.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@ampproject/toolbox-cache-url": "^2.9.0",
diff --git a/client/package.json b/client/package.json
index a578f6c140..cdfcb9d206 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
diff --git a/client/src/core/client/admin/components/UserRole/UserRoleChange.css b/client/src/core/client/admin/components/UserRole/UserRoleChange.css
index 5aeadd7b5f..6ee8737d38 100644
--- a/client/src/core/client/admin/components/UserRole/UserRoleChange.css
+++ b/client/src/core/client/admin/components/UserRole/UserRoleChange.css
@@ -2,6 +2,7 @@
   width: 100%;
   justify-content: space-between;
   padding: 0;
+  line-height: 1.14;
 }
 
 .arrowsIcon {
diff --git a/client/src/core/client/admin/components/UserRole/UserRoleChangeContainer.tsx b/client/src/core/client/admin/components/UserRole/UserRoleChangeContainer.tsx
index 5a7029ad26..d4d3e14167 100644
--- a/client/src/core/client/admin/components/UserRole/UserRoleChangeContainer.tsx
+++ b/client/src/core/client/admin/components/UserRole/UserRoleChangeContainer.tsx
@@ -124,8 +124,6 @@ const UserRoleChangeContainer: FunctionComponent<Props> = ({
 
   const handleOnChangeMembershipScopes = useCallback(
     async (siteIDs: string[]) => {
-      /* eslint-disable */
-      console.log("changing membership scopes");
       await updateUserMembershipScopes({
         userID: user.id,
         membershipScopes: {
diff --git a/client/src/core/client/admin/routes/Community/UserRow.css b/client/src/core/client/admin/routes/Community/UserRow.css
index 331dd82dc3..87d929a680 100644
--- a/client/src/core/client/admin/routes/Community/UserRow.css
+++ b/client/src/core/client/admin/routes/Community/UserRow.css
@@ -1,17 +1,17 @@
 .usernameColumn {
-  vertical-align: top;
+  vertical-align: middle;
   word-break: break-word;
   padding-top: 15px;
   padding-bottom: 15px;
 }
 .emailColumn {
-  vertical-align: top;
+  vertical-align: middle;
   word-break: break-word;
   padding-top: 15px;
   padding-bottom: 15px;
 }
 .memberSinceColumn {
-  vertical-align: top;
+  vertical-align: middle;
   white-space: nowrap;
   padding-top: 15px;
   padding-bottom: 15px;
@@ -38,9 +38,10 @@
 .deleted {
   display: inline-block;
   padding-left: var(--spacing-2);
-  color: #DC8400;
+  color: #dc8400;
 }
 
 .notAvailable {
   color: var(--palette-text-100);
+  text-align: left;
 }
diff --git a/client/src/core/client/admin/routes/Configure/sections/ModerationPhases/ModerationPhasesConfigContainer.tsx b/client/src/core/client/admin/routes/Configure/sections/ModerationPhases/ModerationPhasesConfigContainer.tsx
index 1d2afbf5d2..d3fb1ddb3c 100644
--- a/client/src/core/client/admin/routes/Configure/sections/ModerationPhases/ModerationPhasesConfigContainer.tsx
+++ b/client/src/core/client/admin/routes/Configure/sections/ModerationPhases/ModerationPhasesConfigContainer.tsx
@@ -78,7 +78,7 @@ const ModerationPhasesConfigContainer: FunctionComponent<Props> = ({
           id="configure-moderationPhases-description"
           elems={{
             externalLink: (
-              <ExternalLink href="https://github.com/coralproject/talk/blob/main/EXTERNAL_MODERATION_PHASES.md#request-signing" />
+              <ExternalLink href="https://docs.coralproject.net/external-moderation-phases" />
             ),
           }}
         >
@@ -86,7 +86,7 @@ const ModerationPhasesConfigContainer: FunctionComponent<Props> = ({
             Configure a external moderation phase to automate some moderation
             actions. Moderation requests will be JSON encoded and signed. To
             learn more about moderation requests, visit our{" "}
-            <ExternalLink href="https://github.com/coralproject/talk/blob/main/EXTERNAL_MODERATION_PHASES.md#request-signing">
+            <ExternalLink href="https://docs.coralproject.net/external-moderation-phases">
               docs
             </ExternalLink>
             .
diff --git a/client/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkPopover.tsx b/client/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkPopover.tsx
index def6f3605e..4376049b95 100644
--- a/client/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkPopover.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkPopover.tsx
@@ -31,7 +31,7 @@ const PermalinkPopover: FunctionComponent<Props> = ({
   // Run once.
   useEffect(() => {
     emitShowEvent({ commentID });
-  }, [emitShowEvent, commentID]);
+  }, []);
 
   const timeout: any = useRef<any>(null);
 
diff --git a/client/src/core/client/stream/tabs/Comments/Comment/ReportFlow/ReportCommentForm.tsx b/client/src/core/client/stream/tabs/Comments/Comment/ReportFlow/ReportCommentForm.tsx
index 7cfb5bc8c5..6e1b252eb4 100644
--- a/client/src/core/client/stream/tabs/Comments/Comment/ReportFlow/ReportCommentForm.tsx
+++ b/client/src/core/client/stream/tabs/Comments/Comment/ReportFlow/ReportCommentForm.tsx
@@ -1,10 +1,11 @@
 import { Localized } from "@fluent/react/compat";
 import cn from "classnames";
 import { get } from "lodash";
-import React, { FunctionComponent } from "react";
+import React, { FunctionComponent, useEffect } from "react";
 import { Field, FieldProps, Form } from "react-final-form";
 import { graphql } from "react-relay";
 
+import { useViewerEvent } from "coral-framework/lib/events";
 import { OnSubmit } from "coral-framework/lib/form";
 import { useLocal } from "coral-framework/lib/relay";
 import {
@@ -12,6 +13,7 @@ import {
   validateMaxLength,
 } from "coral-framework/lib/validation";
 import CLASSES from "coral-stream/classes";
+import { ShowReportPopoverEvent } from "coral-stream/events";
 import {
   ButtonSvgIcon,
   ShareExternalLinkIcon,
@@ -75,6 +77,13 @@ const ReportCommentForm: FunctionComponent<Props> = ({
     `
   );
 
+  const emitReportEvent = useViewerEvent(ShowReportPopoverEvent);
+
+  // Run once.
+  useEffect(() => {
+    emitReportEvent({ commentID: id });
+  }, []);
+
   return (
     <div
       className={cn(styles.root, CLASSES.reportPopover.$root)}
diff --git a/common/lib/constants.ts b/common/lib/constants.ts
index 112dce5ca8..132723659b 100644
--- a/common/lib/constants.ts
+++ b/common/lib/constants.ts
@@ -152,6 +152,7 @@ export const PROTECTED_EMAIL_DOMAINS = new Set<string>([
   "live.no",
   "yahoo.no",
   "hotmail.no",
+  "rr.com"
 ]);
 
 export const FLAIR_BADGE_NAME_REGEX = "^[\\w.-]+$";
diff --git a/common/package-lock.json b/common/package-lock.json
index 4465229851..f0a2c7e2d4 100644
--- a/common/package-lock.json
+++ b/common/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "common",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "common",
-      "version": "8.6.2",
+      "version": "8.6.3",
       "license": "ISC",
       "dependencies": {
         "coral-config": "../config/dist",
diff --git a/common/package.json b/common/package.json
index 2cb5585a1a..e00d424ba6 100644
--- a/common/package.json
+++ b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/config/package-lock.json b/config/package-lock.json
index b22d24bbbf..cbcecb3cdd 100644
--- a/config/package-lock.json
+++ b/config/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "common",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "common",
-      "version": "8.6.2",
+      "version": "8.6.3",
       "license": "ISC",
       "dependencies": {
         "typescript": "^3.9.5"
diff --git a/config/package.json b/config/package.json
index 9fe7cfc28a..1b005e96b4 100644
--- a/config/package.json
+++ b/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/docs/docs/administration.md b/docs/docs/administration.md
index fd7285fd20..f6b3243d8c 100644
--- a/docs/docs/administration.md
+++ b/docs/docs/administration.md
@@ -47,7 +47,7 @@ There is also a clock icon in the top right of the page. When you click the icon
 
 You can set the default language Coral uses in **Admin** > **Configure** > **General**.
 
-You can see what languages Coral currently supports here: https://github.com/coralproject/talk/tree/master/src/locales
+You can see what languages Coral currently supports here: https://github.com/coralproject/talk/tree/main/locales
 
 ### Comment Stream Settings
 
@@ -138,7 +138,7 @@ Comments containing a word or phrase in the **Suspect Words** List are placed in
 
 Lists of words/phrases are not case sensitive, and are separated by new lines.
 
-_Note: occasionally comments are marked "Possible Banned Word" - this happens when the banned word check times out, so we don't know if the comment included a banned word or not.  This happens most often in newsrooms that include several thousand banned words on their lists.  It should only occur on a small percentage of your comments.  We will be fixing this problem in the future, so in the meantime you might try trimming your Banned Word list of words/phrases that seem very unlikely to appear, to reduce the frequency of this issue._
+_Note: occasionally comments are marked "Possible Banned Word" - this happens when the banned word check times out, so we don't know if the comment included a banned word or not. This happens most often in newsrooms that include several thousand banned words on their lists. It should only occur on a small percentage of your comments. We will be fixing this problem in the future, so in the meantime you might try trimming your Banned Word list of words/phrases that seem very unlikely to appear, to reduce the frequency of this issue._
 
 ## Email SMTP Settings
 
diff --git a/docs/docs/comment-embed.md b/docs/docs/comment-embed.md
index 13c07da1b9..5c7b55bb70 100644
--- a/docs/docs/comment-embed.md
+++ b/docs/docs/comment-embed.md
@@ -51,7 +51,7 @@ After successful injection, it includes a shadow dom with the full comment embed
 
 Any custom CSS and CSS Font Faces stylesheets that are configured in the `Advanced` admin configuration section will be used to style the comment embed.
 
-The comment embed uses the same [CSS classes](https://github.com/coralproject/talk/blob/develop/src/core/client/stream/classes.ts) that are available to style any comment in the stream. The comment embed also includes a `coral-comment-embed-container` class that can be used to style it specifically.
+The comment embed uses the same [CSS classes](https://github.com/coralproject/talk/blob/main/client/src/core/client/stream/classes.ts) that are available to style any comment in the stream. The comment embed also includes a `coral-comment-embed-container` class that can be used to style it specifically.
 
 ### Advanced configuration
 
@@ -99,7 +99,7 @@ The simple comment embed html includes the comment's text, comment author's user
 
 - embeddedMediaIframeScript
 
-If you are embedding a comment that includes embedded media (Twitter, Youtube, external media image), you will need to add a script to set the correct height for the embed. A message is already being posted via `postMessage` from the embedded media iframe in the Coral comment. An example of how this might be added can be found in `https://github.com/coralproject/talk/tree/develop/src/core/client/oembed/commentEmbed.html`. To support the embedded media height with this iframe script, you will need to attach the comment embed via shadow dom to an element with the id of `coral-comment-embed-shadowRoot-COMMENT_ID`.
+If you are embedding a comment that includes embedded media (Twitter, Youtube, external media image), you will need to add a script to set the correct height for the embed. A message is already being posted via `postMessage` from the embedded media iframe in the Coral comment. An example of how this might be added can be found in `https://github.com/coralproject/talk/blob/main/client/src/core/client/oembed/commentEmbed.html`. To support the embedded media height with this iframe script, you will need to attach the comment embed via shadow dom to an element with the id of `coral-comment-embed-shadowRoot-COMMENT_ID`.
 
 You will not need to add this script if you are using the Oembed API to add the `simpleCommentEmbedHtml` to your page to work with `commentEmbed.js` injection. The injection script will add the needed iframe script in this case.
 
diff --git a/docs/docs/css.md b/docs/docs/css.md
index ac276d31d4..10f992ab77 100644
--- a/docs/docs/css.md
+++ b/docs/docs/css.md
@@ -23,7 +23,7 @@ Here is a CSS example that modifies some of the CSS Variables.
 }
 ```
 
-You can find all CSS Variables using the Web Inspector or navigate to https://github.com/coralproject/talk/blob/main/CSS_VARIABLES.md for a comprehensive list and additional information.
+You can find all CSS Variables using the Web Inspector or navigate to [https://github.com/coralproject/talk/blob/main/client/CSS_VARIABLES.md](https://github.com/coralproject/talk/blob/main/client/CSS_VARIABLES.md) for a comprehensive list and additional information.
 
 > **NOTE:** Before 6.3.0 Coral uses a different set of CSS Variables. Navigate to the link above to get information on upgrading.
 
@@ -33,7 +33,7 @@ If you would like to change the styling of any elements of the comment embed, we
 
 The easiest way to find the class name for the element you're looking for is to use the web inspector, and then update your stylesheet accordingly.
 
-You can also navigate to https://github.com/coralproject/talk/blob/main/src/core/client/stream/classes.ts to see available stable class names.
+You can also navigate to https://github.com/coralproject/talk/blob/main/client/src/core/client/stream/classes.ts to see available stable class names.
 
 ### Custom container class for theming
 
diff --git a/docs/docs/development.md b/docs/docs/development.md
index ad9c291ec1..7e5c13d1a8 100644
--- a/docs/docs/development.md
+++ b/docs/docs/development.md
@@ -58,7 +58,13 @@ to start the installation wizard.
 
 To see the comment stream goto http://localhost:8080/.
 
-To run linting and tests use the following commands:
+### To modify environment variables:
+
+Place and modify a `.env` file within `server/`.
+
+Similar to other applications, development environment variables are picked up from a `.env` file. However, since Coral is a mono-repo, you need to create this file within the `server/` folder. This allows Coral's web server to pick up on the configuration at its relative startup root.
+
+### To run linting and tests use the following commands:
 
 ```bash
 # Run the linters.
@@ -103,7 +109,7 @@ We’re so proud to have received submissions from a lot of 3rd party contributo
 translating Coral into their own languages.
 
 You can see what languages Coral currently supports here:
-https://github.com/coralproject/talk/tree/main/src/locales
+https://github.com/coralproject/talk/tree/main/locales
 
 Coral uses the [fluent](http://projectfluent.org/) library and store our
 translations in [FTL](http://projectfluent.org/fluent/guide/) files in
diff --git a/docs/docs/environment-variables.md b/docs/docs/environment-variables.md
index 6c868ce828..e24d6e80e9 100644
--- a/docs/docs/environment-variables.md
+++ b/docs/docs/environment-variables.md
@@ -4,7 +4,7 @@ title: Environment Variables
 
 The following environment variables can be set to configure the Coral Server. You
 can expose them in your shell via `export NODE_ENV=development` or by placing
-the variables in a `.env` file in the root of the project in a simple
+the variables in a `.env` file under the `server/` directory of the project in a simple
 `NODE_ENV=development` format delimited by newlines.
 
 ## Required Configuration Variables
diff --git a/docs/docs/events.md b/docs/docs/events.md
index 7e8e416175..1924fc3025 100644
--- a/docs/docs/events.md
+++ b/docs/docs/events.md
@@ -13,11 +13,11 @@ In this example, we’re logging all events to the console as well as sending th
 ```html
 <script>
   const CoralStreamEmbed = Coral.createStreamEmbed({
-    events: function(events) {
-      events.onAny(function(eventName, data) {
+    events: function (events) {
+      events.onAny(function (eventName, data) {
         console.log(eventName, data);
-        if (eventName === 'createComment.success') {
-          my_event_tracker.send('createComment', data);
+        if (eventName === "createComment.success") {
+          my_event_tracker.send("createComment", data);
         }
       });
     },
@@ -27,6 +27,6 @@ In this example, we’re logging all events to the console as well as sending th
 
 ## Available Events
 
-A complete list of trackable events is available on GitHub: https://github.com/coralproject/talk/blob/main/CLIENT_EVENTS.md
+A complete list of trackable events is available on GitHub: https://github.com/coralproject/talk/blob/main/client/CLIENT_EVENTS.md
 
 _Note: only events that occur on the comment embed stream will be emitted. No events are emitted from Coral's Moderation/Admin interface._
diff --git a/docs/docs/external-moderation-phases.md b/docs/docs/external-moderation-phases.md
index 4c2cd088b1..b0ac3d8dfb 100644
--- a/docs/docs/external-moderation-phases.md
+++ b/docs/docs/external-moderation-phases.md
@@ -18,7 +18,7 @@ payload.
 When a comment is created or edited, it will be processed by moderation phases in
 a predefined order. Any external moderation phase is run last, and only if all
 other moderation phases before it do not return a status. The current set of
-moderation phases is listed in order [here](https://github.com/coralproject/talk/blob/main/src/core/server/services/comments/pipeline/phases/index.ts).
+moderation phases is listed in order [here](https://github.com/coralproject/talk/blob/main/server/src/core/server/services/comments/pipeline/phases/index.ts).
 
 Once you have received a moderation request, you must respond within the
 provided timeout else the phase will be skipped and it will continue. It is
diff --git a/docs/docs/faq.md b/docs/docs/faq.md
index 81597df1f8..a809070955 100644
--- a/docs/docs/faq.md
+++ b/docs/docs/faq.md
@@ -12,11 +12,11 @@ You can also request help on GitHub by [submitting an issue](https://github.com/
 
 ## How can our dev team contribute to Coral?
 
-We are lucky to work with newsroom dev teams and individual contributors who span the world, and come from newsrooms of all sizes. You can read our [Contribution Guide](https://github.com/coralproject/talk/blob/master/CONTRIBUTING.md) to get started, but feel free to reach out to us via GitHub too.
+We are lucky to work with newsroom dev teams and individual contributors who span the world, and come from newsrooms of all sizes. You can read our [Contribution Guide](https://github.com/coralproject/talk/blob/main/CONTRIBUTING.md) to get started, but feel free to reach out to us via GitHub too.
 
 ## What if we want to add a feature you don't have?
 
-Coral is open source, so you're free to develop additional functionality and [submit a pull request](https://github.com/coralproject.net/talk).
+Coral is open source, so you're free to develop additional functionality and [submit a pull request](https://github.com/coralproject/talk).
 
 ## Do you have GDPR features?
 
@@ -30,7 +30,7 @@ Import tools are still in development for version 5, but will be coming soon! Co
 
 ## Does Coral enforce unique usernames?
 
-We don't do this because your [SSO](https://docs.coralproject.net/sso) should be the single source of truth for all user account management, including usernames. If Coral were to reject or change usernames supplied by the SSO, there would be a conflict, as we only receive from your SSO and don't push changes to your user database. 
+We don't do this because your [SSO](https://docs.coralproject.net/sso) should be the single source of truth for all user account management, including usernames. If Coral were to reject or change usernames supplied by the SSO, there would be a conflict, as we only receive from your SSO and don't push changes to your user database.
 
 ## What support is available?
 
diff --git a/docs/docs/installation.md b/docs/docs/installation.md
index 980099de51..6bd322b6b1 100644
--- a/docs/docs/installation.md
+++ b/docs/docs/installation.md
@@ -128,7 +128,7 @@ the following from your `talk` directory to do this:
 SIGNING_SECRET="$(openssl rand -base64 48)"
 
 # Add a randomly generated secret to your .env file.
-cat >> .env <<EOF
+cat >> server/.env <<EOF
 SIGNING_SECRET=${SIGNING_SECRET}
 EOF
 ```
diff --git a/docs/docs/migrate-data.md b/docs/docs/migrate-data.md
index 57a07b8ca8..a83541050e 100644
--- a/docs/docs/migrate-data.md
+++ b/docs/docs/migrate-data.md
@@ -59,7 +59,7 @@ export CORAL_SITE_ID=""
 
 # This importer tool is designed to work with Coral at the following migration
 # version. This is the newest file in the
-# https://github.com/coralproject/talk/tree/develop/src/core/server/services/migrate/migrations
+# https://github.com/coralproject/talk/tree/main/server/src/core/server/services/migrate/migrations
 # directory for your version of Coral.
 export CORAL_MIGRATION_ID="1582929716101"
 
diff --git a/docs/docs/notifications.md b/docs/docs/notifications.md
index 47fea9d4e9..baa4a7e6a9 100644
--- a/docs/docs/notifications.md
+++ b/docs/docs/notifications.md
@@ -55,4 +55,4 @@ Email templates are text based and support translations. Many of the transaction
 
 Coral does not currently support customizing email templates beyond the default templates.
 
-To view the current email text strings for US English visit: https://github.com/coralproject/talk/blob/main/src/core/server/locales/en-US/email.ftl
+To view the current email text strings for US English visit: https://github.com/coralproject/talk/blob/main/server/src/core/server/locales/en-US/email.ftl
diff --git a/locales/nl-NL/stream.ftl b/locales/nl-NL/stream.ftl
index a69fa338b6..2ee529a239 100644
--- a/locales/nl-NL/stream.ftl
+++ b/locales/nl-NL/stream.ftl
@@ -3,7 +3,7 @@
 ## General
 
 general-commentsEmbedSection =
-  .aria-label = Reacties insluiten
+  .aria-label = Reacties embedden
 
 general-moderate = Modereren
 general-archived = Gearchiveerd
@@ -175,7 +175,7 @@ comments-rte-externalImage =
 
 comments-remainingCharacters = { $remaining } overgebleven karakters
 
-comments-postCommentFormFake-signInAndJoin = Meld je aan of Registreer je in 1 minuut om een reactie te kunnen plaatsen.
+comments-postCommentFormFake-signInAndJoin = Aanmelden of registreren om een reactie te kunnen plaatsen.
 
 comments-postCommentForm-rteLabel = Plaats een reactie
 
@@ -251,13 +251,13 @@ comments-userPopover-ignore = Negeren
 comments-userIgnorePopover-ignoreUser = Negeer {$username}?
 comments-userIgnorePopover-description =
   Wanneer je een gebruiker negeert, dan worden
-  alle reacties van deze gebruiker niet meer getoond aan je.
+  alle reacties van deze gebruiker voor jou verborgen.
   Je kunt dit later ongedaan maken in je profiel.
 comments-userIgnorePopover-ignore = Negeren
 comments-userIgnorePopover-cancel = Annuleren
 
 comments-userBanPopover-title = Blokkeer {$username}?
-comments-userSiteBanPopover-title = Ban {$username} from this site?
+comments-userSiteBanPopover-title = Ban {$username} van deze site?
 comments-userBanPopover-description =
   Eenmaal geblokkeerd, zal deze gebruiker niet meer in staat zijn om
   om reacties te plaatsen.
@@ -273,7 +273,7 @@ comments-moderationDropdown-approve = Goedkeuren
 comments-moderationDropdown-approved = Goedgekeurd
 comments-moderationDropdown-reject = Afwijzen
 comments-moderationDropdown-rejected = Afgewezen
-comments-moderationDropdown-ban = Blokkeer Gebruiker
+comments-moderationDropdown-ban = Blokkeer gebruiker
 comments-moderationDropdown-siteBan = Site Ban
 comments-moderationDropdown-banned = Geblokkeerd
 comments-moderationDropdown-goToModerate =
@@ -446,7 +446,7 @@ profile-preferencesTab = Voorkeuren
 ### Bio
 profile-bio-title = Bio
 profile-bio-description =
-  Schrijf een bio om openbaar weer te geven op je commentaarprofiel. Moet
+  Schrijf een bio om openbaar weer te geven op je profiel. Moet
   minder dan 100 tekens bevatten.
 profile-bio-remove = Verwijderen
 profile-bio-update = Bijwerken
@@ -465,7 +465,7 @@ profile-accountDeletion-cancelAccountDeletion =
 
 ### Comment History
 profile-commentHistory-section =
-  .aria-label = Reactie Geschiedenis
+  .aria-label = Eerdere reacties
 profile-historyComment-commentLabel =
   Reactie <RelativeTime></RelativeTime> op { $storyTitle }
 profile-historyComment-viewConversation = Bekijk discussie
@@ -542,7 +542,7 @@ profile-account-changePassword = Wijzig wachtwoord
 profile-account-changePassword-oldPassword = Oud wachtwoord
 profile-account-changePassword-forgotPassword = Wachtwoord vergeten?
 profile-account-changePassword-newPassword = Nieuw wachtwoord
-profile-account-changePassword-button = Change wachtwoord
+profile-account-changePassword-button = Verander wachtwoord
 profile-account-changePassword-updated =
   Je wachtwoord is gewijzigd
 profile-account-changePassword-password = wachtwoord
@@ -661,7 +661,7 @@ profile-account-changePassword-change = Wijzigen
 profile-notificationsTab = Notificaties
 profile-account-notifications-emailNotifications = E-mail notificaties
 profile-account-notifications-emailNotifications = E-mail notificaties
-profile-account-notifications-receiveWhen = Ontvang notificaties als:
+profile-account-notifications-receiveWhen = Ontvang notificaties wanneer:
 profile-account-notifications-onReply = Mijn reactie een antwoord ontvangt
 profile-account-notifications-onFeatured = Mijn reactie is opgenomen in de lijst
 profile-account-notifications-onStaffReplies = Een medewerker reageert op mijn reactie
@@ -749,9 +749,9 @@ profile-changeUsername-edit = Bewerk
 profile-changeUsername-change = Wijzigen
   .aria-label = Wijzig gebruikernaam
 profile-changeUsername-heading = Bewerk je gebruikersnaam
-profile-changeUsername-heading-changeYourUsername = Change your username
-profile-changeUsername-desc = Wijzig de gebruikersnaam die bij al je vroegere en toekomstige reacties zal verschijnen. <strong>Gebruikersnamen kunnen gewijzigd worden ééns per { framework-timeago-time }.</strong>
-profile-changeUsername-desc-text = Wijzig de gebruikersnaam die bij al je vroegere en toekomstige reacties zal verschijnen. Gebruikersnamen kunnen gewijzigd worden ééns per { framework-timeago-time }.
+profile-changeUsername-heading-changeYourUsername = Verander je gebruikersnaam
+profile-changeUsername-desc = Wijzig de gebruikersnaam die bij al je vroegere en toekomstige reacties zal verschijnen. <strong>Gebruikersnamen kunnen ééns per { framework-timeago-time } gewijzigd worden.</strong>
+profile-changeUsername-desc-text = Wijzig de gebruikersnaam die bij al je vroegere en toekomstige reacties zal verschijnen. Gebruikersnamen kunnen ééns per { framework-timeago-time } gewijzigd worden.
 profile-changeUsername-current = Huidige gebruikersnaam
 profile-changeUsername-newUsername-label = Nieuwe gebruikersnaam
 profile-changeUsername-confirmNewUsername-label = Bevestig nieuwe gebruikersnaam
diff --git a/server/EXTERNAL_MODERATION_PHASES.md b/server/EXTERNAL_MODERATION_PHASES.md
index 6991bb65ae..459d30b6f6 100644
--- a/server/EXTERNAL_MODERATION_PHASES.md
+++ b/server/EXTERNAL_MODERATION_PHASES.md
@@ -13,7 +13,7 @@ payload.
 When a comment is created or edited, it will be processed by moderation phases in
 a predefined order. Any external moderation phase is run last, and only if all
 other moderation phases before it do not return a status. The current set of
-moderation phases is listed in order [here](https://github.com/coralproject/talk/blob/main/src/core/server/services/comments/pipeline/phases/index.ts).
+moderation phases is listed in order [here](https://github.com/coralproject/talk/blob/main/server/src/core/server/services/comments/pipeline/phases/index.ts).
 
 Once you have received a moderation request, you must respond within the
 provided timeout else the phase will be skipped and it will continue. It is
@@ -28,6 +28,7 @@ The external moderation phase must respond with one of the following:
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
 ## Table of Contents
 
 - [Request Signing](#request-signing)
diff --git a/server/package-lock.json b/server/package-lock.json
index 1b70ccebd5..d833eadb75 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@coralproject/talk",
-      "version": "8.6.2",
+      "version": "8.6.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@ampproject/toolbox-cache-url": "^2.9.0",
diff --git a/server/package.json b/server/package.json
index 6a1ab595b4..96bbeb13b3 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
diff --git a/server/src/core/server/events/listeners/slack/publishEvent.ts b/server/src/core/server/events/listeners/slack/publishEvent.ts
index 02f5b3c042..e2165934f3 100644
--- a/server/src/core/server/events/listeners/slack/publishEvent.ts
+++ b/server/src/core/server/events/listeners/slack/publishEvent.ts
@@ -103,9 +103,12 @@ export default class SlackPublishEvent {
     );
     const commentLink = getURLWithCommentID(this.story.url, this.comment.id);
 
-    const body = getHTMLPlainText(getLatestRevision(this.comment).body);
+    // We truncate to less than 3000 characters to stay under Slack limits
+    const truncatedBody = getHTMLPlainText(
+      getLatestRevision(this.comment).body
+    ).slice(0, 2999);
     return {
-      text: body,
+      text: truncatedBody,
       blocks: [
         {
           type: "section",
@@ -121,7 +124,7 @@ export default class SlackPublishEvent {
           block_id: "body-block",
           text: {
             type: "plain_text",
-            text: body,
+            text: truncatedBody,
           },
         },
         {
diff --git a/server/src/core/server/events/listeners/webhook.ts b/server/src/core/server/events/listeners/webhook.ts
index 2467ae2f36..c42a3373d7 100644
--- a/server/src/core/server/events/listeners/webhook.ts
+++ b/server/src/core/server/events/listeners/webhook.ts
@@ -17,6 +17,7 @@ export class WebhookCoralEventListener
     CoralEventType.STORY_CREATED,
     CoralEventType.COMMENT_CREATED,
     CoralEventType.COMMENT_REPLY_CREATED,
+    CoralEventType.COMMENT_LEFT_MODERATION_QUEUE,
   ];
 
   private readonly queue: WebhookQueue;
diff --git a/server/src/core/server/graph/plugins/helpers.ts b/server/src/core/server/graph/plugins/helpers.ts
index e5f6c41543..94465e66f2 100644
--- a/server/src/core/server/graph/plugins/helpers.ts
+++ b/server/src/core/server/graph/plugins/helpers.ts
@@ -101,7 +101,7 @@ function hoistCoralErrorExtensions(
   }
 
   // Get the translation bundle.
-  const bundle = ctx.i18n.getBundle(ctx.lang);
+  const bundle = ctx.i18n.getBundle(ctx.tenant ? ctx.tenant.locale : ctx.lang);
 
   // Translate the extensions.
   const extensions = originalError.serializeExtensions(bundle, ctx.id);
diff --git a/server/src/core/server/graph/resolvers/Subscription/commentEnteredModerationQueue.ts b/server/src/core/server/graph/resolvers/Subscription/commentEnteredModerationQueue.ts
index e40e7c061b..f28d0c8fa0 100644
--- a/server/src/core/server/graph/resolvers/Subscription/commentEnteredModerationQueue.ts
+++ b/server/src/core/server/graph/resolvers/Subscription/commentEnteredModerationQueue.ts
@@ -17,6 +17,7 @@ export interface CommentEnteredModerationQueueInput
   extends SubscriptionPayload {
   queue: GQLMODERATION_QUEUE;
   commentID: string;
+  status?: string;
   storyID: string;
   siteID: string;
   section?: string;
diff --git a/server/src/core/server/graph/resolvers/Subscription/commentLeftModerationQueue.ts b/server/src/core/server/graph/resolvers/Subscription/commentLeftModerationQueue.ts
index 894fdcfc7d..479ff998ec 100644
--- a/server/src/core/server/graph/resolvers/Subscription/commentLeftModerationQueue.ts
+++ b/server/src/core/server/graph/resolvers/Subscription/commentLeftModerationQueue.ts
@@ -16,6 +16,7 @@ import {
 export interface CommentLeftModerationQueueInput extends SubscriptionPayload {
   queue: GQLMODERATION_QUEUE;
   commentID: string;
+  status?: string;
   storyID: string;
   siteID: string;
   section?: string;
diff --git a/server/src/core/server/graph/schema/schema.graphql b/server/src/core/server/graph/schema/schema.graphql
index 4618471fc9..58eb8f4139 100644
--- a/server/src/core/server/graph/schema/schema.graphql
+++ b/server/src/core/server/graph/schema/schema.graphql
@@ -1760,6 +1760,7 @@ enum WEBHOOK_EVENT_NAME {
   STORY_CREATED
   COMMENT_CREATED
   COMMENT_REPLY_CREATED
+  COMMENT_LEFT_MODERATION_QUEUE
 }
 
 type WebhookEndpoint {
diff --git a/server/src/core/server/services/events/comments.ts b/server/src/core/server/services/events/comments.ts
index 90a08e2438..69c8553859 100644
--- a/server/src/core/server/services/events/comments.ts
+++ b/server/src/core/server/services/events/comments.ts
@@ -162,12 +162,13 @@ export async function publishCommentFeatured(
 export async function publishModerationQueueChanges(
   broker: CoralEventPublisherBroker,
   moderationQueue: Pick<CommentModerationQueueCounts, "queues">,
-  comment: Pick<Comment, "id" | "storyID" | "siteID" | "section">
+  comment: Pick<Comment, "id" | "storyID" | "siteID" | "section" | "status">
 ) {
   if (moderationQueue.queues.pending === 1) {
     await CommentEnteredModerationQueueCoralEvent.publish(broker, {
       queue: GQLMODERATION_QUEUE.PENDING,
       commentID: comment.id,
+      status: comment.status,
       storyID: comment.storyID,
       siteID: comment.siteID,
       section: comment.section,
@@ -176,6 +177,7 @@ export async function publishModerationQueueChanges(
     await CommentLeftModerationQueueCoralEvent.publish(broker, {
       queue: GQLMODERATION_QUEUE.PENDING,
       commentID: comment.id,
+      status: comment.status,
       storyID: comment.storyID,
       siteID: comment.siteID,
       section: comment.section,
@@ -185,6 +187,7 @@ export async function publishModerationQueueChanges(
     await CommentEnteredModerationQueueCoralEvent.publish(broker, {
       queue: GQLMODERATION_QUEUE.REPORTED,
       commentID: comment.id,
+      status: comment.status,
       storyID: comment.storyID,
       siteID: comment.siteID,
       section: comment.section,
@@ -193,6 +196,7 @@ export async function publishModerationQueueChanges(
     await CommentLeftModerationQueueCoralEvent.publish(broker, {
       queue: GQLMODERATION_QUEUE.REPORTED,
       commentID: comment.id,
+      status: comment.status,
       storyID: comment.storyID,
       siteID: comment.siteID,
       section: comment.section,
@@ -202,6 +206,7 @@ export async function publishModerationQueueChanges(
     await CommentEnteredModerationQueueCoralEvent.publish(broker, {
       queue: GQLMODERATION_QUEUE.UNMODERATED,
       commentID: comment.id,
+      status: comment.status,
       storyID: comment.storyID,
       siteID: comment.siteID,
       section: comment.section,
@@ -210,6 +215,7 @@ export async function publishModerationQueueChanges(
     await CommentLeftModerationQueueCoralEvent.publish(broker, {
       queue: GQLMODERATION_QUEUE.UNMODERATED,
       commentID: comment.id,
+      status: comment.status,
       storyID: comment.storyID,
       siteID: comment.siteID,
       section: comment.section,