diff --git a/_data/comm-release.json b/_data/comm-release.json
index e032cc11..e1230d44 100644
--- a/_data/comm-release.json
+++ b/_data/comm-release.json
@@ -124,6 +124,10 @@
     "calendar-event-listing-column-due-date.tooltiptext",
     "calendar-event-listing-column-end-date.label",
     "calendar-event-listing-column-end-date.tooltiptext",
+    "calendar-event-listing-column-creation-date.label",
+    "calendar-event-listing-column-creation-date.tooltiptext",
+    "calendar-event-listing-column-last-modified-time.label",
+    "calendar-event-listing-column-last-modified-time.tooltiptext",
     "calendar-event-listing-column-location.label",
     "calendar-event-listing-column-location.tooltiptext",
     "calendar-event-listing-column-percent-complete.label",
@@ -375,6 +379,8 @@
     "ask-save-title-task",
     "ask-save-message-event",
     "ask-save-message-task",
+    "calendar-item-all-day.label",
+    "calendar-item-all-day.accesskey",
     "warning-end-before-start",
     "warning-until-date-before-start",
     "home-calendar-name",
@@ -1128,8 +1134,6 @@
     "event.calendar.accesskey",
     "event.attendees.label",
     "event.attendees.accesskey",
-    "event.alldayevent.label",
-    "event.alldayevent.accesskey",
     "event.from.label",
     "event.from.accesskey",
     "task.from.label",
@@ -5186,7 +5190,6 @@
     "serverType-smtp",
     "getMsgButtonTooltip",
     "getMsgButtonTooltip.listSeparator",
-    "documentDone",
     "documentLoading",
     "autosyncProgress",
     "localFolders",
@@ -5204,7 +5207,6 @@
     "mailnews.labels.description.4",
     "mailnews.labels.description.5",
     "mailnews.tags.format",
-    "tag",
     "mailnews.search_date_format",
     "mailnews.search_date_separator",
     "mailnews.search_date_leading_zeros",
@@ -5310,11 +5312,6 @@
     "updatesItem_pending",
     "updatesItem_pendingFallback",
     "updatesItem_pending.accesskey",
-    "folderPaneModeHeader_all",
-    "folderPaneModeHeader_unread",
-    "folderPaneModeHeader_favorite",
-    "folderPaneModeHeader_recent",
-    "folderPaneModeHeader_smart",
     "unifiedAccountName",
     "mdnBarMessageNormal",
     "mdnBarMessageAddressDiffers",
@@ -7652,6 +7649,12 @@
     "folder-pane-header-toggle-folder-size.label",
     "folder-pane-header-toggle-full-path.label",
     "folder-pane-header-hide-local-folders.label",
+    "folder-pane-mode-header-all",
+    "folder-pane-mode-header-unread",
+    "folder-pane-mode-header-favorite",
+    "folder-pane-mode-header-recent",
+    "folder-pane-mode-header-smart",
+    "folder-pane-mode-header-tags",
     "folder-pane-mode-context-button.title",
     "folder-pane-mode-context-toggle-compact-mode.label",
     "folder-pane-mode-context-toggle-compact-mode.accesskey",
@@ -8326,7 +8329,7 @@
     "address-book-add-ldap-icon.alt",
     "address-book-add-ldap",
     "address-book-add-ldap-description",
-    "account-hub-address-book-sync-option-data",
+    "account-hub-address-book-sync-books-data",
     "address-book-sync-existing-description",
     "account-hub-select-address-book-account",
     "account-hub-account-address-book-count",
@@ -8377,7 +8380,45 @@
     "account-hub-notification-unknown-host",
     "account-hub-ssl-noencryption",
     "account-hub-email-skip-button",
-    "account-hub-finding-sync-accounts"
+    "account-hub-finding-sync-accounts",
+    "account-hub-privacy-policy",
+    "account-hub-welcome",
+    "account-hub-welcome-brand",
+    "account-hub-welcome-text",
+    "account-hub-name-warning-icon.title",
+    "account-hub-email-label",
+    "account-hub-email-label.accesskey",
+    "account-hub-email-input.placeholder",
+    "account-hub-email-warning-icon.title",
+    "account-hub-password-label",
+    "account-hub-password-label.accesskey",
+    "account-hub-password-label.title",
+    "account-hub-remember-password",
+    "account-hub-remember-password.accesskey",
+    "account-hub-exchange-label",
+    "account-hub-exchange-label.accesskey",
+    "account-hub-installing-addon",
+    "account-hub-success-addon",
+    "account-hub-success-half-manual",
+    "account-hub-result-no-encryption",
+    "account-hub-result-ssl",
+    "account-hub-result-starttls",
+    "account-hub-credentials-wrong",
+    "account-hub-find-settings-failed",
+    "account-hub-exchange-config-unverifiable",
+    "account-hub-advanced-setup-button",
+    "account-hub-advanced-setup-button.accesskey",
+    "account-hub-exchange-dialog-question",
+    "account-hub-creation-error-title",
+    "account-hub-error-server-exists",
+    "account-hub-confirm-advanced-title",
+    "account-hub-confirm-advanced-description",
+    "account-hub-addon-install-title",
+    "account-hub-encryption-button",
+    "account-hub-address-books-button",
+    "account-hub-calendars-button",
+    "account-hub-thundermail-button",
+    "account-hub-thundermail-divider-text"
   ],
   "mail/messenger/accountcreation/accountSetup.ftl": [
     "account-setup-tab-title",
@@ -8662,6 +8703,7 @@
     "books-pane-create-list-button.title",
     "books-pane-import-button",
     "books-pane-import-button.title",
+    "address-book-list.aria-label",
     "all-address-books-row.title",
     "all-address-books",
     "about-addressbook-card-count",
@@ -9034,7 +9076,10 @@
     "calendar-dialog-reminders-row-icon.alt",
     "calendar-dialog-attendees-row-icon.alt",
     "calendar-dialog-attendee-count",
-    "calendar-dialog-attendee-summary",
+    "calendar-dialog-attendee-summary-going",
+    "calendar-dialog-attendee-summary-maybe",
+    "calendar-dialog-attendee-summary-declined",
+    "calendar-dialog-attendee-summary-pending",
     "calendar-dialog-attendee-organizer",
     "calendar-dialog-attendee-optional",
     "calendar-dialog-icon-attending.alt",
@@ -9603,6 +9648,8 @@
     "menu-move-copy-recent-destinations.accesskey",
     "menu-move-copy-favorites.label",
     "menu-move-copy-favorites.accesskey",
+    "menu-move-copy-no-recent.label",
+    "menu-move-copy-no-favorites.label",
     "appmenu-save-as-file.label",
     "appmenu-settings.label",
     "appmenu-addons-and-themes.label",
@@ -10940,10 +10987,10 @@
     "recreate-inbox.label",
     "recreate-inbox.accesskey",
     "archive-example-label",
-    "archive-folder-name.label",
-    "inbox-folder-name.label",
-    "child-folder-name.label",
-    "sibling-folder-name.label"
+    "archive-folder-name-label",
+    "inbox-folder-name-label",
+    "child-folder-name-label",
+    "sibling-folder-name-label"
   ],
   "mail/messenger/preferences/am-copies.ftl": [
     "account-prefs-show-address-row-description"
@@ -11587,6 +11634,9 @@
     "account-hub-checkbox-label.label",
     "account-hub-checkbox-label.accesskey",
     "account-hub-checkbox-description",
+    "account-hub-manual-config-checkbox-label.label",
+    "account-hub-manual-config-checkbox-label.accesskey",
+    "account-hub-manual-config-checkbox-description",
     "new-calendar-legend",
     "new-calendar-checkbox-label.label",
     "new-calendar-checkbox-description",
diff --git a/_data/comm.json b/_data/comm.json
index b544898b..64420531 100644
--- a/_data/comm.json
+++ b/_data/comm.json
@@ -9788,9 +9788,7 @@
     "ignored-subtheads-feedback",
     "attachment-view-attachment-count",
     "allow-remote-content-resource.label",
-    "remote-content-option-allow-all.label",
-    "oauth2-loopback-success",
-    "oauth2-loopback-failure"
+    "remote-content-option-allow-all.label"
   ],
   "mail/messenger/messengercompose/messengercompose.ftl": [
     "compose-send-format-menu.label",
@@ -10035,6 +10033,16 @@
     "try-searching-prefix",
     "remove-expired-articles-label"
   ],
+  "mail/messenger/oauthResultPage.ftl": [
+    "oauth-result-wordmark-alt",
+    "oauth-result-footer-text",
+    "oauth-success-title",
+    "oauth-success-subtitle",
+    "oauth-success-body",
+    "oauth-error-title",
+    "oauth-error-subtitle",
+    "oauth-error-body"
+  ],
   "mail/messenger/openpgp/backupKeyPassword.ftl": [
     "set-password-window-title",
     "set-password-legend",
@@ -10912,7 +10920,7 @@
     "policy-SanitizeOnShutdown2",
     "policy-SearchEngines",
     "policy-SearchSuggestEnabled",
-    "policy-SecurityDevices",
+    "policy-SecurityDevices2",
     "policy-SSLVersionMax",
     "policy-SSLVersionMin",
     "policy-SupportMenu",
diff --git a/mail/messenger/accountcreation/accountHub.ftl b/mail/messenger/accountcreation/accountHub.ftl
index 077775b3..1093ea68 100644
--- a/mail/messenger/accountcreation/accountHub.ftl
+++ b/mail/messenger/accountcreation/accountHub.ftl
@@ -274,21 +274,6 @@ account-hub-address-book-sync-books-data =
        *[other] { $addressBooks } address books available
     }
 account-hub-fetching-sync-accounts = Discovering address books and calendars…
-# $addressBooks (Number) - The number of address books that can be synced.
-# $accounts (Number) - The number of accounts.
-account-hub-address-book-sync-option-data =
-    { $addressBooks ->
-        [one]
-            { $accounts ->
-                [one] 1 address book from 1 account available
-               *[other] 1 address book from { $accounts } accounts available
-            }
-       *[other]
-            { $accounts ->
-                [one] { $addressBooks } address books from 1 account available
-               *[other] { $addressBooks } address books from { $accounts } accounts available
-            }
-    }
 address-book-sync-existing-description = Retrieving existing accounts…
 account-hub-select-address-book-account = Select an account with Address books
 # $synced (Number) - The number of address books that are synced.
diff --git a/mail/messenger/calendarDialog.ftl b/mail/messenger/calendarDialog.ftl
index 3a9690c0..096eba37 100644
--- a/mail/messenger/calendarDialog.ftl
+++ b/mail/messenger/calendarDialog.ftl
@@ -34,72 +34,6 @@ calendar-dialog-attendee-count =
         [one] { $count } Guest
        *[other] { $count } Guests
     }
-# Variables:
-#   $going (Number): Number of guests that responded "attending".
-#   $maybe (Number): Number of guests that responded "maybe".
-#   $declined (Number): Number of guests that responded "declined".
-#   $pending (Number): Number of guests that response "pending".
-calendar-dialog-attendee-summary =
-    { $going ->
-        [one]
-            { $maybe ->
-                [one]
-                    { $declined ->
-                        [one]
-                            { $pending ->
-                                [one] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                               *[other] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                            }
-                       *[other]
-                            { $pending ->
-                                [one] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                               *[other] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                            }
-                    }
-               *[other]
-                    { $declined ->
-                        [one]
-                            { $pending ->
-                                [one] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                               *[other] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                            }
-                       *[other]
-                            { $pending ->
-                                [one] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                               *[other] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                            }
-                    }
-            }
-       *[other]
-            { $maybe ->
-                [one]
-                    { $declined ->
-                        [one]
-                            { $pending ->
-                                [one] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                               *[other] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                            }
-                       *[other]
-                            { $pending ->
-                                [one] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                               *[other] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                            }
-                    }
-               *[other]
-                    { $declined ->
-                        [one]
-                            { $pending ->
-                                [one] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                               *[other] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                            }
-                       *[other]
-                            { $pending ->
-                                [one] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                               *[other] { $going } attending, { $maybe } maybe, { $declined } declined, { $pending } pending
-                            }
-                    }
-            }
-    }
 calendar-dialog-attendee-organizer = Organizer
 calendar-dialog-attendee-optional = Optional
 calendar-dialog-icon-attending =
diff --git a/mail/messenger/oauthResultPage.ftl b/mail/messenger/oauthResultPage.ftl
new file mode 100644
index 00000000..7bf46ffe
--- /dev/null
+++ b/mail/messenger/oauthResultPage.ftl
@@ -0,0 +1,30 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+### These strings are formatted and used in a generated HTML page, shown in the user's default browser. Because of that, they have to use slightly unconventional formatting. It also means instead of strings having attributes, each attribute is its own entry.
+
+
+## Always included in the page
+
+oauth-result-wordmark-alt = { -brand-full-name }
+oauth-result-footer-text = Need help? Contact support.
+
+## Successful authentication
+
+oauth-success-title = You’re all set
+oauth-success-subtitle = Your account has been securely connected to { -brand-short-name }.
+oauth-success-body = You can close this window.
+
+## Authentication error
+
+oauth-error-title = Sign-in couldn’t be completed
+oauth-error-subtitle = { -brand-short-name } wasn’t able to finish signing in with these settings.
+# New lines in the string will be converted into new lines in the output.
+# $linkStart (String) - Link prefix. Has to always be before $linkEnd. Has no visible content.
+# $linkEnd (String) - Link suffix. Has to always be after $linkStart. Has no visible content.
+oauth-error-body =
+    Go back to { -brand-short-name }, review your account configuration settings, and try again.
+    
+    If the problem continues, see { $linkStart }Troubleshoot account sign-in{ $linkEnd } for help.
diff --git a/mail/messenger/policies/policies-descriptions.ftl b/mail/messenger/policies/policies-descriptions.ftl
index 51339679..a8a1154d 100644
--- a/mail/messenger/policies/policies-descriptions.ftl
+++ b/mail/messenger/policies/policies-descriptions.ftl
@@ -85,6 +85,7 @@ policy-RequestedLocales = Set the list of requested locales for the application
 policy-SanitizeOnShutdown2 = Clear navigation data on shutdown.
 policy-SearchEngines = Configure search engine settings. This policy is only available on the Extended Support Release (ESR) version.
 policy-SearchSuggestEnabled = Enable or disable search suggestions.
+policy-SecurityDevices2 = Add or delete PKCS #11 modules.
 # For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/PKCS11/Module_Installation
 policy-SecurityDevices = Install PKCS #11 modules.
 policy-SSLVersionMax = Set the maximum SSL version.